From stas@springdaemons.com  Tue Mar 13 06:50:18 2012
Return-Path: <stas@springdaemons.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A7FA11065673
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 13 Mar 2012 06:50:18 +0000 (UTC)
	(envelope-from stas@springdaemons.com)
Received: from mx0.deglitch.com (cl-414.sto-01.se.sixxs.net [IPv6:2001:16d8:ff00:19d::2])
	by mx1.freebsd.org (Postfix) with ESMTP id 5B9458FC1D
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 13 Mar 2012 06:50:17 +0000 (UTC)
Received: from orion.SpringDaemons.com (c-98-234-218-159.hsd1.ca.comcast.net [98.234.218.159])
	by mx0.deglitch.com (Postfix) with ESMTPA id 508BF8FC27;
	Tue, 13 Mar 2012 10:50:16 +0400 (MSK)
Received: by orion.SpringDaemons.com (Postfix, from userid 1024)
	id 7BECB39F1C; Mon, 12 Mar 2012 22:52:06 -0700 (PDT)
Message-Id: <20120313055206.7BECB39F1C@orion.SpringDaemons.com>
Date: Mon, 12 Mar 2012 22:52:06 -0700 (PDT)
From: Stanislav Sedov <stas@deglitch.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: dgerow@afflictions.org
Subject: [PATCH] security/openconnect: fix on FreeBSD 10.0
X-Send-Pr-Version: 3.113
X-GNATS-Notify: dgerow@afflictions.org

>Number:         165997
>Category:       ports
>Synopsis:       [PATCH] security/openconnect: fix on FreeBSD 10.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    zi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 13 07:00:03 UTC 2012
>Closed-Date:    Sun Apr 15 14:39:24 UTC 2012
>Last-Modified:  Sun Apr 15 14:40:11 UTC 2012
>Originator:     Stanislav Sedov
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
Deglitch Networks
>Environment:
System: FreeBSD orion.SpringDaemons.com 10.0-CURRENT FreeBSD 10.0-CURRENT #11 r232841M: Sun Mar 11 17:06:29 PDT
>Description:
- The SIOCSIFADDR ioctl was dropped on FreeBSD 10.0.  Use SIOCAIFADDR instead.
  This PR depends on ports/165992.

Added file(s):
- files/patch-tun.c

Port maintainer (dgerow@afflictions.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_4 (mode: change, diff: suffix)
>How-To-Repeat:
>Fix:

--- openconnect-3.15_1.patch begins here ---
diff -ruN --exclude=CVS ../openconnect.orig/Makefile ./Makefile
--- ../openconnect.orig/Makefile	2012-03-12 22:48:24.000000000 -0700
+++ ./Makefile	2012-03-12 22:48:42.000000000 -0700
@@ -7,7 +7,7 @@
 
 PORTNAME=	openconnect
 PORTVERSION=	3.15
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.infradead.org/pub/openconnect/ \
 		CRITICAL
diff -ruN --exclude=CVS ../openconnect.orig/files/patch-tun.c ./files/patch-tun.c
--- ../openconnect.orig/files/patch-tun.c	1969-12-31 16:00:00.000000000 -0800
+++ ./files/patch-tun.c	2012-03-12 22:46:33.000000000 -0700
@@ -0,0 +1,56 @@
+--- tun.c.orig	2011-11-24 08:18:34.000000000 -0800
++++ tun.c	2012-03-12 22:46:30.000000000 -0700
+@@ -38,6 +38,9 @@
+ #include <arpa/inet.h>
+ #include <errno.h>
+ #include <ctype.h>
++#if defined(__FreeBSD__)
++#include <sys/param.h>	/* For __FreeBSD_version */
++#endif
+ #if defined(__sun__)
+ #include <stropts.h>
+ #include <sys/sockio.h>
+@@ -109,9 +112,43 @@
+ 
+ 		addr.sin_family = AF_INET;
+ 		addr.sin_addr.s_addr = inet_addr(vpninfo->vpn_addr);
++
++		/*
++		 * SIOCSIFADDR ioctl was dropped in FreeBSD 10.0
++		 */
++#if defined(__FreeBSD__) && __FreeBSD_version > 1000004
++		{
++			struct ifaliasreq ifra;
++			struct sockaddr_in *sin;
++
++			memset(&ifra, 0, sizeof(ifra));
++			strncpy(ifra.ifra_name, vpninfo->ifname, sizeof(ifra.ifra_name) - 1);
++
++			/* Set source address. */
++			sin = (struct sockaddr_in *)&(ifra.ifra_addr);
++			memcpy(sin, &addr, sizeof(struct sockaddr_in));
++			sin->sin_len = sizeof(*sin);
++
++			/* Set destination address. */
++			sin = (struct sockaddr_in *)&(ifra.ifra_broadaddr);
++			memcpy(sin, &addr, sizeof(struct sockaddr_in));
++			sin->sin_len = sizeof(*sin);
++
++			/* Set mask address. */
++			sin = (struct sockaddr_in *)&(ifra.ifra_mask);
++			addr.sin_family = AF_INET;
++			addr.sin_addr.s_addr = 0xffffffff;
++			memcpy(sin, &addr, sizeof(struct sockaddr_in));
++			sin->sin_len = sizeof(*sin);
++
++			if (ioctl(net_fd, SIOCAIFADDR, &ifra) < 0)
++				perror(_("SIOCAIFADDR"));
++		}
++#else
+ 		memcpy(&ifr.ifr_addr, &addr, sizeof(addr));
+ 		if (ioctl(net_fd, SIOCSIFADDR, &ifr) < 0)
+ 			perror(_("SIOCSIFADDR"));
++#endif
+ 	}
+ 
+ 	ifr.ifr_mtu = vpninfo->mtu;
--- openconnect-3.15_1.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue Mar 13 07:00:15 UTC 2012 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=165997 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: dgerow@afflictions.org
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/165997: [PATCH] security/openconnect: fix on FreeBSD 10.0
Date: Tue, 13 Mar 2012 07:00:12 UT

 Maintainer of security/openconnect,
 
 Please note that PR ports/165997 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/165997
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Tue Mar 13 13:58:45 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=165997 
Responsible-Changed-From-To: miwi->zi 
Responsible-Changed-By: zi 
Responsible-Changed-When: Sun Apr 1 19:19:57 UTC 2012 
Responsible-Changed-Why:  
I'll take it.  I am the maintainer for security/openconnect. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=165997 
State-Changed-From-To: feedback->closed 
State-Changed-By: zi 
State-Changed-When: Sun Apr 15 14:39:22 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=165997 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/165997: commit references a PR
Date: Sun, 15 Apr 2012 14:39:11 +0000 (UTC)

 zi          2012-04-15 14:38:59 UTC
 
   FreeBSD ports repository
 
   Modified files:
     security/openconnect Makefile distinfo 
     security/openconnect/files patch-www_Makefile.am 
   Added files:
     security/openconnect/files patch-tun.c 
   Log:
   - Update to 3.16
   - Fix 10-CURRENT support [1]
   
   PR:             ports/165997 [1]
   Submitted by:   Stanislav Sedov <stas@deglitch.com> [1]
   
   Revision  Changes    Path
   1.13      +1 -1      ports/security/openconnect/Makefile
   1.7       +2 -2      ports/security/openconnect/distinfo
   1.1       +56 -0     ports/security/openconnect/files/patch-tun.c (new)
   1.2       +3 -3      ports/security/openconnect/files/patch-www_Makefile.am
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
