aboutsummaryrefslogtreecommitdiffstats
path: root/main/s390-tools
diff options
context:
space:
mode:
Diffstat (limited to 'main/s390-tools')
-rw-r--r--main/s390-tools/0002-musl-fixes.patch2
-rw-r--r--main/s390-tools/0009-link-libexecinfo.patch12
-rw-r--r--main/s390-tools/0300-disable-program-using-gnu-ext.patch2
-rw-r--r--main/s390-tools/0400-busybox-compat.patch81
-rw-r--r--main/s390-tools/0500-remove-lib64.patch73
-rw-r--r--main/s390-tools/APKBUILD49
-rw-r--r--main/s390-tools/argz.patch71
-rw-r--r--main/s390-tools/bash.patch13
-rw-r--r--main/s390-tools/iucvterm-gettext.patch11
-rw-r--r--main/s390-tools/lfs64.patch43
-rw-r--r--main/s390-tools/no-execinfo.patch56
-rw-r--r--main/s390-tools/osasnmpd-Fix-missing-semicolon.patch32
-rw-r--r--main/s390-tools/zipl-disable-fortify-source.patch13
13 files changed, 318 insertions, 140 deletions
diff --git a/main/s390-tools/0002-musl-fixes.patch b/main/s390-tools/0002-musl-fixes.patch
index 90de1f34dd4..50da3b256f6 100644
--- a/main/s390-tools/0002-musl-fixes.patch
+++ b/main/s390-tools/0002-musl-fixes.patch
@@ -1,6 +1,6 @@
--- a/dasdfmt/dasdfmt.h
+++ b/dasdfmt/dasdfmt.h
-@@ -65,13 +65,13 @@
+@@ -69,13 +69,13 @@
"is in invalid format\n",prog_name);}
typedef struct bootstrap1 {
diff --git a/main/s390-tools/0009-link-libexecinfo.patch b/main/s390-tools/0009-link-libexecinfo.patch
deleted file mode 100644
index bcb7fc0c9d6..00000000000
--- a/main/s390-tools/0009-link-libexecinfo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/common.mak b/common.mak
-index 9c349e5..0a5fd69 100644
---- a/common.mak
-+++ b/common.mak
-@@ -231,6 +231,7 @@ else
- NO_PIE_LINKFLAGS :=
- NO_PIE_LDFLAGS :=
- endif
-+LDLIBS += $(LIBEXECINFO_LIBS)
-
- # Overwrite implicite makefile rules for having nice compile output
- %.o: %.c
diff --git a/main/s390-tools/0300-disable-program-using-gnu-ext.patch b/main/s390-tools/0300-disable-program-using-gnu-ext.patch
index d65ca5ca27f..be3a8a8b44b 100644
--- a/main/s390-tools/0300-disable-program-using-gnu-ext.patch
+++ b/main/s390-tools/0300-disable-program-using-gnu-ext.patch
@@ -10,4 +10,4 @@ cpuplugd : feenableexcept function
+ vmconvert vmcp man mon_tools dasdinfo vmur ipl_tools \
ziomon iucvterm hyptop cmsfs-fuse qethqoat zfcpdump zdsfs cpumf \
systemd hmcdrvfs cpacfstats zdev dump2tar zkey netboot etc zpcictl \
- genprotimg lsstp
+ genprotimg lsstp hsci
diff --git a/main/s390-tools/0400-busybox-compat.patch b/main/s390-tools/0400-busybox-compat.patch
index 745196323ad..102e63d6eb7 100644
--- a/main/s390-tools/0400-busybox-compat.patch
+++ b/main/s390-tools/0400-busybox-compat.patch
@@ -1,8 +1,10 @@
+diff --git a/libekmfweb/Makefile b/libekmfweb/Makefile
+index 1c77699..16f89c3 100644
--- a/libekmfweb/Makefile
+++ b/libekmfweb/Makefile
-@@ -73,13 +73,13 @@
+@@ -91,13 +91,13 @@ libekmfweb.so.$(VERSION): ALL_LDFLAGS += -shared -Wl,--version-script=libekmfweb
-Wl,-z,defs,-Bsymbolic -Wl,-soname,libekmfweb.so.$(VERM)
- libekmfweb.so.$(VERSION): ekmfweb.o utilities.o cca.o
+ libekmfweb.so.$(VERSION): ekmfweb.o utilities.o cca.o $(libs)
$(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@
- ln -srf libekmfweb.so.$(VERSION) libekmfweb.so.$(VERM)
- ln -srf libekmfweb.so.$(VERSION) libekmfweb.so
@@ -10,23 +12,74 @@
+ ln -sf libekmfweb.so.$(VERSION) libekmfweb.so
install-libekmfweb.so.$(VERSION): libekmfweb.so.$(VERSION)
-- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 -T libekmfweb.so.$(VERSION) $(DESTDIR)$(USRLIB64DIR)/libekmfweb.so.$(VERSION)
-- ln -srf $(DESTDIR)$(USRLIB64DIR)/libekmfweb.so.$(VERSION) $(DESTDIR)$(USRLIB64DIR)/libekmfweb.so.$(VERM)
-- ln -srf $(DESTDIR)$(USRLIB64DIR)/libekmfweb.so.$(VERSION) $(DESTDIR)$(USRLIB64DIR)/libekmfweb.so
-+ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 libekmfweb.so.$(VERSION) $(DESTDIR)$(USRLIB64DIR)/libekmfweb.so.$(VERSION)
-+ ln -sf $(DESTDIR)$(USRLIB64DIR)/libekmfweb.so.$(VERSION) $(DESTDIR)$(USRLIB64DIR)/libekmfweb.so.$(VERM)
-+ ln -sf $(DESTDIR)$(USRLIB64DIR)/libekmfweb.so.$(VERSION) $(DESTDIR)$(USRLIB64DIR)/libekmfweb.so
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 -T libekmfweb.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so.$(VERSION)
+- ln -srf $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so.$(VERM)
+- ln -srf $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so
++ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 libekmfweb.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so.$(VERSION)
++ ln -sf $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so.$(VERM)
++ ln -sf $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so
$(INSTALL) -d -m 770 $(DESTDIR)$(USRINCLUDEDIR)/ekmfweb
- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 $(rootdir)include/ekmfweb/ekmfweb.h $(DESTDIR)$(USRINCLUDEDIR)/ekmfweb
+ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 $(rootdir)include/ekmfweb/ekmfweb.h $(DESTDIR)$(USRINCLUDEDIR)/ekmfweb
+diff --git a/libkmipclient/Makefile b/libkmipclient/Makefile
+index addd096..9a0b776 100644
+--- a/libkmipclient/Makefile
++++ b/libkmipclient/Makefile
+@@ -114,13 +114,13 @@ libkmipclient.so.$(VERSION): ALL_LDFLAGS += -shared -Wl,--version-script=libkmip
+ libkmipclient.so.$(VERSION): kmip.o request.o response.o attribute.o key.o ttlv.o json.o \
+ xml.o https.o tls.o names.o utils.o
+ $(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@
+- ln -srf libkmipclient.so.$(VERSION) libkmipclient.so.$(VERM)
+- ln -srf libkmipclient.so.$(VERSION) libkmipclient.so
++ ln -sf libkmipclient.so.$(VERSION) libkmipclient.so.$(VERM)
++ ln -sf libkmipclient.so.$(VERSION) libkmipclient.so
+
+ install-libkmipclient.so.$(VERSION): libkmipclient.so.$(VERSION)
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 -T libkmipclient.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so.$(VERSION)
+- ln -srf $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so.$(VERM)
+- ln -srf $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so
++ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 libkmipclient.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so.$(VERSION)
++ ln -sf $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so.$(VERM)
++ ln -sf $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so
+ $(INSTALL) -d -m 770 $(DESTDIR)$(USRINCLUDEDIR)/kmipclient
+ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 $(rootdir)include/kmipclient/kmipclient.h $(DESTDIR)$(USRINCLUDEDIR)/kmipclient
+
+diff --git a/zkey/ekmfweb/Makefile b/zkey/ekmfweb/Makefile
+index 013beb8..c8de734 100644
--- a/zkey/ekmfweb/Makefile
+++ b/zkey/ekmfweb/Makefile
-@@ -48,7 +48,7 @@
+@@ -49,7 +49,7 @@ install: all install-libekmfweb.dep zkey-ekmfweb.so
+ $(INSTALL) -d -m 755 $(DESTDIR)$(MANDIR)/man1
$(INSTALL) -m 644 -c zkey-ekmfweb.1 $(DESTDIR)$(MANDIR)/man1
- $(INSTALL) -d -m 755 $(DESTDIR)$(USRLIB64DIR)
- $(INSTALL) -d -m 755 $(DESTDIR)$(USRLIB64DIR)/zkey
-- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 -T zkey-ekmfweb.so $(DESTDIR)$(USRLIB64DIR)/zkey/zkey-ekmfweb.so
-+ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 zkey-ekmfweb.so $(DESTDIR)$(USRLIB64DIR)/zkey/zkey-ekmfweb.so
+ $(INSTALL) -d -m 755 $(DESTDIR)$(ZKEYKMSPLUGINDIR)
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 -T zkey-ekmfweb.so $(DESTDIR)$(ZKEYKMSPLUGINDIR)/zkey-ekmfweb.so
++ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 zkey-ekmfweb.so $(DESTDIR)$(ZKEYKMSPLUGINDIR)/zkey-ekmfweb.so
clean:
rm -f *.o zkey-ekmfweb.so install-libekmfweb.dep libekmfweb.dep
+diff --git a/zkey/kmip/Makefile b/zkey/kmip/Makefile
+index 14a532e..ca604de 100644
+--- a/zkey/kmip/Makefile
++++ b/zkey/kmip/Makefile
+@@ -50,7 +50,7 @@ install: all install-libkmipclient.dep zkey-kmip.so
+ $(INSTALL) -d -m 755 $(DESTDIR)$(MANDIR)/man1
+ $(INSTALL) -m 644 -c zkey-kmip.1 $(DESTDIR)$(MANDIR)/man1
+ $(INSTALL) -d -m 755 $(DESTDIR)$(ZKEYKMSPLUGINDIR)
+- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 -T zkey-kmip.so $(DESTDIR)$(ZKEYKMSPLUGINDIR)/zkey-kmip.so
++ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 zkey-kmip.so $(DESTDIR)$(ZKEYKMSPLUGINDIR)/zkey-kmip.so
+ $(INSTALL) -d -m 770 $(DESTDIR)$(SYSCONFDIR)/zkey/kmip
+ $(INSTALL) -d -m 770 $(DESTDIR)$(SYSCONFDIR)/zkey/kmip/profiles
+ $(INSTALL) -m 644 -c profiles/*.profile $(DESTDIR)$(SYSCONFDIR)/zkey/kmip/profiles
+diff --git a/chreipl-fcp-mpath/Makefile b/chreipl-fcp-mpath/Makefile
+index e7fb920..f628390 100644
+--- a/chreipl-fcp-mpath/Makefile
++++ b/chreipl-fcp-mpath/Makefile
+@@ -130,7 +130,7 @@ else # $(ENABLE_DOC) != 1
+ # freshness of the man page can be checked, even if `pandoc` is not available,
+ # or ENABLE_DOC disabled.
+
+-MANPAGE_FRESH := $(shell sha256sum --check .chreipl-fcp-mpath.7.cksum >/dev/null && echo 1 || echo 0)
++MANPAGE_FRESH := $(shell sha256sum -c .chreipl-fcp-mpath.7.cksum >/dev/null && echo 1 || echo 0)
+ ifeq ($(MANPAGE_FRESH),0)
+ $(warning chreipl-fcp-mpath.7 is outdated, please regenerate it by calling `make ENABLE_DOC=1`)
+ endif
diff --git a/main/s390-tools/0500-remove-lib64.patch b/main/s390-tools/0500-remove-lib64.patch
index b554014f943..d1e5497cc29 100644
--- a/main/s390-tools/0500-remove-lib64.patch
+++ b/main/s390-tools/0500-remove-lib64.patch
@@ -1,65 +1,24 @@
---- a/zkey/kms.c
-+++ b/zkey/kms.c
-@@ -40,7 +40,7 @@
-
- #define ENVVAR_ZKEY_KMS_PLUGINS "ZKEY_KMS_PLUGINS"
- #define DEFAULT_KMS_PLUGINS "/etc/zkey/kms-plugins.conf"
--#define KMS_PLUGIN_LOCATION "/usr/lib64/zkey"
-+#define KMS_PLUGIN_LOCATION "/usr/lib/zkey"
-
- #define KMS_CONFIG_FILE "kms.conf"
- #define KMS_CONFIG_PROP_KMS "kms"
---- a/libekmfweb/Makefile
-+++ b/libekmfweb/Makefile
-@@ -77,9 +77,9 @@
- ln -sf libekmfweb.so.$(VERSION) libekmfweb.so
-
- install-libekmfweb.so.$(VERSION): libekmfweb.so.$(VERSION)
-- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 libekmfweb.so.$(VERSION) $(DESTDIR)$(USRLIB64DIR)/libekmfweb.so.$(VERSION)
-- ln -sf $(DESTDIR)$(USRLIB64DIR)/libekmfweb.so.$(VERSION) $(DESTDIR)$(USRLIB64DIR)/libekmfweb.so.$(VERM)
-- ln -sf $(DESTDIR)$(USRLIB64DIR)/libekmfweb.so.$(VERSION) $(DESTDIR)$(USRLIB64DIR)/libekmfweb.so
-+ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 libekmfweb.so.$(VERSION) $(DESTDIR)$(USRLIBDIR)/libekmfweb.so.$(VERSION)
-+ ln -sf $(DESTDIR)$(USRLIBDIR)/libekmfweb.so.$(VERSION) $(DESTDIR)$(USRLIBDIR)/libekmfweb.so.$(VERM)
-+ ln -sf $(DESTDIR)$(USRLIBDIR)/libekmfweb.so.$(VERSION) $(DESTDIR)$(USRLIBDIR)/libekmfweb.so
- $(INSTALL) -d -m 770 $(DESTDIR)$(USRINCLUDEDIR)/ekmfweb
- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 $(rootdir)include/ekmfweb/ekmfweb.h $(DESTDIR)$(USRINCLUDEDIR)/ekmfweb
-
---- a/zkey/ekmfweb/Makefile
-+++ b/zkey/ekmfweb/Makefile
-@@ -46,9 +46,9 @@
- install: all install-libekmfweb.dep zkey-ekmfweb.so
- $(INSTALL) -d -m 755 $(DESTDIR)$(MANDIR)/man1
- $(INSTALL) -m 644 -c zkey-ekmfweb.1 $(DESTDIR)$(MANDIR)/man1
-- $(INSTALL) -d -m 755 $(DESTDIR)$(USRLIB64DIR)
-- $(INSTALL) -d -m 755 $(DESTDIR)$(USRLIB64DIR)/zkey
-- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 zkey-ekmfweb.so $(DESTDIR)$(USRLIB64DIR)/zkey/zkey-ekmfweb.so
-+ $(INSTALL) -d -m 755 $(DESTDIR)$(USRLIBDIR)
-+ $(INSTALL) -d -m 755 $(DESTDIR)$(USRLIBDIR)/zkey
-+ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 zkey-ekmfweb.so $(DESTDIR)$(USRLIBDIR)/zkey/zkey-ekmfweb.so
-
- clean:
- rm -f *.o zkey-ekmfweb.so install-libekmfweb.dep libekmfweb.dep
+diff --git a/common.mak b/common.mak
+index 78c678e..ba7cbb4 100644
--- a/common.mak
+++ b/common.mak
-@@ -163,7 +163,7 @@
- USRBINDIR = $(INSTALLDIR)/usr/bin
+@@ -181,7 +181,7 @@ USRBINDIR = $(INSTALLDIR)/usr/bin
BINDIR = $(INSTALLDIR)/sbin
LIBDIR = $(INSTALLDIR)/lib
+ USRLIBDIR = $(INSTALLDIR)/usr/lib
-USRLIB64DIR = $(INSTALLDIR)/usr/lib64
-+USRLIBDIR = $(INSTALLDIR)/usr/lib
++USRLIB64DIR = $(INSTALLDIR)/usr/lib
SYSCONFDIR = $(INSTALLDIR)/etc
MANDIR = $(INSTALLDIR)/usr/share/man
VARDIR = $(INSTALLDIR)/var
-@@ -179,10 +179,10 @@
- $(SYSCONFDIR) $(SYSCONFDIR)/sysconfig \
- $(TOOLS_LIBDIR) $(TOOLS_DATADIR) \
- $(ZFCPDUMP_DIR) $(SYSTEMDSYSTEMUNITDIR) \
-- $(USRLIB64DIR) $(USRINCLUDEDIR)
-+ $(USRLIBDIR) $(USRINCLUDEDIR)
- OWNER = $(shell id -un)
- GROUP = $(shell id -gn)
--export INSTALLDIR BINDIR LIBDIR USRLIB64DIR MANDIR OWNER GROUP
-+export INSTALLDIR BINDIR LIBDIR USRLIBDIR MANDIR OWNER GROUP
-
- # Special defines for zfcpdump
- ZFCPDUMP_IMAGE = zfcpdump-image
+--- a/genprotimg/src/Makefile
++++ b/genprotimg/src/Makefile
+@@ -43,7 +43,7 @@ LIBCRYPTO_LIBS := $(shell pkg-config --s
+ LIBCURL_CFLAGS := $(shell pkg-config --silence-errors --cflags libcurl)
+ LIBCURL_LIBS := $(shell pkg-config --silence-errors --libs libcurl)
+ else
+-GLIB2_CFLAGS := -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
++GLIB2_CFLAGS := -I/usr/include/glib-2.0
+ GLIB2_LIBS := -lglib-2.0
+ LIBCRYPTO_CFLAGS :=
+ LIBCRYPTO_LIBS := -lcrypto
diff --git a/main/s390-tools/APKBUILD b/main/s390-tools/APKBUILD
index 55ca18df45e..13933582b2c 100644
--- a/main/s390-tools/APKBUILD
+++ b/main/s390-tools/APKBUILD
@@ -1,25 +1,24 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Tuan Hoang <tmhoang@linux.ibm.com>
pkgname=s390-tools
-pkgver=2.15.1
-pkgrel=0
+pkgver=2.23.0
+pkgrel=2
pkgdesc="Tools for use with the s390 Linux kernel and device drivers"
url="https://github.com/ibm-s390-tools/s390-tools"
arch="s390x"
license="MIT"
options="!check" # No test suite
depends="bash"
-makedepends="linux-headers libexecinfo-dev zlib-dev fuse-dev ncurses-dev openssl-dev
- cryptsetup-dev json-c-dev net-snmp-dev curl-dev"
+makedepends="linux-headers zlib-dev fuse3-dev ncurses-dev openssl-dev>3 libxml2-dev
+ cryptsetup-dev json-c-dev net-snmp-dev curl-dev liblockfile-dev"
triggers="$pkgname.trigger=/boot"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-dbg"
source="$pkgname-$pkgver.tar.gz::https://github.com/ibm-s390-tools/s390-tools/archive/v$pkgver.tar.gz
0002-musl-fixes.patch
0004-missing-time-header.patch
0006-define-path-mounted.patch
0007-tunedasd-no-need-error-h.patch
0008-iucvterm-no-nls.patch
- 0009-link-libexecinfo.patch
0010-musl-s390x-signal-def.patch
0200-dasdinfo-gnu-ext-hack.patch
@@ -28,6 +27,11 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/ibm-s390-tools/s390-tools/ar
0500-remove-lib64.patch
bash.patch
argz.patch
+ iucvterm-gettext.patch
+ no-execinfo.patch
+ zipl-disable-fortify-source.patch
+ osasnmpd-Fix-missing-semicolon.patch
+ lfs64.patch
argz.c
argz.h
@@ -40,37 +44,46 @@ build() {
cp "$srcdir"/argz.h "$builddir"/include/argz.h
cp "$srcdir"/argz.c "$builddir"/libargz/argz.c
cp "$srcdir"/Makefile.argz "$builddir"/libargz/Makefile
- make V=1 CFLAGS="$CFLAGS -D_GNU_SOURCE" \
+ make V=1 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" \
HAVE_GLIB=0 \
+ HAVE_GLIB2=0 \
HAVE_PFM=0 \
- DISTRELEASE="Alpine" \
- LIBEXECINFO_LIBS="-lexecinfo"
+ HAVE_LIBUDEV=0 \
+ DISTRELEASE="Alpine"
gcc -Wall -o mk-s390-cdboot "$srcdir"/mk-s390-cdboot.c
}
package() {
make DESTDIR="$pkgdir" DISTRELEASE="Alpine" \
HAVE_GLIB=0 \
+ HAVE_GLIB2=0 \
HAVE_PFM=0 \
+ HAVE_LIBUDEV=0 \
install
install -Dm755 mk-s390-cdboot "$pkgdir"/sbin/mk-s390-cdboot
}
-sha512sums="a62ab491bac153b78161b7b1fb80ef1aa5ddb8657a9329f5ad9f8a16f106a9a9af1a37ceb328ed34eb44adb406207faec12ed0fb6648b5198498bf2fd411f0cf s390-tools-2.15.1.tar.gz
-c114bbd55833fa82f7cce3beb854141f59dbb187ba59cc829378940cf738d0748314aef3fccd27ff2bb75a0f681989a997731172fa01fe0e1da0377bc07bfdb2 0002-musl-fixes.patch
+sha512sums="
+839ea737db0bbfb2c726c757867e5d38b771282aa3484b90c3cc6376efa6c564874fe62879dccc8c5547a768e29aa5389ecf20d244574c5479887504addaee3b s390-tools-2.23.0.tar.gz
+ca1ba0f4c76c1441589138fafbd9f6fc2423cc086301fcb18eb9f47f7884c279cf73cc9e74f4cde305775bd6fa5bf2f9450385ad02b5a20671e59c604823efb5 0002-musl-fixes.patch
6e0f8d999eef08677e9f80d1a07e01556474723b9b00435d463428eee22babe4489257ad5c8fffb650bd0fd5714cdac01dc926e1402f9741fc1327d177ece897 0004-missing-time-header.patch
e41548d83d53e4371afcee3601505520506d05b932aeb91f1ca86e589c010fa5d22777d4617c1e25adfc04fbcf45289cf65a8100108c878323e125e312579220 0006-define-path-mounted.patch
ecfbba213d2a705e2a5a2697090f659670ca1a12e4568c1de87f17d11d72a1a6c524b23b4db25c0558b4e8239c27afddb94d8887d93170b359d77985018f9b9c 0007-tunedasd-no-need-error-h.patch
bdbeb6f3873ede82487c7e4fcac84aa2bf8a922991ec32d029a64cd7142625f5a99920db0f1b6935805d7371ae5a7640c5ea577969937dd96c4f4f996b909ac3 0008-iucvterm-no-nls.patch
-c8a1ffcdd8d3ff278d86e37ef08a46f6df0b5c39dd3e26a64a8fc27c6a5dfdb658aa0733e149868153f276b36488f0814b5f8612601e317adf092492eaef55c6 0009-link-libexecinfo.patch
f785a899583de8592422e5e46c4e4893196e3c7885e4a0bb4c717c3587db8c1a4c264c80337b1d0c31b39150f3c3b71b876fe156086ace3a542c12678ae7c85e 0010-musl-s390x-signal-def.patch
f5e06e28f77c44f591d74f383ce308a6bfb129b00b291601f2be8866dd1382c597348794be2109c9dc0fa8fdbbee509d036fa6c215e73c4c99f476d3c1cb5a83 0200-dasdinfo-gnu-ext-hack.patch
-a837df6e526aaaa1309c37238a4a198c60355bf57b321c49ef0df1a84ffd1e28e9f56d3d123a91a53ccc724027fd5cccc06132764bbdcb26f349115f21b6aaaa 0300-disable-program-using-gnu-ext.patch
-038a5cb43f35fd11255160b09deebfcadad90f471d38e1c91c53ba5c3a1f6748447e3cfedacd54cd726b3a533ed632ac160094a98b861bee59ec005445d0b45c 0400-busybox-compat.patch
-fff9b7c4d83b11cfb6ceed2bd7bd9039d0469c02e4bd362c87c112d86fc975da6758a144aec2d21c7286f6ede22008b60e6e1781a4b52c0a4b10627ec1e52b63 0500-remove-lib64.patch
-1627d1aa9ac485b3271c0629ec573ce1fdebb72d4ecb9ea9af7968a6a568cf0c6d728afff4389551ab80e0b863c971df18e7781d8280ade4653ca5bd03ade8dc bash.patch
-76ac09da991da94e74639fbdc1a3cafcc3c92587c0a9b3eef27cc5349c0f0e319d9ff0ec7ef751aaf5271c24a92ef6cd27f1c30fa83552acf5122f9845f8f72d argz.patch
+89ca081aabb5d0f8868ce171cf27265f127585dc57f9950b3ee24d31c1a9a0c25026da77724dc96be8d579768625fee9b2b1214647355dffb49e338dfce18092 0300-disable-program-using-gnu-ext.patch
+6d07d0c1f380da42f092038a1434dc1934dead821d6f7c3f8a9e2e85c38e477cf2e34a98d33ac515b67bb0202ca5a469c059d59678c19d9e9bd01456518608e1 0400-busybox-compat.patch
+63853e3fbd07b17884509d949fd0386956fc05f17d85ecf70a00a2828b1624b96d41e0957cf5aa000d1fc276408dc50c586c9468d56111d9397db392282bbaec 0500-remove-lib64.patch
+3577c2e0715a5553f5061354b3ff9d9ab2e52712b140fb24a84471c3d3e0d47acf74e00d4f05d7a94aa82942cf84f8ae0b30ac15dfe32d10ff2d24a7a7c0c41f bash.patch
+5bc7b2b51bd298d0942ff2f96bb9e30d258100ce87b48285fd4dfeb24448f33a3c679789187d4355c487e64057d7f49a44c0d934bb5f427d18fd625e55de5b0c argz.patch
+c3746ea9e5c638a7adc51bfd8ffebc34f2be45d8d816e9f5711ba8f238fe028f711c91c6732a08a8088e32261f769e2e41a079997295e146082212b8fa84a246 iucvterm-gettext.patch
+797ea51f24b2bb0ff0e14a5626d8b13d5ed93f083f7c3366d2e7b6be7102fc5f092c241686e6f5738ee0096d389e0d1490ebc87402541cba83b92c8059cacbdc no-execinfo.patch
+bb4925d3ad1c128af5f7072b94228a2efa4bd2a227dd2de6badec6b5d846b1fbf116228f8f514f3c5d86b1b51597d9bc2c47149d723e3b1944ceed6c5fe7fd60 zipl-disable-fortify-source.patch
+6563c53138d9a1a385a947bede29661c1c862d05102ee271cfda7270333e737444c2c576af99fa567a75b8659b03193bb0a437b0910d0476c6b6dbe4554e7fcf osasnmpd-Fix-missing-semicolon.patch
+ab1bc0273fdd529fe4dcf20d3d8760d30702d670bbef1f173951d12fe2a62344c8b81209296c103c2ae06c62b2a771121eb41e2d88c08b6a0e19027f9b23a947 lfs64.patch
2e573314d4c4ed90b61da28de22ae8e2f68ced5489f7e5e0b30f51b776efaf40c1f781d3b485418572d8f33a169fa6946b7358cbd4a7de5a3724b20ed622262b argz.c
50bd5c0f555963dadbfaa72df5bf0801a48743d6d0feddb6ebfa4ffa410196216c1860d3a577361e035169fea4217aef3f04d69394c59db65b60c5ea29eba8cb argz.h
5e19ccfce59a2a79863db676b0ea4280cb9016cda1a30dc233526f52425c305410dd148453b75c2613acac37e364305ee25f8e545d57c5059cca19a13bac2a5e Makefile.argz
-349eb06895016d16194819c4a04f604720f1373ea61a9bc4c58467281c9a2ed3539bd4e8b6984f4e5177630dbe8b928aa95912c9a3e3b0e1fe275d59f9fe573d mk-s390-cdboot.c"
+349eb06895016d16194819c4a04f604720f1373ea61a9bc4c58467281c9a2ed3539bd4e8b6984f4e5177630dbe8b928aa95912c9a3e3b0e1fe275d59f9fe573d mk-s390-cdboot.c
+"
diff --git a/main/s390-tools/argz.patch b/main/s390-tools/argz.patch
index 8623866c4be..c2d13fcb68d 100644
--- a/main/s390-tools/argz.patch
+++ b/main/s390-tools/argz.patch
@@ -1,21 +1,21 @@
diff --git a/Makefile b/Makefile
-index 6081acc..fe8dd2f 100644
+index 31c4065..95dce2d 100644
--- a/Makefile
+++ b/Makefile
-@@ -3,7 +3,7 @@ ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/ar
- # Include common definitions
- include common.mak
-
--LIB_DIRS = libvtoc libutil libzds libdasd libvmdump libccw libvmcp libekmfweb
-+LIB_DIRS = libargz libvtoc libutil libzds libdasd libvmdump libccw libvmcp libekmfweb
+@@ -8,7 +8,7 @@ include common.mak
+ # LIBS: Libraries that can have a dependency to base libraries
+ # TOOLS: Tools that can have a dependency to base libraries or libraries
+ #
+-BASELIB_DIRS = libutil libseckey
++BASELIB_DIRS = libargz libutil libseckey
+ LIB_DIRS = libvtoc libzds libdasd libvmdump libccw libvmcp libekmfweb \
+ libkmipclient libcpumf
TOOL_DIRS = zipl zdump fdasd dasdfmt dasdview tunedasd \
- tape390 osasnmpd qetharp ip_watcher qethconf scripts zconf \
- vmconvert vmcp man mon_tools dasdinfo vmur ipl_tools \
diff --git a/common.mak b/common.mak
index 0a5fd69..c6f429c 100644
--- a/common.mak
+++ b/common.mak
-@@ -315,6 +315,10 @@ endif
+@@ -329,6 +329,10 @@ endif
# check the library directory via "make -C" when the tools Makefile is
# processed.
@@ -103,9 +103,9 @@ index a44b14b..48c02fb 100644
-libs = $(rootdir)/libutil/libutil.a
+libs = $(rootdir)/libutil/libutil.a $(rootdir)/libargz/libargz.a
- detect-libcryptsetup.dep:
- echo "#include <libcryptsetup.h>" > detect-libcryptsetup.dep
-@@ -88,11 +88,11 @@
+ CFLAGS += -DKMS_PLUGIN_LOCATION=\"$(ZKEYKMSPLUGINDIR)\"
+
+@@ -90,11 +90,11 @@
ep11.h misc.h utils.h
kms.o: kms.c kms.h kms-plugin.h utils.h pkey.h
@@ -121,21 +121,22 @@ index a44b14b..48c02fb 100644
--- a/zkey/ekmfweb/Makefile
+++ b/zkey/ekmfweb/Makefile
-@@ -5,7 +5,7 @@
+@@ -5,7 +5,7 @@ VERM = $(shell echo $(VERSION) | cut -d
all: zkey-ekmfweb.so
-libs = $(rootdir)/libutil/libutil.a
+libs = $(rootdir)/libutil/libutil.a $(rootdir)/libargz/libargz.a
- export LIBRARY_PATH = $(rootdir)/libekmfweb:$LIBRARY_PATH
-
-@@ -29,7 +29,7 @@
+ zkey-ekmfweb.o: zkey-ekmfweb.c zkey-ekmfweb.h ../kms-plugin.h \
+ ../cca.h ../utils.h ../pkey.h ../properties.h \
+@@ -27,7 +27,8 @@ utils.o: ../utils.c ../utils.h ../pkey.h
$(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -fPIC -c $< -o $@
zkey-ekmfweb.so: ALL_CFLAGS += -fPIC
--zkey-ekmfweb.so: LDLIBS = -lekmfweb -ldl -lcrypto
-+zkey-ekmfweb.so: LDLIBS = -lekmfweb -ldl -lcrypto $(LIBEXECINFO_LIBS)
+-zkey-ekmfweb.so: LDLIBS = -L$(rootdir)/libekmfweb -lekmfweb -ldl -lcrypto
++zkey-ekmfweb.so: LDLIBS = -L$(rootdir)/libekmfweb -lekmfweb -ldl -lcrypto \
++ $(LIBEXECINFO_LIBS)
zkey-ekmfweb.so: ALL_LDFLAGS += -shared -Wl,--version-script=zkey-ekmfweb.map \
-Wl,-z,defs,-Bsymbolic -Wl,-soname,zkey-ekmfweb.so.$(VERM)
zkey-ekmfweb.so: zkey-ekmfweb.o properties.o pkey.o cca.o ep11.o utils.o $(libs)
@@ -152,14 +153,36 @@ index 9dcac07..2f87798 100644
#include "lib/util_base.h"
#include "lib/util_libc.h"
diff --git a/libutil/Makefile b/libutil/Makefile
-index ca90f2a..3042f3d 100644
+index 508df5b..647bbbe 100644
--- a/libutil/Makefile
+++ b/libutil/Makefile
@@ -1,6 +1,6 @@
include ../common.mak
--lib = libutil.a
-+lib = libutil.a $(rootdir)/libargz/libargz.a
+-lib := libutil.a
++lib := libutil.a $(rootdir)/libargz/libargz.a
+
+ sources := $(filter-out %_example.c,$(wildcard *.c))
+ objects := $(patsubst %.c,%.o,$(sources))
+diff --git a/zkey/kmip/Makefile b/zkey/kmip/Makefile
+index 14a532e..597c851 100644
+--- a/zkey/kmip/Makefile
++++ b/zkey/kmip/Makefile
+@@ -5,7 +5,7 @@ VERM = $(shell echo $(VERSION) | cut -d '.' -f 1)
+
+ all: zkey-kmip.so
+
+-libs = $(rootdir)/libutil/libutil.a $(rootdir)/libseckey/libseckey.a
++libs = $(rootdir)/libutil/libutil.a $(rootdir)/libargz/libargz.a $(rootdir)/libseckey/libseckey.a
+
+ zkey-kmip.o: zkey-kmip.c zkey-kmip.h ../kms-plugin.h ../plugin-utils.h \
+ ../cca.h ../utils.h ../pkey.h ../properties.h \
+@@ -31,7 +31,7 @@ utils.o: ../utils.c ../utils.h ../pkey.h ../cca.h ../ep11.h ../kms-plugin.h
+ $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -fPIC -c $< -o $@
- examples = util_base_example \
- util_panic_example \
+ zkey-kmip.so: ALL_CFLAGS += -fPIC
+-zkey-kmip.so: LDLIBS = -L$(rootdir)/libkmipclient -lkmipclient -ldl -lcrypto
++zkey-kmip.so: LDLIBS = -L$(rootdir)/libkmipclient -lkmipclient -ldl -lcrypto $(LIBEXECINFO_LIBS)
+ zkey-kmip.so: ALL_LDFLAGS += -shared -Wl,--version-script=zkey-kmip.map \
+ -Wl,-z,defs,-Bsymbolic -Wl,-soname,zkey-kmip.so.$(VERM)
+ zkey-kmip.so: zkey-kmip.o plugin-utils.o properties.o pkey.o cca.o ep11.o \
diff --git a/main/s390-tools/bash.patch b/main/s390-tools/bash.patch
index 3523799303f..4affeb4f97e 100644
--- a/main/s390-tools/bash.patch
+++ b/main/s390-tools/bash.patch
@@ -1,16 +1,3 @@
-diff --git a/scripts/dbginfo.sh b/scripts/dbginfo.sh
-index bac62f0..3bed72a 100755
---- a/scripts/dbginfo.sh
-+++ b/scripts/dbginfo.sh
-@@ -1223,7 +1223,7 @@ exec 8>&1 9>&2 >"${LOGFILE}" 2>&1
- trap emergency_exit SIGHUP SIGINT SIGTERM
-
- pr_log_stdout ""
--pr_log_stdout "Hardware platform = $(uname -i)"
-+pr_log_stdout "Hardware platform = $(uname -m)"
- pr_log_stdout "Kernel version = ${KERNEL_VERSION}.${KERNEL_MAJOR_REVISION}.${KERNEL_MINOR_REVISION} ($(uname -r 2>/dev/null))"
- pr_log_stdout "Runtime environment = ${RUNTIME_ENVIRONMENT}"
- pr_log_stdout ""
diff --git a/zconf/chccwdev b/zconf/chccwdev
index b1140c0..2c3ca6a 100755
--- a/zconf/chccwdev
diff --git a/main/s390-tools/iucvterm-gettext.patch b/main/s390-tools/iucvterm-gettext.patch
new file mode 100644
index 00000000000..9d8ded6e842
--- /dev/null
+++ b/main/s390-tools/iucvterm-gettext.patch
@@ -0,0 +1,11 @@
+--- s390-tools-2.16.0.orig/iucvterm/Makefile
++++ s390-tools-2.16.0/iucvterm/Makefile
+@@ -7,7 +7,7 @@
+ export GETTEXT_TEXTDOMAIN
+
+
+-SUBDIRS = src po doc bin etc test
++SUBDIRS = src doc bin etc test
+ RECURSIVE_TARGETS = all-recursive install-recursive clean-recursive \
+ check-recursive
+
diff --git a/main/s390-tools/lfs64.patch b/main/s390-tools/lfs64.patch
new file mode 100644
index 00000000000..ec15af585d4
--- /dev/null
+++ b/main/s390-tools/lfs64.patch
@@ -0,0 +1,43 @@
+diff --git a/dasdview/dasdview.c b/dasdview/dasdview.c
+index 92a30ea..8c999af 100644
+--- a/dasdview/dasdview.c
++++ b/dasdview/dasdview.c
+@@ -1865,7 +1865,7 @@ static void dasdview_view_standard(dasdview_info_t *info)
+
+ /* seek in SEEK_STEP steps */
+ for (i = 1; i <= j; i++) {
+- rc = lseek64(fd, SEEK_STEP, SEEK_CUR);
++ rc = lseek(fd, SEEK_STEP, SEEK_CUR);
+ if (rc == -1) {
+ printf("*** rc: %d (%d) ***\n", rc, errno);
+ printf("*** j: %llu ***\n", j);
+diff --git a/zipl/src/zipl-editenv.c b/zipl/src/zipl-editenv.c
+index a55e9df..2d62824 100644
+--- a/zipl/src/zipl-editenv.c
++++ b/zipl/src/zipl-editenv.c
+@@ -128,7 +128,7 @@ static int envblk_update(struct zipl_envblk *zeb)
+ if (fs_map(zeb->fd, zeb->offset, &blknr, zeb->size) != 0)
+ goto error_close;
+
+- if (lseek64(dev_fd, blknr * (uint64_t)zeb->size, SEEK_SET) < 0) {
++ if (lseek(dev_fd, blknr * (off_t)zeb->size, SEEK_SET) < 0) {
+ error_reason(strerror(errno));
+ goto error_close;
+ }
+diff --git a/zkey/zkey-cryptsetup.c b/zkey/zkey-cryptsetup.c
+index fae78c7..3238b69 100644
+--- a/zkey/zkey-cryptsetup.c
++++ b/zkey/zkey-cryptsetup.c
+@@ -490,10 +490,10 @@ static int keyfile_seek(int fd, size_t bytes)
+ {
+ size_t next_read;
+ ssize_t bytes_r;
+- off64_t r;
++ off_t r;
+ char *tmp;
+
+- r = lseek64(fd, bytes, SEEK_CUR);
++ r = lseek(fd, bytes, SEEK_CUR);
+ if (r > 0)
+ return 0;
+ if (r < 0 && errno != ESPIPE)
diff --git a/main/s390-tools/no-execinfo.patch b/main/s390-tools/no-execinfo.patch
new file mode 100644
index 00000000000..ba2f0c2fb05
--- /dev/null
+++ b/main/s390-tools/no-execinfo.patch
@@ -0,0 +1,56 @@
+diff --git a/libutil/util_panic.c b/libutil/util_panic.c
+index 59a9a9e..cc21e3d 100644
+--- a/libutil/util_panic.c
++++ b/libutil/util_panic.c
+@@ -9,7 +9,6 @@
+ * it under the terms of the MIT license. See LICENSE for details.
+ */
+
+-#include <execinfo.h>
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -26,6 +25,7 @@
+ */
+ static void print_backtrace(void)
+ {
++ #if 0
+ void *array[256];
+ size_t i, size;
+ char **strings;
+@@ -41,6 +41,7 @@ static void print_backtrace(void)
+ fprintf(stderr, " %s\n", strings[i]);
+
+ free(strings);
++ #endif
+ }
+
+ /*
+diff --git a/zdev/src/misc.c b/zdev/src/misc.c
+index 2f5cbc2..08a2524 100644
+--- a/zdev/src/misc.c
++++ b/zdev/src/misc.c
+@@ -10,7 +10,6 @@
+ #include <ctype.h>
+ #include <dirent.h>
+ #include <errno.h>
+-#include <execinfo.h>
+ #include <limits.h>
+ #include <signal.h>
+ #include <stdarg.h>
+@@ -1258,6 +1257,7 @@ void line_free(int argc, char **argv)
+ /* Used for debugging. */
+ void print_trace(void)
+ {
++ #if 0
+ void *bt[BACKTRACE_MAX];
+ char **bt_sym;
+ int num, i;
+@@ -1268,6 +1268,7 @@ void print_trace(void)
+ for (i = 0; i < num; i++)
+ fprintf(stderr, "DEBUG: %s\n", bt_sym[i]);
+ free(bt_sym);
++ #endif
+ }
+
+ /* Return a textual representation of @config. */
diff --git a/main/s390-tools/osasnmpd-Fix-missing-semicolon.patch b/main/s390-tools/osasnmpd-Fix-missing-semicolon.patch
new file mode 100644
index 00000000000..5d595fadce9
--- /dev/null
+++ b/main/s390-tools/osasnmpd-Fix-missing-semicolon.patch
@@ -0,0 +1,32 @@
+From c62f9306347f6d27a9130547693e1e456ac64a72 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka@redhat.com>
+Date: Fri, 1 Sep 2023 09:31:39 +0200
+Subject: [PATCH] osasnmpd: Fix missing semicolon
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+5.9.4 net-snmp started to require semicolon on the config_require there
+are no docs covering this change.
+
+Link: https://bugzilla.redhat.com/show_bug.cgi?id=2235734
+Closes: https://github.com/ibm-s390-linux/s390-tools/pull/155
+Signed-off-by: Jakub Čajka <jcajka@redhat.com>
+Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
+---
+ osasnmpd/ibmOSAMib.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/osasnmpd/ibmOSAMib.h b/osasnmpd/ibmOSAMib.h
+index 6dc2345d5..2b20684b0 100644
+--- a/osasnmpd/ibmOSAMib.h
++++ b/osasnmpd/ibmOSAMib.h
+@@ -16,7 +16,7 @@
+
+ /* we may use header_generic and header_simple_table from the util_funcs module */
+
+-config_require(util_funcs)
++config_require(util_funcs);
+
+
+ /* function prototypes */
diff --git a/main/s390-tools/zipl-disable-fortify-source.patch b/main/s390-tools/zipl-disable-fortify-source.patch
new file mode 100644
index 00000000000..dda888a8473
--- /dev/null
+++ b/main/s390-tools/zipl-disable-fortify-source.patch
@@ -0,0 +1,13 @@
+diff --git a/zipl/src/Makefile b/zipl/src/Makefile
+index 786bb7f..2a1e10a 100644
+--- a/zipl/src/Makefile
++++ b/zipl/src/Makefile
+@@ -4,7 +4,7 @@ include ../../common.mak
+ ALL_CPPFLAGS += -I../include -I../boot \
+ -DZFCPDUMP_IMAGE="STRINGIFY($(ZFCPDUMP_DIR)/$(ZFCPDUMP_IMAGE))" \
+ -DZFCPDUMP_INITRD="STRINGIFY($(ZFCPDUMP_DIR)/$(ZFCPDUMP_INITRD))" \
+- -D_FILE_OFFSET_BITS=64 $(NO_PIE_CFLAGS)
++ -D_FILE_OFFSET_BITS=64 -U_FORTIFY_SOURCE $(NO_PIE_CFLAGS)
+ ALL_LDFLAGS += -Wl,-z,noexecstack $(NO_PIE_LDFLAGS)
+
+ libs = $(rootdir)/libutil/libutil.a
generated by cgit v1.2.3 (git 2.41.0) at 2024-04-20 03:11:00 +0000