From 27ca60ea5a173b1f750e59c8c22f3450f2c7a877 Mon Sep 17 00:00:00 2001
From: PktSurf <smlinux@pktsurf.in>
Date: Thu, 9 Mar 2023 21:50:51 +0530
Subject: [PATCH] Upgraded base/boost to 1.81.0 Upgraded base/bzip2 to 1.0.8
 Upgraded base/ca-certificates to 20221205

---
 base/boost/boost.SMBuild                     | 24 +++++-----
 base/bzip2/bzip2-flags.patch                 | 21 ---------
 base/bzip2/bzip2.SMBuild                     | 46 +++++++++++++-------
 base/ca-certificates/ca-certificates.SMBuild |  2 +-
 4 files changed, 43 insertions(+), 50 deletions(-)
 delete mode 100644 base/bzip2/bzip2-flags.patch

diff --git a/base/boost/boost.SMBuild b/base/boost/boost.SMBuild
index 68769a3..afb1481 100755
--- a/base/boost/boost.SMBuild
+++ b/base/boost/boost.SMBuild
@@ -1,6 +1,6 @@
 app=boost
-sversion=1_69_0
-version="$(echo $sversion | sed 's@_@.@g')"
+sversion=1_81_0
+version=1.81.0
 build=1sml
 homepage="https://www.boost.org/"
 download="https://boostorg.jfrog.io/artifactory/main/release/$version/source/boost_$sversion.tar.bz2"
@@ -15,17 +15,18 @@ build() {
   cd "$app"_"$sversion" 
   chown -R root.root .
 
-  applypatch $srcdir/boost-execinfo.patch
-
-  unset CXX
-  # Also symlink <toolchain>-gcc-6.3.0 to gcc-6.3.0 and <toolchain>-g++ to g++-6.3.0
-
   CC="$CC" \
   ./bootstrap.sh \
-    --prefix="$pkg" \
+    --prefix="$pkg" --with-toolset=gcc --with-icu --with-python=python3 
 
-  ./b2 -j3 toolset=gcc-foo -d+2 stage threading=multi link=shared || true
-  ./b2 -j3 -d+2 install threading=multi link=shared || true
+  build_options="$MAKEFLAGS toolset=gcc threading=multi runtime-link=shared link=shared \
+      cflags=-fno-strict-aliasing --without-graph_parallel --without-mpi"
+  
+  ./b2 $build_options
+  ./b2 $build_options install
+
+  install -Dm 755 b2 $pkg/bin/b2
+  ( cd $pkg ; ln -s b2 bjam )
 
   cp LICENSE_1_0.txt $pkgdocs/LICENSE
 
@@ -33,6 +34,5 @@ build() {
 }
 
 sha512sums="
-d0e9bb858c44880d56c0291afef6a1b011a62f659a2d8f58dcb6147ea0899f9157bd8db3097896618fee0116847ebeac78b6d0f0fec8a92c3469500828bbe552  boost_1_69_0.tar.bz2
-16d8d072adb9073f240e3f7ff73591d3867681c4ba47f6f9f7d064e367b45a97e1f757ff01e489d0d834382670f9e9658755754d0e0dce62b08e6045c1f8605a  boost-execinfo.patch
+8f18972314e8dd5c952825fc52ca49d17b0e0b31db12bcc1cd0ba42c2d71c4f6ce5f5062fdbb65db029ec2c58ca93a32c32d0cdce62329556200dc8650a03fbf  boost_1_81_0.tar.gz
 "
diff --git a/base/bzip2/bzip2-flags.patch b/base/bzip2/bzip2-flags.patch
deleted file mode 100644
index c292043..0000000
--- a/base/bzip2/bzip2-flags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- bzip2-1.0.6.old/Makefile-libbz2_so
-+++ bzip2-1.0.6/Makefile-libbz2_so
-@@ -25,6 +25,7 @@
- CC=gcc
- BIGFILES=-D_FILE_OFFSET_BITS=64
- CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
-+LDFLAGS=
- 
- OBJS= blocksort.o  \
-       huffman.o    \
-@@ -35,8 +36,8 @@
-       bzlib.o
- 
- all: $(OBJS)
--	$(CC) -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) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
- 	rm -f libbz2.so.1.0
- 	ln -s libbz2.so.1.0.6 libbz2.so.1.0
-
diff --git a/base/bzip2/bzip2.SMBuild b/base/bzip2/bzip2.SMBuild
index 2ad7b4d..bed2efa 100755
--- a/base/bzip2/bzip2.SMBuild
+++ b/base/bzip2/bzip2.SMBuild
@@ -1,5 +1,5 @@
 app=bzip2
