Fixes installation of libraries

4 files changed, 76 insertions, 9 deletions

diff --git a/net-misc/stunnel/ChangeLog b/net-misc/stunnel/ChangeLog
index 4bdf56b93f37..702be3d0cb5d 100644
--- a/net-misc/stunnel/ChangeLog
+++ b/net-misc/stunnel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/stunnel
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.10 2003/05/26 06:49:25 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.11 2003/06/25 10:25:37 aliz Exp $
+
+*stunnel-4.04-r1 (25 Jun 2003)
+
+  25 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> stunnel-4.04-r1.ebuild :
+  Fixed installation av shared and static libstunnel. Found by Simon Matthews <simon@paxonet.com>.
 
   26 May 2003; Daniel Ahlberg <aliz@gentoo.org> stunnel-3.22-r1.ebuild, stunnel-3.22-r2.ebuild
 						stunnel-4.02.ebuild, stunnel-4.04.ebuild :
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 31a765630302..2b892e48de40 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,18 +1,19 @@
-MD5 966747c0a69e642c3c47c546cc84a889 ChangeLog 1428
+MD5 9453f4eb96a7af46c3d9bcac46f2da03 ChangeLog 1633
 MD5 f50f68bb9d3326181f8b318e76aa1de0 stunnel-3.22-r1.ebuild 866
-MD5 dcebdde5e1aeb2e8615b0d7c23e4ee82 stunnel-3.22-r2.ebuild 916
 MD5 61b49be13e3cee5ca0de0dd5c6db2ec2 stunnel-4.02.ebuild 1426
-MD5 59fa013273a91787278e88baa4a09ae3 stunnel-4.04.ebuild 1638
+MD5 dcebdde5e1aeb2e8615b0d7c23e4ee82 stunnel-3.22-r2.ebuild 916
+MD5 38c70ffa1374e2af9632cf99c5936d1c stunnel-4.04-r1.ebuild 1732
 MD5 bf10c9036f0ff4b8578c46b89538aed7 files/digest-stunnel-3.22-r1 64
-MD5 bf10c9036f0ff4b8578c46b89538aed7 files/digest-stunnel-3.22-r2 64
 MD5 220783bf566d4a93f482aaa1b832c3de files/digest-stunnel-4.02 64
-MD5 dfc2feba647c5fb39db0bd98e769fb7e files/digest-stunnel-4.04 64
 MD5 11826396e336e3ef4004caa61501610b files/stunnel-3.14-gentoo.diff 1147
-MD5 9177dd12df6261a5bde7e8756c0f1585 files/stunnel-3.22-blinding.patch 3756
 MD5 60507279a2c9abbec2037b9e5a0840f7 files/stunnel-3.22-gentoo.diff 1170
 MD5 60507279a2c9abbec2037b9e5a0840f7 files/stunnel-3.22-r1-gentoo.diff 1170
 MD5 2afb1fc42f8ea8f7b54d47a79f80e33a files/stunnel-4.02-gentoo.diff 321
-MD5 6cdf521ff4c96a48e8863635b78fa596 files/stunnel-4.04-blinding.patch 2526
-MD5 2afb1fc42f8ea8f7b54d47a79f80e33a files/stunnel-4.04-gentoo.diff 321
 MD5 4839b059fba14c4f7f2acb50888aadac files/stunnel.conf 720
 MD5 8f15bd139f849ac79a4be397b39e1dcd files/stunnel.rc6 553
+MD5 2afb1fc42f8ea8f7b54d47a79f80e33a files/stunnel-4.04-gentoo.diff 321
+MD5 6cdf521ff4c96a48e8863635b78fa596 files/stunnel-4.04-blinding.patch 2526
+MD5 9177dd12df6261a5bde7e8756c0f1585 files/stunnel-3.22-blinding.patch 3756
+MD5 dfc2feba647c5fb39db0bd98e769fb7e files/digest-stunnel-4.04 64
+MD5 dfc2feba647c5fb39db0bd98e769fb7e files/digest-stunnel-4.04-r1 64
+MD5 bf10c9036f0ff4b8578c46b89538aed7 files/digest-stunnel-3.22-r2 64
diff --git a/net-misc/stunnel/files/digest-stunnel-4.04-r1 b/net-misc/stunnel/files/digest-stunnel-4.04-r1
new file mode 100644
index 000000000000..f8df0f6a7fdf
--- /dev/null
+++ b/net-misc/stunnel/files/digest-stunnel-4.04-r1
@@ -0,0 +1 @@
+MD5 2fcdf0311a0ab8a3223293c706a84e97 stunnel-4.04.tar.gz 309072
diff --git a/net-misc/stunnel/stunnel-4.04-r1.ebuild b/net-misc/stunnel/stunnel-4.04-r1.ebuild
new file mode 100644
index 000000000000..59af89318cd1
--- /dev/null
+++ b/net-misc/stunnel/stunnel-4.04-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.04-r1.ebuild,v 1.1 2003/06/25 10:25:38 aliz Exp $
+
+inherit 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.6c"
+RDEPEND=">=dev-libs/openssl-0.9.6c"
+KEYWORDS="~x86 ~sparc "
+LICENSE="GPL-2"
+SLOT="0"
+
+src_unpack() {
+	unpack ${A}; cd ${S}
+	epatch ${FILESDIR}/${PF}-gentoo.diff
+	epatch ${FILESDIR}/${P}-blinding.patch
+}
+
+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() {
+	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/${PF}
+	doins tools/ca.pl tools/importCA.sh
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/stunnel.rc6 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
+	doins ${FILESDIR}/stunnel.conf	
+
+	dosed "s:/usr/etc/stunnel:/etc/stunnel:" /etc/stunnel/stunnel.conf
+
+	dodir /etc/stunnel
+}
+
+pkg_postinst() {
+	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"
+}