summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Ahlberg <aliz@gentoo.org>2003-01-04 02:38:19 +0000
committerDaniel Ahlberg <aliz@gentoo.org>2003-01-04 02:38:19 +0000
commit8837739807160d122bd2c2a834da0e7bf065d558 (patch)
tree5ad9b2ca88114511a347ea7a28eb0bab9eb36645
parentsomething left (diff)
downloadgentoo-2-8837739807160d122bd2c2a834da0e7bf065d558.tar.gz
gentoo-2-8837739807160d122bd2c2a834da0e7bf065d558.tar.bz2
gentoo-2-8837739807160d122bd2c2a834da0e7bf065d558.zip
Misc fixes
-rw-r--r--net-misc/stunnel/ChangeLog5
-rw-r--r--net-misc/stunnel/files/stunnel.rc66
-rw-r--r--net-misc/stunnel/stunnel-4.02.ebuild20
3 files changed, 19 insertions, 12 deletions
diff --git a/net-misc/stunnel/ChangeLog b/net-misc/stunnel/ChangeLog
index cd018d08130c..3986622e32e2 100644
--- a/net-misc/stunnel/ChangeLog
+++ b/net-misc/stunnel/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/stunnel
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.5 2002/12/13 11:00:14 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.6 2003/01/04 02:38:19 aliz Exp $
+
+ 04 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> stunnel-4.02.ebuild, files/stunnel.rc6 :
+ Misc fixes, closes #12608.
06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
diff --git a/net-misc/stunnel/files/stunnel.rc6 b/net-misc/stunnel/files/stunnel.rc6
index 7bcbe435d6a2..a871fa9c07bf 100644
--- a/net-misc/stunnel/files/stunnel.rc6
+++ b/net-misc/stunnel/files/stunnel.rc6
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/files/stunnel.rc6,v 1.1 2002/10/26 23:42:32 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/files/stunnel.rc6,v 1.2 2003/01/04 02:38:19 aliz Exp $
depend() {
need net
@@ -9,12 +9,12 @@ depend() {
start() {
ebegin "Starting stunnel"
- start-stop-daemon --start --quiet --exec /usr/sbin/stunnel
+ start-stop-daemon --start --quiet --exec /usr/sbin/stunnel -- /etc/stunnel/stunnel.conf
eend $?
}
stop() {
ebegin "Stopping net-snmpd"
- start-stop-daemon --stop --quiet --exec /usr/sbin/stunnel
+ start-stop-daemon --stop --quiet --exec /usr/sbin/stunnel -- /etc/stunnel/stunnel.conf
eend $?
}
diff --git a/net-misc/stunnel/stunnel-4.02.ebuild b/net-misc/stunnel/stunnel-4.02.ebuild
index 5878d9905440..ff2f35ef195b 100644
--- a/net-misc/stunnel/stunnel-4.02.ebuild
+++ b/net-misc/stunnel/stunnel-4.02.ebuild
@@ -1,6 +1,6 @@
# Copyright 2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.02.ebuild,v 1.2 2002/12/09 04:33:19 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-4.02.ebuild,v 1.3 2003/01/04 02:38:19 aliz Exp $
S=${WORKDIR}/${P}
DESCRIPTION="TSL/SSL - Port Wrapper"
@@ -17,10 +17,10 @@ src_unpack() {
patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
}
-src_compile() {
- ./configure --prefix=/usr --infodir=/usr/share/info --mandir=/usr/share/man || die
- emake || die
-}
+#src_compile() {
+# econf || die
+# emake || die
+#}
src_install() {
into /usr
@@ -33,14 +33,18 @@ src_install() {
insinto /usr/share/doc/${PF}
doins tools/ca.pl tools/importCA.sh
- insinto /etc/init.d
- newins ${FILESDIR}/stunnel.rc6 stunnel
+ exeinto /etc/init.d
+ newexe ${FILESDIR}/stunnel.rc6 stunnel
dolib src/.libs/libstunnel.la
dolib.so src/.libs/libstunnel.so
- insinto /etc
+ insinto /etc/stunnel
doins ${FILESDIR}/stunnel.conf
+
+ dosed "s:/usr/etc/stunnel:/etc/stunnel:" /etc/stunnel/stunnel.conf
+
+ dodir /etc/stunnel
}
pkg_postinst() {