polynomial-c 14/05/22 14:01:25
Modified: ChangeLog apache-tools-2.2.27.ebuild
Added: apache-tools-2.4.9-r1.ebuild
apache-tools-2.2.27-r1.ebuild
Removed: apache-tools-2.4.9.ebuild
Log:
Do not link to openssl when ssl USE flag is disabled
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
0x981CA6FC)
Revision Changes Path
1.191 app-admin/apache-tools/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/ChangeLog?rev=1.191&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/ChangeLog?rev=1.191&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/ChangeLog?r1=1.190&r2=1.191
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- ChangeLog 21 May 2014 06:26:48 -0000 1.190
+++ ChangeLog 22 May 2014 14:01:25 -0000 1.191
@@ -1,6 +1,14 @@
# 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.190
2014/05/21 06:26:48 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.191
2014/05/22 14:01:25 polynomial-c Exp $
+
+*apache-tools-2.4.9-r1 (22 May 2014)
+*apache-tools-2.2.27-r1 (22 May 2014)
+
+ 22 May 2014; Lars Wendler <[email protected]>
+ apache-tools-2.2.27.ebuild, +apache-tools-2.2.27-r1.ebuild,
+ -apache-tools-2.4.9.ebuild, +apache-tools-2.4.9-r1.ebuild:
+ Do not link to openssl when ssl USE flag is disabled.
21 May 2014; Lars Wendler <[email protected]>
-apache-tools-2.2.24.ebuild, -apache-tools-2.2.25.ebuild,
1.11 app-admin/apache-tools/apache-tools-2.2.27.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.27.ebuild?rev=1.11&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.27.ebuild?rev=1.11&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.27.ebuild?r1=1.10&r2=1.11
Index: apache-tools-2.2.27.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.27.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- apache-tools-2.2.27.ebuild 17 May 2014 13:50:53 -0000 1.10
+++ apache-tools-2.2.27.ebuild 22 May 2014 14:01:25 -0000 1.11
@@ -1,6 +1,6 @@
# 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.10 2014/05/17 13:50:53 ago Exp $
+# $Header:
/var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.27.ebuild,v
1.11 2014/05/22 14:01:25 polynomial-c Exp $
EAPI="4"
inherit flag-o-matic eutils
@@ -76,7 +76,7 @@
for i in *; do
dosym /usr/sbin/${i} /usr/sbin/${i}2
done
- popd "${D}"/usr/sbin/ >/dev/null
+ popd >/dev/null
# Provide a symlink for ab-ssl
if use ssl; then
1.1 app-admin/apache-tools/apache-tools-2.4.9-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.9-r1.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.9-r1.ebuild?rev=1.1&content-type=text/plain
Index: apache-tools-2.4.9-r1.ebuild
===================================================================
# 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
}
1.1 app-admin/apache-tools/apache-tools-2.2.27-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.27-r1.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.27-r1.ebuild?rev=1.1&content-type=text/plain
Index: apache-tools-2.2.27-r1.ebuild
===================================================================
# 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-r1.ebuild,v
1.1 2014/05/22 14:01:25 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() {
# 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
}
