Update to 6.1_rc1 and disable ssp on the ld-elf.so loader to avoid breaking it.

Package-Manager: portage-2.1_pre10

6 files changed, 142 insertions, 16 deletions

diff --git a/sys-freebsd/freebsd-libexec/ChangeLog b/sys-freebsd/freebsd-libexec/ChangeLog
index adedae71f522..3eb15b64bc70 100644
--- a/sys-freebsd/freebsd-libexec/ChangeLog
+++ b/sys-freebsd/freebsd-libexec/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/freebsd-libexec
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/ChangeLog,v 1.4 2006/04/20 07:00:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/ChangeLog,v 1.5 2006/04/30 23:09:55 flameeyes Exp $
+
+*freebsd-libexec-6.1_rc1 (30 Apr 2006)
+
+  30 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/freebsd-libexec-nossp.patch, freebsd-libexec-6.0.ebuild,
+  +freebsd-libexec-6.1_rc1.ebuild:
+  Update to 6.1_rc1 and disable ssp on the ld-elf.so loader to avoid breaking it.
 
   20 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   freebsd-libexec-6.0.ebuild:
diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest
index dc997cb0512a..e48f0db2e262 100644
--- a/sys-freebsd/freebsd-libexec/Manifest
+++ b/sys-freebsd/freebsd-libexec/Manifest
@@ -1,31 +1,62 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 13e3717e2fcf9e4cd92b4a482d51b196 ChangeLog 2812
-RMD160 81e14b19648495ae4718e7122be4144055830fbd ChangeLog 2812
-SHA256 64370354f65229bd096ffdb1dde9bfa434d7cfc6c12424e23f34dfbd7ae752c1 ChangeLog 2812
-MD5 ddf68922a1d3f555d4cd1ba03f2defbe files/digest-freebsd-libexec-6.0 1798
-RMD160 16c39da9cf4c01e3a1b030647f5c506593c91b8c files/digest-freebsd-libexec-6.0 1798
-SHA256 5448a66939478317fe42bdcd92b7afa281bdfdbd77b86af55dcc21f11567a2dc files/digest-freebsd-libexec-6.0 1798
+AUX freebsd-libexec-5.3_rc1-ypxfr-makefile.patch 263 RMD160 40b586d5036d1456df7479339a3a11d82fae038e SHA1 4dee4c5dc1fff2262c91ef6c2eae30eea5267d4f SHA256 15903b83aff510790a8d3c18c3c34e352f35a5d8d07528ce0e243a07bf1cdb08 size 263
 MD5 5d5db03a0ec099511d480ed697158c2f files/freebsd-libexec-5.3_rc1-ypxfr-makefile.patch 263
 RMD160 40b586d5036d1456df7479339a3a11d82fae038e files/freebsd-libexec-5.3_rc1-ypxfr-makefile.patch 263
 SHA256 15903b83aff510790a8d3c18c3c34e352f35a5d8d07528ce0e243a07bf1cdb08 files/freebsd-libexec-5.3_rc1-ypxfr-makefile.patch 263
+AUX freebsd-libexec-nossp.patch 465 RMD160 d2636c5f13a117f34f2d73fb0a4e04e39b93ed88 SHA1 19d41dd1e3938c4c2d1ce248386628cf8178865b SHA256 afe3ad1ddd1e8a53f29e0d0a2215ef0326b0437d268afcd8c9052c010cfa1745 size 465
+MD5 2190b6de4dd241c99f78331b9f5670be files/freebsd-libexec-nossp.patch 465
+RMD160 d2636c5f13a117f34f2d73fb0a4e04e39b93ed88 files/freebsd-libexec-nossp.patch 465
+SHA256 afe3ad1ddd1e8a53f29e0d0a2215ef0326b0437d268afcd8c9052c010cfa1745 files/freebsd-libexec-nossp.patch 465
+AUX freebsd-libexec-setXid.patch 270 RMD160 70cb184d02b3a3102eeb6332226db42b2abf04f5 SHA1 0e9332ab2a6951abfdfd58bd134368e7e437fa28 SHA256 b96e8adef3276e5bd2b2518641b9d971202476803b82bdea7077603510116b8e size 270
 MD5 938595a512ae215d1b8f97d80d81adec files/freebsd-libexec-setXid.patch 270
 RMD160 70cb184d02b3a3102eeb6332226db42b2abf04f5 files/freebsd-libexec-setXid.patch 270
 SHA256 b96e8adef3276e5bd2b2518641b9d971202476803b82bdea7077603510116b8e files/freebsd-libexec-setXid.patch 270
