[ptxdist] [PATCH 1/9] bzip2: add upstream URL, switch to HTTPS

[ptxdist] [PATCH 1/9] bzip2: add upstream URL, switch to HTTPS

[Roland Hieber]

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 rules/bzip2.make | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rules/bzip2.make b/rules/bzip2.make
index b6eaa2d1957d..c8e8695a4703 100644
--- a/rules/bzip2.make
+++ b/rules/bzip2.make
@@ -19,7 +19,9 @@ BZIP2_VERSION	:= 1.0.6
 BZIP2_MD5	:= 00b516f4704d4a7cb50a1d97e6e8e15b
 BZIP2		:= bzip2-$(BZIP2_VERSION)
 BZIP2_SUFFIX	:= tar.gz
-BZIP2_URL	:= http://distfiles.gentoo.org/distfiles/$(BZIP2).$(BZIP2_SUFFIX)
+BZIP2_URL	:= \
+	https://sourceware.org/pub/bzip2/$(BZIP2).$(BZIP2_SUFFIX) \
+	https://distfiles.gentoo.org/distfiles/$(BZIP2).$(BZIP2_SUFFIX)
 BZIP2_SOURCE	:= $(SRCDIR)/$(BZIP2).$(BZIP2_SUFFIX)
 BZIP2_DIR	:= $(BUILDDIR)/$(BZIP2)
 BZIP2_LICENSE	:= bzip2-1.0.6
-- 
2.29.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 2/9] bzip2: add license files

[Roland Hieber]

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 rules/bzip2.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/bzip2.make b/rules/bzip2.make
index c8e8695a4703..4bf856e565c3 100644
--- a/rules/bzip2.make
+++ b/rules/bzip2.make
@@ -25,6 +25,7 @@ BZIP2_URL	:= \
 BZIP2_SOURCE	:= $(SRCDIR)/$(BZIP2).$(BZIP2_SUFFIX)
 BZIP2_DIR	:= $(BUILDDIR)/$(BZIP2)
 BZIP2_LICENSE	:= bzip2-1.0.6
+BZIP2_LICENSE_FILES	:= file://LICENSE;md5=ddeb76cd34e791893c0f539fdab879bb
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.29.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 3/9] bzip2: version bump 1.0.6 -> 1.0.8

[Roland Hieber]

Patch 0002 (CVE-2016-3189) was merged upstream in bzip2-1.0.7, remove
it. Unfuzz the other patch.

The copyright dates, the version number and the author's e-mail address
changed in LICENSE.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 ...recover-Fix-potential-use-after-free.patch | 23 -------------------
 patches/bzip2-1.0.6/series                    |  5 ----
 .../0001-fixup-Makefile.patch                 | 12 ++++------
 patches/bzip2-1.0.8/series                    |  4 ++++
 rules/bzip2.make                              |  6 ++---
 5 files changed, 12 insertions(+), 38 deletions(-)
 delete mode 100644 patches/bzip2-1.0.6/0002-bzip2recover-Fix-potential-use-after-free.patch
 delete mode 100644 patches/bzip2-1.0.6/series
 rename patches/{bzip2-1.0.6 => bzip2-1.0.8}/0001-fixup-Makefile.patch (96%)
 create mode 100644 patches/bzip2-1.0.8/series

diff --git a/patches/bzip2-1.0.6/0002-bzip2recover-Fix-potential-use-after-free.patch b/patches/bzip2-1.0.6/0002-bzip2recover-Fix-potential-use-after-free.patch
deleted file mode 100644
index d3ba2379a8e3..000000000000
--- a/patches/bzip2-1.0.6/0002-bzip2recover-Fix-potential-use-after-free.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Jakub Martisko <jamartis@redhat.com>
-Date: Wed, 30 Mar 2016 10:22:27 +0200
-Subject: [PATCH] bzip2recover: Fix potential use-after-free
-
-Origin: https://bugzilla.redhat.com/attachment.cgi?id=1169843&action=edit
-Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2016-3189
-Bug-Debian: https://bugs.debian.org/827744
----
- bzip2recover.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/bzip2recover.c b/bzip2recover.c
-index f9de0496abf1..252c1b79853d 100644
---- a/bzip2recover.c
-+++ b/bzip2recover.c
-@@ -457,6 +457,7 @@ Int32 main ( Int32 argc, Char** argv )
-             bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 );
-             bsPutUInt32 ( bsWr, blockCRC );
-             bsClose ( bsWr );
-+            outFile = NULL;
-          }
-          if (wrBlock >= rbCtr) break;
-          wrBlock++;
diff --git a/patches/bzip2-1.0.6/series b/patches/bzip2-1.0.6/series
deleted file mode 100644
index faf98db85308..000000000000
--- a/patches/bzip2-1.0.6/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-fixup-Makefile.patch
-0002-bzip2recover-Fix-potential-use-after-free.patch
-# b97444d53b93823526970708b2bbb965  - git-ptx-patches magic
diff --git a/patches/bzip2-1.0.6/0001-fixup-Makefile.patch b/patches/bzip2-1.0.8/0001-fixup-Makefile.patch
similarity index 96%
rename from patches/bzip2-1.0.6/0001-fixup-Makefile.patch
rename to patches/bzip2-1.0.8/0001-fixup-Makefile.patch
index 0e260213418e..af14b2d5436f 100644
--- a/patches/bzip2-1.0.6/0001-fixup-Makefile.patch
+++ b/patches/bzip2-1.0.8/0001-fixup-Makefile.patch
@@ -3,17 +3,15 @@
 Subject: [PATCH] fixup Makefile
 
 This patch fixes various problems in the makefile and disables compile
