commit: 0d1ae7b4a1f347231f7d1b04626c4ee5c2c68ed4 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Mon Mar 26 17:43:34 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Mon Mar 26 17:47:05 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d1ae7b4
Revert "app-admin/apache-tools: Removed depreacated 2.2 version." This reverts commit a5357cd65f35ed983d0f00d3cee198016528ef8a. app-admin/apache-tools/Manifest | 1 + app-admin/apache-tools/apache-tools-2.2.34.ebuild | 85 ++++++++++++++++++++++ .../files/apache-tools-2.2.20-Makefile.patch | 41 +++++++++++ 3 files changed, 127 insertions(+) diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest index 918c246d7cb..0036e53218c 100644 --- a/app-admin/apache-tools/Manifest +++ b/app-admin/apache-tools/Manifest @@ -1,3 +1,4 @@ +DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240 DIST httpd-2.4.27.tar.bz2 6527394 BLAKE2B 50a650eb2edd121dac860ff555273290010d7e85bf4d5fbe3683f82e1928dde99ebfabc42186436f5052a66555a73d8b797b114c76c123faa31b9f51575d0bbb SHA512 7e7e8070715b74cb6890096a74e194f4c6a49c14bda685b1ad832e84312f1ac4316ea03a430e679502bfd8e1853aefa544ee002a20d0f7e994b9a590c74bc42c DIST httpd-2.4.29.tar.bz2 6567926 BLAKE2B 01a83212941abad548f73fc144f9731ff51e0ed8f975e76cb994247601f7c2f89a3f862e011638afb77988eda0ef2b543634fb6bc45b583e9bdba2c30e565731 SHA512 840982fd3d21463bc5c1747f211dfacf3abdf634d149e49bb49fd2e5deda140de602dbdf31e1bbe5337a48f718ab2261c408e83a8dd39a9291ee7b6b7a85639a DIST httpd-2.4.33.tar.bz2 6934765 BLAKE2B 4ff266b85358e3100c8064c84c89db0235e6f46bb4b308e6b3bf642a9c0815eb6a731ee12e3d8ea2bf31a5d5e6621152452f1e8a9625755689f552f2473b1955 SHA512 e74b2b3346d67be45a8bc8a7cbb8eabf5c403a5cfe5797a976f94a539529843fbcdf03b9ca0548816b2cf37f4ce0eb301f8d5af25b1270fdf8dd9f5bf0585269 diff --git a/app-admin/apache-tools/apache-tools-2.2.34.ebuild b/app-admin/apache-tools/apache-tools-2.2.34.ebuild new file mode 100644 index 00000000000..e7272e34483 --- /dev/null +++ b/app-admin/apache-tools/apache-tools-2.2.34.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +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 ~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:0= ) + !<www-servers/apache-2.2.4" + +DEPEND="${RDEPEND} + sys-devel/libtool" + +S="${WORKDIR}/httpd-${PV}" + +PATCHES=( + "${FILESDIR}/${PN}-2.2.20-Makefile.patch" +) + +src_configure() { + # 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) + + # econf overwrites the stuff from config.layout. + econf \ + --sbindir=/usr/sbin \ + --with-z=/usr \ + --with-apr=/usr \ + --with-apr-util=/usr \ + --with-pcre=/usr \ + $(use_enable ssl) \ + $(usex ssl '--with-ssl=/usr' '') +} + +src_compile() { + cd support || die + emake +} + +src_install () { + cd support || die + + make DESTDIR="${D}" install || die + + # 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 || 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/files/apache-tools-2.2.20-Makefile.patch b/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch new file mode 100644 index 00000000000..7bc39527790 --- /dev/null +++ b/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch @@ -0,0 +1,41 @@ +=== modified file 'support/Makefile.in' +--- a/support/Makefile.in ++++ b/support/Makefile.in +@@ -1,9 +1,10 @@ + DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \ +- logresolve.pl phf_abuse_log.cgi split-logfile envvars-std ++ logresolve.pl phf_abuse_log.cgi split-logfile + + CLEAN_TARGETS = suexec + +-PROGRAMS = htpasswd htdigest rotatelogs logresolve ab htdbm htcacheclean httxt2dbm $(NONPORTABLE_SUPPORT) ++PROGRAMS = htpasswd htdigest rotatelogs logresolve ab htdbm htcacheclean httxt2dbm \ ++ $(NONPORTABLE_SUPPORT) log_server_status split-logfile dbmmanage + TARGETS = $(PROGRAMS) + + PROGRAM_LDADD = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS) +@@ -12,22 +13,13 @@ + include $(top_builddir)/build/rules.mk + + install: +- @test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir) + @test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) +- @test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir) +- @cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir) +- @for i in apxs apachectl dbmmanage; do \ ++ @for i in $(PROGRAMS) ; do \ + if test -f "$(builddir)/$$i"; then \ + cp -p $$i $(DESTDIR)$(sbindir); \ + chmod 755 $(DESTDIR)$(sbindir)/$$i; \ + fi ; \ + done +- @if test -f "$(builddir)/envvars-std"; then \ +- cp -p envvars-std $(DESTDIR)$(sbindir); \ +- if test ! -f $(DESTDIR)$(sbindir)/envvars; then \ +- cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \ +- fi ; \ +- fi + + htpasswd_OBJECTS = htpasswd.lo + htpasswd: $(htpasswd_OBJECTS) +
