[Midnightbsd-cvs] mports [23011] trunk/security/gnupg1: gnupg 1.4.22
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Feb 17 16:22:25 EST 2018
Revision: 23011
http://svnweb.midnightbsd.org/mports/?rev=23011
Author: laffer1
Date: 2018-02-17 16:22:25 -0500 (Sat, 17 Feb 2018)
Log Message:
-----------
gnupg 1.4.22
Modified Paths:
--------------
trunk/security/gnupg1/Makefile
trunk/security/gnupg1/distinfo
Added Paths:
-----------
trunk/security/gnupg1/files/patch-doc_Makefile.in
trunk/security/gnupg1/files/patch-g10_Makefile.in
trunk/security/gnupg1/files/patch-mpi_config.links
trunk/security/gnupg1/files/patch-mpi_longlong.h
trunk/security/gnupg1/files/patch-security_gnupg1_files_patch-g10-trustdb.c
Removed Paths:
-------------
trunk/security/gnupg1/files/patch-config.links
trunk/security/gnupg1/files/patch-doc:Makefile.in
trunk/security/gnupg1/files/patch-g10-trustdb.c
trunk/security/gnupg1/files/patch-g10:Makefile.in
Modified: trunk/security/gnupg1/Makefile
===================================================================
--- trunk/security/gnupg1/Makefile 2018-02-17 19:25:03 UTC (rev 23010)
+++ trunk/security/gnupg1/Makefile 2018-02-17 21:22:25 UTC (rev 23011)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= gnupg
-PORTVERSION= 1.4.21
+PORTVERSION= 1.4.22
PORTREVISION= 0
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG}
Modified: trunk/security/gnupg1/distinfo
===================================================================
--- trunk/security/gnupg1/distinfo 2018-02-17 19:25:03 UTC (rev 23010)
+++ trunk/security/gnupg1/distinfo 2018-02-17 21:22:25 UTC (rev 23011)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1518764395
-SHA256 (gnupg-1.4.21.tar.bz2) = 6b47a3100c857dcab3c60e6152e56a997f2c7862c1b8b2b25adf3884a1ae2276
-SIZE (gnupg-1.4.21.tar.bz2) = 3689305
-SHA256 (gnupg-1.4.21.tar.bz2.sig) = 2836778a868cf45ba5c785221f447d34f841f5bb653fe2edf3a8dd88b486b26e
-SIZE (gnupg-1.4.21.tar.bz2.sig) = 287
+TIMESTAMP = 1518895536
+SHA256 (gnupg-1.4.22.tar.bz2) = 9594a24bec63a21568424242e3f198b9d9828dea5ff0c335e47b06f835f930b4
+SIZE (gnupg-1.4.22.tar.bz2) = 3746546
+SHA256 (gnupg-1.4.22.tar.bz2.sig) = 3e2267edca293131e3f65a0a21329e4399434e05e278f3c529f901c4c1dc440a
+SIZE (gnupg-1.4.22.tar.bz2.sig) = 620
Deleted: trunk/security/gnupg1/files/patch-config.links
===================================================================
--- trunk/security/gnupg1/files/patch-config.links 2018-02-17 19:25:03 UTC (rev 23010)
+++ trunk/security/gnupg1/files/patch-config.links 2018-02-17 21:22:25 UTC (rev 23011)
@@ -1,35 +0,0 @@
---- mpi/config.links.orig Thu Apr 24 20:15:58 2003
-+++ mpi/config.links Sat May 10 16:29:28 2003
-@@ -40,7 +40,7 @@
- ;;
- i[3467]86*-*-openbsd* | \
- i[3467]86*-*-freebsd*-elf | \
-- i[3467]86*-*-freebsd[3-9]* | \
-+ i[3467]86*-*-freebsd[1-9]* | \
- i[3467]86*-*-freebsdelf* | \
- i[3467]86*-*-netbsd* | \
- i[3467]86*-*-k*bsd*)
-@@ -142,6 +142,12 @@
- echo '/* configured for sparc64-*netbsd */' >>./mpi/asm-syntax.h
- path=""
- ;;
-+ sparc64-*-freebsd*)
-+ # There are no sparc64 assembler modules that work, so
-+ # just use generic C functions
-+ echo '/* configured for sparc64-*freebsd* */' >>./mpi/asm-syntax.h
-+ path=""
-+ ;;
- sparc9*-*-* | \
- sparc64*-*-* | \
- ultrasparc*-*-* )
-@@ -227,8 +227,8 @@
- path="powerpc32"
- ;;
-
-- powerpc*-*-netbsd* | powerpc*-*-openbsd*)
-- echo '/* configured for {Open,Net}BSD on powerpc */' >>./mpi/asm-syntax.h
-+ powerpc*-*-freebsd* | powerpc*-*-netbsd* | powerpc*-*-openbsd*)
-+ echo '/* configured for {Free,Open,Net}BSD on powerpc */' >>./mpi/asm-syntax.h
- echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
- cat $srcdir/mpi/powerpc32/syntax.h >>./mpi/asm-syntax.h
- mpi_sflags="-Wa,-mppc"
Deleted: trunk/security/gnupg1/files/patch-doc:Makefile.in
===================================================================
--- trunk/security/gnupg1/files/patch-doc:Makefile.in 2018-02-17 19:25:03 UTC (rev 23010)
+++ trunk/security/gnupg1/files/patch-doc:Makefile.in 2018-02-17 21:22:25 UTC (rev 23011)
@@ -1,40 +0,0 @@
---- doc/Makefile.in.orig 2015-02-27 17:37:51.000000000 +0900
-+++ doc/Makefile.in 2015-02-28 23:39:40.404690107 +0900
-@@ -77,7 +77,7 @@
- test $$has_opt = yes
- am__make_dryrun = (target_option=n; $(am__make_running_with_option))
- am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
--pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(datadir)/doc/gnupg1
- pkgincludedir = $(includedir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkglibexecdir = $(libexecdir)/@PACKAGE@
-@@ -422,7 +422,11 @@
-
- # 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 @@
- -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 @@
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
- done
-+endif
-
- uninstall-pkgdataDATA:
- @$(NORMAL_UNINSTALL)
Added: trunk/security/gnupg1/files/patch-doc_Makefile.in
===================================================================
--- trunk/security/gnupg1/files/patch-doc_Makefile.in (rev 0)
+++ trunk/security/gnupg1/files/patch-doc_Makefile.in 2018-02-17 21:22:25 UTC (rev 23011)
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orig 2015-12-20 07:53:15 UTC
++++ doc/Makefile.in
+@@ -77,7 +77,7 @@ am__make_running_with_option = \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+-pkgdatadir = $(datadir)/@PACKAGE@
++pkgdatadir = $(datadir)/doc/gnupg1
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkglibexecdir = $(libexecdir)/@PACKAGE@
Property changes on: trunk/security/gnupg1/files/patch-doc_Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/security/gnupg1/files/patch-g10-trustdb.c
===================================================================
--- trunk/security/gnupg1/files/patch-g10-trustdb.c 2018-02-17 19:25:03 UTC (rev 23010)
+++ trunk/security/gnupg1/files/patch-g10-trustdb.c 2018-02-17 21:22:25 UTC (rev 23011)
@@ -1,15 +0,0 @@
-Index: security/gnupg1/files/patch-g10-trustdb.c
-===================================================================
---- security/gnupg1/files/patch-g10-trustdb.c (revision 0)
-+++ security/gnupg1/files/patch-g10-trustdb.c (working copy)
-@@ -0,0 +1,10 @@
-+--- g10/trustdb.c.orig 2013-12-13 08:28:22.000000000 +0100
-++++ g10/trustdb.c 2014-05-17 19:47:21.125216457 +0200
-+@@ -927,6 +927,7 @@
-+ TRUSTREC rec;
-+ int rc;
-+
-++ init_trustdb();
-+ if (trustdb_args.no_trustdb && opt.trust_model == TM_ALWAYS)
-+ return 0;
-+
Deleted: trunk/security/gnupg1/files/patch-g10:Makefile.in
===================================================================
--- trunk/security/gnupg1/files/patch-g10:Makefile.in 2018-02-17 19:25:03 UTC (rev 23010)
+++ trunk/security/gnupg1/files/patch-g10:Makefile.in 2018-02-17 21:22:25 UTC (rev 23011)
@@ -1,40 +0,0 @@
---- g10/Makefile.in.orig 2015-02-27 17:37:51.000000000 +0900
-+++ g10/Makefile.in 2015-02-28 23:43:42.178420136 +0900
-@@ -79,7 +79,7 @@
- test $$has_opt = yes
- am__make_dryrun = (target_option=n; $(am__make_running_with_option))
- am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
--pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(datadir)/gnupg1
- pkgincludedir = $(includedir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkglibexecdir = $(libexecdir)/@PACKAGE@
-@@ -465,7 +465,11 @@
- @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 at bzip2_source =
- @ENABLE_BZIP2_SUPPORT_TRUE at bzip2_source = compress-bz2.c
- common_source = \
-@@ -731,6 +735,8 @@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(AM_V_CC at 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 @@
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
- done
-+endif
-
- uninstall-dist_pkgdataDATA:
- @$(NORMAL_UNINSTALL)
Added: trunk/security/gnupg1/files/patch-g10_Makefile.in
===================================================================
--- trunk/security/gnupg1/files/patch-g10_Makefile.in (rev 0)
+++ trunk/security/gnupg1/files/patch-g10_Makefile.in 2018-02-17 21:22:25 UTC (rev 23011)
@@ -0,0 +1,11 @@
+--- g10/Makefile.in.orig 2015-12-20 07:53:15 UTC
++++ g10/Makefile.in
+@@ -79,7 +79,7 @@ am__make_running_with_option = \
+ test $$has_opt = yes
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+-pkgdatadir = $(datadir)/@PACKAGE@
++pkgdatadir = $(datadir)/gnupg1
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkglibexecdir = $(libexecdir)/@PACKAGE@
Property changes on: trunk/security/gnupg1/files/patch-g10_Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/security/gnupg1/files/patch-mpi_config.links
===================================================================
--- trunk/security/gnupg1/files/patch-mpi_config.links (rev 0)
+++ trunk/security/gnupg1/files/patch-mpi_config.links 2018-02-17 21:22:25 UTC (rev 23011)
@@ -0,0 +1,35 @@
+--- mpi/config.links.orig 2015-12-19 14:08:22 UTC
++++ mpi/config.links
+@@ -40,7 +40,7 @@ case "${host}" in
+ ;;
+ i[3467]86*-*-openbsd* | \
+ i[3467]86*-*-freebsd*-elf | \
+- i[3467]86*-*-freebsd[3-9]* | \
++ i[3467]86*-*-freebsd[1-9]* | \
+ i[3467]86*-*-freebsdelf* | \
+ i[3467]86*-*-netbsd* | \
+ i[3467]86*-*-k*bsd*)
+@@ -141,6 +141,12 @@ case "${host}" in
+ echo '/* No working assembler modules available */' >>./mpi/asm-syntax.h
+ path=""
+ ;;
++ sparc64-*-freebsd*)
++ # There are no sparc64 assembler modules that work, so
++ # just use generic C functions
++ echo '/* configured for sparc64-*freebsd* */' >>./mpi/asm-syntax.h
++ path=""
++ ;;
+ sparc9*-*-* | \
+ ultrasparc*-*-* )
+ echo '/* configured for sparc9 or higher */' >>./mpi/asm-syntax.h
+@@ -230,8 +236,8 @@ case "${host}" in
+ path="powerpc32"
+ ;;
+
+- powerpc*-*-netbsd* | powerpc*-*-openbsd*)
+- echo '/* configured for {Open,Net}BSD on powerpc */' >>./mpi/asm-syntax.h
++ powerpc*-*-freebsd* | powerpc*-*-netbsd* | powerpc*-*-openbsd*)
++ echo '/* configured for {Free,Open,Net}BSD on powerpc */' >>./mpi/asm-syntax.h
+ echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
+ cat $srcdir/mpi/powerpc32/syntax.h >>./mpi/asm-syntax.h
+ mpi_sflags="-Wa,-mppc"
Property changes on: trunk/security/gnupg1/files/patch-mpi_config.links
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/security/gnupg1/files/patch-mpi_longlong.h
===================================================================
--- trunk/security/gnupg1/files/patch-mpi_longlong.h (rev 0)
+++ trunk/security/gnupg1/files/patch-mpi_longlong.h 2018-02-17 21:22:25 UTC (rev 23011)
@@ -0,0 +1,39 @@
+--- mpi/longlong.h.orig 2015-12-19 14:08:22 UTC
++++ mpi/longlong.h
+@@ -184,8 +184,8 @@ extern UDItype __udiv_qrnnd ();
+ #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+ __asm__ ("adds %1, %4, %5\n" \
+ "adc %0, %2, %3" \
+- : "=r" ((USItype)(sh)), \
+- "=&r" ((USItype)(sl)) \
++ : "=r" ((sh)), \
++ "=&r" ((sl)) \
+ : "%r" ((USItype)(ah)), \
+ "rI" ((USItype)(bh)), \
+ "%r" ((USItype)(al)), \
+@@ -193,8 +193,8 @@ extern UDItype __udiv_qrnnd ();
+ #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
+ __asm__ ("subs %1, %4, %5\n" \
+ "sbc %0, %2, %3" \
+- : "=r" ((USItype)(sh)), \
+- "=&r" ((USItype)(sl)) \
++ : "=r" ((sh)), \
++ "=&r" ((sl)) \
+ : "r" ((USItype)(ah)), \
+ "rI" ((USItype)(bh)), \
+ "r" ((USItype)(al)), \
+@@ -221,10 +221,10 @@ extern UDItype __udiv_qrnnd ();
+ : "r0", "r1", "r2")
+ #else
+ #define umul_ppmm(xh, xl, a, b) \
+- __asm__ ("%@ Inlined umul_ppmm\n" \
+- "umull %r1, %r0, %r2, %r3" \
+- : "=&r" ((USItype)(xh)), \
+- "=r" ((USItype)(xl)) \
++ __asm__ ( \
++ "umull %1, %0, %2, %3" \
++ : "=&r" ((xh)), \
++ "=r" ((xl)) \
+ : "r" ((USItype)(a)), \
+ "r" ((USItype)(b)) \
+ : "r0", "r1")
Property changes on: trunk/security/gnupg1/files/patch-mpi_longlong.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/security/gnupg1/files/patch-security_gnupg1_files_patch-g10-trustdb.c
===================================================================
--- trunk/security/gnupg1/files/patch-security_gnupg1_files_patch-g10-trustdb.c (rev 0)
+++ trunk/security/gnupg1/files/patch-security_gnupg1_files_patch-g10-trustdb.c 2018-02-17 21:22:25 UTC (rev 23011)
@@ -0,0 +1,15 @@
+Index: security/gnupg1/files/patch-g10-trustdb.c
+===================================================================
+--- security/gnupg1/files/patch-g10-trustdb.c.orig 2016-06-17 21:55:32 UTC
++++ security/gnupg1/files/patch-g10-trustdb.c
+@@ -0,0 +1,10 @@
++--- g10/trustdb.c.orig 2013-12-13 08:28:22.000000000 +0100
+++++ g10/trustdb.c
++@@ -927,6 +927,7 @@
++ TRUSTREC rec;
++ int rc;
++
+++ init_trustdb();
++ if (trustdb_args.no_trustdb && opt.trust_model == TM_ALWAYS)
++ return 0;
++
Property changes on: trunk/security/gnupg1/files/patch-security_gnupg1_files_patch-g10-trustdb.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list