-time test. It was taken from Debinan.
+time test. It was taken from Debian.
 
 Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
 ---
-# 20091210 rsc: needs probably another look before going mainline
-
- Makefile |  134 ++++++++++++++++++++++++++++++++------------------------------
- 1 files changed, 69 insertions(+), 65 deletions(-)
+ Makefile | 134 ++++++++++++++++++++++++++++++++-------------------------------
+ 1 file changed, 69 insertions(+), 65 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 9754ddf286b1..8e6a46b63904 100644
+index f8a17722e1c3..d2c7e75ed744 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -12,6 +12,8 @@
@@ -203,5 +201,5 @@ @@ -69,73 +93,53 @@ test: bzip2
 -	rm -f manual.ps manual.html manual.pdf
 +	#rm -f manual.ps manual.html manual.pdf
  
- DISTNAME=bzip2-1.0.6
+ DISTNAME=bzip2-1.0.8
  dist: check manual
diff --git a/patches/bzip2-1.0.8/series b/patches/bzip2-1.0.8/series
new file mode 100644
index 000000000000..78ff345669b5
--- /dev/null
+++ b/patches/bzip2-1.0.8/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-fixup-Makefile.patch
+# cf8c416b9e8252c5e89375edfd4523b9  - git-ptx-patches magic
diff --git a/rules/bzip2.make b/rules/bzip2.make
index 4bf856e565c3..8247b24c1983 100644
--- a/rules/bzip2.make
+++ b/rules/bzip2.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_BZIP2) += bzip2
 #
 # Paths and names
 #
-BZIP2_VERSION	:= 1.0.6
-BZIP2_MD5	:= 00b516f4704d4a7cb50a1d97e6e8e15b
+BZIP2_VERSION	:= 1.0.8
+BZIP2_MD5	:= 67e051268d0c475ea773822f7500d0e5
 BZIP2		:= bzip2-$(BZIP2_VERSION)
 BZIP2_SUFFIX	:= tar.gz
 BZIP2_URL	:= \
@@ -25,7 +25,7 @@ BZIP2_URL	:= \
 BZIP2_SOURCE	:= $(SRCDIR)/$(BZIP2).$(BZIP2_SUFFIX)
 BZIP2_DIR	:= $(BUILDDIR)/$(BZIP2)
 BZIP2_LICENSE	:= bzip2-1.0.6
-BZIP2_LICENSE_FILES	:= file://LICENSE;md5=ddeb76cd34e791893c0f539fdab879bb
+BZIP2_LICENSE_FILES	:= file://LICENSE;md5=1e5cffe65fc786f83a11a4b225495c0b
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.29.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 4/9] libarchive: move to HTTPS URL

[Roland Hieber]

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 rules/libarchive.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/libarchive.make b/rules/libarchive.make
index 5d9081eb317c..b56ee7a4c4d6 100644
--- a/rules/libarchive.make
+++ b/rules/libarchive.make
@@ -18,7 +18,7 @@ LIBARCHIVE_VERSION	:= 3.3.2
 LIBARCHIVE_MD5		:= 4583bd6b2ebf7e0e8963d90879eb1b27
 LIBARCHIVE		:= libarchive-$(LIBARCHIVE_VERSION)
 LIBARCHIVE_SUFFIX	:= tar.gz
-LIBARCHIVE_URL		:= http://www.libarchive.org/downloads/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX)
+LIBARCHIVE_URL		:= https://www.libarchive.org/downloads/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX)
 LIBARCHIVE_SOURCE	:= $(SRCDIR)/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX)
 LIBARCHIVE_DIR		:= $(BUILDDIR)/$(LIBARCHIVE)
 LIBARCHIVE_LICENSE	:= BSD-2-Clause AND BSD-3-Clause
-- 
2.29.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 5/9] libarchive: add license files

[Roland Hieber]

The COPYING document also mentions that some files are in the public
domain.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 rules/libarchive.make | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rules/libarchive.make b/rules/libarchive.make
index b56ee7a4c4d6..13d61a1da314 100644
--- a/rules/libarchive.make
+++ b/rules/libarchive.make
@@ -21,7 +21,8 @@ LIBARCHIVE_SUFFIX	:= tar.gz
 LIBARCHIVE_URL		:= https://www.libarchive.org/downloads/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX)
 LIBARCHIVE_SOURCE	:= $(SRCDIR)/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX)
 LIBARCHIVE_DIR		:= $(BUILDDIR)/$(LIBARCHIVE)
-LIBARCHIVE_LICENSE	:= BSD-2-Clause AND BSD-3-Clause
+LIBARCHIVE_LICENSE	:= BSD-2-Clause AND BSD-3-Clause AND public_domain
+LIBARCHIVE_LICENSE_FILES	:= file://COPYING;md5=ed99aca006bc346974bb745a35336425
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.29.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 6/9] libarchive: version bump 3.3.2 -> 3.5.1

[Roland Hieber]

The COPYING file mentions some triple-licensed files, and updated the
copyright year.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 rules/libarchive.make | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/rules/libarchive.make b/rules/libarchive.make
index 13d61a1da314..6e9e0ff28ef3 100644
--- a/rules/libarchive.make
+++ b/rules/libarchive.make
@@ -14,15 +14,16 @@ PACKAGES-$(PTXCONF_LIBARCHIVE) += libarchive
 #
 # Paths and names
 #
-LIBARCHIVE_VERSION	:= 3.3.2
-LIBARCHIVE_MD5		:= 4583bd6b2ebf7e0e8963d90879eb1b27
+LIBARCHIVE_VERSION	:= 3.5.1
+LIBARCHIVE_MD5		:= c96040b75a14c8ba73238c284147e87f
 LIBARCHIVE		:= libarchive-$(LIBARCHIVE_VERSION)
 LIBARCHIVE_SUFFIX	:= tar.gz
 LIBARCHIVE_URL		:= https://www.libarchive.org/downloads/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX)
 LIBARCHIVE_SOURCE	:= $(SRCDIR)/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX)
 LIBARCHIVE_DIR		:= $(BUILDDIR)/$(LIBARCHIVE)
