From bd7908c6630f38067350d396ac5d18c3cc2434a0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 29 Oct 2017 11:22:34 +0000 Subject: gentoo resync : 29.10.2017 --- app-admin/apache-tools/Manifest | 6 +- app-admin/apache-tools/apache-tools-2.2.31.ebuild | 89 ------------------ app-admin/apache-tools/apache-tools-2.2.34.ebuild | 2 +- app-admin/apache-tools/apache-tools-2.4.29.ebuild | 106 ++++++++++++++++++++++ 4 files changed, 110 insertions(+), 93 deletions(-) delete mode 100644 app-admin/apache-tools/apache-tools-2.2.31.ebuild create mode 100644 app-admin/apache-tools/apache-tools-2.4.29.ebuild (limited to 'app-admin/apache-tools') diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest index 4eca733b9d17..3e5c07ee2669 100644 --- a/app-admin/apache-tools/Manifest +++ b/app-admin/apache-tools/Manifest @@ -1,13 +1,13 @@ AUX apache-tools-2.2.20-Makefile.patch 1573 SHA256 a523a76bcd87059e401b89d341c691423ab4cb4752b8d8871f7d499715335ef8 SHA512 85120f1b57cd14baf3482dc21d4175447e135700a1f8e6455970c14e576cb0c510815681a9906de4c7eb68743de7e41bbb2d86e83dcb62cd57eb0c9f638f6892 WHIRLPOOL 45f4572d51ba4de804ea7be467c19720010a5e5dba9b1904b28f6666a5d0986fafe5a93737e4a38cc86dea32c6ce0ca816358744f240bd84ece0bbbf6e87d508 AUX apache-tools-2.4.7-Makefile.patch 1695 SHA256 69e1d6f232cb887d516b36a38c4bff1e10d36ed91fd1776cb7029b798525f2f7 SHA512 f597ce5503e590ed5b2621c04dcf0a571a73b70f144df7fe4e5fb7329a4f1558a5eb16913fe3d7c58ac1030f46cd2b1882e08d0f62106fbf8d40a8677c6b9448 WHIRLPOOL 6962efc88b83d7a42029440c0abbdbda92c71a6c7ffda98072756e25ed54060050bdec1115550de76cf5fd1802cf3a7fd156796ccdb8c1c4139f375be8ade7c1 -DIST httpd-2.2.31.tar.bz2 5610489 SHA256 f32f9d19f535dac63b06cb55dfc023b40dcd28196b785f79f9346779e22f26ac SHA512 5aa47d4b76f692bbd8b309135ff99152df98cf69b505b9daf3f13f7f2a31443eaf4995161adfbc47a133b4d0e091fda2d95fc6b87a956f0ada18d7466ee28e74 WHIRLPOOL a2e3e53c51719cb6f7e641b41788cd89ce7b4d2ea105b403bfa3b3d4479b69c5604228269062f66722594e105e91121d05b1c9f27ca7dc4ecfcf339da8b8375c DIST httpd-2.2.34.tar.bz2 5779739 SHA256 e53183d5dfac5740d768b4c9bea193b1099f4b06b57e5f28d7caaf9ea7498160 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240 WHIRLPOOL 0bd86b3644fae79c74928c0cd8bc3e4b7d821544a760dbe6459df43210f690d3c4dc74168e029b0b5bbaba6fcd0433aeb4312794455d91b00b7c36c537dfdefd DIST httpd-2.4.27.tar.bz2 6527394 SHA256 71fcc128238a690515bd8174d5330a5309161ef314a326ae45c7c15ed139c13a SHA512 7e7e8070715b74cb6890096a74e194f4c6a49c14bda685b1ad832e84312f1ac4316ea03a430e679502bfd8e1853aefa544ee002a20d0f7e994b9a590c74bc42c WHIRLPOOL 35aeaa01b2bf5772ad21d1011e619befd75fdaade5aa0ca7c61367e7b7a66af28dccf8729a53418f2598199721b68aac7d8c575797ed218150d00af4e8dd4dba DIST httpd-2.4.28.tar.bz2 6553163 SHA256 c1197a3a62a4ab5c584ab89b249af38cf28b4adee9c0106b62999fd29f920666 SHA512 8de8e32b87e6de220e492e74db9df0882fae11c3b9732f3d3316da048c04767ac4429c0433c36f87d8705263e3376f97a7e1f66a9d7a518632a67b6fe617590a WHIRLPOOL a4c8be522d5e900e01cefc0fc6d196e3e49e45e2daffa9ec22b2dc44deace506da5a4cf68afd04b0062b87ffcd27b6e59d0b8ae71cc2304d5080d066174e95ed -EBUILD apache-tools-2.2.31.ebuild 2154 SHA256 3a0897803e8e7751d12ba5796d1446204b8cfc262f339caf5df103d03090c181 SHA512 ee6d208a81d42676e847f6502ab55361a4212a9a0eedb12eb8fc1039bf18af84bd969b04526db0adaf05ab8c50f1d99a9425155eb34aed00f5f8272feb1e13a9 WHIRLPOOL 185d4500e1f73ebfb34bb773e52c1ca38291a2f1f1a10111a8807e0a8201b3e2cf2e68fb6cd9a8f6a626048f6dd67af63ec19366030f5e45378748e7fdfcdc3f -EBUILD apache-tools-2.2.34.ebuild 1990 SHA256 2d38b93c76cc3d8bd45196bf63b86091becc277cabefa4e515abfd21f06e5f03 SHA512 361e835bfd379bd5edf02844f72510c6089ad3e2a311db9d042aaf1cdcbed1f70986e28173d958497b01f787a06cfac4f4969137b1e5e9b56cb43ff27eb7fad6 WHIRLPOOL e3602a6c628240961281612921a269b2c40315fae9350a73fa86c0ca3ea6946d3553624bd19a9a39200ec39959049bd2b0aae37172afe5cf7feba85f24feea48 +DIST httpd-2.4.29.tar.bz2 6567926 SHA256 777753a5a25568a2a27428b2214980564bc1c38c1abf9ccc7630b639991f7f00 SHA512 840982fd3d21463bc5c1747f211dfacf3abdf634d149e49bb49fd2e5deda140de602dbdf31e1bbe5337a48f718ab2261c408e83a8dd39a9291ee7b6b7a85639a WHIRLPOOL bd91e3baa3c2b25cb6a4e48062c38a97f9c941884be2e44805a3a08e1fdfb13bf18b37b6c7ab9e7656934f2d3b8c2893e79480ee119f073bfbb376b6c3e32a74 +EBUILD apache-tools-2.2.34.ebuild 1989 SHA256 4d01baae38b96247523ff6220f71908ca5e9c04c06084420841b0c1cea40217d SHA512 1041e7e11bb9fab007fc2e013d23b35732be287e67513fcbbb318988b224260993654e272d4ec9d76075e1dd449140c28a28c0009a49407fe880e33114743dc7 WHIRLPOOL f607531b302bcc91aeed2923d07c35b7e279496284870a5c8f8f44a4d72c78cc6223e5fe108e552906b4f4faca3fe04c03befd4f7fcf479269621e75cdad520a EBUILD apache-tools-2.4.27.ebuild 2665 SHA256 a4a00940d981ba9e1fce7d0b9737fb044e63c7f588ba2f0212d1776f615f97d4 SHA512 a6fb3773dddad5cc2f9ef78dd84b716c18194a77b25c4f096d7b3fbb8feac40d6c48ab1dabad7fdf065e4a25624a6ea9d8e2c092b05a711e8a1b980503863435 WHIRLPOOL 02f1c15b64dd5ca3a6f3ae963e9a3a2753887d2791a3ddda161622d6691380ea5bd439cfb851d9d3f1bf227e4af8d962aa4ddf6607ce6b87a4e0e3c4adca2c6c EBUILD apache-tools-2.4.28.ebuild 2674 SHA256 e1192010d093e007643ba1d6f43e62590969e8b6e72351fd256e2853b4bde00f SHA512 0c389a3b8f5edb9b63b2248ab05e9441478cfd7f801bd9e389845c4ffbe7521d09f21b78f91d681935ac8ce8615f55782ed8bfe1f79fb5756f718f095b2fe89f WHIRLPOOL e27f202caed6995f9c0911e6a75d02d84bbc4cf5f5758400c2cbfb83143f3fdff0685ce7ee95194a7fa8f1a86bb4e153e98eda1c0aeae1bdc559e7b850ed8c45 +EBUILD apache-tools-2.4.29.ebuild 2674 SHA256 e1192010d093e007643ba1d6f43e62590969e8b6e72351fd256e2853b4bde00f SHA512 0c389a3b8f5edb9b63b2248ab05e9441478cfd7f801bd9e389845c4ffbe7521d09f21b78f91d681935ac8ce8615f55782ed8bfe1f79fb5756f718f095b2fe89f WHIRLPOOL e27f202caed6995f9c0911e6a75d02d84bbc4cf5f5758400c2cbfb83143f3fdff0685ce7ee95194a7fa8f1a86bb4e153e98eda1c0aeae1bdc559e7b850ed8c45 MISC ChangeLog 10183 SHA256 4160609514d162d5b28196a6b3a90b27cbb38ca71e9f4a8abdbae628d76a8e66 SHA512 b53f5eae871b1183b7230969cca04477a09cb263e5f6a95744831247d8c65aa95fbe5d639a184a4136de537223745500e43f36982c77d3bb0243158bd74ef664 WHIRLPOOL 8c9a2298544d2c4a91470ef3147e34e750a0cc687882511a8f6273c3073ec878a5e60536af3edab0d16d664daa57c6ce233016ca07536ae5784e2f332bed0c9a MISC ChangeLog-2015 27945 SHA256 5d6bee2eac0905e873ea8986ec7bc3d4bee37581d931c09e55e6ab8c414b2d83 SHA512 f2f602931d36aaec1068c643729dabc4cc30c2a936cd418f48cef14dcc25d0e6eebb79cd003667a38e82e0eddbc2c5f6b35801314c1d0fce08643713ceeb00e4 WHIRLPOOL 01ed580519a15a2b7d4b89a1ed5f7bd223eefbd6e4d3804802ae5970f08125c02b64db936c6f401075844f2a5e608499cad29963cc21d97bb3a625d58671146c MISC metadata.xml 508 SHA256 6278b055b895401969703dc8f7a8d49244543e693e77bf57be03485a76f518b2 SHA512 0837c71bf2c7d2c54b7f6e3fcc4f5f1f42b36d6e14a981e38d77089551318db72c731a5d0eef0fd95ca55e69629a790f2e6719ecb59368cd7dd935ebafaa89aa WHIRLPOOL e07c6e0a11487f30d482e847cef17aa6f6c9365f469e5f9debf057a93701d91ca82d014b1d89799abdbbf0203d3ff3713c502bc605c7b74a1179c3330dca256f diff --git a/app-admin/apache-tools/apache-tools-2.2.31.ebuild b/app-admin/apache-tools/apache-tools-2.2.31.ebuild deleted file mode 100644 index 164fa3333408..000000000000 --- a/app-admin/apache-tools/apache-tools-2.2.31.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" -inherit flag-o-matic eutils - -DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm" -HOMEPAGE="https://httpd.apache.org/" -SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="ssl" -RESTRICT="test" - -RDEPEND="=dev-libs/apr-1* - =dev-libs/apr-util-1* - dev-libs/expat - dev-libs/libpcre - kernel_linux? ( sys-apps/util-linux ) - ssl? ( dev-libs/openssl ) - !/dev/null || die - for i in *; do - dosym /usr/sbin/${i} /usr/sbin/${i}2 - done - popd >/dev/null || die - - # Provide a symlink for ab-ssl - if use ssl; then - dosym /usr/sbin/ab /usr/sbin/ab-ssl - dosym /usr/sbin/ab /usr/sbin/ab2-ssl - fi - - # make htpasswd accessible for non-root users - dosym /usr/sbin/htpasswd /usr/bin/htpasswd - dosym /usr/sbin/htdigest /usr/bin/htdigest - - dodoc "${S}"/CHANGES -} diff --git a/app-admin/apache-tools/apache-tools-2.2.34.ebuild b/app-admin/apache-tools/apache-tools-2.2.34.ebuild index 52873291bcea..2b4760c96f25 100644 --- a/app-admin/apache-tools/apache-tools-2.2.34.ebuild +++ b/app-admin/apache-tools/apache-tools-2.2.34.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" IUSE="ssl" RESTRICT="test" diff --git a/app-admin/apache-tools/apache-tools-2.4.29.ebuild b/app-admin/apache-tools/apache-tools-2.4.29.ebuild new file mode 100644 index 000000000000..efe38de48918 --- /dev/null +++ b/app-admin/apache-tools/apache-tools-2.4.29.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit flag-o-matic eutils multilib toolchain-funcs + +DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm" +HOMEPAGE="https://httpd.apache.org/" +SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris" +IUSE="libressl ssl" +RESTRICT="test" + +RDEPEND=">=dev-libs/apr-1.5.0:1 + dev-libs/apr-util:1 + dev-libs/expat + dev-libs/libpcre + kernel_linux? ( sys-apps/util-linux ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + )" + +DEPEND="${RDEPEND} + sys-devel/libtool" + +S="${WORKDIR}/httpd-${PV}" + +PATCHES=( + "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446 +) + +src_prepare() { + default + + # This package really should upgrade to using pcre's .pc file. + cat <<-\EOF >"${T}"/pcre-config + #!/bin/bash + flags=() + for flag; do + if [[ ${flag} == "--version" ]]; then + flags+=( --modversion ) + else + flags+=( "${flag}" ) + fi + done + exec ${PKG_CONFIG} libpcre "${flags[@]}" + EOF + chmod a+x "${T}"/pcre-config +} + +src_configure() { + # Brain dead check. + tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" + + tc-export PKG_CONFIG + + # Instead of filtering --as-needed (bug #128505), append --no-as-needed + #append-ldflags $(no-as-needed) + + # econf overwrites the stuff from config.layout. + ac_cv_path_PKGCONFIG=${PKG_CONFIG} \ + econf \ + --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules \ + --sbindir="${EPREFIX}"/usr/sbin \ + --with-perl="${EPREFIX}"/usr/bin/perl \ + --with-expat="${EPREFIX}"/usr \ + --with-z="${EPREFIX}"/usr \ + --with-apr="${SYSROOT}${EPREFIX}"/usr \ + --with-apr-util="${SYSROOT}${EPREFIX}"/usr \ + --with-pcre="${T}"/pcre-config \ + $(use_enable ssl) \ + $(usex ssl '--with-ssl="${EPREFIX}"/usr' '') + sed -i \ + -e '/^LTFLAGS/s:--silent::' \ + build/rules.mk build/config_vars.mk || die +} + +src_compile() { + emake -C support +} + +src_install() { + emake -C support DESTDIR="${D}" install + dodoc CHANGES + doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \ + docs/man/{htcacheclean,rotatelogs}.8 + + # Providing compatiblity symlinks for #177697 (which we'll stop to install + # at some point). + pushd "${ED}"/usr/sbin >/dev/null || die + local i + for i in *; do + dosym ${i} /usr/sbin/${i}2 + done + popd >/dev/null || die + + # Provide a symlink for ab-ssl + if use ssl; then + dosym ab /usr/bin/ab-ssl + dosym ab /usr/bin/ab2-ssl + fi +} -- cgit v1.2.3