| 1 |
commit: 0d1ae7b4a1f347231f7d1b04626c4ee5c2c68ed4 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Mar 26 17:43:34 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 26 17:47:05 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d1ae7b4 |
| 7 |
|
| 8 |
Revert "app-admin/apache-tools: Removed depreacated 2.2 version." |
| 9 |
|
| 10 |
This reverts commit a5357cd65f35ed983d0f00d3cee198016528ef8a. |
| 11 |
|
| 12 |
app-admin/apache-tools/Manifest | 1 + |
| 13 |
app-admin/apache-tools/apache-tools-2.2.34.ebuild | 85 ++++++++++++++++++++++ |
| 14 |
.../files/apache-tools-2.2.20-Makefile.patch | 41 +++++++++++ |
| 15 |
3 files changed, 127 insertions(+) |
| 16 |
|
| 17 |
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest |
| 18 |
index 918c246d7cb..0036e53218c 100644 |
| 19 |
--- a/app-admin/apache-tools/Manifest |
| 20 |
+++ b/app-admin/apache-tools/Manifest |
| 21 |
@@ -1,3 +1,4 @@ |
| 22 |
+DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240 |
| 23 |
DIST httpd-2.4.27.tar.bz2 6527394 BLAKE2B 50a650eb2edd121dac860ff555273290010d7e85bf4d5fbe3683f82e1928dde99ebfabc42186436f5052a66555a73d8b797b114c76c123faa31b9f51575d0bbb SHA512 7e7e8070715b74cb6890096a74e194f4c6a49c14bda685b1ad832e84312f1ac4316ea03a430e679502bfd8e1853aefa544ee002a20d0f7e994b9a590c74bc42c |
| 24 |
DIST httpd-2.4.29.tar.bz2 6567926 BLAKE2B 01a83212941abad548f73fc144f9731ff51e0ed8f975e76cb994247601f7c2f89a3f862e011638afb77988eda0ef2b543634fb6bc45b583e9bdba2c30e565731 SHA512 840982fd3d21463bc5c1747f211dfacf3abdf634d149e49bb49fd2e5deda140de602dbdf31e1bbe5337a48f718ab2261c408e83a8dd39a9291ee7b6b7a85639a |
| 25 |
DIST httpd-2.4.33.tar.bz2 6934765 BLAKE2B 4ff266b85358e3100c8064c84c89db0235e6f46bb4b308e6b3bf642a9c0815eb6a731ee12e3d8ea2bf31a5d5e6621152452f1e8a9625755689f552f2473b1955 SHA512 e74b2b3346d67be45a8bc8a7cbb8eabf5c403a5cfe5797a976f94a539529843fbcdf03b9ca0548816b2cf37f4ce0eb301f8d5af25b1270fdf8dd9f5bf0585269 |
| 26 |
|
| 27 |
diff --git a/app-admin/apache-tools/apache-tools-2.2.34.ebuild b/app-admin/apache-tools/apache-tools-2.2.34.ebuild |
| 28 |
new file mode 100644 |
| 29 |
index 00000000000..e7272e34483 |
| 30 |
--- /dev/null |
| 31 |
+++ b/app-admin/apache-tools/apache-tools-2.2.34.ebuild |
| 32 |
@@ -0,0 +1,85 @@ |
| 33 |
+# Copyright 1999-2018 Gentoo Foundation |
| 34 |
+# Distributed under the terms of the GNU General Public License v2 |
| 35 |
+ |
| 36 |
+EAPI=6 |
| 37 |
+inherit flag-o-matic eutils |
| 38 |
+ |
| 39 |
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm" |
| 40 |
+HOMEPAGE="https://httpd.apache.org/" |
| 41 |
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2" |
| 42 |
+ |
| 43 |
+LICENSE="Apache-2.0" |
| 44 |
+SLOT="0" |
| 45 |
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" |
| 46 |
+IUSE="ssl" |
| 47 |
+RESTRICT="test" |
| 48 |
+ |
| 49 |
+RDEPEND="=dev-libs/apr-1* |
| 50 |
+ =dev-libs/apr-util-1* |
| 51 |
+ dev-libs/expat |
| 52 |
+ dev-libs/libpcre |
| 53 |
+ kernel_linux? ( sys-apps/util-linux ) |
| 54 |
+ ssl? ( dev-libs/openssl:0= ) |
| 55 |
+ !<www-servers/apache-2.2.4" |
| 56 |
+ |
| 57 |
+DEPEND="${RDEPEND} |
| 58 |
+ sys-devel/libtool" |
| 59 |
+ |
| 60 |
+S="${WORKDIR}/httpd-${PV}" |
| 61 |
+ |
| 62 |
+PATCHES=( |
| 63 |
+ "${FILESDIR}/${PN}-2.2.20-Makefile.patch" |
| 64 |
+) |
| 65 |
+ |
| 66 |
+src_configure() { |
| 67 |
+ # Brain dead check. |
| 68 |
+ tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" |
| 69 |
+ |
| 70 |
+ # Instead of filtering --as-needed (bug #128505), append --no-as-needed |
| 71 |
+ append-ldflags $(no-as-needed) |
| 72 |
+ |
| 73 |
+ # econf overwrites the stuff from config.layout. |
| 74 |
+ econf \ |
| 75 |
+ --sbindir=/usr/sbin \ |
| 76 |
+ --with-z=/usr \ |
| 77 |
+ --with-apr=/usr \ |
| 78 |
+ --with-apr-util=/usr \ |
| 79 |
+ --with-pcre=/usr \ |
| 80 |
+ $(use_enable ssl) \ |
| 81 |
+ $(usex ssl '--with-ssl=/usr' '') |
| 82 |
+} |
| 83 |
+ |
| 84 |
+src_compile() { |
| 85 |
+ cd support || die |
| 86 |
+ emake |
| 87 |
+} |
| 88 |
+ |
| 89 |
+src_install () { |
| 90 |
+ cd support || die |
| 91 |
+ |
| 92 |
+ make DESTDIR="${D}" install || die |
| 93 |
+ |
| 94 |
+ # install manpages |
| 95 |
+ doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm}.1 \ |
| 96 |
+ "${S}"/docs/man/{htcacheclean,rotatelogs,ab,logresolve}.8 |
| 97 |
+ |
| 98 |
+ # Providing compatiblity symlinks for #177697 (which we'll stop to install |
| 99 |
+ # at some point). |
| 100 |
+ pushd "${D}"/usr/sbin/ >/dev/null || die |
| 101 |
+ for i in *; do |
| 102 |
+ dosym /usr/sbin/${i} /usr/sbin/${i}2 |
| 103 |
+ done |
| 104 |
+ popd >/dev/null || die |
| 105 |
+ |
| 106 |
+ # Provide a symlink for ab-ssl |
| 107 |
+ if use ssl; then |
| 108 |
+ dosym /usr/sbin/ab /usr/sbin/ab-ssl |
| 109 |
+ dosym /usr/sbin/ab /usr/sbin/ab2-ssl |
| 110 |
+ fi |
| 111 |
+ |
| 112 |
+ # make htpasswd accessible for non-root users |
| 113 |
+ dosym /usr/sbin/htpasswd /usr/bin/htpasswd |
| 114 |
+ dosym /usr/sbin/htdigest /usr/bin/htdigest |
| 115 |
+ |
| 116 |
+ dodoc "${S}"/CHANGES |
| 117 |
+} |
| 118 |
|
| 119 |
diff --git a/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch b/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch |
| 120 |
new file mode 100644 |
| 121 |
index 00000000000..7bc39527790 |
| 122 |
--- /dev/null |
| 123 |
+++ b/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch |
| 124 |
@@ -0,0 +1,41 @@ |
| 125 |
+=== modified file 'support/Makefile.in' |
| 126 |
+--- a/support/Makefile.in |
| 127 |
++++ b/support/Makefile.in |
| 128 |
+@@ -1,9 +1,10 @@ |
| 129 |
+ DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \ |
| 130 |
+- logresolve.pl phf_abuse_log.cgi split-logfile envvars-std |
| 131 |
++ logresolve.pl phf_abuse_log.cgi split-logfile |
| 132 |
+ |
| 133 |
+ CLEAN_TARGETS = suexec |
| 134 |
+ |
| 135 |
+-PROGRAMS = htpasswd htdigest rotatelogs logresolve ab htdbm htcacheclean httxt2dbm $(NONPORTABLE_SUPPORT) |
| 136 |
++PROGRAMS = htpasswd htdigest rotatelogs logresolve ab htdbm htcacheclean httxt2dbm \ |
| 137 |
++ $(NONPORTABLE_SUPPORT) log_server_status split-logfile dbmmanage |
| 138 |
+ TARGETS = $(PROGRAMS) |
| 139 |
+ |
| 140 |
+ PROGRAM_LDADD = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS) |
| 141 |
+@@ -12,22 +13,13 @@ |
| 142 |
+ include $(top_builddir)/build/rules.mk |
| 143 |
+ |
| 144 |
+ install: |
| 145 |
+- @test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir) |
| 146 |
+ @test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) |
| 147 |
+- @test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir) |
| 148 |
+- @cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir) |
| 149 |
+- @for i in apxs apachectl dbmmanage; do \ |
| 150 |
++ @for i in $(PROGRAMS) ; do \ |
| 151 |
+ if test -f "$(builddir)/$$i"; then \ |
| 152 |
+ cp -p $$i $(DESTDIR)$(sbindir); \ |
| 153 |
+ chmod 755 $(DESTDIR)$(sbindir)/$$i; \ |
| 154 |
+ fi ; \ |
| 155 |
+ done |
| 156 |
+- @if test -f "$(builddir)/envvars-std"; then \ |
| 157 |
+- cp -p envvars-std $(DESTDIR)$(sbindir); \ |
| 158 |
+- if test ! -f $(DESTDIR)$(sbindir)/envvars; then \ |
| 159 |
+- cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \ |
| 160 |
+- fi ; \ |
| 161 |
+- fi |
| 162 |
+ |
| 163 |
+ htpasswd_OBJECTS = htpasswd.lo |
| 164 |
+ htpasswd: $(htpasswd_OBJECTS) |
| 165 |
+ |
Archives