From e43d11f01d7bd33c87e5c54dcd2363a5432c60e9 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Mon, 18 Apr 2022 21:19:36 +0200 Subject: [PATCH] nettle: cleanup remove unnecessary install file clean up patches --- nettle/001-fix-dll-names.patch | 28 +++++++++++++++++++++ nettle/3.2-dlopen-test-msys-test.patch | 15 ------------ nettle/PKGBUILD | 16 ++++++------ nettle/nettle-2.6-msys2.patch | 34 -------------------------- nettle/nettle.install | 20 --------------- 5 files changed, 35 insertions(+), 78 deletions(-) create mode 100644 nettle/001-fix-dll-names.patch delete mode 100644 nettle/3.2-dlopen-test-msys-test.patch delete mode 100644 nettle/nettle-2.6-msys2.patch delete mode 100644 nettle/nettle.install diff --git a/nettle/001-fix-dll-names.patch b/nettle/001-fix-dll-names.patch new file mode 100644 index 00000000..8d0ba070 --- /dev/null +++ b/nettle/001-fix-dll-names.patch @@ -0,0 +1,28 @@ +--- nettle-3.7.3/configure.ac.orig 2021-06-06 22:06:29.000000000 +0200 ++++ nettle-3.7.3/configure.ac 2022-04-18 21:14:30.819409900 +0200 +@@ -666,8 +666,8 @@ + LIBHOGWEED_FORLINK='libhogweed-$(LIBHOGWEED_MAJOR).dll' + ;; + cygwin*) +- LIBNETTLE_FORLINK='cygnettle-$(LIBNETTLE_MAJOR).dll' +- LIBHOGWEED_FORLINK='cyghogweed-$(LIBHOGWEED_MAJOR).dll' ++ LIBNETTLE_FORLINK='msys-nettle-$(LIBNETTLE_MAJOR).dll' ++ LIBHOGWEED_FORLINK='msys-hogweed-$(LIBHOGWEED_MAJOR).dll' + ;; + esac + if test "x$cross_compiling" = xyes ; then +diff -aur nettle-3.2/testsuite/dlopen-test.c.orig nettle-3.2/testsuite/dlopen-test.c > ../3.2-dlopen-test-msys-test.patch +--- nettle-3.2/testsuite/dlopen-test.c.orig 2016-05-17 07:17:36.777183000 -0400 ++++ nettle-3.2/testsuite/dlopen-test.c 2016-05-17 07:18:23.983817400 -0400 +@@ -9,7 +9,11 @@ + main (int argc UNUSED, char **argv UNUSED) + { + #if HAVE_LIBDL ++ #ifdef __MSYS__ ++ void *handle = dlopen ("../msys-nettle-8.dll", RTLD_NOW); ++ #else + void *handle = dlopen ("../libnettle." SO_EXT, RTLD_NOW); ++ #endif + int (*get_version)(void); + if (!handle) + { diff --git a/nettle/3.2-dlopen-test-msys-test.patch b/nettle/3.2-dlopen-test-msys-test.patch deleted file mode 100644 index 2cbf2405..00000000 --- a/nettle/3.2-dlopen-test-msys-test.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -aur nettle-3.2/testsuite/dlopen-test.c.orig nettle-3.2/testsuite/dlopen-test.c > ../3.2-dlopen-test-msys-test.patch ---- nettle-3.2/testsuite/dlopen-test.c.orig 2016-05-17 07:17:36.777183000 -0400 -+++ nettle-3.2/testsuite/dlopen-test.c 2016-05-17 07:18:23.983817400 -0400 -@@ -9,7 +9,11 @@ - main (int argc UNUSED, char **argv UNUSED) - { - #if HAVE_LIBDL -+ #ifdef __MSYS__ -+ void *handle = dlopen ("../msys-nettle-8.dll", RTLD_NOW); -+ #else - void *handle = dlopen ("../libnettle." SO_EXT, RTLD_NOW); -+ #endif - int (*get_version)(void); - if (!handle) - { diff --git a/nettle/PKGBUILD b/nettle/PKGBUILD index 02764e7f..b17d3f33 100644 --- a/nettle/PKGBUILD +++ b/nettle/PKGBUILD @@ -2,7 +2,7 @@ pkgname=('nettle' 'libnettle' 'libhogweed' 'libnettle-devel') pkgver=3.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="A low-level cryptographic library" arch=('i686' 'x86_64') url="https://www.lysator.liu.se/~nisse/nettle/" @@ -11,28 +11,27 @@ groups=('net-utils') depends=('gmp') makedepends=('gmp-devel' 'autotools' 'gcc') source=(https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig} - nettle-2.6-msys2.patch - 3.2-dlopen-test-msys-test.patch) + 001-fix-dll-names.patch) validpgpkeys=('343C2FF0FBEE5EC2EDBEF399F3599FF828C67298') # Niels M├╢ller sha256sums=('661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0' 'SKIP' - '3c83eeb093ae056ba0a583d38ed171891509ab70e39057594ee8f30885db0d99' - 'a922cc88086f0f1af1aea5a40ead773c5cc97d6c55bd6870b574f62dde812a51') + 'b55a5b742e77215a8290d9adfd12378ff4b55a4e51285ac3662ac8ead9e4bfd3') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ${srcdir}/nettle-2.6-msys2.patch - patch -p1 -i ${srcdir}/3.2-dlopen-test-msys-test.patch + patch -p1 -i ${srcdir}/001-fix-dll-names.patch autoreconf -fi } build() { cd "${srcdir}/${pkgname}-${pkgver}" + + local CYGWIN_CHOST="${CHOST/-msys/-cygwin}" ./configure \ --prefix=/usr \ --libdir=/usr/lib \ - --build=${CHOST} \ + --build=${CYGWIN_CHOST} \ --enable-shared \ --enable-static \ --disable-assembler @@ -48,7 +47,6 @@ check() { package_nettle() { depends=('libnettle') - install=$pkgname.install mkdir -p ${pkgdir}/usr/bin cp -rf ${srcdir}/dest/usr/bin/*.exe ${pkgdir}/usr/bin/ diff --git a/nettle/nettle-2.6-msys2.patch b/nettle/nettle-2.6-msys2.patch deleted file mode 100644 index 4c26139b..00000000 --- a/nettle/nettle-2.6-msys2.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -Naur nettle-3.3-orig/aclocal.m4 nettle-3.3/aclocal.m4 ---- nettle-3.3-orig/aclocal.m4 2013-01-14 21:44:12.000000000 +0000 -+++ nettle-3.3/aclocal.m4 2013-04-24 18:30:00.456054700 +0000 -@@ -35,6 +35,7 @@ - # Could also use -fpic, depending on the number of symbol references - solaris*) CCPIC="-fPIC" ;; - cygwin*) CCPIC="" ;; -+ msys*) CCPIC="" ;; - mingw32*) CCPIC="" ;; - *) CCPIC="-fpic" ;; - esac -diff -Naur nettle-3.3-orig/configure.ac nettle-3.3/configure.ac ---- nettle-3.3-orig/configure.ac 2013-01-14 21:44:12.000000000 +0000 -+++ nettle-3.3/configure.ac 2013-04-24 18:33:10.252929700 +0000 -@@ -569,7 +569,7 @@ - W64_ABI=no - - case "$host_os" in -- mingw32*|cygwin*) -+ mingw32*|cygwin*|msys*) - # The actual DLLs, e.g. libnettle-$major-$minor.dll, are normally - # installed into the bin dir (or more exactly $libdir/../bin, for - # automake), while libnettle.dll.a, which is a stub file for -@@ -583,6 +583,10 @@ - LIBNETTLE_FORLINK='cygnettle-$(LIBNETTLE_MAJOR).dll' - LIBHOGWEED_FORLINK='cyghogweed-$(LIBHOGWEED_MAJOR).dll' - ;; -+ msys*) -+ LIBNETTLE_FORLINK='msys-nettle-$(LIBNETTLE_MAJOR).dll' -+ LIBHOGWEED_FORLINK='msys-hogweed-$(LIBHOGWEED_MAJOR).dll' -+ ;; - esac - if test "x$cross_compiling" = xyes ; then - case "$ABI" in diff --git a/nettle/nettle.install b/nettle/nettle.install deleted file mode 100644 index a0cd2f98..00000000 --- a/nettle/nettle.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist="nettle.info" - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -}