pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
compat32_libgcrypt: Rename libgcrypt-32 to compat32_libgcrypt
- To: pkgsrc-wip-changes%NetBSD.org@localhost
- Subject: compat32_libgcrypt: Rename libgcrypt-32 to compat32_libgcrypt
- From: Naveen Narayanan <zerous@nocebo.space>
- Date: Tue, 23 Jul 2019 15:55:58 +0000
Module Name: pkgsrc-wip
Committed By: Naveen Narayanan <zerous@nocebo.space>
Pushed By: zerous
Date: Tue Jul 23 17:55:58 2019 +0200
Changeset: 19497f3741f43b0a02081b65803cc7a6d8fb1de0
Added Files:
compat32_libgcrypt/DESCR
compat32_libgcrypt/Makefile
compat32_libgcrypt/PLIST
compat32_libgcrypt/TODO
compat32_libgcrypt/buildlink3.mk
compat32_libgcrypt/distinfo
compat32_libgcrypt/hacks.mk
compat32_libgcrypt/options.mk
compat32_libgcrypt/patches/patch-aa
compat32_libgcrypt/patches/patch-cipher_camellia-aarch64.S
compat32_libgcrypt/patches/patch-cipher_rijndael-arm.S
compat32_libgcrypt/patches/patch-random_jitterentropy-base.c
compat32_libgcrypt/patches/patch-src_visibility.h
Removed Files:
libgcrypt-32/DESCR
libgcrypt-32/Makefile
libgcrypt-32/PLIST
libgcrypt-32/TODO
libgcrypt-32/buildlink3.mk
libgcrypt-32/distinfo
libgcrypt-32/hacks.mk
libgcrypt-32/options.mk
libgcrypt-32/patches/patch-aa
libgcrypt-32/patches/patch-cipher_camellia-aarch64.S
libgcrypt-32/patches/patch-cipher_rijndael-arm.S
libgcrypt-32/patches/patch-random_jitterentropy-base.c
libgcrypt-32/patches/patch-src_visibility.h
Log Message:
compat32_libgcrypt: Rename libgcrypt-32 to compat32_libgcrypt
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=19497f3741f43b0a02081b65803cc7a6d8fb1de0
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
compat32_libgcrypt/DESCR | 6 ++
compat32_libgcrypt/Makefile | 73 ++++++++++++++++++++++
compat32_libgcrypt/PLIST | 10 +++
compat32_libgcrypt/TODO | 54 ++++++++++++++++
compat32_libgcrypt/buildlink3.mk | 17 +++++
compat32_libgcrypt/distinfo | 11 ++++
compat32_libgcrypt/hacks.mk | 12 ++++
compat32_libgcrypt/options.mk | 26 ++++++++
compat32_libgcrypt/patches/patch-aa | 15 +++++
.../patches/patch-cipher_camellia-aarch64.S | 16 +++++
.../patches/patch-cipher_rijndael-arm.S | 15 +++++
.../patches/patch-random_jitterentropy-base.c | 26 ++++++++
compat32_libgcrypt/patches/patch-src_visibility.h | 28 +++++++++
libgcrypt-32/DESCR | 6 --
libgcrypt-32/Makefile | 73 ----------------------
libgcrypt-32/PLIST | 10 ---
libgcrypt-32/TODO | 54 ----------------
libgcrypt-32/buildlink3.mk | 17 -----
libgcrypt-32/distinfo | 11 ----
libgcrypt-32/hacks.mk | 12 ----
libgcrypt-32/options.mk | 26 --------
libgcrypt-32/patches/patch-aa | 15 -----
.../patches/patch-cipher_camellia-aarch64.S | 16 -----
libgcrypt-32/patches/patch-cipher_rijndael-arm.S | 15 -----
.../patches/patch-random_jitterentropy-base.c | 26 --------
libgcrypt-32/patches/patch-src_visibility.h | 28 ---------
26 files changed, 309 insertions(+), 309 deletions(-)
diffs:
diff --git a/compat32_libgcrypt/DESCR b/compat32_libgcrypt/DESCR
new file mode 100644
index 0000000000..db98ce8fa5
--- /dev/null
+++ b/compat32_libgcrypt/DESCR
@@ -0,0 +1,6 @@
+This is a general purpose cryptographic library based on the code from GnuPG.
+It provides functions for all cryptograhic building blocks: symmetric ciphers
+(AES, DES, Blowfish, CAST5, Twofish, Arcfour), hash algorithms (MD4, MD5,
+RIPE-MD160, SHA-1, TIGER-192), MACs (HMAC for all hash algorithms), public key
+algorithms (RSA, ElGamal, DSA), large integer functions, random numbers and a
+lot of supporting functions.
diff --git a/compat32_libgcrypt/Makefile b/compat32_libgcrypt/Makefile
new file mode 100644
index 0000000000..bef10bdfee
--- /dev/null
+++ b/compat32_libgcrypt/Makefile
@@ -0,0 +1,73 @@
+# $NetBSD: Makefile,v 1.96 2018/11/02 23:08:29 adam Exp $
+
+DISTNAME= libgcrypt-1.8.4
+CATEGORIES= security
+MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/libgcrypt/
+EXTRACT_SUFX= .tar.bz2
+ABI= 32
+CFLAGS+= -m32
+GNU_CONFIGURE_PREFIX= ${PREFIX}/emul/netbsd32/
+
+PKGNAME= compat${ABI}_${DISTNAME}
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= https://www.gnu.org/software/libgcrypt/
+COMMENT= GNU cryptographic library
+LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
+
+USE_LIBTOOL= yes
+GNU_CONFIGURE= yes
+
+TEST_TARGET= check
+
+TEXINFO_REQD= 4.0
+INFO_FILES= yes
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../mk/compiler.mk"
+
+.if empty(MACHINE_PLATFORM:MNetBSD-*-i386) && \
+ empty(MACHINE_PLATFORM:MNetBSD-*-alpha) && \
+ empty(MACHINE_PLATFORM:MNetBSD-*-sparc) && \
+ empty(MACHINE_PLATFORM:M*-*-hppa)
+CONFIGURE_ARGS+= --disable-asm
+.endif
+CONFIGURE_ARGS+= --disable-aesni-support
+
+.if !empty(MACHINE_PLATFORM:MLinux-*-i386) || \
+ !empty(MACHINE_PLATFORM:MSunOS-*-i386)
+CONFIGURE_ARGS+= --disable-pclmul-support
+.endif
+
+# SCO OpenServer 5.0.7/3.2 has no socklen_t, but it is defined in pthread.h
+# from builtin GNU pth.
+.if ${OS_VARIANT} == "SCOOSR5"
+CONFIGURE_ENV+= ac_cv_type_socklen_t=yes
+CONFIGURE_ENV+= gl_cv_socklen_t_equiv=int
+.endif
+
+.if !empty(PKGSRC_COMPILER:Mclang)
+CFLAGS+= -fheinous-gnu-extensions
+.endif
+
+.if (${MACHINE_ARCH} == "x86_64")
+. if !empty(CC_VERSION:Mgcc-4.[45].*)
+CONFIGURE_ARGS+= --disable-avx2-support
+CONFIGURE_ARGS+= --disable-avx-support
+CONFIGURE_ENV+= gcry_cv_gcc_inline_asm_avx=no
+. endif
+.endif
+
+SUBST_CLASSES+= rpath
+SUBST_FILES.rpath= src/libgcrypt-config.in
+SUBST_STAGE.rpath= pre-configure
+SUBST_MESSAGE.rpath= Fixing rpath flags
+SUBST_VARS.rpath= COMPILER_RPATH_FLAG
+
+.include "options.mk"
+
+BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.13
+
+.include "../../wip/compat32_libgpg-error/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/compat32_libgcrypt/PLIST b/compat32_libgcrypt/PLIST
new file mode 100644
index 0000000000..f67b7de566
--- /dev/null
+++ b/compat32_libgcrypt/PLIST
@@ -0,0 +1,10 @@
+@comment $NetBSD$
+emul/netbsd32/bin/dumpsexp
+emul/netbsd32/bin/hmac256
+emul/netbsd32/bin/libgcrypt-config
+emul/netbsd32/bin/mpicalc
+emul/netbsd32/include/gcrypt.h
+emul/netbsd32/info/gcrypt.info
+emul/netbsd32/lib/libgcrypt.la
+emul/netbsd32/man/man1/hmac256.1
+emul/netbsd32/share/aclocal/libgcrypt.m4
diff --git a/compat32_libgcrypt/TODO b/compat32_libgcrypt/TODO
new file mode 100644
index 0000000000..e8bf6018d0
--- /dev/null
+++ b/compat32_libgcrypt/TODO
@@ -0,0 +1,54 @@
+The build seems to fail early with:
+
+[...]
+ Libgcrypt v1.8.4 has been configured as follows:
+
+ Platform: NetBSD (x86_64--netbsd)
+ Hardware detection module: hwf-x86
+ Enabled cipher algorithms: arcfour blowfish cast5 des aes twofish
+ serpent rfc2268 seed camellia idea salsa20
+ gost28147 chacha20
+ Enabled digest algorithms: crc gostr3411-94 md4 md5 rmd160 sha1
+ sha256 sha512 sha3 tiger whirlpool stribog
+ blake2
+ Enabled kdf algorithms: s2k pkdf2 scrypt
+ Enabled pubkey algorithms: dsa elgamal rsa ecc
+ Random number generator: default
+ Try using jitter entropy: yes
+ Using linux capabilities: no
+ Try using Padlock crypto: no
+ Try using AES-NI crypto: no
+ Try using Intel PCLMUL: yes
+ Try using Intel SSE4.1: yes
+ Try using DRNG (RDRAND): yes
+ Try using Intel AVX: yes
+ Try using Intel AVX2: yes
+ Try using ARM NEON: n/a
+ Try using ARMv8 crypto: n/a
+
+=> Modifying libtool scripts to use pkgsrc libtool
+=> Modifying libtool scripts to use pkgsrc depcomp
+socklen=`/usr/bin/grep '^#define socklen_t' /tmp/pkgsrc/wip/libgcrypt-32/work/libgcrypt-1.8.4/config.h || true`; /bin/mv /tmp/pkgsrc/wip/libgcrypt-32/work/libgcrypt-1.8.4/src/gcrypt.h /tmp/pkgsrc/wip/libgcrypt-32/work/libgcrypt-1.8.4/src/gcrypt.h.old; /usr/bin/sed -e "s,^/\* socklen_t \*/,$socklen," /tmp/pkgsrc/wip/libgcrypt-32/work/libgcrypt-1.8.4/src/gcrypt.h.old > /tmp/pkgsrc/wip/libgcrypt-32/work/libgcrypt-1.8.4/src/gcrypt.h
+===> Building for compat32_libgcrypt-1.8.4
+--- all ---
+/usr/bin/make all-recursive
+--- all-recursive ---
+Making all in compat
+--- compat.lo ---
+/bin/sh ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I.. -I../src -I../src -I/usr/pkg/include -I/usr/pkg/include -I/usr/include -O2 -m32 -pipe -O2 -march=haswell -D_FORTIFY_SOURCE=2 -I/usr/pkg/include -I/usr/include -fvisibility=hidden -fno-delete-null-pointer-checks -Wall -MT compat.lo -MD -MP -MF .deps/compat.Tpo -c -o compat.lo compat.c
+libtool: compile: gcc -DHAVE_CONFIG_H -I. -I.. -I../src -I/tmp/pkgsrc/wip/libgcrypt-32/work/.buildlink/include -O2 -m32 -pipe -O2 -march=haswell -D_FORTIFY_SOURCE=2 -fvisibility=hidden -fno-delete-null-pointer-checks -Wall -MT compat.lo -MD -MP -MF .deps/compat.Tpo -c compat.c -fPIC -DPIC -o .libs/compat.o
+In file included from ../src/gcrypt-int.h:27:0,
+ from ../src/visibility.h:38,
+ from ../src/g10lib.h:39,
+ from compat.c:22:
+../src/gcrypt.h:30:10: fatal error: gpg-error.h: No such file or directory
+ #include <gpg-error.h>
+ ^~~~~~~~~~~~~
+compilation terminated.
+*** [compat.lo] Error code 1
+
+make[2]: stopped in /tmp/pkgsrc/wip/libgcrypt-32/work/libgcrypt-1.8.4/compat
+1 error
+[...]
+
+(Despice libgpg-error-1.36 is installed.)
diff --git a/compat32_libgcrypt/buildlink3.mk b/compat32_libgcrypt/buildlink3.mk
new file mode 100644
index 0000000000..95b5b98ec4
--- /dev/null
+++ b/compat32_libgcrypt/buildlink3.mk
@@ -0,0 +1,17 @@
+# $NetBSD: buildlink3.mk,v 1.18 2016/08/17 23:13:11 maya Exp $
+
+BUILDLINK_TREE+= compat32_libgcrypt
+
+.if !defined(COMPAT32_LIBGCRYPT_BUILDLINK3_MK)
+COMPAT32_LIBGCRYPT_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.compat32_libgcrypt+= compat32_libgcrypt>=1.2.0
+BUILDLINK_ABI_DEPENDS.compat32_libgcrypt+= compat32_libgcrypt>=1.6.0
+BUILDLINK_PKGSRCDIR.compat32_libgcrypt?= ../../wip/compat32_libgcrypt
+BUILDLINK_LIBDIRS.compat32_libgcrypt?= emul/netbsd32/lib
+
+
+.include "../../security/libgpg-error/buildlink3.mk"
+.endif # COMPAT32_LIBGCRYPT_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -compat32_libgcrypt
diff --git a/compat32_libgcrypt/distinfo b/compat32_libgcrypt/distinfo
new file mode 100644
index 0000000000..3c7f005c94
--- /dev/null
+++ b/compat32_libgcrypt/distinfo
@@ -0,0 +1,11 @@
+$NetBSD: distinfo,v 1.81 2019/01/09 14:19:26 martin Exp $
+
+SHA1 (libgcrypt-1.8.4.tar.bz2) = 4a8ef9db6922f3a31992aca5640b4198a69b58fc
+RMD160 (libgcrypt-1.8.4.tar.bz2) = 57a23952989b6a852d0654218206876c4a878087
+SHA512 (libgcrypt-1.8.4.tar.bz2) = b831fc337eb14806897e224b0d1e78d1f8e9db91dffa818a015a4aa104144e2d971e5a855904907ee2bb9990a9d526de32d6787e1cae98e28a65c3258b2b1ea1
+Size (libgcrypt-1.8.4.tar.bz2) = 2990108 bytes
+SHA1 (patch-aa) = 60b3f4453b217ed8879a2ffd8d485c0195ffb5f8
+SHA1 (patch-cipher_camellia-aarch64.S) = 3175085651b737e1339e34241b6107898e2cf4a7
+SHA1 (patch-cipher_rijndael-arm.S) = ef3cb7f481022440780eb48ae31cbfad0a3ec115
+SHA1 (patch-random_jitterentropy-base.c) = 5a14676aae7ad5d12f9f0bed366af5183aaf22ad
+SHA1 (patch-src_visibility.h) = 8cbbf6803ab34b4b7dda832aa8ee18247aa89518
diff --git a/compat32_libgcrypt/hacks.mk b/compat32_libgcrypt/hacks.mk
new file mode 100644
index 0000000000..4419a7bf18
--- /dev/null
+++ b/compat32_libgcrypt/hacks.mk
@@ -0,0 +1,12 @@
+# $NetBSD: hacks.mk,v 1.4 2008/03/26 20:09:43 tron Exp $
+
+# config.h #defines socklen_t if it is not defined, but libgcrypt does
+# not propogate this to the installed gcrypt.h, so packages using it
+# subsequently fail.
+#
+# hack around this by using the same #define (if present) in gcrypt.h.
+post-configure:
+ socklen=`${GREP} '^#define socklen_t' ${WRKSRC}/config.h || ${TRUE}`; \
+ ${MV} ${WRKSRC}/src/gcrypt.h ${WRKSRC}/src/gcrypt.h.old; \
+ ${SED} -e "s,^/\* socklen_t \*/,$$socklen," \
+ ${WRKSRC}/src/gcrypt.h.old > ${WRKSRC}/src/gcrypt.h
diff --git a/compat32_libgcrypt/options.mk b/compat32_libgcrypt/options.mk
new file mode 100644
index 0000000000..bb7fb562cb
--- /dev/null
+++ b/compat32_libgcrypt/options.mk
@@ -0,0 +1,26 @@
+# $NetBSD: options.mk,v 1.8 2013/04/21 14:44:53 wiz Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.libgcrypt
+PKG_SUPPORTED_OPTIONS=
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${MACHINE_ARCH} == "i386" && ${OPSYS} != "Darwin"
+. include "../../mk/compiler.mk"
+# GCC 3.x (at least 3.3.3 on NetBSD) fails to compile asm() call in
+# cipher/rijndael.c:do_padlock()
+. if empty(CC_VERSION:Mgcc-3.*)
+PKG_SUPPORTED_OPTIONS+= via-padlock
+# With GCC 4.1.3 on NetBSD, do_padlock() crashes with signal 11
+. if ${OPSYS} != "NetBSD"
+PKG_SUGGESTED_OPTIONS+= via-padlock
+. endif
+. endif
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if empty(PKG_OPTIONS:Mvia-padlock)
+# Disable VIA Padlock support.
+CONFIGURE_ARGS+= --disable-padlock-support
+.endif
diff --git a/compat32_libgcrypt/patches/patch-aa b/compat32_libgcrypt/patches/patch-aa
new file mode 100644
index 0000000000..f810a3ad23
--- /dev/null
+++ b/compat32_libgcrypt/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.9 2016/09/01 10:19:30 fhajny Exp $
+
+Add rpath to configure script.
+
+--- src/libgcrypt-config.in.orig 2008-08-19 17:20:04.000000000 +0200
++++ src/libgcrypt-config.in
+@@ -155,7 +155,7 @@ if test "$echo_libs" = "yes"; then
+
+ # Set up `libdirs'.
+ if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
+- libdirs="-L$libdir"
++ libdirs="-L$libdir @COMPILER_RPATH_FLAG@@libdir@"
+ fi
+
+ # Set up `libs_final'.
diff --git a/compat32_libgcrypt/patches/patch-cipher_camellia-aarch64.S b/compat32_libgcrypt/patches/patch-cipher_camellia-aarch64.S
new file mode 100644
index 0000000000..37b0724b99
--- /dev/null
+++ b/compat32_libgcrypt/patches/patch-cipher_camellia-aarch64.S
@@ -0,0 +1,16 @@
+$NetBSD: patch-cipher_camellia-aarch64.S,v 1.2 2019/01/09 14:19:26 martin Exp $
+
+Do not make _gcry_camellia_arm_tables global, to allow the assembler to
+resolve the symbol locally (avoids relocations that break the build).
+
+--- cipher/camellia-aarch64.S.orig 2017-11-23 19:16:58.000000000 +0100
++++ cipher/camellia-aarch64.S 2019-01-09 14:27:16.928019986 +0100
+@@ -284,7 +284,7 @@
+ .size _gcry_camellia_arm_decrypt_block,.-_gcry_camellia_arm_decrypt_block;
+
+ /* Encryption/Decryption tables */
+-.globl _gcry_camellia_arm_tables
++# .globl _gcry_camellia_arm_tables
+ .type _gcry_camellia_arm_tables,@object;
+ .balign 32
+ _gcry_camellia_arm_tables:
diff --git a/compat32_libgcrypt/patches/patch-cipher_rijndael-arm.S b/compat32_libgcrypt/patches/patch-cipher_rijndael-arm.S
new file mode 100644
index 0000000000..eb5999f2a0
--- /dev/null
+++ b/compat32_libgcrypt/patches/patch-cipher_rijndael-arm.S
@@ -0,0 +1,15 @@
+$NetBSD: patch-cipher_rijndael-arm.S,v 1.1 2016/07/02 13:24:17 wiz Exp $
+
+Fix ARM unaligned access problem.
+https://lists.gnupg.org/pipermail/gcrypt-devel/2016-June/003904.html
+
+--- cipher/rijndael-arm.S.orig 2016-03-23 11:59:34.000000000 +0000
++++ cipher/rijndael-arm.S
+@@ -19,6 +19,7 @@
+ */
+
+ #include <config.h>
++#undef __ARM_FEATURE_UNALIGNED
+
+ #if defined(__ARMEL__)
+ #ifdef HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS
diff --git a/compat32_libgcrypt/patches/patch-random_jitterentropy-base.c b/compat32_libgcrypt/patches/patch-random_jitterentropy-base.c
new file mode 100644
index 0000000000..fb8b99e4f2
--- /dev/null
+++ b/compat32_libgcrypt/patches/patch-random_jitterentropy-base.c
@@ -0,0 +1,26 @@
+$NetBSD: patch-random_jitterentropy-base.c,v 1.1 2018/05/11 19:20:11 kamil Exp $
+
+Port to Clang.
+
+--- random/jitterentropy-base.c.orig 2017-11-23 18:16:58.000000000 +0000
++++ random/jitterentropy-base.c
+@@ -50,13 +50,18 @@
+ */
+
+ #undef _FORTIFY_SOURCE
++
++#ifdef __clang__
++#pragma clang optimize off
++#else
+ #pragma GCC optimize ("O0")
++#endif
+
+ #include "jitterentropy.h"
+
+ #ifndef CONFIG_CRYPTO_CPU_JITTERENTROPY_STAT
+ /* only check optimization in a compilation for real work */
+- #ifdef __OPTIMIZE__
++ #if defined(__OPTIMIZE__) && !defined(__clang__)
+ #error "The CPU Jitter random number generator must not be compiled with optimizations. See documentation. Use the compiler switch -O0 for compiling jitterentropy-base.c."
+ #endif
+ #endif
diff --git a/compat32_libgcrypt/patches/patch-src_visibility.h b/compat32_libgcrypt/patches/patch-src_visibility.h
new file mode 100644
index 0000000000..5e3a4de4bc
--- /dev/null
+++ b/compat32_libgcrypt/patches/patch-src_visibility.h
@@ -0,0 +1,28 @@
+$NetBSD: patch-src_visibility.h,v 1.2 2014/08/21 19:55:26 wiz Exp $
+
+GCC on SCO OpenServer 5.0.7/3.2 does not support visibility.
+
+https://bugs.g10code.com/gnupg/issue1704
+
+--- src/visibility.h.orig 2014-01-29 09:48:38.000000000 +0000
++++ src/visibility.h
+@@ -26,7 +26,9 @@
+
+ /* Include the main header here so that public symbols are mapped to
+ the internal underscored ones. */
+-#ifdef _GCRY_INCLUDED_BY_VISIBILITY_C
++/* All available GCC for SCO OpenServer 5.0.7/3.2 does not support
++ visibility. */
++#if defined(_GCRY_INCLUDED_BY_VISIBILITY_C) || defined(_SCO_DS)
+ /* We need to redeclare the deprecated functions without the
+ deprecated attribute. */
+ # define GCRYPT_NO_DEPRECATED
+@@ -48,7 +50,7 @@ gcry_err_code_t gcry_md_get (gcry_md_hd_
+ NOTE: When adding new functions, please make sure to add them to
+ libgcrypt.vers and libgcrypt.def as well. */
+
+-#ifdef _GCRY_INCLUDED_BY_VISIBILITY_C
++#if defined(_GCRY_INCLUDED_BY_VISIBILITY_C) || defined(_SCO_DS)
+
+ /* A macro to flag a function as visible. */
+ #ifdef GCRY_USE_VISIBILITY
diff --git a/libgcrypt-32/DESCR b/libgcrypt-32/DESCR
deleted file mode 100644
index db98ce8fa5..0000000000
--- a/libgcrypt-32/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-This is a general purpose cryptographic library based on the code from GnuPG.
-It provides functions for all cryptograhic building blocks: symmetric ciphers
-(AES, DES, Blowfish, CAST5, Twofish, Arcfour), hash algorithms (MD4, MD5,
-RIPE-MD160, SHA-1, TIGER-192), MACs (HMAC for all hash algorithms), public key
-algorithms (RSA, ElGamal, DSA), large integer functions, random numbers and a
-lot of supporting functions.
diff --git a/libgcrypt-32/Makefile b/libgcrypt-32/Makefile
deleted file mode 100644
index 9426327afb..0000000000
--- a/libgcrypt-32/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-# $NetBSD: Makefile,v 1.96 2018/11/02 23:08:29 adam Exp $
-
-DISTNAME= libgcrypt-1.8.4
-CATEGORIES= security
-MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/libgcrypt/
-EXTRACT_SUFX= .tar.bz2
-ABI= 32
-CFLAGS+= -m32
-GNU_CONFIGURE_PREFIX= ${PREFIX}/emul/netbsd32/
-
-PKGNAME= compat${ABI}_${DISTNAME}
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://www.gnu.org/software/libgcrypt/
-COMMENT= GNU cryptographic library
-LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
-
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-
-TEST_TARGET= check
-
-TEXINFO_REQD= 4.0
-INFO_FILES= yes
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../mk/compiler.mk"
-
-.if empty(MACHINE_PLATFORM:MNetBSD-*-i386) && \
- empty(MACHINE_PLATFORM:MNetBSD-*-alpha) && \
- empty(MACHINE_PLATFORM:MNetBSD-*-sparc) && \
- empty(MACHINE_PLATFORM:M*-*-hppa)
-CONFIGURE_ARGS+= --disable-asm
-.endif
-CONFIGURE_ARGS+= --disable-aesni-support
-
-.if !empty(MACHINE_PLATFORM:MLinux-*-i386) || \
- !empty(MACHINE_PLATFORM:MSunOS-*-i386)
-CONFIGURE_ARGS+= --disable-pclmul-support
-.endif
-
-# SCO OpenServer 5.0.7/3.2 has no socklen_t, but it is defined in pthread.h
-# from builtin GNU pth.
-.if ${OS_VARIANT} == "SCOOSR5"
-CONFIGURE_ENV+= ac_cv_type_socklen_t=yes
-CONFIGURE_ENV+= gl_cv_socklen_t_equiv=int
-.endif
-
-.if !empty(PKGSRC_COMPILER:Mclang)
-CFLAGS+= -fheinous-gnu-extensions
-.endif
-
-.if (${MACHINE_ARCH} == "x86_64")
-. if !empty(CC_VERSION:Mgcc-4.[45].*)
-CONFIGURE_ARGS+= --disable-avx2-support
-CONFIGURE_ARGS+= --disable-avx-support
-CONFIGURE_ENV+= gcry_cv_gcc_inline_asm_avx=no
-. endif
-.endif
-
-SUBST_CLASSES+= rpath
-SUBST_FILES.rpath= src/libgcrypt-config.in
-SUBST_STAGE.rpath= pre-configure
-SUBST_MESSAGE.rpath= Fixing rpath flags
-SUBST_VARS.rpath= COMPILER_RPATH_FLAG
-
-.include "options.mk"
-
-BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.13
-
-.include "../../wip/libgpg-error-32/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/libgcrypt-32/PLIST b/libgcrypt-32/PLIST
deleted file mode 100644
index f67b7de566..0000000000
--- a/libgcrypt-32/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD$
-emul/netbsd32/bin/dumpsexp
-emul/netbsd32/bin/hmac256
-emul/netbsd32/bin/libgcrypt-config
-emul/netbsd32/bin/mpicalc
-emul/netbsd32/include/gcrypt.h
-emul/netbsd32/info/gcrypt.info
-emul/netbsd32/lib/libgcrypt.la
-emul/netbsd32/man/man1/hmac256.1
-emul/netbsd32/share/aclocal/libgcrypt.m4
diff --git a/libgcrypt-32/TODO b/libgcrypt-32/TODO
deleted file mode 100644
index e8bf6018d0..0000000000
--- a/libgcrypt-32/TODO
+++ /dev/null
@@ -1,54 +0,0 @@
-The build seems to fail early with:
-
-[...]
- Libgcrypt v1.8.4 has been configured as follows:
-
- Platform: NetBSD (x86_64--netbsd)
- Hardware detection module: hwf-x86
- Enabled cipher algorithms: arcfour blowfish cast5 des aes twofish
- serpent rfc2268 seed camellia idea salsa20
- gost28147 chacha20
- Enabled digest algorithms: crc gostr3411-94 md4 md5 rmd160 sha1
- sha256 sha512 sha3 tiger whirlpool stribog
- blake2
- Enabled kdf algorithms: s2k pkdf2 scrypt
- Enabled pubkey algorithms: dsa elgamal rsa ecc
- Random number generator: default
- Try using jitter entropy: yes
- Using linux capabilities: no
- Try using Padlock crypto: no
- Try using AES-NI crypto: no
- Try using Intel PCLMUL: yes
- Try using Intel SSE4.1: yes
- Try using DRNG (RDRAND): yes
- Try using Intel AVX: yes
- Try using Intel AVX2: yes
- Try using ARM NEON: n/a
- Try using ARMv8 crypto: n/a
-
-=> Modifying libtool scripts to use pkgsrc libtool
-=> Modifying libtool scripts to use pkgsrc depcomp
-socklen=`/usr/bin/grep '^#define socklen_t' /tmp/pkgsrc/wip/libgcrypt-32/work/libgcrypt-1.8.4/config.h || true`; /bin/mv /tmp/pkgsrc/wip/libgcrypt-32/work/libgcrypt-1.8.4/src/gcrypt.h /tmp/pkgsrc/wip/libgcrypt-32/work/libgcrypt-1.8.4/src/gcrypt.h.old; /usr/bin/sed -e "s,^/\* socklen_t \*/,$socklen," /tmp/pkgsrc/wip/libgcrypt-32/work/libgcrypt-1.8.4/src/gcrypt.h.old > /tmp/pkgsrc/wip/libgcrypt-32/work/libgcrypt-1.8.4/src/gcrypt.h
-===> Building for compat32_libgcrypt-1.8.4
---- all ---
-/usr/bin/make all-recursive
---- all-recursive ---
-Making all in compat
---- compat.lo ---
-/bin/sh ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I.. -I../src -I../src -I/usr/pkg/include -I/usr/pkg/include -I/usr/include -O2 -m32 -pipe -O2 -march=haswell -D_FORTIFY_SOURCE=2 -I/usr/pkg/include -I/usr/include -fvisibility=hidden -fno-delete-null-pointer-checks -Wall -MT compat.lo -MD -MP -MF .deps/compat.Tpo -c -o compat.lo compat.c
-libtool: compile: gcc -DHAVE_CONFIG_H -I. -I.. -I../src -I/tmp/pkgsrc/wip/libgcrypt-32/work/.buildlink/include -O2 -m32 -pipe -O2 -march=haswell -D_FORTIFY_SOURCE=2 -fvisibility=hidden -fno-delete-null-pointer-checks -Wall -MT compat.lo -MD -MP -MF .deps/compat.Tpo -c compat.c -fPIC -DPIC -o .libs/compat.o
-In file included from ../src/gcrypt-int.h:27:0,
- from ../src/visibility.h:38,
- from ../src/g10lib.h:39,
- from compat.c:22:
-../src/gcrypt.h:30:10: fatal error: gpg-error.h: No such file or directory
- #include <gpg-error.h>
- ^~~~~~~~~~~~~
-compilation terminated.
-*** [compat.lo] Error code 1
-
-make[2]: stopped in /tmp/pkgsrc/wip/libgcrypt-32/work/libgcrypt-1.8.4/compat
-1 error
-[...]
-
-(Despice libgpg-error-1.36 is installed.)
diff --git a/libgcrypt-32/buildlink3.mk b/libgcrypt-32/buildlink3.mk
deleted file mode 100644
index 1482157151..0000000000
--- a/libgcrypt-32/buildlink3.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.18 2016/08/17 23:13:11 maya Exp $
-
-BUILDLINK_TREE+= compat32_libgcrypt
-
-.if !defined(COMPAT32_LIBGCRYPT_BUILDLINK3_MK)
-COMPAT32_LIBGCRYPT_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.compat32_libgcrypt+= compat32_libgcrypt>=1.2.0
-BUILDLINK_ABI_DEPENDS.compat32_libgcrypt+= compat32_libgcrypt>=1.6.0
-BUILDLINK_PKGSRCDIR.compat32_libgcrypt?= ../../wip/libgcrypt-32
-BUILDLINK_LIBDIRS.compat32_libgcrypt?= emul/netbsd32/lib
-
-
-.include "../../security/libgpg-error/buildlink3.mk"
-.endif # COMPAT32_LIBGCRYPT_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -compat32_libgcrypt
diff --git a/libgcrypt-32/distinfo b/libgcrypt-32/distinfo
deleted file mode 100644
index 3c7f005c94..0000000000
--- a/libgcrypt-32/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.81 2019/01/09 14:19:26 martin Exp $
-
-SHA1 (libgcrypt-1.8.4.tar.bz2) = 4a8ef9db6922f3a31992aca5640b4198a69b58fc
-RMD160 (libgcrypt-1.8.4.tar.bz2) = 57a23952989b6a852d0654218206876c4a878087
-SHA512 (libgcrypt-1.8.4.tar.bz2) = b831fc337eb14806897e224b0d1e78d1f8e9db91dffa818a015a4aa104144e2d971e5a855904907ee2bb9990a9d526de32d6787e1cae98e28a65c3258b2b1ea1
-Size (libgcrypt-1.8.4.tar.bz2) = 2990108 bytes
-SHA1 (patch-aa) = 60b3f4453b217ed8879a2ffd8d485c0195ffb5f8
-SHA1 (patch-cipher_camellia-aarch64.S) = 3175085651b737e1339e34241b6107898e2cf4a7
-SHA1 (patch-cipher_rijndael-arm.S) = ef3cb7f481022440780eb48ae31cbfad0a3ec115
-SHA1 (patch-random_jitterentropy-base.c) = 5a14676aae7ad5d12f9f0bed366af5183aaf22ad
-SHA1 (patch-src_visibility.h) = 8cbbf6803ab34b4b7dda832aa8ee18247aa89518
diff --git a/libgcrypt-32/hacks.mk b/libgcrypt-32/hacks.mk
deleted file mode 100644
index 4419a7bf18..0000000000
--- a/libgcrypt-32/hacks.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: hacks.mk,v 1.4 2008/03/26 20:09:43 tron Exp $
-
-# config.h #defines socklen_t if it is not defined, but libgcrypt does
-# not propogate this to the installed gcrypt.h, so packages using it
-# subsequently fail.
-#
-# hack around this by using the same #define (if present) in gcrypt.h.
-post-configure:
- socklen=`${GREP} '^#define socklen_t' ${WRKSRC}/config.h || ${TRUE}`; \
- ${MV} ${WRKSRC}/src/gcrypt.h ${WRKSRC}/src/gcrypt.h.old; \
- ${SED} -e "s,^/\* socklen_t \*/,$$socklen," \
- ${WRKSRC}/src/gcrypt.h.old > ${WRKSRC}/src/gcrypt.h
diff --git a/libgcrypt-32/options.mk b/libgcrypt-32/options.mk
deleted file mode 100644
index bb7fb562cb..0000000000
--- a/libgcrypt-32/options.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: options.mk,v 1.8 2013/04/21 14:44:53 wiz Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.libgcrypt
-PKG_SUPPORTED_OPTIONS=
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${MACHINE_ARCH} == "i386" && ${OPSYS} != "Darwin"
-. include "../../mk/compiler.mk"
-# GCC 3.x (at least 3.3.3 on NetBSD) fails to compile asm() call in
-# cipher/rijndael.c:do_padlock()
-. if empty(CC_VERSION:Mgcc-3.*)
-PKG_SUPPORTED_OPTIONS+= via-padlock
-# With GCC 4.1.3 on NetBSD, do_padlock() crashes with signal 11
-. if ${OPSYS} != "NetBSD"
-PKG_SUGGESTED_OPTIONS+= via-padlock
-. endif
-. endif
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-.if empty(PKG_OPTIONS:Mvia-padlock)
-# Disable VIA Padlock support.
-CONFIGURE_ARGS+= --disable-padlock-support
-.endif
diff --git a/libgcrypt-32/patches/patch-aa b/libgcrypt-32/patches/patch-aa
deleted file mode 100644
index f810a3ad23..0000000000
--- a/libgcrypt-32/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2016/09/01 10:19:30 fhajny Exp $
-
-Add rpath to configure script.
-
---- src/libgcrypt-config.in.orig 2008-08-19 17:20:04.000000000 +0200
-+++ src/libgcrypt-config.in
-@@ -155,7 +155,7 @@ if test "$echo_libs" = "yes"; then
-
- # Set up `libdirs'.
- if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
-- libdirs="-L$libdir"
-+ libdirs="-L$libdir @COMPILER_RPATH_FLAG@@libdir@"
- fi
-
- # Set up `libs_final'.
diff --git a/libgcrypt-32/patches/patch-cipher_camellia-aarch64.S b/libgcrypt-32/patches/patch-cipher_camellia-aarch64.S
deleted file mode 100644
index 37b0724b99..0000000000
--- a/libgcrypt-32/patches/patch-cipher_camellia-aarch64.S
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-cipher_camellia-aarch64.S,v 1.2 2019/01/09 14:19:26 martin Exp $
-
-Do not make _gcry_camellia_arm_tables global, to allow the assembler to
-resolve the symbol locally (avoids relocations that break the build).
-
---- cipher/camellia-aarch64.S.orig 2017-11-23 19:16:58.000000000 +0100
-+++ cipher/camellia-aarch64.S 2019-01-09 14:27:16.928019986 +0100
-@@ -284,7 +284,7 @@
- .size _gcry_camellia_arm_decrypt_block,.-_gcry_camellia_arm_decrypt_block;
-
- /* Encryption/Decryption tables */
--.globl _gcry_camellia_arm_tables
-+# .globl _gcry_camellia_arm_tables
- .type _gcry_camellia_arm_tables,@object;
- .balign 32
- _gcry_camellia_arm_tables:
diff --git a/libgcrypt-32/patches/patch-cipher_rijndael-arm.S b/libgcrypt-32/patches/patch-cipher_rijndael-arm.S
deleted file mode 100644
index eb5999f2a0..0000000000
--- a/libgcrypt-32/patches/patch-cipher_rijndael-arm.S
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-cipher_rijndael-arm.S,v 1.1 2016/07/02 13:24:17 wiz Exp $
-
-Fix ARM unaligned access problem.
-https://lists.gnupg.org/pipermail/gcrypt-devel/2016-June/003904.html
-
---- cipher/rijndael-arm.S.orig 2016-03-23 11:59:34.000000000 +0000
-+++ cipher/rijndael-arm.S
-@@ -19,6 +19,7 @@
- */
-
- #include <config.h>
-+#undef __ARM_FEATURE_UNALIGNED
-
- #if defined(__ARMEL__)
- #ifdef HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS
diff --git a/libgcrypt-32/patches/patch-random_jitterentropy-base.c b/libgcrypt-32/patches/patch-random_jitterentropy-base.c
deleted file mode 100644
index fb8b99e4f2..0000000000
--- a/libgcrypt-32/patches/patch-random_jitterentropy-base.c
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-random_jitterentropy-base.c,v 1.1 2018/05/11 19:20:11 kamil Exp $
-
-Port to Clang.
-
---- random/jitterentropy-base.c.orig 2017-11-23 18:16:58.000000000 +0000
-+++ random/jitterentropy-base.c
-@@ -50,13 +50,18 @@
- */
-
- #undef _FORTIFY_SOURCE
-+
-+#ifdef __clang__
-+#pragma clang optimize off
-+#else
- #pragma GCC optimize ("O0")
-+#endif
-
- #include "jitterentropy.h"
-
- #ifndef CONFIG_CRYPTO_CPU_JITTERENTROPY_STAT
- /* only check optimization in a compilation for real work */
-- #ifdef __OPTIMIZE__
-+ #if defined(__OPTIMIZE__) && !defined(__clang__)
- #error "The CPU Jitter random number generator must not be compiled with optimizations. See documentation. Use the compiler switch -O0 for compiling jitterentropy-base.c."
- #endif
- #endif
diff --git a/libgcrypt-32/patches/patch-src_visibility.h b/libgcrypt-32/patches/patch-src_visibility.h
deleted file mode 100644
index 5e3a4de4bc..0000000000
--- a/libgcrypt-32/patches/patch-src_visibility.h
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-src_visibility.h,v 1.2 2014/08/21 19:55:26 wiz Exp $
-
-GCC on SCO OpenServer 5.0.7/3.2 does not support visibility.
-
-https://bugs.g10code.com/gnupg/issue1704
-
---- src/visibility.h.orig 2014-01-29 09:48:38.000000000 +0000
-+++ src/visibility.h
-@@ -26,7 +26,9 @@
-
- /* Include the main header here so that public symbols are mapped to
- the internal underscored ones. */
--#ifdef _GCRY_INCLUDED_BY_VISIBILITY_C
-+/* All available GCC for SCO OpenServer 5.0.7/3.2 does not support
-+ visibility. */
-+#if defined(_GCRY_INCLUDED_BY_VISIBILITY_C) || defined(_SCO_DS)
- /* We need to redeclare the deprecated functions without the
- deprecated attribute. */
- # define GCRYPT_NO_DEPRECATED
-@@ -48,7 +50,7 @@ gcry_err_code_t gcry_md_get (gcry_md_hd_
- NOTE: When adding new functions, please make sure to add them to
- libgcrypt.vers and libgcrypt.def as well. */
-
--#ifdef _GCRY_INCLUDED_BY_VISIBILITY_C
-+#if defined(_GCRY_INCLUDED_BY_VISIBILITY_C) || defined(_SCO_DS)
-
- /* A macro to flag a function as visible. */
- #ifdef GCRY_USE_VISIBILITY
Home |
Main Index |
Thread Index |
Old Index