Moved bootstrap function call into prepbuilddir and disabled static lib generation in base/brotli

Fixed man page path in base/chrpath
Removed unnecessary -a while cp'ing COPYING file in base/cpio
Added code to copy LICENSEs in base/{dmraid,libyaml,ndctl}
Only cp COPYING file in base/{libgit2,nasm,sbc,slapt-get}
Fix prefix in base/libvpx
Fix desc variable value in base/ncdu
base/patch does not need to be statically-linked
Disabled installation of example files in base/qpdf
Discarded --disable-tcl build option in base/sqlite
Applied CVE patch 2022-48303 for base/tar

base/brotli/brotli.SMBuild

@@ -1,6 +1,6 @@
 app=brotli
 version=1.0.7
-build=1sml
+build=2sml
 homepage="https://github.com/google/brotli"
 download="https://github.com/google/brotli/archive/refs/tags/v$version.tar.gz"
 requires="musl"
@@ -13,13 +13,14 @@ prepbuilddir() {
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+
+  ./bootstrap
 }
 
 build() {
-  ./bootstrap
-
   ./configure \
-    --prefix="" 
+    --prefix="" \
+    --disable-static
 
   make
   make install DESTDIR=$pkg

base/chrpath/chrpath.SMBuild

@@ -1,6 +1,6 @@
 app=chrpath
 version=0.16
-build=1sml
+build=2sml
 homepage="https://chrpath.alioth.debian.org/"
 download="https://alioth.debian.org/frs/download.php/latestfile/813/chrpath-$version.tar.gz"
 desc="Program to modify rpath aka dynamic library load path of binaries"
@@ -18,12 +18,9 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
-    --mandir=/share/man
 
   make
-  make install DESTDIR=$pkg 
+  make install mandir="/share/man" docdir="/share/doc/$app-$version" DESTDIR=$pkg 
-
-  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }

base/cpio/cpio.SMBuild

@@ -23,7 +23,7 @@ build() {
   make
   make install DESTDIR=$pkg 
 
-  cp -a COPYING $pkgdocs/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }

base/dmraid/dmraid.SMBuild

@@ -1,6 +1,6 @@
 app=dmraid
 version=1.0.0
-build=1sml
+build=2sml
 homepage="https://people.redhat.com/~heinzm/sw/dmraid/"
 download="https://people.redhat.com/~heinzm/sw/dmraid/src/dmiraid-$version.rc16-3.tar.bz2"
 desc="Tool and a library to discover, configure and activate ATA RAID devices"
@@ -40,6 +40,8 @@ build() {
   make -j1
   make install DESTDIR=$pkg 
 
+  cp LICENSE* $pkgdocs/
+
   mkfinalpkg
 }
 

base/libgit2/libgit2.SMBuild

@@ -1,6 +1,6 @@
 app=libgit2
 version=1.0.1
-build=1sml
+build=2sml
 homepage="https://libgit2.github.com/"
 download="https://github.com/libgit2/libgit2/releases/download/v1.0.1/libgit2-1.0.1.tar.gz"
 desc="C library for custom Git applications"
@@ -28,7 +28,7 @@ build() {
   make 
   make install DESTDIR=$pkg 
 
-  cp ../{COPYING,README.md,SECURITY.md} $pkgdocs/
+  cp ../COPYING $pkgdocs/
 
   mkfinalpkg
 }

base/libvpx/libvpx.SMBuild

@@ -1,6 +1,6 @@
 app=libvpx
 version=1.8.2
-build=1sml
+build=2sml
 homepage="https://github.com/webmproject/libvpx"
 download="https://github.com/webmproject/libvpx/archive/refs/tags/v$version.tar.gz"
 desc="provides the WebM VP8/VP9 codec libraries"
