summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2014-04-16 14:11:04 +0000
committerLars Wendler <polynomial-c@gentoo.org>2014-04-16 14:11:04 +0000
commit1885a2c0986c62546d5e75738c6f3ac51375aa4d (patch)
treeac9f68285a12318dbbc23dfaf9a34b7ad8f24b1d /app-admin/apache-tools
parentLinux patch 3.4.87 (diff)
downloadhistorical-1885a2c0986c62546d5e75738c6f3ac51375aa4d.tar.gz
historical-1885a2c0986c62546d5e75738c6f3ac51375aa4d.tar.bz2
historical-1885a2c0986c62546d5e75738c6f3ac51375aa4d.zip
Version bump. Removed old
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0x981CA6FC
Diffstat (limited to 'app-admin/apache-tools')
-rw-r--r--app-admin/apache-tools/ChangeLog8
-rw-r--r--app-admin/apache-tools/Manifest32
-rw-r--r--app-admin/apache-tools/apache-tools-2.2.27.ebuild92
-rw-r--r--app-admin/apache-tools/apache-tools-2.4.7-r1.ebuild95
4 files changed, 115 insertions, 112 deletions
diff --git a/app-admin/apache-tools/ChangeLog b/app-admin/apache-tools/ChangeLog
index a5884182adb7..d96555466c6e 100644
--- a/app-admin/apache-tools/ChangeLog
+++ b/app-admin/apache-tools/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-admin/apache-tools
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.178 2014/03/18 18:48:45 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.179 2014/04/16 14:11:03 polynomial-c Exp $
+
+*apache-tools-2.2.27 (16 Apr 2014)
+
+ 16 Apr 2014; Lars Wendler <polynomial-c@gentoo.org>
+ +apache-tools-2.2.27.ebuild, -apache-tools-2.4.7-r1.ebuild:
+ Version bump. Removed old.
*apache-tools-2.4.9 (18 Mar 2014)
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index fd623712caca..9eab66cfe4e6 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -6,29 +6,29 @@ AUX apache-tools-2.4.7-Makefile.patch 1695 SHA256 69e1d6f232cb887d516b36a38c4bff
DIST httpd-2.2.24.tar.bz2 5490439 SHA256 0453f5d2d7e3b1975a1c6a8a22b6d6ff768715a3b0a89b51e5f7b5851628fad7 SHA512 e1c24535bb0ae309c249c0a6fbd390064a929d960241e5e68737744f120a88b615bd5d9065fc2f749ee664ed96621c9373576e6ca32bd189d625fcd4dc1b8f01 WHIRLPOOL b24bf388e1be29cc52341d66af00318b3a60ad6db6b4df8c6cc0abf496c4e603d3b733529d21d3d1c37dad0008cacafa8078abdff6c25cb42b3874b6e176713e
DIST httpd-2.2.25.tar.bz2 5524905 SHA256 4bcaf3524796a514b31aa5c64ce80b0cdb484bab5735416de29d00f6d50fa65a SHA512 4750e79bdab4ca28c602a808531dfc1482e86bf425d5cb3bcb42a9ccfbbfde5bfd05e66649ea741523c96de6582f5e12facbb1e7d67257bcf78a3ed7a66f80d9 WHIRLPOOL 7ce37be9b66de24cc7259c6e8a0696b496c893933b1c5dbdff5147c279fb644b5d5fc77ed02531b0f081f0c217f684d1bcd98bac26938b23c1d7a4ec085162f6
DIST httpd-2.2.26.tar.bz2 5390190 SHA256 af908e3dd5673f1c6f0ccc615e11d435e77517940af00e518e68ea25284b42b6 SHA512 d66bef511acfc9b0daea699c83c282a88351f6820369a6ed70c71a192a90911c6d28491d845e545a50dd394241e16e41338c054844cddcffc49af99c6208ec41 WHIRLPOOL 9ac6e8f38144b701201d87d9010a79314f331cc696660358c1cd6a27e8a712910d6cf6796156dfa2aef9aeea64d47550afc9b2afa3984afd6c8f4519d6f61744
-DIST httpd-2.4.7.tar.bz2 5004719 SHA256 64368d8301836815ae237f2b62d909711c896c1bd34573771e0ee5ad808ce71b SHA512 35500788e1a8b5813bbc0ee0f647ec4acb5b13c27bf5d826691487ea23ee27d4a3babea766fa70f960eb347f6e2c243d1315bb2f1aa082509e632560e7eef562 WHIRLPOOL b82065bec3d6b24ec39282f07d05e4e8ee64599679c68c2879841b359e1326ba9773f13d6c5cd5df1a1d23a641e330fcaab8b363b65eddeb1aba1733f82941c5
+DIST httpd-2.2.27.tar.bz2 5616798 SHA256 205973ded6ca55c056ce9c84d73ab708f7829f330193bd39b651463b8d4f8147 SHA512 b318c157392e5c602d42eb52c8d7f1bd7258c817756fd20dcec8a8a177af3e42db4e25891473646c293ace42bc5d5608de083a14878ed446b8559709492bbf1d WHIRLPOOL c80c56d511586c87d6eb41eb8f5c00317d101b7532b127d50531409f4068aceba1022b16cf2ab122d91edcd9552fcae8543e8a31fbab78564dcd2e057b29e0f1
DIST httpd-2.4.9.tar.bz2 4994460 SHA256 f78cc90dfa47caf3d83ad18fd6b4e85f237777c1733fc9088594b70ce2847603 SHA512 3a66302e18a2d165b3851665dc73be7d3849fc3359c1ff9dd9e2eaebf1f1d8fb89b7b0a05929d6247750bf0ed1abf9cf3c236a373b2d99635c8ca41698719c96 WHIRLPOOL 735677695d3b1497d554dd3e8d97733359140f3bb524335ab474275ca2b5546ceab8f5f3778948fabee2d152bf5b096d99b3dabb1011a4b68905c7cd5012a648
EBUILD apache-tools-2.2.24.ebuild 2293 SHA256 0562cdb559c38cfab4eb577aac8d56f2b527e8cabac237fe05b0106514fc6abb SHA512 b3659de96fa11a52999b9e724a67884dccb2c615e67b85aad4e9bde7438ca1c53cc5cc16379ec6fe42518e997192746e2b4f2a89d3c1e02d419f3d389715805b WHIRLPOOL a96faa218466cfa48bcff3e424aabcd34a1c58a22a31bfb92b83b4a3c382da5d697fa0003ace7e3160c2a9e532e11a7eeb1f461dd0ee59a5646315f6e472cec9
EBUILD apache-tools-2.2.25.ebuild 2293 SHA256 fff4f2fe5a2ac60c51a3a097536c8ffe51fc72ab24e22fdc09b0ff8431ab1472 SHA512 c75b85360ab625898b79eca4867589e168f1784b1b296e67071e29ea26c9e76e7105d255f270116f8958b293a53e48833cc54319b282ee9cebf9187f2c52ca62 WHIRLPOOL 0505e126171f58f05f65431a569b12dee30da60514ee063542ba98934eb92b7eea05b4e5c4817408ad0eb30757fc6110230f58f52ce8479d6f1438ff8b852bb7
EBUILD apache-tools-2.2.26.ebuild 2304 SHA256 05f2a55971059d10270af92157bf5aa6c0a1dabdaeb2f643536d94b67131dc87 SHA512 a714cfa882da3b9fb671e0c7dbe880e8447905f310fae7b530d8a3338f7def9a29f3817c3a82432ef45f72c5959bce71df1a23911131a5b57eaefc71062e5e41 WHIRLPOOL 35b637536efd72f7aaf731135ebcac3a58cbfa47c185ababce1002ff4db565648decfb304a1ae8e4b2931bb89f75dac7ed3679e4324a8eaa7c4bddf66b7de92f
-EBUILD apache-tools-2.4.7-r1.ebuild 2651 SHA256 06d9cc970a8b24f43a4a2e5773cae504c576794b6888462ba7cedac2e1cfd23f SHA512 d4b65e2507f57b0b1ba973fc0e8202e7484f4d87ce1bfeab91fa8bfafe5813eb99549995edd7f7312200538253ac463e80d9ccd0f275da6260b414abb7afe4b1 WHIRLPOOL e8baa9957bac8ed9b5ab5c4804c51392a9d6e098f9b7f99999ba5fa66486c99b2130ef00eb9de8fe1374b770e171335e7b1f71403ee51f5bc585c7ba297c3b2f
+EBUILD apache-tools-2.2.27.ebuild 2310 SHA256 21ac4105da8294cc2684ddf7a3adae8765cb35c439813f64483b114f39f19910 SHA512 db6fea8306bdb6855044d748c1e61e502a60d252c0bf6d52b3e38daafee5b9e2593f2963e2fd3b348a21ed86ffceed8805ba56d31aeeb5d69bbb11ddd02cde92 WHIRLPOOL 01ef7a4f29656c296fac4df324e71d315522c4f0a76d8040a10cb036f422438c2870d63e5de94463eddb8b2d97880818fdb0cee9c41dca55d334a62bf721c537
EBUILD apache-tools-2.4.9.ebuild 2654 SHA256 60370b7dbbe5b6bcd0ef7fbd9955c7736b858ce36ad7d4cec4ea15fa77a52f77 SHA512 6f100df08e950180d03e94e90d478d5fc95528270073cd17808112befdd5c315a6fa2859c8a561058eeaee4b3a5eb197c588d57e3c327f95d27ee9815a6a2c88 WHIRLPOOL 8de719407decf4b79fc09b5d2549f7f863ba00bb3c701d410edea225a9ac9dd38043f0021d6cd3c590aec620af02cd601ca102c77bf26b07b4f6e30521ce48d4
-MISC ChangeLog 23982 SHA256 d5e41b1e0741a8a83d4403b2d98d8aa596f324e6494d36addeb665ff208c79bf SHA512 966a2a2b5a38680e6aefb1a16c1f67a6b9a1a8bf1802a0c31bfb8198f16e6e36fe616f96c1d066f9cb47165db94e8d978232d6b8d44f623be97894d7f3c2f17a WHIRLPOOL b38cc6269d00794d465895eba96609a709140fa3b9eb43d900357ef01533db0ea5b4f7461e35412f66782ee81448f55c6d0bc0e686d30f8a1477c58e64c6dee4
+MISC ChangeLog 24164 SHA256 dd692425be72e4e8c12ac77815566e35a1df715eadf915186893c38b6ae7ed5b SHA512 8ae108d044a4eb58a03823829517c96c4479d8c8b68b098d47dd26455c95afe95e8141b7a52748092343b78e170df3de5241c89505e1524f98a875e7c3bf81e3 WHIRLPOOL b68ac05e1a2f6b73509b4a0db3b3dacf068494097fe460d071670ae7064ab62777f92140194f3e0d163046a1fa05da987c9ab9024037d78579d4c7ccb2a74505
MISC metadata.xml 587 SHA256 7a663c163db27db13913e30a4936a622ffd9d0bb8718645e6267db0ff274c072 SHA512 9554e1963db41540801093b18efbfc1b85b2662ceef2b4e061065b4464a2de35212ae64257541261573d0c39c58a1e02d5da1b0fe139fede0aa9d9114a6fce7b WHIRLPOOL 14cf07a79457057ef8b2c97d663ce7d0ece8a7770c6fd60af1aaa9b4e187e0f823863629a991a0730c965407fae882f668756c7a68f3ad441ecb049a345d12eb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQIcBAEBCAAGBQJTKJUOAAoJEPiazRVxLXTFND8P/0S4jaVNXJKYnP9VJqx0X1MY
-ejSSysMDsiO5tW8mnTmaWAfwyk2gWfUhskAEsDBlqsOwYXUE1a1zPS3z2iREPM8w
-xiutjyeMPsOSEYe+JNqD1Tb/XNrC8Y/uuEsgfKKe2TDcukUiji2hyPPPVPubtrcW
-CfKsnEJfhgBKTdOf9yMcD8SeYDRoYOiQmzRdOex4TdwuMa0Zt3W3/0hhYORx94Pf
-WPGzELnpiYDG2Zxhx3H5LJsXRWEVaWorINP+UOhiNZom64uxuRDSdEeH4uHLLfYD
-YplSKn+vV/qoZYHcs1DmFNCDITacqDEJ4AmSYqzqcGaY16YjKKOY3Erwu+hFmQ9R
-j6v0Rhv/PsB+NNwePNsl+oqLNM9Zt6jdTYifNB0hqIxRkQXF2c9kJOodmbkndtEW
-gJinB/7/3aE9m0iMLBIfouPpnLq6CrTP4lzE4mLO2bRSJ9LMNrGkchzeIsh4RHCL
-qLiYqtS0CNPav+S4o/1JlIYVyTDkNInbL/AK6X/R+lIq+9CYX4PpqF3n79pcAD+t
-0aYcoCVNae7jCT4lZiRCLY0dUJHWz0bm8MG8PHPU8evyAw2mlzNt0svdEMNy6Weo
-2gfD23WrZCv0I5ir4hgIYPvIXzQ4fc0CnmpOoBGDIKtT4oK/iHG1ciMHUp5yP/XL
-YVY8P4/j+bxpASOeL80d
-=OQQC
+iQIcBAEBCAAGBQJTTo94AAoJEPiazRVxLXTFq3EQAKso4w/Ii5nyXXXRs4nqM4Eo
+WppXp/8GBvwlG8y7UVWAxzY2CjxRYNJApGStX0noF2XpTb6kVtSxsgDiJr7nTga3
+pzNpykJeAZw7EV338NAxhOmmtoTPM7OoUyfn0mYQP4tiLvDljeTqx7H7RBSciofq
+gkfXbNSaTmfyTa+dt1KqfgY2BsjBfMlAUjPUMDFp6kO3ez0/dRVwqVLGaI+FVGFY
+SDPLEMB/t0NiKV4YVo8SqEcaMdTNf1dVOXxU3I0Qf2qO2zxUtJEoigkzTqEtRwwM
+BMd4ys/mO61GkebC7KdTSWpC3nDl6aHfK51m2omq3IFGegD8rO8e3iAdfljLYj8b
+45SBTlMSY55WrhuWe/2TeQoXw/wgvf1TeT352I63iyX0ZPOIHgpn9YNYw+TZ/ajL
+wtLVOijdVCiwqrAatSBpZMiPIjS8ai0F9CljzD01JLuiCAb07xZPqvW0WTjUy6w9
+h9qx7Q/QFNoaxdctWCCDiaVXu/fVSuOFlkUaBcvnBxJ4b2EzEo6gyL8j/N3cX8xQ
+I6gWoYYXkMlZEKkskiPZXyso5oW1GkaLVdUPW9wf7y/7dJEy1Ral3fPOuuoobkrJ
+y9/zcCka2Hm+uikirqzDwNO2usQ/DEjVU/ZyoTYTIAdOmlRn2IWt+k6GYKEub2m8
+Y+/BdbOvLBbYBMYdU5s0
+=RHZ8
-----END PGP SIGNATURE-----
diff --git a/app-admin/apache-tools/apache-tools-2.2.27.ebuild b/app-admin/apache-tools/apache-tools-2.2.27.ebuild
new file mode 100644
index 000000000000..96abd2988276
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.2.27.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.27.ebuild,v 1.1 2014/04/16 14:11:03 polynomial-c Exp $
+
+EAPI="4"
+inherit flag-o-matic eutils
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="http://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/libpcre
+ ssl? ( dev-libs/openssl )
+ !<www-servers/apache-2.2.4"
+
+DEPEND="${RDEPEND}
+ sys-devel/libtool"
+
+S="${WORKDIR}/httpd-${PV}"
+
+src_prepare() {
+ # Apply these patches:
+ # (1) apache-tools-2.2.20-Makefile.patch:
+ # - fix up the `make install' for support/
+ # - remove envvars from `make install'
+ epatch "${FILESDIR}"/${PN}-2.2.20-Makefile.patch
+}
+
+src_configure() {
+ local myconf=""
+
+ # Brain dead check.
+ tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+ # Instead of filtering --as-needed (bug #128505), append --no-as-needed
+ append-ldflags $(no-as-needed)
+
+ use ssl && myconf+=" --with-ssl=/usr --enable-ssl"
+
+ # econf overwrites the stuff from config.layout, so we have to put them into
+ # our myconf line too
+ econf \
+ --sbindir=/usr/sbin \
+ --with-z=/usr \
+ --with-apr=/usr \
+ --with-apr-util=/usr \
+ --with-pcre=/usr \
+ ${myconf}
+}
+
+src_compile() {
+ cd support || die
+ emake
+}
+
+src_install () {
+ cd support || die
+
+ make DESTDIR="${D}" install
+
+ # install manpages
+ doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm}.1 \
+ "${S}"/docs/man/{htcacheclean,rotatelogs,ab,logresolve}.8
+
+ # Providing compatiblity symlinks for #177697 (which we'll stop to install
+ # at some point).
+ pushd "${D}"/usr/sbin/ >/dev/null
+ for i in *; do
+ dosym /usr/sbin/${i} /usr/sbin/${i}2
+ done
+ popd "${D}"/usr/sbin/ >/dev/null
+
+ # 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.4.7-r1.ebuild b/app-admin/apache-tools/apache-tools-2.4.7-r1.ebuild
deleted file mode 100644
index 864d2cc9c00c..000000000000
--- a/app-admin/apache-tools/apache-tools-2.4.7-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.7-r1.ebuild,v 1.3 2014/01/31 08:24:41 vapier Exp $
-
-EAPI=5
-inherit flag-o-matic eutils multilib toolchain-funcs
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="http://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 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
-IUSE="ssl"
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/apr-1.5.0:1
- dev-libs/apr-util:1
- dev-libs/libpcre
- ssl? ( dev-libs/openssl )"
-
-DEPEND="${RDEPEND}
- sys-devel/libtool"
-
-S="${WORKDIR}/httpd-${PV}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.4.7-Makefile.patch #459446
-
- # This package really should upgrade to using pcre's .pc file.
- cat <<-\EOF >"${T}"/pcre-config
- #!/bin/sh
- [ "${flag}" = "--version" ] && set -- --modversion
- exec ${PKG_CONFIG} libpcre "$@"
- EOF
- chmod a+x "${T}"/pcre-config
-}
-
-src_configure() {
- local myconf=()
-
- # 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)
-
- use ssl && myconf+=( --with-ssl="${EPREFIX}"/usr --enable-ssl )
-
- # econf overwrites the stuff from config.layout, so we have to put them into
- # our myconf line too
- 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 \
- "${myconf[@]}"
- 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
- local i
- for i in *; do
- dosym ${i} /usr/sbin/${i}2
- done
- popd >/dev/null
-
- # Provide a symlink for ab-ssl
- if use ssl; then
- dosym ab /usr/bin/ab-ssl
- dosym ab /usr/bin/ab2-ssl
- fi
-}