Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ipvsadm for openSUSE:Factory checked
in at 2022-09-07 11:05:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ipvsadm (Old)
and /work/SRC/openSUSE:Factory/.ipvsadm.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ipvsadm"
Wed Sep 7 11:05:41 2022 rev:27 rq:1001486 version:1.31
Changes:
--------
--- /work/SRC/openSUSE:Factory/ipvsadm/ipvsadm.changes 2022-05-17
17:23:53.255141239 +0200
+++ /work/SRC/openSUSE:Factory/.ipvsadm.new.2083/ipvsadm.changes
2022-09-07 11:05:47.940370286 +0200
@@ -1,0 +2,6 @@
+Tue Sep 6 14:21:39 UTC 2022 - Marius Tomaschewski <m...@suse.com>
+
+- Finish UsrMerge and move binaries /usr/sbin (bsc#1191064)
+- Re-add changes to zero-byte ipvsadm-print_largenum.patch file
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ipvsadm.spec ++++++
--- /var/tmp/diff_new_pack.kNocUp/_old 2022-09-07 11:05:48.392371435 +0200
+++ /var/tmp/diff_new_pack.kNocUp/_new 2022-09-07 11:05:48.396371445 +0200
@@ -73,12 +73,17 @@
%install
mkdir -p
%{buildroot}/{sbin,%{_sbindir},%{_mandir}/man8,%{_unitdir},%{_fillupdir}}
-make BUILD_ROOT=%{buildroot} MANDIR=%{_mandir} install
+make BUILD_ROOT=%{buildroot} MANDIR=%{_mandir} SBINDIR=%{_sbindir} install
+%if !0%{?usrmerged}
+for binary in ipvsadm ipvsadm-save ipvsadm-restore ; do
+ ln -sf %{_sbindir}/$binary %{buildroot}/sbin/$binary ;
+done
+%endif
# 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}
+ln -sf %_sbindir/service %{buildroot}%{_sbindir}/rc%{name}
install -m 644 sysconfig.ipvsadm
%{buildroot}%{_fillupdir}/sysconfig.%{name}
install -m 644 ipvsadm.rules %{buildroot}%{_sysconfdir}/%{name}.rules
@@ -100,9 +105,12 @@
%doc README
%config %{_sysconfdir}/%{name}.rules
%{_unitdir}/%{name}.service
-/sbin/*
-%{_sbindir}/*
-/%{_mandir}/man*/*
+%if !0%{?usrmerged}
+/sbin/ipvsadm*
+%endif
+%{_sbindir}/ipvsadm*
+%{_sbindir}/rcipvsadm*
+/%{_mandir}/man*/ipvsadm*
%{_fillupdir}/sysconfig.%{name}
%changelog
++++++ ipvsadm-makefile.patch ++++++
--- /var/tmp/diff_new_pack.kNocUp/_old 2022-09-07 11:05:48.420371506 +0200
+++ /var/tmp/diff_new_pack.kNocUp/_new 2022-09-07 11:05:48.424371516 +0200
@@ -1,19 +1,21 @@
-diff -Nur ipvsadm-1.31/Makefile new/Makefile
---- ipvsadm-1.31/Makefile 2019-12-24 14:20:30.000000000 +0100
-+++ new/Makefile 2022-04-24 01:42:51.839729180 +0200
-@@ -38,9 +38,9 @@
+--- ipvsadm/Makefile
++++ ipvsadm/Makefile 2022/09/06 11:41:13
+@@ -37,10 +37,11 @@ RPMSPECDIR = $(shell rpm --eval '%_specd
+
CC = gcc
INCLUDE =
- SBIN = $(BUILD_ROOT)/sbin
--MANDIR = usr/man
-+MANDIR = usr/share/man
- MAN = $(BUILD_ROOT)/$(MANDIR)/man8
+-SBIN = $(BUILD_ROOT)/sbin
++SBINDIR = /sbin
++SBIN = $(BUILD_ROOT)$(SBINDIR)
+ MANDIR = usr/man
+-MAN = $(BUILD_ROOT)/$(MANDIR)/man8
-INIT = $(BUILD_ROOT)/etc/rc.d/init.d
++MAN = $(BUILD_ROOT)$(MANDIR)/man8
+INIT = $(BUILD_ROOT)/etc/init.d
MKDIR = mkdir
INSTALL = install
STATIC_LIBS = libipvs/libipvs.a
-@@ -87,7 +87,7 @@
+@@ -87,7 +88,7 @@ libs:
make -C libipvs
ipvsadm: $(OBJS) $(STATIC_LIBS)
@@ -22,7 +24,7 @@
install: all
if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi
-@@ -99,7 +99,7 @@
+@@ -99,7 +100,7 @@ install: all
$(INSTALL) -m 0644 ipvsadm-save.8 $(MAN)
$(INSTALL) -m 0644 ipvsadm-restore.8 $(MAN)
[ -d $(INIT) ] || $(MKDIR) -p $(INIT)
++++++ ipvsadm-print_largenum.patch ++++++
--- /var/tmp/diff_new_pack.kNocUp/_old 2022-09-07 11:05:48.432371537 +0200
+++ /var/tmp/diff_new_pack.kNocUp/_new 2022-09-07 11:05:48.436371547 +0200
@@ -1,3 +1,12 @@
-
-(No newline at EOF)
+--- ipvsadm/ipvsadm.c
++++ ipvsadm/ipvsadm.c 2022/09/06 11:18:40
+@@ -1823,7 +1823,7 @@ static void print_largenum(unsigned long
+ 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;
+ }
+
++++++ ipvsadm.service ++++++
--- /var/tmp/diff_new_pack.kNocUp/_old 2022-09-07 11:05:48.456371598 +0200
+++ /var/tmp/diff_new_pack.kNocUp/_new 2022-09-07 11:05:48.460371608 +0200
@@ -5,8 +5,8 @@
[Service]
Type=oneshot
EnvironmentFile=-/etc/sysconfig/ipvsadm
-ExecStart=/bin/bash -c "exec /sbin/ipvsadm-restore < $IPVSADM_CONFIG"
-ExecStop=/sbin/ipvsadm -C
+ExecStart=/bin/bash -c "exec /usr/sbin/ipvsadm-restore < $IPVSADM_CONFIG"
+ExecStop=/usr/sbin/ipvsadm -C
RemainAfterExit=yes
[Install]
