mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 17:09:10 -07:00
www-apache/mod_gnutls: cleanup
Package-Manager: Portage-2.3.3, Repoman-2.3.1
This commit is contained in:
Alon Bar-Lev
@@ -1,5 +1 @@
|
||||
DIST mod_gnutls-0.5.10.tar.bz2 245958 SHA256 469fea5f2f422c459b4153c1b959d5d62568d3ddf87f90ca6fe880c81b3b8374 SHA512 c23fb1380565dc90f805fc1e05f8f1dc4544def16e2740548dea0c575a3f5a1d4148ce3dabd886b90b3a275da9955a82789653861892bf311b605622cc96005e WHIRLPOOL 4266b21fcb9f026eeb24d4b26d56ec23b5c29f1cc7e554979c7644d7aeae9666d2cf6c0ecc1d30f9b50aa41063140fe792f900db7430643f2b9f23fe0823cb8c
|
||||
DIST mod_gnutls-0.7.3.tar.bz2 337630 SHA256 fb1cd05320891e560abab52f0fffed84af7afd3f7220c7cc1fa6ae6eadc9ea35 SHA512 f7b2aa570072bb9fd7ca31ccb48cb8c741da76a80a9518ab2fc2e2737b3bbbea6e74800c67a635f1eb141c5dbd14d1397bbbd81bf51828c2b4e034f771ce3a6b WHIRLPOOL 677bcc82d8f386ad056fdb49a3d0354717d4f31695983446f331f9e2dd203f5814dff3f2742264bd811ed747ff2a0a27183be11ef2a253085953e6b213c70adc
|
||||
DIST mod_gnutls-0.7.5.tar.bz2 361708 SHA256 7187edb7854eaed5a69659e4ec1dc2220513fa54f452f51b4bc664798fb0f692 SHA512 ba9333d21c54fa9b1ff846001e91b8293996f3c4d38aa5c485d88168eb40ae606015cfde5b9849f928a15035dd8bb84a388c5b16e3b7df61c71c3a3508781017 WHIRLPOOL d2a20a3dfa69b48b31be300fe463e3e9ef67bcd1090c7feaa8bd3c598c9fdc20ec4a598ccdf5e8b47e8c2ec67f378d278759d0f0d87003d009cdb78e5268e946
|
||||
DIST mod_gnutls-0.8.1.tar.bz2 415478 SHA256 5cd6d9c167763d92d9fd76ea606cbca0802eba4ac75c87022906464234ce904c SHA512 31bbc0676957993bf1b33b5db9160aad4b012c268548952f5fa79d8b165620399f1b0a250db487d4d9d88272cb4a2e70d424950e3ebfbdccaf405640223d7630 WHIRLPOOL b8cc52dffa3d35a94954dda8b5a141a0d864afcd5a6f20839cb4839a080fbdcfaf0b3bc4e21565dc2be04d911eb1de1689c68ab088401d561962e0c1c343ce57
|
||||
DIST mod_gnutls-0.8.2.tar.bz2 415903 SHA256 05eeb78e41f1fd6780607a17d705b1965ce5c3ce6223a9a8a86ba9288d22e683 SHA512 b1690aeee4f6d104e4b6a7bd443e289204630b33e00b7b145b11291d8819b5c3d5bd52b535746b8ebdfee7a5f34df527243b743b8c5d716b1d0617e319d43f4d WHIRLPOOL f3b57579bbdfea5ed845df8bd551f7b03b3f49f1b22ede1ff5c1b1b7c7fd1eeea0a55f0fb7ffe4a91cb9d5bce60f7e2e47d586f2f58057b18cf950eee24b1fbb
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
|
||||
Fix for httpd 2.4.
|
||||
|
||||
--- mod_gnutls-0.5.10/src/gnutls_hooks.c.httpd24
|
||||
+++ mod_gnutls-0.5.10/src/gnutls_hooks.c
|
||||
@@ -750,7 +750,12 @@ int mgs_hook_pre_connection(conn_rec * c
|
||||
return DECLINED;
|
||||
}
|
||||
|
||||
+#if AP_MODULE_MAGIC_AT_LEAST(20111130, 0)
|
||||
+ /* ### this is a bizarre test -- jorton */
|
||||
+ if (c->client_addr->hostname || strcmp(c->client_ip,c->local_ip) == 0) {
|
||||
+#else
|
||||
if (c->remote_addr->hostname || apr_strnatcmp(c->remote_ip,c->local_ip) == 0) {
|
||||
+#endif
|
||||
/* Connection initiated by Apache (mod_proxy) => ignore */
|
||||
return OK;
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
diff -up mod_gnutls-0.5.10/include/mod_gnutls.h.in.no-extra mod_gnutls-0.5.10/include/mod_gnutls.h.in
|
||||
--- mod_gnutls-0.5.10/include/mod_gnutls.h.in.no-extra 2011-07-08 23:29:46.000000000 +0200
|
||||
+++ mod_gnutls-0.5.10/include/mod_gnutls.h.in 2013-03-07 09:08:49.833348848 +0100
|
||||
@@ -28,7 +28,6 @@
|
||||
#include "ap_release.h"
|
||||
|
||||
#include <gnutls/gnutls.h>
|
||||
-#include <gnutls/extra.h>
|
||||
#include <gnutls/openpgp.h>
|
||||
#include <gnutls/x509.h>
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
--- mod_gnutls-0.5.10/m4/apr_memcache.m4 2011-07-08 23:29:46.000000000 +0200
|
||||
+++ mod_gnutls-0.5.10/m4/apr_memcache.m4.new 2011-09-15 20:04:00.117806214 +0200
|
||||
@@ -40,21 +40,20 @@
|
||||
if test -n "$apr_memcache_includes"; then
|
||||
apr_memcache_includedir=$apr_memcache_includes
|
||||
elif test -n "$apr_memcache_prefix"; then
|
||||
- apr_memcache_includedir=$apr_memcache_prefix/include/apr_memcache-0
|
||||
+ apr_memcache_includedir=$apr_memcache_prefix/include/aprutil-1
|
||||
else
|
||||
- apr_memcache_includedir=$includedir/apr_memcache-0
|
||||
+ apr_memcache_includedir=$includedir/aprutil-1
|
||||
fi
|
||||
+
|
||||
CFLAGS="-I$apr_memcache_includedir $CFLAGS"
|
||||
|
||||
+
|
||||
AC_CHECK_LIB(
|
||||
- apr_memcache,
|
||||
+ aprutil-1,
|
||||
apr_memcache_create,
|
||||
[
|
||||
- APR_MEMCACHE_LIBS="-lapr_memcache"
|
||||
- if test -n "$apr_memcache_libdir"; then
|
||||
- APR_MEMCACHE_LIBS="-R$apr_memcache_libdir -L$apr_memcache_libdir $APR_MEMCACHE_LIBS"
|
||||
- fi
|
||||
- APR_MEMCACHE_CFLAGS="-I$apr_memcache_includedir"
|
||||
+ APR_MEMCACHE_LIBS="`apu-1-config --link-ld`"
|
||||
+ APR_MEMCACHE_CFLAGS="`apu-1-config --includes`"
|
||||
]
|
||||
)
|
||||
CFLAGS=$save_CFLAGS
|
||||
@@ -1,49 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="5"
|
||||
inherit apache-module autotools eutils
|
||||
|
||||
DESCRIPTION="mod_gnutls uses GnuTLS to provide SSL/TLS encryption for Apache2, similarly to mod_ssl"
|
||||
HOMEPAGE="http://www.outoforder.cc/projects/apache/mod_gnutls/"
|
||||
SRC_URI="http://www.outoforder.cc/downloads/${PN}/${P}.tar.bz2"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~sparc x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=">=net-libs/gnutls-2.10.0:="
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
APACHE2_MOD_CONF="47_${PN}"
|
||||
APACHE2_MOD_DEFINE="GNUTLS"
|
||||
|
||||
DOCFILES="NEWS NOTICE README README.ENV"
|
||||
|
||||
need_apache2
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/${P}-httpd24.patch"
|
||||
epatch "${FILESDIR}/${PN}_apr_memcache_m4_dirty.patch"
|
||||
epatch "${FILESDIR}/${P}-no-extra.patch"
|
||||
|
||||
sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
|
||||
|
||||
epatch_user
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf --with-apxs="${APXS}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake
|
||||
}
|
||||
|
||||
src_install() {
|
||||
mv -f src/.libs/libmod_gnutls.so src/.libs/${PN}.so
|
||||
keepdir /var/cache/${PN}
|
||||
apache-module_src_install
|
||||
}
|
||||
@@ -1,54 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
inherit apache-module autotools eutils
|
||||
|
||||
DESCRIPTION="mod_gnutls uses GnuTLS to provide SSL/TLS encryption for Apache2, similarly to mod_ssl"
|
||||
HOMEPAGE="https://mod.gnutls.org/"
|
||||
SRC_URI="https://mod.gnutls.org/downloads/${P}.tar.bz2"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
CDEPEND=">=net-libs/gnutls-2.10.0:="
|
||||
DEPEND="${CDEPEND}
|
||||
test? ( app-crypt/monkeysphere )"
|
||||
RDEPEND="${CDEPEND}"
|
||||
|
||||
# Fails because gpg-agent cannot be accessed
|
||||
RESTRICT="test"
|
||||
|
||||
APACHE2_MOD_CONF="47_${PN}"
|
||||
APACHE2_MOD_DEFINE="GNUTLS"
|
||||
|
||||
DOCFILES="CHANGELOG NOTICE README"
|
||||
|
||||
need_apache2
|
||||
|
||||
src_prepare() {
|
||||
sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
|
||||
|
||||
epatch_user
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf --with-apxs="${APXS}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake
|
||||
}
|
||||
|
||||
src_install() {
|
||||
mv -f src/.libs/libmod_gnutls.so src/.libs/${PN}.so
|
||||
keepdir /var/cache/${PN}
|
||||
apache-module_src_install
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake -j1 check
|
||||
}
|
||||
@@ -1,53 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
inherit apache-module autotools eutils
|
||||
|
||||
DESCRIPTION="mod_gnutls uses GnuTLS to provide SSL/TLS encryption for Apache2, similarly to mod_ssl"
|
||||
HOMEPAGE="https://mod.gnutls.org/"
|
||||
SRC_URI="https://mod.gnutls.org/downloads/${P}.tar.bz2"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
CDEPEND=">=net-libs/gnutls-2.10.0:="
|
||||
DEPEND="${CDEPEND}
|
||||
test? ( app-crypt/monkeysphere )"
|
||||
RDEPEND="${CDEPEND}"
|
||||
|
||||
# Fails because gpg-agent cannot be accessed
|
||||
RESTRICT="test"
|
||||
|
||||
APACHE2_MOD_CONF="47_${PN}"
|
||||
APACHE2_MOD_DEFINE="GNUTLS"
|
||||
|
||||
DOCFILES="CHANGELOG NOTICE README"
|
||||
|
||||
need_apache2
|
||||
|
||||
src_prepare() {
|
||||
sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
|
||||
|
||||
epatch_user
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf --with-apxs="${APXS}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake
|
||||
}
|
||||
|
||||
src_install() {
|
||||
keepdir /var/cache/${PN}
|
||||
apache-module_src_install
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake -j1 check
|
||||
}
|
||||
@@ -1,53 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
inherit apache-module autotools eutils
|
||||
|
||||
DESCRIPTION="mod_gnutls uses GnuTLS to provide SSL/TLS encryption for Apache2, similarly to mod_ssl"
|
||||
HOMEPAGE="https://mod.gnutls.org/"
|
||||
SRC_URI="https://mod.gnutls.org/downloads/${P}.tar.bz2"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
CDEPEND=">=net-libs/gnutls-3.4.0:="
|
||||
DEPEND="${CDEPEND}
|
||||
test? ( app-crypt/monkeysphere )"
|
||||
RDEPEND="${CDEPEND}"
|
||||
|
||||
need_apache2_4
|
||||
|
||||
# Fails because gpg-agent cannot be accessed
|
||||
RESTRICT="test"
|
||||
|
||||
APACHE2_MOD_CONF="47_${PN}"
|
||||
APACHE2_MOD_DEFINE="GNUTLS"
|
||||
|
||||
DOCFILES="CHANGELOG NOTICE README"
|
||||
|
||||
need_apache2
|
||||
|
||||
src_prepare() {
|
||||
epatch_user
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf --with-apxs="${APXS}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake
|
||||
}
|
||||
|
||||
src_install() {
|
||||
keepdir /var/cache/${PN}
|
||||
apache-module_src_install
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake -j1 check
|
||||
}
|
||||
@@ -1,53 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
inherit apache-module autotools eutils
|
||||
|
||||
DESCRIPTION="mod_gnutls uses GnuTLS to provide SSL/TLS encryption for Apache2, similarly to mod_ssl"
|
||||
HOMEPAGE="https://mod.gnutls.org/"
|
||||
SRC_URI="https://mod.gnutls.org/downloads/${P}.tar.bz2"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
CDEPEND=">=net-libs/gnutls-3.4.0:="
|
||||
DEPEND="${CDEPEND}
|
||||
test? ( app-crypt/monkeysphere )"
|
||||
RDEPEND="${CDEPEND}"
|
||||
|
||||
need_apache2_4
|
||||
|
||||
# Fails because gpg-agent cannot be accessed
|
||||
RESTRICT="test"
|
||||
|
||||
APACHE2_MOD_CONF="47_${PN}"
|
||||
APACHE2_MOD_DEFINE="GNUTLS"
|
||||
|
||||
DOCFILES="CHANGELOG NOTICE README"
|
||||
|
||||
need_apache2
|
||||
|
||||
src_prepare() {
|
||||
epatch_user
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf --with-apxs="${APXS}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake
|
||||
}
|
||||
|
||||
src_install() {
|
||||
keepdir /var/cache/${PN}
|
||||
apache-module_src_install
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake -j1 check
|
||||
}
|
||||
Reference in New Issue
Block a user