Closing #53519.

6 files changed, 108 insertions, 15 deletions

diff --git a/net-misc/stunnel/ChangeLog b/net-misc/stunnel/ChangeLog
index c8e9a29dbba8..87d080d6ceba 100644
--- a/net-misc/stunnel/ChangeLog
+++ b/net-misc/stunnel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/stunnel
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.26 2004/06/08 07:59:52 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.27 2004/06/14 19:10:04 aliz Exp $
+
+*stunnel-4.05 (14 Jun 2004)
+
+  14 Jun 2004; Daniel Ahlberg <aliz@gentoo.org> stunnel-4.05.ebuild:
+  Version bump found by Daniel Webert <daniel_webert@web.de> in #53519. Added
+  metadata.xml.
 
   08 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> stunnel-4.04-r3.ebuild:
   Stable on alpha.
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 7a1722561de4..c61558a05f29 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,22 +1,25 @@
-MD5 56b1435200867f376c16f045cf081886 stunnel-3.26.ebuild 775
-MD5 abf2690f0d68c9d31321a3b9b508e3e0 stunnel-4.04-r2.ebuild 1770
+MD5 ba9e2e8b0386d64dd4adecf2c5fabd9f stunnel-4.04-r2.ebuild 1769
+MD5 3394ca108a5f8dbe5d82a5fdf015c61b stunnel-3.22-r2.ebuild 919
+MD5 cdaf70d5f199b9751dbf9895158ee6eb stunnel-3.26.ebuild 774
+MD5 a42a5573024686e1e600685bf13ddc7f stunnel-4.05.ebuild 1763
+MD5 59b27a4f747e20814ec17f8ed6a9f9a3 stunnel-4.04-r1.ebuild 1699
 MD5 dc3d110d847ba43de37a1b5a9ec2445f stunnel-4.04-r3.ebuild 1761
 MD5 34bbee92573a6cd35c7417b86a9e8fcd ChangeLog 3357
-MD5 46d08a84d32d31324508bc29a7f2da55 stunnel-4.04-r1.ebuild 1700
-MD5 86eea6bc8f56e00074177c23bc9ddbfa stunnel-3.22-r2.ebuild 920
-MD5 021f1b3d5a07aa11f572d4fa8a50b4f1 files/stunnel.conf.4.04-r2 721
 MD5 9177dd12df6261a5bde7e8756c0f1585 files/stunnel-3.22-blinding.patch 3756
-MD5 dfc2feba647c5fb39db0bd98e769fb7e files/digest-stunnel-4.04-r2 64
-MD5 f0bc7b1f2fbe0f8e9fe15b05b8add06d files/stunnel.rc6.4.04-r3 605
-MD5 de0ef08d91f0d3b050792c3b20394625 files/stunnel.rc6 541
-MD5 b42ca1fbeb5d6454de36aac4cb893294 files/stunnel-3.26-gentoo.diff 941
-MD5 4839b059fba14c4f7f2acb50888aadac files/stunnel.conf 720
-MD5 dfc2feba647c5fb39db0bd98e769fb7e files/digest-stunnel-4.04-r3 64
+MD5 3a379f44f65498303a6e40d2507c5d69 files/stunnel.rc6 540
 MD5 bf10c9036f0ff4b8578c46b89538aed7 files/digest-stunnel-3.22-r2 64
-MD5 2afb1fc42f8ea8f7b54d47a79f80e33a files/stunnel-4.04-gentoo.diff 321
+MD5 4f954fd61770afc292c04b81b6bf421a files/stunnel.rc6.4.04-r2 567
+MD5 c9f531a5e0d6f9cf2dda41d0d934842f files/stunnel.rc6.4.04-r3 604
+MD5 021f1b3d5a07aa11f572d4fa8a50b4f1 files/stunnel.conf.4.04-r2 721
 MD5 2f553bbcab5ab83a6e45e3ddd73f9944 files/stunnel.conf.4.04-r3 725
 MD5 6cdf521ff4c96a48e8863635b78fa596 files/stunnel-4.04-blinding.patch 2526
-MD5 ea2086dcf69dddf6d075a7040d209335 files/digest-stunnel-3.26 64
 MD5 dfc2feba647c5fb39db0bd98e769fb7e files/digest-stunnel-4.04-r1 64
