Version bump (bug #254438). Fix building with >=net-libs/gnutls-2.7.1 (bug #253714).

(Portage version: 13625-svn/cvs/Linux x86_64)

3 files changed, 91 insertions, 1 deletions

diff --git a/www-apache/mod_gnutls/ChangeLog b/www-apache/mod_gnutls/ChangeLog
index e42841445815..2515974192ed 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_gnutls/ChangeLog,v 1.17 2009/01/01 14:15:47 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_gnutls/ChangeLog,v 1.18 2009/05/30 00:08:21 arfrever Exp $
+
+*mod_gnutls-0.5.4 (30 May 2009)
+
+  30 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +mod_gnutls-0.5.4.ebuild, +files/mod_gnutls-0.5.4-apache-2.4.patch:
+  Version bump (bug #254438). Fix building with >=net-libs/gnutls-2.7.1 (bug
+  #253714).
 
 *mod_gnutls-0.5.3 (01 Jan 2009)
 
diff --git a/www-apache/mod_gnutls/files/mod_gnutls-0.5.4-apache-2.4.patch b/www-apache/mod_gnutls/files/mod_gnutls-0.5.4-apache-2.4.patch
new file mode 100644
index 000000000000..f8150fe5d001
--- /dev/null
+++ b/www-apache/mod_gnutls/files/mod_gnutls-0.5.4-apache-2.4.patch
@@ -0,0 +1,39 @@
+--- include/mod_gnutls.h.in
++++ include/mod_gnutls.h.in
+@@ -52,10 +52,8 @@
+ 
+ /* Recent Versions of 2.1 renamed several hooks. This allows us to 
+    compile on 2.0.xx  */
+-#if AP_SERVER_MINORVERSION_NUMBER >= 1
+-#if AP_SERVER_PATCHLEVEL_NUMBER >= 3
++#if (AP_SERVER_MINORVERSION_NUMBER == 1 && AP_SERVER_PATCHLEVEL_NUMBER >= 3) || AP_SERVER_MINORVERSION_NUMBER >= 2
+ #define USING_2_1_RECENT 1
+-#endif
+ #endif 
+ 
+ #ifndef USING_2_1_RECENT
+--- src/gnutls_cache.c
++++ src/gnutls_cache.c
+@@ -38,6 +38,10 @@
+ #define MC_TAG_LEN sizeof(MC_TAG)
+ #define STR_SESSION_LEN (GNUTLS_SESSION_ID_STRING_LEN + MC_TAG_LEN)
+ 
++#if MODULE_MAGIC_NUMBER_MAJOR < 20081201
++#define ap_unixd_config unixd_config
++#endif
++
+ char *mgs_session_id2sz(unsigned char *id, int idlen,
+                                char *str, int strsize)
+ {
+@@ -544,9 +548,9 @@
+ #if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
+     /* Running as Root */
+     if (geteuid() == 0)  {
+-        chown(path1, unixd_config.user_id, -1);
++        chown(path1, ap_unixd_config.user_id, -1);
+         if (path2 != NULL) { 
+-            chown(path2, unixd_config.user_id, -1);
++            chown(path2, ap_unixd_config.user_id, -1);
+         }
+     }
+ #endif
diff --git a/www-apache/mod_gnutls/mod_gnutls-0.5.4.ebuild b/www-apache/mod_gnutls/mod_gnutls-0.5.4.ebuild
new file mode 100644
index 000000000000..26c682afc0eb
--- /dev/null
+++ b/www-apache/mod_gnutls/mod_gnutls-0.5.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2009 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.4.ebuild,v 1.1 2009/05/30 00:08:21 arfrever Exp $
+
+EAPI="2"
+
+inherit apache-module eutils ssl-cert
+
+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.4.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}-apache-2.4.patch"
+}
+
+src_configure() {
+	econf --with-apxs="${APXS}"
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	mv -f src/.libs/libmod_gnutls.so src/.libs/${PN}.so
+	keepdir /var/cache/${PN}
+	apache-module_src_install
+}