Fixed compilation of version 0.0.4 with recent kernels.

Some minor QA fixing.
Closes bug #237251.
Package-Manager: portage-2.1.4.4

5 files changed, 45 insertions, 24 deletions

diff --git a/net-misc/ksb26/ChangeLog b/net-misc/ksb26/ChangeLog
index 6f4363ac5356..04fc3d7c1219 100644
--- a/net-misc/ksb26/ChangeLog
+++ b/net-misc/ksb26/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/ksb26
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ksb26/ChangeLog,v 1.7 2007/02/22 02:29:43 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ksb26/ChangeLog,v 1.8 2008/09/15 07:30:28 s4t4n Exp $
+
+  15 Sep 2008; Michele Noberasco <s4t4n@gentoo.org> ksb26-0.0.4.ebuild:
+  Added patch to fix compilation with recent kernels. Closes bug #237251.
+  ksb26-0.0.4.ebuild, ksb26-0.0.3.ebuild:
+  Fixed minor QA issues.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/net-misc/ksb26/Manifest b/net-misc/ksb26/Manifest
index 733d26787210..8a7c3ebf0e82 100644
--- a/net-misc/ksb26/Manifest
+++ b/net-misc/ksb26/Manifest
@@ -1,7 +1,8 @@
+AUX ksb26-0.0.4_unreg_chrdev.patch 495 RMD160 041a3fd5f587e59624a802dd7d7db9ddeaa27873 SHA1 dd27f550ec8ade931f4357ea1774c39bfb6bc761 SHA256 ad3b35aae57f42c7f8b3fbcf554f581f4aa702915d58d810ffc70af46698a6f0
 AUX ksb26-kernel-Makefile 370 RMD160 fef524e212c6da7055b481ea652d4e1d621ddb11 SHA1 2fdfc126651387fff64aef8ab6ca3c572734070c SHA256 27edb2b69a7ae8656ceaed62af841a6721d5b6081346f462df2395fccc3c91a5
 DIST ksb26-0.0.3.tar.gz 19337 RMD160 054db4f4946340f87ff938fdb27e3ed3f74ae892 SHA1 ca34b7c08230c5b291731780551330f36c32d904 SHA256 389c5e1eec4a32b5b331acc8a04aa0676e6300e67ab7021317b001c186922ffa
 DIST ksb26-0.0.4.tar.gz 19848 RMD160 d66afad81fa1f676e967cede23f54255287c5c51 SHA1 e23c23687cdc464df21cc0954f3d2c606fbecd3f SHA256 42b7f48316b72c114b7dbce31ed1c90157f298a55fb547330e99111206845257
-EBUILD ksb26-0.0.3.ebuild 1511 RMD160 e92f8d6442d70c87350964d9b8d5223e038b9d89 SHA1 2841e5bcdc40d4b31ee0e35297c3964a5b518959 SHA256 206a9e7b61eabe5c9d605372d97b5bc31660536a81b5f8fa21bfd08fa1db66c5
-EBUILD ksb26-0.0.4.ebuild 1512 RMD160 17b429c5d09751f327e5012bc6e67987ffef9322 SHA1 961a1af1d4413a17c7e7b7aa730ad2e9b790180f SHA256 8e35d83db9371dac8bb5702a64137464818a230c813088c5a4411778a874f3e6
-MISC ChangeLog 1031 RMD160 4dd2c8e6709fcfdf603bd105645df53abdb7896e SHA1 3fe91f57a65ed8ac3b70d4d9fbc9bacd7f2b4b38 SHA256 288b7a5d49454060cefa749ea4a3764c042b1c910428aea6aac609da776d3cdd
+EBUILD ksb26-0.0.3.ebuild 1527 RMD160 7f2d5559b33871ec429171817348e08155b11b51 SHA1 22b937b3f1c8d5644cb5af53a4ac60ab1cf0e676 SHA256 9a59ff8a34fd2fda24c62394e83190b0cfcd0ed18f1fbea3ee50cec66783d371
+EBUILD ksb26-0.0.4.ebuild 1645 RMD160 6aef484046cc6fee3dcb3e426d67596f5f2db2e9 SHA1 5bb4a6b1808c745cc3c049e9361bd69b0a81e024 SHA256 96f3cd797ed1d2e5a0fb1141167a9bd279df2a1db85c3f330dd27feb3e564ae0
+MISC ChangeLog 1245 RMD160 33f0ab79995bfd197a12b67a662ecd49ad39fa67 SHA1 347a6193d30034585a3671aa4c73f24e666fd5ea SHA256 a0857435118c896f6f488987f31bccf31a534883742455edb7ea03fc418e1a6c
 MISC metadata.xml 1220 RMD160 3a54731c37cdc439e140a331910cacf22fb64348 SHA1 3f46848682f332d28a483ba9fbdec4694e337474 SHA256 07804d76c63629fd05f61aa2b9df39a8cec62c8439ea86a71cf4fe04f9f139a1
