aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanno <hanno@gentoo.org>2014-07-22 23:22:36 +0200
committerHanno <hanno@gentoo.org>2014-07-22 23:22:36 +0200
commit9c6c59728dafd4e4375f5ec89f5ff1b2d7d26ee8 (patch)
treec76ae72ddc11332902f6d27064bb9e3bb66ba3e9 /app-admin
parentsecond apache-patch, fix was incomplete (diff)
downloadlibressl-9c6c59728dafd4e4375f5ec89f5ff1b2d7d26ee8.tar.gz
libressl-9c6c59728dafd4e4375f5ec89f5ff1b2d7d26ee8.tar.bz2
libressl-9c6c59728dafd4e4375f5ec89f5ff1b2d7d26ee8.zip
add apache-tools as a dependency of apache 2.4.10
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/apache-tools/Manifest4
-rw-r--r--app-admin/apache-tools/apache-tools-2.4.10.ebuild91
-rw-r--r--app-admin/apache-tools/files/apache-tools-2.4.7-Makefile.patch47
-rw-r--r--app-admin/apache-tools/metadata.xml13
4 files changed, 155 insertions, 0 deletions
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
new file mode 100644
index 0000000..b0f4cb3
--- /dev/null
+++ b/app-admin/apache-tools/Manifest
@@ -0,0 +1,4 @@
+AUX apache-tools-2.4.7-Makefile.patch 1695 SHA256 69e1d6f232cb887d516b36a38c4bff1e10d36ed91fd1776cb7029b798525f2f7 SHA512 f597ce5503e590ed5b2621c04dcf0a571a73b70f144df7fe4e5fb7329a4f1558a5eb16913fe3d7c58ac1030f46cd2b1882e08d0f62106fbf8d40a8677c6b9448 WHIRLPOOL 6962efc88b83d7a42029440c0abbdbda92c71a6c7ffda98072756e25ed54060050bdec1115550de76cf5fd1802cf3a7fd156796ccdb8c1c4139f375be8ade7c1
+DIST httpd-2.4.10.tar.bz2 5031834 SHA256 176c4dac1a745f07b7b91e7f4fd48f9c48049fa6f088efe758d61d9738669c6a SHA512 e251f5b330da17a8920c589b9e0326d6dd45db28923167718db27b0af2edf769607e9ae6fbb859afbf0c345937fd59053423a2d74bd18ff2272a0f6a19a6496f WHIRLPOOL c9f81296052a61483ceef4ae4b4c467cf64a4035030472dc8c17355f572a4887ddc6179ade2a764a4e3f0cd4ab7cc34a3fa36577a148c3df7b8d44a5f1f0424d
+EBUILD apache-tools-2.4.10.ebuild 2588 SHA256 2c649824a10d2d570b2e4432439263f91e03a6c7b4d89f934bf7647d55500a77 SHA512 ccde8f65621468e3654cb47d15c3c4c3c08d02b2cb0502a815e2274f7a15633d9775993129b359fa1d254d39fc144e0a13ff93731717fdc0a2e7263b835eceaf WHIRLPOOL 37823087ad38978742694339a14682fc5946e15668696aba7fcbd307ac65c0351e5b1802a73dc810c02a9bdebed190a48d84b1ce1674ebb84dc2d64d99916b83
+MISC metadata.xml 494 SHA256 0f4f12f8ac67c0049e4fd82fe8f5e15d9e7bedf2dc1d6c8a0950c596d897e67a SHA512 5e60a3af9bb8dfcae4d980d03f7a21f8454adea57c81110989da85aa31b0ca82e1293475b22c17a65220609f5b4a1f11bc14c4536fd4e650c2bbba7fde2b92f0 WHIRLPOOL 837e5f0e5548403c696c344cb53d24f5faebc2699a4351aa8d5ad053b92e8c0f0af64469aedd14dd6bafe16a0104ec59e9268e370fee2e9a5ebd8c90d805c161
diff --git a/app-admin/apache-tools/apache-tools-2.4.10.ebuild b/app-admin/apache-tools/apache-tools-2.4.10.ebuild
new file mode 100644
index 0000000..e177e19
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.10.ebuild
@@ -0,0 +1,91 @@
+# 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.9-r1.ebuild,v 1.1 2014/05/22 14:01:25 polynomial-c 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() {
+ # 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)
+
+ # econf overwrites the stuff from config.layout.
+ 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 \
+ $(use_enable ssl) \
+ $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+ 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/files/apache-tools-2.4.7-Makefile.patch b/app-admin/apache-tools/files/apache-tools-2.4.7-Makefile.patch
new file mode 100644
index 0000000..b7d3c27
--- /dev/null
+++ b/app-admin/apache-tools/files/apache-tools-2.4.7-Makefile.patch
@@ -0,0 +1,47 @@
+https://bugs.gentoo.org/459446
+
+https://raw.github.com/archlinuxcn/repo/master/apache-tools/apache-tools-Makefile.patch
+
+--- a/support/Makefile.in
++++ b/support/Makefile.in
+@@ -1,9 +1,9 @@
+ 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
+
+-bin_PROGRAMS = htpasswd htdigest htdbm ab logresolve httxt2dbm
++bin_PROGRAMS = htpasswd htdigest htdbm ab logresolve httxt2dbm dbmmanage
+ sbin_PROGRAMS = htcacheclean rotatelogs $(NONPORTABLE_SUPPORT)
+ TARGETS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
+
+@@ -15,26 +15,18 @@
+ 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 dbmmanage; do \
++ @for i in $(bin_PROGRAMS); do \
+ if test -f "$(builddir)/$$i"; then \
+ cp -p $$i $(DESTDIR)$(bindir); \
+ chmod 755 $(DESTDIR)$(bindir)/$$i; \
+ fi ; \
+ done
+- @for i in apachectl; do \
++ @for i in $(sbin_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.lo: passwd_common.h
+ passwd_common.lo: passwd_common.h
diff --git a/app-admin/apache-tools/metadata.xml b/app-admin/apache-tools/metadata.xml
new file mode 100644
index 0000000..0530e46
--- /dev/null
+++ b/app-admin/apache-tools/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>polynomial-c@gentoo.org</email>
+ <name>Lars Wendler</name>
+ </maintainer>
+ <longdescription lang="en">
+ app-admin/apache-tools contains tools that might be useful without
+ having apache itself installed (like htdigest/htpasswd, but also ab -
+ the apache benchmark).
+ </longdescription>
+</pkgmetadata>