remove more conditional crud

4 files changed, 9 insertions, 60 deletions

diff --git a/sbin/isakmpd/Makefile b/sbin/isakmpd/Makefile
index 97b51e2a42c..8f104624d95 100644
--- a/sbin/isakmpd/Makefile
+++ b/sbin/isakmpd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.70 2005/04/08 18:27:09 hshoexer Exp $
+#	$OpenBSD: Makefile,v 1.71 2005/04/08 19:05:15 deraadt Exp $
 #	$EOM: Makefile,v 1.78 2000/10/15 21:33:42 niklas Exp $
 
 #
@@ -39,7 +39,7 @@
 OS=		openbsd
 
 # Compile-time configuration of otherwise optional features
-#FEATURES+=	gmp dnssec
+#FEATURES+=	dnssec
 FEATURES+=	debug
 
 .PATH:		${.CURDIR}/sysdep/${OS}
@@ -61,8 +61,7 @@ CLEANFILES=	exchange_num.c exchange_num.h ipsec_num.c ipsec_num.h \
 		isakmp_fld.c isakmp_fld.h
 MAN=		isakmpd.8 isakmpd.conf.5 isakmpd.policy.5
 CFLAGS+=	-Wall -Wstrict-prototypes -Wmissing-prototypes \
-		-Wmissing-declarations -DNEED_SYSDEP_APP \
-		-I${.CURDIR} -I${.CURDIR}/sysdep/${OS} -I.
+		-Wmissing-declarations -I${.CURDIR} -I${.CURDIR}/sysdep/${OS} -I.
 
 # Include symbolic debugging info
 #DEBUG=		-g
@@ -84,8 +83,6 @@ CFLAGS+=	-Wall -Wstrict-prototypes -Wmissing-prototypes \
 
 SUBDIR=		apps
 
-.include "sysdep/${OS}/Makefile.sysdep"
-
 .if ${FEATURES} != ""
 FEATURES_UC!=	echo ${FEATURES} | tr '[:lower:]' '[:upper:]'
 CFLAGS+=	${FEATURES_UC:S/^/-DUSE_/g}
@@ -101,18 +98,12 @@ SUBDIR+=	samples
 .endif
 .endfor
 
-.if ${FEATURES:Mgmp} == "gmp"
-CFLAGS+=	-DMP_FLAVOUR=MP_FLAVOUR_GMP
-LDADD+=		-lgmp
-DPADD+=		${LIBGMP}
-.else
 CFLAGS+=	-DMP_FLAVOUR=MP_FLAVOUR_OPENSSL
-.endif
 
-SRCS+=		${IPSEC_SRCS} ${DNSSEC} policy.c math_ec2n.c \
-		ike_aggressive.c isakmp_cfg.c dpd.c monitor.c monitor_fdpass.c \
-		nat_traversal.c udp_encap.c
-CFLAGS+=	${IPSEC_CFLAGS} ${DNSSEC_CFLAGS}
+SRCS+=		${DNSSEC} \
+		pf_key_v2.c policy.c math_ec2n.c ike_aggressive.c isakmp_cfg.c \
+		dpd.c monitor.c monitor_fdpass.c nat_traversal.c udp_encap.c
+CFLAGS+=	${DNSSEC_CFLAGS}
 
 LDADD+=		${LWRESLIB} -lkeynote -lcrypto -ldes -lm
 DPADD+=		${LWRESLIB} ${LIBKEYNOTE} ${LIBCRYPTO} ${LIBDES} ${LIBM}
diff --git a/sbin/isakmpd/apps/certpatch/Makefile b/sbin/isakmpd/apps/certpatch/Makefile
index c42293873b2..71f8ed518c6 100644
--- a/sbin/isakmpd/apps/certpatch/Makefile
+++ b/sbin/isakmpd/apps/certpatch/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 2003/06/03 14:35:00 ho Exp $
+#	$OpenBSD: Makefile,v 1.8 2005/04/08 19:05:15 deraadt Exp $
 #	$EOM: Makefile,v 1.6 2000/03/28 21:22:06 ho Exp $
 
 #
@@ -51,7 +51,6 @@ DPADD+=		${LIBGMP}
 CFLAGS+=	-DMP_FLAVOUR=MP_FLAVOUR_OPENSSL
 .endif
 
-.include "${TOPSRC}/sysdep/${OS}/Makefile.sysdep"
 # Override LIBSYSDEPDIR definition from Makefile.sysdep
 LIBSYSDEPDIR=	${TOPSRC}/sysdep/common/libsysdep
 
diff --git a/sbin/isakmpd/sysdep/openbsd/Makefile.sysdep b/sbin/isakmpd/sysdep/openbsd/Makefile.sysdep
deleted file mode 100644
index 8181cff41ea..00000000000
--- a/sbin/isakmpd/sysdep/openbsd/Makefile.sysdep
+++ /dev/null
@@ -1,33 +0,0 @@
-#	$OpenBSD: Makefile.sysdep,v 1.32 2005/04/08 18:57:28 hshoexer Exp $
-#	$EOM: Makefile.sysdep,v 1.18 2001/01/26 10:55:22 niklas Exp $
-
-#
-# Copyright (c) 1999, 2000, 2001 Niklas Hallqvist.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER INN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# This code was written under funding by Ericsson Radio Systems.
-#
-
-IPSEC_SRCS=	pf_key_v2.c
-IPSEC_CFLAGS=	-DUSE_PF_KEY_V2
diff --git a/sbin/isakmpd/sysdep/openbsd/sysdep.c b/sbin/isakmpd/sysdep/openbsd/sysdep.c
index ff292606b2a..11f052600f1 100644
--- a/sbin/isakmpd/sysdep/openbsd/sysdep.c
+++ b/sbin/isakmpd/sysdep/openbsd/sysdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sysdep.c,v 1.30 2005/04/08 16:06:25 deraadt Exp $	 */
+/* $OpenBSD: sysdep.c,v 1.31 2005/04/08 19:05:15 deraadt Exp $	 */
 /* $EOM: sysdep.c,v 1.9 2000/12/04 04:46:35 angelos Exp $	 */
 
 /*
@@ -42,17 +42,13 @@
 #include "monitor.h"
 #include "util.h"
 
-#ifdef NEED_SYSDEP_APP
 #include "app.h"
 #include "conf.h"
 #include "ipsec.h"
 
-#ifdef USE_PF_KEY_V2
 #include "pf_key_v2.h"
 #define KEY_API(x) pf_key_v2_##x
-#endif
 
-#endif /* NEED_SYSDEP_APP */
 #include "log.h"
 
 /*
@@ -75,9 +71,6 @@ sysdep_sa_len(struct sockaddr *sa)
 	return sa->sa_len;
 }
 
-/* As regress/ use this file I protect the sysdep_app_* stuff like this.  */
-#ifdef NEED_SYSDEP_APP
-
 /*
  * When select(2) has noticed our application needs attendance, this is what
  * gets called.  FD is the file descriptor causing the alarm.
@@ -241,4 +234,3 @@ sysdep_ipsec_set_spi(struct sa *sa, struct proto *proto, int incoming,
 		return 0;
 	return KEY_API(set_spi) (sa,proto, incoming, isakmp_sa);
 }
-#endif