ports/162901: [maintainer] [feature-safe] [patch] unbreak net/openafs on 9.0

[Ben Kaduk]

>Number:         162901
>Category:       ports
>Synopsis:       [maintainer] [feature-safe] [patch] unbreak net/openafs on 9.0
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 27 03:10:12 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Ben Kaduk
>Release:        9.0-rc2
>Organization:
MIT SIPB
>Environment:
n/a
>Description:
In r226572, glebius merged the removal of ia_net and ia_netmask from struct in_ifaddr; these fields were checked by some code in OpenAFS, so the latter failed to compile after their removal.
Thanks to Alexandr A. Panshin alexp _at_ tsc _dot_ ru for initially reporting the issue.
>How-To-Repeat:
Try to compile net/openafs on a recent 9.0 snapshot.
>Fix:


Patch attached with submission follows:

diff -ruN openafs.old/Makefile openafs.submit/Makefile
--- openafs.old/Makefile	2011-11-26 21:47:05.000000000 -0500
+++ openafs.submit/Makefile	2011-11-26 21:55:30.000000000 -0500
@@ -8,7 +8,7 @@
 
 PORTNAME=	openafs
 DISTVERSION=	${AFS_DISTVERSION}.${DBVERSION:S/-//g}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net kld
 MASTER_SITES=	http://dl.central.org/dl/openafs/${AFS_DISTVERSION}/:openafs \
 		http://dl.openafs.org/dl/openafs/${AFS_DISTVERSION}/:openafs \
diff -ruN openafs.old/files/patch-src__afs__afs_server.c openafs.submit/files/patch-src__afs__afs_server.c
--- openafs.old/files/patch-src__afs__afs_server.c	1969-12-31 19:00:00.000000000 -0500
+++ openafs.submit/files/patch-src__afs__afs_server.c	2011-11-26 21:55:22.000000000 -0500
@@ -0,0 +1,13 @@
+diff --git a/src/afs/afs_server.c b/src/afs/afs_server.c
+index ad28100..cafd355 100644
+--- a/src/afs/afs_server.c
++++ b/src/afs/afs_server.c
+@@ -1032,7 +1032,7 @@ afsi_SetServerIPRank(struct srvAddr *sa, struct in_ifaddr *ifa)
+     struct sockaddr_in *sin;
+     int t;
+ 
+-    if ((ntohl(sa->sa_ip) & ifa->ia_netmask) == ifa->ia_net) {
++    if (1) {
+ 	if ((ntohl(sa->sa_ip) & ifa->ia_subnetmask) == ifa->ia_subnet) {
+ 	    sin = IA_SIN(ifa);
+ 	    if (SA2ULONG(sin) == ntohl(sa->sa_ip)) {	/* ie, ME!!!  */


>Release-Note:
>Audit-Trail:
>Unformatted: