From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Nov 27 03:10:12 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C50E1106564A for ; Sun, 27 Nov 2011 03:10:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 9B5C68FC0A for ; Sun, 27 Nov 2011 03:10:12 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id pAR3ACEP083952 for ; Sun, 27 Nov 2011 03:10:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id pAR3ACEY083951; Sun, 27 Nov 2011 03:10:12 GMT (envelope-from gnats) Resent-Date: Sun, 27 Nov 2011 03:10:12 GMT Resent-Message-Id: <201111270310.pAR3ACEY083951@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Ben Kaduk Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 02F37106564A for ; Sun, 27 Nov 2011 03:06:29 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id E67908FC0A for ; Sun, 27 Nov 2011 03:06:28 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id pAR36Sfe056406 for ; Sun, 27 Nov 2011 03:06:28 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id pAR36Sl4056405; Sun, 27 Nov 2011 03:06:28 GMT (envelope-from nobody) Message-Id: <201111270306.pAR36Sl4056405@red.freebsd.org> Date: Sun, 27 Nov 2011 03:06:28 GMT From: Ben Kaduk To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/162901: [maintainer] [feature-safe] [patch] unbreak net/openafs on 9.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Nov 2011 03:10:13 -0000 >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: