several fixes: init scripts/certs/useflag/ebuild/version bump - See ChangeLog for more info

(Portage version: 2.0.51.19)

8 files changed, 217 insertions, 18 deletions

diff --git a/net-misc/stunnel/ChangeLog b/net-misc/stunnel/ChangeLog
index 019145229725..64d1574fd7a2 100644
--- a/net-misc/stunnel/ChangeLog
+++ b/net-misc/stunnel/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-misc/stunnel
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.37 2005/02/11 20:58:27 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.38 2005/05/13 21:45:29 ramereth Exp $
+
+*stunnel-4.09 (13 May 2005)
+
+  13 May 2005; Lance Albertson <ramereth@gentoo.org>
+  +files/stunnel-4.09-gentoo.diff, +files/stunnel.conf.4.09,
+  +files/stunnel.rc6.4.09, metadata.xml, +stunnel-4.09.ebuild:
+  Several cleanups in the ebuild, and version bump
+  * fixed init scripts to use proper /var/run/stunnel location
+  * made the build more in line with upstream
+  * fixed cert generation
+  * added ipv6 useflag / took out static
+  * Updated metadata.xml
 
   11 Feb 2005; petre rodan <kaiowas@gentoo.org> stunnel-3.22-r2.ebuild,
   stunnel-3.26.ebuild, stunnel-4.04-r1.ebuild, stunnel-4.04-r2.ebuild,
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index b303401df297..256f556fb644 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,38 +1,33 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 dd357d08aa3b8c3740b42fa0d4b6b616 ChangeLog 4738
-MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
 MD5 4003883982318cb26c51e2291b3e7b00 stunnel-3.22-r2.ebuild 947
 MD5 eb85c0a1e6f5b12850b7d4e0215a327c stunnel-3.26.ebuild 1084
 MD5 ec43a5d2a2d4d21179be8a1f24329a95 stunnel-4.04-r1.ebuild 1721
 MD5 85310ef2c632d7b01481f4b20adff5fe stunnel-4.04-r2.ebuild 1790
 MD5 73445167acb4a9335a548710b776b72e stunnel-4.04-r3.ebuild 1784
+MD5 3c7d56a1f6a95f21ceb95ddf5c76073c metadata.xml 703
 MD5 b2b41fa38d0e49a159629341ba9f8f48 stunnel-4.05.ebuild 1755
+MD5 b7fafbd2bf40fe81ab9bd47dd33614dd stunnel-4.09.ebuild 2143
 MD5 bf10c9036f0ff4b8578c46b89538aed7 files/digest-stunnel-3.22-r2 64
 MD5 ea2086dcf69dddf6d075a7040d209335 files/digest-stunnel-3.26 64
 MD5 dfc2feba647c5fb39db0bd98e769fb7e files/digest-stunnel-4.04-r1 64
 MD5 dfc2feba647c5fb39db0bd98e769fb7e files/digest-stunnel-4.04-r2 64
 MD5 dfc2feba647c5fb39db0bd98e769fb7e files/digest-stunnel-4.04-r3 64
-MD5 c0fb8fc4f6d919edc9d76e0f423873eb files/digest-stunnel-4.05 64
 MD5 9177dd12df6261a5bde7e8756c0f1585 files/stunnel-3.22-blinding.patch 3756
 MD5 60507279a2c9abbec2037b9e5a0840f7 files/stunnel-3.22-gentoo.diff 1170
 MD5 b42ca1fbeb5d6454de36aac4cb893294 files/stunnel-3.26-gentoo.diff 941
 MD5 6cdf521ff4c96a48e8863635b78fa596 files/stunnel-4.04-blinding.patch 2526
 MD5 2afb1fc42f8ea8f7b54d47a79f80e33a files/stunnel-4.04-gentoo.diff 321
-MD5 2afb1fc42f8ea8f7b54d47a79f80e33a files/stunnel-4.05-gentoo.diff 321
 MD5 4839b059fba14c4f7f2acb50888aadac files/stunnel.conf 720
 MD5 021f1b3d5a07aa11f572d4fa8a50b4f1 files/stunnel.conf.4.04-r2 721
 MD5 2f553bbcab5ab83a6e45e3ddd73f9944 files/stunnel.conf.4.04-r3 725
-MD5 2f553bbcab5ab83a6e45e3ddd73f9944 files/stunnel.conf.4.05 725
 MD5 a7262319408c8fc154543b7614662329 files/stunnel.rc6 534
 MD5 39bf8947e5bcc172aba321a975eff263 files/stunnel.rc6.4.04-r2 561
 MD5 1ceef2be86dab81ee4499b783188fa44 files/stunnel.rc6.4.04-r3 598
+MD5 c0fb8fc4f6d919edc9d76e0f423873eb files/digest-stunnel-4.05 64
+MD5 2afb1fc42f8ea8f7b54d47a79f80e33a files/stunnel-4.05-gentoo.diff 321
+MD5 2f553bbcab5ab83a6e45e3ddd73f9944 files/stunnel.conf.4.05 725
 MD5 2d0c9c806bbcf7f7999d1ea564e27e9d files/stunnel.rc6.4.05 591
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCDQhOGSBEIeh4AEYRAiNfAJ4xZDkpYSBVcWvP3HZbnxrT/shoXACfergy
-SgoODgGMhUccBTbSjMGuqS8=
-=eUrJ
------END PGP SIGNATURE-----
+MD5 c50837ef48e4edea744679612588612b files/stunnel.rc6.4.09 934
+MD5 9193cc027bed086a3852dc7189602f0b files/stunnel.conf.4.09 1423
+MD5 2afb1fc42f8ea8f7b54d47a79f80e33a files/stunnel-4.09-gentoo.diff 321
+MD5 b562ecc7a9dab7e2e2582a0601b42569 files/digest-stunnel-4.09 64
diff --git a/net-misc/stunnel/files/digest-stunnel-4.09 b/net-misc/stunnel/files/digest-stunnel-4.09
new file mode 100644
index 000000000000..f3ec67c1f42d
--- /dev/null
+++ b/net-misc/stunnel/files/digest-stunnel-4.09
@@ -0,0 +1 @@
+MD5 2077669b04c36e4c0baa68348e8860a7 stunnel-4.09.tar.gz 484745
diff --git a/net-misc/stunnel/files/stunnel-4.09-gentoo.diff b/net-misc/stunnel/files/stunnel-4.09-gentoo.diff
new file mode 100644
index 000000000000..b41de790e162
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel-4.09-gentoo.diff
@@ -0,0 +1,12 @@
+--- tools/Makefile.in    2002-10-26 16:48:22.000000000 +0000
++++ tools/Makefile.in   2002-10-26 16:48:38.000000000 +0000
+@@ -83,7 +83,7 @@
+
+
+ confdir = $(sysconfdir)/stunnel
+-conf_DATA = stunnel.conf-sample stunnel.pem
++conf_DATA = stunnel.conf-sample
+
+ docdir = $(datadir)/doc/stunnel
+ examplesdir = $(docdir)/examples
+
diff --git a/net-misc/stunnel/files/stunnel.conf.4.09 b/net-misc/stunnel/files/stunnel.conf.4.09
new file mode 100644
index 000000000000..4aa8b8c5252e
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel.conf.4.09
@@ -0,0 +1,61 @@
+# Sample stunnel configuration file by Michal Trojnara 2002-2005
+# Some options used here may not be adequate for your particular configuration
+# Please make sure you understand them (especially the effect of chroot jail)
+
+# Certificate/key is needed in server mode and optional in client mode
+# cert = /etc/stunnel/stunnel.pem
+# key = /etc/stunnel/stunnel.pem
+
+# Some security enhancements for UNIX systems - comment them out on Win32
+# chroot = /chroot/stunnel/
+setuid = stunnel
+setgid = stunnel
+# PID is created inside chroot jail
+pid = /var/run/stunnel/stunnel.pid
+
+# Some performance tunings
+socket = l:TCP_NODELAY=1
+socket = r:TCP_NODELAY=1
+#compression = rle
+
+# Workaround for Eudora bug
+#options = DONT_INSERT_EMPTY_FRAGMENTS
+
+# Authentication stuff
+#verify = 2
+# Don't forget to c_rehash CApath
+# CApath is located inside chroot jail:
+#CApath = /certs
+# It's often easier to use CAfile:
+#CAfile = /etc/stunnel/certs.pem
+# Don't forget to c_rehash CRLpath
+# CRLpath is located inside chroot jail:
+#CRLpath = /crls
+# Alternatively you can use CRLfile:
+#CRLfile = /etc/stunnel/crls.pem
+
+# Some debugging stuff useful for troubleshooting
+#debug = 7
+#output = stunnel.log
+
+# Use it for client mode
+#client = yes
+
+# Service-level configuration
+
+#[pop3s]
+#accept  = 995
+#connect = 110
+
+#[imaps]
+#accept  = 993
+#connect = 143
+
+#[ssmtp]
+#accept  = 465
+#connect = 25
+
+#[https]
+#accept  = 443
+#connect = 80
+#TIMEOUTclose = 0
diff --git a/net-misc/stunnel/files/stunnel.rc6.4.09 b/net-misc/stunnel/files/stunnel.rc6.4.09
new file mode 100755
index 000000000000..d3fac3283205
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel.rc6.4.09
@@ -0,0 +1,34 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/files/stunnel.rc6.4.09,v 1.1 2005/05/13 21:45:29 ramereth Exp $
+
+# Default pidfile location
+PIDFILE="/var/run/stunnel/stunnel.pid"
+
+checkconfig() {
+    # To ensure backwards compatibility
+    if [ ! -z "$(egrep '/etc/stunnel/stunnel.pid' /etc/stunnel/stunnel.conf)" ] ; then
+	ewarn "Please update your stunnel.conf!"
+	ewarn "pid should point to /var/run/stunnel/stunnel.pid"
+	PIDFILE="/etc/stunnel/stunnel.pid"
+    fi
+}
+
+depend() {
+    need net
+}
+
+start() {
+    checkconfig
+    ebegin "Starting stunnel"
+    start-stop-daemon --start --pidfile ${PIDFILE} --quiet --exec /usr/sbin/stunnel -- /etc/stunnel/stunnel.conf  
+    eend $?
+}
+
+stop() {
+    checkconfig
+    ebegin "Stopping stunnel"
+    start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
+    eend $?
+}
diff --git a/net-misc/stunnel/metadata.xml b/net-misc/stunnel/metadata.xml
index 8060c04f89e1..b127144898eb 100644
--- a/net-misc/stunnel/metadata.xml
+++ b/net-misc/stunnel/metadata.xml
@@ -2,7 +2,18 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
-<maintainer>
-  <email>aliz@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>aliz@gentoo.org</email>
+	</maintainer>
+	<maintainer>
+		<email>ramereth@gentoo.org</email>
+		<name>Lance Albertson</name>
+	</maintainer>
+	<longdescription lang="en">
+		Stunnel is a program that allows you to encrypt arbitrary TCP
+		connections inside SSL (Secure Sockets Layer) available on both Unix and
+		Windows. Stunnel can allow you to secure non-SSL aware daemons and
+		protocols (like POP, IMAP, LDAP, etc) by having Stunnel provide the
+		encryption, requiring no changes to the daemon's code.
+	</longdescription>
 </pkgmetadata>
