From owner-svn-ports-all@freebsd.org Fri Feb 2 23:30:35 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1B573ED2E2E; Fri, 2 Feb 2018 23:30:35 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C642086BE3; Fri, 2 Feb 2018 23:30:34 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A7AC3225C9; Fri, 2 Feb 2018 23:30:34 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w12NUYng075182; Fri, 2 Feb 2018 23:30:34 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w12NUYPR075180; Fri, 2 Feb 2018 23:30:34 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201802022330.w12NUYPR075180@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Fri, 2 Feb 2018 23:30:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460759 - in head/security: gpgme py-gpgme X-SVN-Group: ports-head X-SVN-Commit-Author: jhale X-SVN-Commit-Paths: in head/security: gpgme py-gpgme X-SVN-Commit-Revision: 460759 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Feb 2018 23:30:35 -0000 Author: jhale Date: Fri Feb 2 23:30:34 2018 New Revision: 460759 URL: https://svnweb.freebsd.org/changeset/ports/460759 Log: Add a TEST option to toggle in-build testing as it was causing trouble when the test build directory path length was longer than the maximum socket path length. A workaround to this problem is noted in the Makefile. [1] Prevent the GNUPG1 option and the TEST option from being enabled simultaneously since the tests mainly revolve around the programs supplied with GnuPG 2.x. Disable in-build tests for slave ports for now. Move the flavor logic for the python slave port into the slave port Makefile as it was not being evaluated correctly when in the master port Makefile. Reported by: tijl (via private mail) [1] Modified: head/security/gpgme/Makefile head/security/py-gpgme/Makefile Modified: head/security/gpgme/Makefile ============================================================================== --- head/security/gpgme/Makefile Fri Feb 2 23:26:14 2018 (r460758) +++ head/security/gpgme/Makefile Fri Feb 2 23:30:34 2018 (r460759) @@ -3,7 +3,7 @@ PORTNAME= gpgme PORTVERSION= 1.10.0 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= security MASTER_SITES= GNUPG/gpgme @@ -31,7 +31,7 @@ CONFIGURE_ARGS+=--enable-languages="cl" INFO= gpgme PORTDOCS= AUTHORS ChangeLog INSTALL NEWS README THANKS TODO -OPTIONS_DEFINE= DOCS UISERVER +OPTIONS_DEFINE= DOCS TEST UISERVER OPTIONS_SINGLE= GNUPG OPTIONS_SINGLE_GNUPG= GNUPG1 GNUPG2 OPTIONS_DEFAULT= GNUPG2 UISERVER @@ -44,16 +44,21 @@ GNUPG2_DESC= Build gpgme library for GnuPG 2.x GNUPG2_BUILD_DEPENDS= gpg2:security/gnupg GNUPG2_RUN_DEPENDS= gpg2:security/gnupg +# Tests may fail if the test directory path length surpasses the socket path +# length limitation of 104 characters. Due to the way gnupg creates sockets, +# the easiest way to overcome this is to create a /var/run/user/${UID} +# directory set with 700 permissions and owned by the effective user building +# the port. +TEST_CONFIGURE_ENABLE= g13-test gpg-test gpgconf-test gpgsm-test +TEST_PREVENTS= GNUPG1 +TEST_PREVENTS_MSG= TEST option is mainly designed for use with the GNUPG2 option + UISERVER_DESC= GnuPG UI server support UISERVER_CONFIGURE_ENABLE= fd-passing .endif .include -.if !exists(${LOCALBASE}/bin/gpgsm) -CONFIGURE_ARGS+= --disable-gpgsm-test -.endif - .if defined(SLAVEPORT) LIB_DEPENDS+= libgpgme.so:security/gpgme BUILD_WRKSRC= ${WRKSRC}/lang/${BINDING_NAME} @@ -82,11 +87,6 @@ USES+= python USE_PYTHON= py3kplist flavors CONFIGURE_ENV+= SWIG=${LOCALBASE}/bin/swig3.0 PLIST_SUB+= VERSION=${PORTVERSION} -. if ${FLAVOR:Upy27:Mpy2*} -CONFIGURE_ARGS+=--enable-languages="python2" -. else -CONFIGURE_ARGS+=--enable-languages="python3" -. endif . endif .endif @@ -100,7 +100,11 @@ post-patch: . endif .endif @${REINPLACE_CMD} -e 's|^clfilesdir.*|clfilesdir=$$\(libdir\)/common-lisp/gpgme|g' \ - ${WRKSRC}/lang/cl/Makefile.in + ${WRKSRC}/lang/cl/Makefile.in + @${REINPLACE_CMD} -e '/SUBDIRS/s|tests||' \ + ${WRKSRC}/lang/python/Makefile.in \ + ${WRKSRC}/lang/qt/Makefile.in + .if !defined(SLAVEPORT) post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/security/py-gpgme/Makefile ============================================================================== --- head/security/py-gpgme/Makefile Fri Feb 2 23:26:14 2018 (r460758) +++ head/security/py-gpgme/Makefile Fri Feb 2 23:30:34 2018 (r460759) @@ -12,6 +12,12 @@ SLAVEPORT= python BINDING_NAME= python PLIST= ${.CURDIR}/pkg-plist +.if ${FLAVOR:Upy27:Mpy2*} +CONFIGURE_ARGS+=--enable-languages="python2" +.else +CONFIGURE_ARGS+=--enable-languages="python3" +.endif + post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/site-packages/gpg/_gpgme.so