Subject: [alpine-aports] [PATCH] testing/sqm-scripts: Upgrade to 1.0.7

From: Ben Allen <[email-masked]>
Date: Mon, 21 Mar 2016 04:26:12 +0000

- Upgrade to 1.0.7
- Cleanup patches
---
 testing/sqm-scripts/10-Makefile.patch    |  4 ++--
 testing/sqm-scripts/10-defaults.sh.patch |  8 ++++----
 testing/sqm-scripts/10-function.sh.patch |  4 ++--
 testing/sqm-scripts/APKBUILD             | 26 +++++++++++++-------------
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/testing/sqm-scripts/10-Makefile.patch b/testing/sqm-scripts/10-Makefile.patch
index 29879e1..84d7dbe 100644
--- a/testing/sqm-scripts/10-Makefile.patch
+++ b/testing/sqm-scripts/10-Makefile.patch
@@ -1,5 +1,5 @@
---- sqm-scripts-1.0.6/Makefile.orig
-+++ sqm-scripts-1.0.6/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -20,13 +20,8 @@
  	install -m 0744 src/run-openwrt.sh $(DESTDIR)$(PREFIX)/lib/sqm/run.sh
  
diff --git a/testing/sqm-scripts/10-defaults.sh.patch b/testing/sqm-scripts/10-defaults.sh.patch
index ab1d85d..d2c7bdd 100644
--- a/testing/sqm-scripts/10-defaults.sh.patch
+++ b/testing/sqm-scripts/10-defaults.sh.patch
@@ -1,5 +1,5 @@
---- sqm-scripts-1.0.6/src/defaults.sh.orig
-+++ sqm-scripts-1.0.6/src/defaults.sh
+--- a/src/defaults.sh
++++ b/src/defaults.sh
 @@ -27,7 +27,7 @@
  [ -z "$IP" ] && IP=ip_wrapper
  [ -z "$IP_BINARY" ] && IP_BINARY=$(which ip)
@@ -7,5 +7,5 @@
 -[ -z "$INSMOD" ] && INSMOD=$(which modprobe) || INSMOD=$(which insmod)
 +[ -n "$INSMOD" ] || INSMOD=$(which modprobe) || INSMOD=$(which insmod)
  [ -z "$TARGET" ] && TARGET="5ms"
