Module Name: src
Committed By: christos
Date: Sat Mar 8 16:40:44 UTC 2025
Modified Files:
src/usr.sbin/plainrsa-gen: Makefile
src/usr.sbin/racoon: Makefile Makefile.racoon
Log Message:
Move stuff to the common Makefile.racoon
Enable WARNS
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/plainrsa-gen/Makefile
cvs rdiff -u -r1.47 -r1.48 src/usr.sbin/racoon/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/racoon/Makefile.racoon
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/plainrsa-gen/Makefile
diff -u src/usr.sbin/plainrsa-gen/Makefile:1.5 src/usr.sbin/plainrsa-gen/Makefile:1.6
--- src/usr.sbin/plainrsa-gen/Makefile:1.5 Sat Mar 8 04:34:33 2025
+++ src/usr.sbin/plainrsa-gen/Makefile Sat Mar 8 11:40:44 2025
@@ -1,31 +1,17 @@
-# $NetBSD: Makefile,v 1.5 2025/03/08 09:34:33 mlelstv Exp $
+# $NetBSD: Makefile,v 1.6 2025/03/08 16:40:44 christos Exp $
-WARNS?= 0 # XXX third-party program, many issues
-NOCLANGERROR= # defined
+WARNS?= 3 # XXX third-party program, many issues
.include <bsd.own.mk>
PROG= plainrsa-gen
-SRCS= plainrsa-gen.c plog.c crypto_openssl.c logger.c vmbuf.c misc.c \
- rsalist.c sockmisc.c genlist.c prsa_tok.l prsa_par.c
+SRCS+= plainrsa-gen.c
MAN= plainrsa-gen.8
-DIST= ${NETBSDSRCDIR}/crypto/dist/ipsec-tools
-CPPFLAGS+= -I${DIST}/src/racoon -I${DIST}/src/racoon/missing
-CPPFLAGS+= -I${DIST}/src/libipsec
-CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libipsec -I.
-CPPFLAGS+= -DHAVE_CONFIG_H -DNOUSE_PRIVSEP
-.if ${HAVE_OPENSSL} < 11
-CPPFLAGS+= -DHAVE_OPENSSL_RC5_H
-CPPFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L
-.endif
-
-.PATH: ${DIST}/src/racoon
-
+CPPFLAGS+=-DNOUSE_PRIVSEP
LDADD+= -lcrypto -lipsec
DPADD+= ${LIBCRYPTO} ${LIBIPSEC}
.include "${.CURDIR}/../racoon/Makefile.racoon"
.include <bsd.prog.mk>
-
Index: src/usr.sbin/racoon/Makefile
diff -u src/usr.sbin/racoon/Makefile:1.47 src/usr.sbin/racoon/Makefile:1.48
--- src/usr.sbin/racoon/Makefile:1.47 Fri Mar 7 19:10:53 2025
+++ src/usr.sbin/racoon/Makefile Sat Mar 8 11:40:44 2025
@@ -1,33 +1,23 @@
-# $NetBSD: Makefile,v 1.47 2025/03/08 00:10:53 christos Exp $
+# $NetBSD: Makefile,v 1.48 2025/03/08 16:40:44 christos Exp $
-WARNS?= 0 # XXX third-party program, many issues
-NOCLANGERROR= # defined
+USE_FORT?= yes # network client and server
+WARNS=3
.include <bsd.own.mk>
-USE_FORT?= yes # network client and server
PROG= racoon
-SRCS= main.c session.c isakmp.c handler.c \
- isakmp_ident.c isakmp_agg.c isakmp_base.c \
- isakmp_quick.c isakmp_inf.c isakmp_newg.c \
- gssapi.c dnssec.c getcertsbyname.c privsep.c \
- pfkey.c admin.c evt.c ipsec_doi.c oakley.c \
- grabmyaddr.c vendorid.c policy.c localconf.c \
- remoteconf.c crypto_openssl.c algorithm.c \
- proposal.c sainfo.c strnames.c plog.c logger.c \
- schedule.c str2val.c safefile.c backupsa.c \
- genlist.c rsalist.c cftoken.l cfparse.y \
- prsa_tok.l prsa_par.y isakmp_xauth.c isakmp_cfg.c \
- isakmp_unity.c throttle.c isakmp_frag.c \
- nattraversal.c vmbuf.c sockmisc.c misc.c
+SRCS+= admin.c algorithm.c backupsa.c cfparse.y cftoken.l dnssec.c evt.c \
+ getcertsbyname.c grabmyaddr.c gssapi.c handler.c ipsec_doi.c isakmp.c \
+ isakmp_agg.c isakmp_base.c isakmp_cfg.c isakmp_frag.c isakmp_ident.c \
+ isakmp_inf.c isakmp_newg.c isakmp_quick.c isakmp_unity.c isakmp_xauth.c \
+ localconf.c main.c nattraversal.c oakley.c pfkey.c policy.c privsep.c \
+ proposal.c remoteconf.c safefile.c sainfo.c schedule.c session.c \
+ str2val.c strnames.c throttle.c vendorid.c
+
MAN= racoon.8 racoon.conf.5
-DIST= ${NETBSDSRCDIR}/crypto/dist/ipsec-tools
-CPPFLAGS+= -I${DIST}/src/racoon -I${DIST}/src/racoon/missing
-CPPFLAGS+= -I${DIST}/src/libipsec
-CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libipsec -I.
-CPPFLAGS+= -DIPSEC_DEBUG -DHAVE_CONFIG_H -DENABLE_WILDCARD_MATCH
+CPPFLAGS+= -DIPSEC_DEBUG -DENABLE_WILDCARD_MATCH
CPPFLAGS+= -DADMINPORTDIR=\"/var/run\"
CPPFLAGS+= -DSYSCONFDIR=\"/etc/racoon\"
.if ${HAVE_OPENSSL} < 11
@@ -73,12 +63,15 @@ DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
#CFLAGS+=-fsanitize=address
#LDFLAGS+=-fsanitize=address
-.PATH: ${NETBSDSRCDIR}/lib/libipsec ${DIST}/src/racoon
CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
+COPTS.cftoken.c+=-Wno-error=unused-function
+COPTS.isakmp.c+=${CC_WNO_STRINGOP_TRUNCATION}
+COPTS.isakmp_cfg.c+=${CC_WNO_STRINGOP_TRUNCATION} ${${ACTIVE_CC} == "gcc" :? -Wno-error=format-truncation :}
-COPTS+= -fcommon
+#COPTS+= -fcommon
.include "${.CURDIR}/Makefile.racoon"
+.PATH: ${NETBSDSRCDIR}/lib/libipsec
.include <bsd.prog.mk>
Index: src/usr.sbin/racoon/Makefile.racoon
diff -u src/usr.sbin/racoon/Makefile.racoon:1.3 src/usr.sbin/racoon/Makefile.racoon:1.4
--- src/usr.sbin/racoon/Makefile.racoon:1.3 Fri Mar 7 19:21:37 2025
+++ src/usr.sbin/racoon/Makefile.racoon Sat Mar 8 11:40:44 2025
@@ -1,15 +1,31 @@
-# $NetBSD: Makefile.racoon,v 1.3 2025/03/08 00:21:37 christos Exp $
+# $NetBSD: Makefile.racoon,v 1.4 2025/03/08 16:40:44 christos Exp $
+
+DIST= ${NETBSDSRCDIR}/crypto/dist/ipsec-tools
+CPPFLAGS+= -I${DIST}/src/racoon -I${DIST}/src/racoon/missing
+CPPFLAGS+= -I${DIST}/src/libipsec
+CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libipsec -I. -DHAVE_CONFIG_H
+.if ${HAVE_OPENSSL} < 11
+CPPFLAGS+= -DHAVE_OPENSSL_RC5_H
+CPPFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L
+.endif
+
+SRCS+=crypto_openssl.c genlist.c logger.c misc.c plog.c prsa_par.y \
+ prsa_tok.l rsalist.c sockmisc.c vmbuf.c
COPTS.plainrsa-gen.c+= -Wno-error=deprecated-declarations
COPTS.crypto_openssl.c+= -Wno-error=deprecated-declarations
COPTS.rsalist.c+= -Wno-error=deprecated-declarations
COPTS.prsa_par.c+= -Wno-error=deprecated-declarations
+COPTS.prsa_tok.c+=-Wno-error=unused-function
LPREFIX.prsa_tok.l=prsa
YPREFIX.prsa_par.y=prsa
YFLAGS=-d
LFLAGS.prsa_tok.l+=--header-file=prsa_tok.h
+
CLEANFILES+=prsa_tok.h prsa_tok.c prsa_par.c prsa_par.h
+.PATH: ${DIST}/src/racoon
+
prsa_tok.c: prsa_par.c
