Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lsyncd for openSUSE:Factory checked in at 2021-03-07 15:20:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lsyncd (Old) and /work/SRC/openSUSE:Factory/.lsyncd.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lsyncd" Sun Mar 7 15:20:11 2021 rev:17 rq:877495 version:2.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/lsyncd/lsyncd.changes 2018-08-02 14:58:01.916266227 +0200 +++ /work/SRC/openSUSE:Factory/.lsyncd.new.2378/lsyncd.changes 2021-03-07 15:20:13.600588131 +0100 @@ -1,0 +2,13 @@ +Sun Mar 7 07:41:20 UTC 2021 - Carsten Ziepke <[email protected]> + +- Use %%cmake macros + +------------------------------------------------------------------- +Sun Mar 7 06:35:23 UTC 2021 - Carsten Ziepke <[email protected]> + +- Rebase lsyncd-lua.patch and add fix for implicit declaration of + function lua_objlen - renamed to lua_rawlen in 5.2 +- Run spec-cleaner +- Remove insserv configuration and lsyncd-init.d + +------------------------------------------------------------------- Old: ---- lsyncd-init.d ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lsyncd.spec ++++++ --- /var/tmp/diff_new_pack.zDBuET/_old 2021-03-07 15:20:14.228588772 +0100 +++ /var/tmp/diff_new_pack.zDBuET/_new 2021-03-07 15:20:14.228588772 +0100 @@ -1,7 +1,7 @@ # # spec file for package lsyncd # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,52 +12,38 @@ # 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/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} - %define _fillupdir /var/adm/fillup-templates + %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif - -%if 0%{?suse_version} > 1230 -%bcond_without systemd -%else -%bcond_with systemd -%endif - Name: lsyncd Version: 2.2.3 Release: 0 -Url: https://github.com/axkibe/lsyncd +Summary: Live Syncing (Mirror) Daemon +License: GPL-2.0-only +Group: Productivity/Networking/Other +URL: https://github.com/axkibe/lsyncd Source0: https://github.com/axkibe/lsyncd/archive/release-%{version}.tar.gz -Source1: %{name}-init.d -Source2: %{name}.conf -Source3: rsync_sudo.sh -Source4: %{name}.service -Source5: %{name}.sysconfig -Source6: %{name}.logrotate +Source1: %{name}.conf +Source2: rsync_sudo.sh +Source3: %{name}.service +Source4: %{name}.sysconfig +Source5: %{name}.logrotate Patch0: lsyncd-lua.patch Patch1: lsyncd-man.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: asciidoc BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(lua) >= 5.2 -%if %{with systemd} -%{?systemd_requires} -BuildRequires: systemd-rpm-macros -%else -PreReq: %insserv_prereq -%endif -PreReq: %fillup_prereq +BuildRequires: pkgconfig(systemd) Requires: logrotate Requires: rsync >= 3.1 -Summary: Live Syncing (Mirror) Daemon -License: GPL-2.0-only -Group: Productivity/Networking/Other +%{?systemd_requires} %description Lsyncd (Live Syncing (Mirror) Daemon) uses rsync to synchronize local directories with a remote machine running rsyncd. It watches multiple directory trees through inotify. The first step after adding the watches is to rsync all directories with the remote host, and then the software synchronizes single files by collecting the inotify events. lsyncd is a lightweight live mirror solution that should be easy to install and use while blending well with your system. @@ -68,65 +54,44 @@ %patch1 -p1 %build -export CFLAGS="%optflags" -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_INSTALL_MANDIR=%{_mandir} -make %{?_smp_mflags} +export CFLAGS="%{optflags}" +%cmake \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DCMAKE_INSTALL_MANDIR=%{_mandir} +%cmake_build %install -%make_install +%cmake_install mkdir -p %{buildroot}/%{_sbindir} \ %{buildroot}/%{_sysconfdir}/%{name} \ %{buildroot}/%{_localstatedir}/log/lsyncd -%if %{with systemd} -install -Dm 644 %{S:4} %{buildroot}%{_unitdir}/lsyncd.service +install -Dm 644 %{SOURCE3} %{buildroot}%{_unitdir}/lsyncd.service ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name} -install -Dm 644 %{S:6} %{buildroot}%{_sysconfdir}/logrotate.d/lsyncd -%else -install -Dm 755 %{S:1} %{buildroot}/%{_initrddir}/lsyncd -ln -fs %{_sysconfdir}/init.d/lsyncd %{buildroot}%{_sbindir}/rc%{name} -%endif -install -Dm 644 %{S:2} %{buildroot}%{_sysconfdir}/lsyncd/lsyncd.conf -install -Dm 755 %{S:3} %{buildroot}%{_sysconfdir}/lsyncd/rsync_sudo.sh -install -Dm 644 %{S:5} %{buildroot}%{_fillupdir}/sysconfig.%{name} +install -Dm 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/logrotate.d/lsyncd +install -Dm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/lsyncd/lsyncd.conf +install -Dm 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/lsyncd/rsync_sudo.sh +install -Dm 644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.%{name} -%if %{with systemd} %pre -%service_add_pre lsyncd.service -%endif +%service_add_pre %{name}.service %post -%if %{with systemd} -%service_add_post lsyncd.service -%{fillup_only} -%else -%{fillup_and_insserv} -%endif +%service_add_post %{name}.service -%if %{with systemd} %preun -%service_del_preun lsyncd.service -%endif +%service_del_preun %{name}.service %postun -%if %{with systemd} -%service_del_postun lsyncd.service -%else -%{restart_on_update} -%{insserv_cleanup} -%endif +%service_del_postun %{name}.service %files -%defattr(-,root,root) -%doc ChangeLog COPYING +%license COPYING +%doc ChangeLog %{_bindir}/lsyncd -%{_mandir}/man1/lsyncd.1.gz -%if %{with systemd} +%{_sbindir}/rc%{name} +%{_mandir}/man1/lsyncd.1%{?ext_man} %{_unitdir}/lsyncd.service %config(noreplace) %{_sysconfdir}/logrotate.d/lsyncd -%else -%{_initrddir}/lsyncd -%endif -%{_sbindir}/rc%{name} %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/lsyncd.conf %config(noreplace) %{_sysconfdir}/%{name}/rsync_sudo.sh ++++++ lsyncd-lua.patch ++++++ --- /var/tmp/diff_new_pack.zDBuET/_old 2021-03-07 15:20:14.256588800 +0100 +++ /var/tmp/diff_new_pack.zDBuET/_new 2021-03-07 15:20:14.256588800 +0100 @@ -1,7 +1,16 @@ -diff -Pdpru lsyncd-release-2.2.3.orig/cmake/FindLua.cmake lsyncd-release-2.2.3/cmake/FindLua.cmake ---- lsyncd-release-2.2.3.orig/cmake/FindLua.cmake 2018-03-09 13:39:11.000000000 +0100 -+++ lsyncd-release-2.2.3/cmake/FindLua.cmake 2018-04-26 14:39:46.042589696 +0200 -@@ -43,7 +43,7 @@ FOREACH(_SUFFIX ${_POSSIBLE_SUFFIXES}) +diff -Nur lsyncd-release-2.2.3/cmake/FindLua.cmake new/cmake/FindLua.cmake +--- lsyncd-release-2.2.3/cmake/FindLua.cmake 2018-03-09 13:39:11.000000000 +0100 ++++ new/cmake/FindLua.cmake 2021-03-07 07:39:03.333619129 +0100 +@@ -36,14 +36,14 @@ + #SET(_POSSIBLE_LUA_LIBRARY lua) + + # Determine possible naming suffixes (there is no standard for this) +-SET(_POSSIBLE_SUFFIXES "52" "5.2" "-5.2" "53" "5.3" "-5.3" "") ++SET(_POSSIBLE_SUFFIXES "52" "5.2" "-5.2" "53" "5.3" "-5.3" "54" "5.4" "-5.4" "") + + # Set up possible search names and locations +-FOREACH(_SUFFIX ${_POSSIBLE_SUFFIXES}) ++FOREACH(_SUFFIX IN LISTS _POSSIBLE_SUFFIXES) LIST(APPEND _POSSIBLE_LUA_INCLUDE "include/lua${_SUFFIX}") LIST(APPEND _POSSIBLE_LUA_EXECUTABLE "lua${_SUFFIX}") LIST(APPEND _POSSIBLE_LUA_COMPILER "luac${_SUFFIX}") @@ -10,3 +19,22 @@ ENDFOREACH(_SUFFIX) # Find the lua executable +diff -Nur lsyncd-release-2.2.3/lsyncd.c new/lsyncd.c +--- lsyncd-release-2.2.3/lsyncd.c 2018-03-09 13:39:11.000000000 +0100 ++++ new/lsyncd.c 2021-03-07 07:18:09.085235425 +0100 +@@ -1137,13 +1137,13 @@ + { + int tlen; + int it; +- lua_checkstack( L, lua_gettop( L ) + lua_objlen( L, i ) + 1 ); ++ lua_checkstack( L, lua_gettop( L ) + lua_rawlen( L, i ) + 1 ); + + // moves table to top of stack + lua_pushvalue( L, i ); + lua_remove( L, i ); + argc--; +- tlen = lua_objlen( L, -1 ); ++ tlen = lua_rawlen( L, -1 ); + + for( it = 1; it <= tlen; it++ ) + {
