Date: Tue, 6 Jun 2017 22:31:31 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442809 - in branches/2017Q2/security/openvpn-auth-ldap: . files Message-ID: <201706062231.v56MVVXL036966@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Tue Jun 6 22:31:31 2017 New Revision: 442809 URL: https://svnweb.freebsd.org/changeset/ports/442809 Log: MFH: r440973 r440974 r440979 r440981 Unbreak security/openvpn-auth-ldap on 2017Q2, regressed since r440676 (which was an approved MFH of r440667, updating security/openvpn to v2.4.2), with these changes: Unbreak openvpn-plugin.h detection. Apparently the header file changed in openvpn 2.4.2 and now requires #include <stddef.h> explicitly to pull the typedef for size_t in. Add that header line to the test so it won't report a false negative result. Reported by: pkg-fallout@ Modernize, resolving DEVELOPER=yes warnings. No longer depend on OpenVPN sources. OpenVPN 2.3.0 and newer have installed the openvpn-plugin.h file. Cease requiring and extracting the source tarball to obtain this file (as we used to do with 2.2.x and older). Revise Github comment. Invoking blanket approval "Build, Runtime or Packaging fixes, if the quarterly branch version is currently broken." Reported by: Johannes Jost Meixner Approved by: ports-secteam (blanket) Added: branches/2017Q2/security/openvpn-auth-ldap/files/patch-aclocal.m4 - copied, changed from r440973, head/security/openvpn-auth-ldap/files/patch-aclocal.m4 Modified: branches/2017Q2/security/openvpn-auth-ldap/Makefile Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/security/openvpn-auth-ldap/Makefile ============================================================================== --- branches/2017Q2/security/openvpn-auth-ldap/Makefile Tue Jun 6 21:34:35 2017 (r442808) +++ branches/2017Q2/security/openvpn-auth-ldap/Makefile Tue Jun 6 22:31:31 2017 (r442809) @@ -15,17 +15,15 @@ COMMENT= LDAP authentication plugin for OpenVPN LICENSE= BSD3CLAUSE BUILD_DEPENDS= re2c:devel/re2c \ - ${NONEXISTENT}:security/openvpn:extract \ - check>=0:devel/check + check>=0:devel/check \ + ${LOCALBASE}/include/openvpn-plugin.h:security/openvpn -USES= objc tar:xz +USES= autoreconf objc tar:xz GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf autoheader USE_OPENLDAP= yes -OPENVPN_WRKSRC= `cd ${PORTSDIR}/security/openvpn; make -V WRKSRC` CONFIGURE_ARGS+= --with-openldap=${LOCALBASE} \ - --with-openvpn=${OPENVPN_WRKSRC}/include \ + --with-openvpn=${LOCALBASE}/include \ --with-objc-runtime=GNU PORTDOCS= README @@ -62,9 +60,7 @@ CC+= ${DEBUG_FLAGS} # this is a local target to build a tarball from SVN # and another target to upload it # Note that googlecode.com is gone. Apparently someone exported the code -# to Github, but aside from a README that got converted to Markdown -# syntax, there hadn't been changes as of 2016-12-07. -# https://github.com/threerings/openvpn-auth-ldap/ +# to Github: https://github.com/threerings/openvpn-auth-ldap/ build-tarball: ${DISTFILES} ${DISTFILES}: ${RM} -r ${WRKSRC} Copied and modified: branches/2017Q2/security/openvpn-auth-ldap/files/patch-aclocal.m4 (from r440973, head/security/openvpn-auth-ldap/files/patch-aclocal.m4) ============================================================================== --- head/security/openvpn-auth-ldap/files/patch-aclocal.m4 Mon May 15 21:11:21 2017 (r440973, copy source) +++ branches/2017Q2/security/openvpn-auth-ldap/files/patch-aclocal.m4 Tue Jun 6 22:31:31 2017 (r442809) @@ -4,7 +4,7 @@ AC_CACHE_VAL(od_cv_openvpn, [ AC_LINK_IFELSE([ AC_LANG_PROGRAM([ -+ #include <sys/types.h> ++ #include <stddef.h> #include <openvpn-plugin.h> ], [ int flag = OPENVPN_PLUGIN_UP;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706062231.v56MVVXL036966>