From 4c576414b935f8795bf80e88f1e26168d5589d17163c9ccdf88942f5596a381b Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Fri, 14 Feb 2014 20:00:01 +0000 Subject: [PATCH 1/2] Accepting request 215274 from home:ihno:branches:network:utilities ----------------------------------------------------------------- - Fixed patches src_vipa-ignore_ldconfig.patch src_vipa-ldlibrarypath.patch - Updated tar ball from IBM - update to version 2.1.0 (FATE #315295) both patches are still needed. OBS-URL: https://build.opensuse.org/request/show/215274 OBS-URL: https://build.opensuse.org/package/show/network:utilities/src_vipa?expand=0&rev=7 --- src_vipa-2.0.4.tar.bz2 | 3 --- src_vipa-2.1.0.tar.bz2 | 3 +++ src_vipa-ignore_ldconfig.patch | 12 +++++------- src_vipa-ldlibrarypath.patch | 12 +++++------- src_vipa.changes | 18 ++++++++++++++++++ src_vipa.spec | 4 ++-- 6 files changed, 33 insertions(+), 19 deletions(-) delete mode 100644 src_vipa-2.0.4.tar.bz2 create mode 100644 src_vipa-2.1.0.tar.bz2 diff --git a/src_vipa-2.0.4.tar.bz2 b/src_vipa-2.0.4.tar.bz2 deleted file mode 100644 index 94821a0..0000000 --- a/src_vipa-2.0.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7bbce54dcde9c66916d622d330a94bd5e8468ebde35a2611973ea0656d1fb788 -size 18788 diff --git a/src_vipa-2.1.0.tar.bz2 b/src_vipa-2.1.0.tar.bz2 new file mode 100644 index 0000000..4a0affc --- /dev/null +++ b/src_vipa-2.1.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4873dc7ae6cbe05f0518eb11d829f17563616f4a4eb7e2aa0ff16ba24282324b +size 20385 diff --git a/src_vipa-ignore_ldconfig.patch b/src_vipa-ignore_ldconfig.patch index 57ff028..ab731aa 100644 --- a/src_vipa-ignore_ldconfig.patch +++ b/src_vipa-ignore_ldconfig.patch @@ -1,13 +1,11 @@ -Index: Makefile -=================================================================== ---- Makefile.orig -+++ Makefile -@@ -44,7 +44,7 @@ install: src_vipa.so src_vipa.sh +--- Makefile.old 2014-01-27 14:13:23.000000000 +0100 ++++ Makefile 2014-01-27 14:13:51.000000000 +0100 +@@ -51,7 +51,7 @@ $(INSTALL) -m 755 src_vipa.so $(SRC_VIPA_PATH) $(INSTALL) -m 755 src_vipa.sh $(SRC_VIPA_STARTER_PATH) $(INSTALL) -m 644 src_vipa.8 $(SRC_VIPA_MANPAGE_PATH)/man8 -- ldconfig +- $(LDCONFIG) + -/sbin/ldconfig clean: - rm -f src_vipa.{i,s,o,sh,so} core src_vipa-$(VERSION).tar.gz + rm -f src_vipa.i src_vipa.s src_vipa.o src_vipa.sh src_vipa.so core src_vipa-$(VERSION).tar.gz diff --git a/src_vipa-ldlibrarypath.patch b/src_vipa-ldlibrarypath.patch index 88f1056..bfebd79 100644 --- a/src_vipa-ldlibrarypath.patch +++ b/src_vipa-ldlibrarypath.patch @@ -1,12 +1,10 @@ -Index: src_vipa-2.0.4/Makefile -=================================================================== ---- src_vipa-2.0.4.orig/Makefile -+++ src_vipa-2.0.4/Makefile -@@ -34,7 +34,6 @@ src_vipa.so: src_vipa.c +--- tmp/Makefile.old 2014-01-27 14:07:44.000000000 +0100 ++++ tmp/Makefile 2014-01-27 14:08:23.000000000 +0100 +@@ -42,7 +42,6 @@ src_vipa.sh: echo '#!/bin/bash' > src_vipa.sh -- echo 'export LD_LIBRARY_PATH=$(SRC_VIPA_PATH):$$LD_LIBRARY_PATH' >> src_vipa.sh - echo 'export LD_PRELOAD=$(SRC_VIPA_PATH)/src_vipa.so' >> src_vipa.sh +- echo 'export LD_LIBRARY_PATH=$(LIBDIR):$$LD_LIBRARY_PATH' >> src_vipa.sh + echo 'export LD_PRELOAD=$(LIBDIR)/src_vipa.so' >> src_vipa.sh echo 'exec $$@' >> src_vipa.sh chmod 755 src_vipa.sh diff --git a/src_vipa.changes b/src_vipa.changes index a1cfc66..e1c07f7 100644 --- a/src_vipa.changes +++ b/src_vipa.changes @@ -1,3 +1,21 @@ +----------------------------------------------------------------- +Mon Jan 27 13:18:29 UTC 2014 - ihno@suse.com + +- Fixed patches + src_vipa-ignore_ldconfig.patch + src_vipa-ldlibrarypath.patch + +------------------------------------------------------------------- +Fri Jan 24 14:06:01 UTC 2014 - ihno@suse.de + +- Updated tar ball from IBM + +------------------------------------------------------------------- +Fri Jan 24 13:52:51 CET 2014 - ihno@suse.de + +- update to version 2.1.0 (FATE #315295) + both patches are still needed. + ------------------------------------------------------------------- Fri Jul 6 13:59:34 UTC 2012 - meissner@suse.com diff --git a/src_vipa.spec b/src_vipa.spec index bc35494..14d765c 100644 --- a/src_vipa.spec +++ b/src_vipa.spec @@ -1,7 +1,7 @@ # # spec file for package src_vipa # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: src_vipa Url: http://www10.software.ibm.com/developerworks/opensource/linux390/useful_add-ons.shtml -Version: 2.0.4 +Version: 2.1.0 Release: 0 Summary: Virtual Source IP address support for HA solutions License: CPL-1.0 From a9dfb724e30085095b51d61a1119413596e10f0a1b1494168c8c863001c90068 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Fri, 14 Feb 2014 20:00:44 +0000 Subject: [PATCH 2/2] - update source URLs, see https://en.opensuse.org/SourceUrls - verify source tarball md5 - change to original upstream tarball, no source change OBS-URL: https://build.opensuse.org/package/show/network:utilities/src_vipa?expand=0&rev=8 --- src_vipa-2.1.0.md5 | 1 + src_vipa-2.1.0.tar.bz2 | 3 --- src_vipa-2.1.0.tar.gz | 3 +++ src_vipa.changes | 7 +++++++ src_vipa.spec | 9 ++++++--- 5 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 src_vipa-2.1.0.md5 delete mode 100644 src_vipa-2.1.0.tar.bz2 create mode 100644 src_vipa-2.1.0.tar.gz diff --git a/src_vipa-2.1.0.md5 b/src_vipa-2.1.0.md5 new file mode 100644 index 0000000..08fc11e --- /dev/null +++ b/src_vipa-2.1.0.md5 @@ -0,0 +1 @@ +6011b33227d843a6e2f8144331f4b3d4 *src_vipa-2.1.0.tar.gz diff --git a/src_vipa-2.1.0.tar.bz2 b/src_vipa-2.1.0.tar.bz2 deleted file mode 100644 index 4a0affc..0000000 --- a/src_vipa-2.1.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4873dc7ae6cbe05f0518eb11d829f17563616f4a4eb7e2aa0ff16ba24282324b -size 20385 diff --git a/src_vipa-2.1.0.tar.gz b/src_vipa-2.1.0.tar.gz new file mode 100644 index 0000000..b8be127 --- /dev/null +++ b/src_vipa-2.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:00c27caeee485f7ee740c3598cba3a1feb603407f7058c1cb4f8030e60db3b39 +size 22172 diff --git a/src_vipa.changes b/src_vipa.changes index e1c07f7..e783cd6 100644 --- a/src_vipa.changes +++ b/src_vipa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Feb 14 19:58:13 UTC 2014 - andreas.stieger@gmx.de + +- update source URLs, see https://en.opensuse.org/SourceUrls +- verify source tarball md5 +- change to original upstream tarball, no source change + ----------------------------------------------------------------- Mon Jan 27 13:18:29 UTC 2014 - ihno@suse.com diff --git a/src_vipa.spec b/src_vipa.spec index 14d765c..6175484 100644 --- a/src_vipa.spec +++ b/src_vipa.spec @@ -17,13 +17,14 @@ Name: src_vipa -Url: http://www10.software.ibm.com/developerworks/opensource/linux390/useful_add-ons.shtml +Url: http://www.ibm.com/developerworks/linux/linux390/useful_add-ons_vipa.html Version: 2.1.0 Release: 0 Summary: Virtual Source IP address support for HA solutions License: CPL-1.0 Group: Productivity/Clustering/HA -Source: src_vipa-%version.tar.bz2 +Source: http://public.dhe.ibm.com/software/dw/linux390/ht_src/%name-%version.tar.gz +Source1: http://www.ibm.com/developerworks/linux/linux390/MD5/src/%name-%version.md5 Patch1: src_vipa-ldlibrarypath.patch Patch2: src_vipa-ignore_ldconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -39,8 +40,10 @@ further information. %prep +pushd `dirname %{S:0}` +md5sum -c %{S:1} +popd %setup -q -# %patch %patch1 -p1 %patch2