version bump; #203834

(Portage version: 2.1.4_rc11)

4 files changed, 71 insertions, 35 deletions

diff --git a/www-apache/mod_gnutls/ChangeLog b/www-apache/mod_gnutls/ChangeLog
index 3b0541824480..5aafed930f3d 100644
--- a/www-apache/mod_gnutls/ChangeLog
+++ b/www-apache/mod_gnutls/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/mod_gnutls
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_gnutls/ChangeLog,v 1.11 2007/04/11 14:50:01 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_gnutls/ChangeLog,v 1.12 2007/12/31 11:36:29 hollow Exp $
+
+*mod_gnutls-0.4.2.1 (31 Dec 2007)
+
+  31 Dec 2007; Benedikt Böhm <hollow@gentoo.org> files/47_mod_gnutls.conf,
+  +mod_gnutls-0.4.2.1.ebuild:
+  version bump; #203834
 
   11 Apr 2007; Luca Longinotti <chtekk@gentoo.org> mod_gnutls-0.2.0.ebuild:
   Fix bug #168044.
diff --git a/www-apache/mod_gnutls/files/47_mod_gnutls.conf b/www-apache/mod_gnutls/files/47_mod_gnutls.conf
index 3156ee5db569..e249a2a55b3d 100644
--- a/www-apache/mod_gnutls/files/47_mod_gnutls.conf
+++ b/www-apache/mod_gnutls/files/47_mod_gnutls.conf
@@ -1,44 +1,30 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_gnutls/files/47_mod_gnutls.conf,v 1.4 2005/04/13 03:30:33 trapni Exp $
-
 <IfDefine GNUTLS>
-	LoadModule gnutls_module  modules/mod_gnutls.so
-</IfDefine>
-
-<IfModule mod_gnutls.c>
-	# Listen on standard SSL port.
-	# Enable this by default to keep default config in sync with mod_ssl.
-	# Though, this should make migrating from mod_ssl to mod_gnutls easier.
-	Listen 443
+LoadModule gnutls_module  modules/mod_gnutls.so
 
-	# mod_gnutls can optionaly 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"
+# mod_gnutls can optionaly 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
+# 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
 </IfModule>
 
 # 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 ...
 #
-<IfDefine GNUTLS_EXAMPLE>
-	<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>
-</IfDefine>
+#	# 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:ai:noet:ts=4:nowrap:syntax=apache
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_gnutls/files/digest-mod_gnutls-0.4.2.1 b/www-apache/mod_gnutls/files/digest-mod_gnutls-0.4.2.1
new file mode 100644
index 000000000000..6ed7c5dc7af9
--- /dev/null
+++ b/www-apache/mod_gnutls/files/digest-mod_gnutls-0.4.2.1
@@ -0,0 +1,3 @@
+MD5 2cb129e5f997437b51e70a8d7e28c1cc mod_gnutls-0.4.2.1.tar.bz2 243597
+RMD160 daf2b24101fb2c52bcf4393a059674721105f81b mod_gnutls-0.4.2.1.tar.bz2 243597
+SHA256 69891365fc2221a964b22271c7cc732267b69e5953264d0f4c74ec83d73bb706 mod_gnutls-0.4.2.1.tar.bz2 243597
diff --git a/www-apache/mod_gnutls/mod_gnutls-0.4.2.1.ebuild b/www-apache/mod_gnutls/mod_gnutls-0.4.2.1.ebuild
new file mode 100644
index 000000000000..3beab48db01c
--- /dev/null
+++ b/www-apache/mod_gnutls/mod_gnutls-0.4.2.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2007 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.4.2.1.ebuild,v 1.1 2007/12/31 11:36:29 hollow Exp $
+
+inherit apache-module ssl-cert
+
+KEYWORDS="~amd64 ~sparc ~x86"
+
+DESCRIPTION="mod_gnutls uses GnuTLS to provide SSL v3, TLS 1.0 and TLS 1.1 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"
+IUSE=""
+
+DEPEND=">=net-libs/gnutls-2.1.8"
+RDEPEND="${DEPEND}"
+
+APACHE2_MOD_CONF="47_${PN}"
+APACHE2_MOD_DEFINE="GNUTLS"
+
+DOCFILES="LICENSE NOTICE README"
+
+need_apache2
+
+src_compile() {
+	econf --with-apxs=${APXS2} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	mv -f "src/.libs/libmod_gnutls.so" "src/.libs/${PN}.so"
+
+	insinto "${APACHE2_CONFDIR}"
+	doins data/rsafile data/dhfile
+
+	keepdir "${APACHE2_CONFDIR}/ssl"
+	keepdir /var/cache/${PN}
+
+	apache-module_src_install
+}