From matthias.andree@web.de  Wed Jul 10 09:30:59 2002
Return-Path: <matthias.andree@web.de>
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 566A737B400
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 10 Jul 2002 09:30:59 -0700 (PDT)
Received: from m2a2.myip.org (pD951FDDA.dip.t-dialin.net [217.81.253.218])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EE18043E4A
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 10 Jul 2002 09:30:57 -0700 (PDT)
	(envelope-from matthias.andree@web.de)
Received: by emma.line.org (Postfix, from userid 1001)
	id 2A4031B229; Wed, 10 Jul 2002 18:30:54 +0200 (CEST)
Message-Id: <20020710163054.2A4031B229@emma.line.org>
Date: Wed, 10 Jul 2002 18:30:54 +0200 (CEST)
From: Matthias Andree <matthias.andree@web.de>
Reply-To: Matthias Andree <matthias.andree@web.de>
To: FreeBSD-gnats-submit@freebsd.org
Subject: Update port: security/openvpn 1.2.1 -> 1.3.0 
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         40424
>Category:       ports
>Synopsis:       Update port: security/openvpn 1.2.1 -> 1.3.0
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 10 09:40:01 PDT 2002
>Closed-Date:    Thu Jul 11 09:51:36 PDT 2002
>Last-Modified:  Thu Jul 11 09:51:36 PDT 2002
>Originator:     Matthias Andree
>Release:        FreeBSD 4.6-STABLE i386
>Organization:
>Environment:
System: FreeBSD merlin.emma.line.org 4.6-STABLE FreeBSD 4.6-STABLE #10: Wed Jul 10 04:15:04 CEST 2002 toor@merlin.emma.line.org:/usr/src/sys/compile/MA i386


	
>Description:
This patch updates the OpenVPN port to install OpenVPN 1.3.0. The former
FreeBSD distribution patches have been merged in the upstream (baseline),
some bugs have been fixed, some new features have been added, and
compatibility is maintained with at most one command line option added. 
	
>How-To-Repeat:
	
>Fix:

Please apply this patch AND delete the then-empty files directory.

