commit ipvsadm for openSUSE:Factory
Hello community,
here is the log from the commit of package ipvsadm for openSUSE:Factory checked
in at 2017-11-27 22:16:50
Comparing /work/SRC/openSUSE:Factory/ipvsadm (Old)
and /work/SRC/openSUSE:Factory/.ipvsadm.new (New)
Package is "ipvsadm"
Mon Nov 27 22:16:50 2017 rev:24 rq:545406 version:1.29
Changes:
--- /work/SRC/openSUSE:Factory/ipvsadm/ipvsadm.changes 2017-01-09
11:00:15.869254559 +0100
+++ /work/SRC/openSUSE:Factory/.ipvsadm.new/ipvsadm.changes 2017-11-27
22:16:52.405983471 +0100
@@ -1,0 +2,6 @@
+Thu Nov 23 13:46:06 UTC 2017 - rbr...@suse.com
+
+- Replace references to /var/adm/fillup-templates with new
+ %_fillupdir macro (boo#1069468)
+
+---
Other differences:
--
++ ipvsadm.spec ++
--- /var/tmp/diff_new_pack.dxzpzj/_old 2017-11-27 22:16:53.001961838 +0100
+++ /var/tmp/diff_new_pack.dxzpzj/_new 2017-11-27 22:16:53.005961693 +0100
@@ -16,6 +16,11 @@
#
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+ %define _fillupdir /var/adm/fillup-templates
+%endif
+
Name: ipvsadm
BuildRequires: kernel-source
BuildRequires: pkgconfig
@@ -71,14 +76,14 @@
make POPT_LIB="-lpopt" CFLAGS="%{optflags} -fPIC -DHAVE_POPT -DLIBIPVS_USE_NL
-I%{_includedir}/libnl3"
%install
-mkdir -p
%{buildroot}/{sbin,%{_sbindir},%{_mandir}/man8,%{_unitdir},var/adm/fillup-templates}
+mkdir -p
%{buildroot}/{sbin,%{_sbindir},%{_mandir}/man8,%{_unitdir},%{_fillupdir}}
make BUILD_ROOT=%{buildroot} MANDIR=%{_mandir} install
# Sysvinit support dropping
rm -rf %{buildroot}/etc/init.d
# install SuSE init script
install -m 644 %{S:1} %{buildroot}%{_unitdir}/%{name}.service
ln -sf /sbin/service %{buildroot}%{_sbindir}/rc%{name}
-install -m 644 sysconfig.ipvsadm
%{buildroot}/var/adm/fillup-templates/sysconfig.%{name}
+install -m 644 sysconfig.ipvsadm
%{buildroot}%{_fillupdir}/sysconfig.%{name}
install -m 644 ipvsadm.rules %{buildroot}%{_sysconfdir}/%{name}.rules
%post
@@ -102,6 +107,6 @@
/sbin/*
%{_sbindir}/*
/%{_mandir}/man*/*
-/var/adm/fillup-templates/sysconfig.%{name}
+%{_fillupdir}/sysconfig.%{name}
%changelog
commit ipvsadm for openSUSE:Factory
Hello community,
here is the log from the commit of package ipvsadm for openSUSE:Factory checked
in at 2015-12-09 19:50:33
Comparing /work/SRC/openSUSE:Factory/ipvsadm (Old)
and /work/SRC/openSUSE:Factory/.ipvsadm.new (New)
Package is "ipvsadm"
Changes:
--- /work/SRC/openSUSE:Factory/ipvsadm/ipvsadm.changes 2014-06-01
19:41:17.0 +0200
+++ /work/SRC/openSUSE:Factory/.ipvsadm.new/ipvsadm.changes 2015-12-09
22:19:42.0 +0100
@@ -1,0 +2,12 @@
+Tue Dec 1 14:16:43 UTC 2015 - p.drou...@gmail.com
+
+- Update to version 1.28
+ * No changelog available
+- Update download Url
+- Remove obsolete patches
+ * 03_libnl-3-linking.patch
+ * ipvsadm-1.26-ipvs_dests_parse_cb-memory-corruption.diff
+ * ipvsadm-1.26-wrong-error-with--ops-option.bnc847005.diff
+- Update ipvsadm-1.26-print_largenum.diff > ipvsadm-print_largenum.diff
+
+---
Old:
03_libnl-3-linking.patch
ipvsadm-1.26-ipvs_dests_parse_cb-memory-corruption.diff
ipvsadm-1.26-print_largenum.diff
ipvsadm-1.26-wrong-error-with--ops-option.bnc847005.diff
ipvsadm-1.26.tar.bz2
New:
ipvsadm-1.28.tar.xz
ipvsadm-print_largenum.diff
Other differences:
--
++ ipvsadm.spec ++
--- /var/tmp/diff_new_pack.6QulgJ/_old 2015-12-09 22:19:43.0 +0100
+++ /var/tmp/diff_new_pack.6QulgJ/_new 2015-12-09 22:19:43.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ipvsadm
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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,24 +20,19 @@
BuildRequires: kernel-source
BuildRequires: pkgconfig
BuildRequires: popt-devel
-BuildRequires: systemd
+BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(libnl-3.0)
BuildRequires: pkgconfig(libnl-genl-3.0)
Summary:A Utility for Administering the Linux Virtual Server
License:GPL-2.0+
Group: Productivity/Networking/System
-Version:1.26
+Version:1.28
Release:0
Url:http://www.linuxvirtualserver.org/
-Source0:
http://www.LinuxVirtualServer.org/software/ipvsadm-%{version}.tar.bz2
+Source0:
https://www.kernel.org/pub/linux/utils/kernel/ipvsadm/%{name}-%{version}.tar.xz
Source1:ipvsadm.service
-Patch1: ipvsadm-%{version}.diff
-Patch2: ipvsadm-%{version}-print_largenum.diff
-# PATCH-FIX-SLE ipvs_dests_parse_cb-memory-corruption bnc#775051
-Patch3: ipvsadm-%{version}-ipvs_dests_parse_cb-memory-corruption.diff
-# PATCH-FIX-SLE wrong-error-with--ops-option bnc#847005
-Patch4: ipvsadm-%{version}-wrong-error-with--ops-option.bnc847005.diff
-Patch5: 03_libnl-3-linking.patch
+Patch1: ipvsadm-1.26.diff
+Patch2: ipvsadm-print_largenum.diff
Provides: %{name}-%{version}
Requires: grep
Requires(pre): %fillup_prereq
@@ -71,11 +66,9 @@
EOFF
%patch1
%patch2
-%patch3
-%patch4
-%patch5 -p1
+
%build
-make POPT_LIB="-lpopt" CFLAGS="%{optflags} -fPIC -DHAVE_POPT -DLIBIPVS_USE_NL"
+make POPT_LIB="-lpopt" CFLAGS="%{optflags} -fPIC -DHAVE_POPT -DLIBIPVS_USE_NL
-I%{_includedir}/libnl3"
%install
mkdir -p
%{buildroot}/{sbin,%{_sbindir},%{_mandir}/man8,%{_unitdir},var/adm/fillup-templates}
++ ipvsadm-print_largenum.diff ++
--- ipvsadm.c
+++ ipvsadm.c 2011/02/08 15:11:51
@@ -1493,7 +1493,7 @@
int len;
len = snprintf(mytmp, 32, "%llu", i);
- printf("%*llu", len <= 8 ? 9 : len + 1, i);
+ printf("%*llu", (int)(len <= 8 ? 9 : len + 1), i);
return;
}
commit ipvsadm for openSUSE:Factory
Hello community,
here is the log from the commit of package ipvsadm for openSUSE:Factory checked
in at 2014-06-01 19:40:58
Comparing /work/SRC/openSUSE:Factory/ipvsadm (Old)
and /work/SRC/openSUSE:Factory/.ipvsadm.new (New)
Package is ipvsadm
Changes:
--- /work/SRC/openSUSE:Factory/ipvsadm/ipvsadm.changes 2014-05-23
07:51:47.0 +0200
+++ /work/SRC/openSUSE:Factory/.ipvsadm.new/ipvsadm.changes 2014-06-01
19:41:17.0 +0200
@@ -1,0 +2,6 @@
+Wed May 28 01:07:07 UTC 2014 - crrodrig...@opensuse.org
+
+- 03_libnl-3-linking.patch from debian, allow use of libnl3
+ instead of libnl1
+
+---
New:
03_libnl-3-linking.patch
Other differences:
--
++ ipvsadm.spec ++
--- /var/tmp/diff_new_pack.5hktnq/_old 2014-06-01 19:41:18.0 +0200
+++ /var/tmp/diff_new_pack.5hktnq/_new 2014-06-01 19:41:18.0 +0200
@@ -18,9 +18,11 @@
Name: ipvsadm
BuildRequires: kernel-source
-BuildRequires: libnl-1_1-devel
+BuildRequires: pkgconfig
BuildRequires: popt-devel
BuildRequires: systemd
+BuildRequires: pkgconfig(libnl-3.0)
+BuildRequires: pkgconfig(libnl-genl-3.0)
Summary:A Utility for Administering the Linux Virtual Server
License:GPL-2.0+
Group: Productivity/Networking/System
@@ -35,6 +37,7 @@
Patch3: ipvsadm-%{version}-ipvs_dests_parse_cb-memory-corruption.diff
# PATCH-FIX-SLE wrong-error-with--ops-option bnc#847005
Patch4: ipvsadm-%{version}-wrong-error-with--ops-option.bnc847005.diff
+Patch5: 03_libnl-3-linking.patch
Provides: %{name}-%{version}
Requires: grep
Requires(pre): %fillup_prereq
@@ -47,7 +50,7 @@
%prep
-%setup
+%setup -q
# This files are embedded here instead of being another source in order
# to the prefix directory
cat sysconfig.ipvsadm EOFF
@@ -70,7 +73,7 @@
%patch2
%patch3
%patch4
-
+%patch5 -p1
%build
make POPT_LIB=-lpopt CFLAGS=%{optflags} -fPIC -DHAVE_POPT -DLIBIPVS_USE_NL
@@ -80,7 +83,7 @@
# Sysvinit support dropping
rm -rf %{buildroot}/etc/init.d
# install SuSE init script
-install -m 755 %{S:1} %{buildroot}%{_unitdir}/%{name}.service
+install -m 644 %{S:1} %{buildroot}%{_unitdir}/%{name}.service
ln -sf /sbin/service %{buildroot}%{_sbindir}/rc%{name}
install -m 644 sysconfig.ipvsadm
%{buildroot}/var/adm/fillup-templates/sysconfig.%{name}
install -m 644 ipvsadm.rules %{buildroot}%{_sysconfdir}/%{name}.rules
++ 03_libnl-3-linking.patch ++
--- ipvsadm-1.26~/Makefile 2012-05-31 18:22:39.0 -0400
+++ ipvsadm-1.26/Makefile 2012-05-31 18:22:39.0 -0400
@@ -82,7 +82,8 @@
OBJS = ipvsadm.o config_stream.o dynamic_array.o
LIBS = $(POPT_LIB)
ifneq (0,$(HAVE_NL))
-LIBS += -lnl
+INCLUDE+= $(shell pkg-config --cflags libnl-3.0 libnl-genl-3.0)
+LIBS += $(shell pkg-config --libs libnl-3.0 libnl-genl-3.0)
endif
DEFINES= -DVERSION=\$(VERSION)\
-DSCHEDULERS=\$(SCHEDULERS)\ \
-DPE_LIST=\$(PE_LIST)\ $(POPT_DEFINE)
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
'--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
ipvsadm-1.26~/libipvs/Makefile ipvsadm-1.26/libipvs/Makefile
--- ipvsadm-1.26~/libipvs/Makefile 2008-09-21 06:02:03.0 -0400
+++ ipvsadm-1.26/libipvs/Makefile 2012-05-31 18:22:39.0 -0400
@@ -4,6 +4,7 @@
CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -fPIC
ifneq (0,$(HAVE_NL))
CFLAGS += -DLIBIPVS_USE_NL
+INCLUDE += $(shell pkg-config --cflags libnl-3.0 libnl-genl-3.0)
endif
INCLUDE+= $(shell if [ -f ../../ip_vs.h ]; then\
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
'--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr'
ipvsadm-1.26~/libipvs/libipvs.c ipvsadm-1.26/libipvs/libipvs.c
--- ipvsadm-1.26~/libipvs/libipvs.c 2011-02-06 21:38:57.0 -0500
+++ ipvsadm-1.26/libipvs/libipvs.c 2012-05-31 18:24:11.176032999 -0400
@@ -32,7 +32,7 @@
struct ip_vs_getinfo ipvs_info;
#ifdef LIBIPVS_USE_NL
-static struct nl_handle *sock = NULL;
+static struct nl_sock *sock = NULL;
static int family, try_nl = 1;
#endif
@@ -73,7 +73,7 @@
{
int err = EINVAL;
- sock = nl_handle_alloc();
+ sock = nl_socket_alloc();
if (!sock) {
nlmsg_free(msg);
return -1;
@@ -88,7 +88,7 @@
/* To test connections and set the family */
if (msg == NULL) {
- nl_handle_destroy(sock);
+ nl_socket_free(sock);
sock =
commit ipvsadm for openSUSE:Factory
Hello community, here is the log from the commit of package ipvsadm for openSUSE:Factory checked in at 2014-05-23 07:51:47 Comparing /work/SRC/openSUSE:Factory/ipvsadm (Old) and /work/SRC/openSUSE:Factory/.ipvsadm.new (New) Package is ipvsadm Changes: --- /work/SRC/openSUSE:Factory/ipvsadm/ipvsadm.changes 2014-02-15 08:05:17.0 +0100 +++ /work/SRC/openSUSE:Factory/.ipvsadm.new/ipvsadm.changes 2014-05-23 07:51:47.0 +0200 @@ -1,0 +2,5 @@ +Wed May 21 11:08:18 UTC 2014 - jseg...@novell.com + +- added necessary macros for systemd files + +--- Other differences: -- ++ ipvsadm.spec ++ --- /var/tmp/diff_new_pack.CPY8TD/_old 2014-05-23 07:51:48.0 +0200 +++ /var/tmp/diff_new_pack.CPY8TD/_new 2014-05-23 07:51:48.0 +0200 @@ -92,6 +92,12 @@ %postun %service_del_postun ipvsadm.service +%pre +%service_add_pre ipvsadm.service + +%preun +%service_del_preun ipvsadm.service + %files %defattr(-,root,root) %doc README -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ipvsadm for openSUSE:Factory
Hello community,
here is the log from the commit of package ipvsadm for openSUSE:Factory checked
in at 2014-02-15 08:05:16
Comparing /work/SRC/openSUSE:Factory/ipvsadm (Old)
and /work/SRC/openSUSE:Factory/.ipvsadm.new (New)
Package is ipvsadm
Changes:
--- /work/SRC/openSUSE:Factory/ipvsadm/ipvsadm.changes 2013-12-17
10:01:43.0 +0100
+++ /work/SRC/openSUSE:Factory/.ipvsadm.new/ipvsadm.changes 2014-02-15
08:05:17.0 +0100
@@ -1,0 +2,10 @@
+Thu Feb 13 10:33:04 UTC 2014 - m...@suse.de
+
+- Fix segfault when running 'ipvsadm -Ln' caused by buffer overrun
+ in ipvs_dests_parse_cb() function (bnc#775051), by Tim Serong.
+ [+ ipvsadm-1.26-ipvs_dests_parse_cb-memory-corruption.diff]
+- Fix wrong error message when using ipvsadm with option --ops
+ (bnc#847005), by Paul Zirnik.
+ [+ ipvsadm-1.26-wrong-error-with--ops-option.bnc847005.diff]
+
+---
New:
ipvsadm-1.26-ipvs_dests_parse_cb-memory-corruption.diff
ipvsadm-1.26-wrong-error-with--ops-option.bnc847005.diff
Other differences:
--
++ ipvsadm.spec ++
--- /var/tmp/diff_new_pack.pynlmC/_old 2014-02-15 08:05:17.0 +0100
+++ /var/tmp/diff_new_pack.pynlmC/_new 2014-02-15 08:05:17.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ipvsadm
#
-# Copyright (c) 2013 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
@@ -15,20 +15,26 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: ipvsadm
-BuildRequires: kernel-source popt-devel
+BuildRequires: kernel-source
BuildRequires: libnl-1_1-devel
+BuildRequires: popt-devel
BuildRequires: systemd
Summary:A Utility for Administering the Linux Virtual Server
-Version:1.26
-Release:1
License:GPL-2.0+
-Url:http://www.linuxvirtualserver.org/
Group: Productivity/Networking/System
+Version:1.26
+Release:0
+Url:http://www.linuxvirtualserver.org/
Source0:
http://www.LinuxVirtualServer.org/software/ipvsadm-%{version}.tar.bz2
Source1:ipvsadm.service
Patch1: ipvsadm-%{version}.diff
Patch2: ipvsadm-%{version}-print_largenum.diff
+# PATCH-FIX-SLE ipvs_dests_parse_cb-memory-corruption bnc#775051
+Patch3: ipvsadm-%{version}-ipvs_dests_parse_cb-memory-corruption.diff
+# PATCH-FIX-SLE wrong-error-with--ops-option bnc#847005
+Patch4: ipvsadm-%{version}-wrong-error-with--ops-option.bnc847005.diff
Provides: %{name}-%{version}
Requires: grep
Requires(pre): %fillup_prereq
@@ -62,6 +68,8 @@
EOFF
%patch1
%patch2
+%patch3
+%patch4
%build
make POPT_LIB=-lpopt CFLAGS=%{optflags} -fPIC -DHAVE_POPT -DLIBIPVS_USE_NL
++ ipvsadm-1.26-ipvs_dests_parse_cb-memory-corruption.diff ++
Index: libipvs/ip_vs.h
===
--- libipvs/ip_vs.h.orig
+++ libipvs/ip_vs.h
@@ -413,7 +413,7 @@ enum {
__IPVS_CMD_ATTR_MAX,
};
-#define IPVS_CMD_ATTR_MAX (__IPVS_SVC_ATTR_MAX - 1)
+#define IPVS_CMD_ATTR_MAX (__IPVS_CMD_ATTR_MAX - 1)
/*
* Attributes used to describe a service
Index: libipvs/libipvs.c
===
--- libipvs/libipvs.c.orig
+++ libipvs/libipvs.c
@@ -726,8 +726,8 @@ ipvs_sort_services(struct ip_vs_get_serv
static int ipvs_dests_parse_cb(struct nl_msg *msg, void *arg)
{
struct nlmsghdr *nlh = nlmsg_hdr(msg);
- struct nlattr *attrs[IPVS_DEST_ATTR_MAX + 1];
- struct nlattr *dest_attrs[IPVS_SVC_ATTR_MAX + 1];
+ struct nlattr *attrs[IPVS_CMD_ATTR_MAX + 1];
+ struct nlattr *dest_attrs[IPVS_DEST_ATTR_MAX + 1];
struct ip_vs_get_dests **dp = (struct ip_vs_get_dests **)arg;
struct ip_vs_get_dests *d = (struct ip_vs_get_dests *)*dp;
int i = d-num_dests;
++ ipvsadm-1.26-wrong-error-with--ops-option.bnc847005.diff ++
--- ipvsadm.c 2013-10-21 17:27:39.271243668 +0200
+++ ipvsadm.c 2014-01-22 15:22:44.977501332 +0100
@@ -189,7 +189,6 @@
connection,
service-address,
scheduler,
- pe,
persistent,
netmask,
real-server,
@@ -208,6 +207,7 @@
syncid,
exact,
ops,
+ pe,
};
/*
@@ -220,21 +220,21 @@
*/
static const char commands_v_options[NUMBER_OF_CMD][NUMBER_OF_OPT] =
{
- /* -n -c svc -s -p -M -r fwd -w -x -y -mc tot
dmn -st -rt thr -pc srt sid -ex ops */
-/*ADD*/
commit ipvsadm for openSUSE:Factory
Hello community,
here is the log from the commit of package ipvsadm for openSUSE:Factory checked
in at 2013-12-17 10:01:41
Comparing /work/SRC/openSUSE:Factory/ipvsadm (Old)
and /work/SRC/openSUSE:Factory/.ipvsadm.new (New)
Package is ipvsadm
Changes:
--- /work/SRC/openSUSE:Factory/ipvsadm/ipvsadm.changes 2011-09-23
02:03:41.0 +0200
+++ /work/SRC/openSUSE:Factory/.ipvsadm.new/ipvsadm.changes 2013-12-17
10:01:43.0 +0100
@@ -1,0 +2,7 @@
+Mon Oct 28 16:02:10 UTC 2013 - p.drou...@gmail.com
+
+- Add systemd support and drop sysvinit support
+- Remove AUTHORS section
+- Remove redundant %clean section
+
+---
Old:
ipvsadm.init
New:
ipvsadm.service
Other differences:
--
++ ipvsadm.spec ++
--- /var/tmp/diff_new_pack.Uyh11z/_old 2013-12-17 10:01:44.0 +0100
+++ /var/tmp/diff_new_pack.Uyh11z/_new 2013-12-17 10:01:44.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ipvsadm
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -15,27 +15,24 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
-
Name: ipvsadm
BuildRequires: kernel-source popt-devel
BuildRequires: libnl-1_1-devel
+BuildRequires: systemd
Summary:A Utility for Administering the Linux Virtual Server
Version:1.26
Release:1
License:GPL-2.0+
-Url:http://www.LinuxVirtualServer.org/
+Url:http://www.linuxvirtualserver.org/
Group: Productivity/Networking/System
Source0:
http://www.LinuxVirtualServer.org/software/ipvsadm-%{version}.tar.bz2
-Source1:ipvsadm.init
+Source1:ipvsadm.service
Patch1: ipvsadm-%{version}.diff
Patch2: ipvsadm-%{version}-print_largenum.diff
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: %{name}-%{version}
Requires: grep
-PreReq: %insserv_prereq %fillup_prereq
-%define prefix /usr
+Requires(pre): %fillup_prereq
+%{?systemd_requires}
%description
ipvsadm is a utility for administering the IP virtual server services
@@ -43,10 +40,6 @@
-Authors:
-
-Wensong Zhang wens...@iinchina.net
-
%prep
%setup
# This files are embedded here instead of being another source in order
@@ -71,36 +64,34 @@
%patch2
%build
-make POPT_LIB=-lpopt CFLAGS=${RPM_OPT_FLAGS} -fPIC -DHAVE_POPT
-DLIBIPVS_USE_NL
+make POPT_LIB=-lpopt CFLAGS=%{optflags} -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
+mkdir -p
%{buildroot}/{sbin,%{_sbindir},%{_mandir}/man8,%{_unitdir},var/adm/fillup-templates}
+make BUILD_ROOT=%{buildroot} MANDIR=%{_mandir} install
+# Sysvinit support dropping
+rm -rf %{buildroot}/etc/init.d
# install SuSE init script
-install -m 755 %{S:1} ${RPM_BUILD_ROOT}/etc/init.d/ipvsadm
-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
+install -m 755 %{S:1} %{buildroot}%{_unitdir}/%{name}.service
+ln -sf /sbin/service %{buildroot}%{_sbindir}/rc%{name}
+install -m 644 sysconfig.ipvsadm
%{buildroot}/var/adm/fillup-templates/sysconfig.%{name}
+install -m 644 ipvsadm.rules %{buildroot}%{_sysconfdir}/%{name}.rules
%post
-%{fillup_and_insserv ipvsadm}
+%{fillup_only}
+%service_add_post ipvsadm.service
%postun
-%{insserv_cleanup}
-
-%clean
-if [ -n $RPM_BUILD_ROOT ] ; then
- [ $RPM_BUILD_ROOT != / ] rm -rf $RPM_BUILD_ROOT
-fi
+%service_del_postun ipvsadm.service
%files
%defattr(-,root,root)
%doc README
-%config /etc/ipvsadm.rules
-/etc/init.d/ipvsadm
+%config %{_sysconfdir}/%{name}.rules
+%{_unitdir}/%{name}.service
/sbin/*
-/usr/sbin/*
+%{_sbindir}/*
/%{_mandir}/man*/*
-/var/adm/fillup-templates/sysconfig.ipvsadm
+/var/adm/fillup-templates/sysconfig.%{name}
%changelog
++ ipvsadm.service ++
[Unit]
Description=Initialise the Linux Virtual Server
After=syslog.target network.target
[Service]
Type=oneshot
ExecStart=/bin/bash -c exec /sbin/ipvsadm-restore /etc/sysconfig/ipvsadm
ExecStop=/bin/bash -c exec /sbin/ipvsadm-save -n /etc/sysconfig/ipvsadm
commit ipvsadm for openSUSE:Factory
Hello community,
here is the log from the commit of package ipvsadm for openSUSE:Factory checked
in at 2011-12-06 18:19:38
Comparing /work/SRC/openSUSE:Factory/ipvsadm (Old)
and /work/SRC/openSUSE:Factory/.ipvsadm.new (New)
Package is ipvsadm, Maintainer is m...@suse.com
Changes:
Other differences:
--
++ ipvsadm.spec ++
--- /var/tmp/diff_new_pack.DHwy9Q/_old 2011-12-06 18:34:11.0 +0100
+++ /var/tmp/diff_new_pack.DHwy9Q/_new 2011-12-06 18:34:11.0 +0100
@@ -24,7 +24,7 @@
Summary:A Utility for Administering the Linux Virtual Server
Version:1.26
Release:1
-License:GPLv2+
+License:GPL-2.0+
Url:http://www.LinuxVirtualServer.org/
Group: Productivity/Networking/System
Source0:
http://www.LinuxVirtualServer.org/software/ipvsadm-%{version}.tar.bz2
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ipvsadm for openSUSE:Factory
Hello community, here is the log from the commit of package ipvsadm for openSUSE:Factory checked in at Mon Sep 19 17:23:52 CEST 2011. --- ipvsadm/ipvsadm.changes 2011-02-08 20:34:37.0 +0100 +++ /mounts/work_src_done/STABLE/ipvsadm/ipvsadm.changes2011-09-16 14:21:28.0 +0200 @@ -1,0 +2,5 @@ +Fri Sep 16 12:02:37 UTC 2011 - jeng...@medozas.de + +- Select libnl-1_1-devel + +--- calling whatdependson for head-i586 Other differences: -- ++ ipvsadm.spec ++ --- /var/tmp/diff_new_pack.tS9QTF/_old 2011-09-19 17:23:44.0 +0200 +++ /var/tmp/diff_new_pack.tS9QTF/_new 2011-09-19 17:23:44.0 +0200 @@ -20,7 +20,7 @@ Name: ipvsadm BuildRequires: kernel-source popt-devel -BuildRequires: libnl-devel +BuildRequires: libnl-1_1-devel Summary:A Utility for Administering the Linux Virtual Server Version:1.26 Release:1 Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
