From: Michael Stewart Date: Wed, 7 Jun 2006 00:09:35 +0000 (+0000) Subject: Always enable ipv6. Fixes bug 123320. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2637783a69d95a96307137731d43dfe45a1e7348;p=gentoo.git Always enable ipv6. Fixes bug 123320. Package-Manager: portage-2.1_rc4-r1 --- diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog index cb74bf721cca..3c0174c7cfb9 100644 --- a/dev-libs/apr/ChangeLog +++ b/dev-libs/apr/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/apr # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.59 2006/06/06 16:12:51 vericgar Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.60 2006/06/07 00:09:35 vericgar Exp $ + +*apr-1.2.7-r2 (07 Jun 2006) + + 07 Jun 2006; Michael Stewart +apr-1.2.7-r2.ebuild: + Always enable ipv6. Fixes bug 123320. 06 Jun 2006; Michael Stewart apr-1.2.7.ebuild: Remove as-needed filtering diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest index de650502dee1..8fb3863f1202 100644 --- a/dev-libs/apr/Manifest +++ b/dev-libs/apr/Manifest @@ -31,14 +31,18 @@ EBUILD apr-1.2.7-r1.ebuild 2284 RMD160 a43def70d7223f493b72c111b9eb7c9958a5c421 MD5 40466f62c3768606bbb69189e9063949 apr-1.2.7-r1.ebuild 2284 RMD160 a43def70d7223f493b72c111b9eb7c9958a5c421 apr-1.2.7-r1.ebuild 2284 SHA256 0d370d80fbd88cba56c3f1f47d199ab439e9f2d1c19c2223f7fc4fe4016f6891 apr-1.2.7-r1.ebuild 2284 +EBUILD apr-1.2.7-r2.ebuild 2541 RMD160 1bcdc8473dab1ac33751d61596dca8df782124d0 SHA1 ed6e09360b93db7150308c6361d3d6a6a468cfe7 SHA256 f218b3885772fdfd5b996324b153821dd5a60e393dcec3ac5eb9f09ffbccc229 +MD5 968b56c7740d4ed75213fab50e628f7f apr-1.2.7-r2.ebuild 2541 +RMD160 1bcdc8473dab1ac33751d61596dca8df782124d0 apr-1.2.7-r2.ebuild 2541 +SHA256 f218b3885772fdfd5b996324b153821dd5a60e393dcec3ac5eb9f09ffbccc229 apr-1.2.7-r2.ebuild 2541 EBUILD apr-1.2.7.ebuild 1557 RMD160 3774769a8236b5a1c8503e2e3111ca141ab4d757 SHA1 bcc1ba578dbfd0c4313fd46610bbc3009807d3e1 SHA256 56d2756aa7c3b00c93f25787dc6345c3a5c18835639990fbd735e6b9fda09e15 MD5 d0f3560135caff1eba14a54de39753f5 apr-1.2.7.ebuild 1557 RMD160 3774769a8236b5a1c8503e2e3111ca141ab4d757 apr-1.2.7.ebuild 1557 SHA256 56d2756aa7c3b00c93f25787dc6345c3a5c18835639990fbd735e6b9fda09e15 apr-1.2.7.ebuild 1557 -MISC ChangeLog 7577 RMD160 2da55e6ac34b144bb762baff9071baa049f3e458 SHA1 7b7ef600ef117c55475dde337a40f3626df4674c SHA256 d4229c3243df3e8474c4715a5a958bf0106d7f201858be096a67313bb253bfb8 -MD5 eda6cd89d4562591acf76279aa519045 ChangeLog 7577 -RMD160 2da55e6ac34b144bb762baff9071baa049f3e458 ChangeLog 7577 -SHA256 d4229c3243df3e8474c4715a5a958bf0106d7f201858be096a67313bb253bfb8 ChangeLog 7577 +MISC ChangeLog 7722 RMD160 a9bf4206598b6474c1763894623ad6c11bb1981a SHA1 13a011469a0eba7c5c50feeabdacc5d2813be596 SHA256 f2a56d0540d934709427a4efbfa51205f5133d88c0c4bd416c87b4830d66dfde +MD5 9ff21de7079aab47d5d096367d056d45 ChangeLog 7722 +RMD160 a9bf4206598b6474c1763894623ad6c11bb1981a ChangeLog 7722 +SHA256 f2a56d0540d934709427a4efbfa51205f5133d88c0c4bd416c87b4830d66dfde ChangeLog 7722 MISC metadata.xml 226 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e SHA1 fe9f7ce6f2281683065abb3255c8b731665c82ac SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8 MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e metadata.xml 226 @@ -64,3 +68,6 @@ SHA256 638280a01796e1bd4275c9b50efc5c583c332a8a38973fd259177e148bf4ac36 files/di MD5 09fe6662358980713dc8869e8e7dcf98 files/digest-apr-1.2.7-r1 232 RMD160 ca0ba31e6a8204bf8037d3fdfefa39eb25945b24 files/digest-apr-1.2.7-r1 232 SHA256 638280a01796e1bd4275c9b50efc5c583c332a8a38973fd259177e148bf4ac36 files/digest-apr-1.2.7-r1 232 +MD5 09fe6662358980713dc8869e8e7dcf98 files/digest-apr-1.2.7-r2 232 +RMD160 ca0ba31e6a8204bf8037d3fdfefa39eb25945b24 files/digest-apr-1.2.7-r2 232 +SHA256 638280a01796e1bd4275c9b50efc5c583c332a8a38973fd259177e148bf4ac36 files/digest-apr-1.2.7-r2 232 diff --git a/dev-libs/apr/apr-1.2.7-r2.ebuild b/dev-libs/apr/apr-1.2.7-r2.ebuild new file mode 100644 index 000000000000..79c996c5d68c --- /dev/null +++ b/dev-libs/apr/apr-1.2.7-r2.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.2.7-r2.ebuild,v 1.1 2006/06/07 00:09:35 vericgar Exp $ + +inherit autotools + +DESCRIPTION="Apache Portable Runtime Library" +HOMEPAGE="http://apr.apache.org/" +SRC_URI="mirror://apache/apr/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="1" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="ipv6 urandom debug" +RESTRICT="test" + +DEPEND="" + +src_compile() { + + # for some reason not all the .m4 files that are referenced in + # configure.in exist, so we remove all references and include every + # .m4 file in build using aclocal via eautoreconf + # See bug 135463 + sed -i -e '/sinclude/d' configure.in + AT_M4DIR="build" eautoreconf + + myconf="--datadir=/usr/share/apr-1" + + # For now we always enable ipv6. Testing has shown that is still works + # correctly in ipv4 systems, and currently, the ipv4-only support + # is broken in apr. (ipv6 is enabled by default) + #myconf="${myconf} $(use_enable ipv6)" + + myconf="${myconf} --enable-threads" + myconf="${myconf} --enable-nonportable-atomics" + if use urandom; then + einfo "Using /dev/urandom as random device" + myconf="${myconf} --with-devrandom=/dev/urandom" + else + einfo "Using /dev/random as random device" + myconf="${myconf} --with-devrandom=/dev/random" + fi + + useq debug && myconf="${myconf} --enable-maintainer-mode" + + # We pre-load the cache with the correct answer! This avoids + # it violating the sandbox. This may have to be changed for + # non-Linux systems or if sem_open changes on Linux. This + # hack is built around documentation in /usr/include/semaphore.h + # and the glibc (pthread) source + # See bugs 24215 and 133573 + echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache + + econf ${myconf} || die "Configure failed" + + # Make sure we use the system libtool + sed -i 's,$(apr_builddir)/libtool,/usr/bin/libtool,' build/apr_rules.mk + sed -i 's,${installbuilddir}/libtool,/usr/bin/libtool,' apr-1-config + rm libtool + + emake || die "Make failed" +} + +src_install() { + + make DESTDIR="${D}" install || die "make install failed" + + dodoc CHANGES NOTICE LICENSE +} + +pkg_postinst() { + ewarn "We are now using the system's libtool rather then bundling" + ewarn "our own. You will need to rebuild Apache and possibly other" + ewarn "software if you get a message similiar to the following:" + ewarn + ewarn " /usr/share/apr-1/build-1/libtool: No such file or directory" + ewarn +} diff --git a/dev-libs/apr/files/digest-apr-1.2.7-r2 b/dev-libs/apr/files/digest-apr-1.2.7-r2 new file mode 100644 index 000000000000..13dfeb0ca3cd --- /dev/null +++ b/dev-libs/apr/files/digest-apr-1.2.7-r2 @@ -0,0 +1,3 @@ +MD5 aea926cbe588f844ad9e317157d60175 apr-1.2.7.tar.gz 1102370 +RMD160 9dfeb562b376c32261b8a263887a05515c4afbe2 apr-1.2.7.tar.gz 1102370 +SHA256 4bde26d8168216f00e0f652e34e20e527dab38edca6a7c0d85aea542bf0fc5fa apr-1.2.7.tar.gz 1102370