Date: Sun, 30 Oct 2016 21:20:29 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424964 - in head/security/gnupg1: . files Message-ID: <201610302120.u9ULKTki033323@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Sun Oct 30 21:20:29 2016 New Revision: 424964 URL: https://svnweb.freebsd.org/changeset/ports/424964 Log: A number of simplifications and improvements. - Don't download the unusued signature - Use the standard ICONV knob instead of LIBICONV - Improve option descriptions and proper capitalization - Handle the SUID chmod in the plist instead of the Makefile - Simplify CFLAGS modification and skip the unnecessary -std=c89 addition - Don't patch docs installation out, just let pkg DTRT - Switch WWW to https No PORTREVISION bump because most of these changes are NOOPs, except the WWW change which isn't worth forcing a rebuild for. Modified: head/security/gnupg1/Makefile head/security/gnupg1/files/patch-doc_Makefile.in head/security/gnupg1/files/patch-g10_Makefile.in head/security/gnupg1/pkg-descr head/security/gnupg1/pkg-plist Modified: head/security/gnupg1/Makefile ============================================================================== --- head/security/gnupg1/Makefile Sun Oct 30 20:15:46 2016 (r424963) +++ head/security/gnupg1/Makefile Sun Oct 30 21:20:29 2016 (r424964) @@ -5,8 +5,6 @@ PORTVERSION= 1.4.21 CATEGORIES= security MASTER_SITES= GNUPG PKGNAMESUFFIX= 1 -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= adamw@FreeBSD.org COMMENT= The GNU Privacy Guard @@ -25,23 +23,22 @@ PORTDOCS= * TEST_TARGET= check -OPTIONS_DEFINE= CURL DOCS LDAP LIBICONV LIBUSB NLS SUID_GPG +OPTIONS_DEFINE= CURL DOCS LDAP ICONV LIBUSB NLS SUID_GPG OPTIONS_DEFAULT=CURL OPTIONS_SUB= yes -CURL_DESC= use libcurl for the keyserver interface +CURL_DESC= Use libcurl for the keyserver interface LDAP_DESC= LDAP keyserver interface -LIBICONV_DESC= use libiconv -LIBUSB_DESC= use libusb -SUID_GPG_DESC= install GPG with suid +LIBUSB_DESC= Support for USB smart cards +SUID_GPG_DESC= Install GPG setuid CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_CONFIGURE_WITH= libcurl=${LOCALBASE} # Work around a GnuPG configure buglet CURL_CONFIGURE_ENV= _libcurl_config=${LOCALBASE}/bin/curl-config -LIBICONV_USES= iconv -LIBICONV_CONFIGURE_ENABLE= gnupg-iconv +ICONV_USES= iconv +ICONV_CONFIGURE_ENABLE= gnupg-iconv LIBUSB_CONFIGURE_WITH= libusb=${LOCALBASE} @@ -51,13 +48,13 @@ LDAP_CONFIGURE_WITH= ldap=${LOCALBASE} NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls +SUID_GPG_PLIST_SUB= GPGMODE=4555 +SUID_GPG_PLIST_SUB_OFF= GPGMODE= + .include <bsd.port.options.mk> -.if ${CC} == "clang" || ${OSVERSION} >= 1000024 -CFLAGS:= ${CFLAGS:S/$/ -std=c89/} -.if (${ARCH} == "i386") -CFLAGS:= ${CFLAGS:S/$/ -fheinous-gnu-extensions/} -.endif +.if ${ARCH} == "i386" && (${CC} == "clang" || ${OSVERSION} >= 1000024) +CFLAGS+= -fheinous-gnu-extensions .endif post-install-DOCS-on: @@ -70,7 +67,4 @@ post-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor -post-install-SUID_GPG-on: - ${CHMOD} u+s ${STAGEDIR}${PREFIX}/bin/gpg - .include <bsd.port.mk> Modified: head/security/gnupg1/files/patch-doc_Makefile.in ============================================================================== --- head/security/gnupg1/files/patch-doc_Makefile.in Sun Oct 30 20:15:46 2016 (r424963) +++ head/security/gnupg1/files/patch-doc_Makefile.in Sun Oct 30 21:20:29 2016 (r424964) @@ -9,32 +9,3 @@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ -@@ -422,7 +422,11 @@ gnupg1_TEXINFOS = gnupg1.texi - - # Need this to avoid building of dvis with automake 1.4 - DVIS = -+ifdef NOPORTDOCS -+pkgdata_DATA = -+else - pkgdata_DATA = FAQ -+endif - - # we can't add gpg.texi gpgv.texi here because automake does not like them to - # be built files. -@@ -670,6 +674,8 @@ uninstall-man1: - -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) - install-pkgdataDATA: $(pkgdata_DATA) -+ifdef NOPORTDOCS -+else - @$(NORMAL_INSTALL) - @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ - if test -n "$$list"; then \ -@@ -684,6 +690,7 @@ install-pkgdataDATA: $(pkgdata_DATA) - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ - done -+endif - - uninstall-pkgdataDATA: - @$(NORMAL_UNINSTALL) Modified: head/security/gnupg1/files/patch-g10_Makefile.in ============================================================================== --- head/security/gnupg1/files/patch-g10_Makefile.in Sun Oct 30 20:15:46 2016 (r424963) +++ head/security/gnupg1/files/patch-g10_Makefile.in Sun Oct 30 21:20:29 2016 (r424964) @@ -9,32 +9,3 @@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ -@@ -465,7 +465,11 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I - @LIBUSB_CPPFLAGS@ $(am__append_1) - needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a - other_libs = $(LIBICONV) $(DNSLIBS) $(LIBINTL) $(CAPLIBS) -+ifdef NOPORTDOCS -+dist_pkgdata_DATA = -+else - dist_pkgdata_DATA = options.skel -+endif - @ENABLE_BZIP2_SUPPORT_FALSE@bzip2_source = - @ENABLE_BZIP2_SUPPORT_TRUE@bzip2_source = compress-bz2.c - common_source = \ -@@ -731,6 +735,8 @@ distclean-compile: - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - install-dist_pkgdataDATA: $(dist_pkgdata_DATA) -+ifdef NOPORTDOCS -+else - @$(NORMAL_INSTALL) - @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ - if test -n "$$list"; then \ -@@ -745,6 +751,7 @@ install-dist_pkgdataDATA: $(dist_pkgdata - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ - done -+endif - - uninstall-dist_pkgdataDATA: - @$(NORMAL_UNINSTALL) Modified: head/security/gnupg1/pkg-descr ============================================================================== --- head/security/gnupg1/pkg-descr Sun Oct 30 20:15:46 2016 (r424963) +++ head/security/gnupg1/pkg-descr Sun Oct 30 21:20:29 2016 (r424964) @@ -1,9 +1,6 @@ -GnuPG is a complete and free replacement for PGP. +GnuPG is a complete and free replacement for PGP. The security/gnupg +port is the modern 2.x branch with support for newer algorithms, but +the 1.x branch has few dependencies and is sufficient for most PGP +operations using common algorithms. -Because it does not use the patented IDEA algorithm, it can be used -without any restrictions. GnuPG is an RFC2440 (OpenPGP) compliant -application. - -WWW: http://www.gnupg.org/ - -kuriyama@FreeBSD.org +WWW: https://www.gnupg.org/ Modified: head/security/gnupg1/pkg-plist ============================================================================== --- head/security/gnupg1/pkg-plist Sun Oct 30 20:15:46 2016 (r424963) +++ head/security/gnupg1/pkg-plist Sun Oct 30 21:20:29 2016 (r424964) @@ -1,4 +1,4 @@ -bin/gpg +@(,,%%GPGMODE%%) bin/gpg bin/gpg-zip bin/gpgsplit bin/gpgv
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610302120.u9ULKTki033323>