[net-wireless/wimax] fix init.d per bug #338922

Package-Manager: portage-2.2.0_alpha4_p14/cvs/Linux x86_64

3 files changed, 23 insertions, 20 deletions

diff --git a/net-wireless/wimax/ChangeLog b/net-wireless/wimax/ChangeLog
index 69fdc5cbb135..85e07d680fa8 100644
--- a/net-wireless/wimax/ChangeLog
+++ b/net-wireless/wimax/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-wireless/wimax
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wimax/ChangeLog,v 1.4 2010/11/08 17:56:36 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wimax/ChangeLog,v 1.5 2010/11/08 18:04:00 alexxy Exp $
+
+  08 Nov 2010; Alexey Shvetsov <alexxy@gentoo.org> files/wimax:
+  fix init.d per bug #338922
 
 *wimax-1.5.1 (08 Nov 2010)
 
diff --git a/net-wireless/wimax/Manifest b/net-wireless/wimax/Manifest
index d69d3921b7b9..e0bda12ecb76 100644
--- a/net-wireless/wimax/Manifest
+++ b/net-wireless/wimax/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX wimax 648 RMD160 baf1cbcbea336001ccf02f320736c065be1eb2c0 SHA1 966520a76609e4f7710afd7d5daf0f58776947b2 SHA256 120727223bfb5d6a3c1a648615e4370c6da9a1ebc2214d569800922844b3e53d
+AUX wimax 670 RMD160 bc0aa80f2f5dedf934979265ee944a89f0a22196 SHA1 aaedbdc6aacc1a2ba2993291668c8b782e804c32 SHA256 127861027d1b95f93758ed7d4942ba331f35b4811fa38007413dcbd0064ec89b
 AUX wimax-1.5.1-64bit-fixes.patch 4518 RMD160 cd629cd1d5632e78bba9719df494379c4d7d654e SHA1 0c03d5a7b679b0239f39117684f923875254526e SHA256 c0d1592c03b0f4534e4a703020005093fe81ebb8dc553f4f906b9d2729190d7e
 AUX wimax-1.5.1-fix-struct-packing-and-type-casting-issues.patch 18654 RMD160 f05b0513b49f5983e0077677814c9fcb00cd0106 SHA1 8685a538c285b2c33f79d1f1ded0e2a161241c50 SHA256 d2c3bac90b6c8636ac7f583dcca5a2c7116ceb3e49cebd9c2b726b03e4bba75c
 AUX wimax-1.5.1-kdapi.patch 612 RMD160 9eeed850250f6d9c6da58c8e47226282487d40f3 SHA1 c376c7c9ae93b2d0807917baa14d09f8fcf36168 SHA256 5ff129f49098cab5178163470355c2251868c717056c693cc01e47486bf1b0a8
@@ -9,22 +9,22 @@ AUX wimax-1.5.1-malloc-free-warnings.patch 5214 RMD160 eff1931653d17275f04bd8be0
 AUX wimax-1.5.1-pthread-mutex-inconsistency.patch 2743 RMD160 0ec342ed3d2da818283ded9a26f98f3d7256241b SHA1 3a19113d921a34711696cb126eb76aab8183ddf4 SHA256 9243d5fcc369cb5438211e82636ff4fc0fa9bbe2627f77f4243fc82f0e1d61e0
 DIST wimax-1.5.1.tar.gz 2860638 RMD160 0c5ba406c3007e8dbb748b6dabcb83a642411625 SHA1 9443a5376bee152cfc119cbb8f2492e78ac55c0b SHA256 c04d4617e99e836b78f9c4e6eb86a88bc20ab789c05eb201bb8f3846899186a5
 EBUILD wimax-1.5.1.ebuild 1793 RMD160 6b7924ca040d9728cebcc6e77d794af08c20fa31 SHA1 4edeae344eae480709949370a7654d9444526980 SHA256 869f0f25f0d6e898c0b35215a9a6d4e54a32238ab50e5232501a58d7589b1a85
-MISC ChangeLog 1116 RMD160 d37c0ca51fdcb99da208f000f225e6cda482daa9 SHA1 bcb48892476cb721779f54d74f2e74568b737a3e SHA256 6f944b423ec4593da5c9b49df1ae017e66e2733c08ed550ad7d4c23616709c46
+MISC ChangeLog 1210 RMD160 8d1ec87df32065326a7daf8b1f34919b1b19a81d SHA1 ae31ee83b90e57b840292c6b20e66c2534376f21 SHA256 f43cc8e9e36d31596eaad1c3d07ef79a6f30c1f6080b53851ea4a546a0e4fb74
 MISC metadata.xml 250 RMD160 94be601f620e3158922f31ac28328a28665555a2 SHA1 ac8010695121148bf3593692aba56938187882c9 SHA256 aea796ea3b08f1f5ca77c34868298e406de62590afbf2662e87d094c3e0041f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBCAAGBQJM2DlcAAoJEOf+E+/4L5LmEBwQAKkjmaEMwU143bU2Ff46cc8q
