From c56c7ed62bb862eaf2a82d721642b6fcc3aaf3c5 Mon Sep 17 00:00:00 2001
From: PktSurf <smlinux@pktsurf.in>
Date: Mon, 26 Sep 2022 23:21:49 +0530
Subject: [PATCH] Upgraded base/musl to 1.2.3 Upgraded base/gzip to 1.12

---
 base/gzip/gnulibfix    | 185 -----------------------------------------
 base/gzip/gzip.SMBuild |  13 ++-
 base/musl/musl.SMBuild |   7 +-
 3 files changed, 9 insertions(+), 196 deletions(-)
 delete mode 100755 base/gzip/gnulibfix

diff --git a/base/gzip/gnulibfix b/base/gzip/gnulibfix
deleted file mode 100755
index 72b30fa..0000000
--- a/base/gzip/gnulibfix
+++ /dev/null
@@ -1,185 +0,0 @@
-#!/bin/sh
-empty_file() {
-        rm -f "$1"
-        touch "$1"
-}
-
-dir="$1"
-# fix files breaking the build entirely
-for i in freadahead.c fseterr.c ; do empty_file "$dir"/$i ; done
-echo "void close_stdin(void) {}" > "$dir"/closein.c
-
-# fix stuff trying to reimplement libc
-culprits=`cat << EOF
-accept4
-acosl
-alloca
-alphasort
-asinl
-asprintf
-atanl
-atexit
-atoll
-bcopy
-btowc
-chown
-closedir
-cosl
-dirfd
-dprintf
-dup2
-dup3
-_Exit
-expl
-fchdir
-fchown-stub
-fdatasync
-fdopendir
-ffs
-flock
-fnmatch
-forkpty
-fpending
-fprintf
-freeaddrinfo
-fsync
-ftell
-ftruncate
-futimens
-gai_strerror
-getaddrinfo
-getdelim
-getdtablesize
-getgroups
-gethostname
-getline
-getlogin
-getlogin_r
-getnameinfo
-getpagesize
-getpass
-getsubopt
-gettimeofday
-getusershell
-gmtime_r
-grantpt
-imaxabs
-imaxdiv
-inet_ntop
-inet_pton
-isblank
-iswblank
-lchmod
-lchown
-ldexp
-ldexpl
-link
-linkat
-logl
-mbrlen
-mbrtowc
-mbsinit
-memmove
-mempcpy
-mkdtemp
-mkfifo
-mkfifoat
-mknod
-mknodat
-mkstemp
-mktime
-nanosleep
-nl_langinfo
-open
-openat
-opendir
-openpty
-pclose
-perror
-pipe
-pipe2
-poll
-popen
-pread
-pselect
-ptsname
-pwrite
-raise
-readdir
-readlink
-renameat
-rewinddir
-setenv
-sigaction
-sigaddset
-sigdelset
-sigemptyset
-sigfillset
-sigismember
-sigpending
-sigprocmask
-sinl
-snprintf
-spawnattr_destroy
-spawnattr_getdefault
-spawnattr_getflags
-spawnattr_getpgroup
-spawnattr_getsigmask
-spawnattr_init
-spawnattr_setdefault.c
-spawnattr_setflags
-spawnattr_setpgroup
-spawnattr_setsigmask
-spawn_faction_addclose
-spawn_faction_adddup2
-spawn_faction_addopen
-spawn_faction_destroy
-spawn_faction_init
-spawn_factions_addopen
-spawn_factions_destroy
-spawn_factions_init
-sprintf
-sqrtl
-stdio-read
-stdio-write
-strcasecmp
-strcasestr
-strchrnul
-strcspn
-strncasecmp
-strndup
-strnlen
-strpbrk
-strsep
-strsignal
-strstr
-strtod
-strtoimax
-strtol
-symlink
-symlinkat
-tanl
-tcgetsid
-timegm
-time_r
-times
-tmpfile
-uname
-unlockpt
-unsetenv
-usleep
-vasprintf
-vdprintf
-waitpid
-wcrtomb
-wctob
-EOF
-`
-#fixme check fsusage
-flags="-Drpl_tzset=tzset -Drpl_localtime=localtime -Dgnu_fnmatch=fnmatch \
-       -Dposix_fnmatch=fnmatch -Drpl_gmtime=gmtime"
-for i in $culprits ; do
-	empty_file "$dir"/$i.c
-	flags="$flags -Drpl_$i=$i"
-done
-printf "%s\n" "$flags"
diff --git a/base/gzip/gzip.SMBuild b/base/gzip/gzip.SMBuild
index 42c319d..e52c6e7 100755
--- a/base/gzip/gzip.SMBuild
+++ b/base/gzip/gzip.SMBuild
@@ -1,5 +1,5 @@
 app=gzip
-version=1.10
+version=1.12
 build=1sml
 homepage="https://www.gnu.org/software/gzip/"
 download="https://ftp.gnu.org/gnu/gzip/gzip-$version.tar.gz"
@@ -14,13 +14,10 @@ build() {
   cd $app-$version
   fixbuilddirpermissions
 
-  #$srcdir/gnulibfix lib
-  #CPPFLAGS="-Drpl_fdopendir=fdopendir -DS_IRWXUGO=077 -DO_BINARY=0" \
   ./configure \
-    --prefix="" \
-    --sysconfdir=/etc 
+    --prefix="" 
 
-  make V=1
+  make
   make install DESTDIR=$pkg
 
   cp COPYING $pkgdocs/
@@ -29,5 +26,5 @@ build() {
 }
 
 sha512sums="
-7939043e74554ced0c1c05d354ab4eb36cd6dce89ad79d02ccdc5ed6b7ee390759689b2d47c07227b9b44a62851afe7c76c4cae9f92527d999f3f1b4df1cccff  gzip-1.10.tar.gz
-"
+09b441299039479488700b7ef267ab7f71268af0d648d32cf6b1efcac58e59f1f352fa9d4f95278e96a76dc21239be1a5acab319bc85a7501cf5d8573c83d857  gzip-1.12.tar.gz
+"
\ No newline at end of file
diff --git a/base/musl/musl.SMBuild b/base/musl/musl.SMBuild
index 100781e..33a002d 100755
--- a/base/musl/musl.SMBuild
+++ b/base/musl/musl.SMBuild
@@ -1,10 +1,11 @@
 app=musl
-version=1.1.24
+version=1.2.3
 build=1sml
 homepage="http://www.musl-libc.org/"
 download="https://musl.libc.org/releases/musl-$version.tar.gz"
 desc="Simple, fast and POSIX-compliant C library"
 requires="musl"
+preservestaticlibs=1
 
 build() {
   mkandenterbuilddir
@@ -49,7 +50,7 @@ build() {
 }
 
 sha512sums="
-5a8c719897b4d24ba7c0d7d584fdc57f46bb65bb9c7ca4b1d03d54cf8b5fd15697ccc5536d3e4e2a907624cfb0926877b8e7fa2b2ef961c3ea4458b7b3ca930c  musl-1.1.24.tar.lz
+9332f713d3eb7de4369bc0327d99252275ee52abf523ee34b894b24a387f67579787f7c72a46cf652e090cffdb0bc3719a4e7b84dca66890b6a37f12e8ad089c  musl-1.2.3.tar.gz
 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d  getconf.c
 378d70e65bcc65bb4e1415354cecfa54b0c1146dfb24474b69e418cdbf7ad730472cd09f6f103e1c99ba6c324c9560bccdf287f5889bbc3ef0bdf0e08da47413  getent.c
 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf  iconv.c
@@ -59,4 +60,4 @@ fb9ee91cf8fd6330727b67fee8f4f7c4e603839c5cbd8fa9e838bf2f5f68558119d0535de54643d5
 19cec4d39310285eb49ad1beae86884080e0152f9477757513050211b31f95ee7283a64ae95939683df09231cfb021ace816b26981ad05f4fff0a39519f935fe  queue.h
 cd57bec6b2462b08b54dcfc6ba37e1d5289fcdd9463f22ea091679aa8006e24d89c9d57637c0e7a5bfbf02d06e93aa4cb3c0d066400aa1b698a8ae66a9cb7b8e  stab.h
 07cb70f2f0ddb31e23dd913c6f561fc9885667c5803fdf3a559676c99d08834b4104589bacb5d17b4a0b379c68c81a1cf3173832b3da33a7b936fa7b93706844  tree.h
-"
+"
\ No newline at end of file