-version=1.0.6
+version=1.0.8
 build=1sml
 homepage="https://sourceware.org/$app/"
 download="https://sourceware.org/pub/bzip2/bzip2-$version.tar.gz"
@@ -14,32 +14,46 @@ build() {
   cd $app-$version
   fixbuilddirpermissions
 
-  # Taken from sabotage
-
-  applypatch $srcdir/bzip2-flags.patch
-
-  sed -i 's@$(PREFIX)@$(DESTDIR)$(PREFIX)@g' Makefile
-  sed -i 's@$(PREFIX)/man@$(PREFIX)/share/man@g' Makefile
-
+  # Prevent tests from running
   sed -i 's@all: libbz2.a bzip2 bzip2recover test@all: libbz2.a bzip2 bzip2recover@' Makefile
-  make -f Makefile-libbz2_so 
-  make PREFIX="/" CFLAGS="-fPIC" 
 
-  make install DESTDIR=$pkg PREFIX="/"
-  install -m 0644 libbz2.so.1.0.6 $pkg/lib
+  # Prep the shared library and then all binaries
+  make -f Makefile-libbz2_so
+  make $MAKEFLAGS
+
+  # Copy headers, the shared library and the binaries
+  install -Dm 644 bzlib.h $pkg/include/bzlib.h
+  install -Dm 755 libbz2.so.$version $pkg/lib/libbz2.so.$version
+
+  # Copy binaries
+  install -Dm 755 bzdiff $pkg/bin/bzdiff
+  install -Dm 755 bzgrep $pkg/bin/bzgrep 
+  install -Dm 755 bzmore $pkg/bin/bzmore
+  install -Dm 755 bzip2-shared $pkg/bin/bzip2
+  install -Dm 755 bzip2recover $pkg/bin/bzip2recover
+
+  # And man pages
+  mkdir -p $pkg/share/man/man1
+  for manpage in bzip2.1 bzdiff.1 bzgrep.1 bzmore.1 ; do
+    cp $manpage $pkg/share/man/man1/
+  done
 
   cp LICEN?E $pkgdocs/
   
   (
    cd $pkg/lib
-   ln -sf libbz2.so.1.0.6 libbz2.so.1.0
-   ln -sf libbz2.so.1.0.6 libbz2.so
+   ln -sf libbz2.so.$version libbz2.so.1.0
+   ln -sf libbz2.so.$version libbz2.so
+
+   cd $pkg/bin
+   ln -sf bzip2 bunzip2
+   ln -sf bzip2 bzcat
+   ln -sf bzmore bzless
   )
 
   mkfinalpkg
 }
 
 sha512sums="
-a8e36dd2987acb7f39fbfecc5207e9a18f5029b9254c75b0b832b72fa443a227f1e5490739707129ca325a6fab8acfd8fed9fec3330cdc67f4594147f84a1ba0  bzip2-1.0.6.tar.lz
-8b8eff6348994c5d67691d3b4d53bd3e66785138c613737c1f38ac8c245412cde4efe44e671e9ee05c7216e9f895d7ef7212c1f76d31724f5016a3720aad335d  bzip2-flags.patch
+5c2e4a3dd274ddd4c4c3d6bb4dc9c6fc64315229184bf05f26e439f998c36c4f422f5f1da3c4c6b0992378be05dc0728e54d26f377056140aae767086ceaae35  bzip2-1.0.8.tar.lz
 "
diff --git a/base/ca-certificates/ca-certificates.SMBuild b/base/ca-certificates/ca-certificates.SMBuild
index b30db23..bc4b870 100755
--- a/base/ca-certificates/ca-certificates.SMBuild
+++ b/base/ca-certificates/ca-certificates.SMBuild
@@ -1,5 +1,5 @@
 app=ca-certificates
-version=20210308
+version=20221205
 build=1sml
 homepage="https://ftp.debian.org/debian/pool/main/c/ca-certificates/"
 desc="PEM Files of CA Certificates"