+AUX ftpd.pamd 597 RMD160 acb189e5e3166d21a5c3ad8e71d652386853f882 SHA1 34deacd2210c5ad623d08a1cc5b969dfcd36236b SHA256 dc779a1c0b0ad94660584e902d505ad0197b52a3944bc13666815d653790e090 size 597
 MD5 d91d1f0640a08e9bd0b02c0cd7d57116 files/ftpd.pamd 597
 RMD160 acb189e5e3166d21a5c3ad8e71d652386853f882 files/ftpd.pamd 597
 SHA256 dc779a1c0b0ad94660584e902d505ad0197b52a3944bc13666815d653790e090 files/ftpd.pamd 597
-MD5 79666e53ce20e7dfe7c2257537f9d627 freebsd-libexec-6.0.ebuild 1465
-RMD160 678e4c008387e921844e9ad0e92fd64bf9639511 freebsd-libexec-6.0.ebuild 1465
-SHA256 a15dd79b3b6faa5bd7b5e73a358e27ffd2586a8bcd846b1becf5c3219ab05643 freebsd-libexec-6.0.ebuild 1465
+DIST freebsd-bin-6.0.tar.bz2 403680 RMD160 4694f5e9e6469cf64b0e05ae8a1d23a612b2130d SHA256 1b228a67634edc978e961d81855ac8b5efa611683654f9d956b9fe2ece3e9f6c size 403680
+DIST freebsd-bin-6.1_rc1.tar.bz2 405949 RMD160 b364fe8d4e1fa9e351a01cd9591eab8f14491e8f SHA256 dc3f3e924c433386e111fcf4829fb4b0ade7a52bfb65f41e467f719ad1112ab1 size 405949
+DIST freebsd-contrib-6.0.tar.bz2 34972594 RMD160 3f045dd7d1ddbcf20da670051459f0a2fc508a8b SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 size 34972594
+DIST freebsd-contrib-6.1_rc1.tar.bz2 36018347 RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 size 36018347
+DIST freebsd-etc-6.0.tar.bz2 178941 RMD160 48d0eb51f291e5d706ef076151964b88a9fc1796 SHA256 c4bd9401dad72bd869b89aa12a61339a30746caadb741bb0d094f522ee117616 size 178941
+DIST freebsd-etc-6.1_rc1.tar.bz2 183866 RMD160 5f973e0e0dc4418ef50289cd3a6e3f356f3e172a SHA256 c3006c8c0c324be09de7ad0f4873a015257b0510e58d7149c64e84d09a1beb33 size 183866
+DIST freebsd-lib-6.0.tar.bz2 2613087 RMD160 30bf04438a00408284f135c2670106141cae4873 SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 size 2613087
+DIST freebsd-lib-6.1_rc1.tar.bz2 2613706 RMD160 fe9ffa058f907e05747d106636a92aeb0cd2a864 SHA256 de39f9db53c8ab30a292d7ab4530cb0de3fa08ef682937bf2187962579d875c4 size 2613706
+DIST freebsd-libexec-6.0.tar.bz2 277631 RMD160 5121414524c9dfceab1f5ad8b8bc91c65141db82 SHA256 2eddc867d69afa6c5d0a2f3ce18d4570688b5fa49924adb478dc7d548ba8197e size 277631
+DIST freebsd-libexec-6.1_rc1.tar.bz2 277623 RMD160 7a5ae00e1460d2c683164604ac10d1020d27fbda SHA256 a661f039bbda5d5dbefba584fc53a7166315c2456432a9bef2be6e3624658d5b size 277623
+DIST freebsd-ubin-6.0.tar.bz2 1760986 RMD160 08a26aa7afdb1482fd1711355e2ef150ecef709d SHA256 860ecaa8cea7c1bd1a1403d6b345d751e04fed3fd7993bf69a483046844d476b size 1760986
+DIST freebsd-ubin-6.1_rc1.tar.bz2 1762943 RMD160 52bfc6de5a322dd0bfabe7d365d0d8a8b8af6b6e SHA256 120ace5ae8ec906e09b92128ce6d6afe66dbd6d4806f09a51634ddea917a8370 size 1762943
+DIST freebsd-usbin-6.0.tar.bz2 2635411 RMD160 9a8f5cdc041df1ad2b388c432a1829b5c8adc51d SHA256 46ac3c581fd20d9980bcf2d80aba7c2f874ad3e29058939bee0c6f1a4af8ff64 size 2635411
+DIST freebsd-usbin-6.1_rc1.tar.bz2 2663185 RMD160 9745c19a2de23cfbc8c7325679259dff5cbb71d4 SHA256 0db8c33c2edfabec21a31e0a70ee81551e0aeb12856aa9d4a88f5f2e052c11f5 size 2663185
+EBUILD freebsd-libexec-6.0.ebuild 1496 RMD160 8e513861b4a1e4d908c83ab735c589c16e2cd515 SHA1 14b9fc72e73f8302cf583fb8da5238852755c9b8 SHA256 885727451df47b2c4f6dd88456a0c29fae79b5ed652938ab6c7da331e66f4a08 size 1496
+MD5 dd3e0df4ac096173be1432d7f6d59df0 freebsd-libexec-6.0.ebuild 1496
+RMD160 8e513861b4a1e4d908c83ab735c589c16e2cd515 freebsd-libexec-6.0.ebuild 1496
+SHA256 885727451df47b2c4f6dd88456a0c29fae79b5ed652938ab6c7da331e66f4a08 freebsd-libexec-6.0.ebuild 1496
+EBUILD freebsd-libexec-6.1_rc1.ebuild 1500 RMD160 fda85c73bdafc44fa80d38348837582501738929 SHA1 df205ecd3992f4de2dc19711ce3e31becd59c0b5 SHA256 88cdb206c35d284d42ffd0c3b5ce20597fe40213a1a0958687a924a2bbf97565 size 1500
+MD5 775e1db69ccdca8e35c62d82bdafa40d freebsd-libexec-6.1_rc1.ebuild 1500
+RMD160 fda85c73bdafc44fa80d38348837582501738929 freebsd-libexec-6.1_rc1.ebuild 1500
+SHA256 88cdb206c35d284d42ffd0c3b5ce20597fe40213a1a0958687a924a2bbf97565 freebsd-libexec-6.1_rc1.ebuild 1500
+MISC ChangeLog 3089 RMD160 8543af5355e34041a21fc10d285ed9f20e122cd0 SHA1 31d8d96407bf45e4ec1f13fd35a16e5a8a20ab29 SHA256 22ae00f1cdef508b421d395833858c21eb66a23ba0248dd9bc93b2b236cb83df size 3089
+MD5 5f41046c55a3c78be18e63731b879f9e ChangeLog 3089
+RMD160 8543af5355e34041a21fc10d285ed9f20e122cd0 ChangeLog 3089
+SHA256 22ae00f1cdef508b421d395833858c21eb66a23ba0248dd9bc93b2b236cb83df ChangeLog 3089
+MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156
+MD5 ddf68922a1d3f555d4cd1ba03f2defbe files/digest-freebsd-libexec-6.0 1798
+RMD160 16c39da9cf4c01e3a1b030647f5c506593c91b8c files/digest-freebsd-libexec-6.0 1798
+SHA256 5448a66939478317fe42bdcd92b7afa281bdfdbd77b86af55dcc21f11567a2dc files/digest-freebsd-libexec-6.0 1798
+MD5 667dfdba59a6ce926a352782e0b6a3af files/digest-freebsd-libexec-6.1_rc1 1882
+RMD160 42dedd3e2f16cca7016f5c92a20deabb13141354 files/digest-freebsd-libexec-6.1_rc1 1882
+SHA256 50f95987c1148d8e37da20aad578f54a64b0d6f7c72e28cae21a46bf48c4568b files/digest-freebsd-libexec-6.1_rc1 1882
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFERzD4AiZjviIA2XgRAiQ5AJ9glwtYHvlAbw8N9MLvwb+xjva6UACgqwhY
-SMPv7yr//NFskyoBtbH2YmU=
-=LKtt
+iD8DBQFEVUPPAiZjviIA2XgRAn6IAKDI5GFvgbClODnGuJoDFha6y7wL7gCgozBO
+DJJipOeCz0zzY+K6ujht0xg=
+=7hrJ
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-libexec/files/digest-freebsd-libexec-6.1_rc1 b/sys-freebsd/freebsd-libexec/files/digest-freebsd-libexec-6.1_rc1
new file mode 100644
index 000000000000..aa234a3f9a34
--- /dev/null
+++ b/sys-freebsd/freebsd-libexec/files/digest-freebsd-libexec-6.1_rc1
@@ -0,0 +1,21 @@
+MD5 5dcbd5450bcc3bcfd592f0ec86e55921 freebsd-bin-6.1_rc1.tar.bz2 405949
+RMD160 b364fe8d4e1fa9e351a01cd9591eab8f14491e8f freebsd-bin-6.1_rc1.tar.bz2 405949
+SHA256 dc3f3e924c433386e111fcf4829fb4b0ade7a52bfb65f41e467f719ad1112ab1 freebsd-bin-6.1_rc1.tar.bz2 405949
+MD5 fdc3753ea193f97b6e38a6c166923f31 freebsd-contrib-6.1_rc1.tar.bz2 36018347
+RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 freebsd-contrib-6.1_rc1.tar.bz2 36018347
+SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 freebsd-contrib-6.1_rc1.tar.bz2 36018347
+MD5 6e99af8cce64280b02dafb31e8bf7703 freebsd-etc-6.1_rc1.tar.bz2 183866
+RMD160 5f973e0e0dc4418ef50289cd3a6e3f356f3e172a freebsd-etc-6.1_rc1.tar.bz2 183866
+SHA256 c3006c8c0c324be09de7ad0f4873a015257b0510e58d7149c64e84d09a1beb33 freebsd-etc-6.1_rc1.tar.bz2 183866
+MD5 c4785d39e744b337abfa7158e3ce213e freebsd-lib-6.1_rc1.tar.bz2 2613706
+RMD160 fe9ffa058f907e05747d106636a92aeb0cd2a864 freebsd-lib-6.1_rc1.tar.bz2 2613706
+SHA256 de39f9db53c8ab30a292d7ab4530cb0de3fa08ef682937bf2187962579d875c4 freebsd-lib-6.1_rc1.tar.bz2 2613706
+MD5 7fc05b60f2d902eaf2355343c3817ba0 freebsd-libexec-6.1_rc1.tar.bz2 277623
+RMD160 7a5ae00e1460d2c683164604ac10d1020d27fbda freebsd-libexec-6.1_rc1.tar.bz2 277623
+SHA256 a661f039bbda5d5dbefba584fc53a7166315c2456432a9bef2be6e3624658d5b freebsd-libexec-6.1_rc1.tar.bz2 277623
+MD5 0198e4c8f064d5f060c15510a87c5f35 freebsd-ubin-6.1_rc1.tar.bz2 1762943
+RMD160 52bfc6de5a322dd0bfabe7d365d0d8a8b8af6b6e freebsd-ubin-6.1_rc1.tar.bz2 1762943
+SHA256 120ace5ae8ec906e09b92128ce6d6afe66dbd6d4806f09a51634ddea917a8370 freebsd-ubin-6.1_rc1.tar.bz2 1762943
+MD5 d79f570cec1b96e1f58d41fb04e66e6f freebsd-usbin-6.1_rc1.tar.bz2 2663185
+RMD160 9745c19a2de23cfbc8c7325679259dff5cbb71d4 freebsd-usbin-6.1_rc1.tar.bz2 2663185
+SHA256 0db8c33c2edfabec21a31e0a70ee81551e0aeb12856aa9d4a88f5f2e052c11f5 freebsd-usbin-6.1_rc1.tar.bz2 2663185
diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-nossp.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-nossp.patch
new file mode 100644
index 000000000000..44d555a06f9e
--- /dev/null
+++ b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-nossp.patch
@@ -0,0 +1,12 @@
+Index: fbsd-6.1/libexec/rtld-elf/Makefile
+===================================================================
+--- fbsd-6.1.orig/libexec/rtld-elf/Makefile
++++ fbsd-6.1/libexec/rtld-elf/Makefile
+@@ -7,6 +7,7 @@ SRCS=		rtld_start.S \
+ MAN=		rtld.1
+ CSTD?=		gnu99
+ CFLAGS+=	-Wall -DFREEBSD_ELF -DIN_RTLD
++CFLAGS+=	-fno-stack-protector -fno-stack-protector-all
+ CFLAGS+=	-I${.CURDIR}/${MACHINE_ARCH} -I${.CURDIR}
+ LDFLAGS+=	-nostdlib -e .rtld_start
+ INSTALLFLAGS=	-C -b
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-6.0.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-6.0.ebuild
index 3e673f055aef..4e17caf86885 100644
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-6.0.ebuild
+++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-6.0.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-libexec/freebsd-libexec-6.0.ebuild,v 1.3 2006/04/20 07:00:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/freebsd-libexec-6.0.ebuild,v 1.4 2006/04/30 23:09:55 flameeyes Exp $
 
 inherit bsdmk freebsd pam
 