-MD5 1b63ee5eed62e328acae738d1306b224 files/stunnel.rc6.4.04-r2 568
+MD5 dfc2feba647c5fb39db0bd98e769fb7e files/digest-stunnel-4.04-r2 64
+MD5 dfc2feba647c5fb39db0bd98e769fb7e files/digest-stunnel-4.04-r3 64
+MD5 ea2086dcf69dddf6d075a7040d209335 files/digest-stunnel-3.26 64
+MD5 c0fb8fc4f6d919edc9d76e0f423873eb files/digest-stunnel-4.05 64
+MD5 2afb1fc42f8ea8f7b54d47a79f80e33a files/stunnel-4.04-gentoo.diff 321
+MD5 b42ca1fbeb5d6454de36aac4cb893294 files/stunnel-3.26-gentoo.diff 941
 MD5 60507279a2c9abbec2037b9e5a0840f7 files/stunnel-3.22-gentoo.diff 1170
+MD5 2afb1fc42f8ea8f7b54d47a79f80e33a files/stunnel-4.05-gentoo.diff 321
+MD5 4839b059fba14c4f7f2acb50888aadac files/stunnel.conf 720
diff --git a/net-misc/stunnel/files/digest-stunnel-4.05 b/net-misc/stunnel/files/digest-stunnel-4.05
new file mode 100644
index 000000000000..e77a8b2116f1
--- /dev/null
+++ b/net-misc/stunnel/files/digest-stunnel-4.05
@@ -0,0 +1 @@
+MD5 e28a03cf694a43a7f144ec3d5c064456 stunnel-4.05.tar.gz 341191
diff --git a/net-misc/stunnel/files/stunnel-4.05-gentoo.diff b/net-misc/stunnel/files/stunnel-4.05-gentoo.diff
new file mode 100644
index 000000000000..b41de790e162
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel-4.05-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/metadata.xml b/net-misc/stunnel/metadata.xml
new file mode 100644
index 000000000000..8060c04f89e1
--- /dev/null
+++ b/net-misc/stunnel/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>aliz@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/stunnel/stunnel-4.05.ebuild b/net-misc/stunnel/stunnel-4.05.ebuild
new file mode 100644
index 000000000000..dee91e656360
--- /dev/null
+++ b/net-misc/stunnel/stunnel-4.05.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.05.ebuild,v 1.1 2004/06/14 19:10:04 aliz Exp $
+
+inherit ssl-cert eutils
+
+IUSE="static"
+S=${WORKDIR}/${P}
+DESCRIPTION="TLS/SSL - Port Wrapper"
+SRC_URI="http://www.stunnel.org/download/stunnel/src/${P}.tar.gz"
+HOMEPAGE="http://stunnel.mirt.net"
+DEPEND="virtual/glibc >=dev-libs/openssl-0.9.6j"
+RDEPEND=">=dev-libs/openssl-0.9.6j"
+KEYWORDS="~x86 ~sparc ~alpha ~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+
+src_unpack() {
+	unpack ${A}; cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+}
+
+src_compile() {
+	use static && myconf="${myconf} --disable-shared --enable-static"
+	use static && LDADD="${LDADD} -all-static" && export LDADD
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	insinto /etc/stunnel
+	docert stunnel
+
+	into /usr
+	dosbin src/stunnel
+	dodoc AUTHORS BUGS COPYING COPYRIGHT.GPL CREDITS INSTALL NEWS PORTS README TODO
+	dodoc doc/en/transproxy.txt
+	dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html tools/importCA.html
+	doman doc/stunnel.8
+
+	insinto /usr/share/doc/${PVR}
+	doins tools/ca.pl tools/importCA.sh
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/stunnel.rc6.${PVR} stunnel
+
+	dolib src/.libs/libstunnel.la
+	use static || newlib.so src/.libs/libstunnel.so libstunnel.so.${PV}
+	use static || dosym /usr/lib/libstunnel.so.${PV} /usr/lib/libstunnel.so
+
+	insinto /etc/stunnel
+	donewins ${FILESDIR}/stunnel.conf.${PVR} stunnel.conf
+}
+
+pkg_postinst() {
+	enewuser stunnel
+	enewgroup stunnel
+
+	chown stunnel /etc/stunnel
+
+	einfo "Starting from version 4 stunnel now uses a configuration file for setting up stunnels."
+	einfo "Stunnel can now also be run as a daemon"
+}