From 704814ff4907be24546895a250d78887b7de59b5 Mon Sep 17 00:00:00 2001
From: max allan <max_allan@hotmail.com>
Date: Fri, 24 Nov 2023 12:32:57 +0000
Subject: [PATCH] Update packages to allow building Wolfi

Signed-off-by: max allan <max_allan@hotmail.com>
---
 Makefile              |  8 ++++----
 busybox.yaml          |  6 +++---
 busybox/busyboxconfig | 19 ++++++++++++++-----
 file.yaml             |  4 ++--
 ncurses.yaml          | 12 ++++++------
 zlib.yaml             |  4 ++--
 6 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index f32e5b6..dd7021e 100644
--- a/Makefile
+++ b/Makefile
@@ -8,10 +8,10 @@ CACHE_DIR ?= gs://wolfi-sources/
 M4_VERSION ?= 1.4.19-r1
 BISON_VERSION ?= 3.8.2-r1
 FLEX_VERSION ?= 2.6.4-r0
-ZLIB_VERSION ?= 1.2.13-r0
+ZLIB_VERSION ?= 1.3-r0
 BZIP2_VERSION ?= 1.0.8-r0
 PERL_VERSION ?= 5.36.0-r0
-NCURSES_VERSION ?= 6.3-r1
+NCURSES_VERSION ?= 6.4-r0
 TEXINFO_VERSION ?= 6.8-r0
 GMP_VERSION ?= 6.2.1-r2
 ISL_VERSION ?= 0.24-r1
@@ -36,11 +36,11 @@ READLINE_VERSION ?= 8.1.2-r0
 SQLITE_VERSION ?= 3.39.2-r0
 PYTHON3_VERSION ?= 3.10.6-r0
 GLIBC_VERSION ?= 2.36-r0
-BUSYBOX_VERSION ?= 1.35.0-r2
+BUSYBOX_VERSION ?= 1.36.1-r0
 CA_CERTIFICATES_VERSION ?= 20220614-r1
 GZIP_VERSION ?= 1.12-r1
 GREP_VERSION ?= 3.7-r1
-FILE_VERSION ?= 5.43-r0
+FILE_VERSION ?= 5.45-r0
 SED_VERSION ?= 4.8-r1
 WGET_VERSION ?= 1.21.3-r1
 BUILD_BASE_VERSION ?= 1-r2
diff --git a/busybox.yaml b/busybox.yaml
index c35495e..a82eeda 100644
--- a/busybox.yaml
+++ b/busybox.yaml
@@ -1,7 +1,7 @@
 package:
   name: busybox
-  version: 1.35.0
-  epoch: 2
+  version: 1.36.1
+  epoch: 0
   description: "swiss-army knife for embedded systems"
   target-architecture:
     - all
@@ -38,7 +38,7 @@ pipeline:
   - uses: fetch
     with:
       uri: https://distfiles.alpinelinux.org/distfiles/edge/busybox-1.35.0.tar.bz2
-      expected-sha256: faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694
+      expected-sha256: b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314
   - name: Configure
     runs: |
       cp busyboxconfig .config
diff --git a/busybox/busyboxconfig b/busybox/busyboxconfig
index ebf00ed..054c52f 100644
--- a/busybox/busyboxconfig
+++ b/busybox/busyboxconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.35.0
-# Wed Dec 29 18:18:16 2021
+# Busybox version: 1.36.1
+# Thu Nov 23 13:37:41 2023
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -93,6 +93,9 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SMALL=0
+CONFIG_SHA1_SMALL=3
+CONFIG_SHA1_HWACCEL=y
+CONFIG_SHA256_HWACCEL=y
 CONFIG_SHA3_SMALL=0
 CONFIG_FEATURE_NON_POSIX_CP=y
 # CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
@@ -123,6 +126,9 @@ CONFIG_UNICODE_WIDE_WCHARS=y
 # CONFIG_UNICODE_BIDI_SUPPORT is not set
 # CONFIG_UNICODE_NEUTRAL_TABLE is not set
 CONFIG_UNICODE_PRESERVE_BROKEN=y
+# CONFIG_LOOP_CONFIGURE is not set
+# CONFIG_NO_LOOP_CONFIGURE is not set
+CONFIG_TRY_LOOP_CONFIGURE=y
 
 #
 # Applets
@@ -338,6 +344,7 @@ CONFIG_FEATURE_TR_CLASSES=y
 CONFIG_FEATURE_TR_EQUIV=y
 CONFIG_TRUE=y
 CONFIG_TRUNCATE=y
+CONFIG_TSORT=y
 CONFIG_TTY=y
 CONFIG_UNAME=y
 CONFIG_UNAME_OSNAME="Linux"
@@ -587,7 +594,6 @@ CONFIG_FEATURE_CMDLINE_MODULE_OPTIONS=y
 CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
 # CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
 CONFIG_FEATURE_MODUTILS_ALIAS=y
-CONFIG_FEATURE_MODUTILS_BIN=y
 CONFIG_FEATURE_MODUTILS_SYMBOLS=y
 CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
 CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