-LIBARCHIVE_LICENSE	:= BSD-2-Clause AND BSD-3-Clause AND public_domain
-LIBARCHIVE_LICENSE_FILES	:= file://COPYING;md5=ed99aca006bc346974bb745a35336425
+LIBARCHIVE_LICENSE	:= BSD-2-Clause AND BSD-3-Clause AND public_domain AND \
+			   (CC-0-1.0 OR OpenSSL OR Apache-2.0)
+LIBARCHIVE_LICENSE_FILES	:= file://COPYING;md5=d499814247adaee08d88080841cb5665
 
 # ----------------------------------------------------------------------------
 # Prepare
@@ -49,11 +50,14 @@ LIBARCHIVE_CONF_OPT	:= \
 	$(GLOBAL_LARGE_FILE_OPTION) \
 	--with-zlib \
 	--$(call ptx/wwo, PTXCONF_LIBARCHIVE_BZIP2)-bz2lib \
+	--without-libb2 \
 	--without-iconv \
 	--without-lz4 \
+	--without-zstd \
 	--$(call ptx/wwo, PTXCONF_LIBARCHIVE_LZMA)-lzma \
 	--without-lzo2 \
 	--without-cng \
+	--without-mbedtls \
 	--without-nettle \
 	--without-openssl \
 	--without-xml2 \
-- 
2.29.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 7/9] unzip: version bump 5.52 -> 6.00

[Roland Hieber]

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 rules/unzip.make | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/unzip.make b/rules/unzip.make
index 0967fa1a489d..f218f15eae8f 100644
--- a/rules/unzip.make
+++ b/rules/unzip.make
@@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_UNZIP) += unzip
 # Paths and names
 # (unzip is packaged a bit unusual way, that's why two version variables exist)
 #
-UNZIP_VERSION	:= 5.52
-UNZIP_MD5	:= 9d23919999d6eac9217d1f41472034a9
-UNZIP_AVERSION	:= 552
+UNZIP_VERSION	:= 6.00
+UNZIP_MD5	:= 62b490407489521db863b523a7f86375
+UNZIP_AVERSION	:= 60
 UNZIP_ARCHIVE	:= unzip$(UNZIP_AVERSION).tar.gz
 UNZIP		:= unzip-$(UNZIP_VERSION)
 UNZIP_URL	:= $(call ptx/mirror, SF, infozip/$(UNZIP_ARCHIVE))
-- 
2.29.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 8/9] sqlite: version bump 3.28 -> 3.35.5

[Roland Hieber]

Remove the remaining patch, the underlying problem was fixed upstream in
version 3.35.0, check-in e64ff2cce3c03ba2.

Link: https://www.sqlite.org/src/info/e64ff2cce3c03ba2
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 ...nfigure-make-disable-threadsafe-work.patch | 29 -------------------
 patches/sqlite-autoconf-3280000/autogen.sh    |  1 -
 patches/sqlite-autoconf-3280000/series        |  4 ---
 rules/host-sqlite.make                        |  1 +
 rules/sqlite.make                             |  7 +++--
 5 files changed, 5 insertions(+), 37 deletions(-)
 delete mode 100644 patches/sqlite-autoconf-3280000/0001-configure-make-disable-threadsafe-work.patch
 delete mode 120000 patches/sqlite-autoconf-3280000/autogen.sh
 delete mode 100644 patches/sqlite-autoconf-3280000/series

diff --git a/patches/sqlite-autoconf-3280000/0001-configure-make-disable-threadsafe-work.patch b/patches/sqlite-autoconf-3280000/0001-configure-make-disable-threadsafe-work.patch
deleted file mode 100644
index 1e3a641a72b6..000000000000
--- a/patches/sqlite-autoconf-3280000/0001-configure-make-disable-threadsafe-work.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Roland Hieber <rhi@pengutronix.de>
-Date: Tue, 9 Jul 2019 12:18:52 +0200
-Subject: [PATCH] configure: make --disable-threadsafe work
-
-SQLITE_THREADSAFE can be 0, 1 or 2, and if it is not defined, it
-is defined to 1 by default in sqlite3.c.
-
-_REENTRANT only needs to be defined or undefined according to
-https://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html#Feature-Test-Macros
-
-Forwarded: https://www.mail-archive.com/sqlite-users@mailinglists.sqlite.org/msg115812.html
-Signed-off-by: Roland Hieber <rhi@pengutronix.de>
----
- configure.ac | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index f0b70b96428c..3044077e93f6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -91,6 +91,8 @@ if test x"$enable_threadsafe" != "xno"; then
-   BUILD_CFLAGS="$BUILD_CFLAGS -D_REENTRANT=1 -DSQLITE_THREADSAFE=1"
-   AC_SEARCH_LIBS(pthread_create, pthread)
-   AC_SEARCH_LIBS(pthread_mutexattr_init, pthread)
-+else
-+  BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_THREADSAFE=0"
- fi
- #-----------------------------------------------------------------------
- 
diff --git a/patches/sqlite-autoconf-3280000/autogen.sh b/patches/sqlite-autoconf-3280000/autogen.sh
deleted file mode 120000
index 9f8a4cb7ddcb..000000000000
--- a/patches/sqlite-autoconf-3280000/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/sqlite-autoconf-3280000/series b/patches/sqlite-autoconf-3280000/series
deleted file mode 100644
index 516ce59bdbad..000000000000
--- a/patches/sqlite-autoconf-3280000/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-configure-make-disable-threadsafe-work.patch
-# 7c01923b9908ba74dacfdb9f965dc010  - git-ptx-patches magic
diff --git a/rules/host-sqlite.make b/rules/host-sqlite.make
index 0a32adc0cf07..8fc54861b52c 100644
--- a/rules/host-sqlite.make
+++ b/rules/host-sqlite.make
@@ -41,6 +41,7 @@ HOST_SQLITE_CONF_OPT	:= \
 	--disable-readline \
 	--enable-threadsafe \
 	--disable-dynamic-extensions \
