summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Bar-Lev <alonbl@gentoo.org>2017-04-27 20:10:55 +0300
committerAlon Bar-Lev <alonbl@gentoo.org>2017-04-27 20:10:55 +0300
commitebb4f0f145a6308d9282b0dc2257c7143b7dbf24 (patch)
tree1a12f3e4a9abef9ba0707af7e114709065265e85 /www-apache/mod_gnutls/files
parentsys-boot/grub: bump to 2.02 (diff)
downloadgentoo-ebb4f0f145a6308d9282b0dc2257c7143b7dbf24.tar.gz
gentoo-ebb4f0f145a6308d9282b0dc2257c7143b7dbf24.tar.bz2
gentoo-ebb4f0f145a6308d9282b0dc2257c7143b7dbf24.zip
www-apache/mod_gnutls: cleanup
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'www-apache/mod_gnutls/files')
-rw-r--r--www-apache/mod_gnutls/files/mod_gnutls-0.5.10-httpd24.patch18
-rw-r--r--www-apache/mod_gnutls/files/mod_gnutls-0.5.10-no-extra.patch11
-rw-r--r--www-apache/mod_gnutls/files/mod_gnutls_apr_memcache_m4_dirty.patch31
3 files changed, 0 insertions, 60 deletions
diff --git a/www-apache/mod_gnutls/files/mod_gnutls-0.5.10-httpd24.patch b/www-apache/mod_gnutls/files/mod_gnutls-0.5.10-httpd24.patch
deleted file mode 100644
index bc529efaa0d2..000000000000
--- a/www-apache/mod_gnutls/files/mod_gnutls-0.5.10-httpd24.patch
+++ /dev/null
@@ -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;
- }
diff --git a/www-apache/mod_gnutls/files/mod_gnutls-0.5.10-no-extra.patch b/www-apache/mod_gnutls/files/mod_gnutls-0.5.10-no-extra.patch
deleted file mode 100644
index c629f6b6bf6e..000000000000
--- a/www-apache/mod_gnutls/files/mod_gnutls-0.5.10-no-extra.patch
+++ /dev/null
@@ -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>
-
diff --git a/www-apache/mod_gnutls/files/mod_gnutls_apr_memcache_m4_dirty.patch b/www-apache/mod_gnutls/files/mod_gnutls_apr_memcache_m4_dirty.patch
deleted file mode 100644
index 028ebe18ef95..000000000000
--- a/www-apache/mod_gnutls/files/mod_gnutls_apr_memcache_m4_dirty.patch
+++ /dev/null
@@ -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