[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-304-g146369119
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-304-g146369119
|
From: Sébastien S. <ss...@us...> - 2021-11-19 09:11:28
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 146369119af2a0cd9c1ee7b92d9d10da38e0d999 (commit)
from 1ed492493fb9eed6131165fab0423b3265771580 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 146369119af2a0cd9c1ee7b92d9d10da38e0d999
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Nov 19 10:09:37 2021 +0100
[BUILDROOT] 2021.02: patches to fixed pcre downloading
-----------------------------------------------------------------------
Summary of changes:
.../410-package-pcre-bump-to-version-8.45.patch | 64 ++++++++++++++++++++++
.../411-package-pcre-fix-license-hash.patch | 30 ++++++++++
.../2021.02/412-package-pcre-fix-broken-URL.patch | 30 ++++++++++
patches/buildroot/2021.02/cleanup_buildroot.sh | 3 +
4 files changed, 127 insertions(+)
create mode 100644 patches/buildroot/2021.02/410-package-pcre-bump-to-version-8.45.patch
create mode 100644 patches/buildroot/2021.02/411-package-pcre-fix-license-hash.patch
create mode 100644 patches/buildroot/2021.02/412-package-pcre-fix-broken-URL.patch
diff --git a/patches/buildroot/2021.02/410-package-pcre-bump-to-version-8.45.patch b/patches/buildroot/2021.02/410-package-pcre-bump-to-version-8.45.patch
new file mode 100644
index 000000000..931447b73
--- /dev/null
+++ b/patches/buildroot/2021.02/410-package-pcre-bump-to-version-8.45.patch
@@ -0,0 +1,64 @@
+From 0e5a901d3141a3d7e477f0fb79e8f6a748f06449 Mon Sep 17 00:00:00 2001
+From: Francois Perrad <fp...@gm...>
+Date: Thu, 9 Sep 2021 10:35:36 +0200
+Subject: [PATCH 410/412] package/pcre: bump to version 8.45
+
+Signed-off-by: Francois Perrad <fra...@ga...>
+Signed-off-by: Peter Korsgaard <pe...@ko...>
+---
+ package/pcre/0002-Disable-C-unit-tests.patch | 8 ++++----
+ package/pcre/pcre.hash | 2 +-
+ package/pcre/pcre.mk | 2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/package/pcre/0002-Disable-C-unit-tests.patch b/package/pcre/0002-Disable-C-unit-tests.patch
+index c5c1a49f23..1c9f26eb2e 100644
+--- a/package/pcre/0002-Disable-C-unit-tests.patch
++++ b/package/pcre/0002-Disable-C-unit-tests.patch
+@@ -27,16 +27,16 @@ index 6d03912..2c42b3e 100644
+ @WITH_GCOV_TRUE@@WITH_PCRE_CPP_TRUE@am__append_25 = $(GCOV_CXXFLAGS)
+ @WITH_GCOV_TRUE@@WITH_PCRE_CPP_TRUE@am__append_26 = $(GCOV_LIBS)
+ @WITH_GCOV_TRUE@@WITH_PCRE_CPP_TRUE@am__append_27 = $(GCOV_LIBS)
+-@@ -362,9 +356,6 @@ libpcreposix_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+- @WITH_PCRE8_TRUE@am__EXEEXT_1 = pcregrep$(EXEEXT)
++@@ -190,9 +184,6 @@ libpcreposix_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
++ "$(DESTDIR)$(includedir)"
+ @WITH_REBUILD_CHARTABLES_TRUE@am__EXEEXT_2 = dftables$(EXEEXT)
+ @WITH_JIT_TRUE@am__EXEEXT_3 = pcre_jit_test$(EXEEXT)
+ -@WITH_PCRE_CPP_TRUE@am__EXEEXT_4 = pcrecpp_unittest$(EXEEXT) \
+ -@WITH_PCRE_CPP_TRUE@ pcre_scanner_unittest$(EXEEXT) \
+ -@WITH_PCRE_CPP_TRUE@ pcre_stringpiece_unittest$(EXEEXT)
+ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+- am__dftables_SOURCES_DIST = dftables.c
+- @WITH_REBUILD_CHARTABLES_TRUE@am_dftables_OBJECTS = \
++ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++ am__vpath_adj = case $$p in \
+ --
+ 2.7.3
+
+diff --git a/package/pcre/pcre.hash b/package/pcre/pcre.hash
+index 628d617353..a84d63e1bc 100644
+--- a/package/pcre/pcre.hash
++++ b/package/pcre/pcre.hash
+@@ -1,4 +1,4 @@
+ # Locally calculated after checking pgp signature
+-sha256 19108658b23b3ec5058edc9f66ac545ea19f9537234be1ec62b714c84399366d pcre-8.44.tar.bz2
++sha256 4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8 pcre-8.45.tar.bz2
+ # License files, locally calculated
+ sha256 0dd9c13864dbb9ee4d77a1557e96be29b2d719fb6584192ee36611aae264c4a3 LICENCE
+diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk
+index c8498b7acf..264eaa10c7 100644
+--- a/package/pcre/pcre.mk
++++ b/package/pcre/pcre.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-PCRE_VERSION = 8.44
++PCRE_VERSION = 8.45
+ PCRE_SITE = https://ftp.pcre.org/pub/pcre
+ PCRE_SOURCE = pcre-$(PCRE_VERSION).tar.bz2
+ PCRE_LICENSE = BSD-3-Clause
+--
+2.32.0
+
diff --git a/patches/buildroot/2021.02/411-package-pcre-fix-license-hash.patch b/patches/buildroot/2021.02/411-package-pcre-fix-license-hash.patch
new file mode 100644
index 000000000..670480332
--- /dev/null
+++ b/patches/buildroot/2021.02/411-package-pcre-fix-license-hash.patch
@@ -0,0 +1,30 @@
+From 495316758070f7859f974e0594928c5dbe6712de Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fon...@gm...>
+Date: Tue, 14 Sep 2021 07:40:37 +0200
+Subject: [PATCH 411/412] package/pcre: fix license hash
+
+Commit 0e5a901d3141a3d7e477f0fb79e8f6a748f06449 forgot to update license
+hash (updates in year and email)
+
+Fixes:
+ - http://autobuild.buildroot.org/results/045cd98a4067f1314deb66f52240d2db2000ec4d
+
+Signed-off-by: Fabrice Fontaine <fon...@gm...>
+Signed-off-by: Peter Korsgaard <pe...@ko...>
+---
+ package/pcre/pcre.hash | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/package/pcre/pcre.hash b/package/pcre/pcre.hash
+index a84d63e1bc..6150303e24 100644
+--- a/package/pcre/pcre.hash
++++ b/package/pcre/pcre.hash
+@@ -1,4 +1,4 @@
+ # Locally calculated after checking pgp signature
+ sha256 4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8 pcre-8.45.tar.bz2
+ # License files, locally calculated
+-sha256 0dd9c13864dbb9ee4d77a1557e96be29b2d719fb6584192ee36611aae264c4a3 LICENCE
++sha256 51b3dea44f63338b84b9c97b3d793826a8397309068cf9379a423216ab8ea5b2 LICENCE
+--
+2.32.0
+
diff --git a/patches/buildroot/2021.02/412-package-pcre-fix-broken-URL.patch b/patches/buildroot/2021.02/412-package-pcre-fix-broken-URL.patch
new file mode 100644
index 000000000..bcfc45493
--- /dev/null
+++ b/patches/buildroot/2021.02/412-package-pcre-fix-broken-URL.patch
@@ -0,0 +1,30 @@
+From ede473267ac3d00684a23a5280c74423e01977bf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Fri, 19 Nov 2021 09:53:34 +0100
+Subject: [PATCH 412/412] package/pcre: fix broken URL
+
+As stated on www.pcre.org:
+"Note that the former ftp.pcre.org FTP site is no longer available."
+
+Update _SITE URL to Sourceforge.
+---
+ package/pcre/pcre.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk
+index 264eaa10c7..c85f6717db 100644
+--- a/package/pcre/pcre.mk
++++ b/package/pcre/pcre.mk
+@@ -5,7 +5,7 @@
+ ################################################################################
+
+ PCRE_VERSION = 8.45
+-PCRE_SITE = https://ftp.pcre.org/pub/pcre
++PCRE_SITE = http://downloads.sourceforge.net/project/pcre/pcre/$(PCRE_VERSION)
+ PCRE_SOURCE = pcre-$(PCRE_VERSION).tar.bz2
+ PCRE_LICENSE = BSD-3-Clause
+ PCRE_LICENSE_FILES = LICENCE
+--
+2.32.0
+
diff --git a/patches/buildroot/2021.02/cleanup_buildroot.sh b/patches/buildroot/2021.02/cleanup_buildroot.sh
index 8d6e2bbaa..7e8220942 100755
--- a/patches/buildroot/2021.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2021.02/cleanup_buildroot.sh
@@ -90,6 +90,9 @@ rm -rf buildroot/package/openocd/openocd.mk
rm -rf buildroot/package/pci_debug/Config.in
rm -rf buildroot/package/pci_debug/pci_debug.hash
rm -rf buildroot/package/pci_debug/pci_debug.mk
+rm -rf buildroot/package/pcre/0002-Disable-C-unit-tests.patch
+rm -rf buildroot/package/pcre/pcre.hash
+rm -rf buildroot/package/pcre/pcre.mk
rm -rf buildroot/package/python-flask-socketio/Config.in
rm -rf buildroot/package/python-flask-socketio/python-flask-socketio.hash
rm -rf buildroot/package/python-flask-socketio/python-flask-socketio.mk
hooks/post-receive
--
armadeus
|