summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2008-06-01 11:57:12 +0000
committerBenedikt Boehm <hollow@gentoo.org>2008-06-01 11:57:12 +0000
commitc0e4a3565c58cd29155dc417d5085739505a5f6f (patch)
tree6970cf4112cd4e1420c3eaaef5ebb4f25ea347c7
parentStable on ppc wrt bug 224015 (diff)
downloadhistorical-c0e4a3565c58cd29155dc417d5085739505a5f6f.tar.gz
historical-c0e4a3565c58cd29155dc417d5085739505a5f6f.tar.bz2
historical-c0e4a3565c58cd29155dc417d5085739505a5f6f.zip
fix #219515
Package-Manager: portage-2.1.5.2
-rw-r--r--app-admin/apache-tools/ChangeLog8
-rw-r--r--app-admin/apache-tools/Manifest11
-rw-r--r--app-admin/apache-tools/apache-tools-2.2.8-r1.ebuild95
3 files changed, 108 insertions, 6 deletions
diff --git a/app-admin/apache-tools/ChangeLog b/app-admin/apache-tools/ChangeLog
index 4630878b71ba..cce8c9ff42d8 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.34 2008/02/17 13:13:21 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.35 2008/06/01 11:57:12 hollow Exp $
+
+*apache-tools-2.2.8-r1 (01 Jun 2008)
+
+ 01 Jun 2008; Benedikt Böhm <hollow@gentoo.org>
+ +apache-tools-2.2.8-r1.ebuild:
+ fix #219515
17 Feb 2008; Christoph Mende <angelos@gentoo.org>
apache-tools-2.2.8.ebuild:
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 2d82303e57a7..59081968cfaf 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -5,13 +5,14 @@ AUX apache-tools-Makefile.patch 1528 RMD160 a5f5431ab0170f07d4fd7723a93fb38db103
DIST httpd-2.2.6.tar.bz2 4717066 RMD160 5ae895c6898213e1e3b7e7b02cdfcbe5b36a108f SHA1 e6ef926ecd1f9a412af8c266239f0a6f58c63854 SHA256 f27cd9df50a2acd9df8f37520f62f6ce51758689d425ead5883e75ff5ed6548c
DIST httpd-2.2.8.tar.bz2 4799055 RMD160 0736ea9617bafaa1c8cd34ce4fc1c7a659afea57 SHA1 5074904435d3d942ce2dc96c44b07294b8eaca77 SHA256 2ad8d0db1e478838ba88a0ddaf538c7150027d937b017739fdcb3fabb96ebd39
EBUILD apache-tools-2.2.6.ebuild 2252 RMD160 1a611d347d0d52d42f65d4d209433ceb10061122 SHA1 b0ffac68cb40d2e4af41414b48e870d63d723d33 SHA256 567092c688f853973687c9067733071331909d5990be72882fa445012a16984a
+EBUILD apache-tools-2.2.8-r1.ebuild 2357 RMD160 f7d7227732f07f6eed468d96d98c9f1e30830358 SHA1 fe832539c133e3faa6ca472cb548074bf4663c73 SHA256 e9b9f4f72a8d3eb38facdab74790e2fc7542004d61d3d96966cd526a3ec8d887
EBUILD apache-tools-2.2.8.ebuild 2251 RMD160 86ea9770c339ce210ba06354b390852df638b65c SHA1 d40a33ae36aef5390bf880122d1f0d8d345f09dd SHA256 771a1b486bd9115ed3a00287d7fc4f1476ee077616f2ab89899b36f829a78143
-MISC ChangeLog 4589 RMD160 ec2afaae7bf86c1ad06b456214a1a885f03d066b SHA1 21dd82db32d468a05514d7693f05c50cce2eabe1 SHA256 584f495592d0dfe7a17ae872b1d1abdf9ede16341c9f9c2a8ebb46c730241e72
+MISC ChangeLog 4724 RMD160 a2aefeb25bacf2b18e579220cba06805db1ed509 SHA1 dffa1171aef878fc60ad449d789a29d5d72b1b4f SHA256 56a47f1fcc2e5f87bac274842e5d4dc3acc013d33b93a7fdad23023f160b5bad
MISC metadata.xml 444 RMD160 d8596b5b240df6adafad384c6faaf85e0730a966 SHA1 4083f4a0f8f98832142f9ef9fb1e9581876bf699 SHA256 1f54f0529721d94f50b5bfcda2fad18fab605e4d633c59f4a9c63eee278ab40c
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
-iD8DBQFIArQSj9hvisErhMIRAivcAKDVmuX3bMz2FDFWYooZSVGON2PlAQCffUcy
-kP+lyOTA21KrIZBuoKkUfiE=
-=ohgt
+iEYEARECAAYFAkhCjqUACgkQmPFBzbX68WEaaQCfeZkEdQh4LYqqzSURZQ7EwzWE
+Z2wAoJGYDDcDMsOYI7aBiaWfDfekIBao
+=GkQK
-----END PGP SIGNATURE-----
diff --git a/app-admin/apache-tools/apache-tools-2.2.8-r1.ebuild b/app-admin/apache-tools/apache-tools-2.2.8-r1.ebuild
new file mode 100644
index 000000000000..cf38f972cd4d
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.2.8-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2008 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.8-r1.ebuild,v 1.1 2008/06/01 11:57:12 hollow Exp $
+
+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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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}"
+
+S="${WORKDIR}/httpd-${PV}"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ # Apply these patches:
+ # (1) apache-tools-Makefile.patch:
+ # - fix up the `make install' for support/
+ # - remove envvars from `make install'
+ epatch "${FILESDIR}"/${PN}-Makefile.patch
+}
+
+src_compile() {
+ local myconf=""
+ cd "${S}"
+
+ # Instead of filtering --as-needed (bug #128505), append --no-as-needed
+ # Thanks to Harald van Dijk
+ append-ldflags -Wl,--no-as-needed
+
+ if use ssl ; then
+ myconf="${myconf} --with-ssl=/usr --enable-ssl"
+ append-flags -DHAVE_OPENSSL -DUSE_SSL -I/usr/include/openssl
+ append-ldflags -lssl
+ fi
+
+ # econf overwrites the stuff from config.layout, so we have to put them into
+ # our myconf line too
+
+ econf \
+ --sbindir=/usr/sbin \
+ --with-perl=/usr/bin/perl \
+ --with-expat=/usr \
+ --with-z=/usr \
+ --with-apr=/usr \
+ --with-apr-util=/usr \
+ --with-pcre=/usr \
+ ${myconf} || die "econf failed!"
+
+ cd support
+ emake || die "emake support/ failed!"
+}
+
+src_install () {
+ cd "${S}"/support
+
+ make DESTDIR="${D}" install || die "make install failed!"
+
+ # install manpages
+ doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm}.1 \
+ "${S}"/docs/man/{ab,htcacheclean,logresolve,rotatelogs}.8
+
+ # Providing compatiblity symlinks for #177697 (which we'll stop to install
+ # at some point).
+
+ for i in $(ls "${D}"/usr/sbin 2>/dev/null); do
+ dosym /usr/sbin/${i} /usr/sbin/${i}2
+ done
+
+ # 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
+
+ dodoc "${S}"/CHANGES
+}