[arch-commits] Commit in stunnel/repos (4 files)

[Eric Belanger]

    Date: Wednesday, June 25, 2008 @ 00:30:54
  Author: eric
Revision: 3560

Merged revisions 2-3559 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/stunnel/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r1819 | kevin | 2008-05-20 20:56:47 -0400 (Tue, 20 May 2008) | 2 lines
  
  upgpkg: stunnel 4.24-1
      update to 4.24, added license
........
  r3554 | kevin | 2008-06-24 23:42:18 -0400 (Tue, 24 Jun 2008) | 2 lines
  
  upgpkg: stunnel 4.25-1
      FS#10468: corrected path to binary in start script
........

Modified:
  stunnel/repos/extra-x86_64/	(properties)
  stunnel/repos/extra-x86_64/PKGBUILD
  stunnel/repos/extra-x86_64/stunnel
  stunnel/repos/extra-x86_64/stunnel.install

-----------------+
 PKGBUILD        |   20 ++++++++++++--------
 stunnel         |    4 ++--
 stunnel.install |    5 -----
 3 files changed, 14 insertions(+), 15 deletions(-)


Property changes on: stunnel/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /stunnel/trunk:1
   + /stunnel/trunk:1-3559

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-06-25 04:13:15 UTC (rev 3559)
+++ extra-x86_64/PKGBUILD	2008-06-25 04:30:54 UTC (rev 3560)
@@ -3,17 +3,20 @@
 # Contributor: Manolis Tzanidakis
 
 pkgname=stunnel
-pkgver=4.20
+pkgver=4.25
 pkgrel=1
 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL."
 arch=(i686 x86_64)
+license=(GPL)
 url="http://www.stunnel.org"
 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=('cf9940395d3503018f721c962528d2ec' 'aec994e209405420eed197fd15ca09b0'\
-         '2e249654279cc2ffe41df58e68350e5b')
+md5sums=('7f00799f43910c0362df0e69c65965aa'
+         'aec994e209405420eed197fd15ca09b0'
+         'cb647c71ff4cb1e035b6e515d5f13ebf')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
@@ -29,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: extra-x86_64/stunnel
===================================================================
--- extra-x86_64/stunnel	2008-06-25 04:13:15 UTC (rev 3559)
+++ extra-x86_64/stunnel	2008-06-25 04:30:54 UTC (rev 3560)
@@ -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

Modified: extra-x86_64/stunnel.install
===================================================================
--- extra-x86_64/stunnel.install	2008-06-25 04:13:15 UTC (rev 3559)
+++ extra-x86_64/stunnel.install	2008-06-25 04:30:54 UTC (rev 3560)
@@ -42,8 +42,3 @@
   groupdel stunnel &> /dev/null
   rm -rf /var/run/stunnel
 }
-
-op=$1
-shift
-
-$op $*