diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /www-apache/mod_gnutls | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'www-apache/mod_gnutls')
-rw-r--r-- | www-apache/mod_gnutls/Manifest | 2 | ||||
-rw-r--r-- | www-apache/mod_gnutls/files/47_mod_gnutls.conf | 30 | ||||
-rw-r--r-- | www-apache/mod_gnutls/files/mod_gnutls-0.5.10-httpd24.patch | 18 | ||||
-rw-r--r-- | www-apache/mod_gnutls/files/mod_gnutls-0.5.10-no-extra.patch | 11 | ||||
-rw-r--r-- | www-apache/mod_gnutls/files/mod_gnutls_apr_memcache_m4_dirty.patch | 31 | ||||
-rw-r--r-- | www-apache/mod_gnutls/metadata.xml | 8 | ||||
-rw-r--r-- | www-apache/mod_gnutls/mod_gnutls-0.5.10-r1.ebuild | 50 | ||||
-rw-r--r-- | www-apache/mod_gnutls/mod_gnutls-0.6.ebuild | 48 |
8 files changed, 198 insertions, 0 deletions
diff --git a/www-apache/mod_gnutls/Manifest b/www-apache/mod_gnutls/Manifest new file mode 100644 index 000000000000..f48887656d7f --- /dev/null +++ b/www-apache/mod_gnutls/Manifest @@ -0,0 +1,2 @@ +DIST mod_gnutls-0.5.10.tar.bz2 245958 SHA256 469fea5f2f422c459b4153c1b959d5d62568d3ddf87f90ca6fe880c81b3b8374 SHA512 c23fb1380565dc90f805fc1e05f8f1dc4544def16e2740548dea0c575a3f5a1d4148ce3dabd886b90b3a275da9955a82789653861892bf311b605622cc96005e WHIRLPOOL 4266b21fcb9f026eeb24d4b26d56ec23b5c29f1cc7e554979c7644d7aeae9666d2cf6c0ecc1d30f9b50aa41063140fe792f900db7430643f2b9f23fe0823cb8c +DIST mod_gnutls-0.6.tar.gz 70522 SHA256 5fb2c79fd64f55faabde50c6ba3ef7b959825c8a6130152d00ca18f6d99bc041 SHA512 95e9d0e9bedaa46c5d74f97b95472f552004321f475679889844c8cd9bcff80780a610358a62ee3829159844f9ea87b525ea23eef0fc2aff028e87760b9563b9 WHIRLPOOL 2950abc6e59f8dd5d7fe8ee1b38e3ebd950539f6c880b76bced2ae57d66a312c6abd91c51eedac41709035680938aa27f181d19f1603c70a3310f84fec637e8d diff --git a/www-apache/mod_gnutls/files/47_mod_gnutls.conf b/www-apache/mod_gnutls/files/47_mod_gnutls.conf new file mode 100644 index 000000000000..cd88204c9e83 --- /dev/null +++ b/www-apache/mod_gnutls/files/47_mod_gnutls.conf @@ -0,0 +1,30 @@ +<IfDefine GNUTLS> +LoadModule gnutls_module modules/mod_gnutls.so + +# mod_gnutls can optionally use a memcached server to store it's SSL Sessions +# This is useful in a cluster enviroment, where you want all of your servers +# to share a single SSL Session Cache. +#GnuTLSCache memcache "127.0.0.1 server2.example.com server3.example.com" + +# The Default method is to use a DBM backed Cache. It isn't super fast, but +# it is portable and does not require another server to be running like memcached. +GnuTLSCache dbm /var/cache/mod_gnutls/gnutls_cache +</IfDefine> + +# the following is an example virtual-host as you could configure it. +# however, this is just an example. You should always put your own +# configuration stuff inside your own files within vhosts.d/ directory. +#<VirtualHost 1.2.3.4:443> +# # insert other directives ... here ... +# +# # This enables the mod_gnutls Handlers for this Virtual Host +# GnuTLSEnable On +# +# # This is the Private key for your server. +# GnuTLSKeyFile conf/server.key +# +# # This is the Server Certificate. +# GnuTLSCertificateFile conf/server.cert +#</VirtualHost> + +# vim: ts=4 filetype=apache 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 new file mode 100644 index 000000000000..bc529efaa0d2 --- /dev/null +++ b/www-apache/mod_gnutls/files/mod_gnutls-0.5.10-httpd24.patch @@ -0,0 +1,18 @@ + +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 new file mode 100644 index 000000000000..c629f6b6bf6e --- /dev/null +++ b/www-apache/mod_gnutls/files/mod_gnutls-0.5.10-no-extra.patch @@ -0,0 +1,11 @@ +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 new file mode 100644 index 000000000000..028ebe18ef95 --- /dev/null +++ b/www-apache/mod_gnutls/files/mod_gnutls_apr_memcache_m4_dirty.patch @@ -0,0 +1,31 @@ +--- 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 diff --git a/www-apache/mod_gnutls/metadata.xml b/www-apache/mod_gnutls/metadata.xml new file mode 100644 index 000000000000..a1eadd087727 --- /dev/null +++ b/www-apache/mod_gnutls/metadata.xml @@ -0,0 +1,8 @@ +<?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> +</pkgmetadata> diff --git a/www-apache/mod_gnutls/mod_gnutls-0.5.10-r1.ebuild b/www-apache/mod_gnutls/mod_gnutls-0.5.10-r1.ebuild new file mode 100644 index 000000000000..8dfb017a4036 --- /dev/null +++ b/www-apache/mod_gnutls/mod_gnutls-0.5.10-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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 +} diff --git a/www-apache/mod_gnutls/mod_gnutls-0.6.ebuild b/www-apache/mod_gnutls/mod_gnutls-0.6.ebuild new file mode 100644 index 000000000000..372abb56936a --- /dev/null +++ b/www-apache/mod_gnutls/mod_gnutls-0.6.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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.gz" + +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="CHANGELOG NOTICE README" + +need_apache2 + +src_prepare() { + epatch "${FILESDIR}/${PN}_apr_memcache_m4_dirty.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 +} |