From owner-freebsd-ports@FreeBSD.ORG Wed Jan 1 22:59:06 2014 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0AC1ADC6 for ; Wed, 1 Jan 2014 22:59:06 +0000 (UTC) Received: from mail-lb0-x22b.google.com (mail-lb0-x22b.google.com [IPv6:2a00:1450:4010:c04::22b]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 82E4A1D53 for ; Wed, 1 Jan 2014 22:59:05 +0000 (UTC) Received: by mail-lb0-f171.google.com with SMTP id w7so6880105lbi.16 for ; Wed, 01 Jan 2014 14:59:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:content-type:subject:message-id:date:to:mime-version; bh=aoaWNBLWvULKgwTVcgbfQ2kGqzPaLbHfsrNp/0sCSls=; b=pUqNPw6u70rLpRLXYFxm2ygYYksOZ5ppk7xL6A8zEKJT0iE2QfVf3HH9tf31oE5IPj TKBuvOHrpgjPHZH9UpsoeYCYvbYN1XsSWETZDCtcmqLiWPPZ6SJfjtu6aQbxQMglD7x0 z5+ggNH4yCDSGNgPyRIzWONhzkuvniz9T00Ml8lD4D/nkFX64LX4xsrrdrUt0K+PitYv 0gzkDIzP6if46W9Pc/5rJB0emQjp747CaJZGbu7DaWZQEvuEQhVSgILwe/reEWBGlA/Q JsB51SPvXlpymScbvFrGC36PY6sk6IaTYn0xooDhnSrLNiM8tw06BcLId63kHR0mpELd wgSQ== X-Received: by 10.112.17.7 with SMTP id k7mr31285776lbd.9.1388617143419; Wed, 01 Jan 2014 14:59:03 -0800 (PST) Received: from [10.0.1.36] (h-18-119.a328.priv.bahnhof.se. [46.59.18.119]) by mx.google.com with ESMTPSA id qx1sm33140186lbb.15.2014.01.01.14.59.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 01 Jan 2014 14:59:02 -0800 (PST) From: Nick Barkas Content-Type: multipart/mixed; boundary="Apple-Mail=_A64F4D58-515F-4326-8E50-FCF37ED11C37" Subject: fix for security/openvpn-auth-ldap (PR: ports/175692) Message-Id: Date: Wed, 1 Jan 2014 23:58:59 +0100 To: freebsd-ports@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 7.1 \(1827\)) X-Mailer: Apple Mail (2.1827) X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jan 2014 22:59:06 -0000 --Apple-Mail=_A64F4D58-515F-4326-8E50-FCF37ED11C37 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 security/openvpn-auth-ldap has failed to build for some time due to a = minor change in the layout of the openvpn sources. I prepared a fix for = this but haven=92t yet found someone to commit it for me, and also made = it so the port can build on 9.x and later, along with a couple of other = small fixes. I=92d be grateful if a committer can commit the attached = patch. Thanks! --Apple-Mail=_A64F4D58-515F-4326-8E50-FCF37ED11C37 Content-Disposition: attachment; filename=openvpn-auth-ldap.patch Content-Type: application/octet-stream; name="openvpn-auth-ldap.patch" Content-Transfer-Encoding: 7bit Index: Makefile =================================================================== --- Makefile (revision 332654) +++ Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= openvpn-auth-ldap PORTVERSION= 2.0.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DISTNAME= auth-ldap-${PORTVERSION} @@ -18,25 +18,30 @@ USE_OPENLDAP= yes OPENVPN_WRKSRC= `cd ${PORTSDIR}/security/openvpn; make -V WRKSRC` CONFIGURE_ARGS+= --with-openldap=${LOCALBASE} \ - --with-openvpn=${OPENVPN_WRKSRC} + --with-openvpn=${OPENVPN_WRKSRC}/include \ + --with-objc-runtime=GNU PORTDOCS= README PORTEXAMPLES= auth-ldap.conf PLIST_FILES= lib/openvpn-auth-ldap.so NO_STAGE= yes -.include +OPTIONS_DEFINE= DOCS +.include + .if (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) || ${OSVERSION} < 800505 BUILD_DEPENDS+= ${LOCALBASE}/bin/xz:${PORTSDIR}/archivers/xz .endif .if ${OSVERSION} >= 900000 -BROKEN= does not configure on FreeBSD 9.X +# Use gcc from ports because Objective C support no longer included in base +USE_GCC= yes +CONFIGURE_ENV+= OBJC="${CC}" .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif @@ -45,4 +50,4 @@ ${INSTALL_DATA} ${WRKSRC}/auth-ldap.conf ${EXAMPLESDIR} .endif -.include +.include Index: files/patch-tests-Makefile.in =================================================================== --- files/patch-tests-Makefile.in (revision 0) +++ files/patch-tests-Makefile.in (working copy) @@ -0,0 +1,11 @@ +--- tests/Makefile.in.orig 2006-08-01 05:51:52.000000000 +0200 ++++ tests/Makefile.in 2013-06-09 06:33:07.000000000 +0200 +@@ -26,7 +26,7 @@ + CFLAGS+= @CHECK_CFLAGS@ -DTEST_DATA=\"${srcdir}/data\" + OBJCFLAGS+= @CHECK_CFLAGS@ -DTEST_DATA=\"${srcdir}/data\" + LIBS+= -lauth-ldap-testing $(OBJC_LIBS) $(LDAP_LIBS) @CHECK_LIBS@ +-LDFLAGS+= -L${top_builddir}src $(LIBS) ++LDFLAGS+= -L${top_builddir}/src $(LIBS) + + # Recompile the tests every time + all: tests Property changes on: files/patch-tests-Makefile.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property --Apple-Mail=_A64F4D58-515F-4326-8E50-FCF37ED11C37--