Hello community, here is the log from the commit of package fwbuilder for openSUSE:Factory checked in at 2017-01-23 11:36:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fwbuilder (Old) and /work/SRC/openSUSE:Factory/.fwbuilder.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fwbuilder" Changes: -------- --- /work/SRC/openSUSE:Factory/fwbuilder/fwbuilder.changes 2016-06-29 15:10:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fwbuilder.new/fwbuilder.changes 2017-01-23 11:36:38.616228027 +0100 @@ -1,0 +2,17 @@ +Sun Jan 15 20:00:20 UTC 2017 - [email protected] + +- Update to 5.3.7 + * fix compile error + * gh#9 fwbuilder crashes on iptables import + * Use Kernel Timezone in Time Module + +------------------------------------------------------------------- +Sun Sep 4 21:54:06 UTC 2016 - [email protected] + +- add subpackage service/SysVinit + * added systemd service / SysVinit file + * added default file, which will be overwritten (sent) by + fwbuilder GUI + * noarch package + +------------------------------------------------------------------- @@ -14,0 +32,22 @@ + +------------------------------------------------------------------- +Tue Jun 21 13:50:01 UTC 2016 - [email protected] + +- update to 5.3.6.1 + * latest changes from May, 23rd 2016 + <dcc919d57a46ae75b22443ea9a53a3cbdc04c582> +- Version 5.3.6 + * Several bugfixes for Junos, including rollback on syntax error, + correct netmask for host objects and ssh password prompt lock-up +- Version 5.3.0 + * Support for Junos Access lists + * Show release notes for previous releases +- Version 5.2.0 + * Search for objects by port number or ip addres + * View graphical diff and autocompile firewall when loading file + * Support for Cisco NXOS Access lists + * Added support for dummy objects in rules + * Port to Qt5 + * New buildscript for OSX + * Added build instructions for Windows +- remove obsolete fwbuilder-gcc47.patch Old: ---- _service fwbuilder-5.3.6.tar.bz2 New: ---- fwbuilder-5.3.7.tar.gz fwbuilder.default fwbuilder.init fwbuilder.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fwbuilder.spec ++++++ --- /var/tmp/diff_new_pack.jCJDS9/_old 2017-01-23 11:36:39.332126501 +0100 +++ /var/tmp/diff_new_pack.jCJDS9/_new 2017-01-23 11:36:39.336125933 +0100 @@ -1,7 +1,7 @@ # # spec file for package fwbuilder # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -17,13 +17,18 @@ Name: fwbuilder -Version: 5.3.6 +Version: 5.3.7 Release: 0 Summary: Firewall Builder License: GPL-2.0+ Group: Productivity/Networking/Security Url: http://www.fwbuilder.org/ -Source: %{name}-%{version}.tar.bz2 +#Source: https://github.com/fwbuilder/fwbuilder/archive/v%{version}.tar.gz +Source: %{name}-5.3.7.tar.gz +Source10: %{name}.default +Source11: %{name}.init +Source12: %{name}.service +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ @@ -36,13 +41,18 @@ BuildRequires: openssl-devel Requires: hicolor-icon-theme Requires: rcs -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} BuildRequires: fdupes Requires(post): update-desktop-files Requires(postun): update-desktop-files %endif +%if 0%{?suse_version} >= 1210 +BuildRequires: systemd +%{?systemd_requires} +%define has_systemd 1 +%endif + %description Firewall Builder consists of a GUI and set of policy compilers for various firewall platforms. It helps users maintain a database of @@ -54,8 +64,33 @@ completely independent, this provides for a consistent abstract model and the same GUI for different firewall platforms. +%if 0%{?has_systemd} +%package service +Summary: Firewall Builder systemd service file +Group: Productivity/Networking/Security +BuildArch: noarch + +%description service +This is the systemd service file which is needed to start the Firewall automatically +on boot. +The fwbuilder gui will copy over by default a 'fwbuilder' script to /etc/fwbuilder/ + +%else +%package SysVinit +Summary: Firewall Builder SysVint file +Group: Productivity/Networking/Security +%if 0%{?suse_version} > 1110 +BuildArch: noarch +%endif + +%description SysVinit +This is the SysVinit file which is needed to start the Firewall automatically +on boot. +The fwbuilder gui will copy over by default a 'fwbuilder' script to /etc/fwbuilder/ +%endif + %prep -%setup -q +%setup -q -n %{name}-%{version} %build ./autogen.sh @@ -70,6 +105,19 @@ %fdupes -s %{buildroot} %endif +%{__install} -d %{buildroot}%{_sbindir} +%{__install} -D %{S:10} %{buildroot}%{_sysconfdir}/%{name}/%{name} +%{__ln_s} -f %{_sysconfdir}/%{name}/%{name} %{buildroot}%{_sbindir}/%{name} + +# systemd vs SysVinit +%if 0%{?has_systemd} +%{__install} -D -m 0644 %{S:12} %{buildroot}%{_unitdir}/%{name}.service +%{__ln_s} -f %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} +%else #SysVinit +%{__install} -D -m 0755 %{S:11} %{buildroot}%{_sysconfdir}/init.d/%{name} +%{__ln_s} -f %{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} +%endif + %if 0%{?suse_version} > 1310 %post %desktop_database_post @@ -80,6 +128,31 @@ %icon_theme_cache_postun %endif +%if 0%{?has_systemd} +%pre service +%service_add_pre %{name}.service + +%preun service +%service_del_preun %{name}.service + +%post service +%service_add_post %{name}.service + +%postun service +%service_del_postun %{name}.service + +%else +%preun SysVinit +%stop_on_removal %{name} + +%post SysVinit +%{fillup_and_insserv -f proftpd} + +%postun SysVinit +%restart_on_update %{name} +%{insserv_cleanup} +%endif + %files %defattr(-,root,root) %{_bindir}/* @@ -91,5 +164,24 @@ %dir %{_datadir}/icons/hicolor/*/apps %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_mandir}/man1/fwb* +%{_sbindir}/%{name} + +%if 0%{?has_systemd} +%files service +%defattr(-,root,root) +%dir %attr(0750,root,root) %{_sysconfdir}/%{name} +%config(noreplace) %{_sysconfdir}/%{name}/%{name} +%{_sbindir}/%{name} +%{_sbindir}/rc%{name} +%{_unitdir}/%{name}.service +%else +%files SysVinit +%defattr(-,root,root) +%dir %attr(0750,root,root) %{_sysconfdir}/%{name} +%config(noreplace) %{_sysconfdir}/%{name}/%{name} +%{_sbindir}/%{name} +%{_sbindir}/rc%{name} +%{_sysconfdir}/init.d/%{name} +%endif %changelog ++++++ fwbuilder.default ++++++ #!/bin/sh # # This is automatically generated file. DO NOT MODIFY ! # it will be replaced with file generated by fwbuilder GUI # RETVAL=0 exit $RETVAL ++++++ fwbuilder.init ++++++ #!/bin/sh # # Copyright (c) 2016 Scorpio IT, Deidesheim, Germany # All rights reserved # # Author: Christian Wittmer # please send feedback to <[email protected]> # # This library is free software; you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License as published by # the Free Software Foundation; either version 2.1 of the License, or (at # your option) any later version. # # This library is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, # USA. # # /etc/init.d/fwbuilder # and its symbolic link # /(usr/)sbin/rcfwbuilder # ### BEGIN INIT INFO # Provides: fwbuilder # Required-Start: $network $syslog $remote_fs # Should-Start: # Required-Stop: $network $syslog $remote_fs # Should-Stop: # Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: start fwbuilder iptables firewall # Description: start fwbuilder iptables firewall. Script # is usually created by fwbuilder GUI and copied via scp # to /etc/sysconfig/fwbuilder ### END INIT INFO # # Note on runlevels: # 0 - halt/poweroff 6 - reboot # 1 - single user 2 - multiuser without network exported # 3 - multiuser w/ network (text mode) 5 - multiuser w/ network and X11 (xdm) # # Check for missing binaries (stale symlinks should not happen) # Note: Special treatment of stop for LSB conformance FWBUILDER_BIN=/usr/sbin/fwbuilder test -x $FWBUILDER_BIN || { echo "$FWBUILDER_BIN not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } ## Check for existence of needed config file and read it #FWBUILDER_CONFIG=/etc/sysconfig/fwbuilder #test -r $FWBUILDER_CONFIG || { echo "$FWBUILDER_CONFIG not existing"; # if [ "$1" = "stop" ]; then exit 0; # else exit 6; fi; } # ## Read config #. $FWBUILDER_CONFIG # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status # rc_status check and set local and overall rc status # rc_status -v be verbose in local rc status and clear it afterwards # rc_status -v -r ditto and clear both the local and overall rc status # rc_status -s display "skipped" and exit with status 3 # rc_status -u display "unused" and exit with status 3 # rc_failed set local and overall rc status to failed # rc_failed <num> set local and overall rc status to <num> # rc_reset clear both the local and overall rc status # rc_exit exit appropriate to overall rc status # rc_active checks whether a service is activated by symlinks . /etc/rc.status # Reset status of this service rc_reset # Return values acc. to LSB for all commands but status: # 0 - success # 1 - generic or unspecified error # 2 - invalid or excess argument(s) # 3 - unimplemented feature (e.g. "reload") # 4 - user had insufficient privileges # 5 - program is not installed # 6 - program is not configured # 7 - program is not running # 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) # # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signaling is not supported) are # considered a success. case "$1" in start) echo -n "Starting fwbuilder " ## Start daemon with startproc(8). If this fails ## the return value is set appropriately by startproc. #/sbin/startproc $FWBUILDER_BIN $FWBUILDER_BIN start >/dev/null # Remember status and be verbose rc_status -v ;; stop) echo -n "Shutting down fwbuilder " ## Stop daemon with killproc(8) and if this fails ## killproc sets the return value according to LSB. #/sbin/killproc -TERM $FWBUILDER_BIN $FWBUILDER_BIN stop # Remember status and be verbose rc_status -v ;; restart|reload) ## Stop the service and regardless of whether it was ## running or not, start it again. $0 stop $0 start # Remember status and be quiet rc_status ;; status) echo -n "Checking for service fwbuilder " ## Check status with checkproc(8), if process is running ## checkproc will return with exit status 0. # Return value is slightly different for the status command: # 0 - service up and running # 1 - service dead, but /var/run/ pid file exists # 2 - service dead, but /var/lock/ lock file exists # 3 - service not running (unused) # 4 - service status unknown :-( # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) # NOTE: checkproc returns LSB compliant status values. #/sbin/checkproc $FWBUILDER_BIN $FWBUILDER_BIN status # NOTE: rc_status knows that we called this init script with # "status" option and adapts its messages accordingly. rc_status -v ;; *) echo "Usage: $0 {start|stop|status|restart|reload}" exit 1 ;; esac rc_exit ++++++ fwbuilder.service ++++++ [Unit] Description=start fwbuilder iptables firewall After=network.target ypbind.service nfs.service nfsserver.service rpcbind.service [Service] ExecStart=/usr/sbin/fwbuilder start ExecStop=/usr/sbin/fwbuilder stop ExecReload=/usr/sbin/fwbuilder reload RemainAfterExit=true Type=oneshot [Install] WantedBy=multi-user.target
