Fixed enewuser and enewgroup calls, to address bug #142752

Package-Manager: portage-2.1.1_pre4-r2

diff --git a/dev-db/c-jdbc/ChangeLog b/dev-db/c-jdbc/ChangeLog
index b57925815e42c71da35c89b06779c4082dd87d71..0de8cd9bfa0bbeef41bb3925bc7da7868ec47c7c 100644 (file)
--- a/dev-db/c-jdbc/ChangeLog
+++ b/dev-db/c-jdbc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/c-jdbc
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/c-jdbc/ChangeLog,v 1.8 2006/04/27 14:51:57 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/c-jdbc/ChangeLog,v 1.9 2006/08/06 04:22:48 nichoj Exp $
+
+  06 Aug 2006; Joshua Nichols <nichoj@gentoo.org> c-jdbc-1.0.4-r1.ebuild:
+  Fixed enewuser and enewgroup calls, to address bug #142752
 
   27 Apr 2006; Marien Zwart <marienz@gentoo.org>
   files/digest-c-jdbc-1.0.4-r1, Manifest:

diff --git a/dev-db/c-jdbc/Manifest b/dev-db/c-jdbc/Manifest
index 57c8a18deff0281658c3925372b4e2f43ada2014..7cd636f9f4362b5e1e71dc3bd13de507c610c5ba 100644 (file)
--- a/dev-db/c-jdbc/Manifest
+++ b/dev-db/c-jdbc/Manifest
@@ -1,46 +1,36 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX c-jdbc-1.0.4-gentoo.patch 5047 RMD160 fdb19ac9f02c7a7f72d6bb89ddf22c59c88e328c SHA1 407f020f1a4a7c069e814e25e279c90416b19c39 SHA256 4db6305149430630f189ea64877e126133dac2512cc19f1250f77cf892c97ecd size 5047
+AUX c-jdbc-1.0.4-gentoo.patch 5047 RMD160 fdb19ac9f02c7a7f72d6bb89ddf22c59c88e328c SHA1 407f020f1a4a7c069e814e25e279c90416b19c39 SHA256 4db6305149430630f189ea64877e126133dac2512cc19f1250f77cf892c97ecd
 MD5 6f7e7b9ace7df13d6bab70f487a31189 files/c-jdbc-1.0.4-gentoo.patch 5047
 RMD160 fdb19ac9f02c7a7f72d6bb89ddf22c59c88e328c files/c-jdbc-1.0.4-gentoo.patch 5047
 SHA256 4db6305149430630f189ea64877e126133dac2512cc19f1250f77cf892c97ecd files/c-jdbc-1.0.4-gentoo.patch 5047
-AUX cjdbc-conf 313 RMD160 f38d89fb3e5090cf18a5a544d6aa46cac5c73822 SHA1 41ff836806f597a2276890f42b776fc8705e2be2 SHA256 b55516531e7bac03c002a29b73766bca2c7c232449c377030281e444cce10448 size 313
+AUX cjdbc-conf 313 RMD160 f38d89fb3e5090cf18a5a544d6aa46cac5c73822 SHA1 41ff836806f597a2276890f42b776fc8705e2be2 SHA256 b55516531e7bac03c002a29b73766bca2c7c232449c377030281e444cce10448
 MD5 c366d1203f27f5438c29bc3a5724ab73 files/cjdbc-conf 313
 RMD160 f38d89fb3e5090cf18a5a544d6aa46cac5c73822 files/cjdbc-conf 313
 SHA256 b55516531e7bac03c002a29b73766bca2c7c232449c377030281e444cce10448 files/cjdbc-conf 313
-AUX cjdbc-init 926 RMD160 163c6906fa22c6e49a8df62e3fbadd34c1121b8f SHA1 096f765833d8cb25ddc2534f96a7f4ed8c9c21f0 SHA256 eb11bd0f0bd66d0bffe2c5ed6daf5550676afcee9d9386e6d792bc32dbabbc8e size 926
+AUX cjdbc-init 926 RMD160 163c6906fa22c6e49a8df62e3fbadd34c1121b8f SHA1 096f765833d8cb25ddc2534f96a7f4ed8c9c21f0 SHA256 eb11bd0f0bd66d0bffe2c5ed6daf5550676afcee9d9386e6d792bc32dbabbc8e
 MD5 9c7589e63d5760dde9a3d56fdc58e6a7 files/cjdbc-init 926
 RMD160 163c6906fa22c6e49a8df62e3fbadd34c1121b8f files/cjdbc-init 926
 SHA256 eb11bd0f0bd66d0bffe2c5ed6daf5550676afcee9d9386e6d792bc32dbabbc8e files/cjdbc-init 926
-AUX console.sh 606 RMD160 5a5d1d144b02e6c7d5359c1b1f466a2abb7a930e SHA1 184b73b964c56880669313a806832818786e52d0 SHA256 e90bce6b102d9ee3658b6ac261720f0b0468524e95b4773c503defe358d04cc9 size 606
+AUX console.sh 606 RMD160 5a5d1d144b02e6c7d5359c1b1f466a2abb7a930e SHA1 184b73b964c56880669313a806832818786e52d0 SHA256 e90bce6b102d9ee3658b6ac261720f0b0468524e95b4773c503defe358d04cc9
 MD5 62ac24f25532a4183e3ed1e1480878e7 files/console.sh 606
 RMD160 5a5d1d144b02e6c7d5359c1b1f466a2abb7a930e files/console.sh 606
 SHA256 e90bce6b102d9ee3658b6ac261720f0b0468524e95b4773c503defe358d04cc9 files/console.sh 606
-AUX controller.sh 1133 RMD160 78ff8d62deabc03364fcf9ec04175da12cb2498f SHA1 56c869619b5f337b5cf4ec234871a199a5b5dee4 SHA256 562e5737d55a9a059cfd54855ac2a35e0c8481847164cdd53c88bced6327ded5 size 1133
+AUX controller.sh 1133 RMD160 78ff8d62deabc03364fcf9ec04175da12cb2498f SHA1 56c869619b5f337b5cf4ec234871a199a5b5dee4 SHA256 562e5737d55a9a059cfd54855ac2a35e0c8481847164cdd53c88bced6327ded5
 MD5 d1171c36b6ee239f4db6aeaa9ad7519a files/controller.sh 1133
 RMD160 78ff8d62deabc03364fcf9ec04175da12cb2498f files/controller.sh 1133
 SHA256 562e5737d55a9a059cfd54855ac2a35e0c8481847164cdd53c88bced6327ded5 files/controller.sh 1133
-DIST c-jdbc-1.0.4-src.tar.gz 29619297 RMD160 9e50d4d5a44f39547d9790a590d118b7bbbb17fe SHA256 8a6f7a990a65b2e6a7e8b40c50589fd50e603886887c9ca719ae68bc7a31070e size 29619297
-EBUILD c-jdbc-1.0.4-r1.ebuild 3740 RMD160 ddd9f4eec7032544413f86879c49a40fb0bf0524 SHA1 8dae02a36bdccdac07a1f456b93adfafedb9a72f SHA256 8bc38e62db8d7c42caef684bf8ae307495b149d5e86d8c128380904ac6a10431 size 3740
-MD5 248f2e99d81251928963b18fe63f9070 c-jdbc-1.0.4-r1.ebuild 3740
-RMD160 ddd9f4eec7032544413f86879c49a40fb0bf0524 c-jdbc-1.0.4-r1.ebuild 3740
-SHA256 8bc38e62db8d7c42caef684bf8ae307495b149d5e86d8c128380904ac6a10431 c-jdbc-1.0.4-r1.ebuild 3740
-MISC ChangeLog 1545 RMD160 85c1d356aaa2cc31e625c12fef7c03aa726c8591 SHA1 43b3c1de2aa9290b2009bdc17ca26d0db6873492 SHA256 75f5bb5cd2678cd22df138e134900da772cd093ab4358fc4f0c78251accda2aa size 1545
-MD5 a1a0bf21422cf9c66c024f780107cb9c ChangeLog 1545
-RMD160 85c1d356aaa2cc31e625c12fef7c03aa726c8591 ChangeLog 1545
-SHA256 75f5bb5cd2678cd22df138e134900da772cd093ab4358fc4f0c78251accda2aa ChangeLog 1545
-MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb size 158
+DIST c-jdbc-1.0.4-src.tar.gz 29619297 RMD160 9e50d4d5a44f39547d9790a590d118b7bbbb17fe SHA1 f18ab29272cc2b9ab0ab577c37a84ce20ec4daa7 SHA256 8a6f7a990a65b2e6a7e8b40c50589fd50e603886887c9ca719ae68bc7a31070e
+EBUILD c-jdbc-1.0.4-r1.ebuild 3669 RMD160 2074511d12371cd6cd05ccf3705a548e2ee52477 SHA1 6bb7af894fe7631cf4c6f0aa93dd59665e4b91c2 SHA256 3cedf990e04a1d94d97c19086a98ba8a251e9ab230a5855421d7691240bd71c8
+MD5 3f78001d9e4d0606d6d8cf079ad03f11 c-jdbc-1.0.4-r1.ebuild 3669
+RMD160 2074511d12371cd6cd05ccf3705a548e2ee52477 c-jdbc-1.0.4-r1.ebuild 3669
+SHA256 3cedf990e04a1d94d97c19086a98ba8a251e9ab230a5855421d7691240bd71c8 c-jdbc-1.0.4-r1.ebuild 3669
+MISC ChangeLog 1680 RMD160 14d5d552cbcd4673407ea0e84a23da8b82cf19fa SHA1 46fdb31d021a6347195140dd92bf9846b50f7b23 SHA256 748cc0319f41c13489ad58a3cffa82818eb89926153408965ccb2a5c529b8d77
+MD5 1faad21fa7351a9ec22a019c83fe1cb4 ChangeLog 1680
+RMD160 14d5d552cbcd4673407ea0e84a23da8b82cf19fa ChangeLog 1680
+SHA256 748cc0319f41c13489ad58a3cffa82818eb89926153408965ccb2a5c529b8d77 ChangeLog 1680
+MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata.xml 158
 MD5 9d0dc73314f17ac91963c36e6b458447 files/digest-c-jdbc-1.0.4-r1 256
 RMD160 0d6fed62771e52ce60f08675ab6ec72640dc8674 files/digest-c-jdbc-1.0.4-r1 256
 SHA256 889efbccb9a553331b79b4682682499ece17c8e9fcc05ce699e5d5fb6237def5 files/digest-c-jdbc-1.0.4-r1 256
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEUNqVW78445TWHXcRAoHhAJ4vH+DhYvKcR/1iPJfDHJ1Jr9YCgACghQ13
-W1+vbcHtr6HIKR6cmKxfGV4=
-=HdnA
------END PGP SIGNATURE-----

diff --git a/dev-db/c-jdbc/c-jdbc-1.0.4-r1.ebuild b/dev-db/c-jdbc/c-jdbc-1.0.4-r1.ebuild
index a68ec2a41e5aba3ae18277d8e015efd65785b074..89812431e14863d6a4f863c18fb56a47b1804023 100644 (file)
--- a/dev-db/c-jdbc/c-jdbc-1.0.4-r1.ebuild
+++ b/dev-db/c-jdbc/c-jdbc-1.0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/c-jdbc/c-jdbc-1.0.4-r1.ebuild,v 1.9 2006/03/11 17:56:34 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/c-jdbc/c-jdbc-1.0.4-r1.ebuild,v 1.10 2006/08/06 04:22:48 nichoj Exp $
 
 inherit java-pkg eutils
 
@@ -38,9 +38,8 @@ S=${WORKDIR}/${P}-src
 
 pkg_setup() {
        # add a user for cjdbc
-       if ! enewgroup cjdbc || ! enewuser cjdbc -1 /bin/sh /dev/null cjdbc; then
-               die "Unable to add cjdbc user and cjdbc group."
-       fi
+       enewgroup cjdbc 
+       enewuser cjdbc -1 /bin/sh /dev/null cjdbc
 }
 
 src_unpack() {