openSUSE Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
August 2017
- 1 participants
- 2097 discussions
Hello community,
here is the log from the commit of package python-gphoto2 for openSUSE:Factory checked in at 2017-08-28 15:18:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-gphoto2 (Old)
and /work/SRC/openSUSE:Factory/.python-gphoto2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-gphoto2"
Mon Aug 28 15:18:11 2017 rev:2 rq:518958 version:1.7.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-gphoto2/python-gphoto2.changes 2017-08-24 18:39:44.160419477 +0200
+++ /work/SRC/openSUSE:Factory/.python-gphoto2.new/python-gphoto2.changes 2017-08-28 15:19:27.445399819 +0200
@@ -1,0 +2,6 @@
+Sun Aug 27 05:56:47 UTC 2017 - aloisio(a)gmx.com
+
+- Update to version 1.7.1
+ * Return string values from gp_camera_wait_for_event.
+
+-------------------------------------------------------------------
Old:
----
gphoto2-1.7.0.tar.gz
New:
----
gphoto2-1.7.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-gphoto2.spec ++++++
--- /var/tmp/diff_new_pack.FN4chS/_old 2017-08-28 15:19:28.473255376 +0200
+++ /var/tmp/diff_new_pack.FN4chS/_new 2017-08-28 15:19:28.481254252 +0200
@@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-gphoto2
-Version: 1.7.0
+Version: 1.7.1
Release: 0
Summary: Python interface to libgphoto2
License: GPL-3.0+
@@ -30,8 +30,8 @@
BuildRequires: %{python_module devel}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
-BuildRequires: pkgconfig(libgphoto2)
BuildRequires: python-rpm-macros
+BuildRequires: pkgconfig(libgphoto2)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%python_subpackages
++++++ gphoto2-1.7.0.tar.gz -> gphoto2-1.7.1.tar.gz ++++++
/work/SRC/openSUSE:Factory/python-gphoto2/gphoto2-1.7.0.tar.gz /work/SRC/openSUSE:Factory/.python-gphoto2.new/gphoto2-1.7.1.tar.gz differ: char 5, line 1
1
0
Hello community,
here is the log from the commit of package apparmor-rpm-macros for openSUSE:Factory checked in at 2017-08-28 15:18:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apparmor-rpm-macros (Old)
and /work/SRC/openSUSE:Factory/.apparmor-rpm-macros.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apparmor-rpm-macros"
Mon Aug 28 15:18:08 2017 rev:3 rq:518929 version:1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/apparmor-rpm-macros/apparmor-rpm-macros.changes 2017-01-17 14:35:02.312709956 +0100
+++ /work/SRC/openSUSE:Factory/.apparmor-rpm-macros.new/apparmor-rpm-macros.changes 2017-08-28 15:19:26.129584728 +0200
@@ -1,0 +2,6 @@
+Sat Aug 26 19:08:14 UTC 2017 - suse-beta(a)cboltz.de
+
+- %apparmor_reload: skip and regenerate cache to make sure the latest
+ profile gets always used (even if the existing cache is newer)
+
+-------------------------------------------------------------------
@@ -10 +15,0 @@
-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ macros.apparmor ++++++
--- /var/tmp/diff_new_pack.h2x2G2/_old 2017-08-28 15:19:27.133443658 +0200
+++ /var/tmp/diff_new_pack.h2x2G2/_new 2017-08-28 15:19:27.137443096 +0200
@@ -1,5 +1,5 @@
%apparmor_reload()\
if [ "$YAST_IS_RUNNING" != "instsys" ]; then\
- /sbin/apparmor_parser -r %{?*} &> /dev/null || :\
+ /sbin/apparmor_parser -r -T -W %{?*} &> /dev/null || :\
fi\
%{nil}
1
0
Hello community,
here is the log from the commit of package shorewall for openSUSE:Factory checked in at 2017-08-28 15:17:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/shorewall (Old)
and /work/SRC/openSUSE:Factory/.shorewall.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shorewall"
Mon Aug 28 15:17:53 2017 rev:100 rq:518886 version:5.1.5.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/shorewall/shorewall.changes 2017-08-16 16:14:31.318576059 +0200
+++ /work/SRC/openSUSE:Factory/.shorewall.new/shorewall.changes 2017-08-28 15:19:18.402670576 +0200
@@ -1,0 +2,14 @@
+Tue Aug 15 09:53:02 UTC 2017 - bruno(a)ioda-net.ch
+
+- Update to bugfix release 5.1.5.2
+ + Make build reproducible boo#1047218
+ + Fix upgrade from 4x version : dropBcast and dropBcasts are now
+ supported boo#1053650
+ + Perl 5.26 support
+ + Fix for BASIC_FILTERS=Yes and tcfilters
+ + Fix USER/GROUP messages
+ + MAC address in OUTPUT col in accounting file error is raised
+ at compile time
+ + Fix port number 0 or > 65535 perl execption
+
+-------------------------------------------------------------------
Old:
----
shorewall-5.1.4.4.tar.bz2
shorewall-core-5.1.4.4.tar.bz2
shorewall-docs-html-5.1.4.4.tar.bz2
shorewall-init-5.1.4.4.tar.bz2
shorewall-lite-5.1.4.4.tar.bz2
shorewall6-5.1.4.4.tar.bz2
shorewall6-lite-5.1.4.4.tar.bz2
New:
----
shorewall-5.1.5.2.tar.bz2
shorewall-core-5.1.5.2.tar.bz2
shorewall-docs-html-5.1.5.2.tar.bz2
shorewall-init-5.1.5.2.tar.bz2
shorewall-lite-5.1.5.2.tar.bz2
shorewall6-5.1.5.2.tar.bz2
shorewall6-lite-5.1.5.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ shorewall.spec ++++++
--- /var/tmp/diff_new_pack.UPVMwr/_old 2017-08-28 15:19:20.826329985 +0200
+++ /var/tmp/diff_new_pack.UPVMwr/_new 2017-08-28 15:19:20.850326613 +0200
@@ -19,9 +19,9 @@
#
%define have_systemd 1
%define dmaj 5.1
-%define dmin 5.1.4
+%define dmin 5.1.5
Name: shorewall
-Version: 5.1.4.4
+Version: 5.1.5.2
Release: 0
Summary: Shoreline Firewall is an iptables-based firewall for Linux systems
License: GPL-2.0
++++++ shorewall-5.1.4.4.tar.bz2 -> shorewall-5.1.5.2.tar.bz2 ++++++
++++ 12579 lines of diff (skipped)
++++++ shorewall-core-5.1.4.4.tar.bz2 -> shorewall-core-5.1.5.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-5.1.4.4/changelog.txt new/shorewall-core-5.1.5.2/changelog.txt
--- old/shorewall-core-5.1.4.4/changelog.txt 2017-06-23 16:55:40.000000000 +0200
+++ new/shorewall-core-5.1.5.2/changelog.txt 2017-08-02 00:47:07.000000000 +0200
@@ -1,3 +1,52 @@
+Changes in 5.1.5.2
+
+1) Update release documents.
+
+2) Correct source port handling when BASIC_FILTERS=Yes.
+
+3) Correct handling of USER/GROUP in the OUTPUT section of the
+ accounting file.
+
+4) Correct handling of MAC addresses in the accounting file.
+
+Changes in 5.1.5.1
+
+1) Update release documents.
+
+2) Process the snat file if the masq file is empty.
+
+Changes in 5.1.5 Final
+
+1) Update release documents.
+
+2) Include IPv6 annotated config files.
+
+3) Add RESTORE_DEFAULT_ROUTE to shorewall6.conf.
+
+Changes in 5.1.5 RC 1
+
+1) Update release documents.
+
+2) USE_NFLOG_SIZE option.
+
+3) Improve editing of port numbers/service names.
+
+4) Add dropBcasts action.
+
+Changes in 5.1.5 Beta 2
+
+1) Update release documents.
+
+2) Consolidate Shorewall/Shorewall6 manpages.
+
+Changes in 5.1.5 Beta 1
+
+1) Update release documents.
+
+2) Add defect repair through 5.1.4.2.
+
+3) Implement runtime port variables.
+
Changes in 5.1.4.4
1) Update release documents.
@@ -32,13 +81,6 @@
1) Update release documents.
-2) Clean up introduction to shorewall-rules(5).
-
-3) Clarify LOGFORMAT in shorewall[6].conf(5) and
- shorewall[6]-zones(5).
-
-4) Add BLACKLIST to the IPv6 actions.std file.
-
Changes in 5.1.4 RC 1
1) Update release documents.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-5.1.4.4/configure new/shorewall-core-5.1.5.2/configure
--- old/shorewall-core-5.1.4.4/configure 2017-06-23 16:55:40.000000000 +0200
+++ new/shorewall-core-5.1.5.2/configure 2017-08-02 00:47:06.000000000 +0200
@@ -28,7 +28,7 @@
#
# Build updates this
#
-VERSION=5.1.4.4
+VERSION=5.1.5.2
case "$BASH_VERSION" in
[4-9].*)
@@ -190,7 +190,7 @@
done
echo '#' > shorewallrc
-echo "# Created by Shorewall Core version $VERSION configure - " `date` >> shorewallrc
+echo "# Created by Shorewall Core version $VERSION configure - " `date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}"` >> shorewallrc
echo "# rc file: $rcfile" >> shorewallrc
echo '#' >> shorewallrc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-5.1.4.4/configure.pl new/shorewall-core-5.1.5.2/configure.pl
--- old/shorewall-core-5.1.4.4/configure.pl 2017-06-23 16:55:40.000000000 +0200
+++ new/shorewall-core-5.1.5.2/configure.pl 2017-08-02 00:47:06.000000000 +0200
@@ -31,7 +31,7 @@
# Build updates this
#
use constant {
- VERSION => '5.1.4.4'
+ VERSION => '5.1.5.2'
};
my %params;
@@ -173,7 +173,12 @@
open $outfile, '>', 'shorewallrc' or die "Can't open 'shorewallrc' for output: $!";
-printf $outfile "#\n# Created by Shorewall Core version %s configure.pl - %s %2d %04d %02d:%02d:%02d\n", VERSION, $abbr[$localtime[4]], $localtime[3], 1900 + $localtime[5] , @localtime[2,1,0];
+if ( $ENV{SOURCE_DATE_EPOCH} ) {
+ printf $outfile "#\n# Created by Shorewall Core version %s configure.pl - %s\n", VERSION, `date --utc --date=\"\@$ENV{SOURCE_DATE_EPOCH}\"`;
+} else {
+ printf $outfile "#\n# Created by Shorewall Core version %s configure.pl - %s %2d %04d %02d:%02d:%02d\n", VERSION, $abbr[$localtime[4]], $localtime[3], 1900 + $localtime[5] , @localtime[2,1,0];
+}
+
print $outfile "# rc file: $rcfilename\n#\n";
print $outfile "# Input: @ARGV\n#\n" if @ARGV;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-5.1.4.4/install.sh new/shorewall-core-5.1.5.2/install.sh
--- old/shorewall-core-5.1.4.4/install.sh 2017-06-23 16:55:40.000000000 +0200
+++ new/shorewall-core-5.1.5.2/install.sh 2017-08-02 00:47:06.000000000 +0200
@@ -22,7 +22,7 @@
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
-VERSION=5.1.4.4
+VERSION=5.1.5.2
PRODUCT=shorewall-core
Product="Shorewall Core"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-5.1.4.4/known_problems.txt new/shorewall-core-5.1.5.2/known_problems.txt
--- old/shorewall-core-5.1.4.4/known_problems.txt 2017-06-23 16:55:40.000000000 +0200
+++ new/shorewall-core-5.1.5.2/known_problems.txt 2017-08-02 00:47:07.000000000 +0200
@@ -5,32 +5,26 @@
correctly in configurations with USE_DEFAULT_RT=No and optional
providers listed in the DUPLICATE column.
-3) The BLACKLIST action was inadvertently omitted from Shorewall6 in
- Shorewall 5.1.1.
+3) If a masq file with no entries is found by the compiler, then the
+ snat file, if any, is ignored.
- Corrected in Shorewall 5.1.4.1.
+ Corrected in Shorewall 5.1.5.1.
-4) Support for the NFQUEUE '--queue-cpu-fanout' option, introduced in
- Shorewall 5.1.0, contained a defect which can result in the
- following compile-time error:
+4) When BASIC_FILTERS=Yes, the compiler generates an invalid tc
+ command when a source port is specified in a tcfilters entry.
- Use of uninitialized value $fanout in concatenation (.) or string
- at /usr/share/shorewall/Shorewall/Rules.pm line 643,
- <$currentfile> line 2.
+ Corrected in Shorewall 5.1.5.2.
- Corrected in Shorewall 5.1.4.2.
+5) Specifying a USER in the OUTPUT section of the accounting file
+ causes the compilter to incorrectly generate the following error
+ message:
-5) When running on prior-generation distributions such as RHEL6,
- IPv6 multi-ISP configurations fail to start due to an error such as
- the following:
+ ERROR: USER/GROUP may only be specified in the OUTPUT section
- ERROR: Command "ip -6 -6 route replace default scope global
- table 250 nexthop via ::192.88.99.1 dev tun6to4 weight 1"
- Failed
+ Corrected in Shorewall 5.1.5.2.
- Corrected in Shorewall 5.1.4.3.
+6) If a MAC address is specified in the OUTPUT section of the
+ accounting file, no error is generated at compile time. A failure
+ does occur, however, at run-time.
-6) A defect in 5.1.4.3 causes a startup failure when two or more
- 'fallback' providers are configured.
-
- Corrected in Shorewall 5.1.4.4.
+ Corrected in Shorewall 5.1.5.2.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-5.1.4.4/lib.cli new/shorewall-core-5.1.5.2/lib.cli
--- old/shorewall-core-5.1.4.4/lib.cli 2017-06-23 16:55:17.000000000 +0200
+++ new/shorewall-core-5.1.5.2/lib.cli 2017-07-27 23:55:19.000000000 +0200
@@ -25,7 +25,7 @@
# loaded after this one and replaces some of the functions declared here.
#
-SHOREWALL_CAPVERSION=50100
+SHOREWALL_CAPVERSION=50105
if [ -z "$g_basedir" ]; then
#
@@ -2803,6 +2803,7 @@
WAIT_OPTION=
CPU_FANOUT=
NETMAP_TARGET=
+ NFLOG_SIZE=
AMANDA_HELPER=
FTP_HELPER=
@@ -3136,10 +3137,13 @@
qt $g_tool -A $chain -j LOGMARK && LOGMARK_TARGET=Yes
qt $g_tool -A $chain -j LOG || LOG_TARGET=
qt $g_tool -A $chain -j ULOG && ULOG_TARGET=Yes
- qt $g_tool -A $chain -j NFLOG && NFLOG_TARGET=Yes
qt $g_tool -A $chain -j MARK --set-mark 5 && MARK_ANYWHERE=Yes
qt $g_tool -A $chain -m statistic --mode nth --every 2 --packet 1 && STATISTIC_MATCH=Yes
qt $g_tool -A $chain -m geoip --src-cc US && GEOIP_MATCH=Yes
+ if qt $g_tool -A $chain -j NFLOG; then
+ NFLOG_TARGET=Yes
+ qt $g_tool -A $chain -j NFLOG --nflog-size 64 && NFLOG_SIZE=Yes
+ fi
if [ $g_family -eq 4 ]; then
qt $g_tool -A $chain -j ACCOUNT --addr 192.168.1.0/29 --tname $chain && ACCOUNT_TARGET=Yes
@@ -3305,6 +3309,7 @@
report_capability "CT Target (CT_TARGET)" $CT_TARGET
report_capability "NFQUEUE CPU Fanout (CPU_FANOUT)" $CPU_FANOUT
report_capability "NETMAP Target (NETMAP_TARGET)" $NETMAP_TARGET
+ report_capability "--nflog-size support (NFLOG_SIZE)" $NFLOG_SIZE
echo " Kernel Version (KERNELVERSION): $KERNELVERSION"
echo " Capabilities Version (CAPVERSION): $CAPVERSION"
@@ -3411,6 +3416,7 @@
report_capability1 WAIT_OPTION
report_capability1 CPU_FANOUT
report_capability1 NETMAP_TARGET
+ report_capability1 NFLOG_SIZE
report_capability1 AMANDA_HELPER
report_capability1 FTP_HELPER
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-5.1.4.4/manpages/shorewall.8 new/shorewall-core-5.1.5.2/manpages/shorewall.8
--- old/shorewall-core-5.1.4.4/manpages/shorewall.8 2017-06-23 16:56:39.000000000 +0200
+++ new/shorewall-core-5.1.5.2/manpages/shorewall.8 2017-08-02 00:48:28.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 06/23/2017
+.\" Date: 08/01/2017
.\" Manual: Administrative Commands
.\" Source: Administrative Commands
.\" Language: English
.\"
-.TH "SHOREWALL" "8" "06/23/2017" "Administrative Commands" "Administrative Commands"
+.TH "SHOREWALL" "8" "08/01/2017" "Administrative Commands" "Administrative Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -2013,11 +2013,13 @@
.SH "FILES"
.PP
/etc/shorewall/
+.PP
+/etc/shorewall6/
.SH "SEE ALSO"
.PP
\m[blue]\fBhttp://www\&.shorewall\&.net/starting_and_stopping_shorewall\&.htm\fR\m[]\&\s-2\u[17]\d\s+2
.PP
-shorewall\-accounting(5), shorewall\-actions(5), shorewall\-blacklist(5), shorewall\-hosts(5), shorewall_interfaces(5), shorewall\-ipsets(5), shorewall\-maclist(5), shorewall\-masq(5), shorewall\-nat(5), shorewall\-netmap(5), shorewall\-params(5), shorewall\-policy(5), shorewall\-providers(5), shorewall\-proxyarp(5), shorewall\-rtrules(5), shorewall\-routestopped(5), shorewall\-rules(5), shorewall\&.conf(5), shorewall\-secmarks(5), shorewall\-tcclasses(5), shorewall\-tcdevices(5), shorewall\-tcrules(5), shorewall\-tos(5), shorewall\-tunnels(5), shorewall\-zones(5)
+shorewall\-accounting(5), shorewall\-actions(5), shorewall\-arprules(5), shorewall\-blrules(5), shorewall\&.conf(5), shorewall\-conntrack(5), shorewall\-ecn(5), shorewall\-exclusion(5), shorewall\-hosts(5), shorewall\-init(5), shorewall_interfaces(5), shorewall\-ipsets(5), shorewall\-maclist(5), shorewall\-mangle(5), shorewall\-masq(5), shorewall\-modules(5), shorewall\-nat(5), shorewall\-nesting(5), shorewall\-netmap(5), shorewall\-params(5), shorewall\-policy(5), shorewall\-providers(5), shorewall\-proxyarp(5), shorewall6\-proxyndp(5), shorewall\-routes(5), shorewall\-rtrules(5), shorewall\-rtrules(5), shorewall\-rules(5), shorewall\-secmarks(5), shorewall\-snat(5), shorewall\-tcclasses(5), shorewall\-tcdevices(5), shorewall\-tcfilters(5), shorewall\-tcinterfaces(5), shorewall\-tcpri(5), shorewall\-tunnels(5), shorewall\-vardir(5), shorewall\-zones(5)
.SH "NOTES"
.IP " 1." 4
http://www.shorewall.net/starting_and_stopping_shorewall.htm#Trace
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-5.1.4.4/manpages/shorewall.xml new/shorewall-core-5.1.5.2/manpages/shorewall.xml
--- old/shorewall-core-5.1.4.4/manpages/shorewall.xml 2017-06-23 16:56:40.000000000 +0200
+++ new/shorewall-core-5.1.5.2/manpages/shorewall.xml 2017-08-02 00:48:28.000000000 +0200
@@ -3173,6 +3173,8 @@
<title>FILES</title>
<para>/etc/shorewall/</para>
+
+ <para>/etc/shorewall6/</para>
</refsect1>
<refsect1>
@@ -3182,13 +3184,17 @@
url="/starting_and_stopping_shorewall.htm">http://www.shorewall.net/starting_and_stopping_shorewall.htm</ulink></para>
<para>shorewall-accounting(5), shorewall-actions(5),
- shorewall-blacklist(5), shorewall-hosts(5), shorewall_interfaces(5),
- shorewall-ipsets(5), shorewall-maclist(5), shorewall-masq(5),
- shorewall-nat(5), shorewall-netmap(5), shorewall-params(5),
+ shorewall-arprules(5), shorewall-blrules(5), shorewall.conf(5),
+ shorewall-conntrack(5), shorewall-ecn(5), shorewall-exclusion(5),
+ shorewall-hosts(5), shorewall-init(5), shorewall_interfaces(5),
+ shorewall-ipsets(5), shorewall-maclist(5), shorewall-mangle(5),
+ shorewall-masq(5), shorewall-modules(5), shorewall-nat(5),
+ shorewall-nesting(5), shorewall-netmap(5), shorewall-params(5),
shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5),
- shorewall-rtrules(5), shorewall-routestopped(5), shorewall-rules(5),
- shorewall.conf(5), shorewall-secmarks(5), shorewall-tcclasses(5),
- shorewall-tcdevices(5), shorewall-tcrules(5), shorewall-tos(5),
- shorewall-tunnels(5), shorewall-zones(5)</para>
+ shorewall6-proxyndp(5), shorewall-routes(5), shorewall-rtrules(5),
+ shorewall-rtrules(5), shorewall-rules(5), shorewall-secmarks(5),
+ shorewall-snat(5), shorewall-tcclasses(5), shorewall-tcdevices(5),
+ shorewall-tcfilters(5), shorewall-tcinterfaces(5), shorewall-tcpri(5),
+ shorewall-tunnels(5), shorewall-vardir(5), shorewall-zones(5)</para>
</refsect1>
</refentry>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-5.1.4.4/releasenotes.txt new/shorewall-core-5.1.5.2/releasenotes.txt
--- old/shorewall-core-5.1.4.4/releasenotes.txt 2017-06-23 16:55:40.000000000 +0200
+++ new/shorewall-core-5.1.5.2/releasenotes.txt 2017-08-02 00:47:07.000000000 +0200
@@ -1,7 +1,7 @@
----------------------------------------------------------------------------
- S H O R E W A L L 5 . 1 . 4 . 4
+ S H O R E W A L L 5 . 1 . 5 . 2
------------------------------
- J u n e 2 3 , 2 0 1 7
+ J u l y 3 1 , 2 0 1 7
----------------------------------------------------------------------------
I. PROBLEMS CORRECTED IN THIS RELEASE
@@ -14,87 +14,62 @@
I. P R O B L E M S C O R R E C T E D I N T H I S R E L E A S E
----------------------------------------------------------------------------
-5.1.4.4
+5.1.5.2
-1) A defect in 5.1.4.3 caused a startup failure when two or more
- 'fallback' providers were configured. That has been corrected.
+1) Previously, Specifying a USER in the OUTPUT section of the
+ accounting file caused the compilter to incorrectly generate the
+ following error message:
-5.1.4.3
+ ERROR: USER/GROUP may only be specified in the OUTPUT section
-1) When running on prior-generation distributions such as RHEL6,
- IPv6 multi-ISP configurations failed to start due to an error such as
- the following:
+ That has been corrected, and no error message is generated in this
+ case.
- ERROR: Command "ip -6 -6 route replace default scope global
- table 250 nexthop via ::192.88.99.1 dev tun6to4 weight 1"
- Failed
-
- Such configurations now start successfully.
+2) When BASIC_FILTERS=Yes, the compiler previously generated an
+ invalid tc command when when a source port was specified in a
+ tcfilters entry. The compiler now generates correct input in this
+ case.
-5.1.4.2
+3) Previously, a MAC address could be specified in the OUTPUT
+ section of the accounting file and no error would be generated at
+ compile time. A failure would occur, however, at run-time. Now, an
+ error is raised during compilation.
-1) Many broken links in the manpages have been corrected.
+5.1.5.1
-2) Support for the NFQUEUE '--queue-cpu-fanout' option, introduced in
- Shorewall 5.1.0, contained a defect which could result in the
- following compile-time error:
-
- Use of uninitialized value $fanout in concatenation (.) or string
- at /usr/share/shorewall/Shorewall/Rules.pm line 643,
- <$currentfile> line 2.
-
- That has been corrected.
-
-5.1.4.1
-
-1) The introductory material in shorewall-rules(5) has been cleaned
- up.
-
-2) The information about LOGFORMAT in shorewall[6].conf(5) and
- shorewall[6]-zones(5) has been expanded.
-
- In Shorewall 5.1.0, the setting of LOGFORMAT in the default and
- sample .conf files was changed to "%s:%s " to enable 10-character
- zone names (up from 5 characters using the default
- "Shorewall:%s:%s:" setting). As part of this change, if a
- shorewall.conf file which did not set LOGFORMAT is updated using
- "shorewall update", LOGFORMAT is set to "Shorewall:%s:%s:" to
- preserve the existing behavior.
+1) To compensate for the presence of a masq file with no entries,
+ the compiler will now attempt to process the snat file when such a
+ masq file is found. Previously, if a masq file with no entries was
+ found, the snat file, if any, was ignored.
- This can have an effect on new installations, however in that
- scipts or log analyzers can no longer be configured to simply look
- for "Shorewall:" in log messages unless the setting of LOGFORMAT is
- changed. The manpages (and the Migration Considerations below) have
- been updated to describe how to locate these messages using the new
- "%s:%s " setting.
+2) Previously, maintainers could not create reproducable packages
+ because the 'configure' and 'configure.pl' scripts inserted the
+ current date and time into the generated shorewallrc file.
-3) The BLACKLIST action was inadvertently omitted from Shorewall6 in
- Shorewall 5.1.1. That has been corrected.
+ To support reproducable package builds, the scripts now recognize
+ the SOURCE_DATE_EPOCH environmental variable (see
+ https://reproducible-builds.org/specs/source-date-epoch/)
-5.1.4
+ The change to 'configure' was supplied by Bernhard M. Wiedemann.
-1) This release contains defect repair through Shorewall 5.1.3.1.
+5.1.5
-2) Previously, if a Shorewall Variable ( e.g., @chain ) was the target
- of a conditional ?RESET directive (one that was enclosed in ?if...
- ?else...?endif logic), the compiler could incorrectly use an
- existing chain created from the action rather than creating a new
- (and different) chain. That has been corrected.
+1) This release contains defect repair through Shorewall 5.1.4.4.
-3) Previously, if alternate input format specified a column that had
- already been specified, the contents of that column were silently
- overwritten. Now, a warning message is issued stating that the
- prior value has been replaced by the newer value.
+2) Previously, when 0 was used as a port number or when a port number
+ > 65535 was specified, an 'uninitialized variable' Perl exception
+ occurred when the compiler attempted to issue an error
+ message. That has been corrected.
-4) Previously, a string-valued interface option, such as
- 'physical', could be given an empty value (e.g., "physical=,"), and
- the compiler would fail to flag it. Now, this usage raises an
- error.
+3) When running with Perl 5.26, messages such at the following could
+ be issued:
-5) Previously, the 'tunnel-src' and 'tunnel-dst' zone options would
- generate an error under Shorewall6. That has been corrected.
+ Unescaped left brace in regex is deprecated here (and will be
+ fatal in Perl 5.30), passed through in regex; marked by <-- HERE
+ in m/^(\s*|.*[^&@%]){ <-- HERE (.*)}\s*$/ at
+ /usr/share/shorewall/Shorewall/Config.pm line 2343.
-6) A number of small documentation corrections have been made.
+ That problem has been corrected.
----------------------------------------------------------------------------
I I. K N O W N P R O B L E M S R E M A I N I N G
@@ -115,48 +90,40 @@
uses a "delete..add.." sequence on these routes rather than a
single "replace" command.
+4) When the formerly built-in actions were converted to standard
+ actions in Shorewall 5.1.3, the 'dropBcasts' action was
+ inadvertently changed to 'dropBcast'. Beginning with this release,
+ both spellings are accepted.
+
----------------------------------------------------------------------------
I I I. N E W F E A T U R E S I N T H I S R E L E A S E
----------------------------------------------------------------------------
-1) All IPv6 standard actions have been deleted and their logic
- has been added to their IPv4 counterparts who can now handle
- both address families.
-
-2) Previously, ?error and ?require messages as well as verbose ?info
- and ?warning messages (those that report the file and line numbers)
- generated from an action file would report the action file name and
- line number rather than the file and line number where the action
- was invoked. The file and line number where the action was invoked
- were listed second. Beginning with this release, the invoking file
- and line number are listed first and the action file and line number
- are not reported. This allows for creation of clearer messages.
-
- Example:
-
- Previously, when an invalid value was passed for the 'bricks'
- parameter to the GlusterFS action on line 45 of the rules file, a
- message such as the following was issued (folded to 76 columns):
-
- ERROR: Invalid value for Bricks (2000)
- /usr/share/shorewall/action.GlusterFS (line 15)
- from /etc/shorewall/rules (line 45)
-
- Note that the message seems to imply that the error is in
- action.GlusterFS rather than in the rules file.
-
- Beginning with this release, the message will be:
-
- ERROR: Invalid value (2000) for the GlusterFS Bricks argument
- /etc/shorewall/rules (line 45)
-
- Note: This change only affects actions, including inline actions.
- Macros will continue to report the old way.
+1) Run-time port variables are now supported. See
+ http://www.shorewall.org/configuration_file_basics.htm#Port_Variables
+ for details.
+
+2) The Shorewall and Shorewall6 manpages are now consolidated. Almost
+ all of the Shorewall6 manpages are manpage aliases for the
+ corresponding Shorewall manpages which describe the files for both
+ products.
+
+3) There is now a FIN standard action which handles TCP packets with
+ the FIN, ACK and PSH flags set.
+
+4) According to the Netfilter team (see
+ https://patchwork.kernel.org/patch/9198133/) the --nflog-range option
+ of the NFLOG target has never worked correctly, and they have
+ deprecated that option in favor of the --nflog-size option. To
+ accomodate this change, there is now an "--nflog-size support"
+ (NFLOG_SIZE) Shorewall capability and a USE_NFLOG_SIZE option in
+ shorewall[6].conf.
-3) IPv6 UPnP support (including MINIUPNPD) is now available.
+ For further information, see the Migrations Issues item number 8.
-4) A PERL_HASH_SEED option has been added to allow the Perl hash seed
- to be specified. See shorewall.conf(5) and perlsec(1) for details.
+5) The RESTORE_DEFAULT_ROUTE option has now been added to
+ shorewall6.conf. Prior to this release, RESTORE_DEFAULT_ROUTE=Yes
+ has always been assumed for Shorewall6 configurations.
----------------------------------------------------------------------------
I V. M I G R A T I O N I S S U E S
@@ -276,11 +243,188 @@
Broadcast no longer handle multicast. Multicast is handeled
separately in actions allowMcast, dropMcast and Multicast. The
now-deprecated Drop and Reject policy actions have been modified so
- that they continue to silently drop multicast packets.
+ that they continue to silently drop multicast packets.
+
+8) According to the Netfilter team (see
+ https://patchwork.kernel.org/patch/9198133/) the --nflog-range option
+ of the NFLOG target has never worked correctly, and they have
+ deprecated that option in favor of the --nflog-size option.
+
+ To accomodate this change, Shorewall 5.1.5 added an "--nflog-size
+ support" (NFLOG_SIZE) Shorewall capability and a USE_NFLOG_SIZE
+ option in shorewall[6].conf. If USE_NFLOG_SIZE=Yes, then if the
+ capability is present, Shorewall will use '--nflog-size' in place
+ of '--nflog-range'. If USE_NFLOG_SIZE=Yes and the capability is not
+ present, an error is raised.
+
+ If you don't use NFLOG or if you use NFLOG with omittted second
+ parameter or with 0 as the second parameter, and 'shorewall show
+ capabilities' indicated that --nflog-size support is present, you
+ may safely set USE_NFLOG_SIZE=Yes.
+
+ If you pass a non-zero value as the second parameter to NFLOG and
+ the '--nflog-size support' capability is present, you need to
+ verify that those NFLOG messages are as you expect with
+ USE_NFLOG_SIZE=Yes.
----------------------------------------------------------------------------
V. N O T E S F R O M O T H E R 5 . 1 R E L E A S E S
----------------------------------------------------------------------------
+ P R O B L E M S C O R R E C T E D I N 5 . 1 . 4
+----------------------------------------------------------------------------
+
+5.1.4.4
+
+1) A defect in 5.1.4.3 caused a startup failure when two or more
+ 'fallback' providers were configured. That has been corrected.
+
+5.1.4.3
+
+1) When running on prior-generation distributions such as RHEL6,
+ IPv6 multi-ISP configurations failed to start due to an error such as
+ the following:
+
+ ERROR: Command "ip -6 -6 route replace default scope global
+ table 250 nexthop via ::192.88.99.1 dev tun6to4 weight 1"
+ Failed
+
+ Such configurations now start successfully.
+
+5.1.4.2
+
+1) Many broken links in the manpages have been corrected.
+
+2) Support for the NFQUEUE '--queue-cpu-fanout' option, introduced in
+ Shorewall 5.1.0, contained a defect which could result in the
+ following compile-time error:
+
+ Use of uninitialized value $fanout in concatenation (.) or string
+ at /usr/share/shorewall/Shorewall/Rules.pm line 643,
+ <$currentfile> line 2.
+
+ That has been corrected.
+
+5.1.4.1
+
+1) The introductory material in shorewall-rules(5) has been cleaned
+ up.
+
+2) The information about LOGFORMAT in shorewall[6].conf(5) and
+ shorewall[6]-zones(5) has been expanded.
+
+ In Shorewall 5.1.0, the setting of LOGFORMAT in the default and
+ sample .conf files was changed to "%s:%s " to enable 10-character
+ zone names (up from 5 characters using the default
+ "Shorewall:%s:%s:" setting). As part of this change, if a
+ shorewall.conf file which did not set LOGFORMAT is updated using
+ "shorewall update", LOGFORMAT is set to "Shorewall:%s:%s:" to
+ preserve the existing behavior.
+
+ This can have an effect on new installations, however in that
+ scipts or log analyzers can no longer be configured to simply look
+ for "Shorewall:" in log messages unless the setting of LOGFORMAT is
+ changed. The manpages (and the Migration Considerations below) have
+ been updated to describe how to locate these messages using the new
+ "%s:%s " setting.
+
+3) The BLACKLIST action was inadvertently omitted from Shorewall6 in
+ Shorewall 5.1.1. That has been corrected.
+
+5.1.4.1
+
+1) The introductory material in shorewall-rules(5) has been cleaned
+ up.
+
+2) The information about LOGFORMAT in shorewall[6].conf(5) and
+ shorewall[6]-zones(5) has been expanded.
+
+ In Shorewall 5.1.0, the setting of LOGFORMAT in the default and
+ sample .conf files was changed to "%s:%s " to enable 10-character
+ zone names (up from 5 characters using the default
+ "Shorewall:%s:%s:" setting). As part of this change, if a
+ shorewall.conf file which did not set LOGFORMAT is updated using
+ "shorewall update", LOGFORMAT is set to "Shorewall:%s:%s:" to
+ preserve the existing behavior.
+
+ This can have an effect on new installations, however in that
+ scipts or log analyzers can no longer be configured to simply look
+ for "Shorewall:" in log messages unless the setting of LOGFORMAT is
+ changed. The manpages (and the Migration Considerations below) have
+ been updated to describe how to locate these messages using the new
+ "%s:%s " setting.
+
+3) The BLACKLIST action was inadvertently omitted from Shorewall6 in
+ Shorewall 5.1.1. That has been corrected.
+
+5.1.4
+
+1) This release contains defect repair through Shorewall 5.1.3.1.
+
+2) Previously, if a Shorewall Variable ( e.g., @chain ) was the target
+ of a conditional ?RESET directive (one that was enclosed in ?if...
+ ?else...?endif logic), the compiler could incorrectly use an
+ existing chain created from the action rather than creating a new
+ (and different) chain. That has been corrected.
+
+3) Previously, if alternate input format specified a column that had
+ already been specified, the contents of that column were silently
+ overwritten. Now, a warning message is issued stating that the
+ prior value has been replaced by the newer value.
+
+4) Previously, a string-valued interface option, such as
+ 'physical', could be given an empty value (e.g., "physical=,"), and
+ the compiler would fail to flag it. Now, this usage raises an
+ error.
+
+5) Previously, the 'tunnel-src' and 'tunnel-dst' zone options would
+ generate an error under Shorewall6. That has been corrected.
+
+6) A number of small documentation corrections have been made.
+
+----------------------------------------------------------------------------
+ N E W F E A T U R E S I N 5 . 1 . 3
+----------------------------------------------------------------------------
+
+1) All IPv6 standard actions have been deleted and their logic
+ has been added to their IPv4 counterparts who can now handle
+ both address families.
+
+2) Previously, ?error and ?require messages as well as verbose ?info
+ and ?warning messages (those that report the file and line numbers)
+ generated from an action file would report the action file name and
+ line number rather than the file and line number where the action
+ was invoked. The file and line number where the action was invoked
+ were listed second. Beginning with this release, the invoking file
+ and line number are listed first and the action file and line number
+ are not reported. This allows for creation of clearer messages.
+
+ Example:
+
+ Previously, when an invalid value was passed for the 'bricks'
+ parameter to the GlusterFS action on line 45 of the rules file, a
+ message such as the following was issued (folded to 76 columns):
+
+ ERROR: Invalid value for Bricks (2000)
+ /usr/share/shorewall/action.GlusterFS (line 15)
+ from /etc/shorewall/rules (line 45)
+
+ Note that the message seems to imply that the error is in
+ action.GlusterFS rather than in the rules file.
+
+ Beginning with this release, the message will be:
+
+ ERROR: Invalid value (2000) for the GlusterFS Bricks argument
+ /etc/shorewall/rules (line 45)
+
+ Note: This change only affects actions, including inline actions.
+ Macros will continue to report the old way.
+
+3) IPv6 UPnP support (including MINIUPNPD) is now available.
+
+4) A PERL_HASH_SEED option has been added to allow the Perl hash seed
+ to be specified. See shorewall.conf(5) and perlsec(1) for details.
+
+----------------------------------------------------------------------------
P R O B L E M S C O R R E C T E D I N 5 . 1 . 3
----------------------------------------------------------------------------
@@ -311,7 +455,7 @@
sample configuration.
----------------------------------------------------------------------------
- N E W F E A T U R E S I N 5 . 1 . 2
+ N E W F E A T U R E S I N 5 . 1 . 3
----------------------------------------------------------------------------
1) The tarball installers and uninstallers have been unified and
@@ -632,32 +776,9 @@
2) Several settings in the default/sample .conf files have been
modified:
- a) In Shorewall 5.1.0, the setting of LOGFORMAT in the default and
- sample .conf files was changed to "%s:%s " to enable
- 10-character zone names (up from 5 characters using the default
- "Shorewall:%s:%s:" setting). As part of this change, if a
- shorewall.conf file which did not set LOGFORMAT is updated using
- "shorewall update", LOGFORMAT is set to "Shorewall:%s:%s:" to
- preserve the existing behavior.
-
- This can have an effect on new installations, however in that
- scipts or log analyzers can no longer be configured to simply look
- for "Shorewall:" in log messages unless the setting of LOGFORMAT is
- changed. If you use the new "%s:%s " setting then
- Shorewall-generated Netfilter messages may be matched using
- this regular expression:
-
- 'IN=.* OUT=.* SRC=.*\..* DST='
-
- Shorewall6-generated Netfilter messages may be matched using:
-
- 'IN=.* OUT=.* SRC=.*:.* DST='
-
- And all Netfilter messages (IPv4 and IPv6) are matched using:
-
- 'IN=.* OUT=.* SRC=.* DST='
+ a) The LOGFORMAT setting has been changed from "Shorewall:%s:%s:"
+ to "%s %s " to enable longer zone names.
- Shorewall6-generated Netfilter messages may be idd
b) The LOGLIMIT setting has been changed from empty to
"s:1/sec:10", to enable log trottling by default.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-5.1.4.4/shorewall-core.spec new/shorewall-core-5.1.5.2/shorewall-core.spec
--- old/shorewall-core-5.1.4.4/shorewall-core.spec 2017-06-23 16:55:40.000000000 +0200
+++ new/shorewall-core-5.1.5.2/shorewall-core.spec 2017-08-02 00:47:07.000000000 +0200
@@ -1,6 +1,6 @@
%define name shorewall-core
-%define version 5.1.4
-%define release 4
+%define version 5.1.5
+%define release 2
Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
Name: %{name}
@@ -69,14 +69,18 @@
%doc COPYING INSTALL changelog.txt releasenotes.txt
%changelog
-* Fri Jun 23 2017 Tom Eastep tom(a)shorewall.net
-- Updated to 5.1.4-4
-* Sun Jun 18 2017 Tom Eastep tom(a)shorewall.net
-- Updated to 5.1.4-3
-* Mon Jun 12 2017 Tom Eastep tom(a)shorewall.net
-- Updated to 5.1.4-2
-* Fri May 19 2017 Tom Eastep tom(a)shorewall.net
-- Updated to 5.1.4-1
+* Thu Jul 27 2017 Tom Eastep tom(a)shorewall.net
+- Updated to 5.1.5-2
+* Thu Jul 06 2017 Tom Eastep tom(a)shorewall.net
+- Updated to 5.1.5-1
+* Mon Jun 26 2017 Tom Eastep tom(a)shorewall.net
+- Updated to 5.1.5-0base
+* Wed Jun 21 2017 Tom Eastep tom(a)shorewall.net
+- Updated to 5.1.5-0RC1
+* Fri Jun 16 2017 Tom Eastep tom(a)shorewall.net
+- Updated to 5.1.5-0Beta2
+* Thu May 11 2017 Tom Eastep tom(a)shorewall.net
+- Updated to 5.1.5-0Beta1
* Fri May 05 2017 Tom Eastep tom(a)shorewall.net
- Updated to 5.1.4-0base
* Mon Apr 24 2017 Tom Eastep tom(a)shorewall.net
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-5.1.4.4/uninstall.sh new/shorewall-core-5.1.5.2/uninstall.sh
--- old/shorewall-core-5.1.4.4/uninstall.sh 2017-06-23 16:55:40.000000000 +0200
+++ new/shorewall-core-5.1.5.2/uninstall.sh 2017-08-02 00:47:06.000000000 +0200
@@ -26,7 +26,7 @@
# You may only use this script to uninstall the version
# shown below. Simply run this script to remove Shorewall Firewall
-VERSION=5.1.4.4
+VERSION=5.1.5.2
PRODUCT=shorewall-core
Product="Shorewall Core"
++++++ shorewall-docs-html-5.1.4.4.tar.bz2 -> shorewall-docs-html-5.1.5.2.tar.bz2 ++++++
++++ 9482 lines of diff (skipped)
++++++ shorewall-init-5.1.4.4.tar.bz2 -> shorewall-init-5.1.5.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-5.1.4.4/changelog.txt new/shorewall-init-5.1.5.2/changelog.txt
--- old/shorewall-init-5.1.4.4/changelog.txt 2017-06-23 16:45:30.000000000 +0200
+++ new/shorewall-init-5.1.5.2/changelog.txt 2017-08-02 00:47:07.000000000 +0200
@@ -1,3 +1,52 @@
+Changes in 5.1.5.2
+
+1) Update release documents.
+
+2) Correct source port handling when BASIC_FILTERS=Yes.
+
+3) Correct handling of USER/GROUP in the OUTPUT section of the
+ accounting file.
+
+4) Correct handling of MAC addresses in the accounting file.
+
+Changes in 5.1.5.1
+
+1) Update release documents.
+
+2) Process the snat file if the masq file is empty.
+
+Changes in 5.1.5 Final
+
+1) Update release documents.
+
+2) Include IPv6 annotated config files.
+
+3) Add RESTORE_DEFAULT_ROUTE to shorewall6.conf.
+
+Changes in 5.1.5 RC 1
+
+1) Update release documents.
+
+2) USE_NFLOG_SIZE option.
+
+3) Improve editing of port numbers/service names.
+
+4) Add dropBcasts action.
+
+Changes in 5.1.5 Beta 2
+
+1) Update release documents.
+
+2) Consolidate Shorewall/Shorewall6 manpages.
+
+Changes in 5.1.5 Beta 1
+
+1) Update release documents.
+
+2) Add defect repair through 5.1.4.2.
+
+3) Implement runtime port variables.
+
Changes in 5.1.4.4
1) Update release documents.
@@ -32,13 +81,6 @@
1) Update release documents.
-2) Clean up introduction to shorewall-rules(5).
-
-3) Clarify LOGFORMAT in shorewall[6].conf(5) and
- shorewall[6]-zones(5).
-
-4) Add BLACKLIST to the IPv6 actions.std file.
-
Changes in 5.1.4 RC 1
1) Update release documents.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-5.1.4.4/configure new/shorewall-init-5.1.5.2/configure
--- old/shorewall-init-5.1.4.4/configure 2017-06-23 16:45:30.000000000 +0200
+++ new/shorewall-init-5.1.5.2/configure 2017-08-02 00:47:07.000000000 +0200
@@ -28,7 +28,7 @@
#
# Build updates this
#
-VERSION=5.1.4.4
+VERSION=5.1.5.2
case "$BASH_VERSION" in
[4-9].*)
@@ -190,7 +190,7 @@
done
echo '#' > shorewallrc
-echo "# Created by Shorewall Core version $VERSION configure - " `date` >> shorewallrc
+echo "# Created by Shorewall Core version $VERSION configure - " `date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}"` >> shorewallrc
echo "# rc file: $rcfile" >> shorewallrc
echo '#' >> shorewallrc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-5.1.4.4/configure.pl new/shorewall-init-5.1.5.2/configure.pl
--- old/shorewall-init-5.1.4.4/configure.pl 2017-06-23 16:45:30.000000000 +0200
+++ new/shorewall-init-5.1.5.2/configure.pl 2017-08-02 00:47:07.000000000 +0200
@@ -31,7 +31,7 @@
# Build updates this
#
use constant {
- VERSION => '5.1.4.4'
+ VERSION => '5.1.5.2'
};
my %params;
@@ -173,7 +173,12 @@
open $outfile, '>', 'shorewallrc' or die "Can't open 'shorewallrc' for output: $!";
-printf $outfile "#\n# Created by Shorewall Core version %s configure.pl - %s %2d %04d %02d:%02d:%02d\n", VERSION, $abbr[$localtime[4]], $localtime[3], 1900 + $localtime[5] , @localtime[2,1,0];
+if ( $ENV{SOURCE_DATE_EPOCH} ) {
+ printf $outfile "#\n# Created by Shorewall Core version %s configure.pl - %s\n", VERSION, `date --utc --date=\"\@$ENV{SOURCE_DATE_EPOCH}\"`;
+} else {
+ printf $outfile "#\n# Created by Shorewall Core version %s configure.pl - %s %2d %04d %02d:%02d:%02d\n", VERSION, $abbr[$localtime[4]], $localtime[3], 1900 + $localtime[5] , @localtime[2,1,0];
+}
+
print $outfile "# rc file: $rcfilename\n#\n";
print $outfile "# Input: @ARGV\n#\n" if @ARGV;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-5.1.4.4/install.sh new/shorewall-init-5.1.5.2/install.sh
--- old/shorewall-init-5.1.4.4/install.sh 2017-06-23 16:45:30.000000000 +0200
+++ new/shorewall-init-5.1.5.2/install.sh 2017-08-02 00:47:07.000000000 +0200
@@ -27,7 +27,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
-VERSION=5.1.4.4
+VERSION=5.1.5.2
PRODUCT=shorewall-init
Product="Shorewall Init"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-5.1.4.4/releasenotes.txt new/shorewall-init-5.1.5.2/releasenotes.txt
--- old/shorewall-init-5.1.4.4/releasenotes.txt 2017-06-23 16:45:30.000000000 +0200
+++ new/shorewall-init-5.1.5.2/releasenotes.txt 2017-08-02 00:47:07.000000000 +0200
@@ -1,7 +1,7 @@
----------------------------------------------------------------------------
- S H O R E W A L L 5 . 1 . 4 . 4
+ S H O R E W A L L 5 . 1 . 5 . 2
------------------------------
- J u n e 2 3 , 2 0 1 7
+ J u l y 3 1 , 2 0 1 7
----------------------------------------------------------------------------
I. PROBLEMS CORRECTED IN THIS RELEASE
@@ -14,87 +14,62 @@
I. P R O B L E M S C O R R E C T E D I N T H I S R E L E A S E
----------------------------------------------------------------------------
-5.1.4.4
+5.1.5.2
-1) A defect in 5.1.4.3 caused a startup failure when two or more
- 'fallback' providers were configured. That has been corrected.
+1) Previously, Specifying a USER in the OUTPUT section of the
+ accounting file caused the compilter to incorrectly generate the
+ following error message:
-5.1.4.3
+ ERROR: USER/GROUP may only be specified in the OUTPUT section
-1) When running on prior-generation distributions such as RHEL6,
- IPv6 multi-ISP configurations failed to start due to an error such as
- the following:
+ That has been corrected, and no error message is generated in this
+ case.
- ERROR: Command "ip -6 -6 route replace default scope global
- table 250 nexthop via ::192.88.99.1 dev tun6to4 weight 1"
- Failed
-
- Such configurations now start successfully.
+2) When BASIC_FILTERS=Yes, the compiler previously generated an
+ invalid tc command when when a source port was specified in a
+ tcfilters entry. The compiler now generates correct input in this
+ case.
-5.1.4.2
+3) Previously, a MAC address could be specified in the OUTPUT
+ section of the accounting file and no error would be generated at
+ compile time. A failure would occur, however, at run-time. Now, an
+ error is raised during compilation.
-1) Many broken links in the manpages have been corrected.
+5.1.5.1
-2) Support for the NFQUEUE '--queue-cpu-fanout' option, introduced in
- Shorewall 5.1.0, contained a defect which could result in the
- following compile-time error:
-
- Use of uninitialized value $fanout in concatenation (.) or string
- at /usr/share/shorewall/Shorewall/Rules.pm line 643,
- <$currentfile> line 2.
-
- That has been corrected.
-
-5.1.4.1
-
-1) The introductory material in shorewall-rules(5) has been cleaned
- up.
-
-2) The information about LOGFORMAT in shorewall[6].conf(5) and
- shorewall[6]-zones(5) has been expanded.
-
- In Shorewall 5.1.0, the setting of LOGFORMAT in the default and
- sample .conf files was changed to "%s:%s " to enable 10-character
- zone names (up from 5 characters using the default
- "Shorewall:%s:%s:" setting). As part of this change, if a
- shorewall.conf file which did not set LOGFORMAT is updated using
- "shorewall update", LOGFORMAT is set to "Shorewall:%s:%s:" to
- preserve the existing behavior.
+1) To compensate for the presence of a masq file with no entries,
+ the compiler will now attempt to process the snat file when such a
+ masq file is found. Previously, if a masq file with no entries was
+ found, the snat file, if any, was ignored.
- This can have an effect on new installations, however in that
- scipts or log analyzers can no longer be configured to simply look
- for "Shorewall:" in log messages unless the setting of LOGFORMAT is
- changed. The manpages (and the Migration Considerations below) have
- been updated to describe how to locate these messages using the new
- "%s:%s " setting.
+2) Previously, maintainers could not create reproducable packages
+ because the 'configure' and 'configure.pl' scripts inserted the
+ current date and time into the generated shorewallrc file.
-3) The BLACKLIST action was inadvertently omitted from Shorewall6 in
- Shorewall 5.1.1. That has been corrected.
+ To support reproducable package builds, the scripts now recognize
+ the SOURCE_DATE_EPOCH environmental variable (see
+ https://reproducible-builds.org/specs/source-date-epoch/)
-5.1.4
+ The change to 'configure' was supplied by Bernhard M. Wiedemann.
-1) This release contains defect repair through Shorewall 5.1.3.1.
+5.1.5
-2) Previously, if a Shorewall Variable ( e.g., @chain ) was the target
- of a conditional ?RESET directive (one that was enclosed in ?if...
- ?else...?endif logic), the compiler could incorrectly use an
- existing chain created from the action rather than creating a new
- (and different) chain. That has been corrected.
+1) This release contains defect repair through Shorewall 5.1.4.4.
-3) Previously, if alternate input format specified a column that had
- already been specified, the contents of that column were silently
- overwritten. Now, a warning message is issued stating that the
- prior value has been replaced by the newer value.
+2) Previously, when 0 was used as a port number or when a port number
+ > 65535 was specified, an 'uninitialized variable' Perl exception
+ occurred when the compiler attempted to issue an error
+ message. That has been corrected.
-4) Previously, a string-valued interface option, such as
- 'physical', could be given an empty value (e.g., "physical=,"), and
- the compiler would fail to flag it. Now, this usage raises an
- error.
+3) When running with Perl 5.26, messages such at the following could
+ be issued:
-5) Previously, the 'tunnel-src' and 'tunnel-dst' zone options would
- generate an error under Shorewall6. That has been corrected.
+ Unescaped left brace in regex is deprecated here (and will be
+ fatal in Perl 5.30), passed through in regex; marked by <-- HERE
+ in m/^(\s*|.*[^&@%]){ <-- HERE (.*)}\s*$/ at
+ /usr/share/shorewall/Shorewall/Config.pm line 2343.
-6) A number of small documentation corrections have been made.
+ That problem has been corrected.
----------------------------------------------------------------------------
I I. K N O W N P R O B L E M S R E M A I N I N G
@@ -115,48 +90,40 @@
uses a "delete..add.." sequence on these routes rather than a
single "replace" command.
+4) When the formerly built-in actions were converted to standard
+ actions in Shorewall 5.1.3, the 'dropBcasts' action was
+ inadvertently changed to 'dropBcast'. Beginning with this release,
+ both spellings are accepted.
+
----------------------------------------------------------------------------
I I I. N E W F E A T U R E S I N T H I S R E L E A S E
----------------------------------------------------------------------------
-1) All IPv6 standard actions have been deleted and their logic
- has been added to their IPv4 counterparts who can now handle
- both address families.
-
-2) Previously, ?error and ?require messages as well as verbose ?info
- and ?warning messages (those that report the file and line numbers)
- generated from an action file would report the action file name and
- line number rather than the file and line number where the action
- was invoked. The file and line number where the action was invoked
- were listed second. Beginning with this release, the invoking file
- and line number are listed first and the action file and line number
- are not reported. This allows for creation of clearer messages.
-
- Example:
-
- Previously, when an invalid value was passed for the 'bricks'
- parameter to the GlusterFS action on line 45 of the rules file, a
- message such as the following was issued (folded to 76 columns):
-
- ERROR: Invalid value for Bricks (2000)
- /usr/share/shorewall/action.GlusterFS (line 15)
- from /etc/shorewall/rules (line 45)
-
- Note that the message seems to imply that the error is in
- action.GlusterFS rather than in the rules file.
-
- Beginning with this release, the message will be:
-
- ERROR: Invalid value (2000) for the GlusterFS Bricks argument
- /etc/shorewall/rules (line 45)
-
- Note: This change only affects actions, including inline actions.
- Macros will continue to report the old way.
+1) Run-time port variables are now supported. See
+ http://www.shorewall.org/configuration_file_basics.htm#Port_Variables
+ for details.
+
+2) The Shorewall and Shorewall6 manpages are now consolidated. Almost
+ all of the Shorewall6 manpages are manpage aliases for the
+ corresponding Shorewall manpages which describe the files for both
+ products.
+
+3) There is now a FIN standard action which handles TCP packets with
+ the FIN, ACK and PSH flags set.
+
+4) According to the Netfilter team (see
+ https://patchwork.kernel.org/patch/9198133/) the --nflog-range option
+ of the NFLOG target has never worked correctly, and they have
+ deprecated that option in favor of the --nflog-size option. To
+ accomodate this change, there is now an "--nflog-size support"
+ (NFLOG_SIZE) Shorewall capability and a USE_NFLOG_SIZE option in
+ shorewall[6].conf.
-3) IPv6 UPnP support (including MINIUPNPD) is now available.
+ For further information, see the Migrations Issues item number 8.
-4) A PERL_HASH_SEED option has been added to allow the Perl hash seed
- to be specified. See shorewall.conf(5) and perlsec(1) for details.
+5) The RESTORE_DEFAULT_ROUTE option has now been added to
+ shorewall6.conf. Prior to this release, RESTORE_DEFAULT_ROUTE=Yes
+ has always been assumed for Shorewall6 configurations.
----------------------------------------------------------------------------
I V. M I G R A T I O N I S S U E S
@@ -276,11 +243,188 @@
Broadcast no longer handle multicast. Multicast is handeled
separately in actions allowMcast, dropMcast and Multicast. The
now-deprecated Drop and Reject policy actions have been modified so
- that they continue to silently drop multicast packets.
+ that they continue to silently drop multicast packets.
+
+8) According to the Netfilter team (see
+ https://patchwork.kernel.org/patch/9198133/) the --nflog-range option
+ of the NFLOG target has never worked correctly, and they have
+ deprecated that option in favor of the --nflog-size option.
+
+ To accomodate this change, Shorewall 5.1.5 added an "--nflog-size
+ support" (NFLOG_SIZE) Shorewall capability and a USE_NFLOG_SIZE
+ option in shorewall[6].conf. If USE_NFLOG_SIZE=Yes, then if the
+ capability is present, Shorewall will use '--nflog-size' in place
+ of '--nflog-range'. If USE_NFLOG_SIZE=Yes and the capability is not
+ present, an error is raised.
+
+ If you don't use NFLOG or if you use NFLOG with omittted second
+ parameter or with 0 as the second parameter, and 'shorewall show
+ capabilities' indicated that --nflog-size support is present, you
+ may safely set USE_NFLOG_SIZE=Yes.
+
+ If you pass a non-zero value as the second parameter to NFLOG and
+ the '--nflog-size support' capability is present, you need to
+ verify that those NFLOG messages are as you expect with
+ USE_NFLOG_SIZE=Yes.
----------------------------------------------------------------------------
V. N O T E S F R O M O T H E R 5 . 1 R E L E A S E S
----------------------------------------------------------------------------
+ P R O B L E M S C O R R E C T E D I N 5 . 1 . 4
+----------------------------------------------------------------------------
+
+5.1.4.4
+
+1) A defect in 5.1.4.3 caused a startup failure when two or more
+ 'fallback' providers were configured. That has been corrected.
+
+5.1.4.3
+
+1) When running on prior-generation distributions such as RHEL6,
+ IPv6 multi-ISP configurations failed to start due to an error such as
+ the following:
+
+ ERROR: Command "ip -6 -6 route replace default scope global
+ table 250 nexthop via ::192.88.99.1 dev tun6to4 weight 1"
+ Failed
+
+ Such configurations now start successfully.
+
+5.1.4.2
+
+1) Many broken links in the manpages have been corrected.
+
+2) Support for the NFQUEUE '--queue-cpu-fanout' option, introduced in
+ Shorewall 5.1.0, contained a defect which could result in the
+ following compile-time error:
+
+ Use of uninitialized value $fanout in concatenation (.) or string
+ at /usr/share/shorewall/Shorewall/Rules.pm line 643,
+ <$currentfile> line 2.
+
+ That has been corrected.
+
+5.1.4.1
+
+1) The introductory material in shorewall-rules(5) has been cleaned
+ up.
+
+2) The information about LOGFORMAT in shorewall[6].conf(5) and
+ shorewall[6]-zones(5) has been expanded.
+
+ In Shorewall 5.1.0, the setting of LOGFORMAT in the default and
+ sample .conf files was changed to "%s:%s " to enable 10-character
+ zone names (up from 5 characters using the default
+ "Shorewall:%s:%s:" setting). As part of this change, if a
+ shorewall.conf file which did not set LOGFORMAT is updated using
+ "shorewall update", LOGFORMAT is set to "Shorewall:%s:%s:" to
+ preserve the existing behavior.
+
+ This can have an effect on new installations, however in that
+ scipts or log analyzers can no longer be configured to simply look
+ for "Shorewall:" in log messages unless the setting of LOGFORMAT is
+ changed. The manpages (and the Migration Considerations below) have
+ been updated to describe how to locate these messages using the new
+ "%s:%s " setting.
+
+3) The BLACKLIST action was inadvertently omitted from Shorewall6 in
+ Shorewall 5.1.1. That has been corrected.
+
+5.1.4.1
+
+1) The introductory material in shorewall-rules(5) has been cleaned
+ up.
+
+2) The information about LOGFORMAT in shorewall[6].conf(5) and
+ shorewall[6]-zones(5) has been expanded.
+
+ In Shorewall 5.1.0, the setting of LOGFORMAT in the default and
+ sample .conf files was changed to "%s:%s " to enable 10-character
+ zone names (up from 5 characters using the default
+ "Shorewall:%s:%s:" setting). As part of this change, if a
+ shorewall.conf file which did not set LOGFORMAT is updated using
+ "shorewall update", LOGFORMAT is set to "Shorewall:%s:%s:" to
+ preserve the existing behavior.
+
+ This can have an effect on new installations, however in that
+ scipts or log analyzers can no longer be configured to simply look
+ for "Shorewall:" in log messages unless the setting of LOGFORMAT is
+ changed. The manpages (and the Migration Considerations below) have
+ been updated to describe how to locate these messages using the new
+ "%s:%s " setting.
+
+3) The BLACKLIST action was inadvertently omitted from Shorewall6 in
+ Shorewall 5.1.1. That has been corrected.
+
+5.1.4
+
+1) This release contains defect repair through Shorewall 5.1.3.1.
+
+2) Previously, if a Shorewall Variable ( e.g., @chain ) was the target
+ of a conditional ?RESET directive (one that was enclosed in ?if...
+ ?else...?endif logic), the compiler could incorrectly use an
+ existing chain created from the action rather than creating a new
+ (and different) chain. That has been corrected.
+
+3) Previously, if alternate input format specified a column that had
+ already been specified, the contents of that column were silently
+ overwritten. Now, a warning message is issued stating that the
+ prior value has been replaced by the newer value.
+
+4) Previously, a string-valued interface option, such as
+ 'physical', could be given an empty value (e.g., "physical=,"), and
+ the compiler would fail to flag it. Now, this usage raises an
+ error.
+
+5) Previously, the 'tunnel-src' and 'tunnel-dst' zone options would
+ generate an error under Shorewall6. That has been corrected.
+
+6) A number of small documentation corrections have been made.
+
+----------------------------------------------------------------------------
+ N E W F E A T U R E S I N 5 . 1 . 3
+----------------------------------------------------------------------------
+
+1) All IPv6 standard actions have been deleted and their logic
+ has been added to their IPv4 counterparts who can now handle
+ both address families.
+
+2) Previously, ?error and ?require messages as well as verbose ?info
+ and ?warning messages (those that report the file and line numbers)
+ generated from an action file would report the action file name and
+ line number rather than the file and line number where the action
+ was invoked. The file and line number where the action was invoked
+ were listed second. Beginning with this release, the invoking file
+ and line number are listed first and the action file and line number
+ are not reported. This allows for creation of clearer messages.
+
+ Example:
+
+ Previously, when an invalid value was passed for the 'bricks'
+ parameter to the GlusterFS action on line 45 of the rules file, a
+ message such as the following was issued (folded to 76 columns):
+
+ ERROR: Invalid value for Bricks (2000)
+ /usr/share/shorewall/action.GlusterFS (line 15)
+ from /etc/shorewall/rules (line 45)
+
+ Note that the message seems to imply that the error is in
+ action.GlusterFS rather than in the rules file.
+
+ Beginning with this release, the message will be:
+
+ ERROR: Invalid value (2000) for the GlusterFS Bricks argument
+ /etc/shorewall/rules (line 45)
+
+ Note: This change only affects actions, including inline actions.
+ Macros will continue to report the old way.
+
+3) IPv6 UPnP support (including MINIUPNPD) is now available.
+
+4) A PERL_HASH_SEED option has been added to allow the Perl hash seed
+ to be specified. See shorewall.conf(5) and perlsec(1) for details.
+
+----------------------------------------------------------------------------
P R O B L E M S C O R R E C T E D I N 5 . 1 . 3
----------------------------------------------------------------------------
@@ -311,7 +455,7 @@
sample configuration.
----------------------------------------------------------------------------
- N E W F E A T U R E S I N 5 . 1 . 2
+ N E W F E A T U R E S I N 5 . 1 . 3
----------------------------------------------------------------------------
1) The tarball installers and uninstallers have been unified and
@@ -632,32 +776,9 @@
2) Several settings in the default/sample .conf files have been
modified:
- a) In Shorewall 5.1.0, the setting of LOGFORMAT in the default and
- sample .conf files was changed to "%s:%s " to enable
- 10-character zone names (up from 5 characters using the default
- "Shorewall:%s:%s:" setting). As part of this change, if a
- shorewall.conf file which did not set LOGFORMAT is updated using
- "shorewall update", LOGFORMAT is set to "Shorewall:%s:%s:" to
- preserve the existing behavior.
-
- This can have an effect on new installations, however in that
- scipts or log analyzers can no longer be configured to simply look
- for "Shorewall:" in log messages unless the setting of LOGFORMAT is
- changed. If you use the new "%s:%s " setting then
- Shorewall-generated Netfilter messages may be matched using
- this regular expression:
-
- 'IN=.* OUT=.* SRC=.*\..* DST='
-
- Shorewall6-generated Netfilter messages may be matched using:
-
- 'IN=.* OUT=.* SRC=.*:.* DST='
-
- And all Netfilter messages (IPv4 and IPv6) are matched using:
-
- 'IN=.* OUT=.* SRC=.* DST='
+ a) The LOGFORMAT setting has been changed from "Shorewall:%s:%s:"
+ to "%s %s " to enable longer zone names.
- Shorewall6-generated Netfilter messages may be idd
b) The LOGLIMIT setting has been changed from empty to
"s:1/sec:10", to enable log trottling by default.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-5.1.4.4/shorewall-init.spec new/shorewall-init-5.1.5.2/shorewall-init.spec
--- old/shorewall-init-5.1.4.4/shorewall-init.spec 2017-06-23 16:45:30.000000000 +0200
+++ new/shorewall-init-5.1.5.2/shorewall-init.spec 2017-08-02 00:47:07.000000000 +0200
@@ -1,6 +1,6 @@
%define name shorewall-init
-%define version 5.1.4
-%define release 4
+%define version 5.1.5
+%define release 2
Summary: Shorewall-init adds functionality to Shoreline Firewall (Shorewall).
Name: %{name}
@@ -135,14 +135,18 @@
%doc COPYING changelog.txt releasenotes.txt
%changelog
-* Fri Jun 23 2017 Tom Eastep tom(a)shorewall.net
-- Updated to 5.1.4-4
-* Sun Jun 18 2017 Tom Eastep tom(a)shorewall.net
-- Updated to 5.1.4-3
-* Mon Jun 12 2017 Tom Eastep tom(a)shorewall.net
-- Updated to 5.1.4-2
-* Fri May 19 2017 Tom Eastep tom(a)shorewall.net
-- Updated to 5.1.4-1
+* Thu Jul 27 2017 Tom Eastep tom(a)shorewall.net
+- Updated to 5.1.5-2
+* Thu Jul 06 2017 Tom Eastep tom(a)shorewall.net
+- Updated to 5.1.5-1
+* Mon Jun 26 2017 Tom Eastep tom(a)shorewall.net
+- Updated to 5.1.5-0base
+* Wed Jun 21 2017 Tom Eastep tom(a)shorewall.net
+- Updated to 5.1.5-0RC1
+* Fri Jun 16 2017 Tom Eastep tom(a)shorewall.net
+- Updated to 5.1.5-0Beta2
+* Thu May 11 2017 Tom Eastep tom(a)shorewall.net
+- Updated to 5.1.5-0Beta1
* Fri May 05 2017 Tom Eastep tom(a)shorewall.net
- Updated to 5.1.4-0base
* Mon Apr 24 2017 Tom Eastep tom(a)shorewall.net
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-5.1.4.4/uninstall.sh new/shorewall-init-5.1.5.2/uninstall.sh
--- old/shorewall-init-5.1.4.4/uninstall.sh 2017-06-23 16:45:30.000000000 +0200
+++ new/shorewall-init-5.1.5.2/uninstall.sh 2017-08-02 00:47:07.000000000 +0200
@@ -26,7 +26,7 @@
# You may only use this script to uninstall the version
# shown below. Simply run this script to remove Shorewall Firewall
-VERSION=5.1.4.4
+VERSION=5.1.5.2
PRODUCT=shorewall-init
Product="Shorewall Init"
++++++ shorewall-lite-5.1.4.4.tar.bz2 -> shorewall-lite-5.1.5.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-5.1.4.4/changelog.txt new/shorewall-lite-5.1.5.2/changelog.txt
--- old/shorewall-lite-5.1.4.4/changelog.txt 2017-06-23 16:45:31.000000000 +0200
+++ new/shorewall-lite-5.1.5.2/changelog.txt 2017-08-02 00:47:07.000000000 +0200
@@ -1,3 +1,52 @@
+Changes in 5.1.5.2
+
+1) Update release documents.
+
+2) Correct source port handling when BASIC_FILTERS=Yes.
+
+3) Correct handling of USER/GROUP in the OUTPUT section of the
+ accounting file.
+
+4) Correct handling of MAC addresses in the accounting file.
+
+Changes in 5.1.5.1
+
+1) Update release documents.
+
+2) Process the snat file if the masq file is empty.
+
+Changes in 5.1.5 Final
+
+1) Update release documents.
+
+2) Include IPv6 annotated config files.
+
+3) Add RESTORE_DEFAULT_ROUTE to shorewall6.conf.
+
+Changes in 5.1.5 RC 1
+
+1) Update release documents.
+
+2) USE_NFLOG_SIZE option.
+
+3) Improve editing of port numbers/service names.
+
+4) Add dropBcasts action.
+
+Changes in 5.1.5 Beta 2
+
+1) Update release documents.
+
+2) Consolidate Shorewall/Shorewall6 manpages.
+
+Changes in 5.1.5 Beta 1
+
+1) Update release documents.
+
+2) Add defect repair through 5.1.4.2.
+
+3) Implement runtime port variables.
+
Changes in 5.1.4.4
1) Update release documents.
@@ -32,13 +81,6 @@
1) Update release documents.
-2) Clean up introduction to shorewall-rules(5).
-
-3) Clarify LOGFORMAT in shorewall[6].conf(5) and
- shorewall[6]-zones(5).
-
-4) Add BLACKLIST to the IPv6 actions.std file.
-
Changes in 5.1.4 RC 1
1) Update release documents.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-5.1.4.4/configure new/shorewall-lite-5.1.5.2/configure
--- old/shorewall-lite-5.1.4.4/configure 2017-06-23 16:45:31.000000000 +0200
+++ new/shorewall-lite-5.1.5.2/configure 2017-08-02 00:47:07.000000000 +0200
@@ -28,7 +28,7 @@
#
# Build updates this
#
-VERSION=5.1.4.4
+VERSION=5.1.5.2
case "$BASH_VERSION" in
[4-9].*)
@@ -190,7 +190,7 @@
done
echo '#' > shorewallrc
-echo "# Created by Shorewall Core version $VERSION configure - " `date` >> shorewallrc
+echo "# Created by Shorewall Core version $VERSION configure - " `date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}"` >> shorewallrc
echo "# rc file: $rcfile" >> shorewallrc
echo '#' >> shorewallrc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-5.1.4.4/configure.pl new/shorewall-lite-5.1.5.2/configure.pl
--- old/shorewall-lite-5.1.4.4/configure.pl 2017-06-23 16:45:31.000000000 +0200
+++ new/shorewall-lite-5.1.5.2/configure.pl 2017-08-02 00:47:07.000000000 +0200
@@ -31,7 +31,7 @@
# Build updates this
#
use constant {
- VERSION => '5.1.4.4'
+ VERSION => '5.1.5.2'
};
my %params;
@@ -173,7 +173,12 @@
open $outfile, '>', 'shorewallrc' or die "Can't open 'shorewallrc' for output: $!";
-printf $outfile "#\n# Created by Shorewall Core version %s configure.pl - %s %2d %04d %02d:%02d:%02d\n", VERSION, $abbr[$localtime[4]], $localtime[3], 1900 + $localtime[5] , @localtime[2,1,0];
+if ( $ENV{SOURCE_DATE_EPOCH} ) {
+ printf $outfile "#\n# Created by Shorewall Core version %s configure.pl - %s\n", VERSION, `date --utc --date=\"\@$ENV{SOURCE_DATE_EPOCH}\"`;
+} else {
+ printf $outfile "#\n# Created by Shorewall Core version %s configure.pl - %s %2d %04d %02d:%02d:%02d\n", VERSION, $abbr[$localtime[4]], $localtime[3], 1900 + $localtime[5] , @localtime[2,1,0];
+}
+
print $outfile "# rc file: $rcfilename\n#\n";
print $outfile "# Input: @ARGV\n#\n" if @ARGV;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-5.1.4.4/install.sh new/shorewall-lite-5.1.5.2/install.sh
--- old/shorewall-lite-5.1.4.4/install.sh 2017-06-23 16:45:31.000000000 +0200
+++ new/shorewall-lite-5.1.5.2/install.sh 2017-08-02 00:47:07.000000000 +0200
@@ -22,7 +22,7 @@
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
-VERSION=5.1.4.4
+VERSION=5.1.5.2
usage() # $1 = exit status
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-5.1.4.4/manpages/shorewall-lite-vardir.5 new/shorewall-lite-5.1.5.2/manpages/shorewall-lite-vardir.5
--- old/shorewall-lite-5.1.4.4/manpages/shorewall-lite-vardir.5 2017-06-23 16:47:25.000000000 +0200
+++ new/shorewall-lite-5.1.5.2/manpages/shorewall-lite-vardir.5 2017-08-02 00:48:20.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-lite-vardir
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 06/23/2017
+.\" Date: 08/01/2017
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-LITE\-VAR" "5" "06/23/2017" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-LITE\-VAR" "5" "08/01/2017" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-5.1.4.4/manpages/shorewall-lite.8 new/shorewall-lite-5.1.5.2/manpages/shorewall-lite.8
--- old/shorewall-lite-5.1.4.4/manpages/shorewall-lite.8 2017-06-23 16:47:25.000000000 +0200
+++ new/shorewall-lite-5.1.5.2/manpages/shorewall-lite.8 2017-08-02 00:48:21.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-lite
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 06/23/2017
+.\" Date: 08/01/2017
.\" Manual: Administrative Commands
.\" Source: Administrative Commands
.\" Language: English
.\"
-.TH "SHOREWALL\-LITE" "8" "06/23/2017" "Administrative Commands" "Administrative Commands"
+.TH "SHOREWALL\-LITE" "8" "08/01/2017" "Administrative Commands" "Administrative Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-5.1.4.4/manpages/shorewall-lite.conf.5 new/shorewall-lite-5.1.5.2/manpages/shorewall-lite.conf.5
--- old/shorewall-lite-5.1.4.4/manpages/shorewall-lite.conf.5 2017-06-23 16:47:24.000000000 +0200
+++ new/shorewall-lite-5.1.5.2/manpages/shorewall-lite.conf.5 2017-08-02 00:48:19.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-lite.conf
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 06/23/2017
+.\" Date: 08/01/2017
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-LITE\&.CO" "5" "06/23/2017" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-LITE\&.CO" "5" "08/01/2017" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-5.1.4.4/releasenotes.txt new/shorewall-lite-5.1.5.2/releasenotes.txt
--- old/shorewall-lite-5.1.4.4/releasenotes.txt 2017-06-23 16:45:31.000000000 +0200
+++ new/shorewall-lite-5.1.5.2/releasenotes.txt 2017-08-02 00:47:07.000000000 +0200
@@ -1,7 +1,7 @@
----------------------------------------------------------------------------
- S H O R E W A L L 5 . 1 . 4 . 4
+ S H O R E W A L L 5 . 1 . 5 . 2
------------------------------
- J u n e 2 3 , 2 0 1 7
+ J u l y 3 1 , 2 0 1 7
----------------------------------------------------------------------------
I. PROBLEMS CORRECTED IN THIS RELEASE
@@ -14,87 +14,62 @@
I. P R O B L E M S C O R R E C T E D I N T H I S R E L E A S E
----------------------------------------------------------------------------
-5.1.4.4
+5.1.5.2
-1) A defect in 5.1.4.3 caused a startup failure when two or more
- 'fallback' providers were configured. That has been corrected.
+1) Previously, Specifying a USER in the OUTPUT section of the
+ accounting file caused the compilter to incorrectly generate the
+ following error message:
-5.1.4.3
+ ERROR: USER/GROUP may only be specified in the OUTPUT section
-1) When running on prior-generation distributions such as RHEL6,
- IPv6 multi-ISP configurations failed to start due to an error such as
- the following:
+ That has been corrected, and no error message is generated in this
+ case.
- ERROR: Command "ip -6 -6 route replace default scope global
- table 250 nexthop via ::192.88.99.1 dev tun6to4 weight 1"
- Failed
-
- Such configurations now start successfully.
+2) When BASIC_FILTERS=Yes, the compiler previously generated an
+ invalid tc command when when a source port was specified in a
+ tcfilters entry. The compiler now generates correct input in this
+ case.
-5.1.4.2
+3) Previously, a MAC address could be specified in the OUTPUT
+ section of the accounting file and no error would be generated at
+ compile time. A failure would occur, however, at run-time. Now, an
+ error is raised during compilation.
-1) Many broken links in the manpages have been corrected.
+5.1.5.1
-2) Support for the NFQUEUE '--queue-cpu-fanout' option, introduced in
- Shorewall 5.1.0, contained a defect which could result in the
- following compile-time error:
-
- Use of uninitialized value $fanout in concatenation (.) or string
- at /usr/share/shorewall/Shorewall/Rules.pm line 643,
- <$currentfile> line 2.
-
- That has been corrected.
-
-5.1.4.1
-
-1) The introductory material in shorewall-rules(5) has been cleaned
- up.
-
-2) The information about LOGFORMAT in shorewall[6].conf(5) and
- shorewall[6]-zones(5) has been expanded.
-
- In Shorewall 5.1.0, the setting of LOGFORMAT in the default and
- sample .conf files was changed to "%s:%s " to enable 10-character
- zone names (up from 5 characters using the default
- "Shorewall:%s:%s:" setting). As part of this change, if a
- shorewall.conf file which did not set LOGFORMAT is updated using
- "shorewall update", LOGFORMAT is set to "Shorewall:%s:%s:" to
- preserve the existing behavior.
+1) To compensate for the presence of a masq file with no entries,
+ the compiler will now attempt to process the snat file when such a
+ masq file is found. Previously, if a masq file with no entries was
+ found, the snat file, if any, was ignored.
- This can have an effect on new installations, however in that
- scipts or log analyzers can no longer be configured to simply look
- for "Shorewall:" in log messages unless the setting of LOGFORMAT is
- changed. The manpages (and the Migration Considerations below) have
- been updated to describe how to locate these messages using the new
- "%s:%s " setting.
+2) Previously, maintainers could not create reproducable packages
+ because the 'configure' and 'configure.pl' scripts inserted the
+ current date and time into the generated shorewallrc file.
-3) The BLACKLIST action was inadvertently omitted from Shorewall6 in
- Shorewall 5.1.1. That has been corrected.
+ To support reproducable package builds, the scripts now recognize
+ the SOURCE_DATE_EPOCH environmental variable (see
+ https://reproducible-builds.org/specs/source-date-epoch/)
-5.1.4
+ The change to 'configure' was supplied by Bernhard M. Wiedemann.
-1) This release contains defect repair through Shorewall 5.1.3.1.
+5.1.5
-2) Previously, if a Shorewall Variable ( e.g., @chain ) was the target
- of a conditional ?RESET directive (one that was enclosed in ?if...
- ?else...?endif logic), the compiler could incorrectly use an
- existing chain created from the action rather than creating a new
- (and different) chain. That has been corrected.
+1) This release contains defect repair through Shorewall 5.1.4.4.
-3) Previously, if alternate input format specified a column that had
- already been specified, the contents of that column were silently
- overwritten. Now, a warning message is issued stating that the
- prior value has been replaced by the newer value.
+2) Previously, when 0 was used as a port number or when a port number
+ > 65535 was specified, an 'uninitialized variable' Perl exception
+ occurred when the compiler attempted to issue an error
+ message. That has been corrected.
-4) Previously, a string-valued interface option, such as
- 'physical', could be given an empty value (e.g., "physical=,"), and
- the compiler would fail to flag it. Now, this usage raises an
- error.
+3) When running with Perl 5.26, messages such at the following could
+ be issued:
-5) Previously, the 'tunnel-src' and 'tunnel-dst' zone options would
- generate an error under Shorewall6. That has been corrected.
+ Unescaped left brace in regex is deprecated here (and will be
+ fatal in Perl 5.30), passed through in regex; marked by <-- HERE
+ in m/^(\s*|.*[^&@%]){ <-- HERE (.*)}\s*$/ at
+ /usr/share/shorewall/Shorewall/Config.pm line 2343.
-6) A number of small documentation corrections have been made.
+ That problem has been corrected.
----------------------------------------------------------------------------
I I. K N O W N P R O B L E M S R E M A I N I N G
@@ -115,48 +90,40 @@
uses a "delete..add.." sequence on these routes rather than a
single "replace" command.
+4) When the formerly built-in actions were converted to standard
+ actions in Shorewall 5.1.3, the 'dropBcasts' action was
+ inadvertently changed to 'dropBcast'. Beginning with this release,
+ both spellings are accepted.
+
----------------------------------------------------------------------------
I I I. N E W F E A T U R E S I N T H I S R E L E A S E
----------------------------------------------------------------------------
-1) All IPv6 standard actions have been deleted and their logic
- has been added to their IPv4 counterparts who can now handle
- both address families.
-
-2) Previously, ?error and ?require messages as well as verbose ?info
- and ?warning messages (those that report the file and line numbers)
- generated from an action file would report the action file name and
- line number rather than the file and line number where the action
- was invoked. The file and line number where the action was invoked
- were listed second. Beginning with this release, the invoking file
- and line number are listed first and the action file and line number
- are not reported. This allows for creation of clearer messages.
-
- Example:
-
- Previously, when an invalid value was passed for the 'bricks'
- parameter to the GlusterFS action on line 45 of the rules file, a
- message such as the following was issued (folded to 76 columns):
-
- ERROR: Invalid value for Bricks (2000)
- /usr/share/shorewall/action.GlusterFS (line 15)
- from /etc/shorewall/rules (line 45)
-
- Note that the message seems to imply that the error is in
- action.GlusterFS rather than in the rules file.
-
- Beginning with this release, the message will be:
-
- ERROR: Invalid value (2000) for the GlusterFS Bricks argument
- /etc/shorewall/rules (line 45)
-
- Note: This change only affects actions, including inline actions.
- Macros will continue to report the old way.
+1) Run-time port variables are now supported. See
+ http://www.shorewall.org/configuration_file_basics.htm#Port_Variables
+ for details.
+
+2) The Shorewall and Shorewall6 manpages are now consolidated. Almost
+ all of the Shorewall6 manpages are manpage aliases for the
+ corresponding Shorewall manpages which describe the files for both
+ products.
+
+3) There is now a FIN standard action which handles TCP packets with
+ the FIN, ACK and PSH flags set.
+
+4) According to the Netfilter team (see
+ https://patchwork.kernel.org/patch/9198133/) the --nflog-range option
+ of the NFLOG target has never worked correctly, and they have
+ deprecated that option in favor of the --nflog-size option. To
+ accomodate this change, there is now an "--nflog-size support"
+ (NFLOG_SIZE) Shorewall capability and a USE_NFLOG_SIZE option in
+ shorewall[6].conf.
-3) IPv6 UPnP support (including MINIUPNPD) is now available.
+ For further information, see the Migrations Issues item number 8.
-4) A PERL_HASH_SEED option has been added to allow the Perl hash seed
- to be specified. See shorewall.conf(5) and perlsec(1) for details.
+5) The RESTORE_DEFAULT_ROUTE option has now been added to
+ shorewall6.conf. Prior to this release, RESTORE_DEFAULT_ROUTE=Yes
+ has always been assumed for Shorewall6 configurations.
----------------------------------------------------------------------------
I V. M I G R A T I O N I S S U E S
@@ -276,11 +243,188 @@
Broadcast no longer handle multicast. Multicast is handeled
separately in actions allowMcast, dropMcast and Multicast. The
now-deprecated Drop and Reject policy actions have been modified so
- that they continue to silently drop multicast packets.
+ that they continue to silently drop multicast packets.
+
+8) According to the Netfilter team (see
+ https://patchwork.kernel.org/patch/9198133/) the --nflog-range option
+ of the NFLOG target has never worked correctly, and they have
+ deprecated that option in favor of the --nflog-size option.
+
+ To accomodate this change, Shorewall 5.1.5 added an "--nflog-size
+ support" (NFLOG_SIZE) Shorewall capability and a USE_NFLOG_SIZE
+ option in shorewall[6].conf. If USE_NFLOG_SIZE=Yes, then if the
+ capability is present, Shorewall will use '--nflog-size' in place
+ of '--nflog-range'. If USE_NFLOG_SIZE=Yes and the capability is not
+ present, an error is raised.
+
+ If you don't use NFLOG or if you use NFLOG with omittted second
+ parameter or with 0 as the second parameter, and 'shorewall show
+ capabilities' indicated that --nflog-size support is present, you
+ may safely set USE_NFLOG_SIZE=Yes.
+
+ If you pass a non-zero value as the second parameter to NFLOG and
+ the '--nflog-size support' capability is present, you need to
+ verify that those NFLOG messages are as you expect with
+ USE_NFLOG_SIZE=Yes.
----------------------------------------------------------------------------
V. N O T E S F R O M O T H E R 5 . 1 R E L E A S E S
----------------------------------------------------------------------------
+ P R O B L E M S C O R R E C T E D I N 5 . 1 . 4
+----------------------------------------------------------------------------
+
+5.1.4.4
+
+1) A defect in 5.1.4.3 caused a startup failure when two or more
+ 'fallback' providers were configured. That has been corrected.
+
+5.1.4.3
+
+1) When running on prior-generation distributions such as RHEL6,
+ IPv6 multi-ISP configurations failed to start due to an error such as
+ the following:
+
+ ERROR: Command "ip -6 -6 route replace default scope global
+ table 250 nexthop via ::192.88.99.1 dev tun6to4 weight 1"
+ Failed
+
+ Such configurations now start successfully.
+
+5.1.4.2
+
+1) Many broken links in the manpages have been corrected.
+
+2) Support for the NFQUEUE '--queue-cpu-fanout' option, introduced in
+ Shorewall 5.1.0, contained a defect which could result in the
+ following compile-time error:
+
+ Use of uninitialized value $fanout in concatenation (.) or string
+ at /usr/share/shorewall/Shorewall/Rules.pm line 643,
+ <$currentfile> line 2.
+
+ That has been corrected.
+
+5.1.4.1
+
+1) The introductory material in shorewall-rules(5) has been cleaned
+ up.
+
+2) The information about LOGFORMAT in shorewall[6].conf(5) and
+ shorewall[6]-zones(5) has been expanded.
+
+ In Shorewall 5.1.0, the setting of LOGFORMAT in the default and
+ sample .conf files was changed to "%s:%s " to enable 10-character
+ zone names (up from 5 characters using the default
+ "Shorewall:%s:%s:" setting). As part of this change, if a
+ shorewall.conf file which did not set LOGFORMAT is updated using
+ "shorewall update", LOGFORMAT is set to "Shorewall:%s:%s:" to
+ preserve the existing behavior.
+
+ This can have an effect on new installations, however in that
+ scipts or log analyzers can no longer be configured to simply look
+ for "Shorewall:" in log messages unless the setting of LOGFORMAT is
+ changed. The manpages (and the Migration Considerations below) have
+ been updated to describe how to locate these messages using the new
+ "%s:%s " setting.
+
+3) The BLACKLIST action was inadvertently omitted from Shorewall6 in
+ Shorewall 5.1.1. That has been corrected.
+
+5.1.4.1
+
+1) The introductory material in shorewall-rules(5) has been cleaned
+ up.
+
+2) The information about LOGFORMAT in shorewall[6].conf(5) and
+ shorewall[6]-zones(5) has been expanded.
+
+ In Shorewall 5.1.0, the setting of LOGFORMAT in the default and
+ sample .conf files was changed to "%s:%s " to enable 10-character
+ zone names (up from 5 characters using the default
+ "Shorewall:%s:%s:" setting). As part of this change, if a
+ shorewall.conf file which did not set LOGFORMAT is updated using
+ "shorewall update", LOGFORMAT is set to "Shorewall:%s:%s:" to
+ preserve the existing behavior.
+
+ This can have an effect on new installations, however in that
+ scipts or log analyzers can no longer be configured to simply look
+ for "Shorewall:" in log messages unless the setting of LOGFORMAT is
+ changed. The manpages (and the Migration Considerations below) have
+ been updated to describe how to locate these messages using the new
+ "%s:%s " setting.
+
+3) The BLACKLIST action was inadvertently omitted from Shorewall6 in
+ Shorewall 5.1.1. That has been corrected.
+
+5.1.4
+
+1) This release contains defect repair through Shorewall 5.1.3.1.
+
+2) Previously, if a Shorewall Variable ( e.g., @chain ) was the target
+ of a conditional ?RESET directive (one that was enclosed in ?if...
+ ?else...?endif logic), the compiler could incorrectly use an
+ existing chain created from the action rather than creating a new
+ (and different) chain. That has been corrected.
+
+3) Previously, if alternate input format specified a column that had
+ already been specified, the contents of that column were silently
+ overwritten. Now, a warning message is issued stating that the
+ prior value has been replaced by the newer value.
+
+4) Previously, a string-valued interface option, such as
+ 'physical', could be given an empty value (e.g., "physical=,"), and
+ the compiler would fail to flag it. Now, this usage raises an
+ error.
+
+5) Previously, the 'tunnel-src' and 'tunnel-dst' zone options would
+ generate an error under Shorewall6. That has been corrected.
+
+6) A number of small documentation corrections have been made.
+
+----------------------------------------------------------------------------
+ N E W F E A T U R E S I N 5 . 1 . 3
+----------------------------------------------------------------------------
+
+1) All IPv6 standard actions have been deleted and their logic
+ has been added to their IPv4 counterparts who can now handle
+ both address families.
+
+2) Previously, ?error and ?require messages as well as verbose ?info
+ and ?warning messages (those that report the file and line numbers)
+ generated from an action file would report the action file name and
+ line number rather than the file and line number where the action
+ was invoked. The file and line number where the action was invoked
+ were listed second. Beginning with this release, the invoking file
+ and line number are listed first and the action file and line number
+ are not reported. This allows for creation of clearer messages.
+
+ Example:
+
+ Previously, when an invalid value was passed for the 'bricks'
+ parameter to the GlusterFS action on line 45 of the rules file, a
+ message such as the following was issued (folded to 76 columns):
+
+ ERROR: Invalid value for Bricks (2000)
+ /usr/share/shorewall/action.GlusterFS (line 15)
+ from /etc/shorewall/rules (line 45)
+
+ Note that the message seems to imply that the error is in
+ action.GlusterFS rather than in the rules file.
+
+ Beginning with this release, the message will be:
+
+ ERROR: Invalid value (2000) for the GlusterFS Bricks argument
+ /etc/shorewall/rules (line 45)
+
+ Note: This change only affects actions, including inline actions.
+ Macros will continue to report the old way.
+
+3) IPv6 UPnP support (including MINIUPNPD) is now available.
+
+4) A PERL_HASH_SEED option has been added to allow the Perl hash seed
+ to be specified. See shorewall.conf(5) and perlsec(1) for details.
+
+----------------------------------------------------------------------------
P R O B L E M S C O R R E C T E D I N 5 . 1 . 3
----------------------------------------------------------------------------
@@ -311,7 +455,7 @@
sample configuration.
----------------------------------------------------------------------------
- N E W F E A T U R E S I N 5 . 1 . 2
+ N E W F E A T U R E S I N 5 . 1 . 3
----------------------------------------------------------------------------
1) The tarball installers and uninstallers have been unified and
@@ -632,32 +776,9 @@
2) Several settings in the default/sample .conf files have been
modified:
- a) In Shorewall 5.1.0, the setting of LOGFORMAT in the default and
- sample .conf files was changed to "%s:%s " to enable
- 10-character zone names (up from 5 characters using the default
- "Shorewall:%s:%s:" setting). As part of this change, if a
- shorewall.conf file which did not set LOGFORMAT is updated using
- "shorewall update", LOGFORMAT is set to "Shorewall:%s:%s:" to
- preserve the existing behavior.
-
- This can have an effect on new installations, however in that
- scipts or log analyzers can no longer be configured to simply look
- for "Shorewall:" in log messages unless the setting of LOGFORMAT is
- changed. If you use the new "%s:%s " setting then
- Shorewall-generated Netfilter messages may be matched using
- this regular expression:
-
- 'IN=.* OUT=.* SRC=.*\..* DST='
-
- Shorewall6-generated Netfilter messages may be matched using:
-
- 'IN=.* OUT=.* SRC=.*:.* DST='
-
- And all Netfilter messages (IPv4 and IPv6) are matched using:
-
- 'IN=.* OUT=.* SRC=.* DST='
+ a) The LOGFORMAT setting has been changed from "Shorewall:%s:%s:"
+ to "%s %s " to enable longer zone names.
- Shorewall6-generated Netfilter messages may be idd
b) The LOGLIMIT setting has been changed from empty to
"s:1/sec:10", to enable log trottling by default.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-5.1.4.4/shorewall-lite.spec new/shorewall-lite-5.1.5.2/shorewall-lite.spec
--- old/shorewall-lite-5.1.4.4/shorewall-lite.spec 2017-06-23 16:45:31.000000000 +0200
+++ new/shorewall-lite-5.1.5.2/shorewall-lite.spec 2017-08-02 00:47:07.000000000 +0200
@@ -1,6 +1,6 @@
%define name shorewall-lite
-%define version 5.1.4
-%define release 4
+%define version 5.1.5
+%define release 2
%define initdir /etc/init.d
Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems.
@@ -115,14 +115,18 @@
%doc COPYING changelog.txt releasenotes.txt
%changelog
-* Fri Jun 23 2017 Tom Eastep tom(a)shorewall.net
-- Updated to 5.1.4-4
-* Sun Jun 18 2017 Tom Eastep tom(a)shorewall.net
-- Updated to 5.1.4-3
-* Mon Jun 12 2017 Tom Eastep tom(a)shorewall.net
-- Updated to 5.1.4-2
-* Fri May 19 2017 Tom Eastep tom(a)shorewall.net
-- Updated to 5.1.4-1
+* Thu Jul 27 2017 Tom Eastep tom(a)shorewall.net
+- Updated to 5.1.5-2
+* Thu Jul 06 2017 Tom Eastep tom(a)shorewall.net
+- Updated to 5.1.5-1
+* Mon Jun 26 2017 Tom Eastep tom(a)shorewall.net
+- Updated to 5.1.5-0base
+* Wed Jun 21 2017 Tom Eastep tom(a)shorewall.net
+- Updated to 5.1.5-0RC1
+* Fri Jun 16 2017 Tom Eastep tom(a)shorewall.net
+- Updated to 5.1.5-0Beta2
+* Thu May 11 2017 Tom Eastep tom(a)shorewall.net
+- Updated to 5.1.5-0Beta1
* Fri May 05 2017 Tom Eastep tom(a)shorewall.net
- Updated to 5.1.4-0base
* Mon Apr 24 2017 Tom Eastep tom(a)shorewall.net
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-5.1.4.4/uninstall.sh new/shorewall-lite-5.1.5.2/uninstall.sh
--- old/shorewall-lite-5.1.4.4/uninstall.sh 2017-06-23 16:45:31.000000000 +0200
+++ new/shorewall-lite-5.1.5.2/uninstall.sh 2017-08-02 00:47:07.000000000 +0200
@@ -26,7 +26,7 @@
# You may only use this script to uninstall the version
# shown below. Simply run this script to remove Shorewall Firewall
-VERSION=5.1.4.4
+VERSION=5.1.5.2
usage() # $1 = exit status
{
++++++ shorewall-5.1.4.4.tar.bz2 -> shorewall6-5.1.5.2.tar.bz2 ++++++
++++ 116895 lines of diff (skipped)
++++++ shorewall-lite-5.1.4.4.tar.bz2 -> shorewall6-lite-5.1.5.2.tar.bz2 ++++++
++++ 3464 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package libkeduvocdocument for openSUSE:Factory checked in at 2017-08-28 15:17:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libkeduvocdocument (Old)
and /work/SRC/openSUSE:Factory/.libkeduvocdocument.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkeduvocdocument"
Mon Aug 28 15:17:50 2017 rev:31 rq:518879 version:17.08.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libkeduvocdocument/libkeduvocdocument.changes 2017-07-29 09:00:00.632670307 +0200
+++ /work/SRC/openSUSE:Factory/.libkeduvocdocument.new/libkeduvocdocument.changes 2017-08-28 15:19:14.631200573 +0200
@@ -1,0 +2,17 @@
+Fri Aug 11 22:46:18 UTC 2017 - christophe(a)krop.fr
+
+- Update to KDE Applications 17.08.0
+ * New feature release
+ * https://www.kde.org/announcements/announce-applications-17.08.0.php
+- Changes since 17.04.3 :
+ * Use Q_DECL_OVERRIDE
+
+-------------------------------------------------------------------
+Sat Aug 5 18:19:19 UTC 2017 - christophe(a)krop.fr
+
+- Update to KDE Applications 17.07.90
+ * KDE Applications 17.07.90
+ * https://www.kde.org/announcements/announce-applications-17.07.90.php
+
+
+-------------------------------------------------------------------
Old:
----
libkeduvocdocument-17.04.3.tar.xz
New:
----
libkeduvocdocument-17.08.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libkeduvocdocument.spec ++++++
--- /var/tmp/diff_new_pack.QgObE6/_old 2017-08-28 15:19:15.619061751 +0200
+++ /var/tmp/diff_new_pack.QgObE6/_new 2017-08-28 15:19:15.635059502 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libkeduvocdocument
#
-# 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
@@ -15,13 +15,14 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
%bcond_without lang
Name: libkeduvocdocument
-Version: 17.04.3
+Version: 17.08.0
Release: 0
%define kf5_version 5.26.0
-# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA)
+# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
Summary: Library for KDE Education Applications
License: GPL-2.0+
@@ -47,6 +48,26 @@
This package contains the library which is required by the KDE education
applications.
+%package -n libKEduVocDocument5
+Summary: Library for KDE Education Applications
+Group: System/GUI/KDE
+Recommends: kdeedu-data
+Recommends: %{name}-lang
+Provides: %{name} = %{version}
+
+%description -n libKEduVocDocument5
+This package contains the library which is required by the KDE education
+applications.
+
+%package devel
+Summary: Library for KDE Education Applications: Build Environment
+Group: Development/Libraries/KDE
+Requires: libKEduVocDocument5 = %{version}
+
+%description devel
+This package contains all necessary files and libraries needed to
+develop KDE education applications.
+
%if %{with lang}
%lang_package
%endif
@@ -65,17 +86,6 @@
%endif
%fdupes -s %{buildroot}
-%package -n libKEduVocDocument5
-Summary: Library for KDE Education Applications
-Group: System/GUI/KDE
-Recommends: kdeedu-data
-Recommends: %{name}-lang
-Provides: %{name} = %{version}
-
-%description -n libKEduVocDocument5
-This package contains the library which is required by the KDE education
-applications.
-
%post -n libKEduVocDocument5 -p /sbin/ldconfig
%postun -n libKEduVocDocument5 -p /sbin/ldconfig
@@ -84,21 +94,12 @@
%doc README COPYING*
%{_kf5_libdir}/libKEduVocDocument.so.*
-%package devel
-Summary: Library for KDE Education Applications: Build Environment
-Group: Development/Libraries/KDE
-Requires: libKEduVocDocument5 = %{version}
-
-%description devel
-This package contains all necessary files and libraries needed to
-develop KDE education applications.
-
%files devel
%defattr(-,root,root)
%doc README COPYING*
-%{_kf5_prefix}/include/libkeduvocdocument/
-%{_kf5_libdir}/cmake/libkeduvocdocument/
+%{_kf5_cmakedir}/libkeduvocdocument/
%{_kf5_libdir}/libKEduVocDocument.so
+%{_kf5_prefix}/include/libkeduvocdocument/
%if %{with lang}
%files lang -f %{name}.lang
++++++ libkeduvocdocument-17.04.3.tar.xz -> libkeduvocdocument-17.08.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-17.04.3/keduvocdocument/keduvocleitnerbox.h new/libkeduvocdocument-17.08.0/keduvocdocument/keduvocleitnerbox.h
--- old/libkeduvocdocument-17.04.3/keduvocdocument/keduvocleitnerbox.h 2017-03-24 00:34:07.000000000 +0100
+++ new/libkeduvocdocument-17.08.0/keduvocdocument/keduvocleitnerbox.h 2017-06-01 13:30:23.000000000 +0200
@@ -48,12 +48,12 @@
* get a list of all entries in the box
* @return
*/
- QList < KEduVocExpression* > entries(EnumEntriesRecursive recursive = NotRecursive);
+ QList < KEduVocExpression* > entries(EnumEntriesRecursive recursive = NotRecursive) Q_DECL_OVERRIDE;
- KEduVocExpression* entry(int row, EnumEntriesRecursive recursive = NotRecursive);
+ KEduVocExpression* entry(int row, EnumEntriesRecursive recursive = NotRecursive) Q_DECL_OVERRIDE;
/** get the number of entries in the lesson */
- int entryCount(EnumEntriesRecursive recursive = NotRecursive);
+ int entryCount(EnumEntriesRecursive recursive = NotRecursive) Q_DECL_OVERRIDE;
private:
class Private;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-17.04.3/keduvocdocument/keduvoclesson.h new/libkeduvocdocument-17.08.0/keduvocdocument/keduvoclesson.h
--- old/libkeduvocdocument-17.04.3/keduvocdocument/keduvoclesson.h 2017-03-24 00:34:07.000000000 +0100
+++ new/libkeduvocdocument-17.08.0/keduvocdocument/keduvoclesson.h 2017-06-01 13:30:23.000000000 +0200
@@ -49,13 +49,13 @@
/** assignment operator */
KEduVocLesson& operator= ( const KEduVocLesson& );
- KEduVocExpression* entry(int row, EnumEntriesRecursive recursive = NotRecursive);
+ KEduVocExpression* entry(int row, EnumEntriesRecursive recursive = NotRecursive) Q_DECL_OVERRIDE;
/** get a list of all entries in the lesson */
- QList < KEduVocExpression* > entries(EnumEntriesRecursive recursive = NotRecursive);
+ QList < KEduVocExpression* > entries(EnumEntriesRecursive recursive = NotRecursive) Q_DECL_OVERRIDE;
/** get the number of entries in the lesson */
- int entryCount(EnumEntriesRecursive recursive = NotRecursive);
+ int entryCount(EnumEntriesRecursive recursive = NotRecursive) Q_DECL_OVERRIDE;
/** append an entry to the lesson
* @param entryid id of the entry to add
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-17.04.3/keduvocdocument/keduvocwordtype.h new/libkeduvocdocument-17.08.0/keduvocdocument/keduvocwordtype.h
--- old/libkeduvocdocument-17.04.3/keduvocdocument/keduvocwordtype.h 2017-03-24 00:34:07.000000000 +0100
+++ new/libkeduvocdocument-17.08.0/keduvocdocument/keduvocwordtype.h 2017-06-01 13:30:23.000000000 +0200
@@ -75,12 +75,12 @@
* @param recursive include entries in sublessons
* @return
*/
- QList < KEduVocExpression* > entries(EnumEntriesRecursive recursive = NotRecursive);
+ QList < KEduVocExpression* > entries(EnumEntriesRecursive recursive = NotRecursive) Q_DECL_OVERRIDE;
- KEduVocExpression* entry(int row, EnumEntriesRecursive recursive = NotRecursive);
+ KEduVocExpression* entry(int row, EnumEntriesRecursive recursive = NotRecursive) Q_DECL_OVERRIDE;
/** get the number of entries in the lesson */
- int entryCount(EnumEntriesRecursive recursive = NotRecursive);
+ int entryCount(EnumEntriesRecursive recursive = NotRecursive) Q_DECL_OVERRIDE;
private:
class Private;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-17.04.3/keduvocdocument/readerwriters/dummyreader.h new/libkeduvocdocument-17.08.0/keduvocdocument/readerwriters/dummyreader.h
--- old/libkeduvocdocument-17.04.3/keduvocdocument/readerwriters/dummyreader.h 2017-03-24 00:34:07.000000000 +0100
+++ new/libkeduvocdocument-17.08.0/keduvocdocument/readerwriters/dummyreader.h 2017-06-01 13:30:23.000000000 +0200
@@ -69,22 +69,22 @@
and decide if it is a suitable type.
@return true if parsable
*/
- virtual bool isParsable();
+ bool isParsable() Q_DECL_OVERRIDE;
/** @brief returns the KEduVocDocument::FileType that this reader handles
@return KEduVocDocument::FileType handled
*/
- virtual KEduVocDocument::FileType fileTypeHandled();
+ KEduVocDocument::FileType fileTypeHandled() Q_DECL_OVERRIDE;
/** @brief Parse file and write into doc
@param doc to be written
@return error status of the read.*/
- virtual KEduVocDocument::ErrorCode read(KEduVocDocument & doc);
+ KEduVocDocument::ErrorCode read(KEduVocDocument & doc) Q_DECL_OVERRIDE;
/** an error message.
@return the error message
*/
- virtual QString errorMessage() const;
+ QString errorMessage() const Q_DECL_OVERRIDE;
private :
/**
@brief XML tag to identify a dummy file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-17.04.3/keduvocdocument/readerwriters/failedreader.h new/libkeduvocdocument-17.08.0/keduvocdocument/readerwriters/failedreader.h
--- old/libkeduvocdocument-17.04.3/keduvocdocument/readerwriters/failedreader.h 2017-03-24 00:34:07.000000000 +0100
+++ new/libkeduvocdocument-17.08.0/keduvocdocument/readerwriters/failedreader.h 2017-06-01 13:30:23.000000000 +0200
@@ -49,22 +49,22 @@
and decide if it is a suitable type.
@return true if parsable
*/
- virtual bool isParsable();
+ bool isParsable() Q_DECL_OVERRIDE;
/** @brief returns the KEduVocDocument::FileType that this reader handles
@return KEduVocDocument::FileType handled
*/
- virtual KEduVocDocument::FileType fileTypeHandled();
+ KEduVocDocument::FileType fileTypeHandled() Q_DECL_OVERRIDE;
/** @brief Parse file and write into doc
@param doc to be written
@return error status of the read.*/
- virtual KEduVocDocument::ErrorCode read(KEduVocDocument & doc);
+ KEduVocDocument::ErrorCode read(KEduVocDocument & doc) Q_DECL_OVERRIDE;
/** an error message.
@return the error message
*/
- virtual QString errorMessage() const;
+ QString errorMessage() const Q_DECL_OVERRIDE;
private :
KEduVocDocument::ErrorCode m_error; ///< The error code to always return;
QString m_errorMessage; ///< The error message
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-17.04.3/keduvocdocument/readerwriters/keduvoccsvreader.h new/libkeduvocdocument-17.08.0/keduvocdocument/readerwriters/keduvoccsvreader.h
--- old/libkeduvocdocument-17.04.3/keduvocdocument/readerwriters/keduvoccsvreader.h 2017-03-24 00:34:07.000000000 +0100
+++ new/libkeduvocdocument-17.08.0/keduvocdocument/readerwriters/keduvoccsvreader.h 2017-06-01 13:30:23.000000000 +0200
@@ -38,7 +38,7 @@
/** @brief CSV can always parse a file
@return true if parsable
*/
- virtual bool isParsable()
+ bool isParsable() Q_DECL_OVERRIDE
{
return true;
}
@@ -46,17 +46,17 @@
/** @brief returns the KEduVocDocument::FileType that this reader handles
@return KEduVocDocument::FileType handled
*/
- virtual KEduVocDocument::FileType fileTypeHandled();
+ KEduVocDocument::FileType fileTypeHandled() Q_DECL_OVERRIDE;
/** @brief Parse file and write into doc
@param doc to be written
@return error status of the read.*/
- virtual KEduVocDocument::ErrorCode read(KEduVocDocument & doc );
+ KEduVocDocument::ErrorCode read(KEduVocDocument & doc ) Q_DECL_OVERRIDE;
/** an error message.
@return the error message
*/
- virtual QString errorMessage() const
+ QString errorMessage() const Q_DECL_OVERRIDE
{
return m_errorMessage;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-17.04.3/keduvocdocument/readerwriters/keduvockvtml2reader.h new/libkeduvocdocument-17.08.0/keduvocdocument/readerwriters/keduvockvtml2reader.h
--- old/libkeduvocdocument-17.04.3/keduvocdocument/readerwriters/keduvockvtml2reader.h 2017-03-24 00:34:07.000000000 +0100
+++ new/libkeduvocdocument-17.08.0/keduvocdocument/readerwriters/keduvockvtml2reader.h 2017-06-01 13:30:23.000000000 +0200
@@ -51,22 +51,22 @@
and decide if it is a suitable type.
@return true if parsable
*/
- virtual bool isParsable();
+ bool isParsable() Q_DECL_OVERRIDE;
/** @brief returns the KEduVocDocument::FileType that this reader handles
@return KEduVocDocument::FileType handled
*/
- virtual KEduVocDocument::FileType fileTypeHandled();
+ KEduVocDocument::FileType fileTypeHandled() Q_DECL_OVERRIDE;
/** @brief Parse file and write into doc
@param doc to be written
@return error status of the read.*/
- virtual KEduVocDocument::ErrorCode read(KEduVocDocument & doc );
+ KEduVocDocument::ErrorCode read(KEduVocDocument & doc ) Q_DECL_OVERRIDE;
/** an error message.
@return the error message
*/
- virtual QString errorMessage() const
+ QString errorMessage() const Q_DECL_OVERRIDE
{
return m_errorMessage;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-17.04.3/keduvocdocument/readerwriters/keduvocpaukerreader.h new/libkeduvocdocument-17.08.0/keduvocdocument/readerwriters/keduvocpaukerreader.h
--- old/libkeduvocdocument-17.04.3/keduvocdocument/readerwriters/keduvocpaukerreader.h 2017-03-24 00:34:07.000000000 +0100
+++ new/libkeduvocdocument-17.08.0/keduvocdocument/readerwriters/keduvocpaukerreader.h 2017-06-01 13:30:23.000000000 +0200
@@ -42,22 +42,22 @@
and decide if it is a suitable type.
@return true if parsable
*/
- virtual bool isParsable();
+ bool isParsable() Q_DECL_OVERRIDE;
/** @brief returns the KEduVocDocument::FileType that this reader handles
@return KEduVocDocument::FileType handled
*/
- virtual KEduVocDocument::FileType fileTypeHandled();
+ KEduVocDocument::FileType fileTypeHandled() Q_DECL_OVERRIDE;
/** @brief Parse file and write into doc
@param doc to be written
@return error status of the read.*/
- virtual KEduVocDocument::ErrorCode read(KEduVocDocument & doc );
+ KEduVocDocument::ErrorCode read(KEduVocDocument & doc ) Q_DECL_OVERRIDE;
/** an error message.
@return the error message
*/
- virtual QString errorMessage() const;
+ QString errorMessage() const Q_DECL_OVERRIDE;
private:
/** Skip unknown tags*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-17.04.3/keduvocdocument/readerwriters/keduvocvokabelnreader.h new/libkeduvocdocument-17.08.0/keduvocdocument/readerwriters/keduvocvokabelnreader.h
--- old/libkeduvocdocument-17.04.3/keduvocdocument/readerwriters/keduvocvokabelnreader.h 2017-03-24 00:34:07.000000000 +0100
+++ new/libkeduvocdocument-17.08.0/keduvocdocument/readerwriters/keduvocvokabelnreader.h 2017-06-01 13:30:23.000000000 +0200
@@ -43,22 +43,22 @@
and decide if it is a suitable type.
@return true if parsable
*/
- virtual bool isParsable();
+ bool isParsable() Q_DECL_OVERRIDE;
/** @brief returns the KEduVocDocument::FileType that this reader handles
@return KEduVocDocument::FileType handled
*/
- virtual KEduVocDocument::FileType fileTypeHandled();
+ KEduVocDocument::FileType fileTypeHandled() Q_DECL_OVERRIDE;
/** @brief Parse file and write into doc
@param doc to be written
@return error status of the read.*/
- virtual KEduVocDocument::ErrorCode read(KEduVocDocument & doc);
+ KEduVocDocument::ErrorCode read(KEduVocDocument & doc) Q_DECL_OVERRIDE;
/** an error message.
@return the error message
*/
- virtual QString errorMessage() const
+ QString errorMessage() const Q_DECL_OVERRIDE
{
return m_errorMessage;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-17.04.3/keduvocdocument/readerwriters/keduvocwqlreader.h new/libkeduvocdocument-17.08.0/keduvocdocument/readerwriters/keduvocwqlreader.h
--- old/libkeduvocdocument-17.04.3/keduvocdocument/readerwriters/keduvocwqlreader.h 2017-03-24 00:34:07.000000000 +0100
+++ new/libkeduvocdocument-17.08.0/keduvocdocument/readerwriters/keduvocwqlreader.h 2017-06-01 13:30:23.000000000 +0200
@@ -43,22 +43,22 @@
and decide if it is a suitable type.
@return true if parsable
*/
- virtual bool isParsable();
+ bool isParsable() Q_DECL_OVERRIDE;
/** @brief returns the KEduVocDocument::FileType that this reader handles
@return KEduVocDocument::FileType handled
*/
- virtual KEduVocDocument::FileType fileTypeHandled();
+ KEduVocDocument::FileType fileTypeHandled() Q_DECL_OVERRIDE;
/** @brief Parse file and write into doc
@param doc to be written
@return error status of the read.*/
- virtual KEduVocDocument::ErrorCode read(KEduVocDocument & doc );
+ KEduVocDocument::ErrorCode read(KEduVocDocument & doc ) Q_DECL_OVERRIDE;
/** an error message.
@return the error message
*/
- virtual QString errorMessage() const
+ QString errorMessage() const Q_DECL_OVERRIDE
{
return m_errorMessage;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-17.04.3/keduvocdocument/readerwriters/keduvocxdxfreader.h new/libkeduvocdocument-17.08.0/keduvocdocument/readerwriters/keduvocxdxfreader.h
--- old/libkeduvocdocument-17.04.3/keduvocdocument/readerwriters/keduvocxdxfreader.h 2017-03-24 00:34:07.000000000 +0100
+++ new/libkeduvocdocument-17.08.0/keduvocdocument/readerwriters/keduvocxdxfreader.h 2017-06-01 13:30:23.000000000 +0200
@@ -42,22 +42,22 @@
and decide if it is a suitable type.
@return true if parsable
*/
- virtual bool isParsable();
+ bool isParsable() Q_DECL_OVERRIDE;
/** @brief returns the KEduVocDocument::FileType that this reader handles
@return KEduVocDocument::FileType handled
*/
- virtual KEduVocDocument::FileType fileTypeHandled();
+ KEduVocDocument::FileType fileTypeHandled() Q_DECL_OVERRIDE;
/** @brief Parse file and write into doc
@param doc to be written
@return error status of the read.*/
- virtual KEduVocDocument::ErrorCode read(KEduVocDocument & doc);
+ KEduVocDocument::ErrorCode read(KEduVocDocument & doc) Q_DECL_OVERRIDE;
/** an error message.
@return the error message
*/
- virtual QString errorMessage() const;
+ QString errorMessage() const Q_DECL_OVERRIDE;
private:
/** Skip unknown tags */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-17.04.3/po/bg/libkeduvocdocument.po new/libkeduvocdocument-17.08.0/po/bg/libkeduvocdocument.po
--- old/libkeduvocdocument-17.04.3/po/bg/libkeduvocdocument.po 2017-07-11 02:17:22.000000000 +0200
+++ new/libkeduvocdocument-17.08.0/po/bg/libkeduvocdocument.po 2017-08-11 02:29:58.000000000 +0200
@@ -1,8 +1,5 @@
-# translation of libkdeedu.po to Bulgarian
-# Bulgarian translation of KDE.
-# This file is licensed under the GPL.
-#
-# $Id:$
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
#
# Zlatko Popov <zlatkopopov(a)fsa-bg.org>, 2007.
# Yasen Pramatarov <yasen(a)lindeas.com>, 2009, 2011.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-17.04.3/po/gl/libkeduvocdocument.po new/libkeduvocdocument-17.08.0/po/gl/libkeduvocdocument.po
--- old/libkeduvocdocument-17.04.3/po/gl/libkeduvocdocument.po 2017-07-11 02:17:22.000000000 +0200
+++ new/libkeduvocdocument-17.08.0/po/gl/libkeduvocdocument.po 2017-08-11 02:29:58.000000000 +0200
@@ -57,7 +57,7 @@
#: keduvocdocument/keduvocdocument.cpp:189
#, kde-format
msgid "Cannot lock file %1"
-msgstr "Non é posíbel bloquear o ficheiro «%1»."
+msgstr "Non é posíbel bloquear o ficheiro %1."
#: keduvocdocument/keduvocdocument.cpp:242
#, kde-format
@@ -67,7 +67,7 @@
#: keduvocdocument/keduvocdocument.cpp:250
#, kde-format
msgid "Cannot open tempfile %1"
-msgstr "Non é posíbel abrir o ficheiro temporal «%1»."
+msgstr "Non é posíbel abrir o ficheiro temporal %1."
#: keduvocdocument/keduvocdocument.cpp:255
#, kde-format
@@ -137,7 +137,7 @@
#: keduvocdocument/keduvocdocument.cpp:871
#, kde-format
msgid "All supported documents"
-msgstr "Todos os documentos soportados"
+msgstr "Todos os documentos permitidos"
#: keduvocdocument/keduvocdocument.cpp:880
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-17.04.3/po/he/libkeduvocdocument.po new/libkeduvocdocument-17.08.0/po/he/libkeduvocdocument.po
--- old/libkeduvocdocument-17.04.3/po/he/libkeduvocdocument.po 2017-07-11 02:17:22.000000000 +0200
+++ new/libkeduvocdocument-17.08.0/po/he/libkeduvocdocument.po 2017-08-11 02:29:58.000000000 +0200
@@ -492,63 +492,3 @@
#, kde-format
msgid "Level 7"
msgstr ""
-
-#, fuzzy
-#~ msgid "&Search:"
-#~ msgstr "חפש"
-
-#, fuzzy
-#~ msgctxt "NAME OF TRANSLATORS"
-#~ msgid "Your names"
-#~ msgstr "צוות התרגום של KDE ישראל"
-
-#, fuzzy
-#~ msgctxt "usage label - context in which a word is used"
-#~ msgid "proper name"
-#~ msgstr "צוות התרגום של KDE ישראל"
-
-#, fuzzy
-#~ msgid "March"
-#~ msgstr "חפש"
-
-#~ msgid "Week %1"
-#~ msgstr "שבוע %1"
-
-#~ msgid "Next year"
-#~ msgstr "השנה הבאה"
-
-#~ msgid "Previous year"
-#~ msgstr "השנה שעברה"
-
-#~ msgid "Next month"
-#~ msgstr "החודש הבא"
-
-#~ msgid "Previous month"
-#~ msgstr "החודש הקודם"
-
-#~ msgid "Select a week"
-#~ msgstr "בחר שבוע"
-
-#~ msgid "Select a month"
-#~ msgstr "בחר חודש"
-
-#~ msgid "Select a year"
-#~ msgstr "בחר שנה"
-
-#~ msgid "Select the current day"
-#~ msgstr "בחר יום"
-
-#~ msgid "(c) 2004, Jason Harris"
-#~ msgstr "(c) 2004, Jason Harris"
-
-#, fuzzy
-#~ msgid "Jason Harris"
-#~ msgstr "(c) 2004, Jason Harris"
-
-#, fuzzy
-#~ msgid "(c) 2005, Jason Harris"
-#~ msgstr "(c) 2004, Jason Harris"
-
-#, fuzzy
-#~ msgid "(c) 2006, Jason Harris"
-#~ msgstr "(c) 2004, Jason Harris"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-17.04.3/po/tr/libkeduvocdocument.po new/libkeduvocdocument-17.08.0/po/tr/libkeduvocdocument.po
--- old/libkeduvocdocument-17.04.3/po/tr/libkeduvocdocument.po 2017-07-11 02:17:23.000000000 +0200
+++ new/libkeduvocdocument-17.08.0/po/tr/libkeduvocdocument.po 2017-08-11 02:29:58.000000000 +0200
@@ -960,8 +960,8 @@
#~ "Boron means 'Bor(ax) + (carb)on'. It is found in borax and behaves a lot "
#~ "like carbon"
#~ msgstr ""
-#~ "Bor, 'Bor(ax) + (karb)on' kelimelerinden türetilmiştir. Boraksta bulunur ve "
-#~ "karbona çok benzer davranış gösterir"
+#~ "Bor, 'Bor(ax) + (karb)on' kelimelerinden türetilmiştir. Boraksta bulunur "
+#~ "ve karbona çok benzer davranış gösterir"
#~ msgid "Latin 'carboneum' for carbon"
#~ msgstr "Karbon için Latince 'carboneum'"
@@ -1025,7 +1025,8 @@
#~ "named 'magnesia nigra', or for short, Manganese."
#~ msgstr ""
#~ "Bu element, kara toprak içinde Magnesia isimli bir kasaba civarında "
-#~ "bulunmuştur. 'Magnesia karası' veya kısaca Mangan olarak isimlendirilmiştir."
+#~ "bulunmuştur. 'Magnesia karası' veya kısaca Mangan olarak "
+#~ "isimlendirilmiştir."
#~ msgid "Latin 'ferrum'"
#~ msgstr "Latince 'ferrum'"
@@ -1040,7 +1041,8 @@
#~ msgstr "Selvi ağacından esinlenerek 'cuprum' ismi verilmiştir"
#~ msgid "German 'zinking' for 'rough', because zinc ore is very rough"
-#~ msgstr "Almanca'da 'zinking' ('sert') anlamında, çünkü çinko madeni çok serttir"
+#~ msgstr ""
+#~ "Almanca'da 'zinking' ('sert') anlamında, çünkü çinko madeni çok serttir"
#~ msgid "'Gallia' is an old name for France"
#~ msgstr "'Gallia' Fransa'nın eski bir adı"
@@ -1115,7 +1117,8 @@
#~ msgstr "Arapça'da 'anthos ammonos' (Ammon tanrısının çiçek açması)"
#~ msgid "Latin 'tellus' or 'telluris' for 'Planet Earth'"
-#~ msgstr "Latince'de 'tellus' veya 'telluris', 'Dünya Gezegeni' anlamına gelir"
+#~ msgstr ""
+#~ "Latince'de 'tellus' veya 'telluris', 'Dünya Gezegeni' anlamına gelir"
#~ msgid "Greek 'ioeides' for 'violet'."
#~ msgstr "Yunanca'da 'menekşe' anlamında 'ioeides'"
@@ -1149,8 +1152,8 @@
#~ "Named after the Greek Prometheus. Prometheus stole the fire from the gods "
#~ "and gave it to mankind."
#~ msgstr ""
-#~ "Yunanca'daki Promotheus kelimesinden gelmektedir. Mitolojiye göre Prometheus "
-#~ "tanrılardan ateşi çalmış ve insanlığa bağışlamıştır."
+#~ "Yunanca'daki Promotheus kelimesinden gelmektedir. Mitolojiye göre "
+#~ "Prometheus tanrılardan ateşi çalmış ve insanlığa bağışlamıştır."
#~ msgid "Named after the mineral Samarskit"
#~ msgstr "Samarskit isimli minerale atfen"
@@ -1174,8 +1177,8 @@
#~ "Named ofter the Swedish town of Ytterby. Terbium and Ytterbium are also "
#~ "named after this town."
#~ msgstr ""
-#~ "İsveç'teki Ytterby kasabasından ismini almıştır. Terbiyum ve İterbiyum da bu "
-#~ "kasabadan isimlerini almıştır."
+#~ "İsveç'teki Ytterby kasabasından ismini almıştır. Terbiyum ve İterbiyum da "
+#~ "bu kasabadan isimlerini almıştır."
#~ msgid "Named after the old name of Scandinavia, 'Thule'."
#~ msgstr "İskandinavya'nın eski adı olan 'Thule'den bu ismi almıştır."
@@ -1184,8 +1187,8 @@
#~ "Like Terbium and Gadolinium, this is named after the Swedish town of "
#~ "Ytterby."
#~ msgstr ""
-#~ "Terbiyum ve Gadolinyum gibi, İsveç'teki Ytterby kasabasından dolayı bu ismi "
-#~ "almıştır."
+#~ "Terbiyum ve Gadolinyum gibi, İsveç'teki Ytterby kasabasından dolayı bu "
+#~ "ismi almıştır."
#~ msgid "Named after the Roman name 'Lutetia' for Paris"
#~ msgstr "Paris için Roma'lıların koyduğu 'Lutetia' isminden"
@@ -1234,7 +1237,8 @@
#~ msgstr "Latince'de kurşun için 'plumbum'"
#~ msgid "The old name of Bismuth is 'Wismut', which stood for 'white mass'."
-#~ msgstr "Bizmutun eski ismi 'Wismut' olup 'beyaz kütle' anlamına gelmektedir."
+#~ msgstr ""
+#~ "Bizmutun eski ismi 'Wismut' olup 'beyaz kütle' anlamına gelmektedir."
#~ msgid "Named after Poland to honor Marie Curie"
#~ msgstr "Marie Curie'nin anısına Polonya'dan türetilmiştir"
@@ -1253,7 +1257,8 @@
#~ msgid "Latin 'radius' for 'beam', as it is radioactive"
#~ msgstr ""
-#~ "'Işın' anlamına gelen, Latince 'radius'tan türetilmiştir, çünkü radyoaktiftir"
+#~ "'Işın' anlamına gelen, Latince 'radius'tan türetilmiştir, çünkü "
+#~ "radyoaktiftir"
#~ msgid "Greek 'aktis' for 'beam' - actinium is radioactive"
#~ msgstr ""
@@ -1292,7 +1297,8 @@
#~ msgid "Named after the US-State of California."
#~ msgstr ""
-#~ "Amerika Birleşik Devletleri'ndeki Kaliforniya eyaletinden bu ismi almıştır."
+#~ "Amerika Birleşik Devletleri'ndeki Kaliforniya eyaletinden bu ismi "
+#~ "almıştır."
#~ msgid "Named after the scientist Albert Einstein."
#~ msgstr "Bilim adamı Albert Einstein'den bu ismi almıştır."
@@ -1307,7 +1313,8 @@
#~ msgstr "Bilimadamı Alfred Nobel'den sonra isimlendirildi."
#~ msgid "Named after the scientist Ernest Orlando Lawrence."
-#~ msgstr "Ernest Orlando Lawrence isimli bilim adamının anısına ithaf edilmiştir."
+#~ msgstr ""
+#~ "Ernest Orlando Lawrence isimli bilim adamının anısına ithaf edilmiştir."
#~ msgid "Named after the scientist Ernest Rutherford"
#~ msgstr "Bilimadamı Ernest Rutherford'tan sonra isimlendirildi."
@@ -1345,15 +1352,15 @@
#~ "Historically known as eka-mercury. Ununbium is a temporary IUPAC "
#~ "systematic element name."
#~ msgstr ""
-#~ "Tarihte eka-civa olarak bilinir. Ununbiyum, geçici olarak IUPAC tarafından "
-#~ "konan sistematik element ismidir."
+#~ "Tarihte eka-civa olarak bilinir. Ununbiyum, geçici olarak IUPAC "
+#~ "tarafından konan sistematik element ismidir."
#~ msgid ""
#~ "Historically known as eka-thallium. Ununtrium is a temporary IUPAC "
#~ "systematic element name."
#~ msgstr ""
-#~ "Tarihte eka-talyum olarak bilinir. Ununtriyum, IUPAC tarafından konan geçici "
-#~ "sistematik element ismidir."
+#~ "Tarihte eka-talyum olarak bilinir. Ununtriyum, IUPAC tarafından konan "
+#~ "geçici sistematik element ismidir."
#~ msgid ""
#~ "Historically known as eka-lead. Ununquadium is a temporary IUPAC "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-17.04.3/po/zh_CN/libkeduvocdocument.po new/libkeduvocdocument-17.08.0/po/zh_CN/libkeduvocdocument.po
--- old/libkeduvocdocument-17.04.3/po/zh_CN/libkeduvocdocument.po 2017-07-11 02:17:23.000000000 +0200
+++ new/libkeduvocdocument-17.08.0/po/zh_CN/libkeduvocdocument.po 2017-08-11 02:29:58.000000000 +0200
@@ -1,25 +1,20 @@
-# translation of libkdeedu.po to 简体中文
-# translation of libkdeedu.po to
-# Copyright (C) 2007, 2009 Free Software Foundation, Inc.
-#
-# Ni Hui <shuizhuyuanluo(a)126.com>, 2007, 2009.
-# yuanjiayj <yuanjiayj(a)gmail.com>, 2007.
-# Lie Ex <shuizhuyuanluo(a)126.com>, 2007-2010.
-# Weng Xuetian <wengxt(a)gmail.com>, 2015.
msgid ""
msgstr ""
-"Project-Id-Version: libkdeedu\n"
+"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2016-11-19 20:14+0100\n"
-"PO-Revision-Date: 2015-03-12 14:23-0700\n"
-"Last-Translator: Weng Xuetian <wengxt(a)gmail.com>\n"
-"Language-Team: Chinese Simplified <kde-china(a)kde.org>\n"
+"PO-Revision-Date: 2017-08-05 09:36-0400\n"
+"Last-Translator: guoyunhebrave <guoyunhebrave(a)gmail.com>\n"
+"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: crowdin.com\n"
+"X-Crowdin-Project: kdeorg\n"
+"X-Crowdin-Language: zh-CN\n"
+"X-Crowdin-File: /kf5-stable/messages/kdeedu/libkeduvocdocument.pot\n"
#: keduvocdocument/keduvoccsvwriter.cpp:47
#, kde-format
@@ -67,10 +62,9 @@
msgstr "无法打开临时文件 %1"
#: keduvocdocument/keduvocdocument.cpp:255
-#, fuzzy, kde-format
-#| msgid "Cannot download %1"
+#, kde-format
msgid "Cannot download %1: %2"
-msgstr "无法下载 %1"
+msgstr ""
#: keduvocdocument/keduvocdocument.cpp:281
#, kde-format
@@ -499,874 +493,3 @@
#, kde-format
msgid "Level 7"
msgstr "等级 7"
-
-#~ msgid "Untitled"
-#~ msgstr "无标题"
-
-#~ msgid "Vocabulary"
-#~ msgstr "词汇"
-
-#~ msgid ""
-#~ "Parse error at line %1, column %2:\n"
-#~ "%3"
-#~ msgstr ""
-#~ "在行 %1,列 %2 中有语法错误:\n"
-#~ "%3"
-
-#~ msgid "Error Opening File"
-#~ msgstr "打开文件出错"
-
-#~ msgid "file must be opened first"
-#~ msgstr "必须先打开文件"
-
-#~ msgid "This is not a KDE Vocabulary document."
-#~ msgstr "这不是一个 KDE 的词汇文档。"
-
-#~ msgid "missing identifier elements from identifiers tag"
-#~ msgstr "在标识符标签中缺失标识符元素"
-
-#~ msgid "Default Lesson"
-#~ msgstr "默认课程"
-
-#~ msgid "identifier missing id"
-#~ msgstr "标识符缺少 id"
-
-#~ msgid "entry missing id"
-#~ msgstr "条目缺少 id"
-
-#~ msgctxt "A generic name for a new lesson and its number."
-#~ msgid "Lesson %1"
-#~ msgstr "课程 %1"
-
-#~ msgid "Data for original language missing"
-#~ msgstr "原始语言缺失的数据"
-
-#~ msgid "Ambiguous definition of language code"
-#~ msgstr "语言代码的模糊定义"
-
-#~ msgid "This is not a Pauker document"
-#~ msgstr "这不是一个 Pauker 文档"
-
-#~ msgid "Lesson %1"
-#~ msgstr "课程 %1"
-
-#~ msgid "This does not appear to be a (K)WordQuiz file"
-#~ msgstr "这似乎不是一个 (K)WordQuiz 文档"
-
-#~ msgid "Only files created by WordQuiz 5.x or later can be opened"
-#~ msgstr "只能打开由 WordQuiz 5.x 或更新版本创建的文件"
-
-#~ msgid "Error while reading file"
-#~ msgstr "读取文件时出错"
-
-#~ msgid "This is not a XDXF document"
-#~ msgstr "这不是一个 XDXF 文档"
-
-#~ msgid "Glossary"
-#~ msgstr "专业词典"
-
-#~ msgid "&Search:"
-#~ msgstr "搜索(&S):"
-
-#~ msgid "References"
-#~ msgstr "参考"
-
-#~ msgid "Go to '%1'"
-#~ msgstr "前往“%1”"
-
-#~ msgid "Classic Periodic Table"
-#~ msgstr "传统周期表"
-
-#~ msgid "Long Periodic Table"
-#~ msgstr "长周期表"
-
-#~ msgid "Short Periodic Table"
-#~ msgstr "短周期表"
-
-#~ msgid "Transition Elements"
-#~ msgstr "翻译元素"
-
-#~ msgid "DZ Periodic Table"
-#~ msgstr "DZ 周期表"
-
-#~ msgid "Dummy"
-#~ msgstr "虚假"
-
-#~ msgid "Hydrogen"
-#~ msgstr "氢"
-
-#~ msgid "Helium"
-#~ msgstr "氦"
-
-#~ msgid "Lithium"
-#~ msgstr "锂"
-
-#~ msgid "Beryllium"
-#~ msgstr "铍"
-
-#~ msgid "Boron"
-#~ msgstr "硼"
-
-#~ msgid "Carbon"
-#~ msgstr "碳"
-
-#~ msgid "Nitrogen"
-#~ msgstr "氮"
-
-#~ msgid "Oxygen"
-#~ msgstr "氧"
-
-#~ msgid "Fluorine"
-#~ msgstr "氟"
-
-#~ msgid "Neon"
-#~ msgstr "氖"
-
-#~ msgid "Sodium"
-#~ msgstr "钠"
-
-#~ msgid "Magnesium"
-#~ msgstr "镁"
-
-#~ msgid "Aluminium"
-#~ msgstr "铝"
-
-#~ msgid "Silicon"
-#~ msgstr "硅"
-
-#~ msgid "Phosphorus"
-#~ msgstr "磷"
-
-#~ msgid "Sulfur"
-#~ msgstr "硫"
-
-#~ msgid "Chlorine"
-#~ msgstr "氯"
-
-#~ msgid "Argon"
-#~ msgstr "氩"
-
-#~ msgid "Potassium"
-#~ msgstr "钾"
-
-#~ msgid "Calcium"
-#~ msgstr "钙"
-
-#~ msgid "Scandium"
-#~ msgstr "钪"
-
-#~ msgid "Titanium"
-#~ msgstr "钛"
-
-#~ msgid "Vanadium"
-#~ msgstr "钒"
-
-#~ msgid "Chromium"
-#~ msgstr "铬"
-
-#~ msgid "Manganese"
-#~ msgstr "锰"
-
-#~ msgid "Iron"
-#~ msgstr "铁"
-
-#~ msgid "Cobalt"
-#~ msgstr "钴"
-
-#~ msgid "Nickel"
-#~ msgstr "镍"
-
-#~ msgid "Copper"
-#~ msgstr "铜"
-
-#~ msgid "Zinc"
-#~ msgstr "锌"
-
-#~ msgid "Gallium"
-#~ msgstr "镓"
-
-#~ msgid "Germanium"
-#~ msgstr "锗"
-
-#~ msgid "Arsenic"
-#~ msgstr "砷"
-
-#~ msgid "Selenium"
-#~ msgstr "硒"
-
-#~ msgid "Bromine"
-#~ msgstr "溴"
-
-#~ msgid "Krypton"
-#~ msgstr "氪"
-
-#~ msgid "Rubidium"
-#~ msgstr "铷"
-
-#~ msgid "Strontium"
-#~ msgstr "锶"
-
-#~ msgid "Yttrium"
-#~ msgstr "钇"
-
-#~ msgid "Zirconium"
-#~ msgstr "锆"
-
-#~ msgid "Niobium"
-#~ msgstr "铌"
-
-#~ msgid "Molybdenum"
-#~ msgstr "钼"
-
-#~ msgid "Technetium"
-#~ msgstr "锝"
-
-#~ msgid "Ruthenium"
-#~ msgstr "钌"
-
-#~ msgid "Rhodium"
-#~ msgstr "铑"
-
-#~ msgid "Palladium"
-#~ msgstr "钯"
-
-#~ msgid "Silver"
-#~ msgstr "银"
-
-#~ msgid "Cadmium"
-#~ msgstr "镉"
-
-#~ msgid "Indium"
-#~ msgstr "铟"
-
-#~ msgid "Tin"
-#~ msgstr "锡"
-
-#~ msgid "Antimony"
-#~ msgstr "锑"
-
-#~ msgid "Tellurium"
-#~ msgstr "碲"
-
-#~ msgid "Iodine"
-#~ msgstr "碘"
-
-#~ msgid "Xenon"
-#~ msgstr "氙"
-
-#~ msgid "Caesium"
-#~ msgstr "铯"
-
-#~ msgid "Barium"
-#~ msgstr "钡"
-
-#~ msgid "Lanthanum"
-#~ msgstr "镧"
-
-#~ msgid "Cerium"
-#~ msgstr "铈"
-
-#~ msgid "Praseodymium"
-#~ msgstr "镨"
-
-#~ msgid "Neodymium"
-#~ msgstr "钕"
-
-#~ msgid "Promethium"
-#~ msgstr "钷"
-
-#~ msgid "Samarium"
-#~ msgstr "钐"
-
-#~ msgid "Europium"
-#~ msgstr "铕"
-
-#~ msgid "Gadolinium"
-#~ msgstr "钆"
-
-#~ msgid "Terbium"
-#~ msgstr "铽"
-
-#~ msgid "Dysprosium"
-#~ msgstr "镝"
-
-#~ msgid "Holmium"
-#~ msgstr "钬"
-
-#~ msgid "Erbium"
-#~ msgstr "铒"
-
-#~ msgid "Thulium"
-#~ msgstr "铥"
-
-#~ msgid "Ytterbium"
-#~ msgstr "镱"
-
-#~ msgid "Lutetium"
-#~ msgstr "镥"
-
-#~ msgid "Hafnium"
-#~ msgstr "铪"
-
-#~ msgid "Tantalum"
-#~ msgstr "钽"
-
-#~ msgid "Tungsten"
-#~ msgstr "钨"
-
-#~ msgid "Rhenium"
-#~ msgstr "铼"
-
-#~ msgid "Osmium"
-#~ msgstr "锇"
-
-#~ msgid "Iridium"
-#~ msgstr "铱"
-
-#~ msgid "Platinum"
-#~ msgstr "铂"
-
-#~ msgid "Gold"
-#~ msgstr "金"
-
-#~ msgid "Mercury"
-#~ msgstr "汞"
-
-#~ msgid "Thallium"
-#~ msgstr "铊"
-
-#~ msgid "Lead"
-#~ msgstr "铅"
-
-#~ msgid "Bismuth"
-#~ msgstr "铋"
-
-#~ msgid "Polonium"
-#~ msgstr "钋"
-
-#~ msgid "Astatine"
-#~ msgstr "砹"
-
-#~ msgid "Radon"
-#~ msgstr "氡"
-
-#~ msgid "Francium"
-#~ msgstr "钫"
-
-#~ msgid "Radium"
-#~ msgstr "镭"
-
-#~ msgid "Actinium"
-#~ msgstr "锕"
-
-#~ msgid "Thorium"
-#~ msgstr "钍"
-
-#~ msgid "Protactinium"
-#~ msgstr "镤"
-
-#~ msgid "Uranium"
-#~ msgstr "铀"
-
-#~ msgid "Neptunium"
-#~ msgstr "镎"
-
-#~ msgid "Plutonium"
-#~ msgstr "钚"
-
-#~ msgid "Americium"
-#~ msgstr "镅"
-
-#~ msgid "Curium"
-#~ msgstr "锔"
-
-#~ msgid "Berkelium"
-#~ msgstr "锫"
-
-#~ msgid "Californium"
-#~ msgstr "锎"
-
-#~ msgid "Einsteinium"
-#~ msgstr "锿"
-
-#~ msgid "Fermium"
-#~ msgstr "镄"
-
-#~ msgid "Mendelevium"
-#~ msgstr "钔"
-
-#~ msgid "Nobelium"
-#~ msgstr "锘"
-
-#~ msgid "Lawrencium"
-#~ msgstr "铹"
-
-#~ msgid "Rutherfordium"
-#~ msgstr "钅卢"
-
-#~ msgid "Dubnium"
-#~ msgstr "钅杜"
-
-#~ msgid "Seaborgium"
-#~ msgstr "钅西"
-
-#~ msgid "Bohrium"
-#~ msgstr "钹"
-
-#~ msgid "Hassium"
-#~ msgstr "钅罕"
-
-#~ msgid "Meitnerium"
-#~ msgstr "钅迈"
-
-#~ msgid "Darmstadtium"
-#~ msgstr "钐"
-
-#~ msgid "Roentgenium"
-#~ msgstr "钌"
-
-#~ msgid "Copernicium"
-#~ msgstr "鎶"
-
-#~ msgid "Ununtrium"
-#~ msgstr "Uut"
-
-#~ msgid "Ununquadium"
-#~ msgstr "Uuq"
-
-#~ msgid "Ununpentium"
-#~ msgstr "Uup"
-
-#~ msgid "Ununhexium"
-#~ msgstr "Uuh"
-
-#~ msgid "Ununseptium"
-#~ msgstr "Uus"
-
-#~ msgid "Ununoctium"
-#~ msgstr "Uuo"
-
-#~ msgid "Greek 'hydro' and 'gennao' for 'forms water'"
-#~ msgstr "希腊语中“hydro”和“gennao”表示“组成水”"
-
-#~ msgid "The Greek word for the sun was 'helios'"
-#~ msgstr "希腊语中的“helios”表示太阳"
-
-#~ msgid "Greek 'lithos' means 'stone'"
-#~ msgstr "希腊语中的“lithos”意思是宝石"
-
-#~ msgid "Greek 'beryllos' for 'light-green stone'"
-#~ msgstr "希腊语中“beryllos”表示“淡绿色的宝石”"
-
-#~ msgid ""
-#~ "Boron means 'Bor(ax) + (carb)on'. It is found in borax and behaves a lot "
-#~ "like carbon"
-#~ msgstr ""
-#~ "硼 Boron 意思是“Bor(ax) + (carb)on”。它是在硼砂 (borax) 发现的,性质很像碳"
-
-#~ msgid "Latin 'carboneum' for carbon"
-#~ msgstr "拉丁文以“carboneum”表示碳"
-
-#~ msgid "Latin 'nitrogenium' ('forms saltpeter')"
-#~ msgstr "拉丁文的“nitrogenium”(“硝石主要成分”)"
-
-#~ msgid "Latin 'oxygenium' (forms acids)"
-#~ msgstr "拉丁文“oxygenium”(酸中含有氧)"
-
-#~ msgid "Latin 'fluere' ('floats')"
-#~ msgstr "拉丁文“fluere”(“漂浮物”)"
-
-#~ msgid "Greek 'neo'. meaning 'new'"
-#~ msgstr "希腊文“neo”。意思是“新的”"
-
-#~ msgid "Arabic 'natrun' for 'soda'"
-#~ msgstr "阿拉伯语“natrun”指“苏打”"
-
-#~ msgid "Named after the city of Magnesia"
-#~ msgstr "以 Magnesia 城名命名"
-
-#~ msgid "Latin 'alumen'"
-#~ msgstr "拉丁文“alumen”,意即明矾"
-
-#~ msgid "Latin 'silex'"
-#~ msgstr "拉丁文“silex”,意即硅石"
-
-#~ msgid "Greek 'phosphoros' for 'carries light'"
-#~ msgstr "希腊语“phosphoros”,意思是“发光”"
-
-#~ msgid "In sanskrit 'sweb' means 'to sleep'"
-#~ msgstr "在梵语中“sweb”表示“去睡觉”"
-
-#~ msgid "Greek 'chloros' for 'yellow-green'"
-#~ msgstr "希腊语中“chloros”表示“黄绿色”,这是氯气的颜色"
-
-#~ msgid "Greek 'aergon' for 'inactive'"
-#~ msgstr "希腊语中“aergon”意思是“不活泼的”"
-
-#~ msgid "Arabic 'al qaliy' for potash"
-#~ msgstr "阿拉伯语中“al qaliy”表示草碱,主要成分是碳酸钾"
-
-#~ msgid "Latin 'calx' for 'lime'"
-#~ msgstr "拉丁语中“calx”表示“石灰”"
-
-#~ msgid "Named because it was found in Scandinavia"
-#~ msgstr "以发现地 Scandinavia 命名"
-
-#~ msgid "The Titans were giants in Greek mythology"
-#~ msgstr "希腊神话中 Titan 是巨人一族"
-
-#~ msgid "'Vanadis' is another name for the Nordic goddess Freyja"
-#~ msgstr "“Vanadis”是北欧女神 Freyia 的另一个名字"
-
-#~ msgid "Greek 'chroma' means 'color'"
-#~ msgstr "希腊语中的“chroma”表示“颜色”"
-
-#~ msgid ""
-#~ "It was discovered near a town named Magnesia in black earth. Thus, it was "
-#~ "named 'magnesia nigra', or for short, Manganese."
-#~ msgstr ""
-#~ "它从一个小镇 Magnesia 的黑钙土中得到。因为这个它被命名为“magnesia nigra”。"
-#~ "简称:Manganese。"
-
-#~ msgid "Latin 'ferrum'"
-#~ msgstr "拉丁语“ferrum”,铁的意思"
-
-#~ msgid "Named after the German word 'Kobold' for 'goblin'"
-#~ msgstr "以德语中“kobold”命名,意思是小妖精"
-
-#~ msgid "'Nickel' was the name of a mountain goblin"
-#~ msgstr "“Nickel”是一座妖精山的名字"
-
-#~ msgid "Greek 'cuprum' for Cypres"
-#~ msgstr "希腊语,Cuprum 塞浦路斯古称 (铜产地)"
-
-#~ msgid "German 'zinking' for 'rough', because zinc ore is very rough"
-#~ msgstr "德语“zinking”是粗糙的意思。因为锌矿石是很粗糙的"
-
-#~ msgid "'Gallia' is an old name for France"
-#~ msgstr "“Gallia”即高卢,是法国的旧名"
-
-#~ msgid "Latin 'germania' is an old name for Germany"
-#~ msgstr "拉丁语“germania”是德国的旧名"
-
-#~ msgid "Greek 'arsenikos' for 'male' or 'bold'"
-#~ msgstr "希腊语“arsenikos”是“雄性”或“大胆”的意思"
-
-#~ msgid "Greek 'selena' for 'moon'"
-#~ msgstr "希腊语“selena”是“月亮”的意思"
-
-#~ msgid "Greek 'bromos' for 'smells badly'"
-#~ msgstr "希腊语“bromos”是“难闻”的意思"
-
-#~ msgid "Greek 'kryptos' for 'hidden'"
-#~ msgstr "希腊语“kryptos”是“隐藏”的意思"
-
-#~ msgid "Latin 'rubidus' for 'dark red'"
-#~ msgstr "拉丁语“rubidus”表示“暗红”"
-
-#~ msgid "Named after the mineral Strontianit"
-#~ msgstr "以锶的发现地 Strontianit 命名"
-
-#~ msgid ""
-#~ "Named after the small town of Ytterby near Stockholm in Sweden. Terbium. "
-#~ "Ytterbium and Gadolinium are also named after this town."
-#~ msgstr "以瑞典斯德哥尔摩附近的小镇 Ytterby 命名。铽,镱和钆都以此小镇命名。"
-
-#~ msgid "Named after the mineral zircon"
-#~ msgstr "以锆矿石“zircon”命名"
-
-#~ msgid "Named after Niobe, the daughter of the Greek god Tantalus."
-#~ msgstr "以希腊神话中的神祗坦塔罗斯的女儿 Niobe 命名。"
-
-#~ msgid ""
-#~ "This name has Greek roots. It means 'like Platinum' - it was difficult to "
-#~ "distinguish Molybdenum from Platinum."
-#~ msgstr "钼的名字表示“像白金”,很难区分铂和钼"
-
-#~ msgid "Greek 'technetos' for artificial"
-#~ msgstr "希腊语“technetos”意即“人造的”"
-
-#~ msgid "Ruthenia is the old name of Russia"
-#~ msgstr "“Ruthenia”,即罗刹,是俄罗斯的旧名"
-
-#~ msgid "Greek 'rhodeos' means 'red like a rose'"
-#~ msgstr "希腊语“thodeos”意思是“红得像玫瑰花”"
-
-#~ msgid "Named after the asteroid Pallas"
-#~ msgstr "以小行星“Pallas”命名"
-
-#~ msgid "Latin 'argentum' for silver"
-#~ msgstr "拉丁文“argentum”,银的意思"
-
-#~ msgid "Greek 'kadmia' ('Galmei' = Zinc carbonate)"
-#~ msgstr "希腊语“kadmia”,意思是碳酸锌"
-
-#~ msgid "Named after 'Indigo' because of its blue spectrum"
-#~ msgstr "以“Indigo”(靛青)命名,因为它是蓝色的"
-
-#~ msgid "Latin 'stannum' for tin"
-#~ msgstr "拉丁文以“stannum”表示锡"
-
-#~ msgid "Arabic 'anthos ammonos' for 'blossom of the god Ammon'"
-#~ msgstr "阿拉伯语“anthos ammonos”,意思是“太阳神之花”"
-
-#~ msgid "Latin 'tellus' or 'telluris' for 'Planet Earth'"
-#~ msgstr "拉丁文“tellus”或“telluris”,指地球"
-
-#~ msgid "Greek 'ioeides' for 'violet'."
-#~ msgstr "希腊语“ioeides”表示“紫罗兰”。"
-
-#~ msgid "Greek 'xenos' for 'foreigner'"
-#~ msgstr "希腊语“xenos”是“外国人”的意思"
-
-#~ msgid "Latin 'caesius' for 'heaven blue'."
-#~ msgstr "拉丁文“caesius”表示“天蓝色”。"
-
-#~ msgid "Greek 'barys' for 'heavy'"
-#~ msgstr "希腊语“barys”表示“重的”"
-
-#~ msgid ""
-#~ "Greek 'lanthanein' for 'hidden'. The Lanthanoids are also called the "
-#~ "'rare earth' elements."
-#~ msgstr "希腊语“lanthanein”,表示“隐藏”。镧系元素又称为稀土元素。"
-
-#~ msgid "Named after the planetoid Ceres"
-#~ msgstr "以小行星谷神星“Ceres”命名"
-
-#~ msgid "Greek 'prasinos didymos' for 'green twin'"
-#~ msgstr ""
-#~ "希腊语“prasinos didymos”,意即“绿色的孪生子”(因镨的盐类为绿色而得名)"
-
-#~ msgid "Greek 'neos didymos' for 'new twin'"
-#~ msgstr "希腊语“neos didymos”意即“新生的双胞胎”"
-
-#~ msgid ""
-#~ "Named after the Greek Prometheus. Prometheus stole the fire from the gods "
-#~ "and gave it to mankind."
-#~ msgstr ""
-#~ "以希腊神话中的普罗米修斯“Prometheus”命名。即盗天火送到人间的普罗米修斯。"
-
-#~ msgid "Named after the mineral Samarskit"
-#~ msgstr "以“Samarskit”矿石命名"
-
-#~ msgid "Named after Europe"
-#~ msgstr "以欧洲“Europe”命名"
-
-#~ msgid "Named after the Finnish chemist Johan Gadolin"
-#~ msgstr "以芬兰化学家 Johan Gadolin 命名"
-
-#~ msgid "Named after the Swedish town of Ytterby"
-#~ msgstr "以瑞典小镇 Ytterby 命名"
-
-#~ msgid "Greek 'dysprositor' for 'difficult to reach'"
-#~ msgstr "希腊语“dysprositor”,意思是“难以接触”"
-
-#~ msgid "Latin 'holmia' for the old name of Stockholm"
-#~ msgstr "拉丁文“holmia”,是瑞典首都斯斯德哥尔摩的旧名"
-
-#~ msgid ""
-#~ "Named ofter the Swedish town of Ytterby. Terbium and Ytterbium are also "
-#~ "named after this town."
-#~ msgstr "以瑞典小镇“Ytterby”命名,铽和镱也以此镇命名"
-
-#~ msgid "Named after the old name of Scandinavia, 'Thule'."
-#~ msgstr "以“Thule”命名,这是斯堪的纳维亚半岛的旧称。"
-
-#~ msgid ""
-#~ "Like Terbium and Gadolinium, this is named after the Swedish town of "
-#~ "Ytterby."
-#~ msgstr "与铽和钆相同,它以瑞典小镇“Ytterby”命名。"
-
-#~ msgid "Named after the Roman name 'Lutetia' for Paris"
-#~ msgstr "以巴黎的罗马名“Lutetia”命名"
-
-#~ msgid "'Hafnia' is the old name of Kopenhagen (Denmark)"
-#~ msgstr "哥本哈根 (丹麦) 的旧名“Hafnia”"
-
-#~ msgid "Named after the Greek myth of Tantalos"
-#~ msgstr "以希腊神话中的英雄 Tantalus 命名"
-
-#~ msgid ""
-#~ "'tung sten' means 'heavy stone' in Swedish. The old name (and thus the "
-#~ "symbol 'W') was Wolfram, named after a mineral."
-#~ msgstr ""
-#~ "瑞典语“tung sten”意思是“很重的石头”。旧名是 Wolffram (旧符号是 W),是一种"
-#~ "矿石。"
-
-#~ msgid "Named after the German river Rhine (latin 'Rhenium')."
-#~ msgstr "以德国的莱茵河命名(拉丁语“Rhenium”)。"
-
-#~ msgid "Greek for 'smell'. Its oxides smell strongly like radishes."
-#~ msgstr "希腊语“气味”的意思,因为它的氧化物闻起来像萝卜。"
-
-#~ msgid "Greek 'iris' for 'rainbow'"
-#~ msgstr "希腊语“iris”,指彩虹"
-
-#~ msgid "Spanish 'platina' means 'small silver'"
-#~ msgstr "西班牙语“platina”,意思是“小银子”"
-
-#~ msgid "Latin 'aurum'. Named after Aurora, the goddess of sunrise"
-#~ msgstr "拉丁语“aurum”,以日出女神 Aurora 命名。"
-
-#~ msgid "Graeco-Latin 'hydrargyrum' for 'liquid silver'"
-#~ msgstr "拉丁语“hydrargyrum”,表示“液状的银”"
-
-#~ msgid "Greek 'tallos' for 'young twig'"
-#~ msgstr "希腊语“tallos”,表示“嫩枝”"
-
-#~ msgid "Latin 'plumbum' for Lead"
-#~ msgstr "拉丁语“plumbum”意思是铅"
-
-#~ msgid "The old name of Bismuth is 'Wismut', which stood for 'white mass'."
-#~ msgstr "铋的原名是“Wismut”,代表“白色物质”。"
-
-#~ msgid "Named after Poland to honor Marie Curie"
-#~ msgstr "以 Poland (波兰) 命名,以纪念居里夫人"
-
-#~ msgid "Greek 'astator' for 'changing'"
-#~ msgstr "希腊语“astator”,表示“变化”"
-
-#~ msgid ""
-#~ "Named after Radium. It ends with 'on' to make it clear that it is a noble "
-#~ "gas."
-#~ msgstr "以元素镭命名,以“on”结尾表示它是一个惰性气体。"
-
-#~ msgid "Named after France to honor Marguerite Perey"
-#~ msgstr "以法国 France 命名,以纪念 Marguerite Perey"
-
-#~ msgid "Latin 'radius' for 'beam', as it is radioactive"
-#~ msgstr "拉丁文“radius”表示“光束”,以示它是放射性的"
-
-#~ msgid "Greek 'aktis' for 'beam' - actinium is radioactive"
-#~ msgstr "拉丁文“aktis”表示“光束”,以示它是放射性的"
-
-#~ msgid "Named after the German god of thunder: Thor"
-#~ msgstr "以德国的雷电之神的名字“Thor”命名"
-
-#~ msgid ""
-#~ "Greek 'protos' for 'ancester'. Protactinium is before Actinium in the "
-#~ "periodic table."
-#~ msgstr "希腊语“protos”,表示“先辈”。镤在周期表中在锕之先"
-
-#~ msgid "Greek 'ouranos' for 'heaven'. Named after the planet Uranus."
-#~ msgstr "希腊语“ouranos”表示“天堂”,以天王星 (Uranus) 命名。"
-
-#~ msgid "Named after the planet Neptune."
-#~ msgstr "以海王星 (Neptune) 命名。"
-
-#~ msgid "Named after the planet Pluto."
-#~ msgstr "以冥王星 (Pluto) 命名。"
-
-#~ msgid "Named after America."
-#~ msgstr "以 America (美国) 命名。"
-
-#~ msgid "Named after Marie Curie."
-#~ msgstr "以 Marie Curie (玛丽亚·居里) 命名。"
-
-#~ msgid "Named after the town Berkeley where it was discovered."
-#~ msgstr "以其发现地 Berkeley (柏克利) 命名。"
-
-#~ msgid "Named after the US-State of California."
-#~ msgstr "以美国 California (加利福尼亚州) 命名。"
-
-#~ msgid "Named after the scientist Albert Einstein."
-#~ msgstr "以科学家 Albert Einstein (阿尔伯特·爱因斯坦) 命名。"
-
-#~ msgid "Named after the scientist Enrico Fermi."
-#~ msgstr "以科学家 Enrico Fermi (恩里科·费米) 命名。"
-
-#~ msgid "Named after the scientist D.I. Mendeleev."
-#~ msgstr "以科学家 D.I. Mendeleev (季米特里·门捷列夫) 命名。"
-
-#~ msgid "Named after the scientist Alfred Nobel."
-#~ msgstr "以科学家 Alfred Nobel (诺贝尔) 命名。"
-
-#~ msgid "Named after the scientist Ernest Orlando Lawrence."
-#~ msgstr "以科学家 Ernest Orlando Lawrence (欧内斯特·奥兰多·劳伦斯) 命名。"
-
-#~ msgid "Named after the scientist Ernest Rutherford"
-#~ msgstr "以科学家 Ernest Rutherford (欧内斯特·卢瑟福) 命名。"
-
-#~ msgid "Named after the science-town Dubna in Russia"
-#~ msgstr "以俄罗斯的科学城 Dubna 命名。"
-
-#~ msgid "Named after the scientist G. Theodore Seaborg."
-#~ msgstr "以科学家 G. Theodore Seaborg (格伦·西奥多·西博格) 命名。"
-
-#~ msgid "Named after the scientist Niels Bohr."
-#~ msgstr "以科学家 Niels Bohr (尼尔斯·玻尔) 命名。"
-
-#~ msgid ""
-#~ "Latin 'hassia' for the German county Hessen. In Hessen a lot elements "
-#~ "have been discovered."
-#~ msgstr "拉丁文“hassia”,指德国城市 Hessen,有很多元素在这里被发现。"
-
-#~ msgid "Named after the scientist Lise Meitner."
-#~ msgstr "以科学家 Lise Meitner (莉泽·迈特纳) 命名。"
-
-#~ msgid ""
-#~ "Named after the German city Darmstadt where many elements have been "
-#~ "discovered."
-#~ msgstr "以德国城市 Darmstadt 命名,在很多的元素在这里被人们发现。"
-
-#~ msgid "Named after Wilhelm Conrad Röntgen."
-#~ msgstr "以 Wilhelm Conrad R ntgen 命名。"
-
-#~ msgid ""
-#~ "Historically known as eka-mercury. Ununbium is a temporary IUPAC "
-#~ "systematic element name."
-#~ msgstr ""
-#~ "历史上是一种类汞物质。Ununbium 是国际纯粹化学与应用化学联合会(IUPAC)临时赋"
-#~ "予的元素系统命名。"
-
-#~ msgid ""
-#~ "Historically known as eka-thallium. Ununtrium is a temporary IUPAC "
-#~ "systematic element name."
-#~ msgstr ""
-#~ "历史上是一种类铊物质。Ununtrium 是国际纯粹化学与应用化学联合会(IUPAC)临时"
-#~ "赋予的元素系统命名。"
-
-#~ msgid ""
-#~ "Historically known as eka-lead. Ununquadium is a temporary IUPAC "
-#~ "systematic element name."
-#~ msgstr ""
-#~ "历史上是一种类铅物质。Ununquadium 是国际纯粹化学与应用化学联合会(IUPAC)临"
-#~ "时赋予的元素系统命名。"
-
-#~ msgid ""
-#~ "Historically known as eka-bismuth. Ununpentium is a temporary IUPAC "
-#~ "systematic element name."
-#~ msgstr ""
-#~ "历史上是一种类铋物质。Ununpentium 是国际纯粹化学与应用化学联合会(IUPAC)临"
-#~ "时赋予的元素系统命名。"
-
-#~ msgid ""
-#~ "Historically known as eka-polonium. Ununhexium is a temporary IUPAC "
-#~ "systematic element name."
-#~ msgstr ""
-#~ "历史上是一种类钋物质。Ununhexium 是国际纯粹化学与应用化学联合会(IUPAC)临时"
-#~ "赋予的元素系统命名。"
-
-#~ msgid "Temporary symbol and name. Can also be referred to as eka-astatine."
-#~ msgstr "临时符号与名称,可被视作一种类砹物质。"
-
-#~ msgid ""
-#~ "Historically known as eka-radon, eka-emanation before 1960. Ununoctium is "
-#~ "a temporary IUPAC systematic element name."
-#~ msgstr ""
-#~ "历史上是一种类氡物质,1960 年以前被视作类射气物质。Ununoctium 是国际纯粹化"
-#~ "学与应用化学联合会(IUPAC)临时赋予的元素系统命名。"
-
-#~ msgctxt "NAME OF TRANSLATORS"
-#~ msgid "Your names"
-#~ msgstr "KDE 中国"
-
-#~ msgctxt "EMAIL OF TRANSLATORS"
-#~ msgid "Your emails"
-#~ msgstr "kde-china(a)kde.org"
-
-#~ msgid "Ununbium"
-#~ msgstr "Uub"
-
-#~ msgid "no translations found"
-#~ msgstr "未找到翻译"
1
0
Hello community,
here is the log from the commit of package poxml for openSUSE:Factory checked in at 2017-08-28 15:17:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/poxml (Old)
and /work/SRC/openSUSE:Factory/.poxml.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "poxml"
Mon Aug 28 15:17:49 2017 rev:54 rq:518878 version:17.08.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/poxml/poxml.changes 2017-07-29 09:00:31.888254488 +0200
+++ /work/SRC/openSUSE:Factory/.poxml.new/poxml.changes 2017-08-28 15:19:13.035424823 +0200
@@ -1,0 +2,17 @@
+Fri Aug 11 22:46:35 UTC 2017 - christophe(a)krop.fr
+
+- Update to KDE Applications 17.08.0
+ * New feature release
+ * https://www.kde.org/announcements/announce-applications-17.08.0.php
+- Changes since 17.04.3 :
+ * None
+
+-------------------------------------------------------------------
+Sat Aug 5 18:19:46 UTC 2017 - christophe(a)krop.fr
+
+- Update to KDE Applications 17.07.90
+ * KDE Applications 17.07.90
+ * https://www.kde.org/announcements/announce-applications-17.07.90.php
+
+
+-------------------------------------------------------------------
Old:
----
poxml-17.04.3.tar.xz
New:
----
poxml-17.08.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ poxml.spec ++++++
--- /var/tmp/diff_new_pack.SlZVbX/_old 2017-08-28 15:19:14.123271950 +0200
+++ /var/tmp/diff_new_pack.SlZVbX/_new 2017-08-28 15:19:14.143269140 +0200
@@ -1,7 +1,7 @@
#
# spec file for package poxml
#
-# 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
@@ -15,18 +15,19 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
%bcond_without lang
Name: poxml
-Version: 17.04.3
+Version: 17.08.0
Release: 0
%define kf5_version 5.26.0
-# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA)
+# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
Summary: Tools for translating DocBook XML files with Gettext
License: GPL-2.0 and GFDL-1.2
Group: System/GUI/KDE
-Url: http://www.kde.org
+Url: http://www.kde.org/
Source0: %{name}-%{version}.tar.xz
BuildRequires: antlr
BuildRequires: antlr-devel
@@ -42,6 +43,18 @@
This is a collection of tools that facilitate translating DocBook XML
files using Gettext message files (PO files).
+%package -n kde-l10n-devel
+Summary: Tools for translating DocBook XML files with Gettext
+Group: System/GUI/KDE
+Obsoletes: kde4-l10n-devel < %{version}
+Provides: kde4-l10n-devel = %{version}
+Recommends: %{name}-lang
+Provides: %{name} = %{version}
+
+%description -n kde-l10n-devel
+This is a collection of tools that facilitate translating DocBook XML
+files using Gettext message files (PO files).
+
%if %{with lang}
%lang_package
%endif
@@ -65,29 +78,17 @@
%find_lang %{name} --with-man --all-name
%endif
-%package -n kde-l10n-devel
-Summary: Tools for translating DocBook XML files with Gettext
-Group: System/GUI/KDE
-Obsoletes: kde4-l10n-devel < %{version}
-Provides: kde4-l10n-devel = %{version}
-Recommends: %{name}-lang
-Provides: %{name} = %{version}
-
-%description -n kde-l10n-devel
-This is a collection of tools that facilitate translating DocBook XML
-files using Gettext message files (PO files).
-
%post -n kde-l10n-devel -p /sbin/ldconfig
%postun -n kde-l10n-devel -p /sbin/ldconfig
%files -n kde-l10n-devel
%defattr(-,root,root)
-%doc COPYING COPYING.DOC
-%{_bindir}/po2xml
-%{_bindir}/split2po
-%{_bindir}/swappo
-%{_bindir}/xml2pot
-%{_mandir}/man1/*.*%{ext_man}
+%doc COPYING*
+%{_kf5_bindir}/po2xml
+%{_kf5_bindir}/split2po
+%{_kf5_bindir}/swappo
+%{_kf5_bindir}/xml2pot
+%{_kf5_mandir}/man1/*.*%{ext_man}
%if %{with lang}
%files lang -f %{name}.lang
++++++ poxml-17.04.3.tar.xz -> poxml-17.08.0.tar.xz ++++++
1
0
Hello community,
here is the log from the commit of package python-openqa_review for openSUSE:Factory checked in at 2017-08-28 15:17:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-openqa_review (Old)
and /work/SRC/openSUSE:Factory/.python-openqa_review.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-openqa_review"
Mon Aug 28 15:17:46 2017 rev:15 rq:518876 version:1.7.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-openqa_review/python-openqa_review.changes 2017-07-25 11:41:23.607895027 +0200
+++ /work/SRC/openSUSE:Factory/.python-openqa_review.new/python-openqa_review.changes 2017-08-28 15:19:09.875868826 +0200
@@ -1,0 +2,9 @@
+Sat Aug 26 08:53:36 UTC 2017 - okurz(a)suse.com
+
+- Update to version 1.7.4:
+ * Fix error 401 on redmine after server side ngingx update
+ * Ignore cscope.out
+ * Fix whitespace as reported by flake8
+ * Fix handling of dotted build numbers parsing from comments
+
+-------------------------------------------------------------------
Old:
----
python-openqa_review-1.7.2.tar.gz
New:
----
python-openqa_review-1.7.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-openqa_review.spec ++++++
--- /var/tmp/diff_new_pack.iYob47/_old 2017-08-28 15:19:11.747605796 +0200
+++ /var/tmp/diff_new_pack.iYob47/_new 2017-08-28 15:19:11.751605234 +0200
@@ -18,7 +18,7 @@
%define short_name openqa_review
Name: python-%{short_name}
-Version: 1.7.2
+Version: 1.7.4
Release: 0
Summary: A review helper script for openQA
License: MIT
++++++ _update.sh ++++++
--- /var/tmp/diff_new_pack.iYob47/_old 2017-08-28 15:19:11.887586125 +0200
+++ /var/tmp/diff_new_pack.iYob47/_new 2017-08-28 15:19:11.887586125 +0200
@@ -8,3 +8,4 @@
osc service localrun download_files
osc add *.tar.gz
osc ci -m "Update to $version"
+osc sr -m "Update to $version"
++++++ python-openqa_review-1.7.2.tar.gz -> python-openqa_review-1.7.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openqa_review-1.7.2/.gitignore new/openqa_review-1.7.4/.gitignore
--- old/openqa_review-1.7.2/.gitignore 2017-07-24 17:06:59.000000000 +0200
+++ new/openqa_review-1.7.4/.gitignore 2017-08-26 10:51:56.000000000 +0200
@@ -8,3 +8,4 @@
version.py
coverage_html/
.*.swp
+cscope.out
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openqa_review-1.7.2/openqa_review/browser.py new/openqa_review-1.7.4/openqa_review/browser.py
--- old/openqa_review-1.7.2/openqa_review/browser.py 2017-07-24 17:06:59.000000000 +0200
+++ new/openqa_review-1.7.4/openqa_review/browser.py 2017-08-26 10:51:56.000000000 +0200
@@ -154,7 +154,7 @@
else: # pragma: no cover
absolute_url = url if not url.startswith('/') else urljoin(str(self.root_url), str(url))
data = json.dumps(data)
- r = requests.request(method, absolute_url, data=data, auth=self.auth, headers={'content-type': 'application/json'})
+ r = requests.request(method, absolute_url, data=data, headers={'X-Redmine-API-Key': self.auth[0], 'content-type': 'application/json'})
r.raise_for_status()
return r.json() if r.text else None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openqa_review-1.7.2/openqa_review/openqa_review.py new/openqa_review-1.7.4/openqa_review/openqa_review.py
--- old/openqa_review-1.7.2/openqa_review/openqa_review.py 2017-07-24 17:06:59.000000000 +0200
+++ new/openqa_review-1.7.4/openqa_review/openqa_review.py 2017-08-26 10:51:56.000000000 +0200
@@ -229,6 +229,7 @@
'poo': lambda i: 'https://progress.opensuse.org/issues/%s' % i,
}
+
def status(entry):
"""Return test status from entry, e.g. 'result_passed'."""
return [s for s in entry.i['class'] if re.search('(state|result)_', s)][0]
@@ -397,7 +398,7 @@
# Could also find previous one with a comment on the build status,
# i.e. a reviewed finished build
# The build number itself might be prefixed with a redundant 'Build' which we ignore
- build_re = re.compile('[bB]uild:(\*\*)? *(Build)?([\w(a)]*)(.*reference.*)?(\*\*)?\r\n')
+ build_re = re.compile('[bB]uild:(\*\*)? *(Build)?([\w@.]*)(.*reference.*)?(\*\*)?\r\n')
# Assuming the most recent with a build number also has the most recent review
for c in reversed(comments):
match = build_re.search(c['text'])
@@ -807,7 +808,6 @@
assert bug_id, "No bug_id found for %s" % v
v['bugref_href'] = issue_tracker[bugref](bug_id)
-
@property
def total_issues(self):
"""Return Number of issue entries for this arch."""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openqa_review-1.7.2/tests/:tests:overview%3Fdistri%3Dopensuse%26version%3D15%26build%3D162.2%26groupid%3D26 new/openqa_review-1.7.4/tests/:tests:overview%3Fdistri%3Dopensuse%26version%3D15%26build%3D162.2%26groupid%3D26
--- old/openqa_review-1.7.2/tests/:tests:overview%3Fdistri%3Dopensuse%26version%3D15%26build%3D162.2%26groupid%3D26 1970-01-01 01:00:00.000000000 +0100
+++ new/openqa_review-1.7.4/tests/:tests:overview%3Fdistri%3Dopensuse%26version%3D15%26build%3D162.2%26groupid%3D26 2017-08-28 15:19:12.467504631 +0200
@@ -0,0 +1 @@
+symbolic link to :tests:overview%3Fdistri%3Dopensuse%26version%3D42.1%26build%3D0311%26groupid%3D25
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openqa_review-1.7.2/tests/:tests:overview%3Fdistri%3Dopensuse%26version%3D15%26build%3D170.1%26groupid%3D26 new/openqa_review-1.7.4/tests/:tests:overview%3Fdistri%3Dopensuse%26version%3D15%26build%3D170.1%26groupid%3D26
--- old/openqa_review-1.7.2/tests/:tests:overview%3Fdistri%3Dopensuse%26version%3D15%26build%3D170.1%26groupid%3D26 1970-01-01 01:00:00.000000000 +0100
+++ new/openqa_review-1.7.4/tests/:tests:overview%3Fdistri%3Dopensuse%26version%3D15%26build%3D170.1%26groupid%3D26 2017-08-28 15:19:12.419511375 +0200
@@ -0,0 +1 @@
+symbolic link to :tests:overview%3Fdistri%3Dopensuse%26version%3D42.1%26build%3D0313%26groupid%3D25
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openqa_review-1.7.2/tests/https%3A::openqa.opensuse.org:group_overview:26.json new/openqa_review-1.7.4/tests/https%3A::openqa.opensuse.org:group_overview:26.json
--- old/openqa_review-1.7.2/tests/https%3A::openqa.opensuse.org:group_overview:26.json 1970-01-01 01:00:00.000000000 +0100
+++ new/openqa_review-1.7.4/tests/https%3A::openqa.opensuse.org:group_overview:26.json 2017-08-26 10:51:56.000000000 +0200
@@ -0,0 +1,77 @@
+{
+ "comments": [
+ {"created": "2015-12-17T15:46:59", "user": "bar", "text": "**Date: 2015-12-17 - 16:45**\r\n**Build: 162.1**\r\n\r\n**Common issues:** baz\r\n<hr>"},
+ {"created": "2015-12-18T13:28:20", "user": "foo", "text": "**Date: 2015-12-18 - 11:16**\r\n**Build: 162.2 (reference 162.1)**\r\n\r\n**Common issues:**\r\n"},
+ {"created": "2015-12-19T13:28:20", "user": "baz", "text": "Some other comment"}
+ ],
+ "pinned_comments": [],
+ "description": "",
+ "max_jobs": 91,
+ "group": {"id": 26, "name": "openSUSE Leap"},
+ "result": {
+ "162.1": {
+ "distri": "opensuse",
+ "version": "15",
+ "reviewed": "",
+ "reviewed_all_passed": "",
+ "escaped_build": "162_1",
+ "escaped_id": "15-162_1",
+ "labeled": 0,
+ "oldest": "2016-11-08T16:59:11",
+ "failed": 20,
+ "passed": 39,
+ "skipped": 0,
+ "softfailed": 0,
+ "unfinished": 0,
+ "total": 59
+ },
+ "162.2": {
+ "distri": "opensuse",
+ "version": "15",
+ "reviewed": "",
+ "reviewed_all_passed": "",
+ "escaped_build": "162_2",
+ "escaped_id": "15-162_2",
+ "labeled": 0,
+ "oldest": "2016-11-08T16:59:11",
+ "failed": 9,
+ "passed": 38,
+ "skipped": 0,
+ "softfailed": 0,
+ "unfinished": 0,
+ "total": 47
+ },
+ "170.1": {
+ "distri": "opensuse",
+ "version": "15",
+ "reviewed": "",
+ "reviewed_all_passed": "",
+ "escaped_build": "170_1",
+ "escaped_id": "15-170_1",
+ "labeled": 0,
+ "oldest": "2016-11-08T16:59:11",
+ "failed": 9,
+ "passed": 38,
+ "skipped": 0,
+ "softfailed": 0,
+ "unfinished": 0,
+ "total": 47
+ },
+ "170.4": {
+ "distri": "opensuse",
+ "version": "15",
+ "reviewed": "",
+ "reviewed_all_passed": "",
+ "escaped_build": "170_4",
+ "escaped_id": "15-170_4",
+ "labeled": 0,
+ "oldest": "2016-11-08T16:59:11",
+ "failed": 21,
+ "passed": 37,
+ "skipped": 0,
+ "softfailed": 0,
+ "unfinished": 33,
+ "total": 91
+ }
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openqa_review-1.7.2/tests/test_openqa_review.py new/openqa_review-1.7.4/tests/test_openqa_review.py
--- old/openqa_review-1.7.2/tests/test_openqa_review.py 2017-07-24 17:06:59.000000000 +0200
+++ new/openqa_review-1.7.4/tests/test_openqa_review.py 2017-08-26 10:51:56.000000000 +0200
@@ -282,6 +282,15 @@
current, reviewed = openqa_review.get_build_urls_to_compare(browser, args.job_group_urls, against_reviewed='last')
+def test_also_dotted_builds_can_be_specified_and_appear_in_report():
+ args = cache_test_args_factory()
+ args.job_group_urls = args.host + '/group_overview/26'
+ browser = browser_factory(args)
+ current, reviewed = openqa_review.get_build_urls_to_compare(browser, args.job_group_urls, against_reviewed='last')
+ assert '=170.1' in current
+ assert '=162.2' in reviewed
+
+
def test_generate_report_with_progress_notification_does_not_fail():
args = cache_test_args_factory()
# Not easy to test automatically but at least we can call it and assume it also gives valid results
1
0
Hello community,
here is the log from the commit of package libqt5-qtspeech for openSUSE:Factory checked in at 2017-08-28 15:17:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtspeech (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtspeech.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtspeech"
Mon Aug 28 15:17:43 2017 rev:2 rq:518874 version:5.9.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtspeech/libqt5-qtspeech.changes 2017-08-24 18:33:47.650645020 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtspeech.new/libqt5-qtspeech.changes 2017-08-28 15:19:07.908145344 +0200
@@ -1,0 +2,6 @@
+Sat Aug 26 09:37:01 UTC 2017 - fabian(a)ritter-vogt.de
+
+- Run spec-cleaner
+- Remove unnecessary empty private-headers-devel package
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtspeech.spec ++++++
--- /var/tmp/diff_new_pack.pE7SBX/_old 2017-08-28 15:19:09.495922219 +0200
+++ /var/tmp/diff_new_pack.pE7SBX/_new 2017-08-28 15:19:09.523918285 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libqt5-qtspeech
#
-# Copyright (c) 2014 SUSE LINUX Products 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,9 +17,11 @@
%define qt5_snapshot 0
-
%define libname libQt5TextToSpeech5
-
+%define base_name libqt5
+%define real_version 5.9.1
+%define so_version 5.5.0
+%define tar_version qtspeech-opensource-src-%{real_version}
Name: libqt5-qtspeech
Version: 5.9.1
Release: 0
@@ -27,22 +29,17 @@
License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-with-Qt-Company-Qt-exception-1.1
Group: Development/Libraries/X11
Url: https://www.qt.io
-%define base_name libqt5
-%define real_version 5.9.1
-%define so_version 5.5.0
-%define tar_version qtspeech-opensource-src-%{real_version}
Source: https://download.qt.io/official_releases/qt/5.9/%{real_version}/submodules/…
Source1: baselibs.conf
BuildRequires: fdupes
BuildRequires: libQt5Core-private-headers-devel
BuildRequires: libQt5Widgets-devel
BuildRequires: libspeechd-devel
-%if %qt5_snapshot
+BuildRequires: xz
+%if %{qt5_snapshot}
#to create the forwarding headers
BuildRequires: perl
%endif
-BuildRequires: xz
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Qt is a set of libraries for developing applications.
@@ -54,11 +51,11 @@
%prep
%setup -q -n qtspeech-opensource-src-%{real_version}
-%package -n %libname
+%package -n %{libname}
Summary: Qt 5 Speech Addon
Group: Development/Libraries/X11
-%description -n %libname
+%description -n %{libname}
Qt is a set of libraries for developing applications.
The module enables a Qt application to support accessibility features
@@ -68,26 +65,11 @@
%package devel
Summary: Development files for the Qt5 Speech library
Group: Development/Libraries/X11
-Requires: %libname = %{version}
+Requires: %{libname} = %{version}
%description devel
You need this package if you want to compile programs with qtspeech.
-%package private-headers-devel
-Summary: Non-ABI stable experimental API for the Qt5 Speech library
-Group: Development/Libraries/C and C++
-BuildArch: noarch
-Requires: %{name}-devel = %{version}
-Requires: libQt5Core-private-headers-devel
-Provides: libQt5TextToSpeech-private-headers-devel
-Obsoletes: libQt5TextToSpeech-private-headers-devel
-
-%description private-headers-devel
-This package provides private headers of libqt5-qtspeech that are normally
-not used by application development and that do not have any ABI or
-API guarantees. The packages that build against these have to require
-the exact Qt version.
-
%package examples
Summary: Qt5 Speech examples
Group: Development/Libraries/X11
@@ -95,12 +77,11 @@
%description examples
Examples for the libqt5-qtspeech module.
-%post -n %libname -p /sbin/ldconfig
-
-%postun -n %libname -p /sbin/ldconfig
+%post -n %{libname} -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
%build
-%if %qt5_snapshot
+%if %{qt5_snapshot}
#force the configure script to generate the forwarding headers (it checks whether .git directory exists)
mkdir .git
%endif
@@ -113,18 +94,11 @@
# kill .la files
rm -f %{buildroot}%{_libqt5_libdir}/lib*.la
-%files -n %libname
-%defattr(-,root,root,755)
+%files -n %{libname}
%{_libqt5_libdir}/libQt5TextToSpeech.so.*
%{_libqt5_plugindir}/texttospeech/
-%files private-headers-devel
-%defattr(-,root,root,755)
-#{_libqt5_includedir}/Qt*/%{so_version}
-
%files devel
-%defattr(-,root,root,755)
-#exclude %{_libqt5_includedir}/Qt*/%{so_version}
%{_libqt5_archdatadir}/mkspecs/modules/qt_lib_*.pri
%{_libqt5_includedir}/Qt*
%{_libqt5_libdir}/cmake/Qt5TextToSpeech/
@@ -133,7 +107,6 @@
%{_libqt5_libdir}/pkgconfig/Qt5TextToSpeech.pc
%files examples
-%defattr(-,root,root,755)
%{_libqt5_examplesdir}/
%changelog
1
0
Hello community,
here is the log from the commit of package calibre for openSUSE:Factory checked in at 2017-08-28 15:17:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/calibre (Old)
and /work/SRC/openSUSE:Factory/.calibre.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "calibre"
Mon Aug 28 15:17:40 2017 rev:172 rq:518871 version:3.7.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/calibre/calibre.changes 2017-08-24 18:53:02.663967230 +0200
+++ /work/SRC/openSUSE:Factory/.calibre.new/calibre.changes 2017-08-28 15:19:04.272656227 +0200
@@ -1,0 +2,40 @@
+Sat Aug 26 08:16:16 UTC 2017 - ecsos(a)opensuse.org
+
+- update to 3.7.0
+ New Features
+ - Allow searching for books in a virtual library using a new
+ 'vl:' prefix
+ - Server: Show file sizes in the tooltips for the download
+ buttons.
+ - Server: Reduce the grid view minimum cover thumbnail size from
+ 150px to 105px
+ - Narrow layout: Fix wasted space to the left of the comments in
+ the Book details panel
+ Bug Fixes
+ - Server: Fix downloading files via the list of formats not
+ working when launching calibre from the home screen on iOS
+ - Browser viewer: Fix controls help overlay not being displayed
+ the first time the viewer is used
+ - MOBI Output: Fix a regression causing a crash for some input
+ documents that specify text-transform or font-variant CSS
+ properties.
+ - DOCX Input: Fix framed lists being rendered with the frame
+ inside the bullets instead of outside it.
+ - Fix a regression that could cause conversion to crash when
+ using the first-letter CSS pseudo selector and outputting to
+ MOBI or DOCX.
+ - Conversion: Fix remove first image option not working for comic
+ input with the disable comic processing option.
+ - Server: Fix tooltip not working in the cover grid view.
+ - Workaround for Qt bug that prevented using the shift and ctrl
+ keys with the touchscreen
+ - Linux: fix native KDE file dialog not working on older systems
+ - Linux: Fix KDE dialogs not supporting multiple file name filter
+ groups
+ - Fix libraries being sorted alphabetically by full path rather
+ than just library name
+ - Server: Allow hyphens in user names
+ - calibredb.exe: Fix misleading error message when connecting to
+ a server with incorrect username or password
+
+-------------------------------------------------------------------
Old:
----
calibre-3.6.0.tar.xz
New:
----
calibre-3.7.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ calibre.spec ++++++
--- /var/tmp/diff_new_pack.s55jq1/_old 2017-08-28 15:19:07.640183000 +0200
+++ /var/tmp/diff_new_pack.s55jq1/_new 2017-08-28 15:19:07.660180190 +0200
@@ -20,7 +20,7 @@
License: GPL-3.0
Group: Productivity/Other
Name: calibre
-Version: 3.6.0
+Version: 3.7.0
Release: 0
Url: http://calibre-ebook.com
Source0: http://download.calibre-ebook.com/%{version}/calibre-%{version}.tar.xz
++++++ calibre-3.6.0.tar.xz -> calibre-3.7.0.tar.xz ++++++
/work/SRC/openSUSE:Factory/calibre/calibre-3.6.0.tar.xz /work/SRC/openSUSE:Factory/.calibre.new/calibre-3.7.0.tar.xz differ: char 25, line 1
1
0
Hello community,
here is the log from the commit of package kmymoney for openSUSE:Factory checked in at 2017-08-28 15:17:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kmymoney (Old)
and /work/SRC/openSUSE:Factory/.kmymoney.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmymoney"
Mon Aug 28 15:17:35 2017 rev:54 rq:518870 version:4.8.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kmymoney/kmymoney.changes 2017-07-04 09:11:52.382132615 +0200
+++ /work/SRC/openSUSE:Factory/.kmymoney.new/kmymoney.changes 2017-08-28 15:18:53.134221468 +0200
@@ -1,0 +2,6 @@
+Sat Aug 26 08:15:10 UTC 2017 - wbauer(a)tmo.at
+
+- Add fix-build-with-cmake-3.9.patch to fix build with latest
+ cmake in Factory (kde#383351)
+
+-------------------------------------------------------------------
New:
----
fix-build-with-cmake-3.9.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kmymoney.spec ++++++
--- /var/tmp/diff_new_pack.eGZrG3/_old 2017-08-28 15:18:54.785989353 +0200
+++ /var/tmp/diff_new_pack.eGZrG3/_new 2017-08-28 15:18:54.789988790 +0200
@@ -30,6 +30,8 @@
Patch2: fix-build.patch
# PATCH-FIX-OPENSUSE aqbanking-5.1-backward-compatibility.patch boo#1042760 -- allow to build the kbanking plugin on Leap 42
Patch3: aqbanking-5.1-backward-compatibility.patch
+# PATCH-FIX-UPSTREAM fix-build-with-cmake-3.9.patch kde#383351 -- fix build with latest cmake in Factory
+Patch4: fix-build-with-cmake-3.9.patch
BuildRequires: aqbanking-devel
%if 0%{?suse_version} > 1325
BuildRequires: libboost_headers-devel
@@ -95,6 +97,7 @@
%if 0%{suse_version} <= 1320
%patch3 -p1
%endif
+%patch4 -p1
%build
%cmake_kde4 -d build
++++++ fix-build-with-cmake-3.9.patch ++++++
>From b0a68ca075928aa29ee1e0007bfb14d714f5a948 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker(a)freenet.de>
Date: Thu, 10 Aug 2017 13:45:04 +0200
Subject: Fix 'Compile error on Fedora 26'
CMake build system used some outdated variables which has been replaced
by cmake build in variables to fix the issue.
FIXED-IN:4.8.1
BUG:383351
---
kmymoney/dialogs/settings/CMakeLists.txt | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/kmymoney/dialogs/settings/CMakeLists.txt b/kmymoney/dialogs/settings/CMakeLists.txt
index 5aacbea..b007dfb 100644
--- a/kmymoney/dialogs/settings/CMakeLists.txt
+++ b/kmymoney/dialogs/settings/CMakeLists.txt
@@ -1,12 +1,11 @@
add_custom_command(
- OUTPUT ${KMyMoney2_BINARY_DIR}/kmymoneysettings.h ${KMyMoney2_BINARY_DIR}/kmymoneysettings.cpp
- DEPENDS ${KMyMoney2_SOURCE_DIR}/kmymoney.kcfg ${KMyMoney2_SOURCE_DIR}/kmymoneysettings.kcfgc
- COMMAND ${KDE4_KCFGC_EXECUTABLE} -d ${KMyMoney2_BINARY_DIR}/ ${KMyMoney2_SOURCE_DIR}/kmymoney.kcfg ${KMyMoney2_SOURCE_DIR}/kmymoneysettings.kcfgc
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.h ${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.cpp
+ DEPENDS ${CMAKE_SOURCE_DIR}/kmymoney/kmymoney.kcfg ${CMAKE_SOURCE_DIR}/kmymoney/kmymoneysettings.kcfgc
+ COMMAND ${KDE4_KCFGC_EXECUTABLE} -d ${CMAKE_CURRENT_BINARY_DIR}/ ${CMAKE_SOURCE_DIR}/kmymoney/kmymoney.kcfg ${CMAKE_SOURCE_DIR}/kmymoney/kmymoneysettings.kcfgc
)
-
set (libsettings_a_SOURCES
- ${KMyMoney2_BINARY_DIR}/kmymoneysettings.h
+ ${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.cpp
ksettingscolors.cpp
ksettingsfonts.cpp
ksettingsforecast.cpp
--
cgit v0.11.2
1
0
Hello community,
here is the log from the commit of package kwave for openSUSE:Factory checked in at 2017-08-28 15:17:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kwave (Old)
and /work/SRC/openSUSE:Factory/.kwave.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwave"
Mon Aug 28 15:17:31 2017 rev:8 rq:518866 version:17.08.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kwave/kwave.changes 2017-07-29 08:59:40.087572941 +0200
+++ /work/SRC/openSUSE:Factory/.kwave.new/kwave.changes 2017-08-28 15:18:48.598858801 +0200
@@ -1,0 +2,22 @@
+Wed Aug 23 18:04:00 UTC 2017 - wbauer(a)tmo.at
+
+- Fix desktop file categories (boo#1055344)
+
+-------------------------------------------------------------------
+Fri Aug 11 22:46:14 UTC 2017 - christophe(a)krop.fr
+
+- Update to KDE Applications 17.08.0
+ * New feature release
+ * https://www.kde.org/announcements/announce-applications-17.08.0.php
+- Changes since 17.04.3 :
+- Too many changes to list here
+
+-------------------------------------------------------------------
+Sat Aug 5 18:19:12 UTC 2017 - christophe(a)krop.fr
+
+- Update to KDE Applications 17.07.90
+ * KDE Applications 17.07.90
+ * https://www.kde.org/announcements/announce-applications-17.07.90.php
+
+
+-------------------------------------------------------------------
Old:
----
kwave-17.04.3.tar.xz
New:
----
kwave-17.08.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kwave.spec ++++++
--- /var/tmp/diff_new_pack.xsqoU9/_old 2017-08-28 15:18:49.910674459 +0200
+++ /var/tmp/diff_new_pack.xsqoU9/_new 2017-08-28 15:18:49.918673334 +0200
@@ -19,10 +19,10 @@
%bcond_without lang
Name: kwave
-Version: 17.04.3
+Version: 17.08.0
Release: 0
%define kf5_version 5.26.0
-# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA)
+# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
Summary: Sound Editor designed for KDE
License: GPL-2.0+
@@ -34,6 +34,7 @@
BuildRequires: extra-cmake-modules
BuildRequires: fftw3-devel
BuildRequires: flac-devel
+BuildRequires: karchive-devel
BuildRequires: kcompletion-devel
BuildRequires: kconfig-devel
BuildRequires: kconfigwidgets-devel
@@ -64,7 +65,9 @@
Recommends: lame
Recommends: toolame
Recommends: twolame
+%if %{with lang}
Recommends: %{name}-lang
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -96,23 +99,23 @@
%find_lang %{name} --with-man --all-name
%kf5_find_htmldocs
%endif
- %suse_update_desktop_file -r org.kde.%{name} Qt KDE AudioVideoEditing
+ %suse_update_desktop_file -r org.kde.%{name} Qt KDE AudioVideo Audio Recorder AudioVideoEditing
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root)
-%{_bindir}/kwave
-%{_libdir}/libkwave*.so.*
-%{_kf5_plugindir}/kwave/
+%dir %{_kf5_appstreamdir}
+%doc %lang(en) %{_kf5_htmldir}/en/kwave/
%{_kf5_applicationsdir}/org.kde.kwave.desktop
-%{_kf5_htmldir}/en/kwave/
+%{_kf5_appstreamdir}/org.kde.kwave.appdata.xml
+%{_kf5_bindir}/kwave
%{_kf5_iconsdir}/hicolor/*/*/*.svgz
+%{_kf5_libdir}/libkwave*.so.*
+%{_kf5_plugindir}/kwave/
%{_kf5_servicetypesdir}/kwave-plugin.desktop
-%{_datadir}/kwave/
-%dir %{_kf5_appstreamdir}
-%{_kf5_appstreamdir}/org.kde.kwave.appdata.xml
+%{_kf5_sharedir}/kwave/
%if %{with lang}
%files lang -f %{name}.lang
++++++ kwave-17.04.3.tar.xz -> kwave-17.08.0.tar.xz ++++++
++++ 27467 lines of diff (skipped)
1
0