diff --git a/net-misc/stunnel/stunnel-4.09.ebuild b/net-misc/stunnel/stunnel-4.09.ebuild
new file mode 100644
index 000000000000..42dca0e0badf
--- /dev/null
+++ b/net-misc/stunnel/stunnel-4.09.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.09.ebuild,v 1.1 2005/05/13 21:45:29 ramereth Exp $
+
+inherit ssl-cert eutils flag-o-matic
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://stunnel.mirt.net/"
+SRC_URI="http://www.stunnel.org/download/stunnel/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~amd64"
+IUSE="ipv6 selinux tcpd"
+
+DEPEND="virtual/libc
+	>=dev-libs/openssl-0.9.6j"
+RDEPEND=">=dev-libs/openssl-0.9.6j
+	selinux? ( sec-policy/selinux-stunnel )"
+
+src_unpack() {
+	unpack ${A}
+	# Hack away generation of certificate
+	sed -i s/^install-data-local:/do-not-run-this:/ "${S}"/tools/Makefile.in
+}
+
+src_compile() {
+	econf \
+		`use_enable ipv6`\
+		`use_with tcpd tcp-wrappers` \
+		|| die "econf died"
+	emake || die "emake died"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+	rm -rf ${D}/usr/share/doc/${PN}
+	rm -f ${D}/{etc/stunnel/stunnel.conf-sample,usr/sbin/stunnel3}
+	rm -f ${D}/usr/share/man/man8/{stunnel.fr.8,stunnel.pl.8}
+
+	dodoc AUTHORS BUGS CREDITS INSTALL NEWS PORTS README TODO ChangeLog \
+		doc/en/transproxy.txt
+	dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+		tools/importCA.html
+
+	insinto /etc/stunnel
+	donewins ${FILESDIR}/stunnel.conf.${PVR} stunnel.conf
+	docert stunnel
+	newinitd ${FILESDIR}/stunnel.rc6.${PVR} stunnel
+
+	keepdir /var/run/stunnel
+}
+
+pkg_postinst() {
+	enewgroup stunnel
+	enewuser stunnel -1 -1 -1 stunnel
+
+	chown stunnel:stunnel ${ROOT}/var/run/stunnel
+	chown stunnel:stunnel ${ROOT}/etc/stunnel/stunnel.{conf,crt,csr,key,pem}
+	chmod 0640 ${ROOT}/etc/stunnel/stunnel.{conf,crt,csr,key,pem}
+
+	if [ ! -z "$(egrep '/etc/stunnel/stunnel.pid' \
+		${ROOT}/etc/stunnel/stunnel.conf )" ] ; then
+
+		ewarn "As of stunnel-4.09, the pid file will be located in /var/run/stunnel."
+		ewarn "Please stop stunnel, etc-update, and start stunnel back up to ensure"
+		ewarn "the update takes place"
+		ewarn ""
+		ewarn "The new location will be /var/run/stunnel/stunnel.pid"
+		ebeep 3
+		epause 3
+	fi
+}