Hello community, here is the log from the commit of package ipvsadm for openSUSE:Factory checked in at Fri Feb 11 02:25:10 CET 2011. -------- --- ipvsadm/ipvsadm.changes 2008-08-25 18:33:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/ipvsadm/ipvsadm.changes 2011-02-08 20:34:37.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Feb 8 19:30:56 UTC 2011 - mt@suse.de + +- Updated to ipvsadm-1.26 (for kernel 2.6.28-rc3 or later) + adding IPv6 support, netlink interface and code cleanups. +- Adopted patches and spec file, switched to use new netlink + interface and popt (getopt support dropped). +- Fixed rpmlint warnings in the init script and spec file. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ipvsadm-1.24.dif ipvsadm-1.24.tar.bz2 New: ---- ipvsadm-1.26-print_largenum.diff ipvsadm-1.26.diff ipvsadm-1.26.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ipvsadm.spec ++++++ --- /var/tmp/diff_new_pack.BW67cA/_old 2011-02-11 02:24:20.000000000 +0100 +++ /var/tmp/diff_new_pack.BW67cA/_new 2011-02-11 02:24:20.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package ipvsadm (Version 1.24) +# spec file for package ipvsadm # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -20,15 +20,17 @@ Name: ipvsadm BuildRequires: kernel-source popt-devel +BuildRequires: libnl-devel Summary: A Utility for Administering the Linux Virtual Server -Version: 1.24 -Release: 297 -License: GPL v2 or later +Version: 1.26 +Release: 1 +License: GPLv2+ Url: http://www.LinuxVirtualServer.org/ Group: Productivity/Networking/System Source0: http://www.LinuxVirtualServer.org/software/ipvsadm-%{version}.tar.bz2 Source1: ipvsadm.init -Patch: ipvsadm-%{version}.dif +Patch1: ipvsadm-%{version}.diff +Patch2: ipvsadm-%{version}-print_largenum.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: %{name}-%{version} Requires: grep @@ -65,19 +67,20 @@ # Please insert your ipvs-rules here # EOFF -%patch +%patch1 +%patch2 %build -make FORCE_GETOPT=1 CFLAGS="${RPM_OPT_FLAGS}" +make POPT_LIB="-lpopt" CFLAGS="${RPM_OPT_FLAGS} -fPIC -DHAVE_POPT -DLIBIPVS_USE_NL" %install mkdir -p ${RPM_BUILD_ROOT}/{sbin,usr/sbin,%{_mandir}/man8,etc/init.d,var/adm/fillup-templates} BUILD_ROOT=${RPM_BUILD_ROOT} MANDIR=%{_mandir} make install # install SuSE init script install -m 755 %{S:1} ${RPM_BUILD_ROOT}/etc/init.d/ipvsadm -install -m 755 sysconfig.ipvsadm ${RPM_BUILD_ROOT}/var/adm/fillup-templates/sysconfig.ipvsadm -install -m 755 ipvsadm.rules ${RPM_BUILD_ROOT}/etc/ipvsadm.rules ln -sf ../../etc/init.d/ipvsadm ${RPM_BUILD_ROOT}/usr/sbin/rcipvsadm +install -m 644 sysconfig.ipvsadm ${RPM_BUILD_ROOT}/var/adm/fillup-templates/sysconfig.ipvsadm +install -m 644 ipvsadm.rules ${RPM_BUILD_ROOT}/etc/ipvsadm.rules %post %{fillup_and_insserv ipvsadm} ++++++ ipvsadm-1.26-print_largenum.diff ++++++ --- ipvsadm.c +++ ipvsadm.c 2011/02/08 15:11:51 @@ -1380,7 +1380,7 @@ static void print_largenum(unsigned long if (format & FMT_EXACT) { len = snprintf(mytmp, 32, "%llu", i); - printf("%*llu", len <= 8 ? 9 : len + 1, i); + printf("%*llu", (int)(len <= 8 ? 9 : len + 1), i); return; } ++++++ ipvsadm-1.26.diff ++++++ --- Makefile +++ Makefile 2011/02/08 14:48:13 @@ -38,9 +38,9 @@ RPMSPECDIR = $(shell rpm --eval '%_specd CC = gcc INCLUDE = SBIN = $(BUILD_ROOT)/sbin -MANDIR = usr/man +MANDIR = usr/share/man MAN = $(BUILD_ROOT)/$(MANDIR)/man8 -INIT = $(BUILD_ROOT)/etc/rc.d/init.d +INIT = $(BUILD_ROOT)/etc/init.d MKDIR = mkdir INSTALL = install STATIC_LIBS = libipvs/libipvs.a @@ -109,7 +109,7 @@ install: all $(INSTALL) -m 0644 ipvsadm-save.8 $(MAN) $(INSTALL) -m 0644 ipvsadm-restore.8 $(MAN) [ -d $(INIT) ] || $(MKDIR) -p $(INIT) - $(INSTALL) -m 0755 ipvsadm.sh $(INIT)/ipvsadm + $(INSTALL) -m 0754 ipvsadm.sh $(INIT)/ipvsadm clean: rm -f ipvsadm $(NAME).spec $(NAME)-$(VERSION).tar.gz ++++++ ipvsadm-1.24.tar.bz2 -> ipvsadm-1.26.tar.bz2 ++++++ ++++ 3478 lines of diff (skipped) ++++++ ipvsadm.init ++++++ --- /var/tmp/diff_new_pack.BW67cA/_old 2011-02-11 02:24:20.000000000 +0100 +++ /var/tmp/diff_new_pack.BW67cA/_new 2011-02-11 02:24:20.000000000 +0100 @@ -8,12 +8,13 @@ # Marius Tomaschewski, SuSE Linux AG # ### BEGIN INIT INFO -# Provides: ipvsadm -# Required-Start: network -# Required-Stop: network -# Default-Start: 3 5 -# Default-Stop: 0 1 2 6 -# Description: This shell script takes care of starting and stopping ipvsadm +# Provides: ipvsadm +# Required-Start: $network +# Required-Stop: $network +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# Short-Description: Loads IPVS rules +# Description: This shell script takes care of loading IPVS rules. ### END INIT INFO # Set defaults @@ -40,9 +41,9 @@ ipvsadm="/sbin/ipvsadm" ipvsadm_load="/sbin/ipvsadm-restore" ipvsadm_save="/sbin/ipvsadm-save" -[ -x $ipvsadm ] || exit 5 -[ -x $ipvsadm_load ] || exit 5 -[ -x $ipvsadm_save ] || exit 5 +[ -x $ipvsadm -a -x $ipvsadm_load -a -x $ipvsadm_save ] || { + [ "$1" = "stop" ] && exit 0 || exit 5 +} empty_config () { @@ -77,7 +78,7 @@ stop) # check if configured - empty_config || exit 6 + empty_config || exit 0 echo -n "clearing the current IPVS table" $ipvsadm -C ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org