From e266e59f3d4e6fa56affc5ed4520ddeb26c05765 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Sun, 14 Jul 2019 23:36:55 +0200
Subject: [PATCH] - bzip2: bump version to 1.0.7

---
 make/target-libs-unused.mk                 | 16 +++++++++-------
 patches/{bzip2-1.0.6.patch => bzip2.patch} | 18 +++++++++---------
 2 files changed, 18 insertions(+), 16 deletions(-)
 rename patches/{bzip2-1.0.6.patch => bzip2.patch} (68%)

diff --git a/make/target-libs-unused.mk b/make/target-libs-unused.mk
index f328b5db..db9fdc9e 100644
--- a/make/target-libs-unused.mk
+++ b/make/target-libs-unused.mk
@@ -84,25 +84,27 @@ $(D)/libroxml: $(ARCHIVE)/libroxml-$(LIBROXML_VER).tar.gz | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-BZIP2_VER = 1.0.6
+BZIP2_VER    = 1.0.7
+BZIP2        = bzip2-$(BZIP2_VER)
 BZIP2_SOURCE = bzip2-$(BZIP2_VER).tar.gz
+BZIP2_URL    = https://sourceware.org/pub/bzip2
 
 $(ARCHIVE)/$(BZIP2_SOURCE):
-	$(DOWNLOAD) http://sources.buildroot.net/$(BZIP2_SOURCE)
+	$(DOWNLOAD) $(BZIP2_URL)/$(BZIP2_SOURCE)
 
-BZIP2_Patch = bzip2-$(BZIP2_VER).patch
+BZIP2_PATCH  = bzip2.patch
 
 $(D)/bzip2: $(ARCHIVE)/$(BZIP2_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/bzip2-$(BZIP2_VER)
+	$(REMOVE)/$(BZIP2)
 	$(UNTAR)/$(BZIP2_SOURCE)
-	$(CHDIR)/bzip2-$(BZIP2_VER); \
-		$(call apply_patches, $(BZIP2_Patch)); \
+	$(CHDIR)/$(BZIP2); \
+		$(call apply_patches, $(BZIP2_PATCH)); \
 		mv Makefile-libbz2_so Makefile; \
 		$(BUILDENV) \
 		$(MAKE) all; \
 		$(MAKE) install PREFIX=$(TARGET_DIR)
 	rm -f $(TARGET_DIR)/bin/bzip2
-	$(REMOVE)/bzip2-$(BZIP2_VER)
+	$(REMOVE)/$(BZIP2)
 	$(TOUCH)
 
 # -----------------------------------------------------------------------------
diff --git a/patches/bzip2-1.0.6.patch b/patches/bzip2.patch
similarity index 68%
rename from patches/bzip2-1.0.6.patch
rename to patches/bzip2.patch
index 756246b0..bbb5d2d7 100644
--- a/patches/bzip2-1.0.6.patch
+++ b/patches/bzip2.patch
@@ -15,11 +15,11 @@
        bzlib.o
  
  all: $(OBJS)
--	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
-+	$(CC) $(CFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
- 	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
+-	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.7 $(OBJS)
++	$(CC) $(CFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.7 $(OBJS)
+ 	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7
  	rm -f libbz2.so.1.0
- 	ln -s libbz2.so.1.0.6 libbz2.so.1.0
+ 	ln -s libbz2.so.1.0.7 libbz2.so.1.0
 @@ -57,3 +56,17 @@
  	$(CC) $(CFLAGS) -c decompress.c
  bzlib.o: bzlib.c
@@ -33,8 +33,8 @@
 +	cp -f bzlib.h $(PREFIX)/include
 +	chmod a+r $(PREFIX)/include/bzlib.h
 +	if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
-+	cp -f libbz2.so.1.0.6 $(PREFIX)/lib
-+	chmod a+r $(PREFIX)/lib/libbz2.so.1.0.6
-+	ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1.0
-+	ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1
-+	ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so
++	cp -f libbz2.so.1.0.7 $(PREFIX)/lib
++	chmod a+r $(PREFIX)/lib/libbz2.so.1.0.7
++	ln -sf libbz2.so.1.0.7 $(PREFIX)/lib/libbz2.so.1.0
++	ln -sf libbz2.so.1.0.7 $(PREFIX)/lib/libbz2.so.1
++	ln -sf libbz2.so.1.0.7 $(PREFIX)/lib/libbz2.so