From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jun 5 17:20:01 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9754F16A469 for ; Tue, 5 Jun 2007 17:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 73CA813C4B7 for ; Tue, 5 Jun 2007 17:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l55HK0mi052584 for ; Tue, 5 Jun 2007 17:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l55HK0fb052583; Tue, 5 Jun 2007 17:20:00 GMT (envelope-from gnats) Resent-Date: Tue, 5 Jun 2007 17:20:00 GMT Resent-Message-Id: <200706051720.l55HK0fb052583@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, Rong-En Fan Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7E91716A473 for ; Tue, 5 Jun 2007 17:11:54 +0000 (UTC) (envelope-from rafan@svm.csie.ntu.edu.tw) Received: from svm.csie.ntu.edu.tw (svm.csie.ntu.edu.tw [140.112.90.75]) by mx1.freebsd.org (Postfix) with ESMTP id 2D13B13C45D for ; Tue, 5 Jun 2007 17:11:53 +0000 (UTC) (envelope-from rafan@svm.csie.ntu.edu.tw) Received: from svm.csie.ntu.edu.tw (localhost [127.0.0.1]) by svm.csie.ntu.edu.tw (8.14.1/8.14.1) with ESMTP id l55HBqOk026036; Wed, 6 Jun 2007 01:11:52 +0800 (CST) (envelope-from rafan@svm.csie.ntu.edu.tw) Received: (from rafan@localhost) by svm.csie.ntu.edu.tw (8.14.1/8.14.1/Submit) id l55HBqmT068646; Wed, 6 Jun 2007 01:11:52 +0800 (CST) (envelope-from rafan) Message-Id: <200706051711.l55HBqmT068646@svm.csie.ntu.edu.tw> Date: Wed, 6 Jun 2007 01:11:52 +0800 (CST) From: Rong-En Fan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: vanhu@netasq.com Subject: ports/113383: [PATCH] security/ipsec-tools: fix build with gcc 4.2 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: Tue, 05 Jun 2007 17:20:01 -0000 >Number: 113383 >Category: ports >Synopsis: [PATCH] security/ipsec-tools: fix build with gcc 4.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Jun 05 17:20:00 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Rong-En Fan >Release: FreeBSD 6.2-STABLE amd64 >Organization: NTU CSIE >Environment: >Description: - Fix build with gcc 4.2. Tested on i386 current. - Remove blank line in distinfo Added file(s): - files/patch-src__racoon__eaytest.c - files/patch-src__racoon__var.h Port maintainer (vanhu@netasq.com) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- ipsec-tools-0.6.7.patch begins here --- Index: distinfo =================================================================== RCS file: /big/freebsd-cvsup/ncvs/ports/security/ipsec-tools/distinfo,v retrieving revision 1.8 diff -u -u -r1.8 distinfo --- distinfo 7 Apr 2007 04:23:27 -0000 1.8 +++ distinfo 5 Jun 2007 17:10:27 -0000 @@ -1,4 +1,3 @@ MD5 (ipsec-tools-0.6.7.tar.bz2) = 4fb764f282dc21cf9a656c58e13dacbb SHA256 (ipsec-tools-0.6.7.tar.bz2) = 4239f836dc610a2443ded7ba35cb3b87de9d582c800e5d9eb5eed37defd61ef2 SIZE (ipsec-tools-0.6.7.tar.bz2) = 723032 - Index: files/patch-src__racoon__eaytest.c =================================================================== RCS file: files/patch-src__racoon__eaytest.c diff -N files/patch-src__racoon__eaytest.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-src__racoon__eaytest.c 5 Jun 2007 17:10:27 -0000 @@ -0,0 +1,20 @@ +--- ./src/racoon/eaytest.c.orig Wed Jun 6 01:07:11 2007 ++++ ./src/racoon/eaytest.c Wed Jun 6 01:07:22 2007 +@@ -311,7 +311,7 @@ + + printf("exact match: succeed.\n"); + +- if (dnstr_w1) { ++ if (dnstr_w1 != NULL) { + asn1dn = eay_str2asn1dn(dnstr_w1, strlen(dnstr_w1)); + if (asn1dn == NULL || asn1dn->l == asn1dn0.l) + errx(1, "asn1dn length wrong for wildcard 1\n"); +@@ -321,7 +321,7 @@ + printf("wildcard 1 match: succeed.\n"); + } + +- if (dnstr_w1) { ++ if (dnstr_w1 != NULL) { + asn1dn = eay_str2asn1dn(dnstr_w2, strlen(dnstr_w2)); + if (asn1dn == NULL || asn1dn->l == asn1dn0.l) + errx(1, "asn1dn length wrong for wildcard 2\n"); Index: files/patch-src__racoon__var.h =================================================================== RCS file: files/patch-src__racoon__var.h diff -N files/patch-src__racoon__var.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-src__racoon__var.h 5 Jun 2007 17:10:27 -0000 @@ -0,0 +1,23 @@ +--- ./src/racoon/var.h.orig Wed Jun 6 01:06:51 2007 ++++ ./src/racoon/var.h Wed Jun 6 01:07:00 2007 +@@ -76,9 +76,9 @@ + do { \ + if (getnameinfo((x), sysdep_sa_len(x), (y), sizeof(y), (z), sizeof(z), \ + NIFLAGS) != 0) { \ +- if (y) \ ++ if (y != NULL) \ + strncpy((y), "(invalid)", sizeof(y)); \ +- if (z) \ ++ if (z != NULL) \ + strncpy((z), "(invalid)", sizeof(z)); \ + } \ + } while (0); +@@ -87,7 +87,7 @@ + do { \ + if (getnameinfo((x), sysdep_sa_len(x), (y), sizeof(y), NULL, 0, \ + NIFLAGS) != 0) { \ +- if (y) \ ++ if (y != NULL) \ + strncpy((y), "(invalid)", sizeof(y)); \ + } \ + } while (0); --- ipsec-tools-0.6.7.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: