Fix setXid patch, thanks to yngwin on freenode for reporting.

Package-Manager: portage-2.1.2_rc2-r1

3 files changed, 16 insertions, 33 deletions

diff --git a/sys-freebsd/freebsd-ubin/ChangeLog b/sys-freebsd/freebsd-ubin/ChangeLog
index de624aab1613..6ea12da945c3 100644
--- a/sys-freebsd/freebsd-ubin/ChangeLog
+++ b/sys-freebsd/freebsd-ubin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-ubin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.37 2006/11/19 01:46:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.38 2006/11/24 12:51:44 flameeyes Exp $
+
+  24 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
+  files/freebsd-ubin-setXid.patch:
+  Fix setXid patch, thanks to yngwin on freenode for reporting.
 
 *freebsd-ubin-6.2_rc1 (19 Nov 2006)
 
diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
index 508ac1248752..dfbab511499f 100644
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ b/sys-freebsd/freebsd-ubin/Manifest
@@ -37,10 +37,10 @@ AUX freebsd-ubin-lint-stdarg.patch 792 RMD160 673ce804ebd887121160da5d1993787334
 MD5 8e69a5c73317c371c037446c8b5c6fba files/freebsd-ubin-lint-stdarg.patch 792
 RMD160 673ce804ebd887121160da5d1993787334099903 files/freebsd-ubin-lint-stdarg.patch 792
 SHA256 ec86f4c77b7c57f9f1651bb5f38641d198123594e770cc31d77d6775fd851bd6 files/freebsd-ubin-lint-stdarg.patch 792
-AUX freebsd-ubin-setXid.patch 4346 RMD160 53e715b3098c555d3675778d079038ccea34fb60 SHA1 46b08e94df50f41048a11de96f1c4d675a6d9fe1 SHA256 371ced78644fb65ff84712d0e4f93cbc79d363a4b67fb681999a670940b3ddb5
-MD5 abc4cce029759b00e4a9356d6ea1ba1b files/freebsd-ubin-setXid.patch 4346
-RMD160 53e715b3098c555d3675778d079038ccea34fb60 files/freebsd-ubin-setXid.patch 4346
-SHA256 371ced78644fb65ff84712d0e4f93cbc79d363a4b67fb681999a670940b3ddb5 files/freebsd-ubin-setXid.patch 4346
+AUX freebsd-ubin-setXid.patch 3723 RMD160 f08790ad10346a69c7e84df111ec1219862298da SHA1 cff080269398d3b5ef5c990ac51e294cd9dc1f8d SHA256 961ac8dcd9efa4f1aab18f56b26c6210d1d5bf441410aae392160e7c0242d16d
+MD5 20b1b64b17e2a733ab5d32a3c84bcae9 files/freebsd-ubin-setXid.patch 3723
+RMD160 f08790ad10346a69c7e84df111ec1219862298da files/freebsd-ubin-setXid.patch 3723
+SHA256 961ac8dcd9efa4f1aab18f56b26c6210d1d5bf441410aae392160e7c0242d16d files/freebsd-ubin-setXid.patch 3723
 AUX locate-updatedb-cron 94 RMD160 2dc29c647124053fda6aff801d4f3a6950ba4645 SHA1 7c53ec741dc424b6883bef2723ef0c1616c2d3aa SHA256 ef062eb2e780b6c323a904c0e1cf8fc911954d05a0194033b37419003f64f14c
 MD5 bb18c50c3b671fe590fc3014f9ed2c3d files/locate-updatedb-cron 94
 RMD160 2dc29c647124053fda6aff801d4f3a6950ba4645 files/locate-updatedb-cron 94
@@ -94,10 +94,10 @@ EBUILD freebsd-ubin-6.2_rc1.ebuild 3446 RMD160 2ef3233291e67379fa18168d105fdc8ab
 MD5 b0cb300967b5fb11884589b522448350 freebsd-ubin-6.2_rc1.ebuild 3446
 RMD160 2ef3233291e67379fa18168d105fdc8ab4da09c7 freebsd-ubin-6.2_rc1.ebuild 3446
 SHA256 6d83c12c18b3abbc20514443d7a0ba35ca2a522da1d4bcf23f115f7acd467227 freebsd-ubin-6.2_rc1.ebuild 3446
-MISC ChangeLog 10190 RMD160 cd81b5065f3f0a75a0d5426a019e132c401f8021 SHA1 65e9774db894adc03ad1cb27eaded942f677e108 SHA256 b291a29baab80602ae03a95eddba1af021d8189e49157f391759d5fc438588c0
-MD5 3f40ec411263a2fc40076bfa475e523c ChangeLog 10190
-RMD160 cd81b5065f3f0a75a0d5426a019e132c401f8021 ChangeLog 10190
-SHA256 b291a29baab80602ae03a95eddba1af021d8189e49157f391759d5fc438588c0 ChangeLog 10190
+MISC ChangeLog 10343 RMD160 bdbf085fdbb19bcca4b3171c0e265ee048b54db6 SHA1 aa06c9433d38ae5a16b89874c4f219169f30a2b2 SHA256 d832cc2045585531ed079081f41fd11384e5f8313914483b156bc2b8e5e107f1
+MD5 2549119265b86df7c0534aa572370a0d ChangeLog 10343
+RMD160 bdbf085fdbb19bcca4b3171c0e265ee048b54db6 ChangeLog 10343
+SHA256 d832cc2045585531ed079081f41fd11384e5f8313914483b156bc2b8e5e107f1 ChangeLog 10343
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -117,7 +117,7 @@ SHA256 a1b8aefc9c98710a171f3a6d6faa1eb5f4bc0774af94f43f409d62e59b7dc277 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFX7eeAiZjviIA2XgRAnRdAKDWe9+rwGLzyGI2Z0aUx65oCv8i1gCgw7Lr
-3GZ4voxL9TM8qKnf+/ekUOo=
-=QQvR
+iD8DBQFFZur4AiZjviIA2XgRArjxAKCTP6Rh76arjxRbXpeTU+BZWk0OrQCaAjfb
+b6Mtaq3g7D1MoL+fKSnlM8s=
+=5Q8f
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-setXid.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-setXid.patch
index 6608adc2b1a9..631ee4f7b4f7 100644
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-setXid.patch
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-setXid.patch
@@ -98,27 +98,6 @@ diff -ur usr.bin.orig/passwd/Makefile usr.bin.setXid/passwd/Makefile
  beforeinstall:
  .for i in passwd yppasswd
  	[ ! -e ${DESTDIR}${BINDIR}/$i ] || \
-diff -ur usr.bin.orig/rlogin/Makefile usr.bin.setXid/rlogin/Makefile
---- usr.bin.orig/rlogin/Makefile	Thu Apr  7 20:52:58 2005
-+++ usr.bin.setXid/rlogin/Makefile	Thu Apr  7 21:25:46 2005
-@@ -8,4 +8,6 @@
- BINMODE=4555
- INSTALLFLAGS=-fschg
- 
-+LDFLAGS+=-Wl,-z,now
-+
- .include <bsd.prog.mk>
-diff -ur usr.bin.orig/rsh/Makefile usr.bin.setXid/rsh/Makefile
---- usr.bin.orig/rsh/Makefile	Thu Apr  7 20:52:58 2005
-+++ usr.bin.setXid/rsh/Makefile	Thu Apr  7 21:25:53 2005
-@@ -9,4 +9,6 @@
- BINMODE=4555
- INSTALLFLAGS=-fschg
- 
-+LDFLAGS+=-Wl,-z,now
-+
- .include <bsd.prog.mk>
-diff -ur usr.bin.orig/su/Makefile usr.bin.setXid/su/Makefile
 --- usr.bin.orig/su/Makefile	Thu Apr  7 20:52:58 2005
 +++ usr.bin.setXid/su/Makefile	Thu Apr  7 21:26:00 2005
 @@ -10,4 +10,6 @@