@@ -832,10 +838,12 @@ CONFIG_READAHEAD=y
 CONFIG_RFKILL=y
 # CONFIG_RUNLEVEL is not set
 # CONFIG_RX is not set
+CONFIG_SEEDRNG=y
 # CONFIG_SETFATTR is not set
 CONFIG_SETSERIAL=y
 CONFIG_STRINGS=y
 CONFIG_TIME=y
+CONFIG_TREE=y
 # CONFIG_TS is not set
 CONFIG_TTYSIZE=y
 # CONFIG_UBIATTACH is not set
@@ -980,7 +988,7 @@ CONFIG_FEATURE_TELNETD_PORT_DEFAULT=0
 # CONFIG_FEATURE_TFTP_PUT is not set
 # CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
 # CONFIG_TFTP_DEBUG is not set
-# CONFIG_TLS is not set
+CONFIG_TLS=y
 CONFIG_TRACEROUTE=y
 CONFIG_TRACEROUTE6=y
 CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
@@ -1008,6 +1016,7 @@ CONFIG_UDHCPC=y
 CONFIG_FEATURE_UDHCPC_ARPING=y
 CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y
 CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+CONFIG_UDHCPC6_DEFAULT_SCRIPT="/usr/share/udhcpc/default6.script"
 CONFIG_UDHCPC6=y
 CONFIG_FEATURE_UDHCPC6_RFC3646=y
 CONFIG_FEATURE_UDHCPC6_RFC4704=y
@@ -1142,10 +1151,10 @@ CONFIG_ASH_MAIL=y
 CONFIG_ASH_ECHO=y
 CONFIG_ASH_PRINTF=y
 CONFIG_ASH_TEST=y
+CONFIG_ASH_SLEEP=y
 CONFIG_ASH_HELP=y
 CONFIG_ASH_GETOPTS=y
 CONFIG_ASH_CMDCMD=y
-CONFIG_ASH_VERSION_VAR=y
 # CONFIG_CTTYHACK is not set
 # CONFIG_HUSH is not set
 # CONFIG_SHELL_HUSH is not set
diff --git a/file.yaml b/file.yaml
index 548b821..e2a9ee0 100644
--- a/file.yaml
+++ b/file.yaml
@@ -1,6 +1,6 @@
 package:
   name: file
-  version: 5.44
+  version: 5.45
   epoch: 0
   description: "file-type identification utility"
   target-architecture:
@@ -27,7 +27,7 @@ pipeline:
   - uses: fetch
     with:
       uri: http://ftp.astron.com/pub/file/file-${{package.version}}.tar.gz
-      expected-sha256: 3751c7fba8dbc831cb8d7cc8aff21035459b8ce5155ef8b0880a27d028475f3b
+      expected-sha256: fc97f51029bb0e2c9f4e3bffefdaf678f0e039ee872b9de5c002a6d09c784d82
   - name: Configure
     runs: |
       ./configure \
diff --git a/ncurses.yaml b/ncurses.yaml
index 787deea..1c41268 100644
--- a/ncurses.yaml
+++ b/ncurses.yaml
@@ -1,7 +1,7 @@
 package:
   name: ncurses
-  version: 6.3
-  epoch: 1
+  version: 6.4
+  epoch: 0 
   description: "console display library"
   target-architecture:
     - all
@@ -28,15 +28,14 @@ environment:
 pipeline:
   - uses: fetch
     with:
-#      uri: https://invisible-mirror.net/archives/ncurses/current/ncurses-${{package.version}}-20220820.tgz
-      uri: https://distfiles.alpinelinux.org/distfiles/edge/ncurses-${{package.version}}-20220820.tgz
-      expected-sha256: 7b810b01f71609fd31107a0b7794d0940d3ecc10c98ba19e83749419ba0934b9
+      uri: https://distfiles.alpinelinux.org/distfiles/edge/ncurses-${{package.version}}-20230715.tgz
+      expected-sha256: 7a8dc72f7021815ac7d594e9bd74fc13b20ec4d84295e60c04163197e28aada7
   - name: Configure
     runs: |
         ./configure \
           --prefix=/usr \
           --host=${{host.triplet.gnu}} \
-          --mandir=/usr/share/man \
+          --without-manpages \
           --without-ada \
           --without-tests \
           --disable-termcap \
@@ -48,6 +47,7 @@ pipeline:
           --enable-pc-files \
           --with-shared \
           --enable-widec \
+          --with-termlib=tinfo \
           --with-xterm-kbs=DEL
   - uses: autoconf/make
   - uses: autoconf/make-install
diff --git a/zlib.yaml b/zlib.yaml
index 1f8d6c7..fcc7539 100644
--- a/zlib.yaml
+++ b/zlib.yaml
@@ -1,6 +1,6 @@
 package:
   name: zlib
-  version: 1.2.13
+  version: 1.3
   epoch: 0
   description: "a library implementing the zlib compression algorithms"
   target-architecture:
@@ -27,7 +27,7 @@ pipeline:
   - uses: fetch
     with:
       uri: https://zlib.net/zlib-${{package.version}}.tar.gz
-      expected-sha256: b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30
+      expected-sha256: ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e
   - runs: |
       CHOST="${{host.triplet.gnu}}" ./configure \
         --prefix=/usr \