Hello community, here is the log from the commit of package booth for openSUSE:Factory checked in at 2018-02-27 16:57:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/booth (Old) and /work/SRC/openSUSE:Factory/.booth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "booth" Tue Feb 27 16:57:09 2018 rev:44 rq:578987 version:1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/booth/booth.changes 2017-12-01 15:55:01.741034009 +0100 +++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2018-02-27 16:57:09.753766188 +0100 @@ -1,0 +2,6 @@ +Thu Feb 22 09:23:51 UTC 2018 - [email protected] + +- Build: replace SuSEFirewall2 by firewalld (fate#320794) in booth.spec +- Upstream version cs: 80199f9477fb4fbf8809f31986139efe3f4ef790 + +------------------------------------------------------------------- Old: ---- booth-1.0+20171123.d4cb8cb.tar.bz2 New: ---- booth-1.0+20180201.80199f9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ booth.spec ++++++ --- /var/tmp/diff_new_pack.c8Fblb/_old 2018-02-27 16:57:11.033719941 +0100 +++ /var/tmp/diff_new_pack.c8Fblb/_new 2018-02-27 16:57:11.037719797 +0100 @@ -1,7 +1,7 @@ # # spec file for package booth # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,14 +21,15 @@ %bcond_with glue # local commit: -%global commit 1.0+20171123.d4cb8cb +%global commit 1.0+20180201.80199f9 %global uname hacluster %global gname haclient %global test_path %{_datadir}/booth/tests -%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services +%define _libexecdir %{_libdir} +%define _fwdefdir %{_libexecdir}/firewalld/services Name: booth Version: 1.0 @@ -110,9 +111,9 @@ rm -f %{buildroot}/%{test_path}/test/*.pyc %if 0%{?suse_version} -#SUSE firewall rule +#Firewalld rule mkdir -p $RPM_BUILD_ROOT/%{_fwdefdir} -install -m 644 contrib/geo-cluster.fwd $RPM_BUILD_ROOT/%{_fwdefdir}/booth +install -m 644 contrib/geo-cluster.firewalld.xml $RPM_BUILD_ROOT/%{_fwdefdir}/booth.xml #install -m 644 %{S:2} $RPM_BUILD_ROOT/%{_fwdefdir}/booth %endif @@ -120,6 +121,10 @@ %service_add_pre booth-arbitrator.service %post +#Reload firewalld if already installed +if [ -e /usr/sbin/firewalld ]; then + %firewalld_reload +fi %service_add_post booth-arbitrator.service %preun @@ -151,7 +156,9 @@ %{_prefix}/lib/ocf/resource.d/booth/geostore %config %attr (644, %{uname}, %{gname}) %{_sysconfdir}/booth/booth.conf.example %if 0%{?suse_version} -%config %{_fwdefdir}/booth +%dir %{_libexecdir}/firewalld +%dir %{_fwdefdir} +%{_fwdefdir}/booth.xml %endif %{_unitdir}/[email protected] %{_unitdir}/booth-arbitrator.service ++++++ booth-1.0+20171123.d4cb8cb.tar.bz2 -> booth-1.0+20180201.80199f9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth-1.0+20171123.d4cb8cb/.git_info new/booth-1.0+20180201.80199f9/.git_info --- old/booth-1.0+20171123.d4cb8cb/.git_info 2017-12-01 10:44:10.863914778 +0100 +++ new/booth-1.0+20180201.80199f9/.git_info 2018-02-22 10:01:37.572481757 +0100 @@ -1 +1 @@ -v1.0-131-gd4cb8cb +v1.0-133-g80199f9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth-1.0+20171123.d4cb8cb/booth.spec new/booth-1.0+20180201.80199f9/booth.spec --- old/booth-1.0+20171123.d4cb8cb/booth.spec 2017-11-23 14:07:59.000000000 +0100 +++ new/booth-1.0+20180201.80199f9/booth.spec 2018-02-01 10:57:55.000000000 +0100 @@ -20,11 +20,11 @@ %if 0%{?suse_version} %define _libexecdir %{_libdir} +%define _fwdefdir %{_libexecdir}/firewalld/services %endif %define with_extra_warnings 0 %define with_debugging 0 %define without_fatal_warnings 1 -%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services %if 0%{?fedora} || 0%{?centos} || 0%{?rhel} %define pkg_group System Environment/Daemons %else @@ -51,6 +51,8 @@ BuildRequires: pkgconfig %if 0%{?suse_version} BuildRequires: glib2-devel +# SuSEFirewall2 replaced by Firewalld (fate#323460) +BuildRequires: firewall-macros %else BuildRequires: pkgconfig(glib-2.0) %endif @@ -135,10 +137,13 @@ rm -f %{buildroot}/%{test_path}/test/*.pyc %if 0%{?suse_version} -#SUSE firewall rule +#Firewalld rule mkdir -p $RPM_BUILD_ROOT/%{_fwdefdir} -install -m 644 contrib/geo-cluster.fwd $RPM_BUILD_ROOT/%{_fwdefdir}/booth +install -m 644 contrib/geo-cluster.firewalld.xml $RPM_BUILD_ROOT/%{_fwdefdir}/booth.xml #install -m 644 %{S:2} $RPM_BUILD_ROOT/%{_fwdefdir}/booth + +%post +%firewalld_reload %endif %check @@ -174,7 +179,9 @@ /usr/lib/ocf/resource.d/booth/geostore %config %{_sysconfdir}/booth/booth.conf.example %if 0%{?suse_version} -%config %{_fwdefdir}/booth +%dir %{_libexecdir}/firewalld +%dir %{_fwdefdir} +%{_fwdefdir}/booth.xml %endif %if %{defined _unitdir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth-1.0+20171123.d4cb8cb/contrib/geo-cluster.firewalld.xml new/booth-1.0+20180201.80199f9/contrib/geo-cluster.firewalld.xml --- old/booth-1.0+20171123.d4cb8cb/contrib/geo-cluster.firewalld.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/booth-1.0+20180201.80199f9/contrib/geo-cluster.firewalld.xml 2018-02-01 10:57:55.000000000 +0100 @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<service> + <short>Booth</short> + <description>This allows you to open ports related to booth.</description> + <port protocol="tcp" port="9929"/> + <port protocol="udp" port="9929"/> +</service> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth-1.0+20171123.d4cb8cb/contrib/geo-cluster.fwd new/booth-1.0+20180201.80199f9/contrib/geo-cluster.fwd --- old/booth-1.0+20171123.d4cb8cb/contrib/geo-cluster.fwd 2017-11-23 14:07:59.000000000 +0100 +++ new/booth-1.0+20180201.80199f9/contrib/geo-cluster.fwd 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -## Name: Booth -## Description: Opens ports for Geo Cluster - -# space separated list of allowed TCP ports -TCP="9929" - -# space separated list of allowed UDP ports -UDP="9929" - -# space separated list of allowed RPC services -RPC="" - -# space separated list of allowed IP protocols -IP="" - -# space separated list of allowed UDP broadcast ports -BROADCAST=""