+	--disable-math \
 	--disable-fts5 \
 	--enable-json1 \
 	--disable-session \
diff --git a/rules/sqlite.make b/rules/sqlite.make
index 67a66a3718f1..eb866118accc 100644
--- a/rules/sqlite.make
+++ b/rules/sqlite.make
@@ -19,11 +19,11 @@ PACKAGES-$(PTXCONF_SQLITE) += sqlite
 #
 # Paths and names
 #
-SQLITE_VERSION	:= 3280000
-SQLITE_MD5	:= 3c68eb400f8354605736cd55400e1572
+SQLITE_VERSION	:= 3350500
+SQLITE_MD5	:= d1d1aba394c8e0443077dc9f1a681bb8
 SQLITE		:= sqlite-autoconf-$(SQLITE_VERSION)
 SQLITE_SUFFIX	:= tar.gz
-SQLITE_URL	:= https://www.sqlite.org/2019/$(SQLITE).$(SQLITE_SUFFIX)
+SQLITE_URL	:= https://www.sqlite.org/2021/$(SQLITE).$(SQLITE_SUFFIX)
 SQLITE_SOURCE	:= $(SRCDIR)/$(SQLITE).$(SQLITE_SUFFIX)
 SQLITE_DIR	:= $(BUILDDIR)/$(SQLITE)
 SQLITE_LICENSE	:= public_domain
@@ -58,6 +58,7 @@ SQLITE_CONF_OPT		:= \
 	--$(call ptx/endis,PTXCONF_SQLITE_READLINE)-readline \
 	--$(call ptx/endis,PTXCONF_SQLITE_THREADSAFE)-threadsafe \
 	--$(call ptx/endis,PTXCONF_SQLITE_LOAD_EXTENSION)-dynamic-extensions \
+	--disable-math \
 	--enable-fts4 \
 	--enable-fts3 \
 	--disable-fts5 \
-- 
2.29.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 9/9] dhcp: move to HTTPS URL

[Roland Hieber]

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 rules/dhcp.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/dhcp.make b/rules/dhcp.make
index e131d3e9fe96..5452f4676adc 100644
--- a/rules/dhcp.make
+++ b/rules/dhcp.make
@@ -21,8 +21,8 @@ DHCP_MD5	:= 23bc6016297aa831dc9f321403e30ddc
 DHCP		:= dhcp-$(DHCP_VERSION)
 DHCP_SUFFIX	:= tar.gz
 DHCP_URL	:= \
-	http://ftp.isc.org/isc/dhcp/$(DHCP).$(DHCP_SUFFIX) \
-	http://ftp.isc.org/isc/dhcp/dhcp-4.1-history/$(DHCP).$(DHCP_SUFFIX)
+	https://ftp.isc.org/isc/dhcp/$(DHCP).$(DHCP_SUFFIX) \
+	https://ftp.isc.org/isc/dhcp/dhcp-4.1-history/$(DHCP).$(DHCP_SUFFIX)
 DHCP_SOURCE	:= $(SRCDIR)/$(DHCP).$(DHCP_SUFFIX)
 DHCP_DIR	:= $(BUILDDIR)/$(DHCP)
 DHCP_LICENSE	:= ISC
-- 
2.29.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 7/9] unzip: version bump 5.52 -> 6.00

[Michael Olbrich]

On Sun, May 16, 2021 at 08:52:30PM +0200, Roland Hieber wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>

ptxdist: error:

checksum of license file '..../build-target/unzip-6.00/LICENSE'
changed: 28dcc51d0d279f531e4be676efb0071f -> 94caec5a51ef55ef711ee4e8b1c69e29

Michael

> ---
>  rules/unzip.make | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/rules/unzip.make b/rules/unzip.make
> index 0967fa1a489d..f218f15eae8f 100644
> --- a/rules/unzip.make
> +++ b/rules/unzip.make
> @@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_UNZIP) += unzip
>  # Paths and names
>  # (unzip is packaged a bit unusual way, that's why two version variables exist)
>  #
> -UNZIP_VERSION	:= 5.52
> -UNZIP_MD5	:= 9d23919999d6eac9217d1f41472034a9
> -UNZIP_AVERSION	:= 552
> +UNZIP_VERSION	:= 6.00
> +UNZIP_MD5	:= 62b490407489521db863b523a7f86375
> +UNZIP_AVERSION	:= 60
>  UNZIP_ARCHIVE	:= unzip$(UNZIP_AVERSION).tar.gz
>  UNZIP		:= unzip-$(UNZIP_VERSION)
>  UNZIP_URL	:= $(call ptx/mirror, SF, infozip/$(UNZIP_ARCHIVE))
> -- 
> 2.29.2
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 7/9] unzip: version bump 5.52 -> 6.00

[Roland Hieber]

On Fri, May 21, 2021 at 11:35:43AM +0200, Michael Olbrich wrote:
> On Sun, May 16, 2021 at 08:52:30PM +0200, Roland Hieber wrote:
> > Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> 
> ptxdist: error:
> 
> checksum of license file '..../build-target/unzip-6.00/LICENSE'
> changed: 28dcc51d0d279f531e4be676efb0071f -> 94caec5a51ef55ef711ee4e8b1c69e29

Huh, strange, but right. Sent v2 in 
<https://lore.ptxdist.org/ptxdist/20210524183500.32170-1-rhi@pengutronix.de>.

 - Roland

> 
> Michael
> 
> > ---
> >  rules/unzip.make | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/rules/unzip.make b/rules/unzip.make
> > index 0967fa1a489d..f218f15eae8f 100644
> > --- a/rules/unzip.make
> > +++ b/rules/unzip.make
> > @@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_UNZIP) += unzip
> >  # Paths and names
> >  # (unzip is packaged a bit unusual way, that's why two version variables exist)
> >  #
> > -UNZIP_VERSION	:= 5.52
> > -UNZIP_MD5	:= 9d23919999d6eac9217d1f41472034a9
> > -UNZIP_AVERSION	:= 552
> > +UNZIP_VERSION	:= 6.00
> > +UNZIP_MD5	:= 62b490407489521db863b523a7f86375
> > +UNZIP_AVERSION	:= 60
> >  UNZIP_ARCHIVE	:= unzip$(UNZIP_AVERSION).tar.gz
> >  UNZIP		:= unzip-$(UNZIP_VERSION)
> >  UNZIP_URL	:= $(call ptx/mirror, SF, infozip/$(UNZIP_ARCHIVE))
> > -- 
> > 2.29.2
> > 
> > 
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de
> > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> > 
> 
> -- 
> Pengutronix e.K.                           |                             |
> Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
> 31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Roland Hieber, Pengutronix e.K.          | r.hieber@pengutronix.de     |
Steuerwalder Str. 21                     | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686         | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] bzip2: add upstream URL, switch to HTTPS

[Michael Olbrich]

Thanks, applied as a59f538632347d04d1cac96385dce221e77bf100.

Michael

[sent from post-receive hook]

On Thu, 27 May 2021 08:45:36 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20210516185231.5680-1-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/bzip2.make b/rules/bzip2.make
> index b6eaa2d1957d..c8e8695a4703 100644
> --- a/rules/bzip2.make
> +++ b/rules/bzip2.make
> @@ -19,7 +19,9 @@ BZIP2_VERSION	:= 1.0.6
>  BZIP2_MD5	:= 00b516f4704d4a7cb50a1d97e6e8e15b
>  BZIP2		:= bzip2-$(BZIP2_VERSION)
>  BZIP2_SUFFIX	:= tar.gz
> -BZIP2_URL	:= http://distfiles.gentoo.org/distfiles/$(BZIP2).$(BZIP2_SUFFIX)
> +BZIP2_URL	:= \
> +	https://sourceware.org/pub/bzip2/$(BZIP2).$(BZIP2_SUFFIX) \
> +	https://distfiles.gentoo.org/distfiles/$(BZIP2).$(BZIP2_SUFFIX)
>  BZIP2_SOURCE	:= $(SRCDIR)/$(BZIP2).$(BZIP2_SUFFIX)
>  BZIP2_DIR	:= $(BUILDDIR)/$(BZIP2)
>  BZIP2_LICENSE	:= bzip2-1.0.6

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] bzip2: add license files

[Michael Olbrich]

Thanks, applied as fa2d78f451d35ebd15c27d6456f605af2e2a5e5c.

Michael

[sent from post-receive hook]

On Thu, 27 May 2021 08:45:37 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20210516185231.5680-2-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/bzip2.make b/rules/bzip2.make
> index c8e8695a4703..4bf856e565c3 100644
> --- a/rules/bzip2.make
> +++ b/rules/bzip2.make
> @@ -25,6 +25,7 @@ BZIP2_URL	:= \
>  BZIP2_SOURCE	:= $(SRCDIR)/$(BZIP2).$(BZIP2_SUFFIX)
>  BZIP2_DIR	:= $(BUILDDIR)/$(BZIP2)
>  BZIP2_LICENSE	:= bzip2-1.0.6
> +BZIP2_LICENSE_FILES	:= file://LICENSE;md5=ddeb76cd34e791893c0f539fdab879bb
>  
>  # ----------------------------------------------------------------------------
>  # Prepare

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] bzip2: version bump 1.0.6 -> 1.0.8

[Michael Olbrich]

Thanks, applied as 402c4a7af5619abbbe9a08869a836f71050e8a64.

Michael

[sent from post-receive hook]

On Thu, 27 May 2021 08:45:39 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Patch 0002 (CVE-2016-3189) was merged upstream in bzip2-1.0.7, remove
> it. Unfuzz the other patch.
> 
> The copyright dates, the version number and the author's e-mail address
> changed in LICENSE.
> 
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20210516185231.5680-3-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/bzip2-1.0.6/0002-bzip2recover-Fix-potential-use-after-free.patch b/patches/bzip2-1.0.6/0002-bzip2recover-Fix-potential-use-after-free.patch
> deleted file mode 100644
> index d3ba2379a8e3..000000000000
> --- a/patches/bzip2-1.0.6/0002-bzip2recover-Fix-potential-use-after-free.patch
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -From: Jakub Martisko <jamartis@redhat.com>
> -Date: Wed, 30 Mar 2016 10:22:27 +0200
> -Subject: [PATCH] bzip2recover: Fix potential use-after-free
> -
> -Origin: https://bugzilla.redhat.com/attachment.cgi?id=1169843&action=edit
> -Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2016-3189
> -Bug-Debian: https://bugs.debian.org/827744
> ----
> - bzip2recover.c | 1 +
> - 1 file changed, 1 insertion(+)
> -
> -diff --git a/bzip2recover.c b/bzip2recover.c
> -index f9de0496abf1..252c1b79853d 100644
> ---- a/bzip2recover.c
> -+++ b/bzip2recover.c
> -@@ -457,6 +457,7 @@ Int32 main ( Int32 argc, Char** argv )
> -             bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 );
> -             bsPutUInt32 ( bsWr, blockCRC );
> -             bsClose ( bsWr );
> -+            outFile = NULL;
> -          }
> -          if (wrBlock >= rbCtr) break;
> -          wrBlock++;
> diff --git a/patches/bzip2-1.0.6/series b/patches/bzip2-1.0.6/series
> deleted file mode 100644
> index faf98db85308..000000000000
> --- a/patches/bzip2-1.0.6/series
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-fixup-Makefile.patch
> -0002-bzip2recover-Fix-potential-use-after-free.patch
> -# b97444d53b93823526970708b2bbb965  - git-ptx-patches magic
> diff --git a/patches/bzip2-1.0.6/0001-fixup-Makefile.patch b/patches/bzip2-1.0.8/0001-fixup-Makefile.patch
> similarity index 96%
> rename from patches/bzip2-1.0.6/0001-fixup-Makefile.patch
> rename to patches/bzip2-1.0.8/0001-fixup-Makefile.patch
> index 0e260213418e..af14b2d5436f 100644
> --- a/patches/bzip2-1.0.6/0001-fixup-Makefile.patch
> +++ b/patches/bzip2-1.0.8/0001-fixup-Makefile.patch
> @@ -3,17 +3,15 @@ Date: Sat, 29 Oct 2011 18:59:40 +0200
>  Subject: [PATCH] fixup Makefile
>  
>  This patch fixes various problems in the makefile and disables compile
> -time test. It was taken from Debinan.
> +time test. It was taken from Debian.
>  
>  Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
>  ---
> -# 20091210 rsc: needs probably another look before going mainline
> -
> - Makefile |  134 ++++++++++++++++++++++++++++++++------------------------------
> - 1 files changed, 69 insertions(+), 65 deletions(-)
> + Makefile | 134 ++++++++++++++++++++++++++++++++-------------------------------
> + 1 file changed, 69 insertions(+), 65 deletions(-)
>  
>  diff --git a/Makefile b/Makefile
> -index 9754ddf286b1..8e6a46b63904 100644
> +index f8a17722e1c3..d2c7e75ed744 100644
>  --- a/Makefile
>  +++ b/Makefile
>  @@ -12,6 +12,8 @@
> @@ -203,5 +201,5 @@ index 9754ddf286b1..8e6a46b63904 100644
>  -	rm -f manual.ps manual.html manual.pdf
>  +	#rm -f manual.ps manual.html manual.pdf
>   
> - DISTNAME=bzip2-1.0.6
> + DISTNAME=bzip2-1.0.8
>   dist: check manual
> diff --git a/patches/bzip2-1.0.8/series b/patches/bzip2-1.0.8/series
> new file mode 100644
> index 000000000000..78ff345669b5
> --- /dev/null
> +++ b/patches/bzip2-1.0.8/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-fixup-Makefile.patch
> +# cf8c416b9e8252c5e89375edfd4523b9  - git-ptx-patches magic
> diff --git a/rules/bzip2.make b/rules/bzip2.make
> index 4bf856e565c3..8247b24c1983 100644
> --- a/rules/bzip2.make
> +++ b/rules/bzip2.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_BZIP2) += bzip2
>  #
>  # Paths and names
>  #
> -BZIP2_VERSION	:= 1.0.6
> -BZIP2_MD5	:= 00b516f4704d4a7cb50a1d97e6e8e15b
> +BZIP2_VERSION	:= 1.0.8
> +BZIP2_MD5	:= 67e051268d0c475ea773822f7500d0e5
>  BZIP2		:= bzip2-$(BZIP2_VERSION)
>  BZIP2_SUFFIX	:= tar.gz
>  BZIP2_URL	:= \
> @@ -25,7 +25,7 @@ BZIP2_URL	:= \
>  BZIP2_SOURCE	:= $(SRCDIR)/$(BZIP2).$(BZIP2_SUFFIX)
>  BZIP2_DIR	:= $(BUILDDIR)/$(BZIP2)
>  BZIP2_LICENSE	:= bzip2-1.0.6
> -BZIP2_LICENSE_FILES	:= file://LICENSE;md5=ddeb76cd34e791893c0f539fdab879bb
> +BZIP2_LICENSE_FILES	:= file://LICENSE;md5=1e5cffe65fc786f83a11a4b225495c0b
>  
>  # ----------------------------------------------------------------------------
>  # Prepare

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] libarchive: move to HTTPS URL

[Michael Olbrich]

Thanks, applied as ce61a83613af08bdbfba683cca266c560df22900.

Michael

[sent from post-receive hook]

On Thu, 27 May 2021 08:45:40 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20210516185231.5680-4-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libarchive.make b/rules/libarchive.make
> index 5d9081eb317c..b56ee7a4c4d6 100644
> --- a/rules/libarchive.make
> +++ b/rules/libarchive.make
> @@ -18,7 +18,7 @@ LIBARCHIVE_VERSION	:= 3.3.2
>  LIBARCHIVE_MD5		:= 4583bd6b2ebf7e0e8963d90879eb1b27
>  LIBARCHIVE		:= libarchive-$(LIBARCHIVE_VERSION)
>  LIBARCHIVE_SUFFIX	:= tar.gz
> -LIBARCHIVE_URL		:= http://www.libarchive.org/downloads/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX)
> +LIBARCHIVE_URL		:= https://www.libarchive.org/downloads/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX)
>  LIBARCHIVE_SOURCE	:= $(SRCDIR)/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX)
>  LIBARCHIVE_DIR		:= $(BUILDDIR)/$(LIBARCHIVE)
>  LIBARCHIVE_LICENSE	:= BSD-2-Clause AND BSD-3-Clause

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] libarchive: add license files

[Michael Olbrich]

Thanks, applied as feeb734fe345facf236c864d8a96b7a2e4992ea3.

Michael

[sent from post-receive hook]

On Thu, 27 May 2021 08:45:41 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> The COPYING document also mentions that some files are in the public
> domain.
> 
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20210516185231.5680-5-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libarchive.make b/rules/libarchive.make
> index b56ee7a4c4d6..13d61a1da314 100644
> --- a/rules/libarchive.make
> +++ b/rules/libarchive.make
> @@ -21,7 +21,8 @@ LIBARCHIVE_SUFFIX	:= tar.gz
>  LIBARCHIVE_URL		:= https://www.libarchive.org/downloads/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX)
>  LIBARCHIVE_SOURCE	:= $(SRCDIR)/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX)
>  LIBARCHIVE_DIR		:= $(BUILDDIR)/$(LIBARCHIVE)
> -LIBARCHIVE_LICENSE	:= BSD-2-Clause AND BSD-3-Clause
> +LIBARCHIVE_LICENSE	:= BSD-2-Clause AND BSD-3-Clause AND public_domain
> +LIBARCHIVE_LICENSE_FILES	:= file://COPYING;md5=ed99aca006bc346974bb745a35336425
>  
>  # ----------------------------------------------------------------------------
>  # Prepare

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] libarchive: version bump 3.3.2 -> 3.5.1

[Michael Olbrich]

Thanks, applied as 15022c6010cfd3727348bf02fc61f377ad632c77.

Michael

[sent from post-receive hook]

On Thu, 27 May 2021 08:45:42 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> The COPYING file mentions some triple-licensed files, and updated the
> copyright year.
> 
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20210516185231.5680-6-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libarchive.make b/rules/libarchive.make
> index 13d61a1da314..6e9e0ff28ef3 100644
> --- a/rules/libarchive.make
> +++ b/rules/libarchive.make
> @@ -14,15 +14,16 @@ PACKAGES-$(PTXCONF_LIBARCHIVE) += libarchive
>  #
>  # Paths and names
>  #
> -LIBARCHIVE_VERSION	:= 3.3.2
> -LIBARCHIVE_MD5		:= 4583bd6b2ebf7e0e8963d90879eb1b27
> +LIBARCHIVE_VERSION	:= 3.5.1
> +LIBARCHIVE_MD5		:= c96040b75a14c8ba73238c284147e87f
>  LIBARCHIVE		:= libarchive-$(LIBARCHIVE_VERSION)
>  LIBARCHIVE_SUFFIX	:= tar.gz
>  LIBARCHIVE_URL		:= https://www.libarchive.org/downloads/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX)
>  LIBARCHIVE_SOURCE	:= $(SRCDIR)/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX)
>  LIBARCHIVE_DIR		:= $(BUILDDIR)/$(LIBARCHIVE)
> -LIBARCHIVE_LICENSE	:= BSD-2-Clause AND BSD-3-Clause AND public_domain
> -LIBARCHIVE_LICENSE_FILES	:= file://COPYING;md5=ed99aca006bc346974bb745a35336425
> +LIBARCHIVE_LICENSE	:= BSD-2-Clause AND BSD-3-Clause AND public_domain AND \
> +			   (CC-0-1.0 OR OpenSSL OR Apache-2.0)
> +LIBARCHIVE_LICENSE_FILES	:= file://COPYING;md5=d499814247adaee08d88080841cb5665
>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> @@ -49,11 +50,14 @@ LIBARCHIVE_CONF_OPT	:= \
>  	$(GLOBAL_LARGE_FILE_OPTION) \
>  	--with-zlib \
>  	--$(call ptx/wwo, PTXCONF_LIBARCHIVE_BZIP2)-bz2lib \
> +	--without-libb2 \
>  	--without-iconv \
>  	--without-lz4 \
> +	--without-zstd \
>  	--$(call ptx/wwo, PTXCONF_LIBARCHIVE_LZMA)-lzma \
>  	--without-lzo2 \
>  	--without-cng \
> +	--without-mbedtls \
>  	--without-nettle \
>  	--without-openssl \
>  	--without-xml2 \

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] sqlite: version bump 3.28 -> 3.35.5

[Michael Olbrich]

Thanks, applied as 4c8c4c2d35a7bae3b8bd08d5198822f6b34c4347.

Michael

[sent from post-receive hook]