@@ -37,7 +37,8 @@ pkg_setup() {
 }
 
 PATCHES="${FILESDIR}/${PN}-setXid.patch
-	${FILESDIR}/${PN}-5.3_rc1-ypxfr-makefile.patch"
+	${FILESDIR}/${PN}-5.3_rc1-ypxfr-makefile.patch
+	${FILESDIR}/${PN}-nossp.patch"
 
 # Remove sendmail, tcp_wrapper and other useless stuff
 REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind"
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-6.1_rc1.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-6.1_rc1.ebuild
new file mode 100644
index 000000000000..91da180fe01e
--- /dev/null
+++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-6.1_rc1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/freebsd-libexec-6.1_rc1.ebuild,v 1.1 2006/04/30 23:09:55 flameeyes Exp $
+
+inherit bsdmk freebsd pam
+
+DESCRIPTION="FreeBSD libexec things"
+SLOT="0"
+KEYWORDS="~x86-fbsd"
+
+IUSE="pam ssl kerberos ipv6 nis"
+
+SRC_URI="mirror://gentoo/${LIBEXEC}.tar.bz2
+	mirror://gentoo/${UBIN}.tar.bz2
+	mirror://gentoo/${BIN}.tar.bz2
+	mirror://gentoo/${CONTRIB}.tar.bz2
+	mirror://gentoo/${LIB}.tar.bz2
+	mirror://gentoo/${ETC}.tar.bz2
+	mirror://gentoo/${USBIN}.tar.bz2"
+
+RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
+	pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	=sys-freebsd/freebsd-mk-defs-${RV}*
+	=sys-freebsd/freebsd-sources-${RV}*"
+
+S="${WORKDIR}/libexec"
+
+pkg_setup() {
+	use pam || mymakeopts="${mymakeopts} NO_PAM= "
+	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
+	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
+	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
+	use nis || mymakeopts="${mymakeopts} NO_NIS= "
+
+	mymakeopts="${mymakeopts} NO_SENDMAIL= NO_PF= "
+}
+
+PATCHES="${FILESDIR}/${PN}-setXid.patch
+	${FILESDIR}/${PN}-5.3_rc1-ypxfr-makefile.patch
+	${FILESDIR}/${PN}-nossp.patch"
+
+# Remove sendmail, tcp_wrapper and other useless stuff
+REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind"
+
+src_install() {
+	freebsd_src_install
+
+	newpamd ${FILESDIR}/ftpd.pamd ftpd
+
+	insinto /etc
+	cd "${WORKDIR}/etc"
+	doins gettytab
+}