Browse Source

Merge pull request #15595 from flyn-org/libgcrypt

Update libgpg-error and libgcrypt
lilik-openwrt-22.03
Rosen Penev 4 years ago
committed by GitHub
parent
commit
28087c7045
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 30 deletions
  1. +3
    -3
      libs/libgcrypt/Makefile
  2. +3
    -3
      libs/libgpg-error/Makefile
  3. +0
    -24
      libs/libgpg-error/patches/011-macos-compile-fix.patch

+ 3
- 3
libs/libgcrypt/Makefile View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libgcrypt PKG_NAME:=libgcrypt
PKG_VERSION:=1.8.7
PKG_RELEASE:=2
PKG_VERSION:=1.9.3
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://www.gnupg.org/ftp/gcrypt/libgcrypt/ PKG_SOURCE_URL:=https://www.gnupg.org/ftp/gcrypt/libgcrypt/
PKG_HASH:=03b70f028299561b7034b8966d7dd77ef16ed139c43440925fe8782561974748
PKG_HASH:=97ebe4f94e2f7e35b752194ce15a0f3c66324e0ff6af26659bbfb5ff2ec328fd
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_CPE_ID:=cpe:/a:gnupg:libgcrypt PKG_CPE_ID:=cpe:/a:gnupg:libgcrypt


+ 3
- 3
libs/libgpg-error/Makefile View File

@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libgpg-error PKG_NAME:=libgpg-error
PKG_VERSION:=1.39
PKG_RELEASE:=2
PKG_VERSION:=1.42
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://mirrors.dotsrc.org/gcrypt/libgpg-error \ PKG_SOURCE_URL:=https://mirrors.dotsrc.org/gcrypt/libgpg-error \
http://ring.ksc.gr.jp/archives/net/gnupg/libgpg-error \ http://ring.ksc.gr.jp/archives/net/gnupg/libgpg-error \
https://www.gnupg.org/ftp/gcrypt/libgpg-error https://www.gnupg.org/ftp/gcrypt/libgpg-error
PKG_HASH:=4a836edcae592094ef1c5a4834908f44986ab2b82e0824a0344b49df8cdb298f
PKG_HASH:=fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE:=LGPL-2.1-or-later


+ 0
- 24
libs/libgpg-error/patches/011-macos-compile-fix.patch View File

@ -1,24 +0,0 @@
--- a/src/gen-lock-obj.sh
+++ b/src/gen-lock-obj.sh
@@ -84,17 +84,16 @@ EOF
# USE_LONG_DOUBLE_FOR_ALIGNMENT
#
-echo -n "#define GPGRT_LOCK_INITIALIZER {$LOCK_ABI_VERSION,{{"
+printf "#define GPGRT_LOCK_INITIALIZER {$LOCK_ABI_VERSION,{{"
i=0
while test "$i" -lt $ac_mtx_size; do
if test "$i" -ne 0 -a "$(( $i % 8 ))" -eq 0; then
- echo ' \'
- echo -n " "
+ printf " %s\n " "\\"
fi
- echo -n '0'
+ printf '0'
if test "$i" -lt $(($ac_mtx_size - 1)); then
- echo -n ','
+ printf ','
fi
i=$(( i + 1 ))
done

Loading…
Cancel
Save