stunnel: update to 4.22

stunnel/.md5sum

@@ -1,3 +1,3 @@
 20d8078911733e4de22903034e725db6  stunnel
-cf9940395d3503018f721c962528d2ec  stunnel-4.20.tar.gz
-53fcee46beb717d0827c925258197bd8  stunnel-config.patch
+773fcf5b0a70bd25fcd58ba7a76c1fbd  stunnel-4.22.tar.gz
+877abcaf74148b8a8af5635f3740a35b  stunnel-config.patch

stunnel/Pkgfile

@@ -1,26 +1,27 @@
 # Description: Stunnel wraps normal socket connections with SSL/TLS
 # URL:         http://www.stunnel.org
 # Maintainer:  Jürgen Daubert, juergen dot daubert at t-online dot de
-# Depends on:  openssl, zlib, tcp_wrappers
+# Depends on:  openssl, zlib
 
 name=stunnel
-version=4.20
+version=4.22
 release=1
 source=(http://www.stunnel.org/download/stunnel/src/$name-$version.tar.gz \
         $name-config.patch $name)
 
 build () {
     cd $name-$version
+
     patch -p1 < $SRC/$name-config.patch
+
     ./configure --prefix=/usr \
                 --sysconfdir=/etc \
                 --localstatedir=/var \
                 --with-ssl=/usr \
-                --with-tcp-wrappers \
                 --enable-ipv6 \
-                --enable-static=yes \
-                --enable-shared=no
+                --disable-libwrap
     make
+
     install -D -m 0755 src/stunnel $PKG/usr/sbin/stunnel
     install -D -m 0644 doc/stunnel.8 $PKG/usr/man/man8/stunnel.8
     install -D -m 0755 $SRC/stunnel  $PKG/etc/rc.d/stunnel

stunnel/stunnel-config.patch

@@ -1,18 +1,18 @@
-diff -Nru stunnel-4.16.orig/src/Makefile.in stunnel-4.16/src/Makefile.in
---- stunnel-4.16.orig/src/Makefile.in	2006-09-02 10:26:19.000000000 +0200
-+++ stunnel-4.16/src/Makefile.in	2006-09-02 10:26:34.000000000 +0200
-@@ -223,7 +223,7 @@
+diff -Nru stunnel-4.22.orig/src/Makefile.in stunnel-4.22/src/Makefile.in
+--- stunnel-4.22.orig/src/Makefile.in	2008-04-07 20:12:07.000000000 +0200
++++ stunnel-4.22/src/Makefile.in	2008-04-07 20:13:35.000000000 +0200
+@@ -224,7 +224,7 @@
  INCLUDES = -I/usr/kerberos/include
  
  # Additional compiler flags
--AM_CPPFLAGS = -DLIBDIR='"$(libdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"' -DPIDFILE='"$(prefix)/var/run/stunnel/stunnel.pid"'
-+AM_CPPFLAGS = -DLIBDIR='"$(libdir)"' -DCONFDIR='"$(sysconfdir)"' -DPIDFILE='"/var/run/stunnel/stunnel.pid"'
+-AM_CPPFLAGS = -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"' -DPIDFILE='"$(localstatedir)/run/stunnel/stunnel.pid"'
++AM_CPPFLAGS = -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)"' -DPIDFILE='"$(localstatedir)/run/stunnel/stunnel.pid"'
  
  # Win32 executable
  EXTRA_DIST = stunnel.exe make.bat mingw.mak makece.bat evc.mak vc.mak nogui.c os2.mak
-diff -Nru stunnel-4.16.orig/tools/stunnel.conf-sample.in stunnel-4.16/tools/stunnel.conf-sample.in
---- stunnel-4.16.orig/tools/stunnel.conf-sample.in	2006-09-02 10:26:19.000000000 +0200
-+++ stunnel-4.16/tools/stunnel.conf-sample.in	2006-09-02 10:29:27.000000000 +0200
+diff -Nru stunnel-4.22.orig/tools/stunnel.conf-sample.in stunnel-4.22/tools/stunnel.conf-sample.in
+--- stunnel-4.22.orig/tools/stunnel.conf-sample.in	2008-04-07 20:12:07.000000000 +0200
++++ stunnel-4.22/tools/stunnel.conf-sample.in	2008-04-08 13:14:40.000000000 +0200
 @@ -3,16 +3,16 @@
  ; Please make sure you understand them (especially the effect of chroot jail)
  
@@ -34,12 +34,13 @@ diff -Nru stunnel-4.16.orig/tools/stunnel.conf-sample.in stunnel-4.16/tools/stun
  ; PID is created inside chroot jail
  pid = /stunnel.pid
  
-@@ -39,7 +39,7 @@
+@@ -39,7 +39,8 @@
  
  ; Some debugging stuff useful for troubleshooting
  ;debug = 7
 -;output = stunnel.log
 +output = /var/log/stunnel.log
++syslog = no
  
  ; Use it for client mode
  ;client = yes