diff options
Diffstat (limited to 'www-apache')
| -rw-r--r-- | www-apache/mod_gnutls/ChangeLog | 11 | ||||
| -rw-r--r-- | www-apache/mod_gnutls/Manifest | 11 | ||||
| -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_apr_memcache_m4_dirty.patch | 31 | ||||
| -rw-r--r-- | www-apache/mod_gnutls/mod_gnutls-0.5.10-r1.ebuild | 46 |
5 files changed, 111 insertions, 6 deletions
diff --git a/www-apache/mod_gnutls/ChangeLog b/www-apache/mod_gnutls/ChangeLog index 1be54361cca1..397399362da7 100644 --- a/www-apache/mod_gnutls/ChangeLog +++ b/www-apache/mod_gnutls/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-apache/mod_gnutls -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_gnutls/ChangeLog,v 1.31 2012/11/27 19:19:34 pacho Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_gnutls/ChangeLog,v 1.32 2013/01/03 19:09:37 pacho Exp $ + +*mod_gnutls-0.5.10-r1 (03 Jan 2013) + + 03 Jan 2013; Pacho Ramos <pacho@gentoo.org> + +files/mod_gnutls-0.5.10-httpd24.patch, + +files/mod_gnutls_apr_memcache_m4_dirty.patch, +mod_gnutls-0.5.10-r1.ebuild: + Apply Fedora patches to fix apache-2.4 compat and fix buggy m4 27 Nov 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml: Drop apache herd as discussed in http://www.gossamer- diff --git a/www-apache/mod_gnutls/Manifest b/www-apache/mod_gnutls/Manifest index c753e61f3ab2..75114d7b019e 100644 --- a/www-apache/mod_gnutls/Manifest +++ b/www-apache/mod_gnutls/Manifest @@ -2,16 +2,19 @@ Hash: SHA256 AUX 47_mod_gnutls.conf 1124 SHA256 530742754527b8669c47206911f8b42ffac582ac0111f9526c7bcc8bf3099279 SHA512 e46365311c4e4fd3bb545c1a081744eb11a689124be9c32c66e0a9c65689961e8704d9d9c440c39c518d263a0bc3c8dbe3125827b547737b8828cbdd8457916c WHIRLPOOL 75b6809675a07330c7159d9a9eee4103cf447d4542a891a1ed228421532c6fee2ce33700550fbec9224389444c5c833cdac84b4ba99f48d0c95154b274bd1f78 +AUX mod_gnutls-0.5.10-httpd24.patch 573 SHA256 d553e629980c03e36fcbe2b0f8b5e7120d21dafe17f411374fdf61e3d7a07832 SHA512 95118755564bd7cf03ba6943d2eb158bd238abd4a5b58b275b0664adbcd023ed2456a11d8c11dd0f3197c9e7195e6c0eb83b84704e1402a3e9203630941296b6 WHIRLPOOL d61252964ef645e70ec7bbfd97eb5c8fe0ed29822a075aa4f975e733ace0c68a1d1faff2d28bac290e061e942127e3c98251ec30237a08b96a9aca6cc81c2d7c +AUX mod_gnutls_apr_memcache_m4_dirty.patch 1068 SHA256 52525ac179ebfb3cf914dc683aeb3f02009f76bf62c903ae2bde3d39692b9ed1 SHA512 250073ea26403dfc30c1846878dc9de8de8159b928aec496c81aefedbf3b61827e4a8dc9e4ab557aec1df0763c0f3062c3a707638cc84e09ded3456de86ab0f6 WHIRLPOOL 8982a23b890f85143d341cf767dd2762919f224b8c86a99ddd767f469d938b508ca71e884282f35f1b69c80bca492dd86f44181efedf94e2cbf93aecc9d600ee DIST mod_gnutls-0.5.10.tar.bz2 245958 SHA256 469fea5f2f422c459b4153c1b959d5d62568d3ddf87f90ca6fe880c81b3b8374 SHA512 c23fb1380565dc90f805fc1e05f8f1dc4544def16e2740548dea0c575a3f5a1d4148ce3dabd886b90b3a275da9955a82789653861892bf311b605622cc96005e WHIRLPOOL 4266b21fcb9f026eeb24d4b26d56ec23b5c29f1cc7e554979c7644d7aeae9666d2cf6c0ecc1d30f9b50aa41063140fe792f900db7430643f2b9f23fe0823cb8c DIST mod_gnutls-0.5.9.tar.bz2 243164 SHA256 cb3da2a31695dcc341e6efebc122fc46e7e4dbb5c6c2aa3aa5a69259e5e96406 +EBUILD mod_gnutls-0.5.10-r1.ebuild 1091 SHA256 21287f15e17a1814f3bceb0f44b0fb41abe047d2e5b2ba82279f3e2873991b9d SHA512 4b229f384a8da4a9decc5227341782f5df71b42e13068fbd989ae4f3d7294dd43a9bf0519092e777fb81d047d4e907a6849c18974bbc98393b25e1ed8a7bdf4d WHIRLPOOL c341aeb455e7d27dea757e7e33799366e3b7c25c78d6669b53321d86506438cb249ae39f0fab49c9745969b5b15987b6d2e99fcda8799a8dafbcc40483fae3ff EBUILD mod_gnutls-0.5.10.ebuild 961 SHA256 90b02ff14b0a70bec015bcb8579e7d6ee3e7070db3e0b2b78bc06f1a0fe83ca3 SHA512 b86a23ac02c950606e2f103be0445111ff139d6dce439385b2baf360d3e236cbced21aa8d6a2017c14ca3564bdc1e429df12dda13135fa01b8e72b38523aec67 WHIRLPOOL aa12b343ba714bb2eb0f0da93fde2ad0025eda6eda423bb85b78d89435b1a60cc8ce3e7bae6ab6dfdf203e95129d696578be536a05bee3dad32612de8e96b4c0 EBUILD mod_gnutls-0.5.9.ebuild 957 SHA256 1add0583c64eb6fd93fa30e04d22b43a59ad5bc31606f04fd4957e9b17d7555b SHA512 f7c8500818913bd58cd6c4714c82bfe47661b6d15da60ae4ee24d57a96461687c73bf0d80940c93d88ef387054b89a70264bcb977fdc7ac9863647547e0db96b WHIRLPOOL d8493eab6356c2c40d7e0095d68ea0d6dd4020561971a44166e22796337020f744a7fa158cad33c15d5a7a3139ddfabb526038ca3549834d54f3534c569bc837 -MISC ChangeLog 4843 SHA256 3dc223e689200ce3deb8bb95fa0f13d3fc55d1dd54ac7ffb8595f2f5c4724a59 SHA512 59d26627e7397898edc01dc19a8358d51b58f1c107d1dc309a889aad09122737c576f5bb116c406eedb5a490183436df705bcfcf822ae4ee72caa8ef916f7c05 WHIRLPOOL 23ea588dfb4828bd5d37f41b3d5cd888badc71b1921e5cd0209b1e4de03a027fd8b5b34aa356e1543a206dac422c729937f40e28850a7fe33b5a0ee1b8b08de8 +MISC ChangeLog 5113 SHA256 d412fd144bb47929f4367d07998927203bd16edfe51ad0bfb6f858fa87674720 SHA512 e84abfd715234b05c2851f2e10098277e7a1af9512c621fbdd69928d3fbd714a6a3cef7530d6657b62b4d8a76b845a1b7dc2845102760660d86c50f9b1ecdeb1 WHIRLPOOL d6096e9270a42aad55674796d0c8dc4303211d2c928a8aecb9285bde82325f39d82ccdd1c2366c86a2be96737e671908ddf378c0b82ecff166e838186064a6fc MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlC1EkcACgkQCaWpQKGI+9SoOgCfYoluX+LbMWPtlRLsn14QRMEz -rtMAmwXr7pYG0HudoUXqxc8JHs/TNWYl -=rt3u +iEYEAREIAAYFAlDl13IACgkQCaWpQKGI+9QnjgCcDf3s5QoTKHRLrLyrbGX5FBYk +YWEAn0XC47sHSxWIupiKLq3dwRR5eFc6 +=9sWL -----END PGP SIGNATURE----- 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_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/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..ec68f808700c --- /dev/null +++ b/www-apache/mod_gnutls/mod_gnutls-0.5.10-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_gnutls/mod_gnutls-0.5.10-r1.ebuild,v 1.1 2013/01/03 19:09:37 pacho Exp $ + +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_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 +} |