head	1.4;
access;
symbols
	RELEASE_4_9_0:1.3
	RELEASE_5_1_0:1.2
	RELEASE_4_8_0:1.2
	RELEASE_5_0_0:1.2
	RELEASE_4_7_0:1.2
	RELEASE_4_6_2:1.2
	RELEASE_4_6_1:1.2
	RELEASE_4_6_0:1.2
	RELEASE_5_0_DP1:1.2
	RELEASE_4_5_0:1.2
	RELEASE_4_4_0:1.1;
locks; strict;
comment	@# @;


1.4
date	2003.10.17.12.41.12;	author edwin;	state dead;
branches;
next	1.3;

1.3
date	2003.09.10.08.22.59;	author netchild;	state Exp;
branches;
next	1.2;

1.2
date	2002.01.10.00.01.51;	author pat;	state Exp;
branches;
next	1.1;

1.1
date	2001.05.20.02.31.11;	author will;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Upgrade to the latests isakmpd version.
@
text
@--- Makefile.orig	Sun Aug 26 00:22:26 2001
+++ Makefile	Wed Jan  9 22:06:58 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=		netbsd
-#OS=		freebsd
+OS=		freebsd
 #OS=		linux
 #OS=		bsdi
 
@@@@ -159,6 +159,7 @@@@
 USE_LIBDES=	yes
 LDADD+=		-lkeynote -lm
 DPADD+=		${LIBKEYNOTE} ${LIBM}
+POLICY=         policy.c
 CFLAGS+=	-DUSE_KEYNOTE
 .endif
 
@@@@ -204,4 +205,3 @@@@
 ${PROG} beforedepend: ${GENERATED}
 
 .include <bsd.prog.mk>
-.include <bsd.subdir.mk>
@


1.3
log
@- Fix the "duplicate script for target <...> ignored" warnings on -current
  caused by ${WRKSRC}/Makefile.
- Fix the "extra tokens at end of #else directive" warnings in
  ${WRKSRC}/sysdep/freebsd/sysdep-os.h on -current.
- Fix some format strings in ${WRKSRC}/conf.c and ${WRKSRC}/sa.c for 64 bit
  systems (obtained from NetBSD).
- Move the delta patching ${WRKSRC}/Makefile from patch-ab (priviously
  patching ${WRKSRC}/samples/Makefile and ${WRKSRC}/Makefile) to patch-aa
  (patching ${WRKSRC}/Makefile).
- Build and install certpatch(8), a quite usefull tool to add subjectAltName
  identities to X.509 certificates.

Submitted by:	Marius Strobl <marius@@alchemy.franken.de>
@
text
@@


1.2
log
@Update to 20020104

PR:		33741
Submitted by:	Anders Andersson <anders@@hack.org>
Obtained from:	NetBSD
@
text
@d15 13
@


1.1
log
@Add isakmpd 20010403, the OpenBSD IKE daemon.  About time, too...

PR:		27274
Submitted by:	Martti Kuparinen <martti.kuparinen@@iki.fi>
@
text
@d1 6
a6 6
--- 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.
a8 1
 #OS=		openbsd-encap
@

