Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.8.git;a=commitdiff;h=c866d8b2bf8470a8687c3379c0ffb62bb33506b8
commit c866d8b2bf8470a8687c3379c0ffb62bb33506b8 Author: Miklos Vajna <[EMAIL PROTECTED]> Date: Sun Jun 8 14:40:31 2008 +0200 stunnel-4.24-1kalgan1-i686 - secfix bump - closes #3122 diff --git a/source/network-extra/stunnel/FrugalBuild b/source/network-extra/stunnel/FrugalBuild index fdcde05..8e6aef7 100644 --- a/source/network-extra/stunnel/FrugalBuild +++ b/source/network-extra/stunnel/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos <[EMAIL PROTECTED]> pkgname=stunnel -pkgver=4.21 -pkgrel=1 +pkgver=4.24 +pkgrel=1kalgan1 pkgdesc="Universal SSL Wrapper" url="http://www.stunnel.org/"; depends=('zlib' 'openssl' 'tcp_wrappers') @@ -12,8 +12,8 @@ groups=('network-extra') archs=('i686') up2date="lynx -dump http://www.stunnel.org/download/source.html|grep -m1 .tar.gz$|Flasttar" source=(http://www.stunnel.org/download/stunnel/src/stunnel-$pkgver.tar.gz \ - rc.stunnel setuid.patch README.Frugalware) -signatures=($source.asc '' '' '') + rc.stunnel README.Frugalware) +signatures=($source.asc '' '') build() { diff --git a/source/network-extra/stunnel/setuid.patch b/source/network-extra/stunnel/setuid.patch deleted file mode 100644 index ff75499..0000000 --- a/source/network-extra/stunnel/setuid.patch +++ /dev/null @@ -1,104 +0,0 @@ -from ftp://stunnel.mirt.net/stunnel/setuid.patch - -we would just get a SIGCHLD without this - ---- /tmp/stunnel-4.21/src/stunnel.c 2007-10-27 17:41:39.000000000 +0200 -+++ src/stunnel.c 2007-11-03 16:44:02.000000000 +0100 -@@ -3,8 +3,8 @@ - * Copyright (c) 1998-2007 Michal Trojnara <[EMAIL PROTECTED]> - * All Rights Reserved - * -- * Version: 4.21 (stunnel.c) -- * Date: 2007.10.27 -+ * Version: 4.22 (stunnel.c) -+ * Date: 2007.11.xx - * - * Author: Michal Trojnara <[EMAIL PROTECTED]> - * -@@ -41,7 +41,7 @@ - static void accept_connection(LOCAL_OPTIONS *); - static void get_limits(void); /* setup global max_clients and max_fds */ - #if !defined (USE_WIN32) && !defined (__vms) --static void make_chroot(void); -+static void drop_privileges(void); - static void daemonize(void); - static void create_pid(void); - static void delete_pid(void); -@@ -111,9 +111,6 @@ - } else { /* inetd mode */ - #if !defined (USE_WIN32) && !defined (__vms)&&!defined(USE_OS2) - max_fds=FD_SETSIZE; /* just in case */ --#ifdef HAVE_CHROOT -- make_chroot(); --#endif /* HAVE_CHROOT */ - drop_privileges(); - #endif - num_clients=1; -@@ -171,9 +168,6 @@ - #if !defined (USE_WIN32) && !defined (__vms) && !defined(USE_OS2) - if(!(options.option.foreground)) - daemonize(); --#ifdef HAVE_CHROOT -- make_chroot(); --#endif /* HAVE_CHROOT */ - drop_privileges(); - create_pid(); - #endif /* !defined USE_WIN32 && !defined (__vms) */ -@@ -299,24 +293,9 @@ - #endif - } - --#ifdef HAVE_CHROOT --static void make_chroot(void) { -- if(options.chroot_dir) { -- if(chroot(options.chroot_dir)) { -- sockerror("chroot"); -- exit(1); -- } -- if(chdir("/")) { -- sockerror("chdir"); -- exit(1); -- } -- } --} --#endif /* HAVE_CHROOT */ -- - #if !defined (USE_WIN32) && !defined (__vms) -- /* set process user and group(s) id */ --void drop_privileges(void) { -+ /* chroot and set process user and group(s) id */ -+static void drop_privileges(void) { - int uid=0, gid=0; - struct group *gr; - #ifdef HAVE_SETGROUPS -@@ -350,6 +329,20 @@ - } - } - -+#ifdef HAVE_CHROOT -+ /* chroot */ -+ if(options.chroot_dir) { -+ if(chroot(options.chroot_dir)) { -+ sockerror("chroot"); -+ exit(1); -+ } -+ if(chdir("/")) { -+ sockerror("chdir"); -+ exit(1); -+ } -+ } -+#endif /* HAVE_CHROOT */ -+ - /* Set uid and gid */ - if(gid) { - if(setgid(gid)) { ---- /tmp/stunnel-4.21/src/prototypes.h 2007-10-05 17:42:48.000000000 +0200 -+++ src/prototypes.h 2007-11-03 16:33:49.000000000 +0100 -@@ -57,7 +57,6 @@ - void main_initialize(char *, char *); - void main_execute(void); - void stunnel_info(int); --void drop_privileges(void); - - /**************************************** Prototypes for log.c */ - _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