diff --git a/net-misc/ksb26/files/ksb26-0.0.4_unreg_chrdev.patch b/net-misc/ksb26/files/ksb26-0.0.4_unreg_chrdev.patch
new file mode 100644
index 000000000000..9c2f6bfe0fd0
--- /dev/null
+++ b/net-misc/ksb26/files/ksb26-0.0.4_unreg_chrdev.patch
@@ -0,0 +1,12 @@
+--- a/kernel/ksb26.c	2005-09-27 11:58:19.000000000 -0500
++++ ksb26/kernel/ksb26.c	2008-09-09 21:25:08.000000000 -0500
+@@ -121,8 +121,7 @@
+ 
+ static void __exit modcleanup(void)
+ {
+-	if(unregister_chrdev(ksb26_major, KSB26_DEV_NAME) < 0)
+-		printk("[%s] Cannot unregister device %s.\n", MODNAME, KSB26_DEV_NAME);
++	unregister_chrdev(ksb26_major, KSB26_DEV_NAME);
+ 	if(unpatch_unix_stream_connect() == -1) {
+ 		printk("[%s] Warning: failed to unpatch unix_stream_connect.\n", MODNAME);
+ 		return;
diff --git a/net-misc/ksb26/ksb26-0.0.3.ebuild b/net-misc/ksb26/ksb26-0.0.3.ebuild
index 73a5793959cb..0d45c72c2933 100644
--- a/net-misc/ksb26/ksb26-0.0.3.ebuild
+++ b/net-misc/ksb26/ksb26-0.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ksb26/ksb26-0.0.3.ebuild,v 1.2 2005/12/20 10:56:52 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ksb26/ksb26-0.0.3.ebuild,v 1.3 2008/09/15 07:30:28 s4t4n Exp $
 
 inherit linux-mod
 
@@ -31,8 +31,8 @@ src_unpack()
 {
 	unpack ${A}
 
-	cd ${S}
-	cp ${FILESDIR}/${PN}-kernel-Makefile kernel/Makefile
+	cd "${S}"
+	cp "${FILESDIR}/${PN}-kernel-Makefile" kernel/Makefile
 	sed -i -e "s:@gcc:\${CC} \${CFLAGS}:" user/Makefile
 }
 
@@ -41,7 +41,7 @@ src_compile()
 	linux-mod_src_compile || die "Kernel module compilation failed!"
 
 	einfo "Preparing userspace tools"
-	cd ${S}/user
+	cd "${S}/user"
 	emake || die "Userspace tools compilation failed!"
 }
 
@@ -49,7 +49,7 @@ src_install()
 {
 	linux-mod_src_install
 
-	cd ${S}
+	cd "${S}"
 	dobin user/ksb26manager
 
 	dodir /etc/ksb26
@@ -64,8 +64,8 @@ pkg_postinst()
 {
 	linux-mod_pkg_postinst
 
-	if [ ! -e ${ROOT}/dev/ksb26 ]; then
-		mknod ${ROOT}/dev/ksb26 c 254 0
+	if [ ! -e "${ROOT}/dev/ksb26" ]; then
+		mknod "${ROOT}/dev/ksb26" c 254 0
 	fi
 
 	einfo "Read man page (man ksb26) for informations about the use of ksb26"
@@ -74,7 +74,7 @@ pkg_postinst()
 
 pkg_postrm()
 {
-	if [ -e ${ROOT}/dev/ksb26 ]; then
-		rm ${ROOT}/dev/ksb26
+	if [ -e "${ROOT}/dev/ksb26" ]; then
+		rm "${ROOT}/dev/ksb26"
 	fi
 }
diff --git a/net-misc/ksb26/ksb26-0.0.4.ebuild b/net-misc/ksb26/ksb26-0.0.4.ebuild
index 69eadc99cd59..16f60236621e 100644
--- a/net-misc/ksb26/ksb26-0.0.4.ebuild
+++ b/net-misc/ksb26/ksb26-0.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ksb26/ksb26-0.0.4.ebuild,v 1.1 2006/01/30 11:17:50 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ksb26/ksb26-0.0.4.ebuild,v 1.2 2008/09/15 07:30:28 s4t4n Exp $
 
 inherit linux-mod
 
@@ -31,9 +31,12 @@ src_unpack()
 {
 	unpack ${A}
 
-	cd ${S}
-	cp ${FILESDIR}/${PN}-kernel-Makefile kernel/Makefile
+	cd "${S}"
+	cp "${FILESDIR}/${PN}-kernel-Makefile" kernel/Makefile
 	sed -i -e "s:@gcc:\${CC} \${CFLAGS}:" user/Makefile
+
+	#patch to fix compilation with recent kernels
+	epatch "${FILESDIR}/${P}_unreg_chrdev.patch" || die "epatch failed"
 }
 
 src_compile()
@@ -41,7 +44,7 @@ src_compile()
 	linux-mod_src_compile || die "Kernel module compilation failed!"
 
 	einfo "Preparing userspace tools"
-	cd ${S}/user
+	cd "${S}/user"
 	emake || die "Userspace tools compilation failed!"
 }
 
@@ -49,7 +52,7 @@ src_install()
 {
 	linux-mod_src_install
 
-	cd ${S}
+	cd "${S}"
 	dobin user/ksb26manager
 
 	dodir /etc/ksb26
@@ -64,8 +67,8 @@ pkg_postinst()
 {
 	linux-mod_pkg_postinst
 
-	if [ ! -e ${ROOT}/dev/ksb26 ]; then
-		mknod ${ROOT}/dev/ksb26 c 254 0
+	if [ ! -e "${ROOT}/dev/ksb26" ]; then
+		mknod "${ROOT}/dev/ksb26" c 254 0
 	fi
 
 	einfo "Read man page (man ksb26) for informations about the use of ksb26"
@@ -74,7 +77,7 @@ pkg_postinst()
 
 pkg_postrm()
 {
-	if [ -e ${ROOT}/dev/ksb26 ]; then
-		rm ${ROOT}/dev/ksb26
+	if [ -e "${ROOT}/dev/ksb26" ]; then
+		rm "${ROOT}/dev/ksb26"
 	fi
 }