- update to 1.1.0

.gitignore

@@ -1 +1,2 @@
 /smc-tools-1.0.0.tar.gz
+/smc-tools-1.1.0.tar.gz

smc-tools-1.0.0-arm.patch

@@ -1,12 +0,0 @@
-diff -up smc-tools-1.0.0/Makefile.arm smc-tools-1.0.0/Makefile
---- smc-tools-1.0.0/Makefile.arm	2018-01-08 11:58:05.000000000 +0100
-+++ smc-tools-1.0.0/Makefile	2018-01-08 11:57:47.000000000 +0100
-@@ -19,6 +19,8 @@ ifeq ($(ARCH),i686)
- ARCH64=0
- else ifeq ($(ARCH),s390)
- ARCH64=0
-+else ifeq ($(ARCH),armv7l)
-+ARCH64=0
- else
- ARCH64=1
- endif

smc-tools-1.0.0-glibc.patch

@@ -1,22 +0,0 @@
-diff -up smc-tools-1.0.0/ld_pre_smc.c.glibc smc-tools-1.0.0/ld_pre_smc.c
---- smc-tools-1.0.0/ld_pre_smc.c.glibc	2018-01-10 11:00:25.000000000 +0100
-+++ smc-tools-1.0.0/ld_pre_smc.c	2018-01-10 11:01:42.000000000 +0100
-@@ -20,8 +20,8 @@
- #include <dlfcn.h>
- #include <errno.h>
- #include <search.h>
-+#include <gnu/lib-names.h>
- 
--#define LIBC_PATH "libc.so.6"
- #define DLOPEN_FLAG RTLD_LAZY
- 
- #ifndef AF_SMC
-@@ -97,7 +97,7 @@ static void initialize(void)
- {
- 	set_debug_mode("SMC_DEBUG");
- 
--	dl_handle = dlopen(LIBC_PATH,DLOPEN_FLAG);
-+	dl_handle = dlopen(LIBC_SO,DLOPEN_FLAG);
- 	if (!dl_handle)
- 		dbg_msg(stderr, "dlopen failed: %s\n", dlerror());
- 	GET_FUNC(socket);

smc-tools-1.0.0-ldflags.patch

@@ -1,41 +0,0 @@
-diff -up smc-tools-1.0.0/Makefile.ldflags smc-tools-1.0.0/Makefile
---- smc-tools-1.0.0/Makefile.ldflags	2017-03-31 12:52:46.000000000 +0200
-+++ smc-tools-1.0.0/Makefile	2018-01-10 10:04:08.000000000 +0100
-@@ -49,6 +51,7 @@ endif
- all: smc_run ld_pre_smc.so ld_pre_smc32.so smcss smc_pnet
- 
- CFLAGS := -Wall -I include -O3 -g
-+LDFLAGS :=
- 
- ifeq ($(ARCH),s390x)
- 	MACHINE_OPT32="-m31"
-@@ -62,13 +65,13 @@ smc_run: smc_run.in
- 
- ld_pre_smc.so: ld_pre_smc.c
- 	${CC} ${CFLAGS} -fPIC -c ld_pre_smc.c
--	${CC} -shared ld_pre_smc.o -ldl -Wl,-z,defs -o ld_pre_smc.so
-+	${CC} ${LDFLAGS} -shared ld_pre_smc.o -ldl -Wl,-z,defs -o ld_pre_smc.so
- 
- ld_pre_smc32.so: ld_pre_smc.c
- ifeq ($(ARCH64),1)
- ifeq ($(STUFF_32BIT),1)
- 	${CC} ${CFLAGS} -fPIC -c ${MACHINE_OPT32} ld_pre_smc.c -o ld_pre_smc32.o
--	${CC} -shared ld_pre_smc32.o ${MACHINE_OPT32} -ldl -o ld_pre_smc32.so
-+	${CC} ${LDFLAGS} -shared ld_pre_smc32.o ${MACHINE_OPT32} -ldl -o ld_pre_smc32.so
- else
- 	$(warning "Warning: Skipping 31/32-bit library build because 31/32-bit \
- build tools are unavailable. SMC-R will not support 31 and 32 bit TCP \
-diff -up smc-tools-1.0.0/Makefile.ldflags smc-tools-1.0.0/Makefile
---- smc-tools-1.0.0/Makefile.ldflags	2018-04-16 14:04:44.000000000 +0200
-+++ smc-tools-1.0.0/Makefile	2018-04-16 14:05:06.000000000 +0200
-@@ -96,8 +96,8 @@ endif
- 
- smc_pnet: smc_pnet.c smc.h
- 	@if [ -e /usr/include/libnl3/netlink/netlink.h ]; then \
--		echo ${CC} ${CFLAGS} ${SMC_PNET_CFLAGS} -o $@ $< ${SMC_PNET_LFLAGS}; \
--		${CC} ${CFLAGS} ${SMC_PNET_CFLAGS} -o $@ $< ${SMC_PNET_LFLAGS}; \
-+		echo ${CC} ${CFLAGS} ${SMC_PNET_CFLAGS} ${LDFLAGS} -o $@ $< ${SMC_PNET_LFLAGS}; \
-+		${CC} ${CFLAGS} ${SMC_PNET_CFLAGS} ${LDFLAGS} -o $@ $< ${SMC_PNET_LFLAGS}; \
- 	else \
- 		printf "*********************************************\n" >&2; \
- 		printf "* Missing build requirement for: %-45s\n" $@ >&2; \

smc-tools-1.0.0-no-strip.patch

@@ -1,22 +0,0 @@
-diff -up smc-tools-1.0.0/Makefile.no-strip smc-tools-1.0.0/Makefile
---- smc-tools-1.0.0/Makefile.no-strip	2018-01-08 11:40:38.000000000 +0100
-+++ smc-tools-1.0.0/Makefile	2018-01-08 11:40:53.000000000 +0100
-@@ -105,14 +105,14 @@ smc_pnet: smc_pnet.c smc.h
- 
- install:
- 	install -d -m755 $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man7 $(DESTDIR)$(MANDIR)/man8
--	install -s $(INSTALL_FLAGS_BIN) ld_pre_smc.so $(DESTDIR)$(LIBDIR)
-+	install $(INSTALL_FLAGS_BIN) ld_pre_smc.so $(DESTDIR)$(LIBDIR)
- ifeq ($(STUFF_32BIT),1)
- 	install -d -m755 $(DESTDIR)$(LIBDIR32)
--	install -s $(INSTALL_FLAGS_BIN) ld_pre_smc32.so $(DESTDIR)$(LIBDIR32)/ld_pre_smc.so
-+	install $(INSTALL_FLAGS_BIN) ld_pre_smc32.so $(DESTDIR)$(LIBDIR32)/ld_pre_smc.so
- endif
- 	install $(INSTALL_FLAGS_BIN) smc_run $(DESTDIR)$(BINDIR)
--	install -s $(INSTALL_FLAGS_BIN) smcss $(DESTDIR)$(BINDIR)
--	install -s $(INSTALL_FLAGS_BIN) smc_pnet $(DESTDIR)$(BINDIR)
-+	install $(INSTALL_FLAGS_BIN) smcss $(DESTDIR)$(BINDIR)
-+	install $(INSTALL_FLAGS_BIN) smc_pnet $(DESTDIR)$(BINDIR)
- 	install $(INSTALL_FLAGS_MAN) af_smc.7 $(DESTDIR)$(MANDIR)/man7
- 	install $(INSTALL_FLAGS_MAN) smc_run.8 $(DESTDIR)$(MANDIR)/man8
- 	install $(INSTALL_FLAGS_MAN) smc_pnet.8 $(DESTDIR)$(MANDIR)/man8

smc-tools.spec

@@ -1,19 +1,11 @@
 Name:           smc-tools
-Version:        1.0.0
+Version:        1.1.0
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        Shared Memory Communication Tools
 
 License:        EPL
 URL:            https://www.ibm.com/developerworks/linux/linux390/smc-tools.html
 Source0:        https://public.dhe.ibm.com/software/dw/linux390/ht_src/%{name}-%{version}.tar.gz
-# don't strip binaries
-Patch0:         %{name}-1.0.0-no-strip.patch
-# treat armv7 as 32-bit
-Patch1:         %{name}-1.0.0-arm.patch
-# use distro LDFLAGS
-Patch2:         %{name}-1.0.0-ldflags.patch
-# let glibc define libc SO
-Patch3:         %{name}-1.0.0-glibc.patch
 
 BuildRequires:  gcc
 BuildRequires:  libnl3-devel
@@ -28,11 +20,11 @@ sockets in Linux.
 
 
 %build
-%make_build CFLAGS="-Iinclude %{optflags}" LDFLAGS="%{__global_ldflags}"
+%make_build CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" V=1
 
 
 %install
-%make_install
+%make_install V=1
 
 
 %files
@@ -41,7 +33,7 @@ sockets in Linux.
 %{_bindir}/smc_pnet
 %{_bindir}/smc_run
 %{_bindir}/smcss
-%{_libdir}/ld_pre_smc.so
+%{_libdir}/libsmc-preload.so*
 %{_mandir}/man7/af_smc.7*
 %{_mandir}/man8/smc_pnet.8*
 %{_mandir}/man8/smc_run.8*
@@ -49,6 +41,9 @@ sockets in Linux.
 
 
 %changelog
+* Mon Jul 09 2018 Dan Horák <dan@danny.cz> - 1.1.0-1
+- update to 1.1.0
+
 * Mon Apr 16 2018 Dan Horák <dan@danny.cz> - 1.0.0-4
 - fix LDFLAGS injection (#1567902)
 

sources

@@ -1 +1 @@
-SHA512 (smc-tools-1.0.0.tar.gz) = f7c8e72a7aaf5a07f9870b5e0926ccdd1bc84f38b7d462745ca96db49e90379892e3d5e44d7634b5a037ea38cb94d2d1979ba41149645959494cfbcc773dd1d6
+SHA512 (smc-tools-1.1.0.tar.gz) = 6d57ca54d5bbdc9b691cd1f907f53624168a33f80c843bfaf170010bbd2d157d84c451f6a01478446bbe261a12f9f7d22c0daab0a865b7a39d2984359ebe4fa2