Hello community, here is the log from the commit of package sanlock for openSUSE:Factory checked in at 2017-06-17 10:20:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sanlock (Old) and /work/SRC/openSUSE:Factory/.sanlock.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sanlock" Sat Jun 17 10:20:31 2017 rev:15 rq:501828 version:3.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/sanlock/sanlock.changes 2017-04-17 10:22:24.399392465 +0200 +++ /work/SRC/openSUSE:Factory/.sanlock.new/sanlock.changes 2017-06-17 10:20:35.248080136 +0200 @@ -1,0 +2,9 @@ +Wed Jun 7 22:39:48 UTC 2017 - [email protected] + +- Update to sanlock 3.5.0 + - increase open file limit to 2048 + - add option to log UTC timestamps + - doc improvements +- Remove support for old, non-systemd distros + +------------------------------------------------------------------- Old: ---- sanlock-3.4.0.tar.xz sanlock.init wdmd.init New: ---- sanlock-3.5.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sanlock.spec ++++++ --- /var/tmp/diff_new_pack.EGvxBT/_old 2017-06-17 10:20:36.043967865 +0200 +++ /var/tmp/diff_new_pack.EGvxBT/_new 2017-06-17 10:20:36.047967301 +0200 @@ -16,21 +16,16 @@ # -%define with_systemd 0 %define with_fence_sanlockd 0 %define with_sanlk_reset 0 -%if 0%{?suse_version} > 1140 -%define with_systemd 1 -%endif - %if 0%{?suse_version} > 1320 %define with_fence_sanlockd 1 %define with_sanlk_reset 1 %endif Name: sanlock -Version: 3.4.0 +Version: 3.5.0 Release: 0 Summary: A shared disk lock manager License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ @@ -42,12 +37,8 @@ BuildRequires: libblkid-devel BuildRequires: python BuildRequires: python-devel -%if %{with_systemd} BuildRequires: systemd %{?systemd_requires} -%else -Requires(pre): %insserv_prereq -%endif BuildRequires: xz Requires(pre): %fillup_prereq %if 0%{?suse_version} > 1320 @@ -57,12 +48,10 @@ Requires(pre): %{_sbindir}/useradd Requires: %{name}-lib = %{version}-%{release} Recommends: logrotate -Source0: %{name}-%{version}.tar.xz -Source1: sanlock.init -Source2: sysconfig.sanlock -Source3: wdmd.init -Source4: sysconfig.wdmd -Source5: fence_sanlockd.init +Source0: %{name}-%{version}.tar.gz +Source1: sysconfig.sanlock +Source2: sysconfig.wdmd +Source3: fence_sanlockd.init # Upstream patches # SUSE patches Patch100: sanlock-SCHED_RESET_ON_FORK-undefined.patch @@ -134,9 +123,7 @@ %patch100 %patch101 %patch102 -%if %{with_systemd} %patch103 -p1 -%endif %patch104 -p1 %patch105 -p1 @@ -175,32 +162,21 @@ %endif install -D -m 644 src/sanlock.conf %{buildroot}/%{_sysconfdir}/sanlock/sanlock.conf -install -D -m 644 %SOURCE2 %{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.sanlock -install -D -m 644 %SOURCE4 %{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.wdmd +install -D -m 644 %SOURCE1 %{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.sanlock +install -D -m 644 %SOURCE2 %{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.wdmd -%if %{with_systemd} install -D -m 644 init.d/sanlock.service %{buildroot}/%{_unitdir}/sanlock.service ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcsanlock install -D -m 644 init.d/wdmd.service %{buildroot}/%{_unitdir}/wdmd.service ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcwdmd %if %{with_fence_sanlockd} -install -D -m 0755 %SOURCE5 %{buildroot}/usr/lib/systemd/systemd-fence_sanlockd +install -D -m 0755 %SOURCE3 %{buildroot}/usr/lib/systemd/systemd-fence_sanlockd install -D -m 0644 init.d/fence_sanlockd.service %{buildroot}/%{_unitdir}/fence_sanlockd.service ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcfence_sanlockd %endif %if %{with_sanlk_reset} install -D -m 0644 init.d/sanlk-resetd.service %{buildroot}/%{_unitdir}/sanlk-resetd.service %endif -%else -install -D -m 755 %SOURCE1 %{buildroot}/etc/init.d/sanlock -ln -s /etc/init.d/sanlock %{buildroot}%{_sbindir}/rcsanlock -install -D -m 755 %SOURCE3 %{buildroot}/etc/init.d/wdmd -ln -s /etc/init.d/wdmd %{buildroot}%{_sbindir}/rcwdmd -%if %{with_fence_sanlockd} -install -D -m 755 %SOURCE5 %{buildroot}/%{_initddir}/fence_sanlockd -ln -s /etc/init.d/fence_sanlockd %{buildroot}%{_sbindir}/rcfence_sanlockd -%endif -%endif install -Dm 0644 src/logrotate.sanlock \ %{buildroot}/etc/logrotate.d/sanlock @@ -214,28 +190,17 @@ -u 179 -c "sanlock" -s /sbin/nologin -r \ -g 179 -G disk -d /var/run/sanlock sanlock -%if %{with_systemd} %service_add_pre wdmd.service %service_add_pre sanlock.service -%endif %pre -n fence-sanlock -%if %{with_systemd} %service_add_pre fence_sanlockd.service -%endif %pre -n sanlk-reset -%if %{with_systemd} %service_add_pre sanlk-resetd.service -%endif %post -%if %{with_systemd} %service_add_post wdmd.service sanlock.service -%else -%restart_on_update wdmd -%restart_on_update sanlock -%endif %fillup_only -n wdmd %fillup_only -n sanlock @@ -244,9 +209,7 @@ %if %{with_fence_sanlockd} %post -n fence-sanlock -%if %{with_systemd} %service_add_post fence_sanlockd.service -%endif %restart_on_update fence_sanlockd #if [ $1 -eq 1 ] ; then #ccs_update_schema > /dev/null 2>&1 ||: @@ -254,51 +217,28 @@ %endif %post -n sanlk-reset -%if %{with_systemd} %service_add_post sanlk-resetd.service -%endif %restart_on_update sanlk-resetd %preun -%if %{with_systemd} %service_del_preun wdmd.service sanlock.service -%else -%stop_on_removal wdmd -%stop_on_removal sanlock -%endif %preun -n fence-sanlock -%if %{with_systemd} %service_del_preun fence_sanlockd.service -%else -%stop_on_removal fence_sanlockd -%endif %preun -n sanlk-reset -%if %{with_systemd} %service_del_preun sanlk-resetd.service -%else -%stop_on_removal sanlk-resetd -%endif %postun -%if %{with_systemd} %service_del_postun wdmd.service sanlock.service -%else -%insserv_cleanup -%endif %postun -n libsanlock1 -p /sbin/ldconfig %postun -n fence-sanlock -%if %{with_systemd} %service_del_postun fence_sanlockd.service -%endif %postun -n sanlk-reset -%if %{with_systemd} %service_del_postun sanlk-resetd.service -%endif %files %defattr(-,root,root,-) @@ -309,13 +249,8 @@ %{_localstatedir}/adm/fillup-templates/sysconfig.sanlock %{_sbindir}/rcwdmd %{_localstatedir}/adm/fillup-templates/sysconfig.wdmd -%if %{with_systemd} %{_unitdir}/sanlock.service %{_unitdir}/wdmd.service -%else -/etc/init.d/sanlock -/etc/init.d/wdmd -%endif %{_sbindir}/sanlock %{_sbindir}/wdmd %{_mandir}/man8/wdmd* @@ -351,12 +286,8 @@ %files -n fence-sanlock %defattr(-,root,root,-) %{_sbindir}/fence_sanlockd -%if %{with_systemd} /usr/lib/systemd/systemd-fence_sanlockd %{_unitdir}/fence_sanlockd.service -%else -/etc/init.d/fence_sanlockd -%endif %{_sbindir}/fence_sanlock %{_sbindir}/fence_sanlockd %{_sbindir}/rcfence_sanlockd @@ -368,9 +299,7 @@ %defattr(-,root,root,-) %{_sbindir}/sanlk-reset %{_sbindir}/sanlk-resetd -%if %{with_systemd} %{_unitdir}/sanlk-resetd.service -%endif %{_mandir}/man8/sanlk-reset.8.gz %{_mandir}/man8/sanlk-resetd.8.gz %endif ++++++ suse-fix-link-errors.patch ++++++ --- /var/tmp/diff_new_pack.EGvxBT/_old 2017-06-17 10:20:36.095960531 +0200 +++ /var/tmp/diff_new_pack.EGvxBT/_new 2017-06-17 10:20:36.099959967 +0200 @@ -1,7 +1,7 @@ -Index: sanlock-3.4.0/fence_sanlock/Makefile +Index: sanlock-3.5.0/fence_sanlock/Makefile =================================================================== ---- sanlock-3.4.0.orig/fence_sanlock/Makefile -+++ sanlock-3.4.0/fence_sanlock/Makefile +--- sanlock-3.5.0.orig/fence_sanlock/Makefile ++++ sanlock-3.5.0/fence_sanlock/Makefile @@ -35,7 +35,7 @@ CFLAGS += -DVERSION=\"$(VER)\" -I../src CFLAGS += -fPIE -DPIE @@ -11,10 +11,10 @@ all: $(TARGET1) $(TARGET2) -Index: sanlock-3.4.0/src/Makefile +Index: sanlock-3.5.0/src/Makefile =================================================================== ---- sanlock-3.4.0.orig/src/Makefile -+++ sanlock-3.4.0/src/Makefile +--- sanlock-3.5.0.orig/src/Makefile ++++ sanlock-3.5.0/src/Makefile @@ -96,17 +96,16 @@ CFLAGS += -DVERSION=\"$(VER)\" CMD_CFLAGS = $(CFLAGS) -fPIE -DPIE @@ -37,10 +37,10 @@ ln -sf $(LIBSO_ENTIRE_TARGET) $(LIB_ENTIRE_TARGET).so ln -sf $(LIBSO_ENTIRE_TARGET) $(LIB_ENTIRE_TARGET).so.$(SOMAJOR) -Index: sanlock-3.4.0/tests/Makefile +Index: sanlock-3.5.0/tests/Makefile =================================================================== ---- sanlock-3.4.0.orig/tests/Makefile -+++ sanlock-3.4.0/tests/Makefile +--- sanlock-3.5.0.orig/tests/Makefile ++++ sanlock-3.5.0/tests/Makefile @@ -34,7 +34,7 @@ CFLAGS += -D_GNU_SOURCE -g \ -fasynchronous-unwind-tables \ -fdiagnostics-show-option @@ -50,10 +50,10 @@ all: $(TARGET1) $(TARGET2) $(TARGET3) $(TARGET4) $(TARGET5) $(TARGET6) $(TARGET7) -Index: sanlock-3.4.0/reset/Makefile +Index: sanlock-3.5.0/reset/Makefile =================================================================== ---- sanlock-3.4.0.orig/reset/Makefile -+++ sanlock-3.4.0/reset/Makefile +--- sanlock-3.5.0.orig/reset/Makefile ++++ sanlock-3.5.0/reset/Makefile @@ -35,7 +35,7 @@ CFLAGS += -DVERSION=\"$(VER)\" -I../src CFLAGS += -fPIE -DPIE ++++++ suse-no-date-time.patch ++++++ --- /var/tmp/diff_new_pack.EGvxBT/_old 2017-06-17 10:20:36.115957710 +0200 +++ /var/tmp/diff_new_pack.EGvxBT/_new 2017-06-17 10:20:36.115957710 +0200 @@ -1,8 +1,8 @@ -Index: sanlock-3.4.0/src/main.c +Index: sanlock-3.5.0/src/main.c =================================================================== ---- sanlock-3.4.0.orig/src/main.c -+++ sanlock-3.4.0/src/main.c -@@ -1903,8 +1903,8 @@ static int read_command_line(int argc, c +--- sanlock-3.5.0.orig/src/main.c ++++ sanlock-3.5.0/src/main.c +@@ -1904,8 +1904,8 @@ static int read_command_line(int argc, c } if (!strcmp(arg1, "--version") || !strcmp(arg1, "-V")) { @@ -13,10 +13,10 @@ exit(EXIT_SUCCESS); } -Index: sanlock-3.4.0/fence_sanlock/fence_sanlockd.c +Index: sanlock-3.5.0/fence_sanlock/fence_sanlockd.c =================================================================== ---- sanlock-3.4.0.orig/fence_sanlock/fence_sanlockd.c -+++ sanlock-3.4.0/fence_sanlock/fence_sanlockd.c +--- sanlock-3.5.0.orig/fence_sanlock/fence_sanlockd.c ++++ sanlock-3.5.0/fence_sanlock/fence_sanlockd.c @@ -565,8 +565,7 @@ int main(int argc, char *argv[]) print_usage(); exit(0); ++++++ suse-systemd.patch ++++++ --- /var/tmp/diff_new_pack.EGvxBT/_old 2017-06-17 10:20:36.127956018 +0200 +++ /var/tmp/diff_new_pack.EGvxBT/_new 2017-06-17 10:20:36.127956018 +0200 @@ -1,7 +1,7 @@ -Index: sanlock-3.4.0/init.d/sanlock.service +Index: sanlock-3.5.0/init.d/sanlock.service =================================================================== ---- sanlock-3.4.0.orig/init.d/sanlock.service -+++ sanlock-3.4.0/init.d/sanlock.service +--- sanlock-3.5.0.orig/init.d/sanlock.service ++++ sanlock-3.5.0/init.d/sanlock.service @@ -5,8 +5,10 @@ Wants=wdmd.service [Service] @@ -15,10 +15,10 @@ [Install] WantedBy=multi-user.target -Index: sanlock-3.4.0/init.d/wdmd.service +Index: sanlock-3.5.0/init.d/wdmd.service =================================================================== ---- sanlock-3.4.0.orig/init.d/wdmd.service -+++ sanlock-3.4.0/init.d/wdmd.service +--- sanlock-3.5.0.orig/init.d/wdmd.service ++++ sanlock-3.5.0/init.d/wdmd.service @@ -4,8 +4,10 @@ After=syslog.target [Service] @@ -32,10 +32,10 @@ [Install] WantedBy=multi-user.target -Index: sanlock-3.4.0/init.d/fence_sanlockd.service +Index: sanlock-3.5.0/init.d/fence_sanlockd.service =================================================================== ---- sanlock-3.4.0.orig/init.d/fence_sanlockd.service -+++ sanlock-3.4.0/init.d/fence_sanlockd.service +--- sanlock-3.5.0.orig/init.d/fence_sanlockd.service ++++ sanlock-3.5.0/init.d/fence_sanlockd.service @@ -5,8 +5,8 @@ Before=corosync.service [Service]
