From owner-freebsd-ports Sat Aug 31 6: 0:28 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 57EAE37B400 for ; Sat, 31 Aug 2002 06:00:15 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F67E43E77 for ; Sat, 31 Aug 2002 06:00:14 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7VD0EJU013778 for ; Sat, 31 Aug 2002 06:00:14 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7VD0E6t013777; Sat, 31 Aug 2002 06:00:14 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A328837B400 for ; Sat, 31 Aug 2002 05:57:54 -0700 (PDT) Received: from undef.unixathome.org (bast.unixathome.org [216.187.105.150]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9CE1143E75 for ; Sat, 31 Aug 2002 05:57:53 -0700 (PDT) (envelope-from dan@undef.unixathome.org) Received: from undef.unixathome.org (localhost [127.0.0.1]) by undef.unixathome.org (8.12.5/8.12.5) with ESMTP id g7VCvqBG076655; Sat, 31 Aug 2002 08:57:52 -0400 (EDT) (envelope-from dan@undef.unixathome.org) Received: (from dan@localhost) by undef.unixathome.org (8.12.5/8.12.5/Submit) id g7VCvqEF076653; Sat, 31 Aug 2002 08:57:52 -0400 (EDT) Message-Id: <200208311257.g7VCvqEF076653@undef.unixathome.org> Date: Sat, 31 Aug 2002 08:57:52 -0400 (EDT) From: Dan Langille Reply-To: Dan Langille To: FreeBSD-gnats-submit@FreeBSD.org Cc: Dan Langille X-Send-Pr-Version: 3.113 Subject: ports/42249: [PATCH] security/stunnel upgrade Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 42249 >Category: ports >Synopsis: [PATCH] security/stunnel upgrade >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Aug 31 06:00:11 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Dan Langille >Release: FreeBSD 4.6-STABLE i386 >Organization: The FreeBSD Diary >Environment: System: FreeBSD undef.unixathome.org 4.6-STABLE FreeBSD 4.6-STABLE #6: Wed Jul 31 13:08:02 EDT 2002 dan@undef.unixathome.org:/usr/obj/usr/src/sys/UNDEF i386 >Description: Replaces PR ports/42223 <== please close. Update port to use version 4.00 of stunnel. NOTE: The home page has migrated which also means a master site has disappeared. I've completed the patches. It would be helpful if someone else could also test my work please. Note that I've been unable to get the new stunnel to work. I suspect my configuration settings rather than the software itself. I'm waiting for a reply to my post to the stunnel users mailing list. >How-To-Repeat: >Fix: --- diff.txt begins here --- diff -ruN stunnel/Makefile stunnel.new/Makefile --- stunnel/Makefile Sat Jan 5 09:49:41 2002 +++ stunnel.new/Makefile Sat Aug 31 07:45:34 2002 @@ -6,10 +6,9 @@ # PORTNAME= stunnel -PORTVERSION= 3.22 +PORTVERSION= 4.00 CATEGORIES= security -MASTER_SITES= http://www.stunnel.org/download/stunnel/src/ \ - ftp://stunnel.mirt.net/stunnel/ \ +MASTER_SITES= ftp://stunnel.mirt.net/stunnel/ \ ftp://opensores.thebunker.net/pub/mirrors/stunnel/ \ ftp://ftp.cryptoarchive.net/pub/cryptoarchive/mirrors/opensores.thebunker.net/pub/mirrors/stunnel/ @@ -19,7 +18,7 @@ IS_INTERACTIVE= YES # prompts for information while generating certificate GNU_CONFIGURE= yes -CONFIGURE_ARGS= --localstatedir=/var/run --with-pem-dir=${PEM_DIR} +CONFIGURE_ARGS= --localstatedir=/var --with-pem-dir=${PEM_DIR} --prefix=${PREFIX} MAN8= stunnel.8 diff -ruN stunnel/distinfo stunnel.new/distinfo --- stunnel/distinfo Sat Jan 5 09:49:41 2002 +++ stunnel.new/distinfo Sat Aug 31 07:45:36 2002 @@ -1 +1 @@ -MD5 (stunnel-3.22.tar.gz) = 69000d8365b006b3c080a1e2dc9ccba9 +MD5 (stunnel-4.00.tar.gz) = 5da49496d516aa2716405a6defac0b0d diff -ruN stunnel/files/patch-aa stunnel.new/files/patch-aa --- stunnel/files/patch-aa Thu Nov 1 03:28:38 2001 +++ stunnel.new/files/patch-aa Sat Aug 31 08:17:23 2002 @@ -1,6 +1,6 @@ ---- common.h.orig Wed Oct 31 00:07:31 2001 -+++ common.h Wed Oct 31 11:07:29 2001 -@@ -174,6 +174,7 @@ +--- src/common.h.orig Sat Aug 31 08:16:32 2002 ++++ src/common.h Sat Aug 31 08:16:35 2002 +@@ -140,6 +140,7 @@ #define writesocket(s,b,n) write((s),(b),(n)) #define closesocket(s) close(s) #define ioctlsocket(a,b,c) ioctl((a),(b),(c)) diff -ruN stunnel/pkg-descr stunnel.new/pkg-descr --- stunnel/pkg-descr Fri Jul 7 15:27:28 2000 +++ stunnel.new/pkg-descr Sat Aug 31 07:48:36 2002 @@ -8,4 +8,4 @@ used inetd daemons like POP-2, POP-3 and IMAP servers without any changes in the programs' code. -WWW: http://www.stunnel.org/ +WWW: http://stunnel.mirt.net/ diff -ruN stunnel/pkg-plist stunnel.new/pkg-plist --- stunnel/pkg-plist Fri Jul 7 15:27:28 2000 +++ stunnel.new/pkg-plist Sat Aug 31 08:29:08 2002 @@ -1,3 +1,30 @@ etc/rc.d/stunnel.sh.sample -lib/stunnel.so +etc/stunnel/stunnel.conf-sample +etc/stunnel/stunnel.pem +lib/libstunnel.so.0 +lib/libstunnel.so +lib/libstunnel.la +lib/libstunnel.a sbin/stunnel +share/doc/stunnel/stunnel.html +share/doc/stunnel/examples/ca.html +share/doc/stunnel/examples/ca.pl +share/doc/stunnel/examples/importCA.html +share/doc/stunnel/examples/importCA.sh +share/doc/stunnel/examples/stunnel.spec +share/doc/stunnel/examples/stunnel.init +share/doc/stunnel/AUTHORS +share/doc/stunnel/BUGS +share/doc/stunnel/ChangeLog +share/doc/stunnel/COPYING +share/doc/stunnel/COPYRIGHT.GPL +share/doc/stunnel/CREDITS +share/doc/stunnel/FAQ +share/doc/stunnel/INSTALL +share/doc/stunnel/INSTALL.W32 +share/doc/stunnel/NEWS +share/doc/stunnel/PORTS +share/doc/stunnel/README +share/doc/stunnel/TODO +@dirrm share/doc/stunnel/examples +@dirrm share/doc/stunnel --- diff.txt ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message