[gentoo-commits] gentoo-x86 commit in net-misc/stunnel: ChangeLog stunnel-4.20.ebuild stunnel-4.21.ebuild stunnel-4.16.ebuild

[Ulrich Mueller (ulm)]

ulm         07/12/08 10:38:25

  Modified:             ChangeLog stunnel-4.20.ebuild
  Added:                stunnel-4.21.ebuild
  Removed:              stunnel-4.16.ebuild
  Log:
  Version bump, bug #197881.
  (Portage version: 2.1.4_rc8)

Revision  Changes    Path
1.78                 net-misc/stunnel/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/stunnel/ChangeLog?rev=1.78&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/stunnel/ChangeLog?rev=1.78&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/stunnel/ChangeLog?r1=1.77&r2=1.78

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- ChangeLog	10 Nov 2007 05:26:34 -0000	1.77
+++ ChangeLog	8 Dec 2007 10:38:25 -0000	1.78
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/stunnel
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.77 2007/11/10 05:26:34 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.78 2007/12/08 10:38:25 ulm Exp $
+
+*stunnel-4.21 (08 Dec 2007)
+
+  08 Dec 2007; Ulrich Mueller <ulm@g.o>
+  +files/stunnel-4.21-libwrap.patch, files/stunnel.rc6,
+  +files/stunnel.rc6.4.20, -stunnel-4.16.ebuild, stunnel-4.20.ebuild,
+  +stunnel-4.21.ebuild:
+  Version bump; ebuild and patch by Santiago M. Mola <coldwind@g.o> in
+  bug #197881. Replace call to docert by install_cert, bug #174759. The binary
+  is now installed in /usr/bin; provide a symlink for backwards compatibility
+  and update the rc file accordingly. Remove old version.
 
   10 Nov 2007; Samuli Suominen <drac@g.o> stunnel-3.26.ebuild:
   Keyword ~amd64 wrt #193770.



1.13                 net-misc/stunnel/stunnel-4.20.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/stunnel/stunnel-4.20.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/stunnel/stunnel-4.20.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/stunnel/stunnel-4.20.ebuild?r1=1.12&r2=1.13

Index: stunnel-4.20.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.20.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- stunnel-4.20.ebuild	3 Nov 2007 16:00:15 -0000	1.12
+++ stunnel-4.20.ebuild	8 Dec 2007 10:38:25 -0000	1.13
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.20.ebuild,v 1.12 2007/11/03 16:00:15 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.20.ebuild,v 1.13 2007/12/08 10:38:25 ulm Exp $
 
 inherit ssl-cert eutils flag-o-matic
 
@@ -39,10 +39,10 @@
 }
 
 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}
+	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
@@ -50,8 +50,8 @@
 		tools/importCA.html
 
 	insinto /etc/stunnel
-	newins ${FILESDIR}/stunnel.conf stunnel.conf
-	newinitd ${FILESDIR}/stunnel.rc6 stunnel
+	doins "${FILESDIR}"/stunnel.conf
+	newinitd "${FILESDIR}"/stunnel.rc6.${PV} stunnel
 	# Check if there's currently an cert already there
 	if [ ! -f /etc/stunnel/stunnel.key ]; then
 		docert stunnel
@@ -64,12 +64,12 @@
 	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}
+	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
+		"${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"



1.1                  net-misc/stunnel/stunnel-4.21.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/stunnel/stunnel-4.21.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/stunnel/stunnel-4.21.ebuild?rev=1.1&content-type=text/plain

Index: stunnel-4.21.ebuild
===================================================================
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.21.ebuild,v 1.1 2007/12/08 10:38:25 ulm Exp $

inherit autotools ssl-cert eutils

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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="ipv6 selinux tcpd"

DEPEND="tcpd? ( sys-apps/tcp-wrappers )
	>=dev-libs/openssl-0.9.6j"
RDEPEND="${DEPEND}
	selinux? ( sec-policy/selinux-stunnel )"

pkg_setup() {
	enewgroup stunnel
	enewuser stunnel -1 -1 -1 stunnel
}

src_unpack() {
	unpack ${A}
	cd "${S}"
	epatch "${FILESDIR}"/${P}-libwrap.patch
	eautoreconf

	# Hack away generation of certificate
	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
		tools/Makefile.in || die "sed failed"
}

src_compile() {
	econf $(use_enable ipv6) \
		$(use_enable tcpd libwrap) || die "econf died"
	emake || die "emake died"
}

src_install() {
	emake DESTDIR="${D}" install || die "emake install failed"
	rm -rf "${D}"/usr/share/doc/${PN}
	rm -f "${D}"/etc/stunnel/stunnel.conf-sample "${D}"/usr/bin/stunnel3 \
		"${D}"/usr/share/man/man8/stunnel.{fr,pl}.8

	# The binary was moved to /usr/bin with 4.21,
	# symlink for backwards compatibility
	dosym ../bin/stunnel /usr/sbin/stunnel

	dodoc AUTHORS BUGS CREDITS 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
	doins "${FILESDIR}"/stunnel.conf
	newinitd "${FILESDIR}"/stunnel.rc6 stunnel

	keepdir /var/run/stunnel
	fowners stunnel:stunnel /var/run/stunnel
}

pkg_postinst() {
	if [ ! -f "${ROOT}"/etc/stunnel/stunnel.key ]; then
		install_cert /etc/stunnel/stunnel
		chown stunnel:stunnel "${ROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
		chmod 0640 "${ROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
	fi

	if [ ! -z "$(grep /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"
	fi
}



-- 
gentoo-commits@g.o mailing list