From 640a12d4dfce0d434159dd77ff415f7f7bc307aa2cdef6345c0353c6c0e1fe4f Mon Sep 17 00:00:00 2001 From: luce johann Date: Wed, 11 Apr 2012 14:06:42 +0000 Subject: [PATCH] Accepting request 113227 from home:jluce2:branches:security OBS-URL: https://build.opensuse.org/request/show/113227 OBS-URL: https://build.opensuse.org/package/show/security/ufw?expand=0&rev=3 --- ufw-0.30.1.tar.bz2 | 3 --- ufw-0.31.1.tar.bz2 | 3 +++ ufw.changes | 7 +++++++ ufw.service | 22 ++++++++++++++++++++++ ufw.spec | 30 +++++++++++++++++++++++++----- 5 files changed, 57 insertions(+), 8 deletions(-) delete mode 100644 ufw-0.30.1.tar.bz2 create mode 100644 ufw-0.31.1.tar.bz2 create mode 100644 ufw.service diff --git a/ufw-0.30.1.tar.bz2 b/ufw-0.30.1.tar.bz2 deleted file mode 100644 index 39f02f2..0000000 --- a/ufw-0.30.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ec01fc253e0100ce3d919c56f8d04a583954ec200e9219c372bfd409a179721 -size 212417 diff --git a/ufw-0.31.1.tar.bz2 b/ufw-0.31.1.tar.bz2 new file mode 100644 index 0000000..e6e6582 --- /dev/null +++ b/ufw-0.31.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2373717e6e23fae773579648c65e52c76d298984a9fc0d400f399fa3399f7239 +size 234889 diff --git a/ufw.changes b/ufw.changes index 1509eae..0a5bea7 100644 --- a/ufw.changes +++ b/ufw.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Apr 4 14:02:00 UTC 2012 - johann.luce@wanadoo.fr + +- Updated in 0.31.1 + fix various warning OBS + add script init file for systemd + ------------------------------------------------------------------- Tue Oct 11 15:05:51 UTC 2011 - johann.luce@wanadoo.fr diff --git a/ufw.service b/ufw.service new file mode 100644 index 0000000..64034a5 --- /dev/null +++ b/ufw.service @@ -0,0 +1,22 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +[Unit] +Description=/etc/init.d/ufw Compatibility +After=syslog.target network.target +ConditionFileIsExecutable=/etc/init.d/ufw + +[Service] +Type=oneshot +ExecStart=/etc/init.d/ufw start +ExecStop=/etc/init.d/ufw stop +TimeoutSec=0 +StandardOutput=syslog +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/ufw.spec b/ufw.spec index 337f7ba..449f237 100644 --- a/ufw.spec +++ b/ufw.spec @@ -1,16 +1,18 @@ Name: ufw -Version: 0.30.1 +Version: 0.31.1 Release: 0 Summary: Uncomplicated Firewall Group: Productivity/Networking/Security -License: GPLv3+ +License: GPL-3.0 URL: http://launchpad.net/%{name} Source0: %{name}-%{version}.tar.bz2 Source1: ufw-init -#BuildArch: noarch +Source2: ufw.service +BuildArch: noarch BuildRequires: python-devel -BuildRequires: iptables-devel +BuildRequires: iptables +BuildRequires: systemd #Requires: %description @@ -36,8 +38,16 @@ python setup.py install --prefix=/usr \ mkdir -p $RPM_BUILD_ROOT/etc/init.d/ install -m 755 $RPM_SOURCE_DIR/ufw-init $RPM_BUILD_ROOT/etc/init.d/ufw ln -s /etc/init.d/ufw $RPM_BUILD_ROOT/usr/sbin/rcufw +ln -s /usr/share/man/man8/ufw.8.gz $RPM_BUILD_ROOT/usr/share/man/man8/rcufw.8.gz mkdir -p $RPM_BUILD_ROOT/usr/bin/ ln -s /usr/sbin/ufw $RPM_BUILD_ROOT/usr/bin/ufw +mkdir -p $RPM_BUILD_ROOT/lib/systemd/ +mkdir -p $RPM_BUILD_ROOT/lib/systemd/system +install -m 644 $RPM_SOURCE_DIR/ufw.service $RPM_BUILD_ROOT/lib/systemd/system/ufw.service +mkdir -p $RPM_BUILD_ROOT/etc/systemd/ +mkdir -p $RPM_BUILD_ROOT/etc/systemd/system/ +mkdir -p $RPM_BUILD_ROOT/etc/systemd/system/multi-user.target.wants +ln -s /lib/systemd/system/ufw.service $RPM_BUILD_ROOT/etc/systemd/system/multi-user.target.wants/ufw.service %post insserv /etc/init.d/ufw @@ -46,6 +56,7 @@ insserv /etc/init.d/ufw %postun %insserv_cleanup /etc/init.d/ufw +%restart_on_update %files %defattr(-,root,root) @@ -53,16 +64,20 @@ insserv /etc/init.d/ufw /lib/ufw/ufw-init-functions /lib/ufw/user.rules /lib/ufw/user6.rules - /usr/lib/python%python_version/site-packages/ufw-0.30.1-py%python_version.egg-info + /usr/lib/python%python_version/site-packages/ufw-%{version}-py%python_version.egg-info /usr/sbin/ufw /usr/sbin/rcufw /usr/bin/ufw /usr/share/man/man8/ufw-framework.8.gz /usr/share/man/man8/ufw.8.gz + /usr/share/man/man8/rcufw.8.gz %config/etc/init.d/ufw %config/etc/ufw %config/etc/ufw/applications.d %config/etc/default/ufw + %config/etc/systemd/system/multi-user.target.wants/ufw.service + /lib/systemd/system/ufw.service + /etc/systemd/system/multi-user.target.wants /lib/ufw /usr/lib/python%python_version/site-packages/ufw /usr/share/ufw @@ -95,6 +110,11 @@ insserv /etc/init.d/ufw %lang(sv) /usr/share/ufw/messages/sv.mo %lang(tl) /usr/share/ufw/messages/tl.mo %lang(zh_CN) /usr/share/ufw/messages/zh_CN.mo +%lang(ast) /usr/share/ufw/messages/ast.mo +%lang(bs) /usr/share/ufw/messages/bs.mo +%lang(ja) /usr/share/ufw/messages/ja.mo +%lang(ur) /usr/share/ufw/messages/ur.mo + %changelog