From 21a1059cd4879ecd655019194fd58fcd8dfc800d Mon Sep 17 00:00:00 2001 From: Benedikt Boehm Date: Thu, 7 Sep 2006 11:22:01 +0000 Subject: [PATCH] hopefully fix SSP/PIE/STACKGAP mess (also fixes #138468); fix executable stacks; fix CFLAGS handling Package-Manager: portage-2.1.1_pre4-r3 --- dev-libs/dietlibc/ChangeLog | 8 ++- dev-libs/dietlibc/Manifest | 24 ++++++--- dev-libs/dietlibc/dietlibc-0.30-r1.ebuild | 52 +++++++++++++++++++ .../dietlibc/files/digest-dietlibc-0.30-r1 | 6 +++ 4 files changed, 81 insertions(+), 9 deletions(-) create mode 100644 dev-libs/dietlibc/dietlibc-0.30-r1.ebuild create mode 100644 dev-libs/dietlibc/files/digest-dietlibc-0.30-r1 diff --git a/dev-libs/dietlibc/ChangeLog b/dev-libs/dietlibc/ChangeLog index c43deb1b9c77..3012195517b5 100644 --- a/dev-libs/dietlibc/ChangeLog +++ b/dev-libs/dietlibc/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/dietlibc # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/ChangeLog,v 1.60 2006/09/04 05:48:28 tsunam Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/ChangeLog,v 1.61 2006/09/07 11:22:01 hollow Exp $ + +*dietlibc-0.30-r1 (07 Sep 2006) + + 07 Sep 2006; Benedikt Böhm +dietlibc-0.30-r1.ebuild: + hopefully fix SSP/PIE/STACKGAP mess (also fixes #138468); fix executable + stacks; fix CFLAGS handling 04 Sep 2006; Joshua Jackson dietlibc-0.30.ebuild: Stable x86; bug #140905 diff --git a/dev-libs/dietlibc/Manifest b/dev-libs/dietlibc/Manifest index a9191e837bfc..221e277385ab 100644 --- a/dev-libs/dietlibc/Manifest +++ b/dev-libs/dietlibc/Manifest @@ -38,6 +38,7 @@ DIST dietlibc-0.28.tar.bz2 560540 RMD160 242cbcd5b7e7f341713f587598cddc9d6ee39f5 DIST dietlibc-0.29.tar.bz2 555075 RMD160 be78077abe892bbabeb38b30f430a5982e3c9c3b SHA1 8720dbc07c5c63ab02cf267f4ebf19b0eee5f267 SHA256 41df3b5d07d5de1dcf712eda3ddd27bc9843c9413e8cecefced09db873cf18db DIST dietlibc-0.30-patches-r0.tar.bz2 13466 RMD160 aef639595e93bd319744901aa87ae15d331709f2 SHA1 f71163605ea54cef6a336a2c360beec38234858e SHA256 bdc14a428b53dcd57bbce2337198e43473964624021d5a4918c5147753e75251 DIST dietlibc-0.30.tar.bz2 567046 RMD160 98d4e20e106f60835ed4a22d3013d9a34957f18a SHA1 cab8631f8ca1902d6668584f72f71706bee020eb SHA256 2c8733825d364d374f0179a403a57e4a382fbb9852431228ef19062a5de183b5 +DIST dietlibc-patches-0.30-r1.tar.bz2 31413 RMD160 f35083e014898e2d14a8d2e6b02506c9e78416cb SHA1 6cddf2fc4ebbf85d7f8d08756cda68686177516e SHA256 61f3c874cfe51bed00d125038e306793012414753ec4c2b8d71344193e1f2a74 EBUILD dietlibc-0.25.ebuild 1574 RMD160 51c448752757f1d97e8badd1992a8d6ae36c03fb SHA1 c031fa9a7a9acd2bb3f19b927fc3bca15e92b718 SHA256 f15f5429024850f407edf33cb1a9f4631055aacefe00c738eb6fc0dfe816b39b MD5 39270afc5eed80629258e1abf196794e dietlibc-0.25.ebuild 1574 RMD160 51c448752757f1d97e8badd1992a8d6ae36c03fb dietlibc-0.25.ebuild 1574 @@ -50,14 +51,18 @@ EBUILD dietlibc-0.29.ebuild 1859 RMD160 dcc1e2225476f0799be643084adb52fb8d7d8946 MD5 335d8fa79c4c6e0a0df3986e2bf9be47 dietlibc-0.29.ebuild 1859 RMD160 dcc1e2225476f0799be643084adb52fb8d7d8946 dietlibc-0.29.ebuild 1859 SHA256 e76a51ae87fc4cdd076d8662284ba030a5a80501754f825924861c3dd0d3656a dietlibc-0.29.ebuild 1859 +EBUILD dietlibc-0.30-r1.ebuild 1564 RMD160 429634a0cb309094b2caa879b70b75c8909f1053 SHA1 f288a370ea5ea2eddb894d86db8f012ddb978037 SHA256 928de83a6e0b02a41e35e1e6fc1e8e7f30c0d0fad433ed1c33ea52e891041cef +MD5 9882f6f526de0c4a49a20a257ffe436d dietlibc-0.30-r1.ebuild 1564 +RMD160 429634a0cb309094b2caa879b70b75c8909f1053 dietlibc-0.30-r1.ebuild 1564 +SHA256 928de83a6e0b02a41e35e1e6fc1e8e7f30c0d0fad433ed1c33ea52e891041cef dietlibc-0.30-r1.ebuild 1564 EBUILD dietlibc-0.30.ebuild 1316 RMD160 d892f9a8cfd4ebaeaddcafc153ac1e23676d5b04 SHA1 843fefe05069ae41942cf356af3da35e19de5912 SHA256 9844a17765371fe314273b9152a020a3e7680d03aecb414e31e3288a8607f116 MD5 8bce1bb35a78d59f6f535216bed96ee6 dietlibc-0.30.ebuild 1316 RMD160 d892f9a8cfd4ebaeaddcafc153ac1e23676d5b04 dietlibc-0.30.ebuild 1316 SHA256 9844a17765371fe314273b9152a020a3e7680d03aecb414e31e3288a8607f116 dietlibc-0.30.ebuild 1316 -MISC ChangeLog 8754 RMD160 1745ec41a82a446ac97ef1518b14a64b22844957 SHA1 52c00421ddc5c4b349f453b893f89909a9c89a9f SHA256 f02723fd4b2002946bdd70d6b9440980a1a9e0351c489bab0f66200a0cb208ac -MD5 a76552c629aa34d6bfed7320a24e8a7e ChangeLog 8754 -RMD160 1745ec41a82a446ac97ef1518b14a64b22844957 ChangeLog 8754 -SHA256 f02723fd4b2002946bdd70d6b9440980a1a9e0351c489bab0f66200a0cb208ac ChangeLog 8754 +MISC ChangeLog 8969 RMD160 82a50ae593df6827bd66c6988367660ded603a49 SHA1 8cd9b37ecf5eddebb459742715482a47785387bc SHA256 b10dffd2d5eb687da62959fd3b106c3cd60aeaf9cc46ec726e431fc33882cc3c +MD5 ce4d9056625554e1155a32334289d99a ChangeLog 8969 +RMD160 82a50ae593df6827bd66c6988367660ded603a49 ChangeLog 8969 +SHA256 b10dffd2d5eb687da62959fd3b106c3cd60aeaf9cc46ec726e431fc33882cc3c ChangeLog 8969 MISC metadata.xml 470 RMD160 db39535bf43d1cea49d04c2ed52bbbc94c94d0cb SHA1 f62e5efb0981e616d453f7f00f3497e5d6f64949 SHA256 34784c3fc1a9a2c548ca86b04f3729cfd045140fcd54b6caeb8c53ce05f16639 MD5 3effe4dd8085cc629d8f6a42cbc10a31 metadata.xml 470 RMD160 db39535bf43d1cea49d04c2ed52bbbc94c94d0cb metadata.xml 470 @@ -74,10 +79,13 @@ SHA256 d3613eb6b51a67d1624be9bb26123baf12827d88138fddedc70317671457dfcd files/di MD5 9cdef8552365d9148d509f59f62b2250 files/digest-dietlibc-0.30 518 RMD160 c2f67ad2dc995b0b842855e39c90f683231b79b2 files/digest-dietlibc-0.30 518 SHA256 94d6f2ad3560d8a7948fe9a06fd8b037abf158fcfee15f0f5e3b12d8e1871894 files/digest-dietlibc-0.30 518 +MD5 2c84e759572d2586112790a72bd02679 files/digest-dietlibc-0.30-r1 518 +RMD160 bf11fe7f822b6e02251f96e7a25f7baf9ac0e795 files/digest-dietlibc-0.30-r1 518 +SHA256 2ee0d071169630d068fb470eb321cef62dca42edfae13f85d295a1bf7d35f083 files/digest-dietlibc-0.30-r1 518 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2.2 (GNU/Linux) +Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFE+75H2ZWR0Jhg/EsRAqFtAJ9iGPH4FKXvFPRhO2U9Fw4q/W6UegCeLuoQ -KhgZsm87oNyse3Y0pCMrh6g= -=Vmmb +iD8DBQFFAADimPFBzbX68WERAjEAAKCPzrjEBXT1zavTgRm3yNDcrF2AfwCfR9bf +mFy7XPMjyK0dIxzX0+QsM4Y= +=91kQ -----END PGP SIGNATURE----- diff --git a/dev-libs/dietlibc/dietlibc-0.30-r1.ebuild b/dev-libs/dietlibc/dietlibc-0.30-r1.ebuild new file mode 100644 index 000000000000..532c4e5d3e92 --- /dev/null +++ b/dev-libs/dietlibc/dietlibc-0.30-r1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.30-r1.ebuild,v 1.1 2006/09/07 11:22:01 hollow Exp $ + +inherit eutils flag-o-matic + +DESCRIPTION="A minimal libc" +HOMEPAGE="http://www.fefe.de/dietlibc/" +SRC_URI="mirror://gentoo/${P}.tar.bz2 + http://dev.gentoo.org/~phreak/distfiles/${PN}-patches-${PVR}.tar.bz2 + http://dev.gentoo.org/~hollow/distfiles/${PN}-patches-${PVR}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug" + +DEPEND="" + +pkg_setup() { + # Replace sparc64 related C[XX]FLAGS (see bug #45716) + use sparc && replace-sparc64-flags + + # gcc-hppa suffers support for SSP, compilation will fail + # (do we still need this? SSP is disabled, see below) + use hppa && strip-unsupported-flags + + # fix (force) some CFLAGS whose inverse will not work with >=gcc-4 + append-flags -fomit-frame-pointer + append-flags -fno-exceptions + append-flags -fno-asynchronous-unwind-tables + + # we use dietlibs STACKGAP in favor of the broken SSP implementation + append-flags -fno-stack-protector + + # debug flags + use debug && append-flags -g +} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${WORKDIR}"/patches/*.patch +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + dobin "${D}"/usr/diet/bin/* || die "dobin failed" + doman "${D}"/usr/diet/man/*/* || die "doman failed" + rm -r "${D}"/usr/diet/{man,bin} + dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING +} diff --git a/dev-libs/dietlibc/files/digest-dietlibc-0.30-r1 b/dev-libs/dietlibc/files/digest-dietlibc-0.30-r1 new file mode 100644 index 000000000000..c60c24ea97f0 --- /dev/null +++ b/dev-libs/dietlibc/files/digest-dietlibc-0.30-r1 @@ -0,0 +1,6 @@ +MD5 2465d652fff6f1fad3da3b98e60e83c9 dietlibc-0.30.tar.bz2 567046 +RMD160 98d4e20e106f60835ed4a22d3013d9a34957f18a dietlibc-0.30.tar.bz2 567046 +SHA256 2c8733825d364d374f0179a403a57e4a382fbb9852431228ef19062a5de183b5 dietlibc-0.30.tar.bz2 567046 +MD5 11fe7ee3a6487721fb68f947c1401007 dietlibc-patches-0.30-r1.tar.bz2 31413 +RMD160 f35083e014898e2d14a8d2e6b02506c9e78416cb dietlibc-patches-0.30-r1.tar.bz2 31413 +SHA256 61f3c874cfe51bed00d125038e306793012414753ec4c2b8d71344193e1f2a74 dietlibc-patches-0.30-r1.tar.bz2 31413 -- 2.26.2