-bnnyM2zAL6PPO2/DRz3K2hTwUBrEXVbeIORDkg0M4kqwDbMQjHorLWZLaM6ntR1l
-kDSS/47KT4Gt9kdeyjvyWhmFFzD0kEGT+2VlvMmfdiilE92nEGFUHLxNMcH/vbdB
-6Xy7S14otuU0MYPE3bSrOZhib8p+Cm7X7t7Yvvy3WxUX7ARyRrsejNh7SRYy/qZk
-KuZnDlZfyUtQDhre6iyaKnxasW9Kdy6YHAF8fVWt4yDq31ohISRqHD7mfD9tYMkQ
-GhXz9yDQrvd+oF3sE3wD6bnmBgmT85ues84Bm9NGxGPhh1WMXbim4hHGH28mCFLm
-4RMskp57pHwadjyv7JDE0lrGVmiLWlP5CpaEVNec259H5mHI8esYofoyE48L90Yo
-9fJG1y88CXCiw0wUMG1+3vMTvrGrCemAVUFu5THWVZIvELB3h3vifyAhvgsiwrdE
-jqY6WEga1amPDLi8l6SnewQjkPhHEAE8ELY380nrvwrvc2ayu/2L2cozbZMU3Fn4
-b2TqYhLMkLZ8fVn2FdONkmZOzHZYvNqJIAXZRNdapb98wdU/zHI47WXGCnSSldWx
-yMoKiUvxxRDyyvMTSyzq9MezYwVIPbfXfLp9d6IB9LF84X4SOztuSu+Ht4plzoUu
-rUtxjqxMULzpW3hpQC1Z
-=KXk9
+iQIcBAEBCAAGBQJM2DsSAAoJEOf+E+/4L5LmNzcQAJxU8+8JfoD5cCcP3rWvE6GB
+3lGBaMgIGWXA8mM/RZjB53ipoF2GelLHoOeg9WyE5C88CjXD3QR9ct+11JO4j+ys
+J0DxhQkgCsT3IavsCckhe4Ff6LsLuWT7gzrmtqRUPCFPdMoXijN5B20rjlyy+bJe
+2FbyJZviK0nsYIB2nWBJy4NVz6TyMDpNhf7VgJ0pwftWJpZujyvwJLcCV7BmBEi/
+Zv/Ryq1pqvo9/42uankHRPbZ9oO5AY8h4mzl5JK2rMeSzKTLw770WqD+cmqzfy32
+RP+FxFhTINorbvCVUMur4My6vlB164IF8LkU5lumN4HgnqfqKwH38hKiauu/1xQ2
+96y8DOXl4qtlNNmFUTJLigKEnTXjiayq/6qRJHt4h9FkeXSlMFqL1D0VQcpZcdqZ
+M35nOw1s8DWOqpOSG4M9cjplBVgrYIV22UYRWqpjW6QKZgnsSiSMuRtwGzg9b//5
+NnCiezQ1e9ISVh6g4niQ6PpZpZagrUEkw7U4smD1sE6M67EIjmwRhnREDBvPNGer
+rDbZCONY0AGjOL+gHQQ2fZv0xzRJ4dZAsiS0M2TH5Wcz3QYE5roQ1QWlQ7lqIRq1
+BZ5bx9OgcTRR11vATXOsz0LUNcxVMCWr+D+RbF6ySQEDcARDJ9HduCofKVfFEmjy
+yy809aIm3JftB39YbM/6
+=wOcP
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/wimax/files/wimax b/net-wireless/wimax/files/wimax
index 43b4da78ac56..7b3bd8f5cb07 100644
--- a/net-wireless/wimax/files/wimax
+++ b/net-wireless/wimax/files/wimax
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wimax/files/wimax,v 1.2 2010/07/26 22:13:27 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wimax/files/wimax,v 1.3 2010/11/08 18:04:00 alexxy Exp $
 
 description="WiMAX Network Service"
 
@@ -12,13 +12,13 @@ depend() {
 
 start() {
 	ebegin "Starting WiMAX Network Service"
-	[ -e /var/run/wimaxd.pid ] && rm -f /var/run/wimaxd.pid
-	start-stop-daemon --start --quiet --pidfile /var/run/wimax.pid --exec /usr/bin/wimaxd -b
+	[ -e /var/run/wimaxd.wmx0.pid ] && rm -f /var/run/wimaxd.wmx0.pid
+	start-stop-daemon --start --quiet --pidfile /var/run/wimaxd.wmx0.pid --exec /usr/bin/wimaxd -b
 	eend $?
 }
 
 stop() {
 	ebegin "Stoping WiMAX Network Service"
-	start-stop-daemon --stop --quiet --pidfile /var/run/wimax.pid
+	start-stop-daemon --stop --quiet --pidfile /var/run/wimaxd.wmx0.pid
 	eend $?
 }