diff options
author | Tijl Coosemans <tijl@FreeBSD.org> | 2020-04-26 09:00:01 +0000 |
---|---|---|
committer | Tijl Coosemans <tijl@FreeBSD.org> | 2020-04-26 09:00:01 +0000 |
commit | 726d350a98e5dec0ff9f5384eed92560534dbe9e (patch) | |
tree | e33c26d1805edd98f05835db7771e16b0e7ea74a /security/ipsec-tools | |
parent | 67fa50d2d9268166d6bc569d9dd0314a5e36f910 (diff) | |
download | ports-726d350a98e5dec0ff9f5384eed92560534dbe9e.tar.gz ports-726d350a98e5dec0ff9f5384eed92560534dbe9e.zip |
Update devel/automake to 1.16.2.
mail/bogofilter security/ipsec-tools:
Patch Makefile.in instead of Makefile.am so automake is not required.
PR: 245599
Approved by: portmgr (antoine)
Exp-run by: antoine
Notes
Notes:
svn path=/head/; revision=532998
Diffstat (limited to 'security/ipsec-tools')
-rw-r--r-- | security/ipsec-tools/Makefile | 19 | ||||
-rw-r--r-- | security/ipsec-tools/files/extra-patch-aclocal.m4 | 24 | ||||
-rw-r--r-- | security/ipsec-tools/files/extra-patch-ipsec-tools | 24 |
3 files changed, 12 insertions, 55 deletions
diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile index 5f03efe0c911..b3ce72389502 100644 --- a/security/ipsec-tools/Makefile +++ b/security/ipsec-tools/Makefile @@ -86,27 +86,9 @@ WCPSKEY_EXTRA_PATCHES= ${FILESDIR}/wildcard-psk.diff ${FILESDIR}/wildcard-psk-oa REQUIREMOD?= ipsec .endif -# Need to be patched for openssl-1.1.1 (default after 1200080) -.if ${OPSYS} == FreeBSD -. if ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} != openssl -BUILD_DEPENDS+= automake>=0:devel/automake -. endif -.endif - post-patch: @${REINPLACE_CMD} -e "s/-Werror//g ; s/-R$$libdir/-Wl,-rpath=$$libdir/g" ${WRKSRC}/configure -# Need to be patched for openssl-1.1.1 (default after 1200080) -.if ${OPSYS} == FreeBSD -. if ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} != openssl -post-configure: - @${REINPLACE_CMD} -e "s/automake-1.14/automake-1.16/g" ${WRKSRC}/Makefile ${WRKSRC}/*/Makefile \ - ${WRKSRC}/*/*/Makefile - @${REINPLACE_CMD} -e "s/aclocal-1.14/aclocal-1.16/g" ${WRKSRC}/Makefile ${WRKSRC}/*/Makefile \ - ${WRKSRC}/*/*/Makefile -. endif -.endif - post-install: @${MKDIR} ${STAGEDIR}/${PREFIX}/etc/racoon @if [ -z `/sbin/sysctl -a | ${GREP} -q ipsec && ${ECHO_CMD} ipsec` ]; then \ @@ -125,7 +107,6 @@ post-install-DOCS-on: .if ${OPSYS} == FreeBSD . if ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} != openssl -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-aclocal.m4 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-ipsec-tools PLIST_FILES+= include/racoon/openssl_compat.h . endif diff --git a/security/ipsec-tools/files/extra-patch-aclocal.m4 b/security/ipsec-tools/files/extra-patch-aclocal.m4 deleted file mode 100644 index 89fe32225ed9..000000000000 --- a/security/ipsec-tools/files/extra-patch-aclocal.m4 +++ /dev/null @@ -1,24 +0,0 @@ ---- aclocal.m4.orig 2018-10-29 00:47:18 UTC -+++ aclocal.m4 -@@ -8619,10 +8619,10 @@ m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_L - # generated from the m4 files accompanying Automake X.Y. - # (This private macro should not be called outside this file.) - AC_DEFUN([AM_AUTOMAKE_VERSION], --[am__api_version='1.14' -+[am__api_version='1.16' - dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to - dnl require some minimum version. Point them to the right macro. --m4_if([$1], [1.14.1], [], -+m4_if([$1], [1.16.1], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl - ]) - -@@ -8638,7 +8638,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) - # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. - # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. - AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], --[AM_AUTOMAKE_VERSION([1.14.1])dnl -+[AM_AUTOMAKE_VERSION([1.16.1])dnl - m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl - _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff --git a/security/ipsec-tools/files/extra-patch-ipsec-tools b/security/ipsec-tools/files/extra-patch-ipsec-tools index acae53e75edf..718ad0e807ba 100644 --- a/security/ipsec-tools/files/extra-patch-ipsec-tools +++ b/security/ipsec-tools/files/extra-patch-ipsec-tools @@ -1,15 +1,15 @@ ---- src/racoon/Makefile.am -+++ src/racoon/Makefile.am -@@ -4,7 +4,7 @@ sbin_PROGRAMS = racoon racoonctl plainrsa-gen - noinst_PROGRAMS = eaytest +--- src/racoon/Makefile.in ++++ src/racoon/Makefile.in +@@ -571,7 +571,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ include_racoon_HEADERS = racoonctl.h var.h vmbuf.h misc.h gcmalloc.h admin.h \ schedule.h sockmisc.h isakmp_var.h isakmp.h isakmp_xauth.h \ - isakmp_cfg.h isakmp_unity.h ipsec_doi.h evt.h + isakmp_cfg.h isakmp_unity.h ipsec_doi.h evt.h openssl_compat.h - lib_LTLIBRARIES = libracoon.la - adminsockdir=${localstatedir}/racoon -@@ -32,7 +32,7 @@ racoon_SOURCES = \ + lib_LTLIBRARIES = libracoon.la + adminsockdir = ${localstatedir}/racoon +@@ -597,7 +597,7 @@ racoon_SOURCES = \ 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 \ @@ -18,22 +18,22 @@ 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 -@@ -51,12 +51,12 @@ libracoon_la_SOURCES = kmpstat.c vmbuf.c sockmisc.c misc.c +@@ -617,12 +617,12 @@ racoonctl_LDADD = libracoon.la ../libipsec/libipsec.la + libracoon_la_SOURCES = kmpstat.c vmbuf.c sockmisc.c misc.c libracoon_la_CFLAGS = -DNOUSE_PRIVSEP $(AM_CFLAGS) - plainrsa_gen_SOURCES = plainrsa-gen.c plog.c \ - crypto_openssl.c logger.c + crypto_openssl.c logger.c openssl_compat.c + EXTRA_plainrsa_gen_SOURCES = $(MISSING_ALGOS) plainrsa_gen_LDADD = $(CRYPTOBJS) vmbuf.o misc.o plainrsa_gen_DEPENDENCIES = $(CRYPTOBJS) vmbuf.o misc.o - -eaytest_SOURCES = eaytest.c plog.c logger.c +eaytest_SOURCES = eaytest.c plog.c logger.c openssl_compat.c EXTRA_eaytest_SOURCES = missing/crypto/sha2/sha2.c - eaytest_LDADD = crypto_openssl_test.o vmbuf.o str2val.o misc_noplog.o \ + eaytest_LDADD = crypto_openssl_test.o vmbuf.o str2val.o misc_noplog.o \ $(CRYPTOBJS) -@@ -75,7 +75,7 @@ noinst_HEADERS = \ +@@ -642,7 +642,7 @@ noinst_HEADERS = \ debugrm.h isakmp.h misc.h sainfo.h \ dhgroup.h isakmp_agg.h netdb_dnssec.h schedule.h \ isakmp_cfg.h isakmp_xauth.h isakmp_unity.h isakmp_frag.h \ |