Skip to content
Snippets Groups Projects
Verified Commit 1df9e87f authored by Simon Borek's avatar Simon Borek
Browse files

patches/packages: bump libgpg-error from 1.42 to 1.45: accepted

parent 69d6cba9
Branches
Tags
2 merge requests!569Turris OS 6.0 (HBK),!544Support and use SPE float instructions on Turris 1.x
Pipeline #102892 passed with stage
in 6 minutes and 55 seconds
From f860fbedeb7e1475ddfac5ac65fc728e550939a0 Mon Sep 17 00:00:00 2001
From: "W. Michael Petullo" <mike@flyn.org>
Date: Sun, 12 Dec 2021 14:15:20 -0600
Subject: [PATCH 1/2] libgpg-error: update to 1.43
Signed-off-by: W. Michael Petullo <mike@flyn.org>
(cherry picked from commit d6000af907b9f517f27deef8b303e3474ee63f37)
---
libs/libgpg-error/Makefile | 4 +--
.../patches/020-build-fix-generation.patch | 27 -------------------
2 files changed, 2 insertions(+), 29 deletions(-)
delete mode 100644 libs/libgpg-error/patches/020-build-fix-generation.patch
diff --git a/libs/libgpg-error/Makefile b/libs/libgpg-error/Makefile
index 00f8c6eb2..f9a98c175 100644
--- a/libs/libgpg-error/Makefile
+++ b/libs/libgpg-error/Makefile
@@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libgpg-error
-PKG_VERSION:=1.42
+PKG_VERSION:=1.43
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://mirrors.dotsrc.org/gcrypt/libgpg-error \
http://ring.ksc.gr.jp/archives/net/gnupg/libgpg-error \
https://www.gnupg.org/ftp/gcrypt/libgpg-error
-PKG_HASH:=fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23
+PKG_HASH:=a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=LGPL-2.1-or-later
diff --git a/libs/libgpg-error/patches/020-build-fix-generation.patch b/libs/libgpg-error/patches/020-build-fix-generation.patch
deleted file mode 100644
index ddbf02ca2..000000000
--- a/libs/libgpg-error/patches/020-build-fix-generation.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 33593864cd54143db594c4237bba41e14179061c Mon Sep 17 00:00:00 2001
-From: David Michael <fedora.dm0@gmail.com>
-Date: Fri, 26 Mar 2021 16:06:50 +0900
-Subject: [PATCH 1/2] build: Fix generation of lock-obj-pub.native.h for cross
- build.
-
-* src/gen-lock-obj.sh: Capture echo output with quotes.
-
---
-
-Fixes-commit: 99ae862a96a569724f49a604ebb7d3f6d2c2d374
-Signed-off-by: David Michael <fedora.dm0@gmail.com>
----
- src/gen-lock-obj.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/gen-lock-obj.sh
-+++ b/src/gen-lock-obj.sh
-@@ -38,7 +38,7 @@
- # AWK=gawk ./gen-lock-obj.sh
- #
-
--if test -n `echo -n`; then
-+if test -n "`echo -n`"; then
- ECHO_C='\c'
- ECHO_N=''
- else
--
2.37.1
From f99611149a10d3f23ef03110b13a0471de5a4d7d Mon Sep 17 00:00:00 2001
From: "W. Michael Petullo" <mike@flyn.org>
Date: Tue, 10 May 2022 14:49:18 -0500
Subject: [PATCH 2/2] libgpg-error: update to 1.45
Signed-off-by: W. Michael Petullo <mike@flyn.org>
(cherry picked from commit c4842bdd2081748dbb8d12dd8856e870f73a3108)
---
libs/libgpg-error/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libs/libgpg-error/Makefile b/libs/libgpg-error/Makefile
index f9a98c175..1db835715 100644
--- a/libs/libgpg-error/Makefile
+++ b/libs/libgpg-error/Makefile
@@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libgpg-error
-PKG_VERSION:=1.43
+PKG_VERSION:=1.45
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://mirrors.dotsrc.org/gcrypt/libgpg-error \
http://ring.ksc.gr.jp/archives/net/gnupg/libgpg-error \
https://www.gnupg.org/ftp/gcrypt/libgpg-error
-PKG_HASH:=a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf
+PKG_HASH:=570f8ee4fb4bff7b7495cff920c275002aea2147e9a1d220c068213267f80a26
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=LGPL-2.1-or-later
--
2.37.1
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment