diff --git a/src_vipa-2.0.3.tar.gz b/src_vipa-2.0.3.tar.gz deleted file mode 100644 index 655fba4..0000000 --- a/src_vipa-2.0.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4677330ddfce0f981525192e6c754e928ab7f56ce88d9ef7ad60cda074406070 -size 20001 diff --git a/src_vipa-2.0.4.tar.bz2 b/src_vipa-2.0.4.tar.bz2 new file mode 100644 index 0000000..94821a0 --- /dev/null +++ b/src_vipa-2.0.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7bbce54dcde9c66916d622d330a94bd5e8468ebde35a2611973ea0656d1fb788 +size 18788 diff --git a/src_vipa.build.patch b/src_vipa.build.patch deleted file mode 100644 index ff43078..0000000 --- a/src_vipa.build.patch +++ /dev/null @@ -1,34 +0,0 @@ -This patch fixes -* a build failure -* usage of uninitialized variable -* usage of unneeded LD_LIBRARY_PATH - ---- Makefile -+++ Makefile -@@ -34,7 +34,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 'exec $$@' >> src_vipa.sh - chmod 755 src_vipa.sh ---- src_vipa.c -+++ src_vipa.c -@@ -26,7 +26,6 @@ - #include - #include - --#include - #include - - #include -@@ -863,7 +862,7 @@ - { - ssize_t result; - struct sv_entry *entry=NULL; -- struct sockaddr *dst_addr; -+ struct sockaddr *dst_addr = NULL; - struct sockaddr_in src_addr; - - if (msg->msg_name) diff --git a/src_vipa.changes b/src_vipa.changes index d50aab2..fb9b39c 100644 --- a/src_vipa.changes +++ b/src_vipa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 24 18:16:51 CEST 2008 - jjolly@suse.de + +- Updated to 2.0.4 tarball from developerWorks site + ------------------------------------------------------------------- Mon Feb 12 01:47:25 CET 2007 - ro@suse.de diff --git a/src_vipa.makefile.patch b/src_vipa.makefile.patch deleted file mode 100644 index 5e4b377..0000000 --- a/src_vipa.makefile.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- Makefile -+++ Makefile -@@ -13,8 +13,9 @@ - # - - CC=gcc --CC_FLAGS=-fPIC -Wall --LD=ld -+LIBC=$(shell ldd `which bash`|grep 'libc.so.6'| sed 's/^.*=> *//g;s/ .*$$//g') -+CC_FLAGS=-fPIC $(RPM_OPT_FLAGS) -DLIBC_PATH=\"$(LIBC)\" -+LD=$(CC) - LD_FLAGS=-shared - INSTALL=install - ---- src_vipa.c -+++ src_vipa.c -@@ -42,7 +42,7 @@ - #include - - --#define LIBC_PATH "libc.so.6" -+/* #define LIBC_PATH "libc.so.6" defined in Makefile */ - #define DLOPEN_FLAG RTLD_LAZY - - -@@ -1255,7 +1255,7 @@ - } - - #ifndef LC_TEST --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - leader_pid = getpid(); - init_mutexes(); -@@ -1265,7 +1265,7 @@ - read_config_file(); - } - --void _fini(void) -+static void __attribute__((destructor)) _fini(void) - { - if (dl_handle) dlclose(dl_handle); - destroy_shm(); diff --git a/src_vipa.spec b/src_vipa.spec index e3cc33e..8383506 100644 --- a/src_vipa.spec +++ b/src_vipa.spec @@ -1,26 +1,32 @@ # -# spec file for package src_vipa (Version 2.0.3) +# spec file for package src_vipa (Version 2.0.4) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2008 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: src_vipa -URL: http://www10.software.ibm.com/developerworks/opensource/linux390/useful_add-ons.shtml -Version: 2.0.3 -Release: 37 +Url: http://www10.software.ibm.com/developerworks/opensource/linux390/useful_add-ons.shtml +Version: 2.0.4 +Release: 1 Summary: Virtual Source IP address support for HA solutions -License: Other License(s), see package +License: Common Public License Version 1.0 Group: Productivity/Clustering/HA -Autoreqprov: on -Source: src_vipa-%version.tar.gz -Patch: src_vipa.makefile.patch -Patch1: src_vipa.build.patch +AutoReqProv: on +Source: src_vipa-%version.tar.bz2 Patch2: src_vipa-ignore_ldconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -35,9 +41,9 @@ further information. %prep -%setup -q -n %name -%patch -%patch1 +%setup -q +# %patch +# %patch1 %patch2 %build @@ -58,29 +64,31 @@ make INSTROOT=%buildroot SRC_VIPA_PATH=%buildroot%_libdir install %attr(555,root,root) %_sbindir/* %attr(555,root,root) %_libdir/src_vipa* -%changelog -n src_vipa -* Mon Feb 12 2007 - ro@suse.de +%changelog +* Wed Sep 24 2008 jjolly@suse.de +- Updated to 2.0.4 tarball from developerWorks site +* Mon Feb 12 2007 ro@suse.de - fix build as non-root -* Fri Aug 25 2006 - aj@suse.de +* Fri Aug 25 2006 aj@suse.de - Fix build. - Do not set LD_LIBRARY without need. - Fix usage of uninitialized variable. -* Thu May 18 2006 - schwab@suse.de +* Thu May 18 2006 schwab@suse.de - Use RPM_OPT_FLAGS. - Fix building of shared library. -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Tue Apr 12 2005 - ihno@suse.de +* Tue Apr 12 2005 ihno@suse.de - update to 2.0.3 (code drop 2005-02-15) -* Thu Nov 11 2004 - ro@suse.de +* Thu Nov 11 2004 ro@suse.de - fixed file list -* Fri Nov 28 2003 - bk@suse.de +* Fri Nov 28 2003 bk@suse.de - update to 2.0.0 and added further glibc-2.3.2 compile fixes -* Tue Aug 12 2003 - ro@suse.de +* Tue Aug 12 2003 ro@suse.de - fix build on x86_64 -* Wed Jun 25 2003 - ro@suse.de +* Wed Jun 25 2003 ro@suse.de - fix bind definition -* Mon Jul 22 2002 - bk@suse.de +* Mon Jul 22 2002 bk@suse.de - update to 1.0.1 which fixes a lib64 problem -* Fri Jul 19 2002 - bk@suse.de +* Fri Jul 19 2002 bk@suse.de - initial version