CVS commit: src/usr.sbin/racoon
Module Name:src
Committed By: christos
Date: Sat Aug 14 17:08:21 UTC 2021
Modified Files:
src/usr.sbin/racoon: Makefile
Log Message:
One more ldap change
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/usr.sbin/racoon/Makefile
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/racoon/Makefile
diff -u src/usr.sbin/racoon/Makefile:1.39 src/usr.sbin/racoon/Makefile:1.40
--- src/usr.sbin/racoon/Makefile:1.39 Mon Apr 12 21:11:05 2021
+++ src/usr.sbin/racoon/Makefile Sat Aug 14 13:08:21 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2021/04/13 01:11:05 mrg Exp $
+# $NetBSD: Makefile,v 1.40 2021/08/14 17:08:21 christos Exp $
WARNS?= 0 # XXX third-party program, many issues
NOCLANGERROR= # defined
@@ -60,8 +60,8 @@ CPPFLAGS+=-DINET6
.if (${USE_LDAP} != "no")
CPPFLAGS+=-DHAVE_LIBLDAP
-LDADD+=-lldap -llber -lssl
-DPADD+= ${LIBLDAP} ${LIBLBER} ${LIBSSL}
+LDADD+= ${LIBLDAP_LDADD}
+DPADD+= ${LIBLDAP_DPADD}
.endif
LDADD+= -lcrypto -lcrypt
CVS commit: src/usr.sbin/racoon
Module Name:src
Committed By: rin
Date: Wed Dec 2 02:21:43 UTC 2020
Modified Files:
src/usr.sbin/racoon: Makefile
Log Message:
Explicitly link liblber and libssl when ldap support is enabled.
Fix sun2, i.e., MKPIC=no build.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/usr.sbin/racoon/Makefile
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/racoon/Makefile
diff -u src/usr.sbin/racoon/Makefile:1.37 src/usr.sbin/racoon/Makefile:1.38
--- src/usr.sbin/racoon/Makefile:1.37 Tue Dec 1 10:10:57 2020
+++ src/usr.sbin/racoon/Makefile Wed Dec 2 02:21:43 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2020/12/01 10:10:57 bouyer Exp $
+# $NetBSD: Makefile,v 1.38 2020/12/02 02:21:43 rin Exp $
WARNS?= 0 # XXX third-party program, many issues
NOCLANGERROR= # defined
@@ -60,8 +60,8 @@ CPPFLAGS+=-DINET6
.if (${USE_LDAP} != "no")
CPPFLAGS+=-DHAVE_LIBLDAP
-LDADD+=-lldap
-DPADD+= ${LIBLDAP}
+LDADD+=-lldap -llber -lssl
+DPADD+= ${LIBLDAP} ${LIBLBER} ${LIBSSL}
.endif
LDADD+= -lcrypto -lcrypt
CVS commit: src/usr.sbin/racoon
Module Name:src
Committed By: bouyer
Date: Tue Dec 1 10:10:57 UTC 2020
Modified Files:
src/usr.sbin/racoon: Makefile
Log Message:
Enable ldap support in racoon(8). Proposed on tech-userlevel,
"Go for it" from christos@
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/usr.sbin/racoon/Makefile
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/racoon/Makefile
diff -u src/usr.sbin/racoon/Makefile:1.36 src/usr.sbin/racoon/Makefile:1.37
--- src/usr.sbin/racoon/Makefile:1.36 Sun Sep 6 07:20:32 2020
+++ src/usr.sbin/racoon/Makefile Tue Dec 1 10:10:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2020/09/06 07:20:32 mrg Exp $
+# $NetBSD: Makefile,v 1.37 2020/12/01 10:10:57 bouyer Exp $
WARNS?= 0 # XXX third-party program, many issues
NOCLANGERROR= # defined
@@ -58,6 +58,12 @@ CPPFLAGS+=-DHAVE_OPENSSL_IDEA_H
CPPFLAGS+=-DINET6
.endif
+.if (${USE_LDAP} != "no")
+CPPFLAGS+=-DHAVE_LIBLDAP
+LDADD+=-lldap
+DPADD+= ${LIBLDAP}
+.endif
+
LDADD+= -lcrypto -lcrypt
DPADD+= ${LIBIPSEC} ${LIBCRYPT}
CVS commit: src/usr.sbin/racoon
Module Name:src
Committed By: christos
Date: Sun Apr 1 23:00:40 UTC 2018
Modified Files:
src/usr.sbin/racoon: Makefile
Log Message:
add commented out debugging options.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/usr.sbin/racoon/Makefile
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/racoon/Makefile
diff -u src/usr.sbin/racoon/Makefile:1.34 src/usr.sbin/racoon/Makefile:1.35
--- src/usr.sbin/racoon/Makefile:1.34 Sat Feb 24 19:16:49 2018
+++ src/usr.sbin/racoon/Makefile Sun Apr 1 19:00:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2018/02/25 00:16:49 mrg Exp $
+# $NetBSD: Makefile,v 1.35 2018/04/01 23:00:40 christos Exp $
WARNS?= 0 # XXX third-party program, many issues
NOCLANGERROR= # defined
@@ -61,6 +61,12 @@ CPPFLAGS+=-DINET6
LDADD+= -lcrypto -lcrypt
DPADD+= ${LIBIPSEC} ${LIBCRYPT}
+#CPPFLAGS+= -DDEBUG_RECORD_MALLOCATION
+#SRCS+= debugrm.c
+
+#CFLAGS+=-fsanitize=address
+#LDFLAGS+=-fsanitize=address
+
.PATH: ${NETBSDSRCDIR}/lib/libipsec ${DIST}/src/racoon
prsa_tok.c: ${DIST}/src/racoon/prsa_tok.l
CVS commit: src/usr.sbin/racoon
Module Name:src
Committed By: christos
Date: Fri Feb 9 02:51:32 UTC 2018
Modified Files:
src/usr.sbin/racoon: Makefile
Log Message:
No RC5 for OpenSSL-1.1
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/usr.sbin/racoon/Makefile
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/racoon/Makefile
diff -u src/usr.sbin/racoon/Makefile:1.32 src/usr.sbin/racoon/Makefile:1.33
--- src/usr.sbin/racoon/Makefile:1.32 Thu Feb 8 21:37:20 2018
+++ src/usr.sbin/racoon/Makefile Thu Feb 8 21:51:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2018/02/09 02:37:20 christos Exp $
+# $NetBSD: Makefile,v 1.33 2018/02/09 02:51:32 christos Exp $
WARNS?= 0 # XXX third-party program, many issues
NOCLANGERROR= # defined
@@ -31,6 +31,7 @@ CPPFLAGS+= -DIPSEC_DEBUG -DHAVE_CONFIG_H
CPPFLAGS+= -DADMINPORTDIR=\"/var/run\"
CPPFLAGS+= -DSYSCONFDIR=\"/etc/racoon\"
.if ${HAVE_OPENSSL} < 11
+CPPFLAGS+= -DHAVE_OPENSSL_RC5_H
CPPFLAGS+= -DOPENSSL_API_COMPAT=0x1010L
.endif
@@ -55,7 +56,6 @@ DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX5
${LIBROKEN} ${LIBASN1} ${LIBSQLITE3}
.endif
CPPFLAGS+=-DHAVE_OPENSSL_IDEA_H
-CPPFLAGS+=-DHAVE_OPENSSL_RC5_H
.if (${USE_INET6} != "no")
CPPFLAGS+=-DINET6
.endif
CVS commit: src/usr.sbin/racoon
Module Name:src
Committed By: christos
Date: Fri Feb 9 02:37:20 UTC 2018
Modified Files:
src/usr.sbin/racoon: Makefile
Log Message:
disable compat api setting for openssl 1.1
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/usr.sbin/racoon/Makefile
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/racoon/Makefile
diff -u src/usr.sbin/racoon/Makefile:1.31 src/usr.sbin/racoon/Makefile:1.32
--- src/usr.sbin/racoon/Makefile:1.31 Wed Feb 7 08:16:50 2018
+++ src/usr.sbin/racoon/Makefile Thu Feb 8 21:37:20 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2018/02/07 13:16:50 christos Exp $
+# $NetBSD: Makefile,v 1.32 2018/02/09 02:37:20 christos Exp $
WARNS?= 0 # XXX third-party program, many issues
NOCLANGERROR= # defined
@@ -30,7 +30,9 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libipse
CPPFLAGS+= -DIPSEC_DEBUG -DHAVE_CONFIG_H -DENABLE_WILDCARD_MATCH
CPPFLAGS+= -DADMINPORTDIR=\"/var/run\"
CPPFLAGS+= -DSYSCONFDIR=\"/etc/racoon\"
+.if ${HAVE_OPENSSL} < 11
CPPFLAGS+= -DOPENSSL_API_COMPAT=0x1010L
+.endif
LDADD+= -ll -ly -lipsec -lutil
DPADD+= ${LIBL} ${LIBY} ${LIBCRYPTO} ${LIBUTIL}
CVS commit: src/usr.sbin/racoon
Module Name:src
Committed By: christos
Date: Wed Feb 7 13:16:50 UTC 2018
Modified Files:
src/usr.sbin/racoon: Makefile
Log Message:
needs the OpenSSL-1.1 api to build
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/racoon/Makefile
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/racoon/Makefile
diff -u src/usr.sbin/racoon/Makefile:1.30 src/usr.sbin/racoon/Makefile:1.31
--- src/usr.sbin/racoon/Makefile:1.30 Sun May 21 10:20:45 2017
+++ src/usr.sbin/racoon/Makefile Wed Feb 7 08:16:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2017/05/21 14:20:45 riastradh Exp $
+# $NetBSD: Makefile,v 1.31 2018/02/07 13:16:50 christos Exp $
WARNS?= 0 # XXX third-party program, many issues
NOCLANGERROR= # defined
@@ -30,6 +30,7 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/lib/libipse
CPPFLAGS+= -DIPSEC_DEBUG -DHAVE_CONFIG_H -DENABLE_WILDCARD_MATCH
CPPFLAGS+= -DADMINPORTDIR=\"/var/run\"
CPPFLAGS+= -DSYSCONFDIR=\"/etc/racoon\"
+CPPFLAGS+= -DOPENSSL_API_COMPAT=0x1010L
LDADD+= -ll -ly -lipsec -lutil
DPADD+= ${LIBL} ${LIBY} ${LIBCRYPTO} ${LIBUTIL}
CVS commit: src/usr.sbin/racoon
Module Name:src
Committed By: christos
Date: Sat Jan 28 23:42:36 UTC 2017
Modified Files:
src/usr.sbin/racoon: Makefile
Log Message:
add sqlite3
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/usr.sbin/racoon/Makefile
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/racoon/Makefile
diff -u src/usr.sbin/racoon/Makefile:1.27 src/usr.sbin/racoon/Makefile:1.28
--- src/usr.sbin/racoon/Makefile:1.27 Fri Nov 8 19:33:48 2013
+++ src/usr.sbin/racoon/Makefile Sat Jan 28 18:42:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2013/11/09 00:33:48 christos Exp $
+# $NetBSD: Makefile,v 1.28 2017/01/28 23:42:36 christos Exp $
WARNS?= 0 # XXX third-party program, many issues
NOCLANGERROR= # defined
@@ -47,9 +47,9 @@ DPADD+= ${LIBPAM} ${PAM_STATIC_DPADD}
.if (${USE_KERBEROS} != "no")
CPPFLAGS+=-DHAVE_GSSAPI
LDADD+= -lgssapi -lkrb5 -lhx509 -lheimntlm -lcom_err \
- -lroken -lasn1
+ -lroken -lasn1 -lsqlite3
DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBCOM_ERR} \
- ${LIBROKEN} ${LIBASN1}
+ ${LIBROKEN} ${LIBASN1} ${LIBSQLITE3}
.endif
CPPFLAGS+=-DHAVE_OPENSSL_IDEA_H
.if (${MKCRYPTO_RC5} != "no")
CVS commit: src/usr.sbin/racoon
Module Name:src
Committed By: christos
Date: Sat Nov 9 00:33:48 UTC 2013
Modified Files:
src/usr.sbin/racoon: Makefile
Log Message:
more sh3 hacks.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/racoon/Makefile
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/racoon/Makefile
diff -u src/usr.sbin/racoon/Makefile:1.26 src/usr.sbin/racoon/Makefile:1.27
--- src/usr.sbin/racoon/Makefile:1.26 Thu Jun 20 11:42:58 2013
+++ src/usr.sbin/racoon/Makefile Fri Nov 8 19:33:48 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2013/06/20 15:42:58 christos Exp $
+# $NetBSD: Makefile,v 1.27 2013/11/09 00:33:48 christos Exp $
WARNS?= 0 # XXX third-party program, many issues
NOCLANGERROR= # defined
@@ -72,4 +72,9 @@ prsa_tok.c: ${DIST}/src/racoon/prsa_tok.
prsa_par.c: ${DIST}/src/racoon/prsa_par.y
${YACC} -pprsa -d -o ${.TARGET} ${.ALLSRC}
+.if defined(HAVE_GCC) ${HAVE_GCC} == 48
+.if ${MACHINE_ARCH} == sh3el
+COPTS.ipsec_doi.c= -O0
+.endif
+.endif
.include bsd.prog.mk
CVS commit: src/usr.sbin/racoon
Module Name:src
Committed By: christos
Date: Thu Jun 20 15:42:58 UTC 2013
Modified Files:
src/usr.sbin/racoon: Makefile
Log Message:
Enable wildcard matching in psk files. We are big kids and if we put a *
in the psk file, we mean it.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/racoon/Makefile
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/racoon/Makefile
diff -u src/usr.sbin/racoon/Makefile:1.25 src/usr.sbin/racoon/Makefile:1.26
--- src/usr.sbin/racoon/Makefile:1.25 Sat Jul 14 00:03:44 2012
+++ src/usr.sbin/racoon/Makefile Thu Jun 20 11:42:58 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2012/07/14 04:03:44 christos Exp $
+# $NetBSD: Makefile,v 1.26 2013/06/20 15:42:58 christos Exp $
WARNS?= 0 # XXX third-party program, many issues
NOCLANGERROR= # defined
@@ -27,7 +27,7 @@ DIST= ${NETBSDSRCDIR}/crypto/dist/ipsec-
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
+CPPFLAGS+= -DIPSEC_DEBUG -DHAVE_CONFIG_H -DENABLE_WILDCARD_MATCH
CPPFLAGS+= -DADMINPORTDIR=\/var/run\
CPPFLAGS+= -DSYSCONFDIR=\/etc/racoon\
CVS commit: src/usr.sbin/racoon
Module Name:src
Committed By: christos
Date: Sat Jul 14 04:03:44 UTC 2012
Modified Files:
src/usr.sbin/racoon: Makefile
Log Message:
MKCRYPTO_IDEA is no more
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/racoon/Makefile
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/racoon/Makefile
diff -u src/usr.sbin/racoon/Makefile:1.24 src/usr.sbin/racoon/Makefile:1.25
--- src/usr.sbin/racoon/Makefile:1.24 Wed Jan 4 10:55:36 2012
+++ src/usr.sbin/racoon/Makefile Sat Jul 14 00:03:44 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2012/01/04 15:55:36 drochner Exp $
+# $NetBSD: Makefile,v 1.25 2012/07/14 04:03:44 christos Exp $
WARNS?= 0 # XXX third-party program, many issues
NOCLANGERROR= # defined
@@ -51,11 +51,7 @@ LDADD+= -lgssapi -lkrb5 -lhx509 -lheimnt
DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBCOM_ERR} \
${LIBROKEN} ${LIBASN1}
.endif
-.if (${MKCRYPTO_IDEA} != no)
CPPFLAGS+=-DHAVE_OPENSSL_IDEA_H
-LDADD+= -lcrypto_idea
-LDADD+= ${LIBCRYPTO_IDEA}
-.endif
.if (${MKCRYPTO_RC5} != no)
CPPFLAGS+=-DHAVE_OPENSSL_RC5_H
LDADD+= -lcrypto_rc5
