From 8653ce234445e3b03ad2fe7b2aadad7f7dc28c54 Mon Sep 17 00:00:00 2001
From: aliriza <aliriza.keskin@pardus.org.tr>
Date: Tue, 25 Jul 2023 07:23:59 +0000
Subject: [PATCH] bzip fix and busybox update

---
 app/arch/bzip2/bzip2.pc.in    | 11 ++++++++
 app/arch/bzip2/makefile.patch | 16 ------------
 app/arch/bzip2/ympbuild       | 48 +++++++++++++++--------------------
 sys/base/busybox/ympbuild     |  6 ++---
 4 files changed, 34 insertions(+), 47 deletions(-)
 create mode 100644 app/arch/bzip2/bzip2.pc.in
 delete mode 100644 app/arch/bzip2/makefile.patch

diff --git a/app/arch/bzip2/bzip2.pc.in b/app/arch/bzip2/bzip2.pc.in
new file mode 100644
index 00000000..a4dd6825
--- /dev/null
+++ b/app/arch/bzip2/bzip2.pc.in
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=/usr
+bindir=${exec_prefix}/bin
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: bzip2
+Description: A file compression library
+Version: @VERSION@
+Libs: -L${libdir} -lbz2
+Cflags: -I${includedir}
diff --git a/app/arch/bzip2/makefile.patch b/app/arch/bzip2/makefile.patch
deleted file mode 100644
index a54c9fb6..00000000
--- a/app/arch/bzip2/makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Makefile b/Makefile
-index fb0f230..3c101bd 100644
---- a/Makefile
-+++ b/Makefile
-@@ -35,10 +35,8 @@ OBJS= blocksort.o  \
-       bzlib.o
- 
- all: $(OBJS)
--	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS)
-+	$(CC) -shared -o libbz2.so.1.0.8 $(OBJS)
- 	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
--	rm -f libbz2.so.1.0
--	ln -s libbz2.so.1.0.8 libbz2.so.1.0
- 
- clean: 
- 	rm -f $(OBJS) bzip2.o libbz2.so.1.0.8 libbz2.so.1.0 bzip2-shared
diff --git a/app/arch/bzip2/ympbuild b/app/arch/bzip2/ympbuild
index c23d7e1f..855e0c33 100644
--- a/app/arch/bzip2/ympbuild
+++ b/app/arch/bzip2/ympbuild
@@ -7,7 +7,7 @@ description='lzma compression utilities and library'
 email='kurth4cker@tutanota.com'
 maintainer='kurth4cker'
 source=("https://sourceware.org/pub/bzip2/bzip2-${version}.tar.gz"
-        'makefile.patch')
+        'bzip2.pc.in')
 md5sums=('67e051268d0c475ea773822f7500d0e5'
          'SKIP')
 group=(app.arch)
@@ -15,35 +15,27 @@ arch=(x86_64)
 cd $name-$version
 
 setup(){
-    mkdir -p $name-shared
-    cp *.c *.h $name-shared
-    cp Makefile-libbz2_so $name-shared/Makefile
-    cd $name-shared
-    patch -Np1 < ../../makefile.patch
+	# Generate relative symlinks
+	sed -i \
+		-e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
+		-e 's:ln -s -f $(PREFIX)/bin/:ln -s :' \
+		Makefile
+
+	# fixup broken version stuff
+	sed -i \
+		-e "s:1\.0\.4:$version:" \
+		bzip2.1 bzip2.txt Makefile-libbz2_so manual.*
 }
 build(){
-    export CFLAGS="-Winline -D_FILE_OFFSET_BITS=64 ${CFLAGS}"
-    make -e -j$(nproc) bzip2recover libbz2.a
-    make -j$(nproc) -C $name-shared CFLAGS="-fpic -fPIC ${CFLAGS}"
+    make -f Makefile-libbz2_so all
+	make all
 }
 package(){
-    install -dm755 ${DESTDIR}/usr/{bin,lib64/bzip2,include,share/man/man1}
-
-    install -m755 $name-shared/bzip2-shared "${DESTDIR}"/usr/bin/bzip2
-    install -m755 bzip2recover bzdiff bzgrep bzmore "${DESTDIR}"/usr/bin
-    ln -sf bzip2 "${DESTDIR}"/usr/bin/bunzip2
-    ln -sf bzip2 "${DESTDIR}"/usr/bin/bzcat
-
-    install -m755 libbz2.a "${DESTDIR}"/usr/lib64
-    install -m755 $name-shared/libbz2.so.${version} "${DESTDIR}"/usr/lib64/
-    ln -s libbz2.so.$version "${DESTDIR}"/usr/lib64/libbz2.so
-    ln -s libbz2.so.$version "${DESTDIR}"/usr/lib64/libbz2.so.1
-    ln -s libbz2.so.$version "${DESTDIR}"/usr/lib64/libbz2.so.1.0
-
-    install -m644 bzlib.h "${DESTDIR}"/usr/include/
-
-    install -m644 bzip2.1 "${DESTDIR}"/usr/share/man/man1/
-    ln -sf bzip2.1 "${DESTDIR}"/usr/share/man/man1/bunzip2.1
-    ln -sf bzip2.1 "${DESTDIR}"/usr/share/man/man1/bzcat.1
-    ln -sf bzip2.1 "${DESTDIR}"/usr/share/man/man1/bzip2recover.1
+    make PREFIX="$DESTDIR"/usr install
+	install -D libbz2.so.$version "$DESTDIR"/usr/lib/libbz2.so.$version
+	ln -s libbz2.so.$version "$DESTDIR"/usr/lib/libbz2.so
+	ln -s libbz2.so.$version "$DESTDIR"/usr/lib/libbz2.so.${version%%.*}
+	mkdir -p "$DESTDIR"/usr/lib/pkgconfig/
+    sed "s|@VERSION@|$version|" ../bzip2.pc.in \
+		> "$DESTDIR"/usr/lib/pkgconfig/bzip2.pc
 }
diff --git a/sys/base/busybox/ympbuild b/sys/base/busybox/ympbuild
index 149756d6..5f809a1d 100644
--- a/sys/base/busybox/ympbuild
+++ b/sys/base/busybox/ympbuild
@@ -1,7 +1,7 @@
 #!/bin/bash
 name=busybox
-version=1.35.0
-release=1
+version=1.36.1
+release=2
 url='https://busybox.net'
 description='BusyBox is a software suite that provides several Unix utilities in a single executable file.'
 email='parduscix@yandex.ru'
@@ -16,7 +16,7 @@ source=("https://busybox.net/downloads/busybox-$version.tar.bz2"
         "files/udhcpc.script"
         "data-user.patch"
 )
-md5sums=("585949b1dd4292b604b7d199866e9913"
+md5sums=("0fc591bc9f4e365dfd9ade0014f32561"
          "SKIP"
          "SKIP"
          "SKIP"