- [ -z "$IPT_MASK" ] && IPT_MASK="0xff"
- [ -z "$IPT_MASK_STRING" ] && IPT_MASK_STRING="/${IPT_MASK}"	# for set-mark
+ [ -z "$IPT_MASK" ] && IPT_MASK="0xff" # to disable: set mask to 0xffffffff
+ #sm: we need the functions above before trying to set the ingress IFB device
diff --git a/testing/sqm-scripts/10-function.sh.patch b/testing/sqm-scripts/10-function.sh.patch
index 6dd05dd..42e6f7e 100644
--- a/testing/sqm-scripts/10-function.sh.patch
+++ b/testing/sqm-scripts/10-function.sh.patch
@@ -1,5 +1,5 @@
---- sqm-scripts-1.0.6/src/functions.sh.orig
-+++ sqm-scripts-1.0.6/src/functions.sh
+--- a/src/functions.sh
++++ b/src/functions.sh
 @@ -70,7 +70,7 @@
  
  do_modules() {
diff --git a/testing/sqm-scripts/APKBUILD b/testing/sqm-scripts/APKBUILD
index 6e87de9..e4adb72 100644
--- a/testing/sqm-scripts/APKBUILD
+++ b/testing/sqm-scripts/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor:
 # Maintainer:
 pkgname=sqm-scripts
-pkgver=1.0.6
+pkgver=1.0.7
 pkgrel=0
 pkgdesc="SQM scripts traffic shaper"
 url="https://github.com/tohojo/sqm-scripts"
@@ -38,15 +38,15 @@ package() {
         make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="7d4b7b5651190139fd2b3227a3f24bc8  sqm-scripts-1.0.6.tar.gz
-a429ea21effe77d4f196970d204bcf80  10-Makefile.patch
-57a4ce0e7fcc5a73e76a71f0f24eb1f7  10-function.sh.patch
-5b6dda1d6b4d93326972d5fabe4208f1  10-defaults.sh.patch"
-sha256sums="7531140f744712714b9551d53c622faec370ba0a6911ef07cdd663981eae23fb  sqm-scripts-1.0.6.tar.gz
-59f26dc845302e9471be73560ccac1d31522688003aa65923b52d4a75f285ad2  10-Makefile.patch
-7ed3c38d043134dd4adbe602efb129bc78d0601818fdc1276adfa988c17a199f  10-function.sh.patch
-4c26984bb61b6b320c75a4a5ea0c878104d9e429a3c64b718db40e16dde955ce  10-defaults.sh.patch"
-sha512sums="3e296f984816ba728cc62e13cb2a7d09183abcf7df04c170a0cb62bef0000ed62cfcb338b5d49bc258677e44e128282f0cdf7ec9d8949507e9f5f37375bdebcc  sqm-scripts-1.0.6.tar.gz
-7ecb7dc71e010b9d2c1fd227de78a34bf6b67b466741ec1756f41a54d372a656d1572f09f9fc7cca45c45591f894037a71c198c7759d8db476de1a0af9292e7e  10-Makefile.patch
-5ecc99eb2edeeff4c9535b1d2c46d27779c8907f6bc00bfd037bead84bbb39d257d155c2c6722d910bf03177ced57f3aabbb576aaaa9bbce0484b6681d30b5f2  10-function.sh.patch
-dcef599c249abf93e7686e14b0aee06f6e8a2a25809665c4e796a7b715e3d1153ad02c8061485bfe5c0cf662e2d4c8d22377318db60c743e170b49f49ce70a0a  10-defaults.sh.patch"
+md5sums="79c30e7b349becb7006eff6cc7840b63  sqm-scripts-1.0.7.tar.gz
+8445b8a37dbad4e1d5616cf22f90e0df  10-Makefile.patch
+6b8d3d269e29e5e5fa39670d32ffcb89  10-function.sh.patch
+04fb808b2247c0241dad147cec9232fe  10-defaults.sh.patch"
+sha256sums="dfbaa5c35a9229d131e394c86d10e3482fb0901e8a063b0fb8a20e20ac54b93f  sqm-scripts-1.0.7.tar.gz
+2fa65381b7cade1aa2b068a6c9f27d0b966afbdd3297ed5afe48886ba64d0b9b  10-Makefile.patch
+c3ba1e4054fa9aaf1c0a621270ad6941e752b3a58c1048f6bdd681fb880e70b5  10-function.sh.patch
+29fb7cc01360c2589a73b24e8d7c1b3fed893cf4f5d400a012272eeb6b167b8f  10-defaults.sh.patch"
+sha512sums="4f8a23511669d78a54ad3ec7b9c83a8cac18bf57010003c5208a75577602d8be2ce4e481d8b5e58739d703f46ba9962a1b24fa240da3169705bb1e00ba2674dc  sqm-scripts-1.0.7.tar.gz
+4bbdf01ad1c8e79b67586d4eb0397ed9f2e8fff18163b4f81b014afd8a2c6c871da53861d0778531d62e0d7a9f4843d9a4f7a6a5dee5c74f12b1ce2c1454fb17  10-Makefile.patch
+b5904eec7196de7ad8ebb3a8c3f6771bc62bae48057e14ba073ea4f34abb50d5459beb436f58f1ee2e2abd3d4f5a7d36370dc09d65a55fa647fd1a43cb3303e6  10-function.sh.patch
+a5d90befde15afe588d6ac46a3ce4c7b123d0d233e83be5c36c9f45f14d71622f6da6c9c47fe219645a474705daaacc52e246ce7c21b313631371db2962a3f9a  10-defaults.sh.patch"
-- 
2.7.2

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---