aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authoromni <omni+alpine@hack.org>2021-03-29 02:47:27 +0000
committerAriadne Conill <ariadne@dereferenced.org>2021-03-29 10:09:16 -0600
commit103603417028376db369a808803cb6587d04b99c (patch)
tree400bb76e0a249f1484a519c8131454024d23ac1e /main
parent03b303c8e4000b81de3c776e34514b7eda16af9b (diff)
downloadaports-103603417028376db369a808803cb6587d04b99c.tar.gz
aports-103603417028376db369a808803cb6587d04b99c.tar.bz2
aports-103603417028376db369a808803cb6587d04b99c.tar.xz
main/s390-tools: upgrade to 2.16.0
[AC: add patches for iucvterm and zkey ekmfweb install rules, change CFLAGS use to CPPFLAGS so that zkey paths don't get clobbered.]
Diffstat (limited to 'main')
-rw-r--r--main/s390-tools/0002-musl-fixes.patch2
-rw-r--r--main/s390-tools/0009-link-libexecinfo.patch2
-rw-r--r--main/s390-tools/0300-disable-program-using-gnu-ext.patch2
-rw-r--r--main/s390-tools/0400-busybox-compat.patch27
-rw-r--r--main/s390-tools/0500-remove-lib64.patch74
-rw-r--r--main/s390-tools/APKBUILD24
-rw-r--r--main/s390-tools/argz.patch21
-rw-r--r--main/s390-tools/iucvterm-gettext.patch11
-rw-r--r--main/s390-tools/zkey-ekmfweb-install.patch11
9 files changed, 88 insertions, 86 deletions
diff --git a/main/s390-tools/0002-musl-fixes.patch b/main/s390-tools/0002-musl-fixes.patch
index 90de1f34dd..50da3b256f 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
index bcb7fc0c9d..4531dda6c8 100644
--- a/main/s390-tools/0009-link-libexecinfo.patch
+++ b/main/s390-tools/0009-link-libexecinfo.patch
@@ -2,7 +2,7 @@ diff --git a/common.mak b/common.mak
index 9c349e5..0a5fd69 100644
--- a/common.mak
+++ b/common.mak
-@@ -231,6 +231,7 @@ else
+@@ -244,6 +244,7 @@ else
NO_PIE_LINKFLAGS :=
NO_PIE_LDFLAGS :=
endif
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 d65ca5ca27..be3a8a8b44 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 745196323a..be9f841165 100644
--- a/main/s390-tools/0400-busybox-compat.patch
+++ b/main/s390-tools/0400-busybox-compat.patch
@@ -1,6 +1,6 @@
--- a/libekmfweb/Makefile
+++ b/libekmfweb/Makefile
-@@ -73,13 +73,13 @@
+@@ -73,13 +73,13 @@ libekmfweb.so.$(VERSION): ALL_LDFLAGS +=
-Wl,-z,defs,-Bsymbolic -Wl,-soname,libekmfweb.so.$(VERM)
libekmfweb.so.$(VERSION): ekmfweb.o utilities.o cca.o
$(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@
@@ -10,23 +10,12 @@
+ 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
---- a/zkey/ekmfweb/Makefile
-+++ b/zkey/ekmfweb/Makefile
-@@ -48,7 +48,7 @@
- $(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
-
- clean:
- rm -f *.o zkey-ekmfweb.so install-libekmfweb.dep libekmfweb.dep
diff --git a/main/s390-tools/0500-remove-lib64.patch b/main/s390-tools/0500-remove-lib64.patch
index b554014f94..281115d70d 100644
--- a/main/s390-tools/0500-remove-lib64.patch
+++ b/main/s390-tools/0500-remove-lib64.patch
@@ -1,47 +1,6 @@
---- 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
--- a/common.mak
+++ b/common.mak
-@@ -163,7 +163,7 @@
+@@ -168,7 +168,7 @@ USRSBINDIR = $(INSTALLDIR)/usr/sbin
USRBINDIR = $(INSTALLDIR)/usr/bin
BINDIR = $(INSTALLDIR)/sbin
LIBDIR = $(INSTALLDIR)/lib
@@ -50,12 +9,26 @@
SYSCONFDIR = $(INSTALLDIR)/etc
MANDIR = $(INSTALLDIR)/usr/share/man
VARDIR = $(INSTALLDIR)/var
-@@ -179,10 +179,10 @@
+@@ -179,10 +179,10 @@ ZFCPDUMP_DIR = $(TOOLS_LIBDIR)/zfcpdu
+ # for SYSTEMDSYSTEMUNITDIR (e.g. /lib/systemd/system)
+ SYSTEMDSYSTEMUNITDIR =
+ USRINCLUDEDIR = $(INSTALLDIR)/usr/include
+-ZKEYKMSPLUGINDIR = $(USRLIB64DIR)/zkey
++ZKEYKMSPLUGINDIR = $(USRLIBDIR)/zkey
+
+ ifeq ($(LIBDIR),$(INSTALLDIR)/lib)
+-SOINSTALLDIR = $(USRLIB64DIR)
++SOINSTALLDIR = $(USRLIBDIR)
+ else
+ SOINSTALLDIR = $(LIBDIR)
+ endif
+@@ -191,11 +191,11 @@ INSTDIRS = $(USRSBINDIR) $(USRBIN
$(SYSCONFDIR) $(SYSCONFDIR)/sysconfig \
$(TOOLS_LIBDIR) $(TOOLS_DATADIR) \
$(ZFCPDUMP_DIR) $(SYSTEMDSYSTEMUNITDIR) \
-- $(USRLIB64DIR) $(USRINCLUDEDIR)
-+ $(USRLIBDIR) $(USRINCLUDEDIR)
+- $(USRLIB64DIR) $(USRINCLUDEDIR) $(ZKEYKMSPLUGINDIR) \
++ $(USRLIBDIR) $(USRINCLUDEDIR) $(ZKEYKMSPLUGINDIR) \
+ $(SOINSTALLDIR)
OWNER = $(shell id -un)
GROUP = $(shell id -gn)
-export INSTALLDIR BINDIR LIBDIR USRLIB64DIR MANDIR OWNER GROUP
@@ -63,3 +36,14 @@
# 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 55ca18df45..392670fe84 100644
--- a/main/s390-tools/APKBUILD
+++ b/main/s390-tools/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Tuan Hoang <tmhoang@linux.ibm.com>
pkgname=s390-tools
-pkgver=2.15.1
+pkgver=2.16.0
pkgrel=0
pkgdesc="Tools for use with the s390 Linux kernel and device drivers"
url="https://github.com/ibm-s390-tools/s390-tools"
@@ -28,6 +28,8 @@ 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
+ zkey-ekmfweb-install.patch
argz.c
argz.h
@@ -40,8 +42,9 @@ 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="-D_GNU_SOURCE" \
HAVE_GLIB=0 \
+ HAVE_GLIB2=0 \
HAVE_PFM=0 \
DISTRELEASE="Alpine" \
LIBEXECINFO_LIBS="-lexecinfo"
@@ -51,25 +54,28 @@ build() {
package() {
make DESTDIR="$pkgdir" DISTRELEASE="Alpine" \
HAVE_GLIB=0 \
+ HAVE_GLIB2=0 \
HAVE_PFM=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="d0866e2f372ba2938ccab264846d6cfe3db1b760cff6645fbefcd33a8ce8e7d971e442ccefda7e8e4d59818293147caa57fa593a3e66cd77e1e661928336793c s390-tools-2.16.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
+c7875cf1cc2de462f481aa0c9bcad14b9bea6aeba18260d5e8686995aefcaa5cbf0e8811046ed25ab70e7c4ada6c7c353debbf3e2cdfefa06c599d8b4b762ee5 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
+89ca081aabb5d0f8868ce171cf27265f127585dc57f9950b3ee24d31c1a9a0c25026da77724dc96be8d579768625fee9b2b1214647355dffb49e338dfce18092 0300-disable-program-using-gnu-ext.patch
+bbd917fd845bd56b742c5bbce571fdf57875819fdd8c9c0ade9a30afb825bb9f3523d034f7362ca6f2e0f098ca8219472c00a01b80afebfb38ef4167fe2fcd82 0400-busybox-compat.patch
+6448e549dbe9b71026c2d57561a3b317cc74475774b00d72cc60ab323ba65c064224413754f68479d005786cc2602b4df348073b53dc815cede99fcaf0de6f60 0500-remove-lib64.patch
1627d1aa9ac485b3271c0629ec573ce1fdebb72d4ecb9ea9af7968a6a568cf0c6d728afff4389551ab80e0b863c971df18e7781d8280ade4653ca5bd03ade8dc bash.patch
-76ac09da991da94e74639fbdc1a3cafcc3c92587c0a9b3eef27cc5349c0f0e319d9ff0ec7ef751aaf5271c24a92ef6cd27f1c30fa83552acf5122f9845f8f72d argz.patch
+371999cb70113d5f9a452c6c7a8964e46f4829936a13c5d0530b107dc64617a34114711d66987a74ea743485f03c581ac0559f4b99c2d198f3d61a87199644a0 argz.patch
+c3746ea9e5c638a7adc51bfd8ffebc34f2be45d8d816e9f5711ba8f238fe028f711c91c6732a08a8088e32261f769e2e41a079997295e146082212b8fa84a246 iucvterm-gettext.patch
+69fb1884695f6fccfd2ee83f112a23002a45b1f74b430581f2adcfaede399c1403bac628e853a5a8fd5cb645e44dbfe0ba89015c8bc2848a3a7ef484c866717f zkey-ekmfweb-install.patch
2e573314d4c4ed90b61da28de22ae8e2f68ced5489f7e5e0b30f51b776efaf40c1f781d3b485418572d8f33a169fa6946b7358cbd4a7de5a3724b20ed622262b argz.c
50bd5c0f555963dadbfaa72df5bf0801a48743d6d0feddb6ebfa4ffa410196216c1860d3a577361e035169fea4217aef3f04d69394c59db65b60c5ea29eba8cb argz.h
5e19ccfce59a2a79863db676b0ea4280cb9016cda1a30dc233526f52425c305410dd148453b75c2613acac37e364305ee25f8e545d57c5059cca19a13bac2a5e Makefile.argz
diff --git a/main/s390-tools/argz.patch b/main/s390-tools/argz.patch
index 8623866c4b..f7b3836f65 100644
--- a/main/s390-tools/argz.patch
+++ b/main/s390-tools/argz.patch
@@ -15,7 +15,7 @@ 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)
diff --git a/main/s390-tools/iucvterm-gettext.patch b/main/s390-tools/iucvterm-gettext.patch
new file mode 100644
index 0000000000..9d8ded6e84
--- /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/zkey-ekmfweb-install.patch b/main/s390-tools/zkey-ekmfweb-install.patch
new file mode 100644
index 0000000000..b7678d0403
--- /dev/null
+++ b/main/s390-tools/zkey-ekmfweb-install.patch
@@ -0,0 +1,11 @@
+--- s390-tools-2.16.0.orig/zkey/ekmfweb/Makefile
++++ s390-tools-2.16.0/zkey/ekmfweb/Makefile
+@@ -46,7 +46,7 @@
+ $(INSTALL) -d -m 755 $(DESTDIR)$(MANDIR)/man1
+ $(INSTALL) -m 644 -c zkey-ekmfweb.1 $(DESTDIR)$(MANDIR)/man1
+ $(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