Author: glen Date: Sat Mar 3 11:04:24 2012 GMT Module: packages Tag: HEAD ---- Log message: - bashism fix
---- Files affected: packages/system-config-firewall: system-config-firewall.spec (1.1 -> 1.2) , bashism.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/system-config-firewall/system-config-firewall.spec diff -u packages/system-config-firewall/system-config-firewall.spec:1.1 packages/system-config-firewall/system-config-firewall.spec:1.2 --- packages/system-config-firewall/system-config-firewall.spec:1.1 Sat Mar 3 12:01:09 2012 +++ packages/system-config-firewall/system-config-firewall.spec Sat Mar 3 12:04:19 2012 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# TODO -# - fix bashism: sh: >/dev/null 2>&1 : illegal file descriptor name # # Conditional build: %bcond_with usermode @@ -10,7 +8,7 @@ Summary: A graphical interface for basic firewall setup Name: system-config-firewall Version: 1.2.29 -Release: 5.4 +Release: 5.5 License: GPL v2+ Group: Base URL: http://fedorahosted.org/system-config-firewall @@ -18,6 +16,7 @@ # Source0-md5: c4c9957218e95dad08fb307bf66fb60c # replace pickle by json (CVE-2011-2520): Patch0: %{name}-1.2.27-rhbz#717985.patch +Patch1: bashism.patch BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: intltool @@ -75,6 +74,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %configure \ @@ -174,5 +174,8 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.2 2012/03/03 11:04:19 glen +- bashism fix + Revision 1.1 2012/03/03 11:01:09 glen - new, based on fedora package ================================================================ Index: packages/system-config-firewall/bashism.patch diff -u /dev/null packages/system-config-firewall/bashism.patch:1.1 --- /dev/null Sat Mar 3 12:04:24 2012 +++ packages/system-config-firewall/bashism.patch Sat Mar 3 12:04:19 2012 @@ -0,0 +1,13 @@ +--- system-config-firewall-1.2.29/src/fw_firewalld.py~ 2011-01-04 18:15:26.000000000 +0200 ++++ system-config-firewall-1.2.29/src/fw_firewalld.py 2012-03-03 12:51:33.845920235 +0200 +@@ -20,8 +20,8 @@ + import os, sys + + def firewalld_active(): +- chkconfig_status = os.system("/sbin/chkconfig firewalld >&/dev/null") +- service_status = os.system("/sbin/service firewalld status >&/dev/null") ++ chkconfig_status = os.system("/sbin/chkconfig firewalld >/dev/null 2>&1") ++ service_status = os.system("/sbin/service firewalld status >/dev/null 2>&1") + + if chkconfig_status + service_status == 0: + return True ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/system-config-firewall/system-config-firewall.spec?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