@@ -18,8 +18,10 @@ prepbuilddir() {
 }
 
 build() {
+  # configure creates /usr in staging if prefix is unset
+  # and fails if '/' is passed as prefix
   ./configure \
-    --prefix="///" \
+    --prefix="//" \
     --enable-shared \
     --disable-static
 

base/libyaml/libyaml.SMBuild

@@ -1,6 +1,6 @@
 app=libyaml
 version=0.2.5
-build=1sml
+build=2sml
 homepage="http://pyyaml.org/wiki/LibYAML"
 download="http://pyyaml.org/download/libyaml/yaml-$version.tar.gz"
 desc="YAML 1.1 library"
@@ -23,6 +23,8 @@ build() {
   make
   make install DESTDIR=$pkg 
 
+  cp License $pkgdocs/
+
   mkfinalpkg
 }
 

base/nasm/nasm.SMBuild

@@ -1,6 +1,6 @@
 app=nasm
 version=2.14.02
-build=1sml
+build=2sml
 homepage="https://www.nasm.us/"
 download="https://www.nasm.us/pub/nasm/releasebuilds/$version/nasm-$version.tar.xz"
 desc="Netwide assembler providing instruction mnemonics and syntax"
@@ -23,7 +23,7 @@ build() {
   make
   make install DESTDIR=$pkg
 
-  cp AUTHORS LICENSE README $pkgdocs/
+  cp LICENSE $pkgdocs/
 
   mkfinalpkg
 }

base/ncdu/ncdu.SMBuild

@@ -3,7 +3,7 @@ version=1.15
 build=1sml
 homepage="https://dev.yorhel.nl/ncdu"
 download="https://dev.yorhel.nl/download/ncdu-$version.tar.gz"
-desc="disk usage viewer using netbsd-curses library"
+desc="Disk usage viewer based on the netbsd-curses library"
 requires="netbsd-curses"
 
 prepbuilddir() {

base/ndctl/ndctl.SMBuild

@@ -1,6 +1,6 @@
 app=ndctl
 version=72.1
-build=1sml
+build=2sml
 homepage="https://github.com/pmem/ndctl"
 download="https://github.com/pmem/ndctl/archive/refs/tags/v$version.tar.gz"
 desc="Library for managing the libnvdimm sub-system in the linux kernel"
@@ -26,6 +26,8 @@ build() {
   make
   make install DESTDIR=$pkg 
 
+  cp COPYING $pkgdocs/
+
   mkfinalpkg
 }
 

base/patch/patch.SMBuild

@@ -1,6 +1,6 @@
 app=patch
 version=2.7.5
-build=1sml
+build=2sml
 homepage="https://www.gnu.org/software/patch/"
 download="https://ftp.gnu.org/gnu/patch/patch-$version.tar.xz"
 desc="Utility to apply a diff or patches file to an original file or files"
@@ -16,7 +16,6 @@ prepbuilddir() {
 }
 
 build() {
-  LDFLAGS="-static" \
   ./configure \
     --prefix="" 
 

base/qpdf/qpdf.SMBuild

@@ -1,6 +1,6 @@
 app=qpdf
 version=11.1.0
-build=1sml
+build=2sml
 homepage="https://github.com/qpdf/qpdf"
 download="https://github.com/qpdf/qpdf/releases/download/v$version/qpdf-$version.tar.gz"
 desc="Command-line tools and library for transforming PDF files"
@@ -21,7 +21,8 @@ build() {
     -DCMAKE_INSTALL_PREFIX="" \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DCMAKE_BUILD_TYPE=Release \
-    -DBUILD_STATIC_LIBS=OFF 
+    -DBUILD_STATIC_LIBS=OFF \
+    -DINSTALL_EXAMPLES=OFF
   
   make
   make install DESTDIR=$pkg 

base/sbc/sbc.SMBuild

@@ -1,6 +1,6 @@
 app=sbc
 version=1.4
-build=1sml
+build=2sml
 homepage="https://www.kernel.org/pub/linux/bluetooth"
 download="https://www.kernel.org/pub/linux/bluetooth/sbc-$version.tar.xz"
 desc="Bluetooth audio library"
@@ -24,7 +24,7 @@ build() {
   make
   make install DESTDIR=$pkg 
 
-  cp COPYING* ChangeLog $pkgdocs/
+  cp COPYING* $pkgdocs/
 
   mkfinalpkg
 }

base/slapt-get/slapt-get.SMBuild

@@ -1,6 +1,6 @@
 app=slapt-get
 version=0.11.1
-build=1sml
+build=2sml
 homepage="https://github.com/jaos/slapt-get"
 desc="An apt-like front-end to Slackware's pkgtools"
 requires="curl libassuan"
@@ -27,7 +27,7 @@ build() {
   install -Dm 644 $srcdir/example.slapt-getrc $pkg/etc/slapt-get/slapt-getrc
   mkdir -p $pkg/var/cache/slapt-get
 
-  cp TODO COPYING README FAQ $pkgdocs/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }

base/sqlite/sqlite.SMBuild

@@ -1,6 +1,6 @@
 app=sqlite
 version=3320100
-build=1sml
+build=2sml
 homepage="https://www.sqlite.org/"
 download="https://www.sqlite.org/2020/sqlite-autoconf-$version.tar.gz"
 desc="Simple, self contained database engine"
@@ -18,7 +18,6 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
-    --disable-tcl \
     --disable-static
 
   make -j1

base/tar/Fix-savannah-bug-62387.patch

@@ -0,0 +1,31 @@
+From 1d530107a24d71e798727d7f0afa0833473d1074 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Matej=20Mu=C5=BEila?= <mmuzila@gmail.com>
+Date: Wed, 11 Jan 2023 08:55:58 +0100
+Subject: [PATCH] Fix savannah bug #62387
+
+* src/list.c (from_header): Check for the end of field after leading byte
+  (0x80 or 0xff) of base-256 encoded header value
+---
+ src/list.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/list.c b/src/list.c
+index 9fafc425..bf41b581 100644
+--- a/src/list.c
++++ b/src/list.c
+@@ -895,6 +895,12 @@ from_header (char const *where0, size_t digs, char const *type,
+ 			   << (CHAR_BIT * sizeof (uintmax_t)
+ 			       - LG_256 - (LG_256 - 2)));
+       value = (*where++ & ((1 << (LG_256 - 2)) - 1)) - signbit;
++      if (where == lim)
++        {
++          if (type && !silent)
++            ERROR ((0, 0, _("Archive base-256 value is invalid")));
++          return -1;
++        }
+       for (;;)
+ 	{
+ 	  value = (value << LG_256) + (unsigned char) *where++;
+-- 
+2.38.1
+

base/tar/tar.SMBuild

@@ -1,6 +1,6 @@
 app=tar
 version=1.34
-build=1sml
+build=2sml
 homepage="https://www.gnu.org/software/tar/"
 download="https://ftp.gnu.org/gnu/tar/tar-$version.tar.xz"
 desc="GNU archiving utility"
@@ -15,6 +15,8 @@ prepbuilddir() {
 
   # The "A lone zero block at %s" messages also cause problems:
   applypatch $srcdir/tar.nolonezero.diff
+  # CVE-2022-48303 patch
+  applypatch $srcdir/Fix-savannah-bug-62387.patch
 }
 
 build() {