Adding an updated ebuild, working around some obscure bugs (#140067; #143887).

Package-Manager: portage-2.1.1_rc1-r4

6 files changed, 115 insertions, 8 deletions

diff --git a/net-wireless/ipw3945d/ChangeLog b/net-wireless/ipw3945d/ChangeLog
index a45faf532648..0e1c00331383 100644
--- a/net-wireless/ipw3945d/ChangeLog
+++ b/net-wireless/ipw3945d/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/ipw3945d
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945d/ChangeLog,v 1.4 2006/08/02 12:16:29 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945d/ChangeLog,v 1.5 2006/09/05 19:37:59 phreak Exp $
+
+*ipw3945d-1.7.22-r2 (05 Sep 2006)
+
+  05 Sep 2006; Christian Heim <phreak@gentoo.org> +files/ipw3945d-conf.d,
+  +files/ipw3945d-init.d, +ipw3945d-1.7.22-r2.ebuild:
+  Adding an updated ebuild, working some obscure bugs (SpankY's braindead
+  daemon #140067; ipw3945d causing an oops on shutdown #143887).
 
 *ipw3945d-1.7.22-r1 (02 Aug 2006)
 
diff --git a/net-wireless/ipw3945d/Manifest b/net-wireless/ipw3945d/Manifest
index d519a00d6b15..29c99936e485 100644
--- a/net-wireless/ipw3945d/Manifest
+++ b/net-wireless/ipw3945d/Manifest
@@ -5,6 +5,14 @@ AUX ipw3945d-1.7.18-modprobe.conf 171 RMD160 77fb16f6a032de201dbcc05df60ed1d4402
 MD5 d7554e7f05ae1b034ce6b9629e8f40c8 files/ipw3945d-1.7.18-modprobe.conf 171
 RMD160 77fb16f6a032de201dbcc05df60ed1d44025cc94 files/ipw3945d-1.7.18-modprobe.conf 171
 SHA256 f7a0c626a87f2a568dd218db1e8e9d821ba81d2969a7de457bf825a72bdf8c00 files/ipw3945d-1.7.18-modprobe.conf 171
+AUX ipw3945d-conf.d 174 RMD160 51a5c4cd892da514c00f80b952936bec90cbdb9b SHA1 d4adcbbb28188f932cd4627c0cba6e4bc49ee2b5 SHA256 d7c4588328f22779016823724b3157f603f9747c9b4d77a1f15e83cabd1a7091
+MD5 97d349b235ca84011032f501cfd65a92 files/ipw3945d-conf.d 174
+RMD160 51a5c4cd892da514c00f80b952936bec90cbdb9b files/ipw3945d-conf.d 174
+SHA256 d7c4588328f22779016823724b3157f603f9747c9b4d77a1f15e83cabd1a7091 files/ipw3945d-conf.d 174
+AUX ipw3945d-init.d 617 RMD160 c3313dd62fc26a94a29a959eb586c9b7fb5ec173 SHA1 8800a1870d8b777406abcf0a07b38df91775f798 SHA256 c127e88f2c3b84f4c0ee8964b84cdf84a03a241220a8b67651966f185ab46f55
+MD5 145399beb5c986aa4ec375925136d5b4 files/ipw3945d-init.d 617
+RMD160 c3313dd62fc26a94a29a959eb586c9b7fb5ec173 files/ipw3945d-init.d 617
+SHA256 c127e88f2c3b84f4c0ee8964b84cdf84a03a241220a8b67651966f185ab46f55 files/ipw3945d-init.d 617
 DIST ipw3945d-1.7.18.tgz 57929 RMD160 3d4d4830c78b4124631d5d4cc9e91417630df810 SHA1 838418cffa6706a214d16e43ab3595e193fbbe6a SHA256 aa43ee86df58350a7c864ecba59d7c5e888058311fb782e325e783901955b83d
 DIST ipw3945d-1.7.22.tgz 59936 RMD160 26c1e602f7f33f8eb8856256a35c59db308c8f17 SHA1 6e97908ea12e41bc97a2b715e9dc887e894df9a6 SHA256 d2cb513b8cedc1515a9c5a4a367aa7869bf2cc644019ebe0737cb13384ef9397
 EBUILD ipw3945d-1.7.18.ebuild 944 RMD160 1c045ed1e26007dfb26156593ce79a934ba0da61 SHA1 e8a830525df410088877c26632093f0676f49df5 SHA256 4bfc0eed9604fcbe7c9488fbadb16c57df582747e86aab135995c9b05712e6cf
@@ -15,10 +23,14 @@ EBUILD ipw3945d-1.7.22-r1.ebuild 958 RMD160 e6ba0abf029d0afc35f5d83d1b7f92828911
 MD5 e12ae7da7cff04f09b72f62d4b5ab02f ipw3945d-1.7.22-r1.ebuild 958
 RMD160 e6ba0abf029d0afc35f5d83d1b7f92828911f4d8 ipw3945d-1.7.22-r1.ebuild 958
 SHA256 ef6d45b51d71dfe484672bfe1008f6394553e107c0d22149ff9b1b1b83f9a9b3 ipw3945d-1.7.22-r1.ebuild 958
-MISC ChangeLog 1017 RMD160 cce1361dcb12c37f004b597d20cea4aee29e6f6f SHA1 21d119110ef241a79df185870ff2c5e0e1601a1c SHA256 77a3928543ad4542ad96c41b0b40a3508d44b1c0342f22bf91613e53c376dc6f
-MD5 9b9e4dc5a91fa69b4ae00234d4fb3c04 ChangeLog 1017
-RMD160 cce1361dcb12c37f004b597d20cea4aee29e6f6f ChangeLog 1017
-SHA256 77a3928543ad4542ad96c41b0b40a3508d44b1c0342f22bf91613e53c376dc6f ChangeLog 1017
+EBUILD ipw3945d-1.7.22-r2.ebuild 1361 RMD160 595962e25fba353c77a6cc0d00052f4011607da8 SHA1 d0ae43018e89eacba9612f31a5e9f0d764bdb81b SHA256 da7ac81121dfd36dc6fc2ee2ea56e83624f387fe725bbeb15047b55e4e29c3e9
+MD5 861ebb070b8b8d343ba696e827cce8bc ipw3945d-1.7.22-r2.ebuild 1361
+RMD160 595962e25fba353c77a6cc0d00052f4011607da8 ipw3945d-1.7.22-r2.ebuild 1361
+SHA256 da7ac81121dfd36dc6fc2ee2ea56e83624f387fe725bbeb15047b55e4e29c3e9 ipw3945d-1.7.22-r2.ebuild 1361
+MISC ChangeLog 1320 RMD160 1afd5f5ff90ea2e3056494a9d1d689b9355b5e4b SHA1 82dcc7d374c37531719b006e232bb7f89a533fda SHA256 89d3f1cc9f81a75ec405e21f258c948180d0ff9456e5fc85cb2b35cbe75e66e1
+MD5 3167e897e1ca487b06f5afae946866ff ChangeLog 1320
+RMD160 1afd5f5ff90ea2e3056494a9d1d689b9355b5e4b ChangeLog 1320
+SHA256 89d3f1cc9f81a75ec405e21f258c948180d0ff9456e5fc85cb2b35cbe75e66e1 ChangeLog 1320
 MISC metadata.xml 254 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f SHA1 653c702fdb89577e9d15e9cbca3891e4acdba061 SHA256 9bffc4ff1cf574848699e33b09ff0f6137d6b64b69d82c7b95cafb32ee75becb
 MD5 f3e68295a919220f58e91a1d3468c851 metadata.xml 254
 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f metadata.xml 254
@@ -29,10 +41,13 @@ SHA256 cf1c91d1007504f5268819d03437d98f6e69074774c103ecb21499679545ea28 files/di
 MD5 ae33038ba8fb0fa9459840b6c2297bdf files/digest-ipw3945d-1.7.22-r1 235
 RMD160 aaa0b90f60b64d0cd78e90c766ffbfb34deae0c8 files/digest-ipw3945d-1.7.22-r1 235
 SHA256 30e8b00331f05d9b8ac248847e70de1a7af8a1ea520bb1fea3faf301607f0345 files/digest-ipw3945d-1.7.22-r1 235
+MD5 ae33038ba8fb0fa9459840b6c2297bdf files/digest-ipw3945d-1.7.22-r2 235
+RMD160 aaa0b90f60b64d0cd78e90c766ffbfb34deae0c8 files/digest-ipw3945d-1.7.22-r2 235
+SHA256 30e8b00331f05d9b8ac248847e70de1a7af8a1ea520bb1fea3faf301607f0345 files/digest-ipw3945d-1.7.22-r2 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE0JejyuNVb5qfaOYRAmLfAJ9arSDyw29nYXCf4FJOz1YVgSDp9ACdGskU
-EWqVyoLQPT/AUI23Iu4uI+Y=
-=HpDO
+iD8DBQFE/dIfyuNVb5qfaOYRAkP0AKCNtt5nuw6OMW6HUqExbyomgM1IgACfe76G
+vUJjbWHw34O6vXDKDjp5rF0=
+=XXCl
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/ipw3945d/files/digest-ipw3945d-1.7.22-r2 b/net-wireless/ipw3945d/files/digest-ipw3945d-1.7.22-r2
new file mode 100644
index 000000000000..92883c1f4f53
--- /dev/null
+++ b/net-wireless/ipw3945d/files/digest-ipw3945d-1.7.22-r2
@@ -0,0 +1,3 @@
+MD5 a8404cb63de7493d1405d5132ea02823 ipw3945d-1.7.22.tgz 59936
+RMD160 26c1e602f7f33f8eb8856256a35c59db308c8f17 ipw3945d-1.7.22.tgz 59936
+SHA256 d2cb513b8cedc1515a9c5a4a367aa7869bf2cc644019ebe0737cb13384ef9397 ipw3945d-1.7.22.tgz 59936
diff --git a/net-wireless/ipw3945d/files/ipw3945d-conf.d b/net-wireless/ipw3945d/files/ipw3945d-conf.d
new file mode 100644
index 000000000000..03cb1fcc79ce
--- /dev/null
+++ b/net-wireless/ipw3945d/files/ipw3945d-conf.d
@@ -0,0 +1,5 @@
+# /etc/conf.d/ipw3945d: config file for /etc/init.d/ipw3945d
+
+# Arguments to be passed to ipw3945d. See 'ipw3945d --help' for more
+# information.
+ARGS="--timeout=-1 --quiet"
diff --git a/net-wireless/ipw3945d/files/ipw3945d-init.d b/net-wireless/ipw3945d/files/ipw3945d-init.d
new file mode 100644
index 000000000000..a57583683fa5
--- /dev/null
+++ b/net-wireless/ipw3945d/files/ipw3945d-init.d
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945d/files/ipw3945d-init.d,v 1.1 2006/09/05 19:37:59 phreak Exp $
+
+PIDFILE=/var/run/ipw3945d/ipw3945d.pid
+
+depend() {
+	before net
+}
+
+start() {
+	ebegin "Starting ipw3945d"
+	start-stop-daemon --start --exec /sbin/ipw3945d --chuid ipw3945d:ipw3945d \
+		--pidfile ${PIDFILE} -- \
+		--pid-file=${PIDFILE} ${ARGS}
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping ipw3945d"
+	start-stop-daemon --stop --exec /sbin/ipw3945 --pidfile ${PIDFILE}
+	eend ${?}
+}
diff --git a/net-wireless/ipw3945d/ipw3945d-1.7.22-r2.ebuild b/net-wireless/ipw3945d/ipw3945d-1.7.22-r2.ebuild
new file mode 100644
index 000000000000..0ce2c3480708
--- /dev/null
+++ b/net-wireless/ipw3945d/ipw3945d-1.7.22-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945d/ipw3945d-1.7.22-r2.ebuild,v 1.1 2006/09/05 19:37:59 phreak Exp $
+
+inherit eutils
+
+DESCRIPTION="Regulatory daemon for the Intel PRO/Wireless 3945ABG miniPCI express adapter"
+HOMEPAGE="http://www.bughost.org/ipw3945/"
+SRC_URI="http://www.bughost.org/ipw3945/daemon/${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE=""
+DEPEND=""
+
+pkg_setup() {
+	enewgroup ipw3945d
+	enewuser ipw3945d -1 -1 -1 ipw3945d
+}
+
+src_install() {
+	into /
+	use x86 && dosbin x86/ipw3945d
+	use amd64 && dosbin x86_64/ipw3945d
+
+	keepdir /var/run/${PN}
+	fowners ipw3945d:ipw3945d /var/run/${PN}
+
+	newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
+	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
+
+	dodoc README.${PN}
+}
+
+pkg_postinst() {
+	einfo
+	einfo "The ipw3945d is now started using an init script. To automatically have"
+	einfo "it started, you need to add it to the boot run level as shown below:"
+	einfo
+	einfo "  # rc-update add ${PN} default"
+	einfo
+
+	if [[ -e "${ROOT}"/etc/modules.d/ipw3945d ]]; then
+		ewarn
+		ewarn "You need to manually delete the now obsolete modprobe entry and run"
+		ewarn "modules-update as shown below:"
+		ewarn
+		ewarn "  # rm -f ${ROOT}/etc/modules.d/ipw3945d; modules-update --force"
+		ewarn
+	fi
+}