diff options
Diffstat (limited to 'app-admin/apache-tools')
-rw-r--r-- | app-admin/apache-tools/Manifest | 8 | ||||
-rw-r--r-- | app-admin/apache-tools/apache-tools-2.4.43.ebuild | 105 | ||||
-rw-r--r-- | app-admin/apache-tools/apache-tools-2.4.46.ebuild | 7 | ||||
-rw-r--r-- | app-admin/apache-tools/apache-tools-2.4.47.ebuild (renamed from app-admin/apache-tools/apache-tools-2.4.41.ebuild) | 11 |
4 files changed, 9 insertions, 122 deletions
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest index 266a9ab6d877..7165fca6d557 100644 --- a/app-admin/apache-tools/Manifest +++ b/app-admin/apache-tools/Manifest @@ -1,8 +1,6 @@ AUX apache-tools-2.4.7-Makefile.patch 1695 BLAKE2B 8fac145613ac9f587e49bc6932c5712b7d7cad0d91422e11701edd24152e1d33907cbf31e3bef709555253759cea72199d4537df5d20d3ce9ca5dc898ba26779 SHA512 f597ce5503e590ed5b2621c04dcf0a571a73b70f144df7fe4e5fb7329a4f1558a5eb16913fe3d7c58ac1030f46cd2b1882e08d0f62106fbf8d40a8677c6b9448 -DIST httpd-2.4.41.tar.bz2 7072373 BLAKE2B 88a2390736209d5ef04bffcb867bc8d6019302885e6f3cc63d18123336d4d0657252105a3bfebf4e91b8daa02119d4a61f4c0a9702244858a3193ec6cf681c0f SHA512 350cc7dcd2c439e0590338fa6da3f44df44f9bb885c381e91f91b14c2f48597f6f0bbac0ea118a8a67eaa70ae7edbb769beace368643ed73f6daee44c307b335 -DIST httpd-2.4.43.tar.bz2 7155865 BLAKE2B cd85c7e25500f8f1b4bd6ac5f715718a61bf548dfaf36408a970d27bacbfce256e4dda255ba5b62f89e117c335d0568d6207c93e5fb0d2b1ee84dba4ce0d4bd7 SHA512 16cfeecc8f6fab6eca478065a384bdf1872f7ac42206b0bc2bcac6c0d9c576f392c07107201f39e0601dec1bbafcb33d66153544de4d87d79b9a52094d334b64 DIST httpd-2.4.46.tar.bz2 7187805 BLAKE2B 2cd8a40be0b7b60ae5b06a286aa6dd801b8615fd0483a4653ceea6f9832c9ebb111f67ba4f69827b01acd1e5552e70ac0441df49573c9da0ca26d4c2f589f0bc SHA512 5936784bb662e9d8a4f7fe38b70c043b468114d931cd10ea831bfe74461ea5856b64f88f42c567ab791fc8907640a99884ba4b6a600f86d661781812735b6f13 -EBUILD apache-tools-2.4.41.ebuild 2524 BLAKE2B 3b2d9368d0cb3088062990484ee7867c6ff3eb2fe82d05b61d34135d8e0b1d1582b8d145e676735f8946539c77158a4d9b6a490d4218e5a751f07fdc05374185 SHA512 2fd21ee79b0822f4ab410e571b27a0ee4b42f66929958cbeeffd10865917592682d9cf1b6b32600a870275b96b4b733a208cfd5a8e8f64980799c53bc0b5d0c9 -EBUILD apache-tools-2.4.43.ebuild 2524 BLAKE2B 3b2d9368d0cb3088062990484ee7867c6ff3eb2fe82d05b61d34135d8e0b1d1582b8d145e676735f8946539c77158a4d9b6a490d4218e5a751f07fdc05374185 SHA512 2fd21ee79b0822f4ab410e571b27a0ee4b42f66929958cbeeffd10865917592682d9cf1b6b32600a870275b96b4b733a208cfd5a8e8f64980799c53bc0b5d0c9 -EBUILD apache-tools-2.4.46.ebuild 2524 BLAKE2B 3b2d9368d0cb3088062990484ee7867c6ff3eb2fe82d05b61d34135d8e0b1d1582b8d145e676735f8946539c77158a4d9b6a490d4218e5a751f07fdc05374185 SHA512 2fd21ee79b0822f4ab410e571b27a0ee4b42f66929958cbeeffd10865917592682d9cf1b6b32600a870275b96b4b733a208cfd5a8e8f64980799c53bc0b5d0c9 +DIST httpd-2.4.47.tar.bz2 7187445 BLAKE2B ba5b6ebac73aaa6f2f0d7a34d5bf9d13bd4ac862ee9d04b105c315c3aad16401b842b6901424dba6a44a0b5d255c0356e0bf72b5d1898b4b091b12192c204c96 SHA512 ac05e878604037572b484c32c767e022bf027e5efa2a2ed28472939d9f536448f1536ede4d809f1e913a29a0247bdd27981bd00d3d8614f978573c14bce7c7af +EBUILD apache-tools-2.4.46.ebuild 2460 BLAKE2B b472d42e496a6af6baca2790f6b1ed330353d169f721f41af04a27f9660f6d9f5fcff220cf63f8369675f202a29d7509c1872a0a9a340ce10a338a67769a46dc SHA512 667f5a2b8d53f03587b982275cc4b0e8ed8c5d814fb93fae6f589b2438a7bce7895259f54f70a89a9a7b7b3af3846c2c51292c5c4af3a7e53feb6457a5743b1f +EBUILD apache-tools-2.4.47.ebuild 2469 BLAKE2B 7c4e2b191bfa166d7c89eec4febf97619b7f6cdc49c429d701c9b5401fea022a792a60ba77b27d959dbd5e3ef53d2e754eed0f10d067915b59b349a8b3736edf SHA512 ca8a17e6cfa9a420d79d967a172bc8f520aceee1f95c98bec69e4bc402df4c1c1a97f4187d09fda71b74043b5fe6e3408e1e25245a98ff92948963a0ba088a92 MISC metadata.xml 468 BLAKE2B 850e5a23a188280992a745276f7466b0287d4e1ca9dee8c61046612273bf7484c24e60d95ccc6637c65c88d851719bed812e2c1f3e951fdca1c7058c68aaa0db SHA512 d9b6eabeaba642f760ceca4b4b39b5db7bae5369c6766ce230c5cf0949e3152affa6ec5116ffa4ead983d987387c767600b8f36ebe1b8cf1323ed5c2cb14fab2 diff --git a/app-admin/apache-tools/apache-tools-2.4.43.ebuild b/app-admin/apache-tools/apache-tools-2.4.43.ebuild deleted file mode 100644 index 42dcd53ef1e3..000000000000 --- a/app-admin/apache-tools/apache-tools-2.4.43.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit flag-o-matic 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 || die -} - -src_configure() { - # Brain dead check. - tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" - - tc-export PKG_CONFIG - - local myeconfargs=( - --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' '') - ) - # econf overwrites the stuff from config.layout. - ac_cv_path_PKGCONFIG=${PKG_CONFIG} \ - econf "${myeconfargs[@]}" - 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 -} diff --git a/app-admin/apache-tools/apache-tools-2.4.46.ebuild b/app-admin/apache-tools/apache-tools-2.4.46.ebuild index 42dcd53ef1e3..6e6a05fad334 100644 --- a/app-admin/apache-tools/apache-tools-2.4.46.ebuild +++ b/app-admin/apache-tools/apache-tools-2.4.46.ebuild @@ -11,7 +11,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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris" -IUSE="libressl ssl" +IUSE="ssl" RESTRICT="test" RDEPEND=">=dev-libs/apr-1.5.0:1= @@ -19,10 +19,7 @@ RDEPEND=">=dev-libs/apr-1.5.0:1= dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - )" + ssl? ( dev-libs/openssl:0= )" DEPEND="${RDEPEND} sys-devel/libtool" diff --git a/app-admin/apache-tools/apache-tools-2.4.41.ebuild b/app-admin/apache-tools/apache-tools-2.4.47.ebuild index 42dcd53ef1e3..7383d8780bb2 100644 --- a/app-admin/apache-tools/apache-tools-2.4.41.ebuild +++ b/app-admin/apache-tools/apache-tools-2.4.47.ebuild @@ -10,8 +10,8 @@ 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris" -IUSE="libressl ssl" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris" +IUSE="ssl" RESTRICT="test" RDEPEND=">=dev-libs/apr-1.5.0:1= @@ -19,10 +19,7 @@ RDEPEND=">=dev-libs/apr-1.5.0:1= dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - )" + ssl? ( dev-libs/openssl:0= )" DEPEND="${RDEPEND} sys-devel/libtool" @@ -71,7 +68,7 @@ src_configure() { $(usex ssl '--with-ssl="${EPREFIX}"/usr' '') ) # econf overwrites the stuff from config.layout. - ac_cv_path_PKGCONFIG=${PKG_CONFIG} \ + ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \ econf "${myeconfargs[@]}" sed -i \ -e '/^LTFLAGS/s:--silent::' \ |