[Midnightbsd-cvs] mports [16431] trunk/security/libgcrypt: libgcrypt 1.6.1
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Aug 2 18:09:28 EDT 2014
Revision: 16431
http://svnweb.midnightbsd.org/mports/?rev=16431
Author: laffer1
Date: 2014-08-02 18:09:28 -0400 (Sat, 02 Aug 2014)
Log Message:
-----------
libgcrypt 1.6.1
Modified Paths:
--------------
trunk/security/libgcrypt/Makefile
trunk/security/libgcrypt/distinfo
trunk/security/libgcrypt/pkg-plist
Added Paths:
-----------
trunk/security/libgcrypt/files/patch-gcrypt.h.in
Removed Paths:
-------------
trunk/security/libgcrypt/files/patch-cipher-rijndael.c
trunk/security/libgcrypt/files/patch-ltmain.sh
trunk/security/libgcrypt/files/patch-mpi-longlong.h
Modified: trunk/security/libgcrypt/Makefile
===================================================================
--- trunk/security/libgcrypt/Makefile 2014-08-02 22:07:31 UTC (rev 16430)
+++ trunk/security/libgcrypt/Makefile 2014-08-02 22:09:28 UTC (rev 16431)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= libgcrypt
-PORTVERSION= 1.5.3
+PORTVERSION= 1.6.1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,7 +14,7 @@
BUILD_DEPENDS= libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error
RUN_DEPENDS= libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error
-USE_BZIP2= yes
+USES= tar:bzip2
USE_AUTOTOOLS= libtool
USE_CSTD= gnu89
GNU_CONFIGURE= yes
Modified: trunk/security/libgcrypt/distinfo
===================================================================
--- trunk/security/libgcrypt/distinfo 2014-08-02 22:07:31 UTC (rev 16430)
+++ trunk/security/libgcrypt/distinfo 2014-08-02 22:09:28 UTC (rev 16431)
@@ -1,2 +1,2 @@
-SHA256 (libgcrypt-1.5.3.tar.bz2) = bcf5334e7da352c45de6aec5d2084ce9a1d30029ff4a4a5da13f1848874759d1
-SIZE (libgcrypt-1.5.3.tar.bz2) = 1508530
+SHA256 (libgcrypt-1.6.1.tar.bz2) = a1c3efea69f8ffe769f488b300ce190eeeb0c30de24a53f1c1b6e4202fdc2070
+SIZE (libgcrypt-1.6.1.tar.bz2) = 2470885
Deleted: trunk/security/libgcrypt/files/patch-cipher-rijndael.c
===================================================================
--- trunk/security/libgcrypt/files/patch-cipher-rijndael.c 2014-08-02 22:07:31 UTC (rev 16430)
+++ trunk/security/libgcrypt/files/patch-cipher-rijndael.c 2014-08-02 22:09:28 UTC (rev 16431)
@@ -1,61 +0,0 @@
---- cipher/rijndael.c.orig 2011-02-22 15:57:59.000000000 +0100
-+++ cipher/rijndael.c 2011-07-26 08:38:07.000000000 +0200
-@@ -844,13 +844,13 @@ do_aesni_cfb (const RIJNDAEL_context *ct
- "movdqa 0x90(%%esi), %%xmm1\n\t"
- aesenc_xmm1_xmm0
- "movdqa 0xa0(%%esi), %%xmm1\n\t"
-- "cmp $10, %[rounds]\n\t"
-+ "cmpl $10, %[rounds]\n\t"
- "jz .Lenclast%=\n\t"
- aesenc_xmm1_xmm0
- "movdqa 0xb0(%%esi), %%xmm1\n\t"
- aesenc_xmm1_xmm0
- "movdqa 0xc0(%%esi), %%xmm1\n\t"
-- "cmp $12, %[rounds]\n\t"
-+ "cmpl $12, %[rounds]\n\t"
- "jz .Lenclast%=\n\t"
- aesenc_xmm1_xmm0
- "movdqa 0xd0(%%esi), %%xmm1\n\t"
-@@ -862,7 +862,7 @@ do_aesni_cfb (const RIJNDAEL_context *ct
- "movdqu %[src], %%xmm1\n\t" /* Save input. */
- "pxor %%xmm1, %%xmm0\n\t" /* xmm0 = input ^ IV */
-
-- "cmp $1, %[decrypt]\n\t"
-+ "cmpl $1, %[decrypt]\n\t"
- "jz .Ldecrypt_%=\n\t"
- "movdqa %%xmm0, %[iv]\n\t" /* [encrypt] Store IV. */
- "jmp .Lleave_%=\n"
-@@ -923,13 +923,13 @@ do_aesni_ctr (const RIJNDAEL_context *ct
- "movdqa 0x90(%%esi), %%xmm1\n\t"
- aesenc_xmm1_xmm0
- "movdqa 0xa0(%%esi), %%xmm1\n\t"
-- "cmp $10, %[rounds]\n\t"
-+ "cmpl $10, %[rounds]\n\t"
- "jz .Lenclast%=\n\t"
- aesenc_xmm1_xmm0
- "movdqa 0xb0(%%esi), %%xmm1\n\t"
- aesenc_xmm1_xmm0
- "movdqa 0xc0(%%esi), %%xmm1\n\t"
-- "cmp $12, %[rounds]\n\t"
-+ "cmpl $12, %[rounds]\n\t"
- "jz .Lenclast%=\n\t"
- aesenc_xmm1_xmm0
- "movdqa 0xd0(%%esi), %%xmm1\n\t"
-@@ -1050,7 +1050,7 @@ do_aesni_ctr_4 (const RIJNDAEL_context *
- aesenc_xmm1_xmm3
- aesenc_xmm1_xmm4
- "movdqa 0xa0(%%esi), %%xmm1\n\t"
-- "cmp $10, %[rounds]\n\t"
-+ "cmpl $10, %[rounds]\n\t"
- "jz .Lenclast%=\n\t"
- aesenc_xmm1_xmm0
- aesenc_xmm1_xmm2
-@@ -1062,7 +1062,7 @@ do_aesni_ctr_4 (const RIJNDAEL_context *
- aesenc_xmm1_xmm3
- aesenc_xmm1_xmm4
- "movdqa 0xc0(%%esi), %%xmm1\n\t"
-- "cmp $12, %[rounds]\n\t"
-+ "cmpl $12, %[rounds]\n\t"
- "jz .Lenclast%=\n\t"
- aesenc_xmm1_xmm0
- aesenc_xmm1_xmm2
Added: trunk/security/libgcrypt/files/patch-gcrypt.h.in
===================================================================
--- trunk/security/libgcrypt/files/patch-gcrypt.h.in (rev 0)
+++ trunk/security/libgcrypt/files/patch-gcrypt.h.in 2014-08-02 22:09:28 UTC (rev 16431)
@@ -0,0 +1,20 @@
+--- src/gcrypt.h.in-orig 2014-07-28 03:54:16.000000000 +0200
++++ src/gcrypt.h.in 2014-07-28 03:54:32.000000000 +0200
+@@ -508,7 +508,7 @@
+ GCRYMPI_FLAG_USER1 = 0x0100,/* User flag 1. */
+ GCRYMPI_FLAG_USER2 = 0x0200,/* User flag 2. */
+ GCRYMPI_FLAG_USER3 = 0x0400,/* User flag 3. */
+- GCRYMPI_FLAG_USER4 = 0x0800,/* User flag 4. */
++ GCRYMPI_FLAG_USER4 = 0x0800 /* User flag 4. */
+ };
+
+
+@@ -1345,7 +1345,7 @@
+ /* Flags used with the open function. */
+ enum gcry_mac_flags
+ {
+- GCRY_MAC_FLAG_SECURE = 1, /* Allocate all buffers in "secure" memory. */
++ GCRY_MAC_FLAG_SECURE = 1 /* Allocate all buffers in "secure" memory. */
+ };
+
+ /* Create a MAC handle for algorithm ALGO. FLAGS may be given as an bitwise OR
Deleted: trunk/security/libgcrypt/files/patch-ltmain.sh
===================================================================
--- trunk/security/libgcrypt/files/patch-ltmain.sh 2014-08-02 22:07:31 UTC (rev 16430)
+++ trunk/security/libgcrypt/files/patch-ltmain.sh 2014-08-02 22:09:28 UTC (rev 16431)
@@ -1,32 +0,0 @@
---- ltmain.sh Wed Jul 17 15:42:41 2002
-+++ ltmain.sh Wed Jul 17 15:47:36 2002
-@@ -2077,10 +2077,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- func_basename "$file"
- name="$func_basename_result"
- instname="$dir/$name"i
- func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-@@ -4560,8 +4562,16 @@
- continue
- ;;
-
-+ -pthread)
-+ compile_command="$compile_command %%PTHREAD_LIBS%%"
-+ finalize_command="$finalize_command %%PTHREAD_LIBS%%"
-+ compiler_flags="$compiler_flags %%PTHREAD_LIBS%%"
-+ continue;
-+ ;;
-+
- -module)
- module=yes
-+ build_old_libs=yes
- continue
- ;;
-
Deleted: trunk/security/libgcrypt/files/patch-mpi-longlong.h
===================================================================
--- trunk/security/libgcrypt/files/patch-mpi-longlong.h 2014-08-02 22:07:31 UTC (rev 16430)
+++ trunk/security/libgcrypt/files/patch-mpi-longlong.h 2014-08-02 22:09:28 UTC (rev 16431)
@@ -1,42 +0,0 @@
---- ./mpi/longlong.h.orig 2010-02-22 19:04:43.000000000 +0900
-+++ ./mpi/longlong.h 2010-11-01 18:25:34.000000000 +0900
-@@ -437,8 +437,8 @@
- #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
- __asm__ ("addl %5,%1\n" \
- "adcl %3,%0" \
-- : "=r" ((USItype)(sh)), \
-- "=&r" ((USItype)(sl)) \
-+ : "=r" (sh), \
-+ "=&r" (sl) \
- : "%0" ((USItype)(ah)), \
- "g" ((USItype)(bh)), \
- "%1" ((USItype)(al)), \
-@@ -446,22 +446,22 @@
- #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
- __asm__ ("subl %5,%1\n" \
- "sbbl %3,%0" \
-- : "=r" ((USItype)(sh)), \
-- "=&r" ((USItype)(sl)) \
-+ : "=r" (sh), \
-+ "=&r" (sl) \
- : "0" ((USItype)(ah)), \
- "g" ((USItype)(bh)), \
- "1" ((USItype)(al)), \
- "g" ((USItype)(bl)))
- #define umul_ppmm(w1, w0, u, v) \
- __asm__ ("mull %3" \
-- : "=a" ((USItype)(w0)), \
-- "=d" ((USItype)(w1)) \
-+ : "=a" (w0), \
-+ "=d" (w1) \
- : "%0" ((USItype)(u)), \
- "rm" ((USItype)(v)))
- #define udiv_qrnnd(q, r, n1, n0, d) \
- __asm__ ("divl %4" \
-- : "=a" ((USItype)(q)), \
-- "=d" ((USItype)(r)) \
-+ : "=a" (q), \
-+ "=d" (r) \
- : "0" ((USItype)(n0)), \
- "1" ((USItype)(n1)), \
- "rm" ((USItype)(d)))
Modified: trunk/security/libgcrypt/pkg-plist
===================================================================
--- trunk/security/libgcrypt/pkg-plist 2014-08-02 22:07:31 UTC (rev 16430)
+++ trunk/security/libgcrypt/pkg-plist 2014-08-02 22:09:28 UTC (rev 16431)
@@ -1,10 +1,10 @@
+bin/mpicalc
bin/dumpsexp
bin/hmac256
bin/libgcrypt-config
include/gcrypt.h
-include/gcrypt-module.h
-lib/libgcrypt.a
-lib/libgcrypt.la
lib/libgcrypt.so
-lib/libgcrypt.so.19
+lib/libgcrypt.so.20
+lib/libgcrypt.so.20.0.1
+man/man1/hmac256.1.gz
share/aclocal/libgcrypt.m4
More information about the Midnightbsd-cvs
mailing list