From owner-freebsd-ports Fri Jan 4 3:40:22 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7D9A437B41E for ; Fri, 4 Jan 2002 03:40:05 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g04Be5u09931; Fri, 4 Jan 2002 03:40:05 -0800 (PST) (envelope-from gnats) Received: from ws66.v6lab.net (ws66.v6lab.net [192.71.20.66]) by hub.freebsd.org (Postfix) with ESMTP id C1BDC37B419 for ; Fri, 4 Jan 2002 03:31:07 -0800 (PST) Received: by ws66.v6lab.net (Postfix, from userid 1000) id 056C249AE8; Fri, 4 Jan 2002 12:31:01 +0100 (CET) Message-Id: <20020104113101.056C249AE8@ws66.v6lab.net> Date: Fri, 4 Jan 2002 12:31:01 +0100 (CET) From: Martti Kuparinen Reply-To: Martti Kuparinen To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/33529: [PATCH] ports/security/isakmpd update Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 33529 >Category: ports >Synopsis: [PATCH] ports/security/isakmpd update >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Jan 04 03:40:05 PST 2002 >Closed-Date: >Last-Modified: >Originator: Martti Kuparinen >Release: FreeBSD 4.4-RELEASE i386 >Organization: >Environment: System: FreeBSD inside 4.4-RELEASE FreeBSD 4.4-RELEASE #0: Tue Sep 18 09:45:08 CEST 2001 root@inside:/usr/obj/usr/src/sys/INSIDE i386 >Description: I have updated the security/isakmpd port to match the latest NetBSD pkgsrc version (which I committed earlier today). >How-To-Repeat: >Fix: diff -ru /usr/ports/security/isakmpd/Makefile isakmpd/Makefile --- /usr/ports/security/isakmpd/Makefile Sun May 20 04:31:11 2001 +++ isakmpd/Makefile Fri Jan 4 12:25:56 2002 @@ -9,7 +9,7 @@ # PORTNAME= isakmpd -PORTVERSION= 20010403 +PORTVERSION= 20020104 CATEGORIES= security net MASTER_SITES= ${MASTER_SITE_NETBSD} MASTER_SITE_SUBDIR= LOCAL_PORTS @@ -26,7 +26,7 @@ MAKE_ENV+= BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man MAN5= isakmpd.conf.5 isakmpd.policy.5 -MAN8= isakmpd.8 +MAN8= isakmpd.8 certpatch.8 MANCOMPRESSED= yes .include diff -ru /usr/ports/security/isakmpd/distinfo isakmpd/distinfo --- /usr/ports/security/isakmpd/distinfo Sun May 20 04:31:11 2001 +++ isakmpd/distinfo Fri Jan 4 12:14:40 2002 @@ -1 +1 @@ -MD5 (isakmpd-20010403.tar.gz) = 9813cb6735983eb00908616bb63a654c +MD5 (isakmpd-20020104.tar.gz) = 80ade017ae4e95498416923872e0a233 diff -ru /usr/ports/security/isakmpd/files/patch-aa isakmpd/files/patch-aa --- /usr/ports/security/isakmpd/files/patch-aa Sun May 20 04:31:11 2001 +++ isakmpd/files/patch-aa Fri Jan 4 12:15:36 2002 @@ -1,12 +1,11 @@ ---- Makefile.orig Fri May 11 17:38:14 2001 -+++ Makefile Fri May 11 17:38:33 2001 -@@ -44,10 +44,10 @@ - # openbsd means 2.5 or newer, openbsd-encap is for older kernels with PF_ENCAP - # linux is the name for Linux with FreeS/WAN integrated, freebsd/netbsd means - # FreeBSD/NetBSD with KAME IPsec. +--- Makefile.orig Sun Aug 26 00:22:26 2001 ++++ Makefile Fri Jan 4 12:15:25 2002 +@@ -43,9 +43,9 @@ + + # openbsd means OpenBSD 2.5 or newer. linux is the name for Linux with + # FreeS/WAN integrated, freebsd/netbsd means FreeBSD/NetBSD with KAME IPsec. -OS= openbsd +#OS= openbsd - #OS= openbsd-encap #OS= netbsd -#OS= freebsd +OS= freebsd diff -ru /usr/ports/security/isakmpd/files/patch-ac isakmpd/files/patch-ac --- /usr/ports/security/isakmpd/files/patch-ac Sun May 20 04:31:11 2001 +++ isakmpd/files/patch-ac Fri Jan 4 12:24:41 2002 @@ -1,11 +1,12 @@ ---- apps/certpatch/Makefile.orig Fri May 11 17:50:35 2001 -+++ apps/certpatch/Makefile Fri May 11 17:51:04 2001 -@@ -37,7 +37,7 @@ +--- sysdep/freebsd/Makefile.sysdep.orig Fri Jan 4 12:22:06 2002 ++++ sysdep/freebsd/Makefile.sysdep Fri Jan 4 12:23:35 2002 +@@ -61,9 +61,6 @@ + sysdep-target: + cd ${.CURDIR}/sysdep/common/libsysdep; ${MAKE} ${.MAKEFLAGS} - PROG= certpatch - SRCS= certpatch.c --BINDIR= /usr/sbin -+BINDIR?= /usr/sbin - TOPSRC= ${.CURDIR}/../.. - TOPOBJ!= cd ${TOPSRC}; printf "all:\n\t@pwd\n" |${MAKE} -f- - OS!= awk '/^OS=/ { print $$2 }' ${.CURDIR}/../../Makefile +-# Kludge around much strange behaviour in /usr/share/mk/bsd.*/mk, don't build certpatch +-SUBDIR= +- + .if make(clean) + SUBDIR+= sysdep/common/libsysdep + .endif Only in /usr/ports/security/isakmpd/files: patch-ba Only in /usr/ports/security/isakmpd/files: patch-ca diff -ru /usr/ports/security/isakmpd/pkg-plist isakmpd/pkg-plist --- /usr/ports/security/isakmpd/pkg-plist Sun May 20 04:31:11 2001 +++ isakmpd/pkg-plist Fri Jan 4 12:25:39 2002 @@ -1,4 +1,5 @@ sbin/isakmpd +sbin/certpatch share/examples/isakmpd/VPN-3way-template.conf share/examples/isakmpd/VPN-east.conf share/examples/isakmpd/VPN-west.conf >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message