Patch to fix bug #149763.

Package-Manager: portage-2.1.2_pre2

5 files changed, 48 insertions, 27 deletions

diff --git a/sys-freebsd/freebsd-usbin/ChangeLog b/sys-freebsd/freebsd-usbin/ChangeLog
index 9744da8cf8de..1323a67bd710 100644
--- a/sys-freebsd/freebsd-usbin/ChangeLog
+++ b/sys-freebsd/freebsd-usbin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-freebsd/freebsd-usbin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.17 2006/09/22 07:20:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.18 2006/10/01 20:14:01 the_paya Exp $
+
+  01 Oct 2006; Javier Villavicencio <the_paya@gentoo.org>
+  +files/freebsd-usbin-adduser.patch, freebsd-usbin-6.1-r1.ebuild,
+  freebsd-usbin-6.2_beta1.ebuild:
+  Added patch to fix adduser paths, by Chris White in bug #149763.
 
   22 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
   freebsd-usbin-6.2_beta1.ebuild:
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index 6340fb315012..e18255ef8b94 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX SA-06-15-ypserv.patch 1932 RMD160 ac1091c913eec8ae1f0c0c479346caf718f0c87a SHA1 337bb241dfa1178c3ce5bb4ec83b1505dc35dc41 SHA256 e56e30d3eb2a23d4a659d5f3effe907b6b00844fab719d3ca3465ae122c703d9
 MD5 7d750e2e1b9f098a196e03c727775fa2 files/SA-06-15-ypserv.patch 1932
 RMD160 ac1091c913eec8ae1f0c0c479346caf718f0c87a files/SA-06-15-ypserv.patch 1932
@@ -17,6 +14,10 @@ AUX freebsd-usbin-6.1-nowrap.patch 1256 RMD160 2356f3fc63a6d27b399e7ec7f2d8637fa
 MD5 13ff92c94bd109435bff0855224d1116 files/freebsd-usbin-6.1-nowrap.patch 1256
 RMD160 2356f3fc63a6d27b399e7ec7f2d8637fa519712d files/freebsd-usbin-6.1-nowrap.patch 1256
 SHA256 e1413acbf003be3fa3a73f8fa0bdf79caa99885192622c79b034345d600b92f8 files/freebsd-usbin-6.1-nowrap.patch 1256
+AUX freebsd-usbin-adduser.patch 428 RMD160 fecedb0bad9f29e9f0d889b2fce0edeb9a954d0b SHA1 3407974fcd42701d1587684f14547b5e02b6b342 SHA256 2e91737ffefd3b7ce3b55da4ce98eb0425961bba2d4a7c4e7c7ffabc1d38f2af
+MD5 5444cbe3e2bc667285b7a68c02785017 files/freebsd-usbin-adduser.patch 428
+RMD160 fecedb0bad9f29e9f0d889b2fce0edeb9a954d0b files/freebsd-usbin-adduser.patch 428
+SHA256 2e91737ffefd3b7ce3b55da4ce98eb0425961bba2d4a7c4e7c7ffabc1d38f2af files/freebsd-usbin-adduser.patch 428
 AUX freebsd-usbin-nowrap.patch 1229 RMD160 2931c7cc81e6dcffdbdd9ea98ff5ae31654070cf SHA1 5b9cb96adcddd1216c6842f1d1f9311f637e4d49 SHA256 4ae0724d5e642e0399188b6805e94495af360ccf4f99443f9bfa80c220d29a8b
 MD5 39d0d0915156088d99b1524fc39e8ebd files/freebsd-usbin-nowrap.patch 1229
 RMD160 2931c7cc81e6dcffdbdd9ea98ff5ae31654070cf files/freebsd-usbin-nowrap.patch 1229
@@ -83,18 +84,18 @@ DIST freebsd-ubin-6.1.tar.bz2 1763218 RMD160 5da58c546cebf30a6b661841dbcb5b53626
 DIST freebsd-ubin-6.2_beta1.tar.bz2 1771844 RMD160 0bedcb1038ac157a2c3eee59db38f75d310bbfa1 SHA1 4a3ef8eb543635b2f88ce9f3fe49ec02e5e62e6a SHA256 b82e2b310001ccb335f26c19bf74431691ace27320fe4d1a49d0b4c86ba419cd
 DIST freebsd-usbin-6.1.tar.bz2 2664570 RMD160 98a87538790a814d0afd35bb0f848bcff574c72d SHA1 c7e6856e7f6bd2d45790737f411348b301944b91 SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e
 DIST freebsd-usbin-6.2_beta1.tar.bz2 2694381 RMD160 360aa0fb7010a337e655ca003599f18b37232f76 SHA1 4ee2bcfb04ad1ed80186b33ed85d6086b34959e9 SHA256 315e58a3d65dc4078845747e97f5e31b3245e3a8795d74a715d81afbadaf08fc
-EBUILD freebsd-usbin-6.1-r1.ebuild 4558 RMD160 677988721f65f8f9ae6e163b7bc6570fd5ee45c3 SHA1 6194bf335505b119d7d08df512916c88c9d34cb0 SHA256 b1902aa6cf644332b3a842f457629c51cb74e4e60d38d6e0e2dd3b6bdddbba4f
-MD5 a8239a2105628e70ba857835a8125d8a freebsd-usbin-6.1-r1.ebuild 4558
-RMD160 677988721f65f8f9ae6e163b7bc6570fd5ee45c3 freebsd-usbin-6.1-r1.ebuild 4558
-SHA256 b1902aa6cf644332b3a842f457629c51cb74e4e60d38d6e0e2dd3b6bdddbba4f freebsd-usbin-6.1-r1.ebuild 4558
-EBUILD freebsd-usbin-6.2_beta1.ebuild 4531 RMD160 de5c639a26fe812413fd33d4345ca6d6209751d6 SHA1 a257ea706e44c2cd38677bccfdbe6546500faa01 SHA256 c6070fb61cb65dca8c4f1ffaa7312ed6b5ff0e7fd9e47fe15da6b4470a0e07be
-MD5 9c2ad9ab01b1ef7a83ff858cc8960306 freebsd-usbin-6.2_beta1.ebuild 4531
-RMD160 de5c639a26fe812413fd33d4345ca6d6209751d6 freebsd-usbin-6.2_beta1.ebuild 4531
-SHA256 c6070fb61cb65dca8c4f1ffaa7312ed6b5ff0e7fd9e47fe15da6b4470a0e07be freebsd-usbin-6.2_beta1.ebuild 4531
-MISC ChangeLog 9689 RMD160 92361d8ab89642e1f9709ef77d7a35cecef785ad SHA1 31d3ade829e3b2e7697549118dc9b319c7b056f9 SHA256 5949bceeda44a4f76894ae68273f978db4cf3d5f05ca964173bdcfb05857d1f7
-MD5 2803b08528b3664ac86a29602cde97ee ChangeLog 9689
-RMD160 92361d8ab89642e1f9709ef77d7a35cecef785ad ChangeLog 9689
-SHA256 5949bceeda44a4f76894ae68273f978db4cf3d5f05ca964173bdcfb05857d1f7 ChangeLog 9689
+EBUILD freebsd-usbin-6.1-r1.ebuild 4590 RMD160 277677bb60a02a8ba8dfe9390e1fb77d68b5e1e3 SHA1 5e4cb9ad659cc4cb3df021b8d598d0e50cc7a114 SHA256 a894ea8a14fc08250fa555b94e589babcc82045e5e1c056d626b1b07fd576e8c
+MD5 49fbc8272fad5e4b3ad3b7a2229306b1 freebsd-usbin-6.1-r1.ebuild 4590
+RMD160 277677bb60a02a8ba8dfe9390e1fb77d68b5e1e3 freebsd-usbin-6.1-r1.ebuild 4590
+SHA256 a894ea8a14fc08250fa555b94e589babcc82045e5e1c056d626b1b07fd576e8c freebsd-usbin-6.1-r1.ebuild 4590
+EBUILD freebsd-usbin-6.2_beta1.ebuild 4563 RMD160 3268062c9c54132a02eb97564da52f61808f8db1 SHA1 f614b8a553ab44753c77e3954a971d73ecfb4df9 SHA256 f3ab10dcc542a3d5dc37b1ac59d108fb8e746f6ebb306cf925cc2ab5a22a69b5
+MD5 361c3c809ad8ba1a63ec2f8e12329bf1 freebsd-usbin-6.2_beta1.ebuild 4563
+RMD160 3268062c9c54132a02eb97564da52f61808f8db1 freebsd-usbin-6.2_beta1.ebuild 4563
+SHA256 f3ab10dcc542a3d5dc37b1ac59d108fb8e746f6ebb306cf925cc2ab5a22a69b5 freebsd-usbin-6.2_beta1.ebuild 4563
+MISC ChangeLog 9915 RMD160 be78db22e0c0d56c0542ee7d3da26aca5d749f7d SHA1 66d919474979518aab61e7402864a367c635d5c2 SHA256 105b32bdc2c965f6ffacbd8e31573f3cda1506bb29569f735415dc4f41796e45
+MD5 f9941fd5975431607ac24af69eee8ca0 ChangeLog 9915
+RMD160 be78db22e0c0d56c0542ee7d3da26aca5d749f7d ChangeLog 9915
+SHA256 105b32bdc2c965f6ffacbd8e31573f3cda1506bb29569f735415dc4f41796e45 ChangeLog 9915
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -105,10 +106,3 @@ SHA256 0e2af80bb11fda4774c21e3d0e44368ffbce6d71fde45b08d4774a038e4c9f06 files/di
 MD5 c222198589bf7d14fa6fa98b65b4a945 files/digest-freebsd-usbin-6.2_beta1 1930
 RMD160 afbe67ce3d5e65a74f2efb4df72377e4bc9ba246 files/digest-freebsd-usbin-6.2_beta1 1930
 SHA256 503f86b9e3fc959845f7f5cc4dfa073e21ea43a75f595f5294a3dea958bc3ebc files/digest-freebsd-usbin-6.2_beta1 1930
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFE47aAiZjviIA2XgRAmHJAJ9ggfvQom7W+PLBjT35Jy2p6qvnDACgihg9
-Y5H6d/a92MLu3GEEdD67Y/g=
-=ctFu
------END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch
new file mode 100644
index 000000000000..39177b4a987d
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch
@@ -0,0 +1,20 @@
+--- usr.sbin/adduser/adduser.sh.old	2006-10-01 13:41:16 +0000
++++ usr.sbin/adduser/adduser.sh	2006-10-01 13:41:38 +0000
+@@ -809,7 +809,7 @@
+ NOHOME="/nonexistent"
+ NOLOGIN="nologin"
+ NOLOGIN_PATH="/usr/sbin/nologin"
+-GREPCMD="/usr/bin/grep"
++GREPCMD="/bin/grep"
+ DATECMD="/bin/date"
+ 
+ # Set default values
+@@ -823,7 +823,7 @@
+ uhome=
+ upass=
+ ushell=
+-udotdir=/usr/share/skel
++udotdir=/etc/skel
+ ugroups=
+ uexpire=
+ upwexpire=
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1-r1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1-r1.ebuild
index 9beedc63542f..8f55a5d8b9e6 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1-r1.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1-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/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1-r1.ebuild,v 1.2 2006/09/14 17:03:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1-r1.ebuild,v 1.3 2006/10/01 20:14:01 the_paya Exp $
 
 inherit bsdmk freebsd flag-o-matic eutils
 
@@ -67,7 +67,8 @@ pkg_setup() {
 PATCHES="${FILESDIR}/${PN}-6.0-fixmakefiles.patch
 	${FILESDIR}/${PN}-6.1-nowrap.patch
 	${FILESDIR}/${P}-gcc41.patch
-	${FILESDIR}/SA-06-15-ypserv.patch"
+	${FILESDIR}/SA-06-15-ypserv.patch
+	${FILESDIR}/${PN}-adduser.patch"
 
 REMOVE_SUBDIRS="
 	named named-checkzone named-checkconf rndc rndc-confgen
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_beta1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_beta1.ebuild
index 2536e8ac4d41..ab3b7bdd00ba 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_beta1.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_beta1.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/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_beta1.ebuild,v 1.2 2006/09/22 07:20:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_beta1.ebuild,v 1.3 2006/10/01 20:14:01 the_paya Exp $
 
 inherit bsdmk freebsd flag-o-matic eutils
 
@@ -66,7 +66,8 @@ pkg_setup() {
 
 PATCHES="${FILESDIR}/${PN}-6.0-fixmakefiles.patch
 	${FILESDIR}/${PN}-6.1-nowrap.patch
-	${FILESDIR}/${PN}-6.1-gcc41.patch"
+	${FILESDIR}/${PN}-6.1-gcc41.patch
+	${FILESDIR}/${PN}-adduser.patch"
 
 REMOVE_SUBDIRS="
 	named named-checkzone named-checkconf rndc rndc-confgen