diff -Nur /usr/ports/security/openvpn/Makefile /root/openvpn/Makefile
--- /usr/ports/security/openvpn/Makefile	Mon Jun 24 18:13:08 2002
+++ /root/openvpn/Makefile	Wed Jul 10 14:47:37 2002
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	openvpn
-PORTVERSION=	1.2.1
+PORTVERSION=	1.3.0
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -34,6 +34,7 @@
 	@${MKDIR} ${DOCSDIR}/${dirs}
 	@${INSTALL_DATA} ${WRKSRC}/${dirs}/* ${DOCSDIR}/${dirs}
 .endfor
+	@${CAT} pkg-message
 .endif
 
 .include <bsd.port.mk>
diff -Nur /usr/ports/security/openvpn/distinfo /root/openvpn/distinfo
--- /usr/ports/security/openvpn/distinfo	Mon Jun 24 18:13:08 2002
+++ /root/openvpn/distinfo	Wed Jul 10 14:15:44 2002
@@ -1 +1 @@
-MD5 (openvpn-1.2.1.tar.gz) = 9a41f775bb5045d225483c8a2a9b0ad0
+MD5 (openvpn-1.3.0.tar.gz) = f82482f0ec8d9091876bd86133a8ff2f
diff -Nur /usr/ports/security/openvpn/files/patch-error.c /root/openvpn/files/patch-error.c
--- /usr/ports/security/openvpn/files/patch-error.c	Mon Jun 24 18:13:10 2002
+++ /root/openvpn/files/patch-error.c	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- error.c.orig	Mon Jun 24 02:27:37 2002
-+++ error.c	Mon Jun 24 02:28:05 2002
-@@ -215,7 +215,7 @@
- #if defined(HAVE_OPENLOG) && defined(HAVE_SYSLOG)
-       if (daemon (cd != NULL, 0) < 0)
- 	msg (M_ERR, "daemon() failed");
--      openlog ("openvpn", LOG_PID, 0);
-+      openlog ("openvpn", LOG_PID, LOG_DAEMON);
- #else
-       msg (M_WARN, "Warning: this operating system lacks daemon logging features, therefore when I become a daemon, I won't be able to log status or error messages");
-       if (daemon (cd != NULL, 0) < 0)
diff -Nur /usr/ports/security/openvpn/files/patch-tun.c /root/openvpn/files/patch-tun.c
--- /usr/ports/security/openvpn/files/patch-tun.c	Mon Jun 24 18:13:10 2002
+++ /root/openvpn/files/patch-tun.c	Thu Jan  1 01:00:00 1970
@@ -1,53 +0,0 @@
---- tun.c.orig	Sun Jun 23 23:43:57 2002
-+++ tun.c	Sun Jun 23 23:45:54 2002
-@@ -76,7 +76,7 @@
- 		);
-       msg (M_INFO, "%s", command_line);
-       if (openvpn_system (command_line) != 0)
--	msg (M_ERR, "linux ifconfig failed");
-+	msg (M_ERR, "Linux ifconfig failed");
- 
- #elif defined(TARGET_SOLARIS)
- 
-@@ -90,7 +90,7 @@
- 		);
-       msg (M_INFO, "%s", command_line);
-       if (openvpn_system (command_line) != 0)
--	msg (M_ERR, "solaris ifconfig failed");
-+	msg (M_ERR, "Solaris ifconfig failed");
- 
- #elif defined(TARGET_OPENBSD)
- 
-@@ -118,7 +118,7 @@
- 		);
-       msg (M_INFO, "%s", command_line);
-       if (openvpn_system (command_line) != 0)
--	msg (M_ERR, "openbsd ifconfig failed");
-+	msg (M_ERR, "OpenBSD ifconfig failed");
- 
- #elif defined(TARGET_DARWIN)
- 
-@@ -144,7 +144,22 @@
- 		);
-       msg (M_INFO, "%s", command_line);
-       if (openvpn_system (command_line) != 0)
--	msg (M_ERR, "darwin ifconfig failed");
-+	msg (M_ERR, "Darwin ifconfig failed");
-+
-+#elif defined(TARGET_FREEBSD)
-+      /* example: ifconfig tun2 10.2.0.2 10.2.0.1 mtu 1450 netmask 255.255.255.255 up */
-+      snprintf (command_line, sizeof (command_line),
-+		IFCONFIG_PATH " %s %s %s mtu %d netmask 255.255.255.255 up",
-+		dev,
-+		ifconfig_local,
-+		ifconfig_remote,
-+		tun_mtu
-+		);
-+      msg (M_INFO, "%s", command_line);
-+      if (openvpn_system (command_line) != 0)
-+	msg (M_ERR, "FreeBSD ifconfig failed");
-+
-+
- 
- #else
-       msg (M_FATAL, "Sorry, but I don't know how to do 'ifconfig' commands on this operating system.  You should ifconfig your tun/tap device manually or use an --up script.");
diff -Nur /usr/ports/security/openvpn/pkg-message /root/openvpn/pkg-message
--- /usr/ports/security/openvpn/pkg-message	Thu Jan  1 01:00:00 1970
+++ /root/openvpn/pkg-message	Wed Jul 10 14:51:19 2002
@@ -0,0 +1,5 @@
+### ---------------------------------------------------------------------- ###
+###  To retain backwards compatibility of OpenVPN 1.3.0 with OpenVPN peers ###
+###  that run older versions (back to 1.1.0), you will have to set the MTU ###
+###  explicitly by command line options since OpenVPN 1.3.0.               ###
+### ---------------------------------------------------------------------- ###
	


>Release-Note:
>Audit-Trail:

From: Matthias Andree <matthias.andree@web.de>
To: freebsd-gnats-submit@FreeBSD.org, matthias.andree@web.de
Cc:  
Subject: Re: ports/40424: Update port: security/openvpn 1.2.1 -> 1.3.0
Date: Thu, 11 Jul 2002 16:17:16 +0200

 Noting that 1.3.1 has been released: 1.3.1 only fixes RPM packaging
 issues over 1.3.0, so it's not worth bothering to update to 1.3.1.
 
 1.3.0 remains the current version.
 
 Hugh, the maintainer has spoken.
State-Changed-From-To: open->closed 
State-Changed-By: ijliao 
State-Changed-When: Thu Jul 11 09:51:21 PDT 2002 
State-Changed-Why:  
committed, thanks 

http://www.freebsd.org/cgi/query-pr.cgi?pr=40424 
>Unformatted:
