Hello community,
here is the log from the commit of package firewalld for openSUSE:Factory
checked in at 2020-11-14 18:22:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/firewalld (Old)
and /work/SRC/openSUSE:Factory/.firewalld.new.24930 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "firewalld"
Sat Nov 14 18:22:52 2020 rev:52 rq: version:0.9.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/firewalld/firewalld.changes 2020-11-13
18:53:18.217726770 +0100
+++ /work/SRC/openSUSE:Factory/.firewalld.new.24930/firewalld.changes
2020-11-14 18:23:03.408056278 +0100
@@ -2,16 +1,0 @@
-Mon Nov 9 09:15:55 UTC 2020 - Michał Rostecki <mroste...@suse.com>
-
-- Remove the patch which enforces usage of iptables instead of
- nftables:
- * 0001-firewall-backend-Switch-default-backend-to-iptables.patch
-- Add firewalld zone for the docker0 interface. This is the
- workaround for lack of nftables support in docker. Without that
- additional zone, containers have no Internet connectivity.
- (rhbz#1817022)
-- Update to 0.9.1:
- * Bugfixes:
- * docs(firewall-cmd): clarify lockdown whitelist command paths
- * fix(dbus): getActivePolicies shouldn't return a policy if a zone is not
active
- * fix(policy): zone interface/source changes should affect all using zone
-
--------------------------------------------------------------------
Old:
----
docker-zone.xml
firewalld-0.9.1.tar.gz
New:
----
0001-firewall-backend-Switch-default-backend-to-iptables.patch
firewalld-0.9.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ firewalld.spec ++++++
--- /var/tmp/diff_new_pack.nEG9vQ/_old 2020-11-14 18:23:05.192058057 +0100
+++ /var/tmp/diff_new_pack.nEG9vQ/_new 2020-11-14 18:23:05.196058061 +0100
@@ -21,14 +21,14 @@
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
Name: firewalld
-Version: 0.9.1
+Version: 0.9.0
Release: 0
Summary: A firewall daemon with D-Bus interface providing a dynamic
firewall
License: GPL-2.0-or-later
Group: Productivity/Networking/Security
Url: http://www.firewalld.org
-Source0:
https://github.com/firewalld/firewalld/releases/download/v%{version}/firewalld-%{version}.tar.gz
-Source1: docker-zone.xml
+Source:
https://github.com/firewalld/firewalld/releases/download/v%{version}/firewalld-%{version}.tar.gz
+Patch0: 0001-firewall-backend-Switch-default-backend-to-iptables.patch
BuildRequires: autoconf
BuildRequires: automake
@@ -151,10 +151,6 @@
ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rcfirewalld
-# add firewalld zone (rhbz#1817022)
-install -dp %{buildroot}%{_prefix}/lib/firewalld/zones
-install -p -m 644 %{SOURCE1}
%{buildroot}%{_prefix}/lib/firewalld/zones/docker.xml
-
%fdupes %{buildroot}%{python3_sitelib}
%find_lang %{name} --all-name
++++++ 0001-firewall-backend-Switch-default-backend-to-iptables.patch ++++++
Index: firewalld-0.8.3/config/firewalld.conf
===================================================================
--- firewalld-0.8.3.orig/config/firewalld.conf
+++ firewalld-0.8.3/config/firewalld.conf
@@ -43,9 +43,9 @@ LogDenied=off
# FirewallBackend
# Selects the firewall backend implementation.
# Choices are:
-# - nftables (default)
-# - iptables (iptables, ip6tables, ebtables and ipset)
-FirewallBackend=nftables
+# - nftables
+# - iptables (iptables, ip6tables, ebtables and ipset) (default)
+FirewallBackend=iptables
# FlushAllOnReload
# Flush all runtime rules on a reload. In previous releases some runtime
Index: firewalld-0.8.3/doc/xml/firewalld.conf.xml
===================================================================
--- firewalld-0.8.3.orig/doc/xml/firewalld.conf.xml
+++ firewalld-0.8.3/doc/xml/firewalld.conf.xml
@@ -149,8 +149,8 @@
<listitem>
<para>
Selects the firewall backend implementation. Possible values
- are; <replaceable>nftables</replaceable> (default), or
- <replaceable>iptables</replaceable>. This applies to all
+ are; <replaceable>nftables</replaceable>, or
+ <replaceable>iptables</replaceable> (default). This applies to
all
firewalld primitives. The only exception is direct and
passthrough rules which always use the traditional iptables,
ip6tables, and ebtables backends.
Index: firewalld-0.8.3/src/firewall/config/__init__.py.in
===================================================================
--- firewalld-0.8.3.orig/src/firewall/config/__init__.py.in
+++ firewalld-0.8.3/src/firewall/config/__init__.py.in
@@ -127,7 +127,7 @@ FALLBACK_IPV6_RPFILTER = True
FALLBACK_INDIVIDUAL_CALLS = False
FALLBACK_LOG_DENIED = "off"
FALLBACK_AUTOMATIC_HELPERS = "no"
-FALLBACK_FIREWALL_BACKEND = "nftables"
+FALLBACK_FIREWALL_BACKEND = "iptables"
FALLBACK_FLUSH_ALL_ON_RELOAD = True
FALLBACK_RFC3964_IPV4 = True
FALLBACK_ALLOW_ZONE_DRIFTING = False
++++++ firewalld-0.9.1.tar.gz -> firewalld-0.9.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/config/lockdown-whitelist.xml
new/firewalld-0.9.0/config/lockdown-whitelist.xml
--- old/firewalld-0.9.1/config/lockdown-whitelist.xml 2020-10-01
18:08:29.000000000 +0200
+++ new/firewalld-0.9.0/config/lockdown-whitelist.xml 2020-09-02
20:08:49.000000000 +0200
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<whitelist>
- <command name="/usr/bin/python /usr/bin/firewall-config"/>
+ <command name="/bin/python /usr/bin/firewall-config"/>
<selinux context="system_u:system_r:NetworkManager_t:s0"/>
<selinux context="system_u:system_r:virtd_t:s0-s0:c0.c1023"/>
<user id="0"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/configure
new/firewalld-0.9.0/configure
--- old/firewalld-0.9.1/configure 2020-10-01 18:08:24.000000000 +0200
+++ new/firewalld-0.9.0/configure 2020-09-02 20:08:45.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for firewalld 0.9.1.
+# Generated by GNU Autoconf 2.69 for firewalld 0.9.0.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@
# Identity of this package.
PACKAGE_NAME='firewalld'
PACKAGE_TARNAME='firewalld'
-PACKAGE_VERSION='0.9.1'
-PACKAGE_STRING='firewalld 0.9.1'
+PACKAGE_VERSION='0.9.0'
+PACKAGE_STRING='firewalld 0.9.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1314,7 +1314,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures firewalld 0.9.1 to adapt to many kinds of systems.
+\`configure' configures firewalld 0.9.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1380,7 +1380,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of firewalld 0.9.1:";;
+ short | recursive ) echo "Configuration of firewalld 0.9.0:";;
esac
cat <<\_ACEOF
@@ -1494,7 +1494,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-firewalld configure 0.9.1
+firewalld configure 0.9.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1511,7 +1511,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by firewalld $as_me 0.9.1, which was
+It was created by firewalld $as_me 0.9.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2378,7 +2378,7 @@
# Define the identity of the package.
PACKAGE='firewalld'
- VERSION='0.9.1'
+ VERSION='0.9.0'
# Some tools Automake needs.
@@ -2585,7 +2585,7 @@
#define PACKAGE_RELEASE "$PACKAGE_RELEASE"
_ACEOF
-PACKAGE_TAG='v0.9.1'
+PACKAGE_TAG='v0.9.0'
cat >>confdefs.h <<_ACEOF
#define PACKAGE_TAG "$PACKAGE_TAG"
@@ -5545,7 +5545,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by firewalld $as_me 0.9.1, which was
+This file was extended by firewalld $as_me 0.9.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5602,7 +5602,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-firewalld config.status 0.9.1
+firewalld config.status 0.9.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/doc/man/man1/firewall-applet.1
new/firewalld-0.9.0/doc/man/man1/firewall-applet.1
--- old/firewalld-0.9.1/doc/man/man1/firewall-applet.1 2020-10-01
18:08:30.000000000 +0200
+++ new/firewalld-0.9.0/doc/man/man1/firewall-applet.1 2020-09-02
20:08:50.000000000 +0200
@@ -4,10 +4,10 @@
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date:
.\" Manual: firewall-applet
-.\" Source: firewalld 0.9.1
+.\" Source: firewalld 0.9.0
.\" Language: English
.\"
-.TH "FIREWALL\-APPLET" "1" "" "firewalld 0.9.1" "firewall-applet"
+.TH "FIREWALL\-APPLET" "1" "" "firewalld 0.9.0" "firewall-applet"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/doc/man/man1/firewall-cmd.1
new/firewalld-0.9.0/doc/man/man1/firewall-cmd.1
--- old/firewalld-0.9.1/doc/man/man1/firewall-cmd.1 2020-10-01
18:08:31.000000000 +0200
+++ new/firewalld-0.9.0/doc/man/man1/firewall-cmd.1 2020-09-02
20:22:00.000000000 +0200
@@ -4,10 +4,10 @@
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date:
.\" Manual: firewall-cmd
-.\" Source: firewalld 0.9.1
+.\" Source: firewalld 0.9.0
.\" Language: English
.\"
-.TH "FIREWALL\-CMD" "1" "" "firewalld 0.9.1" "firewall-cmd"
+.TH "FIREWALL\-CMD" "1" "" "firewalld 0.9.0" "firewall-cmd"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -1905,11 +1905,11 @@
.PP
If a command entry on the whitelist ends with an asterisk \*(Aq*\*(Aq, then
all command lines starting with the command will match\&. If the \*(Aq*\*(Aq is
not there the absolute command inclusive arguments must match\&.
.PP
-Command paths for users are not always the same and depends on the users
PATH\&. Some distributions symlink
-\fB/bin\fR
-to
-\fB/usr/bin\fR
-in which case it depends on the order they appear in the PATH environment
variable\&.
+Commands for user root and others is not always the same\&. Example: As root
+\fB/bin/firewall\-cmd\fR
+is used, as a normal user
+\fB/usr/bin/firewall\-cmd\fR
+is be used on Fedora\&.
.PP
The context is the security (SELinux) context of a running application or
service\&. To get the context of a running application use
\fBps \-e \-\-context\fR\&.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/doc/man/man1/firewall-config.1
new/firewalld-0.9.0/doc/man/man1/firewall-config.1
--- old/firewalld-0.9.1/doc/man/man1/firewall-config.1 2020-10-01
18:08:31.000000000 +0200
+++ new/firewalld-0.9.0/doc/man/man1/firewall-config.1 2020-09-02
20:08:51.000000000 +0200
@@ -4,10 +4,10 @@
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date:
.\" Manual: firewall-config
-.\" Source: firewalld 0.9.1
+.\" Source: firewalld 0.9.0
.\" Language: English
.\"
-.TH "FIREWALL\-CONFIG" "1" "" "firewalld 0.9.1" "firewall-config"
+.TH "FIREWALL\-CONFIG" "1" "" "firewalld 0.9.0" "firewall-config"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/doc/man/man1/firewall-offline-cmd.1
new/firewalld-0.9.0/doc/man/man1/firewall-offline-cmd.1
--- old/firewalld-0.9.1/doc/man/man1/firewall-offline-cmd.1 2020-10-01
18:08:31.000000000 +0200
+++ new/firewalld-0.9.0/doc/man/man1/firewall-offline-cmd.1 2020-09-02
20:08:51.000000000 +0200
@@ -4,10 +4,10 @@
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date:
.\" Manual: firewall-offline-cmd
-.\" Source: firewalld 0.9.1
+.\" Source: firewalld 0.9.0
.\" Language: English
.\"
-.TH "FIREWALL\-OFFLINE\-C" "1" "" "firewalld 0.9.1" "firewall-offline-cmd"
+.TH "FIREWALL\-OFFLINE\-C" "1" "" "firewalld 0.9.0" "firewall-offline-cmd"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/doc/man/man1/firewalld.1
new/firewalld-0.9.0/doc/man/man1/firewalld.1
--- old/firewalld-0.9.1/doc/man/man1/firewalld.1 2020-10-01
18:08:31.000000000 +0200
+++ new/firewalld-0.9.0/doc/man/man1/firewalld.1 2020-09-02
20:08:51.000000000 +0200
@@ -4,10 +4,10 @@
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date:
.\" Manual: firewalld
-.\" Source: firewalld 0.9.1
+.\" Source: firewalld 0.9.0
.\" Language: English
.\"
-.TH "FIREWALLD" "1" "" "firewalld 0.9.1" "firewalld"
+.TH "FIREWALLD" "1" "" "firewalld 0.9.0" "firewalld"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/doc/man/man5/firewalld.conf.5
new/firewalld-0.9.0/doc/man/man5/firewalld.conf.5
--- old/firewalld-0.9.1/doc/man/man5/firewalld.conf.5 2020-10-01
18:08:32.000000000 +0200
+++ new/firewalld-0.9.0/doc/man/man5/firewalld.conf.5 2020-09-02
20:08:52.000000000 +0200
@@ -4,10 +4,10 @@
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date:
.\" Manual: firewalld.conf
-.\" Source: firewalld 0.9.1
+.\" Source: firewalld 0.9.0
.\" Language: English
.\"
-.TH "FIREWALLD\&.CONF" "5" "" "firewalld 0.9.1" "firewalld.conf"
+.TH "FIREWALLD\&.CONF" "5" "" "firewalld 0.9.0" "firewalld.conf"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/doc/man/man5/firewalld.dbus.5
new/firewalld-0.9.0/doc/man/man5/firewalld.dbus.5
--- old/firewalld-0.9.1/doc/man/man5/firewalld.dbus.5 2020-10-01
18:08:33.000000000 +0200
+++ new/firewalld-0.9.0/doc/man/man5/firewalld.dbus.5 2020-09-02
20:08:53.000000000 +0200
@@ -4,10 +4,10 @@
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date:
.\" Manual: firewalld.dbus
-.\" Source: firewalld 0.9.1
+.\" Source: firewalld 0.9.0
.\" Language: English
.\"
-.TH "FIREWALLD\&.DBUS" "5" "" "firewalld 0.9.1" "firewalld.dbus"
+.TH "FIREWALLD\&.DBUS" "5" "" "firewalld 0.9.0" "firewalld.dbus"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/doc/man/man5/firewalld.direct.5
new/firewalld-0.9.0/doc/man/man5/firewalld.direct.5
--- old/firewalld-0.9.1/doc/man/man5/firewalld.direct.5 2020-10-01
18:08:33.000000000 +0200
+++ new/firewalld-0.9.0/doc/man/man5/firewalld.direct.5 2020-09-02
20:08:53.000000000 +0200
@@ -4,10 +4,10 @@
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date:
.\" Manual: firewalld.direct
-.\" Source: firewalld 0.9.1
+.\" Source: firewalld 0.9.0
.\" Language: English
.\"
-.TH "FIREWALLD\&.DIRECT" "5" "" "firewalld 0.9.1" "firewalld.direct"
+.TH "FIREWALLD\&.DIRECT" "5" "" "firewalld 0.9.0" "firewalld.direct"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/doc/man/man5/firewalld.helper.5
new/firewalld-0.9.0/doc/man/man5/firewalld.helper.5
--- old/firewalld-0.9.1/doc/man/man5/firewalld.helper.5 2020-10-01
18:08:33.000000000 +0200
+++ new/firewalld-0.9.0/doc/man/man5/firewalld.helper.5 2020-09-02
20:08:53.000000000 +0200
@@ -4,10 +4,10 @@
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date:
.\" Manual: firewalld.helper
-.\" Source: firewalld 0.9.1
+.\" Source: firewalld 0.9.0
.\" Language: English
.\"
-.TH "FIREWALLD\&.HELPER" "5" "" "firewalld 0.9.1" "firewalld.helper"
+.TH "FIREWALLD\&.HELPER" "5" "" "firewalld 0.9.0" "firewalld.helper"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/doc/man/man5/firewalld.icmptype.5
new/firewalld-0.9.0/doc/man/man5/firewalld.icmptype.5
--- old/firewalld-0.9.1/doc/man/man5/firewalld.icmptype.5 2020-10-01
18:08:33.000000000 +0200
+++ new/firewalld-0.9.0/doc/man/man5/firewalld.icmptype.5 2020-09-02
20:08:54.000000000 +0200
@@ -4,10 +4,10 @@
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date:
.\" Manual: firewalld.icmptype
-.\" Source: firewalld 0.9.1
+.\" Source: firewalld 0.9.0
.\" Language: English
.\"
-.TH "FIREWALLD\&.ICMPTYPE" "5" "" "firewalld 0.9.1" "firewalld.icmptype"
+.TH "FIREWALLD\&.ICMPTYPE" "5" "" "firewalld 0.9.0" "firewalld.icmptype"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/doc/man/man5/firewalld.ipset.5
new/firewalld-0.9.0/doc/man/man5/firewalld.ipset.5
--- old/firewalld-0.9.1/doc/man/man5/firewalld.ipset.5 2020-10-01
18:08:34.000000000 +0200
+++ new/firewalld-0.9.0/doc/man/man5/firewalld.ipset.5 2020-09-02
20:08:54.000000000 +0200
@@ -4,10 +4,10 @@
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date:
.\" Manual: firewalld.ipset
-.\" Source: firewalld 0.9.1
+.\" Source: firewalld 0.9.0
.\" Language: English
.\"
-.TH "FIREWALLD\&.IPSET" "5" "" "firewalld 0.9.1" "firewalld.ipset"
+.TH "FIREWALLD\&.IPSET" "5" "" "firewalld 0.9.0" "firewalld.ipset"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/firewalld-0.9.1/doc/man/man5/firewalld.lockdown-whitelist.5
new/firewalld-0.9.0/doc/man/man5/firewalld.lockdown-whitelist.5
--- old/firewalld-0.9.1/doc/man/man5/firewalld.lockdown-whitelist.5
2020-10-01 18:08:34.000000000 +0200
+++ new/firewalld-0.9.0/doc/man/man5/firewalld.lockdown-whitelist.5
2020-09-02 20:08:54.000000000 +0200
@@ -4,10 +4,10 @@
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date:
.\" Manual: firewalld.lockdown-whitelist
-.\" Source: firewalld 0.9.1
+.\" Source: firewalld 0.9.0
.\" Language: English
.\"
-.TH "FIREWALLD\&.LOCKDOWN" "5" "" "firewalld 0.9.1"
"firewalld.lockdown-whitelist"
+.TH "FIREWALLD\&.LOCKDOWN" "5" "" "firewalld 0.9.0"
"firewalld.lockdown-whitelist"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/doc/man/man5/firewalld.policies.5
new/firewalld-0.9.0/doc/man/man5/firewalld.policies.5
--- old/firewalld-0.9.1/doc/man/man5/firewalld.policies.5 2020-10-01
18:08:35.000000000 +0200
+++ new/firewalld-0.9.0/doc/man/man5/firewalld.policies.5 2020-09-02
20:08:55.000000000 +0200
@@ -4,10 +4,10 @@
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date:
.\" Manual: firewalld.policies
-.\" Source: firewalld 0.9.1
+.\" Source: firewalld 0.9.0
.\" Language: English
.\"
-.TH "FIREWALLD\&.POLICIES" "5" "" "firewalld 0.9.1" "firewalld.policies"
+.TH "FIREWALLD\&.POLICIES" "5" "" "firewalld 0.9.0" "firewalld.policies"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/doc/man/man5/firewalld.policy.5
new/firewalld-0.9.0/doc/man/man5/firewalld.policy.5
--- old/firewalld-0.9.1/doc/man/man5/firewalld.policy.5 2020-10-01
18:08:35.000000000 +0200
+++ new/firewalld-0.9.0/doc/man/man5/firewalld.policy.5 2020-09-02
20:08:55.000000000 +0200
@@ -4,10 +4,10 @@
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date:
.\" Manual: firewalld.policy
-.\" Source: firewalld 0.9.1
+.\" Source: firewalld 0.9.0
.\" Language: English
.\"
-.TH "FIREWALLD\&.POLICY" "5" "" "firewalld 0.9.1" "firewalld.policy"
+.TH "FIREWALLD\&.POLICY" "5" "" "firewalld 0.9.0" "firewalld.policy"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/firewalld-0.9.1/doc/man/man5/firewalld.richlanguage.5
new/firewalld-0.9.0/doc/man/man5/firewalld.richlanguage.5
--- old/firewalld-0.9.1/doc/man/man5/firewalld.richlanguage.5 2020-10-01
18:08:34.000000000 +0200
+++ new/firewalld-0.9.0/doc/man/man5/firewalld.richlanguage.5 2020-09-02
20:08:54.000000000 +0200
@@ -4,10 +4,10 @@
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date:
.\" Manual: firewalld.richlanguage
-.\" Source: firewalld 0.9.1
+.\" Source: firewalld 0.9.0
.\" Language: English
.\"
-.TH "FIREWALLD\&.RICHLANG" "5" "" "firewalld 0.9.1" "firewalld.richlanguage"
+.TH "FIREWALLD\&.RICHLANG" "5" "" "firewalld 0.9.0" "firewalld.richlanguage"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/doc/man/man5/firewalld.service.5
new/firewalld-0.9.0/doc/man/man5/firewalld.service.5
--- old/firewalld-0.9.1/doc/man/man5/firewalld.service.5 2020-10-01
18:08:34.000000000 +0200
+++ new/firewalld-0.9.0/doc/man/man5/firewalld.service.5 2020-09-02
20:08:54.000000000 +0200
@@ -4,10 +4,10 @@
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date:
.\" Manual: firewalld.service
-.\" Source: firewalld 0.9.1
+.\" Source: firewalld 0.9.0
.\" Language: English
.\"
-.TH "FIREWALLD\&.SERVICE" "5" "" "firewalld 0.9.1" "firewalld.service"
+.TH "FIREWALLD\&.SERVICE" "5" "" "firewalld 0.9.0" "firewalld.service"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/doc/man/man5/firewalld.zone.5
new/firewalld-0.9.0/doc/man/man5/firewalld.zone.5
--- old/firewalld-0.9.1/doc/man/man5/firewalld.zone.5 2020-10-01
18:08:35.000000000 +0200
+++ new/firewalld-0.9.0/doc/man/man5/firewalld.zone.5 2020-09-02
20:08:55.000000000 +0200
@@ -4,10 +4,10 @@
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date:
.\" Manual: firewalld.zone
-.\" Source: firewalld 0.9.1
+.\" Source: firewalld 0.9.0
.\" Language: English
.\"
-.TH "FIREWALLD\&.ZONE" "5" "" "firewalld 0.9.1" "firewalld.zone"
+.TH "FIREWALLD\&.ZONE" "5" "" "firewalld 0.9.0" "firewalld.zone"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/doc/man/man5/firewalld.zones.5
new/firewalld-0.9.0/doc/man/man5/firewalld.zones.5
--- old/firewalld-0.9.1/doc/man/man5/firewalld.zones.5 2020-10-01
18:08:35.000000000 +0200
+++ new/firewalld-0.9.0/doc/man/man5/firewalld.zones.5 2020-09-02
20:08:55.000000000 +0200
@@ -4,10 +4,10 @@
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date:
.\" Manual: firewalld.zones
-.\" Source: firewalld 0.9.1
+.\" Source: firewalld 0.9.0
.\" Language: English
.\"
-.TH "FIREWALLD\&.ZONES" "5" "" "firewalld 0.9.1" "firewalld.zones"
+.TH "FIREWALLD\&.ZONES" "5" "" "firewalld 0.9.0" "firewalld.zones"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/doc/xml/firewall-cmd.xml
new/firewalld-0.9.0/doc/xml/firewall-cmd.xml
--- old/firewalld-0.9.1/doc/xml/firewall-cmd.xml 2020-10-01
18:08:30.000000000 +0200
+++ new/firewalld-0.9.0/doc/xml/firewall-cmd.xml 2020-09-01
19:45:58.000000000 +0200
@@ -2395,7 +2395,7 @@
If a command entry on the whitelist ends with an asterisk '*', then all
command lines starting with the command will match. If the '*' is not there the
absolute command inclusive arguments must match.
</para>
<para>
- Command paths for users are not always the same and depends on the
users PATH. Some distributions symlink <command>/bin</command> to
<command>/usr/bin</command> in which case it depends on the order they appear
in the PATH environment variable.
+ Commands for user root and others is not always the same. Example: As
root <command>/bin/firewall-cmd</command> is used, as a normal user
<command>/usr/bin/firewall-cmd</command> is be used on Fedora.
</para>
<para>
The context is the security (SELinux) context of a running application
or service. To get the context of a running application use <command>ps -e
--context</command>.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/doc/xml/firewall-cmd.xml.in
new/firewalld-0.9.0/doc/xml/firewall-cmd.xml.in
--- old/firewalld-0.9.1/doc/xml/firewall-cmd.xml.in 2020-10-01
18:02:04.000000000 +0200
+++ new/firewalld-0.9.0/doc/xml/firewall-cmd.xml.in 2020-09-01
18:36:34.000000000 +0200
@@ -2395,7 +2395,7 @@
If a command entry on the whitelist ends with an asterisk '*', then all
command lines starting with the command will match. If the '*' is not there the
absolute command inclusive arguments must match.
</para>
<para>
- Command paths for users are not always the same and depends on the
users PATH. Some distributions symlink <command>/bin</command> to
<command>/usr/bin</command> in which case it depends on the order they appear
in the PATH environment variable.
+ Commands for user root and others is not always the same. Example: As
root <command>/bin/firewall-cmd</command> is used, as a normal user
<command>/usr/bin/firewall-cmd</command> is be used on Fedora.
</para>
<para>
The context is the security (SELinux) context of a running application
or service. To get the context of a running application use <command>ps -e
--context</command>.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/firewalld.spec
new/firewalld-0.9.0/firewalld.spec
--- old/firewalld-0.9.1/firewalld.spec 2020-10-01 18:04:45.000000000 +0200
+++ new/firewalld-0.9.0/firewalld.spec 2020-09-02 20:07:14.000000000 +0200
@@ -7,7 +7,7 @@
Summary: A firewall daemon with D-Bus interface providing a dynamic firewall
Name: firewalld
-Version: 0.9.1
+Version: 0.9.0
Release: 1%{?dist}
URL: http://firewalld.org
License: GPLv2+
@@ -316,9 +316,6 @@
%{_mandir}/man1/firewall-config*.1*
%changelog
-* Thu Oct 01 2020 Eric Garver <e...@garver.life> - 0.9.1-1
-- bump package to v0.9.1
-
* Wed Sep 02 2020 Eric Garver <e...@garver.life> - 0.9.0-1
- bump package to v0.9.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/po/es.po new/firewalld-0.9.0/po/es.po
--- old/firewalld-0.9.1/po/es.po 2020-10-01 18:02:43.000000000 +0200
+++ new/firewalld-0.9.0/po/es.po 2020-09-02 20:05:25.000000000 +0200
@@ -27,22 +27,21 @@
# Máximo Castañeda Riloba <mcrc...@gmail.com>, 2017. #zanata
# Eric Garver <e...@erig.me>, 2018. #zanata
# Máximo Castañeda Riloba <mcrc...@gmail.com>, 2018. #zanata
-# Emilio Herrera <ehespinos...@gmail.com>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-30 13:30-0400\n"
-"PO-Revision-Date: 2020-09-27 17:29+0000\n"
-"Last-Translator: Emilio Herrera <ehespinos...@gmail.com>\n"
-"Language-Team: Spanish <https://translate.fedoraproject.org/projects/";
-"firewalld/master/es/>\n"
+"PO-Revision-Date: 2018-11-16 08:22+0000\n"
+"Last-Translator: Copied by Zanata <copied-by-zan...@zanata.org>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/firewalld/";
+"language/es/)\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.2.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Zanata 4.6.2\n"
#: ../config/firewall-applet.desktop.in.h:1 ../src/firewall-applet.in:416
msgid "Firewall Applet"
@@ -716,7 +715,7 @@
#: ../src/firewall-config.in:5793
msgid "Built-in ipset, rename not supported."
-msgstr "IPset incorporado, no se puede renombrar."
+msgstr "IPset incorporado, no se puede renombrar"
#: ../src/firewall-config.in:5885 ../src/firewall-config.in:5967
msgid "Please select a file"
@@ -774,7 +773,7 @@
#: ../src/firewall-config.glade.h:3
msgid "Please select the automatic helpers value:"
-msgstr "Por favor selecciones el valor de los auxiliares automáticos:"
+msgstr "Elija el valor para los agentes automáticos"
#: ../src/firewall-config.glade.h:5
msgid "Please enter the command line."
@@ -814,7 +813,7 @@
#: ../src/firewall-config.glade.h:16
msgid "raw"
-msgstr "crudo"
+msgstr "raw"
#: ../src/firewall-config.glade.h:17
msgid "security"
@@ -1230,7 +1229,7 @@
"networks."
msgstr ""
"Si habilita el enmascaramiento, se activará el reenvío de IP para sus redes "
-"IPv4."
+"IPv4"
#: ../src/firewall-config.glade.h:111
msgid "Masquerading"
@@ -1849,7 +1848,7 @@
#: ../src/firewall-config.glade.h:232
msgid "Please select an ipset:"
-msgstr "Por favor elija un IPSet:"
+msgstr "Elija un IPSet"
#: ../src/firewall-config.glade.h:234
msgid "Please enter an ipset entry:"
@@ -1885,7 +1884,7 @@
#: ../src/firewall-config.glade.h:242
msgid "Please select a netfilter conntrack helper:"
-msgstr "Por favor elija un agente netfilter de seguimiento de conexiones:"
+msgstr "Elija un agente netfilter de seguimiento de conexiones"
#: ../src/firewall-config.glade.h:243
msgid "- Select -"
@@ -1932,9 +1931,9 @@
msgstr "Introduzca una regla rica."
#: ../src/firewall-config.glade.h:255
+#, fuzzy
msgid "For host or network allow or denylisting deactivate the element."
-msgstr ""
-"Para permitir o denegar el listado de host o red desactive el elemento."
+msgstr "Para enlistar o deslistar un equipo o red, desactive el elemento."
#: ../src/firewall-config.glade.h:256
msgid "Source:"
@@ -2038,7 +2037,7 @@
#: ../src/firewall-config.glade.h:305
msgid "Default Target"
-msgstr "Objetivo por defecto"
+msgstr "Objetivo por defecto:"
#: ../src/firewall-config.glade.h:306
msgid "Target:"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/po/pt_BR.po
new/firewalld-0.9.0/po/pt_BR.po
--- old/firewalld-0.9.1/po/pt_BR.po 2020-10-01 18:02:44.000000000 +0200
+++ new/firewalld-0.9.0/po/pt_BR.po 2020-09-02 20:05:26.000000000 +0200
@@ -30,22 +30,21 @@
# Mateus de Melo Santos <mateu...@tutanota.com>, 2017. #zanata
# Eric Garver <e...@erig.me>, 2018. #zanata
# Renan Marcos Ferreira <renan.ferreir...@fatec.sp.gov.br>, 2018. #zanata
-# Rafael Fontenelle <rafae...@gnome.org>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-30 13:30-0400\n"
-"PO-Revision-Date: 2020-09-12 16:29+0000\n"
-"Last-Translator: Rafael Fontenelle <rafae...@gnome.org>\n"
-"Language-Team: Portuguese (Brazil) <https://translate.fedoraproject.org/";
-"projects/firewalld/master/pt_BR/>\n"
+"PO-Revision-Date: 2018-11-16 08:27+0000\n"
+"Last-Translator: Copied by Zanata <copied-by-zan...@zanata.org>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/";
+"firewalld/language/pt_BR/)\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.2.2\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Zanata 4.6.2\n"
#: ../config/firewall-applet.desktop.in.h:1 ../src/firewall-applet.in:416
msgid "Firewall Applet"
@@ -62,7 +61,7 @@
#. Translators: These are searchable keywords for the firewall configuration
tool
#: ../config/firewall-config.desktop.in.h:4
msgid "firewall;network;security;iptables;netfilter;"
-msgstr "firewall;network;rede;security;segurança;iptables;netfilter;"
+msgstr "firewall;network;security;iptables;netfilter;"
#: ../src/firewall-applet.in:92 ../src/firewall-config.in:7988
#, c-format
@@ -114,7 +113,7 @@
#: ../src/firewall-applet.in:244 ../src/firewall-applet.in:257
msgid "Reset To Default"
-msgstr "Restaurar para o padrão"
+msgstr "Restaurar para o padrão "
#: ../src/firewall-applet.in:248
msgid "Shields Down Zone:"
@@ -159,7 +158,7 @@
#: ../src/firewall-applet.in:500
msgid "About"
-msgstr "Sobre"
+msgstr "Sobre "
#: ../src/firewall-applet.in:508 ../src/firewall-config.in:618
#: ../src/firewall-config.in:2389 ../src/firewall-config.in:2670
@@ -205,15 +204,15 @@
#: ../src/firewall-applet.in:790 ../src/firewall-config.in:1386
msgid "No NetworkManager imports available"
-msgstr "Sem importações do NetworkManager disponíveis"
+msgstr " NetworkManager sem importações disponíveis"
#: ../src/firewall-applet.in:868
msgid "No connection to firewall daemon"
-msgstr "Sem conexão com o daemon do firewall"
+msgstr "Sem conexão com o daemon do Firewall."
#: ../src/firewall-applet.in:876 ../src/firewall-applet.in:1014
msgid "All network traffic is blocked."
-msgstr "Todo o tráfego de rede está bloqueado."
+msgstr "Todo o tráfego de rede está bloqueado"
#: ../src/firewall-applet.in:880
#, c-format
@@ -244,7 +243,7 @@
#: ../src/firewall-applet.in:913
msgid "No Active Zones."
-msgstr "Não há zonas ativas."
+msgstr "Não há Zonas Ativas"
#: ../src/firewall-applet.in:972
msgid "Connection to FirewallD established."
@@ -256,7 +255,7 @@
#: ../src/firewall-applet.in:989
msgid "FirewallD has been reloaded."
-msgstr "O FirewallD foi recarregado."
+msgstr "O FirewallD foi recarregado"
#: ../src/firewall-applet.in:996
#, c-format
@@ -265,7 +264,7 @@
#: ../src/firewall-applet.in:1015
msgid "Network traffic is not blocked anymore."
-msgstr "O tráfego de rede não está mais sendo bloqueado."
+msgstr "O tráfego de rede não está mais sendo bloqueado"
#: ../src/firewall-applet.in:1041 ../src/firewall-applet.in:1095
msgid "activated"
@@ -333,7 +332,7 @@
#: ../src/firewall-config.in:96
#, c-format
msgid "Used by network connection '%s'"
-msgstr "Usado por conexão de rede \"%s\""
+msgstr "Usado por conexão de rede '%s' "
#: ../src/firewall-config.in:97
#, c-format
@@ -342,7 +341,7 @@
#: ../src/firewall-config.in:99
msgid "enabled"
-msgstr "ativado"
+msgstr "ativado "
#: ../src/firewall-config.in:100
msgid "disabled"
@@ -350,7 +349,7 @@
#: ../src/firewall-config.in:125
msgid "Failed to load icons."
-msgstr "Falha ao carregar ícones."
+msgstr "Falha ao carregar ícones"
#: ../src/firewall-config.in:187 ../src/firewall-config.glade.h:6
msgid "Context"
@@ -482,13 +481,13 @@
#: ../src/firewall-config.in:2044 ../src/firewall-config.in:3211
#: ../src/firewall-config.in:3709 ../src/firewall-config.glade.h:262
msgid "accept"
-msgstr "aceitar"
+msgstr "aceitar "
#: ../src/firewall-config.in:2046 ../src/firewall-config.in:3213
#: ../src/firewall-config.in:3711 ../src/firewall-config.in:3859
#: ../src/firewall-config.glade.h:263
msgid "reject"
-msgstr "rejeitar"
+msgstr "rejeitar "
#: ../src/firewall-config.in:2050 ../src/firewall-config.in:3228
#: ../src/firewall-config.in:3716 ../src/firewall-config.glade.h:264
@@ -499,7 +498,7 @@
#: ../src/firewall-config.in:3718 ../src/firewall-config.in:3860
#: ../src/firewall-config.glade.h:265
msgid "mark"
-msgstr "marcar"
+msgstr "marcação "
#: ../src/firewall-config.in:2055 ../src/firewall-config.in:2099
#: ../src/firewall-config.in:2104
@@ -528,7 +527,7 @@
#: ../src/firewall-config.in:3686 ../src/firewall-config.in:3872
#: ../src/firewall-config.glade.h:291
msgid "masquerade"
-msgstr "mascaramento"
+msgstr "Mascaramento"
#: ../src/firewall-config.in:2080 ../src/firewall-config.in:3184
#: ../src/firewall-config.in:3358 ../src/firewall-config.in:3672
@@ -604,7 +603,7 @@
#: ../src/firewall-config.in:3126 ../src/firewall-config.in:3626
#: ../src/firewall-config.glade.h:270
msgid "second"
-msgstr "segundo"
+msgstr "segundos "
#: ../src/firewall-config.in:3127 ../src/firewall-config.in:3627
#: ../src/firewall-config.glade.h:271
@@ -624,17 +623,17 @@
#: ../src/firewall-config.in:3130 ../src/firewall-config.in:3630
#: ../src/firewall-config.glade.h:276
msgid "emergency"
-msgstr "emergência"
+msgstr "emergência "
#: ../src/firewall-config.in:3131 ../src/firewall-config.in:3631
#: ../src/firewall-config.glade.h:277
msgid "alert"
-msgstr "alerta"
+msgstr "alerta "
#: ../src/firewall-config.in:3132 ../src/firewall-config.in:3632
#: ../src/firewall-config.glade.h:278
msgid "critical"
-msgstr "crítico"
+msgstr "critical "
#: ../src/firewall-config.in:3133 ../src/firewall-config.in:3633
#: ../src/firewall-config.glade.h:279
@@ -649,12 +648,12 @@
#: ../src/firewall-config.in:3135 ../src/firewall-config.in:3635
#: ../src/firewall-config.glade.h:281
msgid "notice"
-msgstr "aviso"
+msgstr "notificação "
#: ../src/firewall-config.in:3136 ../src/firewall-config.in:3636
#: ../src/firewall-config.glade.h:282
msgid "info"
-msgstr "info"
+msgstr "informação "
#: ../src/firewall-config.in:3137 ../src/firewall-config.in:3637
#: ../src/firewall-config.glade.h:283
@@ -689,11 +688,12 @@
#: ../src/firewall-config.in:5602
msgid "Please enter an ipv4 address with the form address[/mask]."
-msgstr "Por favor, insira um endereço ipv4 na forma de endereço[/mask]."
+msgstr ""
+"Por favor, insira um endereço ipv4 com o formulário de endereço [/mask]."
#: ../src/firewall-config.in:5603
msgid "The mask can be a network mask or a number."
-msgstr "A máscara pode ser uma máscara de rede ou um número."
+msgstr "A máscara pode ser uma máscara de rede ou um número. "
#: ../src/firewall-config.in:5605
msgid "Please enter an ipv6 address with the form address[/mask]."
@@ -702,7 +702,7 @@
#: ../src/firewall-config.in:5606
msgid "The mask is a number."
-msgstr "A máscara é um número."
+msgstr "A máscara é um número. "
#: ../src/firewall-config.in:5608
msgid "Please enter an ipv4 or ipv6 address with the form address[/mask]."
@@ -716,11 +716,11 @@
"The mask is a number for ipv6."
msgstr ""
"A máscara pode ser uma máscara de rede ou um número para ipv4.\n"
-"A máscara é um número para ipv6."
+"A máscara é um número para ipv6. "
#: ../src/firewall-config.in:5793
msgid "Built-in ipset, rename not supported."
-msgstr "IPset embutido, renomeação não é suportada."
+msgstr "Ipset embutido, renomeação não é suportada. "
#: ../src/firewall-config.in:5885 ../src/firewall-config.in:5967
msgid "Please select a file"
@@ -728,7 +728,7 @@
#: ../src/firewall-config.in:5892 ../src/firewall-config.in:5974
msgid "Text Files"
-msgstr "Arquivos texto"
+msgstr "Arquivo Texto "
#: ../src/firewall-config.in:5897 ../src/firewall-config.in:5979
msgid "All Files"
@@ -751,7 +751,7 @@
#: ../src/firewall-config.in:6406
msgid "Built-in helper, rename not supported."
-msgstr "Auxiliar embutido, renomeação não é suportada."
+msgstr "Ajuda embutida, renomeação não é suportada"
#: ../src/firewall-config.in:6884
msgid "Built-in icmp, rename not supported."
@@ -913,7 +913,7 @@
#: ../src/firewall-config.glade.h:39
msgid "Family:"
-msgstr "Família:"
+msgstr "Família"
#: ../src/firewall-config.glade.h:43
msgid "Module:"
@@ -941,7 +941,7 @@
#: ../src/firewall-config.glade.h:49
msgid "Please select an ICMP type"
-msgstr "Por favor, selecione um tipo de ICMP"
+msgstr "Por favor, selecione um tipo de ICMP "
#: ../src/firewall-config.glade.h:50
msgid "Add Entry"
@@ -1946,8 +1946,10 @@
msgstr "Por favor insira uma regra valiosa."
#: ../src/firewall-config.glade.h:255
+#, fuzzy
msgid "For host or network allow or denylisting deactivate the element."
-msgstr "Para permitir ou negar um host ou rede, desative o elemento."
+msgstr ""
+"Para o host ou rede de whitelisting ou blacklisting desativar o elemento"
#: ../src/firewall-config.glade.h:256
msgid "Source:"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/po/tr.po new/firewalld-0.9.0/po/tr.po
--- old/firewalld-0.9.1/po/tr.po 2020-10-01 18:02:44.000000000 +0200
+++ new/firewalld-0.9.0/po/tr.po 2020-09-02 20:05:26.000000000 +0200
@@ -13,7 +13,7 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-30 13:30-0400\n"
-"PO-Revision-Date: 2020-09-28 20:29+0000\n"
+"PO-Revision-Date: 2020-07-01 19:40+0000\n"
"Last-Translator: Oğuz Ersen <oguzer...@protonmail.com>\n"
"Language-Team: Turkish <https://translate.fedoraproject.org/projects/";
"firewalld/master/tr/>\n"
@@ -22,7 +22,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n>1);\n"
-"X-Generator: Weblate 4.2.2\n"
+"X-Generator: Weblate 4.1.1\n"
#: ../config/firewall-applet.desktop.in.h:1 ../src/firewall-applet.in:416
msgid "Firewall Applet"
@@ -39,8 +39,7 @@
#. Translators: These are searchable keywords for the firewall configuration
tool
#: ../config/firewall-config.desktop.in.h:4
msgid "firewall;network;security;iptables;netfilter;"
-msgstr ""
-"firewall;network;security;iptables;netfilter;güvenlik duvarı;ağ;koruma;"
+msgstr "güvenlik-duvarı;ağ;güvenlik;iptables;netfilter;"
#: ../src/firewall-applet.in:92 ../src/firewall-config.in:7988
#, c-format
@@ -70,12 +69,12 @@
#: ../src/firewall-applet.in:207
msgid "Configure Shields Up/Down Zones"
-msgstr "Kalkanlar Yukarı/Aşağı Bölgelerini Yapılandır"
+msgstr "Kalkanlar Aktif/Aktif Değil Bölgeleri Yapılandır"
#: ../src/firewall-applet.in:220
msgid "Here you can select the zones used for Shields Up and Shields Down."
msgstr ""
-"Burada Kalkanlar Yukarı ve Kalkanlar Aşağı için kullanılan bölgeleri "
+"Burada Kalkanlar Aktif ve Kalkanlar Aktif Değil için kullanılan bölgeleri "
"seçebilirsiniz."
#: ../src/firewall-applet.in:226
@@ -89,7 +88,7 @@
#: ../src/firewall-applet.in:235
msgid "Shields Up Zone:"
-msgstr "Kalkanlar Yukarı Bölgesi:"
+msgstr "Kalkanlar Aktif Bölge:"
#: ../src/firewall-applet.in:244 ../src/firewall-applet.in:257
msgid "Reset To Default"
@@ -97,7 +96,7 @@
#: ../src/firewall-applet.in:248
msgid "Shields Down Zone:"
-msgstr "Kalkanlar Aşağı Bölgesi:"
+msgstr "Kalkanlar Aktif Değil Bölge:"
#: ../src/firewall-applet.in:340
#, c-format
@@ -114,7 +113,7 @@
#: ../src/firewall-applet.in:470
msgid "Shields Up"
-msgstr "Kalkanlar Yukarı"
+msgstr "Kalkanlar Aktif"
#: ../src/firewall-applet.in:477
msgid "Enable Notifications"
@@ -130,7 +129,7 @@
#: ../src/firewall-applet.in:491
msgid "Configure Shields UP/Down Zones..."
-msgstr "Kalkanlar Yukarı/Aşağı Bölgelerini Yapılandır..."
+msgstr "Kalkanlar Aktif/Aktif Değil Bölgeleri Yapılandır..."
#: ../src/firewall-applet.in:495
msgid "Block all network traffic"
@@ -205,26 +204,26 @@
"interface '{interface}'"
msgstr ""
"Öntanımlı Bölge '{default_zone}', '{interface}' arayüzünde '{connection}' "
-"bağlantısı için etkin"
+"bağlantısı için aktif"
#: ../src/firewall-applet.in:889
msgid ""
"Zone '{zone}' active for connection '{connection}' on interface '{interface}'"
msgstr ""
"'{zone}' bölgesi, '{interface}' arayüzünde '{connection}' bağlantısı için "
-"etkin"
+"aktif"
#: ../src/firewall-applet.in:901
msgid "Zone '{zone}' active for interface '{interface}'"
-msgstr "'{zone}' bölgesi '{interface}' arayüzü için etkin"
+msgstr "'{zone}' bölgesi '{interface}' arayüzü için aktif"
#: ../src/firewall-applet.in:909
msgid "Zone '{zone}' active for source {source}"
-msgstr "'{zone}' bölgesi, {source} kaynağı için etkin"
+msgstr "'{zone}' bölgesi, {source} kaynağı için aktif"
#: ../src/firewall-applet.in:913
msgid "No Active Zones."
-msgstr "Etkin Bölge Yok."
+msgstr "Aktif Bölge Yok."
#: ../src/firewall-applet.in:972
msgid "Connection to FirewallD established."
@@ -249,7 +248,7 @@
#: ../src/firewall-applet.in:1041 ../src/firewall-applet.in:1095
msgid "activated"
-msgstr "etkinleştirildi"
+msgstr "aktifleştirildi"
#: ../src/firewall-applet.in:1042 ../src/firewall-applet.in:1096
msgid "deactivated"
@@ -278,7 +277,7 @@
#: ../src/firewall-applet.in:1080
#, c-format
msgid "Zone '%s' activated for interface '%s'"
-msgstr "'%s' bölgesi, '%s' arayüzü için etkinleştirildi"
+msgstr "'%s' bölgesi, '%s' arayüzü için aktifleştirildi"
#: ../src/firewall-applet.in:1097
msgid "Zone '{zone}' {activated_deactivated} for source '{source}'"
@@ -287,7 +286,7 @@
#: ../src/firewall-applet.in:1121
#, c-format
msgid "Zone '%s' activated for source '%s'"
-msgstr "'%s' bölgesi, '%s' kaynağı için etkinleştirildi"
+msgstr "'%s' bölgesi, '%s' kaynağı için aktifleştirildi"
#: ../src/firewall-config.in:89
msgid "Connection to firewalld established."
@@ -1046,7 +1045,7 @@
#: ../src/firewall-config.glade.h:80
msgid "Active Bindings"
-msgstr "Etkin Bağlamalar"
+msgstr "Aktif Bağlamalar"
#: ../src/firewall-config.glade.h:81
msgid "_Help"
@@ -1064,14 +1063,14 @@
msgid ""
"Hide active runtime bindings of connections, interfaces and sources to zones"
msgstr ""
-"Bağlantıların, arayüzlerin ve kaynakların bölgelere etkin çalışma zamanı "
+"Bağlantıların, arayüzlerin ve kaynakların bölgelere aktif çalışma zamanı "
"bağlamalarını gizle"
#: ../src/firewall-config.glade.h:85
msgid ""
"Show active runtime bindings of connections, interfaces and sources to zones"
msgstr ""
-"Bağlantıların, arayüzlerin ve kaynakların bölgelere etkin çalışma zamanı "
+"Bağlantıların, arayüzlerin ve kaynakların bölgelere aktif çalışma zamanı "
"bağlamalarını göster"
#: ../src/firewall-config.glade.h:86
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/src/firewall/config/__init__.py
new/firewalld-0.9.0/src/firewall/config/__init__.py
--- old/firewalld-0.9.1/src/firewall/config/__init__.py 2020-10-01
18:08:29.000000000 +0200
+++ new/firewalld-0.9.0/src/firewall/config/__init__.py 2020-09-02
20:08:49.000000000 +0200
@@ -42,7 +42,7 @@
DATADIR = '/usr/share/' + DAEMON_NAME
CONFIG_GLADE_NAME = CONFIG_NAME + '.glade'
COPYRIGHT = '(C) 2010-2017 Red Hat, Inc.'
-VERSION = '0.9.1'
+VERSION = '0.9.0'
AUTHORS = [
"Thomas Woerner <twoer...@redhat.com>",
"Jiri Popelka <jpope...@redhat.com>",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/src/firewall/core/fw_zone.py
new/firewalld-0.9.0/src/firewall/core/fw_zone.py
--- old/firewalld-0.9.1/src/firewall/core/fw_zone.py 2020-10-01
18:02:12.000000000 +0200
+++ new/firewalld-0.9.0/src/firewall/core/fw_zone.py 2020-09-01
18:36:34.000000000 +0200
@@ -708,11 +708,11 @@
# after the transaction ends and therefore the interface
# has been added to the zone's settings, update the
# dependent policies
- transaction.add_post(lambda p: (p in
self._fw.policy.get_active_policies_not_derived_from_zone()) and \
-
self._fw.policy._ingress_egress_zones_transaction(True, p), policy)
+ transaction.add_post(lambda: (policy in
self._fw.policy.get_active_policies_not_derived_from_zone()) and \
+
self._fw.policy._ingress_egress_zones_transaction(True, policy))
elif enable:
- transaction.add_post(lambda p: (p in
self._fw.policy.get_active_policies_not_derived_from_zone()) and \
-
self._fw.policy.apply_policy_settings(p), policy)
+ transaction.add_post(lambda: (policy in
self._fw.policy.get_active_policies_not_derived_from_zone()) and \
+
self._fw.policy.apply_policy_settings(policy))
# IPSETS
@@ -772,11 +772,11 @@
# after the transaction ends and therefore the sources
# has been added to the zone's settings, update the
# dependent policies
- transaction.add_post(lambda p: (p in
self._fw.policy.get_active_policies_not_derived_from_zone()) and \
-
self._fw.policy._ingress_egress_zones_transaction(True, p), policy)
+ transaction.add_post(lambda: (policy in
self._fw.policy.get_active_policies_not_derived_from_zone()) and \
+
self._fw.policy._ingress_egress_zones_transaction(True, policy))
elif enable:
- transaction.add_post(lambda p: (p in
self._fw.policy.get_active_policies_not_derived_from_zone()) and \
-
self._fw.policy.apply_policy_settings(p), policy)
+ transaction.add_post(lambda: (policy in
self._fw.policy.get_active_policies_not_derived_from_zone()) and \
+
self._fw.policy.apply_policy_settings(policy))
def add_service(self, zone, service, timeout=0, sender=None):
zone = self._fw.check_zone(zone)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/src/firewall/server/firewalld.py
new/firewalld-0.9.0/src/firewall/server/firewalld.py
--- old/firewalld-0.9.1/src/firewall/server/firewalld.py 2020-10-01
18:02:08.000000000 +0200
+++ new/firewalld-0.9.0/src/firewall/server/firewalld.py 2020-09-02
17:24:34.000000000 +0200
@@ -1143,10 +1143,13 @@
def getActivePolicies(self, sender=None):
log.debug1("policy.getActivePolicies()")
policies = { }
- for policy in
self.fw.policy.get_active_policies_not_derived_from_zone():
- policies[policy] = { }
- policies[policy]["ingress_zones"] =
self.fw.policy.list_ingress_zones(policy)
- policies[policy]["egress_zones"] =
self.fw.policy.list_egress_zones(policy)
+ for policy in self.fw.policy.get_policies_not_derived_from_zone():
+ ingress_zones = self.fw.policy.list_ingress_zones(policy)
+ egress_zones = self.fw.policy.list_egress_zones(policy)
+ if len(ingress_zones) > 0 and len(egress_zones) > 0:
+ policies[policy] = { }
+ policies[policy]["ingress_zones"] = ingress_zones
+ policies[policy]["egress_zones"] = egress_zones
return policies
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/src/firewall-applet
new/firewalld-0.9.0/src/firewall-applet
--- old/firewalld-0.9.1/src/firewall-applet 2020-10-01 18:08:30.000000000
+0200
+++ new/firewalld-0.9.0/src/firewall-applet 2020-09-02 20:08:49.000000000
+0200
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/bin/python
# -*- coding: utf-8 -*-
#
# Copyright (C) 2010-2015 Red Hat, Inc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/src/firewall-cmd
new/firewalld-0.9.0/src/firewall-cmd
--- old/firewalld-0.9.1/src/firewall-cmd 2020-10-01 18:08:30.000000000
+0200
+++ new/firewalld-0.9.0/src/firewall-cmd 2020-09-02 20:08:49.000000000
+0200
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/bin/python
# -*- coding: utf-8 -*-
#
# Copyright (C) 2009-2016 Red Hat, Inc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/src/firewall-config
new/firewalld-0.9.0/src/firewall-config
--- old/firewalld-0.9.1/src/firewall-config 2020-10-01 18:08:30.000000000
+0200
+++ new/firewalld-0.9.0/src/firewall-config 2020-09-02 20:08:49.000000000
+0200
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/bin/python
# -*- coding: utf-8 -*-
#
# Copyright (C) 2011-2015 Red Hat, Inc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/src/firewall-offline-cmd
new/firewalld-0.9.0/src/firewall-offline-cmd
--- old/firewalld-0.9.1/src/firewall-offline-cmd 2020-10-01
18:08:30.000000000 +0200
+++ new/firewalld-0.9.0/src/firewall-offline-cmd 2020-09-02
20:08:49.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/bin/python
# -*- coding: utf-8 -*-
#
# Copyright (C) 2009-2016 Red Hat, Inc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/src/firewalld
new/firewalld-0.9.0/src/firewalld
--- old/firewalld-0.9.1/src/firewalld 2020-10-01 18:08:30.000000000 +0200
+++ new/firewalld-0.9.0/src/firewalld 2020-09-02 20:08:49.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/bin/python
# -*- coding: utf-8 -*-
#
# Copyright (C) 2010-2016 Red Hat, Inc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/src/tests/integration/testsuite
new/firewalld-0.9.0/src/tests/integration/testsuite
--- old/firewalld-0.9.1/src/tests/integration/testsuite 2020-10-01
18:08:45.000000000 +0200
+++ new/firewalld-0.9.0/src/tests/integration/testsuite 2020-09-02
20:09:06.000000000 +0200
@@ -904,7 +904,7 @@
# List of tests.
if $at_list_p; then
cat <<_ATEOF || at_write_fail=1
-firewalld 0.9.1 test suite test groups:
+firewalld 0.9.0 test suite test groups:
NUM: FILE-NAME:LINE TEST-GROUP-NAME
KEYWORDS
@@ -945,7 +945,7 @@
exit $at_write_fail
fi
if $at_version_p; then
- $as_echo "$as_me (firewalld 0.9.1)" &&
+ $as_echo "$as_me (firewalld 0.9.0)" &&
cat <<\_ATEOF || at_write_fail=1
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1128,11 +1128,11 @@
# Banners and logs.
$as_echo "## --------------------------- ##
-## firewalld 0.9.1 test suite. ##
+## firewalld 0.9.0 test suite. ##
## --------------------------- ##"
{
$as_echo "## --------------------------- ##
-## firewalld 0.9.1 test suite. ##
+## firewalld 0.9.0 test suite. ##
## --------------------------- ##"
echo
@@ -1976,7 +1976,7 @@
$as_echo "Please send $at_msg and all information you think might help:
To: <https://github.com/firewalld/firewalld>
- Subject: [firewalld 0.9.1] $as_me: $at_fail_list${at_fail_list:+
failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
+ Subject: [firewalld 0.9.0] $as_me: $at_fail_list${at_fail_list:+
failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
You may investigate any problem if you feel able to do so, in which
case the test suite provides a good starting point. Its output may
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/src/tests/package.m4
new/firewalld-0.9.0/src/tests/package.m4
--- old/firewalld-0.9.1/src/tests/package.m4 2020-10-01 18:08:40.000000000
+0200
+++ new/firewalld-0.9.0/src/tests/package.m4 2020-09-02 20:09:01.000000000
+0200
@@ -1,5 +1,5 @@
m4_define([AT_PACKAGE_NAME],[firewalld])
-m4_define([AT_PACKAGE_VERSION],[0.9.1])
-m4_define([AT_PACKAGE_STRING],[firewalld 0.9.1])
+m4_define([AT_PACKAGE_VERSION],[0.9.0])
+m4_define([AT_PACKAGE_STRING],[firewalld 0.9.0])
m4_define([AT_PACKAGE_URL],[http://firewalld.org/])
m4_define([AT_PACKAGE_BUGREPORT],[https://github.com/firewalld/firewalld])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/firewalld-0.9.1/src/tests/testsuite
new/firewalld-0.9.0/src/tests/testsuite
--- old/firewalld-0.9.1/src/tests/testsuite 2020-10-01 18:08:45.000000000
+0200
+++ new/firewalld-0.9.0/src/tests/testsuite 2020-09-02 20:09:06.000000000
+0200
@@ -1142,7 +1142,7 @@
# List of tests.
if $at_list_p; then
cat <<_ATEOF || at_write_fail=1
-firewalld 0.9.1 test suite test groups:
+firewalld 0.9.0 test suite test groups:
NUM: FILE-NAME:LINE TEST-GROUP-NAME
KEYWORDS
@@ -1183,7 +1183,7 @@
exit $at_write_fail
fi
if $at_version_p; then
- $as_echo "$as_me (firewalld 0.9.1)" &&
+ $as_echo "$as_me (firewalld 0.9.0)" &&
cat <<\_ATEOF || at_write_fail=1
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1393,11 +1393,11 @@
# Banners and logs.
$as_echo "## --------------------------- ##
-## firewalld 0.9.1 test suite. ##
+## firewalld 0.9.0 test suite. ##
## --------------------------- ##"
{
$as_echo "## --------------------------- ##
-## firewalld 0.9.1 test suite. ##
+## firewalld 0.9.0 test suite. ##
## --------------------------- ##"
echo
@@ -2241,7 +2241,7 @@
$as_echo "Please send $at_msg and all information you think might help:
To: <https://github.com/firewalld/firewalld>
- Subject: [firewalld 0.9.1] $as_me: $at_fail_list${at_fail_list:+
failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
+ Subject: [firewalld 0.9.0] $as_me: $at_fail_list${at_fail_list:+
failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
You may investigate any problem if you feel able to do so, in which
case the test suite provides a good starting point. Its output may
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