On Thu, 27 May 2021 08:45:44 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Remove the remaining patch, the underlying problem was fixed upstream in
> version 3.35.0, check-in e64ff2cce3c03ba2.
> 
> Link: https://www.sqlite.org/src/info/e64ff2cce3c03ba2
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20210516185231.5680-8-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/sqlite-autoconf-3280000/0001-configure-make-disable-threadsafe-work.patch b/patches/sqlite-autoconf-3280000/0001-configure-make-disable-threadsafe-work.patch
> deleted file mode 100644
> index 1e3a641a72b6..000000000000
> --- a/patches/sqlite-autoconf-3280000/0001-configure-make-disable-threadsafe-work.patch
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -From: Roland Hieber <rhi@pengutronix.de>
> -Date: Tue, 9 Jul 2019 12:18:52 +0200
> -Subject: [PATCH] configure: make --disable-threadsafe work
> -
> -SQLITE_THREADSAFE can be 0, 1 or 2, and if it is not defined, it
> -is defined to 1 by default in sqlite3.c.
> -
> -_REENTRANT only needs to be defined or undefined according to
> -https://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html#Feature-Test-Macros
> -
> -Forwarded: https://www.mail-archive.com/sqlite-users@mailinglists.sqlite.org/msg115812.html
> -Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ----
> - configure.ac | 2 ++
> - 1 file changed, 2 insertions(+)
> -
> -diff --git a/configure.ac b/configure.ac
> -index f0b70b96428c..3044077e93f6 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -91,6 +91,8 @@ if test x"$enable_threadsafe" != "xno"; then
> -   BUILD_CFLAGS="$BUILD_CFLAGS -D_REENTRANT=1 -DSQLITE_THREADSAFE=1"
> -   AC_SEARCH_LIBS(pthread_create, pthread)
> -   AC_SEARCH_LIBS(pthread_mutexattr_init, pthread)
> -+else
> -+  BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_THREADSAFE=0"
> - fi
> - #-----------------------------------------------------------------------
> - 
> diff --git a/patches/sqlite-autoconf-3280000/autogen.sh b/patches/sqlite-autoconf-3280000/autogen.sh
> deleted file mode 120000
> index 9f8a4cb7ddcb..000000000000
> --- a/patches/sqlite-autoconf-3280000/autogen.sh
> +++ /dev/null
> @@ -1 +0,0 @@
> -../autogen.sh
> \ No newline at end of file
> diff --git a/patches/sqlite-autoconf-3280000/series b/patches/sqlite-autoconf-3280000/series
> deleted file mode 100644
> index 516ce59bdbad..000000000000
> --- a/patches/sqlite-autoconf-3280000/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-configure-make-disable-threadsafe-work.patch
> -# 7c01923b9908ba74dacfdb9f965dc010  - git-ptx-patches magic
> diff --git a/rules/host-sqlite.make b/rules/host-sqlite.make
> index 0a32adc0cf07..8fc54861b52c 100644
> --- a/rules/host-sqlite.make
> +++ b/rules/host-sqlite.make
> @@ -41,6 +41,7 @@ HOST_SQLITE_CONF_OPT	:= \
>  	--disable-readline \
>  	--enable-threadsafe \
>  	--disable-dynamic-extensions \
> +	--disable-math \
>  	--disable-fts5 \
>  	--enable-json1 \
>  	--disable-session \
> diff --git a/rules/sqlite.make b/rules/sqlite.make
> index 67a66a3718f1..eb866118accc 100644
> --- a/rules/sqlite.make
> +++ b/rules/sqlite.make
> @@ -19,11 +19,11 @@ PACKAGES-$(PTXCONF_SQLITE) += sqlite
>  #
>  # Paths and names
>  #
> -SQLITE_VERSION	:= 3280000
> -SQLITE_MD5	:= 3c68eb400f8354605736cd55400e1572
> +SQLITE_VERSION	:= 3350500
> +SQLITE_MD5	:= d1d1aba394c8e0443077dc9f1a681bb8
>  SQLITE		:= sqlite-autoconf-$(SQLITE_VERSION)
>  SQLITE_SUFFIX	:= tar.gz
> -SQLITE_URL	:= https://www.sqlite.org/2019/$(SQLITE).$(SQLITE_SUFFIX)
> +SQLITE_URL	:= https://www.sqlite.org/2021/$(SQLITE).$(SQLITE_SUFFIX)
>  SQLITE_SOURCE	:= $(SRCDIR)/$(SQLITE).$(SQLITE_SUFFIX)
>  SQLITE_DIR	:= $(BUILDDIR)/$(SQLITE)
>  SQLITE_LICENSE	:= public_domain
> @@ -58,6 +58,7 @@ SQLITE_CONF_OPT		:= \
>  	--$(call ptx/endis,PTXCONF_SQLITE_READLINE)-readline \
>  	--$(call ptx/endis,PTXCONF_SQLITE_THREADSAFE)-threadsafe \
>  	--$(call ptx/endis,PTXCONF_SQLITE_LOAD_EXTENSION)-dynamic-extensions \
> +	--disable-math \
>  	--enable-fts4 \
>  	--enable-fts3 \
>  	--disable-fts5 \

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] dhcp: move to HTTPS URL

[Michael Olbrich]

Thanks, applied as 2e66b0b765287f48f2d2ccb6224283063a59e15d.

Michael

[sent from post-receive hook]

On Thu, 27 May 2021 08:45:45 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20210516185231.5680-9-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/dhcp.make b/rules/dhcp.make
> index e131d3e9fe96..5452f4676adc 100644
> --- a/rules/dhcp.make
> +++ b/rules/dhcp.make
> @@ -21,8 +21,8 @@ DHCP_MD5	:= 23bc6016297aa831dc9f321403e30ddc
>  DHCP		:= dhcp-$(DHCP_VERSION)
>  DHCP_SUFFIX	:= tar.gz
>  DHCP_URL	:= \
> -	http://ftp.isc.org/isc/dhcp/$(DHCP).$(DHCP_SUFFIX) \
> -	http://ftp.isc.org/isc/dhcp/dhcp-4.1-history/$(DHCP).$(DHCP_SUFFIX)
> +	https://ftp.isc.org/isc/dhcp/$(DHCP).$(DHCP_SUFFIX) \
> +	https://ftp.isc.org/isc/dhcp/dhcp-4.1-history/$(DHCP).$(DHCP_SUFFIX)
>  DHCP_SOURCE	:= $(SRCDIR)/$(DHCP).$(DHCP_SUFFIX)
>  DHCP_DIR	:= $(BUILDDIR)/$(DHCP)
>  DHCP_LICENSE	:= ISC

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de