[arch-commits] Commit in stunnel/trunk (PKGBUILD stunnel)

[Kevin Piche]

    Date: Tuesday, June 24, 2008 @ 23:42:18
  Author: kevin
Revision: 3554

upgpkg: stunnel 4.25-1
    FS#10468: corrected path to binary in start script

Modified:
  stunnel/trunk/PKGBUILD
  stunnel/trunk/stunnel

----------+
 PKGBUILD |   19 +++++++++++--------
 stunnel  |    4 ++--
 2 files changed, 13 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-06-25 03:04:54 UTC (rev 3553)
+++ PKGBUILD	2008-06-25 03:42:18 UTC (rev 3554)
@@ -3,7 +3,7 @@
 # Contributor: Manolis Tzanidakis
 
 pkgname=stunnel
-pkgver=4.24
+pkgver=4.25
 pkgrel=1
 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL."
 arch=(i686 x86_64)
@@ -12,9 +12,11 @@
 depends=('openssl' 'perl' 'tcp_wrappers' 'zlib')
 source=(http://www.stunnel.org/download/stunnel/src/${pkgname}-${pkgver}.tar.gz
         stunnel-nopem.patch stunnel)
+options=(!libtool)
 install="$pkgname.install"
-md5sums=('f2eea97f2e51f524b4add907ffae077b' 'aec994e209405420eed197fd15ca09b0'
-         '2e249654279cc2ffe41df58e68350e5b')
+md5sums=('7f00799f43910c0362df0e69c65965aa'
+         'aec994e209405420eed197fd15ca09b0'
+         'cb647c71ff4cb1e035b6e515d5f13ebf')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
@@ -30,14 +32,15 @@
   for i in ca.pl importCA.sh; do
     /bin/install -D -m 755 tools/$i $startdir/pkg/usr/share/stunnel/$i
   done
-  /bin/install -D -m 755 $startdir/stunnel $startdir/pkg/etc/rc.d/stunnel
-  /bin/sed -i -e "s:/usr/var/run/stunnel/:/var/run/stunnel:g" \
-      -e "s:nobody:stunnel:g" -e "s:nogroup:stunnel:g" \
-      $startdir/pkg/etc/stunnel/stunnel.conf-sample
+  /bin/install -D -m 755 $startdir/src/stunnel $startdir/pkg/etc/rc.d/stunnel
+  /bin/sed -e "s:/usr/var/lib/stunnel/:/var/run/stunnel:g" \
+           -e "s:/usr/etc/stunnel/:/etc/stunnel/:g" \
+           -e "s:nobody:stunnel:g" -e "s:nogroup:stunnel:g" \
+           -i $startdir/pkg/etc/stunnel/stunnel.conf-sample
   /bin/install -D -m 644 tools/stunnel.cnf \
       $startdir/pkg/etc/stunnel/stunnel.cnf
 
   # libtoolslay
-  find $startdir/pkg -name '*.la' -exec rm {} \;
+  #find $startdir/pkg -name '*.la' -exec rm {} \;
 }
 # vim: ts=2 sw=2 et ft=sh

Modified: stunnel
===================================================================
--- stunnel	2008-06-25 03:04:54 UTC (rev 3553)
+++ stunnel	2008-06-25 03:42:18 UTC (rev 3554)
@@ -3,11 +3,11 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-PID=`pidof -o %PPID /usr/sbin/stunnel`
+PID=`pidof -o %PPID /usr/bin/stunnel`
 case "$1" in
   start)
     stat_busy "Starting stunnel"
-    [ -z "$PID" ] && /usr/sbin/stunnel
+    [ -z "$PID" ] && /usr/bin/stunnel
     if [ $? -gt 0 ]; then
       stat_fail
     else