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
May 2014
- 1 participants
- 1539 discussions
28 May '14
Hello community,
here is the log from the commit of package rubygem-actionpack-3_2 for openSUSE:12.3:Update checked in at 2014-05-28 10:14:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.3:Update/rubygem-actionpack-3_2 (Old)
and /work/SRC/openSUSE:12.3:Update/.rubygem-actionpack-3_2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-actionpack-3_2"
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _link ++++++
--- /var/tmp/diff_new_pack.1Jmz2s/_old 2014-05-28 10:14:47.000000000 +0200
+++ /var/tmp/diff_new_pack.1Jmz2s/_new 2014-05-28 10:14:47.000000000 +0200
@@ -1 +1 @@
-<link package='rubygem-actionpack-3_2.2601' cicount='copy' />
+<link package='rubygem-actionpack-3_2.2827' cicount='copy' />
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package apache-commons-cli for openSUSE:Factory checked in at 2014-05-28 10:01:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache-commons-cli (Old)
and /work/SRC/openSUSE:Factory/.apache-commons-cli.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-commons-cli"
Changes:
--------
New Changes file:
--- /dev/null 2014-05-19 01:51:27.372033255 +0200
+++ /work/SRC/openSUSE:Factory/.apache-commons-cli.new/apache-commons-cli.changes 2014-05-28 10:01:39.000000000 +0200
@@ -0,0 +1,38 @@
+-------------------------------------------------------------------
+Sat Mar 8 18:22:40 UTC 2014 - badshah400(a)gmail.com
+
+- For openSUSE >= 13.1 remove all references to maven scripts as
+ these do not work; fixes building for openSUSE >= 13.1
+- Lots of specfile formatting cleanups
+- Move old %changelog section entries to .changes with proper
+ formatting
+- Add copyright info to spec file.
+
+-------------------------------------------------------------------
+Mon Dec 12 23:47:58 UTC 2011 - dmacvicar(a)suse.de
+
+- rename apache-cli to apache-commons-cli
+- add java() provides
+
+-------------------------------------------------------------------
+Tue Jul 19 10:07:32 UTC 2011 - dmacvicar(a)suse.de
+
+- converted to build with ant:ant
+- removed reference to non existing target/osgi/MANIFEST
+ in maven-build.xml
+
+-------------------------------------------------------------------
+Tue Nov 09 00:00:00 UTC 2010 - chris.spike(a)arcor.de
+
+- Removed maven* BRs in favour of apache-commons-parent
+- Added deprecated groupId to depmap for compatibility reasons
+
+-------------------------------------------------------------------
+Mon Oct 18 00:00:00 UTC 2010 - chris.spike(a)arcor.de
+
+- Removed Epoch
+
+-------------------------------------------------------------------
+Sun Oct 03 00:00:00 UTC 2010 - chris.spike(a)arcor.de
+
+- Rename and rebase from jakarta-commons-cli
New:
----
apache-commons-cli.changes
apache-commons-cli.spec
build.xml.tar.bz2
commons-cli-1.2-src.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache-commons-cli.spec ++++++
#
# spec file for package apache-commons-cli
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%global base_name cli
%global short_name commons-%{base_name}
%global _mavenpomdir %{_datadir}/maven2/poms
%global with_maven 0
Name: apache-commons-cli
Version: 1.2
Release: 0
Summary: Command Line Interface Library for Java
License: Apache-2.0
Group: Development/Libraries/Java
Url: http://commons.apache.org/%{base_name}/
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{vers…
Source1: build.xml.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
BuildRequires: ant
BuildRequires: java-devel >= 1.6.0
BuildRequires: jpackage-utils
Requires: java >= 1.6.0
Requires: jpackage-utils
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
# This should go away with F-17
Provides: jakarta-%{short_name} = %{version}-%{release}
Obsoletes: jakarta-%{short_name} < 1.1-6
Provides: apache-cli
Provides: java(commons-cli:commons-cli) = %{version}
Obsoletes: apache-cli < 1.2
%description
The CLI library provides a simple and easy to use API for working with the
command line arguments and options.
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Libraries/Java
Requires: jpackage-utils
# This should go away with F-17
Obsoletes: jakarta-%{short_name}-javadoc < 1.1-6
%description javadoc
This package contains the API documentation for %{name}.
%prep
%setup -q -n %{short_name}-%{version}-src
tar -xf %{SOURCE1}
%build
export CLASSPATH=$(build-classpath \
plexus/ \
maven/ \
):target/classes:target/test-classes
ant -Dmaven.mode.offline=true package javadoc \
-Dmaven.test.skip=true \
-lib /usr/share/java
%install
# jars
install -Dpm 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|apache-||g"`; done)
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
%if 0%{?suse_version} < 1310
# pom
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
# following line is only for backwards compatibility. New packages
# should use proper groupid org.apache.commons and also artifactid
%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
%endif
# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
%if 0%{?suse_version} < 1310
%post
%update_maven_depmap
%postun
%update_maven_depmap
%endif
%files
%defattr(-,root,root)
%doc LICENSE.txt NOTICE.txt README.txt RELEASE-NOTES.txt
%{_javadir}/*
%if 0%{?suse_version} < 1310
%{_mavenpomdir}/*
%config %{_mavendepmapfragdir}/*
%endif
%files javadoc
%defattr(-,root,root)
%doc LICENSE.txt
%{_javadocdir}/*
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package systemd for openSUSE:Factory checked in at 2014-05-28 06:43:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/systemd (Old)
and /work/SRC/openSUSE:Factory/.systemd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd"
Changes:
--------
--- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2014-05-27 07:09:08.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes 2014-05-28 06:43:12.000000000 +0200
@@ -1,0 +2,25 @@
+Tue May 27 07:23:47 UTC 2014 - werner(a)suse.de
+
+- Add upstream patches
+ 0001-Do-not-unescape-unit-names-in-Install-section.patch
+ 0002-analyze-run-use-bus_open_transport_systemd-instead-o.patch
+
+-------------------------------------------------------------------
+Mon May 26 16:34:10 UTC 2014 - werner(a)suse.de
+
+- Add upstream patch
+ 1020-udev-keyboard-also-hook-into-change-events.patch
+
+-------------------------------------------------------------------
+Mon May 26 15:25:28 UTC 2014 - werner(a)suse.de
+
+- Add upstream patches to update keyboard data base
+ 0001-keymap-Add-Lenovo-Enhanced-USB-Keyboard.patch
+ 0002-keymap-Asus-EeePC-touchpad-toggle-key.patch
+- Add upstream patches
+ 0001-nspawn-allow-to-bind-mount-journal-on-top-of-a-non-e.patch
+ 0002-nspawn-restore-journal-directory-is-empty-check.patch
+ 0003-core-never-consider-failure-when-reading-drop-ins-fa.patch
+ 0004-socket-properly-handle-if-our-service-vanished-durin.patch
+
+-------------------------------------------------------------------
systemd.changes: same change
New:
----
0001-Do-not-unescape-unit-names-in-Install-section.patch
0001-keymap-Add-Lenovo-Enhanced-USB-Keyboard.patch
0001-nspawn-allow-to-bind-mount-journal-on-top-of-a-non-e.patch
0002-analyze-run-use-bus_open_transport_systemd-instead-o.patch
0002-keymap-Asus-EeePC-touchpad-toggle-key.patch
0002-nspawn-restore-journal-directory-is-empty-check.patch
0003-core-never-consider-failure-when-reading-drop-ins-fa.patch
0004-socket-properly-handle-if-our-service-vanished-durin.patch
1020-udev-keyboard-also-hook-into-change-events.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ systemd-mini.spec ++++++
--- /var/tmp/diff_new_pack.nBNzTX/_old 2014-05-28 06:43:15.000000000 +0200
+++ /var/tmp/diff_new_pack.nBNzTX/_new 2014-05-28 06:43:15.000000000 +0200
@@ -495,6 +495,22 @@
Patch252: 0002-journal-properly-detect-language-specified-in-line.patch
# PATCHFIX-UPSTREAM added at 2014/05/21
Patch253: 0003-man-mention-XDG_CONFIG_HOME-in-systemd.unit.patch
+# PATCHFIX-UPSTREAM added at 2014/05/26
+Patch254: 0001-keymap-Add-Lenovo-Enhanced-USB-Keyboard.patch
+# PATCHFIX-UPSTREAM added at 2014/05/26
+Patch255: 0002-keymap-Asus-EeePC-touchpad-toggle-key.patch
+# PATCHFIX-UPSTREAM added at 2014/05/26
+Patch256: 0001-nspawn-allow-to-bind-mount-journal-on-top-of-a-non-e.patch
+# PATCHFIX-UPSTREAM added at 2014/05/26
+Patch257: 0002-nspawn-restore-journal-directory-is-empty-check.patch
+# PATCHFIX-UPSTREAM added at 2014/05/26
+Patch258: 0003-core-never-consider-failure-when-reading-drop-ins-fa.patch
+# PATCHFIX-UPSTREAM added at 2014/05/26
+Patch259: 0004-socket-properly-handle-if-our-service-vanished-durin.patch
+# PATCHFIX-UPSTREAM added at 2014/05/27
+Patch260: 0001-Do-not-unescape-unit-names-in-Install-section.patch
+# PATCHFIX-UPSTREAM added at 2014/05/27
+Patch261: 0002-analyze-run-use-bus_open_transport_systemd-instead-o.patch
# UDEV PATCHES
# ============
@@ -540,6 +556,8 @@
Patch1018: 1018-udev-do-not-skip-the-execution-of-RUN-when-renaming-.patch
# PATCH-FIX-UPSTREAM added at 2014/05/20
Patch1019: 1019-udev-avoid-use-of-uninitialized-err.patch
+# PATCHFIX-UPSTREAM added at 2014/05/26
+Patch1020: 1020-udev-keyboard-also-hook-into-change-events.patch
%description
Systemd is a system and service manager, compatible with SysV and LSB
@@ -940,6 +958,14 @@
%patch251 -p0
%patch252 -p0
%patch253 -p0
+%patch254 -p0
+%patch255 -p0
+%patch256 -p0
+%patch257 -p0
+%patch258 -p0
+%patch259 -p0
+%patch260 -p0
+%patch261 -p0
# udev patches
%patch1001 -p1
@@ -962,6 +988,7 @@
%patch1017 -p0
%patch1018 -p0
%patch1019 -p0
+%patch1020 -p0
# ensure generate files are removed
rm -f units/emergency.service
++++++ systemd.spec ++++++
--- /var/tmp/diff_new_pack.nBNzTX/_old 2014-05-28 06:43:15.000000000 +0200
+++ /var/tmp/diff_new_pack.nBNzTX/_new 2014-05-28 06:43:15.000000000 +0200
@@ -490,6 +490,22 @@
Patch252: 0002-journal-properly-detect-language-specified-in-line.patch
# PATCHFIX-UPSTREAM added at 2014/05/21
Patch253: 0003-man-mention-XDG_CONFIG_HOME-in-systemd.unit.patch
+# PATCHFIX-UPSTREAM added at 2014/05/26
+Patch254: 0001-keymap-Add-Lenovo-Enhanced-USB-Keyboard.patch
+# PATCHFIX-UPSTREAM added at 2014/05/26
+Patch255: 0002-keymap-Asus-EeePC-touchpad-toggle-key.patch
+# PATCHFIX-UPSTREAM added at 2014/05/26
+Patch256: 0001-nspawn-allow-to-bind-mount-journal-on-top-of-a-non-e.patch
+# PATCHFIX-UPSTREAM added at 2014/05/26
+Patch257: 0002-nspawn-restore-journal-directory-is-empty-check.patch
+# PATCHFIX-UPSTREAM added at 2014/05/26
+Patch258: 0003-core-never-consider-failure-when-reading-drop-ins-fa.patch
+# PATCHFIX-UPSTREAM added at 2014/05/26
+Patch259: 0004-socket-properly-handle-if-our-service-vanished-durin.patch
+# PATCHFIX-UPSTREAM added at 2014/05/27
+Patch260: 0001-Do-not-unescape-unit-names-in-Install-section.patch
+# PATCHFIX-UPSTREAM added at 2014/05/27
+Patch261: 0002-analyze-run-use-bus_open_transport_systemd-instead-o.patch
# UDEV PATCHES
# ============
@@ -535,6 +551,8 @@
Patch1018: 1018-udev-do-not-skip-the-execution-of-RUN-when-renaming-.patch
# PATCH-FIX-UPSTREAM added at 2014/05/20
Patch1019: 1019-udev-avoid-use-of-uninitialized-err.patch
+# PATCHFIX-UPSTREAM added at 2014/05/26
+Patch1020: 1020-udev-keyboard-also-hook-into-change-events.patch
%description
Systemd is a system and service manager, compatible with SysV and LSB
@@ -935,6 +953,14 @@
%patch251 -p0
%patch252 -p0
%patch253 -p0
+%patch254 -p0
+%patch255 -p0
+%patch256 -p0
+%patch257 -p0
+%patch258 -p0
+%patch259 -p0
+%patch260 -p0
+%patch261 -p0
# udev patches
%patch1001 -p1
@@ -957,6 +983,7 @@
%patch1017 -p0
%patch1018 -p0
%patch1019 -p0
+%patch1020 -p0
# ensure generate files are removed
rm -f units/emergency.service
++++++ 0001-Do-not-unescape-unit-names-in-Install-section.patch ++++++
Based on 000f6e5667eb4f73e137cbd0d7395a9f9db7728a Mon Sep 17 00:00:00 2001
From: Michal Sekletar <msekleta(a)redhat.com>
Date: Mon, 26 May 2014 20:09:45 +0200
Subject: [PATCH] Do not unescape unit names in [Install] section
https://bugs.freedesktop.org/show_bug.cgi?id=49316
---
src/shared/conf-parser.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- src/shared/conf-parser.c
+++ src/shared/conf-parser.c 2014-05-27 07:36:20.478236631 +0000
@@ -723,7 +723,7 @@ int config_parse_strv(const char *unit,
FOREACH_WORD_QUOTED(w, l, rvalue, state) {
_cleanup_free_ char *n;
- n = cunescape_length(w, l);
+ n = strndup(w, l);
if (!n)
return log_oom();
++++++ 0001-keymap-Add-Lenovo-Enhanced-USB-Keyboard.patch ++++++
>From d258d4967eb24122c2b1014d4e873f61b633f1d2 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt(a)ubuntu.com>
Date: Sun, 25 May 2014 11:57:22 +0200
Subject: [PATCH] keymap: Add Lenovo Enhanced USB Keyboard
https://bugs.freedesktop.org/show_bug.cgi?id=77234
---
hwdb/60-keyboard.hwdb | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git hwdb/60-keyboard.hwdb hwdb/60-keyboard.hwdb
index 832c686..fe5b3ee 100644
--- hwdb/60-keyboard.hwdb
+++ hwdb/60-keyboard.hwdb
@@ -579,6 +579,18 @@ keyboard:dmi:bvn*:bvr*:svnLENOVO*:pn*IdeaPad*Z370*:pvr*
keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*Lenovo*V480*:pvr*
KEYBOARD_KEY_f1=f21
+# enhanced USB keyboard
+keyboard:usb:v04B3p301B*
+ KEYBOARD_KEY_90001=prog1 # ThinkVantage
+ KEYBOARD_KEY_90002=screenlock
+ KEYBOARD_KEY_90003=file
+ KEYBOARD_KEY_90004=wordprocessor
+ KEYBOARD_KEY_90005=spreadsheet
+ KEYBOARD_KEY_90006=calc
+ KEYBOARD_KEY_90007=mail
+ KEYBOARD_KEY_90008=www
+
+
###########################################################
# Logitech
###########################################################
--
1.7.9.2
++++++ 0001-nspawn-allow-to-bind-mount-journal-on-top-of-a-non-e.patch ++++++
>From e6a4a517befe559adf6d1dbbadf425c3538849c9 Mon Sep 17 00:00:00 2001
From: Djalal Harouni <tixxdz(a)opendz.org>
Date: Fri, 11 Apr 2014 01:45:52 +0100
Subject: [PATCH] nspawn: allow to bind mount journal on top of a non empty
container journal dentry
Currently if nspawn was called with --link-journal=host or
--link-journal=auto and the right /var/log/journal/machine-id/ exists
then the bind mount the subdirectory into the container might fail due
to the ~/mycontainer/var/log/journal/machine-id/ of the container not
being empty.
There is no reason to check if the container journal subdir is empty
since there will be a bind mount on top of it. The user asked for a bind
mount so give it.
Note: a next call with --link-journal=guest may fail due to the
/var/log/journal/machine-id/ on the host not being empty.
https://bugs.freedesktop.org/show_bug.cgi?id=76193
Reported-by: Tobias Hunger <tobias.hunger(a)gmail.com>
---
src/nspawn/nspawn.c | 5 -----
1 file changed, 5 deletions(-)
diff --git src/nspawn/nspawn.c src/nspawn/nspawn.c
index 9d9238f..ef84664 100644
--- src/nspawn/nspawn.c
+++ src/nspawn/nspawn.c
@@ -1143,11 +1143,6 @@ static int setup_journal(const char *directory) {
} else if (access(p, F_OK) < 0)
return 0;
- if (dir_is_empty(q) == 0) {
- log_error("%s not empty.", q);
- return -ENOTEMPTY;
- }
-
r = mkdir_p(q, 0755);
if (r < 0) {
log_error("Failed to create %s: %m", q);
--
1.7.9.2
++++++ 0002-analyze-run-use-bus_open_transport_systemd-instead-o.patch ++++++
>From 1f89214e6e990a0b552f6854f87f8514ca384956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas(a)archlinux.org>
Date: Fri, 21 Feb 2014 11:55:24 +0100
Subject: [PATCH] analyze/run: use bus_open_transport_systemd instead of
bus_open_transport
Both systemd-analyze and systemd-run only access org.freedesktop.systemd1
on the bus. This patch allows using systemd-run --user and systemd-analyze
--user even if the user session's bus is not properly integrated with the
systemd user unit.
https://bugs.freedesktop.org/show_bug.cgi?id=79252 and other reports...
---
src/analyze/analyze.c | 2 +-
src/run/run.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git src/analyze/analyze.c src/analyze/analyze.c
index 4c5fcfe..0a4190c 100644
--- src/analyze/analyze.c
+++ src/analyze/analyze.c
@@ -1335,7 +1335,7 @@ int main(int argc, char *argv[]) {
if (r <= 0)
goto finish;
- r = bus_open_transport(arg_transport, arg_host, arg_user, &bus);
+ r = bus_open_transport_systemd(arg_transport, arg_host, arg_user, &bus);
if (r < 0) {
log_error("Failed to create bus connection: %s", strerror(-r));
goto finish;
diff --git src/run/run.c src/run/run.c
index e4c695c..9d5527b 100644
--- src/run/run.c
+++ src/run/run.c
@@ -593,7 +593,7 @@ int main(int argc, char* argv[]) {
arg_description = description;
}
- r = bus_open_transport(arg_transport, arg_host, arg_user, &bus);
+ r = bus_open_transport_systemd(arg_transport, arg_host, arg_user, &bus);
if (r < 0) {
log_error("Failed to create bus connection: %s", strerror(-r));
goto finish;
--
1.7.9.2
++++++ 0002-keymap-Asus-EeePC-touchpad-toggle-key.patch ++++++
>From e55edb22a71e67f01534d28f91c6aa27bba48fc1 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt(a)ubuntu.com>
Date: Sun, 25 May 2014 12:16:35 +0200
Subject: [PATCH] keymap: Asus EeePC touchpad toggle key
Originally is KEY_TOUCHPAD_TOGGLE, but X.org can't handle the big key events,
so use the F21 convention.
https://bugs.freedesktop.org/show_bug.cgi?id=72807
---
hwdb/60-keyboard.hwdb | 1 +
1 file changed, 1 insertion(+)
diff --git hwdb/60-keyboard.hwdb hwdb/60-keyboard.hwdb
index fe5b3ee..05e6a04 100644
--- hwdb/60-keyboard.hwdb
+++ hwdb/60-keyboard.hwdb
@@ -138,6 +138,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svnASUS:pn*
KEYBOARD_KEY_ef=mute
keyboard:name:Asus WMI hotkeys:dmi:bvn*:bvr*:bd*:svnASUS*:pn*:pvr*
+keyboard:name:Eee PC WMI hotkeys:dmi:bvn*:bvr*:bd*:svnASUS*:pn*:pvr*
KEYBOARD_KEY_6b=f21 # Touchpad Toggle
###########################################################
--
1.7.9.2
++++++ 0002-nspawn-restore-journal-directory-is-empty-check.patch ++++++
>From cdb2b9d05a2f3d649f47bd2ba24eb3fe30b52e92 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart(a)poettering.net>
Date: Thu, 22 May 2014 15:19:46 +0900
Subject: [PATCH] nspawn: restore journal directory is empty check
This undoes part of commit e6a4a517befe559adf6d1dbbadf425c3538849c9.
Instead of removing the error message about non-empty journal bind mount
directories, simply downgrade the message to a warning and proceed.
---
src/nspawn/nspawn.c | 3 +++
1 file changed, 3 insertions(+)
diff --git src/nspawn/nspawn.c src/nspawn/nspawn.c
index ef84664..eb9c5e0 100644
--- src/nspawn/nspawn.c
+++ src/nspawn/nspawn.c
@@ -1143,6 +1143,9 @@ static int setup_journal(const char *directory) {
} else if (access(p, F_OK) < 0)
return 0;
+ if (dir_is_empty(q) == 0)
+ log_warning("%s is not empty, proceeding anyway.", q);
+
r = mkdir_p(q, 0755);
if (r < 0) {
log_error("Failed to create %s: %m", q);
--
1.7.9.2
++++++ 0003-core-never-consider-failure-when-reading-drop-ins-fa.patch ++++++
>From bcd816bd349241bcd9c0bfbfd9cfe7b034ba351b Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart(a)poettering.net>
Date: Thu, 22 May 2014 16:49:12 +0900
Subject: [PATCH] core: never consider failure when reading drop-ins fatal
drop-ins don't carry the main configuration of a unit, hence read them
if we can't, complain if we cannot, but don't fail.
---
src/core/load-dropin.c | 42 +++++++++++++-----------------------------
1 file changed, 13 insertions(+), 29 deletions(-)
diff --git src/core/load-dropin.c src/core/load-dropin.c
index 546e560..f2ffc97 100644
--- src/core/load-dropin.c
+++ src/core/load-dropin.c
@@ -58,6 +58,7 @@ static int iterate_dir(
if (errno == ENOENT)
return 0;
+ log_error("Failed to open directory %s: %m", path);
return -errno;
}
@@ -101,7 +102,7 @@ static int process_dir(
char ***strv) {
_cleanup_free_ char *path = NULL;
- int r;
+ int r, q;
assert(u);
assert(unit_path);
@@ -112,11 +113,8 @@ static int process_dir(
if (!path)
return log_oom();
- if (!u->manager->unit_path_cache || set_get(u->manager->unit_path_cache, path)) {
- r = iterate_dir(u, path, dependency, strv);
- if (r < 0)
- return r;
- }
+ if (!u->manager->unit_path_cache || set_get(u->manager->unit_path_cache, path))
+ iterate_dir(u, path, dependency, strv);
if (u->instance) {
_cleanup_free_ char *template = NULL, *p = NULL;
@@ -130,11 +128,8 @@ static int process_dir(
if (!p)
return log_oom();
- if (!u->manager->unit_path_cache || set_get(u->manager->unit_path_cache, p)) {
- r = iterate_dir(u, p, dependency, strv);
- if (r < 0)
- return r;
- }
+ if (!u->manager->unit_path_cache || set_get(u->manager->unit_path_cache, p))
+ iterate_dir(u, p, dependency, strv);
}
return 0;
@@ -152,12 +147,8 @@ char **unit_find_dropin_paths(Unit *u) {
SET_FOREACH(t, u->names, i) {
char **p;
- STRV_FOREACH(p, u->manager->lookup_paths.unit_path) {
- /* This loads the drop-in config snippets */
- r = process_dir(u, *p, t, ".d", _UNIT_DEPENDENCY_INVALID, &strv);
- if (r < 0)
- return NULL;
- }
+ STRV_FOREACH(p, u->manager->lookup_paths.unit_path)
+ process_dir(u, *p, t, ".d", _UNIT_DEPENDENCY_INVALID, &strv);
}
if (strv_isempty(strv))
@@ -186,13 +177,8 @@ int unit_load_dropin(Unit *u) {
char **p;
STRV_FOREACH(p, u->manager->lookup_paths.unit_path) {
- r = process_dir(u, *p, t, ".wants", UNIT_WANTS, NULL);
- if (r < 0)
- return r;
-
- r = process_dir(u, *p, t, ".requires", UNIT_REQUIRES, NULL);
- if (r < 0)
- return r;
+ process_dir(u, *p, t, ".wants", UNIT_WANTS, NULL);
+ process_dir(u, *p, t, ".requires", UNIT_REQUIRES, NULL);
}
}
@@ -201,11 +187,9 @@ int unit_load_dropin(Unit *u) {
return 0;
STRV_FOREACH(f, u->dropin_paths) {
- r = config_parse(u->id, *f, NULL,
- UNIT_VTABLE(u)->sections, config_item_perf_lookup,
- (void*) load_fragment_gperf_lookup, false, false, u);
- if (r < 0)
- return r;
+ config_parse(u->id, *f, NULL,
+ UNIT_VTABLE(u)->sections, config_item_perf_lookup,
+ (void*) load_fragment_gperf_lookup, false, false, u);
}
u->dropin_mtime = now(CLOCK_REALTIME);
--
1.7.9.2
++++++ 0004-socket-properly-handle-if-our-service-vanished-durin.patch ++++++
>From 640ace4a8de907994a1b95f6d368c3e6a8fcf60f Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart(a)poettering.net>
Date: Thu, 22 May 2014 16:56:21 +0900
Subject: [PATCH] socket: properly handle if our service vanished during
runtime
---
src/core/socket.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git src/core/socket.c src/core/socket.c
index 05af8fe..aca20fd 100644
--- src/core/socket.c
+++ src/core/socket.c
@@ -1503,6 +1503,12 @@ static void socket_enter_running(Socket *s, int cfd) {
}
if (!pending) {
+ if (!UNIT_ISSET(s->service)) {
+ log_error_unit(UNIT(s)->id, "%s: service to activate vanished, refusing activation.", UNIT(s)->id);
+ r = -ENOENT;
+ goto fail;
+ }
+
r = manager_add_job(UNIT(s)->manager, JOB_START, UNIT_DEREF(s->service), JOB_REPLACE, true, &error, NULL);
if (r < 0)
goto fail;
--
1.7.9.2
++++++ 1020-udev-keyboard-also-hook-into-change-events.patch ++++++
>From 49804365ea1242456c9763058a59cf68479e07ea Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay(a)vrfy.org>
Date: Mon, 26 May 2014 09:30:21 +0800
Subject: [PATCH] udev: keyboard - also hook into "change" events
Re-apply the keymaps when "udevadm trigger" is called. Hooking into
"add" only would just remove all keymap content from the udev database
instead of applying the new config.
---
rules/60-keyboard.rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git rules/60-keyboard.rules rules/60-keyboard.rules
index 4e0f366..22f71e7 100644
--- rules/60-keyboard.rules
+++ rules/60-keyboard.rules
@@ -1,6 +1,6 @@
# do not edit this file, it will be overwritten on update
-ACTION!="add", GOTO="keyboard_end"
+ACTION=="remove", GOTO="keyboard_end"
KERNEL!="event*", GOTO="keyboard_end"
ENV{ID_INPUT_KEY}=="", GOTO="keyboard_end"
--
1.7.9.2
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package ncurses for openSUSE:Factory checked in at 2014-05-28 06:42:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ncurses (Old)
and /work/SRC/openSUSE:Factory/.ncurses.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ncurses"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ncurses/ncurses.changes 2014-05-22 20:38:19.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ncurses.new/ncurses.changes 2014-05-28 06:42:58.000000000 +0200
@@ -1,0 +2,53 @@
+Mon May 26 08:38:03 UTC 2014 - werner(a)suse.de
+
+- Add ncurses patch 20140524
+ + fix typo in ncurses manpage for the NCURSES_NO_MAGIC_COOKIE
+ environment variable.
+ + improve discussion of input-echoing in curs_getch.3x
+ + clarify discussion in curs_addch.3x of wrapping.
+ + modify parametrized.h to make fln non-padded.
+ + correct several entries which had termcap-style padding used in
+ terminfo: adm21, aj510, alto-h19, att605-pc, x820 -TD
+ + correct syntax for padding in some entries: dg211, h19 -TD
+ + correct ti924-8 which had confused padding versus octal escapes -TD
+ + correct padding in sbi entry -TD
+ + fix an old bug in the termcap emulation; "%i" was ignored in tparm()
+ because the parameters to be incremented were already on the internal
+ stack (report by Corinna Vinschen).
+ + modify tic's "-c" option to take into account the "-C" option to
+ activate additional checks which compare the results from running
+ tparm() on the terminfo expressions versus the translated termcap
+ expressions.
+ + modify tic to allow it to read from FIFOs (report by Matthieu Fronton,
+ cf: 20120324).
+ > patches by Nicolas Boulenguez:
+ + explicit dereferences to suppress some style warnings.
+ + when c_varargs_to_ada.c includes its header, use double quotes
+ instead of <>.
+ + samples/ncurses2-util.adb: removed unused with clause. The warning
+ was removed by an obsolete pragma.
+ + replaced Unreferenced pragmas with Warnings (Off). The latter,
+ available with older GNATs, needs no configure test. This also
+ replaces 3 untested Unreferenced pragmas.
+ + simplified To_C usage in trace handling. Using two parameters allows
+ some basic formatting, and avoids a warning about security with some
+ compiler flags.
+ + for generated Ada sources, replace many snippets with one pure
+ package.
+ + removed C_Chtype and its conversions.
+ + removed C_AttrType and its conversions.
+ + removed conversions between int, Item_Option_Set, Menu_Option_Set.
+ + removed int, Field_Option_Set, Item_Option_Set conversions.
+ + removed C_TraceType, Attribute_Option_Set conversions.
+ + replaced C.int with direct use of Eti_Error, now enumerated. As it
+ was used in a case statement, values were tested by the Ada compiler
+ to be consecutive anyway.
+ + src/Makefile.in: remove duplicate stanza
+ only consider using a project for shared libraries.
+- Add tack patch 1.07.20130713
+ * init.c: typo
+ * fun.c, scan.c: fix warnings from clang 3.3 --analyze
+ * init.c: add error check to setupterm call; ncurses does in fact
+ allow hardcopy and generic terminal descriptions (Debian #716377).
+
+-------------------------------------------------------------------
Old:
----
tack-1.07-20120916.tar.bz2
New:
----
tack-1.07-20130713.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ncurses.spec ++++++
--- /var/tmp/diff_new_pack.nQEKJN/_old 2014-05-28 06:43:00.000000000 +0200
+++ /var/tmp/diff_new_pack.nQEKJN/_new 2014-05-28 06:43:00.000000000 +0200
@@ -44,7 +44,7 @@
Source2: handle.linux
Source3: README.devel
Source4: ncurses-rpmlintrc
-Source5: tack-1.07-20120916.tar.bz2
+Source5: tack-1.07-20130713.tar.bz2
Source6: edit.sed
Source7: baselibs.conf
Patch0: ncurses-%{version}.dif
++++++ ncurses-5.9-patches.tar.bz2 ++++++
++++ 30564 lines of diff (skipped)
++++++ tack-1.07-20120916.tar.bz2 -> tack-1.07-20130713.tar.bz2 ++++++
++++ 7468 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20120916/CHANGES new/tack-1.07-20130713/CHANGES
--- old/tack-1.07-20120916/CHANGES 2012-09-17 01:47:41.000000000 +0200
+++ new/tack-1.07-20130713/CHANGES 2013-07-13 21:07:40.000000000 +0200
@@ -1,3 +1,39 @@
+2013-07-13 Thomas E. Dickey <tom(a)invisible-island.net>
+
+ * init.c: typo
+
+ * fun.c, scan.c: fix warnings from clang 3.3 --analyze
+
+ * init.c:
+ add error check to setupterm call; ncurses does in fact allow hardcopy and
+ generic terminal descriptions (Debian #716377).
+
+ * configure: regen
+
+ * aclocal.m4, configure.in:
+ add/use CF_LIB_PREFIX, CF_MAKEFLAGS, CF_TOP_BUILDDIR and CF_WITH_LIB_PREFIX,
+ to fix unexpanded variables in Makefile.in
+
+ * package/debian/changelog, tack.h, package/tack.spec: bump
+
+ * configure: regen
+
+ * aclocal.m4: resync with my-autoconf:
+ + add 3rd parameter to AC_DEFINE's to allow autoheader to run
+ (several macros)
+ + CF_MAKE_DOCS: apply workaround from xterm #288 for html output
+ + CF_INTEL_COMPILER, CF_XOPEN_SOURCE: $host_os needs AC_CANONICAL_HOST
+ + CF_ACVERSION_CHECK: change from byacc to work around long-ago
+ breakage in autoconf
+ + CF_GCC_VERSION: amend workarounds to accommodate Debian's
+ modification of version-message
+ + CF_CC_ENV_FLAGS: new macro
+ + remove unused macros
+
+2013-02-10 Thomas E. Dickey <tom(a)invisible-island.net>
+
+ * config.sub, config.guess: update to 2013-02-04
+
2012-09-16 Thomas E. Dickey <tom(a)invisible-island.net>
* configure, configure.in:
@@ -195,7 +231,7 @@
* package/debian/changelog, package/tack.spec, tack.h: bump
-2011-06-26 weaver
+2011-06-26 Daniel.Weaver
* ansi.c:
minor bug-fix to show "GR" label in appropriate ANSI character-sets.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20120916/configure.in new/tack-1.07-20130713/configure.in
--- old/tack-1.07-20120916/configure.in 2012-09-17 01:44:45.000000000 +0200
+++ new/tack-1.07-20130713/configure.in 2013-07-13 19:23:39.000000000 +0200
@@ -28,7 +28,7 @@
dnl
dnl Author: Thomas E. Dickey 2007-on
dnl
-dnl $Id: configure.in,v 1.24 2012/09/16 23:44:45 tom Exp $
+dnl $Id: configure.in,v 1.25 2013/07/13 17:23:39 tom Exp $
dnl This is a simple configuration-script for tack which makes it simpler to
dnl build outside the ncurses tree (provided that ncurses was configured using
dnl the --with-ticlib option).
@@ -49,6 +49,7 @@
CF_PROG_INSTALL
CF_PROG_LINT
+CF_MAKEFLAGS
CF_MAKE_TAGS
dnl Things that we don't need (or must override) if we're not building ncurses
@@ -82,12 +83,14 @@
NCURSES_TREE="#"
AC_SUBST(NCURSES_TREE)
+CF_TOP_BUILDDIR
cf_cv_screen=ncurses
cf_cv_libtype=
AC_EXEEXT
AC_OBJEXT
AC_SYS_LONG_FILE_NAMES
+CF_WITH_LIB_PREFIX
CF_ANSI_CC_REQD
CF_DISABLE_ECHO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20120916/fun.c new/tack-1.07-20130713/fun.c
--- old/tack-1.07-20120916/fun.c 2012-03-03 23:05:22.000000000 +0100
+++ new/tack-1.07-20130713/fun.c 2013-07-13 20:48:55.000000000 +0200
@@ -21,7 +21,7 @@
#include <tack.h>
-MODULE_ID("$Id: fun.c,v 1.19 2012/03/03 22:05:22 tom Exp $")
+MODULE_ID("$Id: fun.c,v 1.20 2013/07/13 18:48:55 tom Exp $")
/*
* Test the function keys on the terminal. The code for echo tests
@@ -200,24 +200,32 @@
char *value,
char *lab)
{
- unsigned j;
+ size_t j;
alloc_strings();
if (value) {
- j = (unsigned) strlen(value);
- fkmax = fkmax > j ? fkmax : j;
- /* do not permit duplicates */
- for (j = 0; (int) j < key_count; j++) {
- if (!strcmp(fk_name[j], name)) {
- return;
+ int found = 0;
+ if (key_count != 0) {
+ j = strlen(value);
+ fkmax = (fkmax > j) ? fkmax : j;
+ /* do not permit duplicates */
+ for (j = 0; j < (size_t) key_count; j++) {
+ if (fk_name[j] == 0) {
+ break;
+ } else if (!strcmp(fk_name[j], name)) {
+ found = 1;
+ break;
+ }
}
}
- fkval[key_count] = value;
- fk_tested[key_count] = 0;
- fk_label[key_count] = lab;
- fk_name[key_count++] = name;
- if (lab) {
- got_labels = TRUE;
+ if (!found) {
+ fkval[key_count] = value;
+ fk_tested[key_count] = 0;
+ fk_label[key_count] = lab;
+ fk_name[key_count++] = name;
+ if (lab) {
+ got_labels = TRUE;
+ }
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20120916/init.c new/tack-1.07-20130713/init.c
--- old/tack-1.07-20120916/init.c 2012-03-03 16:15:32.000000000 +0100
+++ new/tack-1.07-20130713/init.c 2013-07-13 20:59:47.000000000 +0200
@@ -23,7 +23,7 @@
#include <tack.h>
#include <tic.h>
-MODULE_ID("$Id: init.c,v 1.14 2012/03/03 15:15:32 tom Exp $")
+MODULE_ID("$Id: init.c,v 1.16 2013/07/13 18:59:47 tom Exp $")
#if NCURSES_VERSION_MAJOR >= 5 || NCURSES_VERSION_PATCH >= 981219
#define _nc_get_curterm(p) _nc_get_tty_mode(p)
@@ -222,12 +222,16 @@
#endif
/**
- * This call will load the terminfo data base and set the cur-term
- * variable. Only terminals that actually exist will get here so its
- * OK to ignore errors. This is a good thing since ncurses does not
- * permit (os) or (gn) to be set.
+ * This call loads the terminfo data base and sets the cur-term
+ * variable. Only terminals that actually exist get here so it is
+ * simpler to handle errors.
*/
- setupterm(tty_basename, 1, &status);
+ if (setupterm(tty_basename, 1, &status) != OK) {
+ fprintf(stderr, "The \"%s\" terminal is listed as %s\n",
+ tty_basename,
+ (status > 0) ? "hardcopy" : "generic");
+ ExitProgram(EXIT_FAILURE);
+ }
/**
* Get the current terminal definitions. This must be done before
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20120916/package/debian/changelog new/tack-1.07-20130713/package/debian/changelog
--- old/tack-1.07-20120916/package/debian/changelog 2012-09-16 16:01:27.000000000 +0200
+++ new/tack-1.07-20130713/package/debian/changelog 2013-07-13 17:45:17.000000000 +0200
@@ -1,3 +1,9 @@
+tack (1.07-20130713) unstable; urgency=low
+
+ * improvements for configure script
+
+ -- Thomas E. Dickey <dickey(a)invisible-island.net> Sat, 13 Jul 2013 11:44:55 -0400
+
tack (1.07-20120916) unstable; urgency=low
* improvements for configure script
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20120916/package/tack.spec new/tack-1.07-20130713/package/tack.spec
--- old/tack-1.07-20120916/package/tack.spec 2012-09-16 16:00:29.000000000 +0200
+++ new/tack-1.07-20130713/package/tack.spec 2013-07-13 17:45:05.000000000 +0200
@@ -1,8 +1,8 @@
Summary: tack - terminfo action checker
%define AppProgram tack
%define AppVersion 1.07
-%define AppRelease 20120916
-# $XTermId: tack.spec,v 1.7 2012/09/16 14:00:29 tom Exp $
+%define AppRelease 20130713
+# $XTermId: tack.spec,v 1.8 2013/07/13 15:45:05 tom Exp $
Name: %{AppProgram}
Version: %{AppVersion}
Release: %{AppRelease}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20120916/scan.c new/tack-1.07-20130713/scan.c
--- old/tack-1.07-20120916/scan.c 2012-03-03 17:12:35.000000000 +0100
+++ new/tack-1.07-20130713/scan.c 2013-07-13 20:43:00.000000000 +0200
@@ -22,7 +22,7 @@
#include <tack.h>
-MODULE_ID("$Id: scan.c,v 1.11 2012/03/03 16:12:35 tom Exp $")
+MODULE_ID("$Id: scan.c,v 1.12 2013/07/13 18:43:00 tom Exp $")
size_t scan_max; /* length of longest scan code */
char **scan_up, **scan_down, **scan_name;
@@ -146,9 +146,9 @@
scan_up = (char **) malloc(sizeof(char *) * MAX_SCAN);
scan_down = (char **) malloc(sizeof(char *) * MAX_SCAN);
scan_name = (char **) malloc(sizeof(char *) * MAX_SCAN);
- scan_tested = (size_t *) malloc(sizeof(size_t *) * MAX_SCAN);
- scan_length = (size_t *) malloc(sizeof(size_t *) * MAX_SCAN);
- scan_value = (unsigned *) malloc(sizeof(unsigned *) * MAX_SCAN);
+ scan_tested = (size_t *) malloc(sizeof(size_t) * MAX_SCAN);
+ scan_length = (size_t *) malloc(sizeof(size_t) * MAX_SCAN);
+ scan_value = (unsigned *) malloc(sizeof(unsigned) * MAX_SCAN);
scan_up[0] = scan_down[0] = scan_name[0] = (char *) 0;
str = (char *) malloc((size_t) CHUNK); /* buffer space */
sl = str + CHUNK_LO; /* an upper limit */
@@ -176,7 +176,8 @@
scan_max = len;
scan_value[i] = UChar(scan_name[i][0]);
- if (scan_name[i][1]) /* multi-character name */
+ if (scan_name[i][0]
+ && scan_name[i][1]) /* multi-character name */
for (j = 0; scan_special[j].name; j++) {
if (!strcmp(scan_name[i], scan_special[j].name)) {
scan_value[i] = scan_special[j].type;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20120916/tack.1 new/tack-1.07-20130713/tack.1
--- old/tack-1.07-20120916/tack.1 2011-06-26 19:17:20.000000000 +0200
+++ new/tack-1.07-20130713/tack.1 2011-06-26 19:17:20.000000000 +0200
@@ -26,7 +26,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $Id: tack.1,v 1.4 2011/06/26 17:17:20 weaver Exp $
+.\" $Id: tack.1,v 1.4 2011/06/26 17:17:20 Daniel.Weaver Exp $
.TH tack 1M ""
.ds n 5
.ds d @TERMINFO@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.07-20120916/tack.h new/tack-1.07-20130713/tack.h
--- old/tack-1.07-20120916/tack.h 2012-09-16 17:16:00.000000000 +0200
+++ new/tack-1.07-20130713/tack.h 2013-07-13 17:45:17.000000000 +0200
@@ -19,7 +19,7 @@
** Boston, MA 02110-1301, USA
*/
-/* $Id: tack.h,v 1.35 2012/09/16 15:16:00 Adrian.Bunk Exp $ */
+/* $Id: tack.h,v 1.36 2013/07/13 15:45:17 tom Exp $ */
#ifndef NCURSES_TACK_H_incl
#define NCURSES_TACK_H_incl 1
@@ -28,7 +28,7 @@
#define MAJOR_VERSION 1
#define MINOR_VERSION 7
-#define PATCH_VERSION 20120916
+#define PATCH_VERSION 20130713
#ifdef HAVE_CONFIG_H
#include <ncurses_cfg.h>
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2014-05-27 18:58:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kernel-source (Old)
and /work/SRC/openSUSE:Factory/.kernel-source.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kernel-source/kernel-debug.changes 2014-05-23 10:55:55.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-debug.changes 2014-05-27 18:58:41.000000000 +0200
@@ -1,0 +2,29 @@
+Fri May 23 15:27:33 CEST 2014 - jeffm(a)suse.de
+
+- config: sync vanilla configs for 3.15-rc6.
+- commit acf7dab
+
+-------------------------------------------------------------------
+Fri May 23 15:13:50 CEST 2014 - jeffm(a)suse.de
+
+- Update to 3.15-rc6.
+- Config changes:
+ - ACPI_PROCFS_POWER=y (default n)
+ - Should eventually be =n once userspace tools have been audited.
+- commit d2be7e3
+
+-------------------------------------------------------------------
+Fri May 23 14:37:40 CEST 2014 - jdelvare(a)suse.de
+
+- Update ppc config files: Disable SH_MOBILE media drivers
+ These are useless on PowerPC.
+- commit cacd723
+
+-------------------------------------------------------------------
+Fri May 23 11:27:56 CEST 2014 - jdelvare(a)suse.de
+
+- Update config files: Disable remaining R-CAR drivers
+ These drivers are useless except on arm/shmobile.
+- commit 2dd69e8
+
+-------------------------------------------------------------------
@@ -167,0 +197,7 @@
+
+-------------------------------------------------------------------
+Mon May 12 10:15:01 CEST 2014 - mmarek(a)suse.cz
+
+- rpm/kernel-binary.spec.in: Do not keep debug symbols in vmlinux-*.gz
+ (bnc#877267)
+- commit f928d60
kernel-default.changes: same change
kernel-desktop.changes: same change
kernel-docs.changes: same change
kernel-ec2.changes: same change
kernel-exynos.changes: same change
kernel-lpae.changes: same change
kernel-obs-build.changes: same change
kernel-obs-qa-xen.changes: same change
kernel-obs-qa.changes: same change
kernel-pae.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-vanilla.changes: same change
kernel-xen.changes: same change
Old:
----
linux-3.15-rc5.tar.xz
New:
----
linux-3.15-rc6.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.RyJQmM/_old 2014-05-27 18:58:52.000000000 +0200
+++ /var/tmp/diff_new_pack.RyJQmM/_new 2014-05-27 18:58:52.000000000 +0200
@@ -19,8 +19,8 @@
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
-%define srcversion 3.15-rc5
-%define patchversion 3.15.0-rc5
+%define srcversion 3.15-rc6
+%define patchversion 3.15.0-rc6
%define variant %{nil}
%define vanilla_only 0
@@ -59,9 +59,9 @@
Summary: A Debug Version of the Kernel
License: GPL-2.0
Group: System/Kernel
-Version: 3.15.rc5
+Version: 3.15.rc6
%if 0%{?is_kotd}
-Release: <RELEASE>.gcc68f12
+Release: <RELEASE>.g346029d
%else
Release: 0
%endif
@@ -539,6 +539,20 @@
# mark the file 0644 again
chmod +x %buildroot/$vmlinux
if test $1 == "--compressed"; then
+%if 0%{?__debug_package:1}
+ # split the debug information just to keep the compressed file
+ # reasonably small
+ local vmlinux_debug=usr/lib/debug/$vmlinux.debug
+ mkdir -p $(dirname %buildroot/$vmlinux_debug)
+ objcopy --only-keep-debug \
+ %buildroot/$vmlinux \
+ %buildroot/$vmlinux_debug || :
+ objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
+ --strip-debug \
+ %buildroot/$vmlinux || :
+ # let find-debuginfo.sh do the real job
+ rm -f %buildroot/$vmlinux_debug
+%endif
gzip -n -k -9 %buildroot/$vmlinux
ghost_vmlinux=true
else
kernel-default.spec: same change
kernel-desktop.spec: same change
++++++ kernel-docs.spec ++++++
--- /var/tmp/diff_new_pack.RyJQmM/_old 2014-05-27 18:58:52.000000000 +0200
+++ /var/tmp/diff_new_pack.RyJQmM/_new 2014-05-27 18:58:52.000000000 +0200
@@ -16,7 +16,7 @@
#
-%define patchversion 3.15.0-rc5
+%define patchversion 3.15.0-rc6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -25,9 +25,9 @@
Summary: Kernel Documentation
License: GPL-2.0
Group: Documentation/Man
-Version: 3.15.rc5
+Version: 3.15.rc6
%if 0%{?is_kotd}
-Release: <RELEASE>.gcc68f12
+Release: <RELEASE>.g346029d
%else
Release: 0
%endif
++++++ kernel-ec2.spec ++++++
--- /var/tmp/diff_new_pack.RyJQmM/_old 2014-05-27 18:58:52.000000000 +0200
+++ /var/tmp/diff_new_pack.RyJQmM/_new 2014-05-27 18:58:52.000000000 +0200
@@ -19,8 +19,8 @@
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
-%define srcversion 3.15-rc5
-%define patchversion 3.15.0-rc5
+%define srcversion 3.15-rc6
+%define patchversion 3.15.0-rc6
%define variant %{nil}
%define vanilla_only 0
@@ -59,9 +59,9 @@
Summary: The Amazon EC2 Xen Kernel
License: GPL-2.0
Group: System/Kernel
-Version: 3.15.rc5
+Version: 3.15.rc6
%if 0%{?is_kotd}
-Release: <RELEASE>.gcc68f12
+Release: <RELEASE>.g346029d
%else
Release: 0
%endif
@@ -538,6 +538,20 @@
# mark the file 0644 again
chmod +x %buildroot/$vmlinux
if test $1 == "--compressed"; then
+%if 0%{?__debug_package:1}
+ # split the debug information just to keep the compressed file
+ # reasonably small
+ local vmlinux_debug=usr/lib/debug/$vmlinux.debug
+ mkdir -p $(dirname %buildroot/$vmlinux_debug)
+ objcopy --only-keep-debug \
+ %buildroot/$vmlinux \
+ %buildroot/$vmlinux_debug || :
+ objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
+ --strip-debug \
+ %buildroot/$vmlinux || :
+ # let find-debuginfo.sh do the real job
+ rm -f %buildroot/$vmlinux_debug
+%endif
gzip -n -k -9 %buildroot/$vmlinux
ghost_vmlinux=true
else
kernel-exynos.spec: same change
kernel-lpae.spec: same change
++++++ kernel-obs-build.spec ++++++
--- /var/tmp/diff_new_pack.RyJQmM/_old 2014-05-27 18:58:52.000000000 +0200
+++ /var/tmp/diff_new_pack.RyJQmM/_new 2014-05-27 18:58:52.000000000 +0200
@@ -19,7 +19,7 @@
#!BuildIgnore: post-build-checks
-%define patchversion 3.15.0-rc5
+%define patchversion 3.15.0-rc6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -45,9 +45,9 @@
Summary: package kernel and initrd for OBS VM builds
License: GPL-2.0
Group: SLES
-Version: 3.15.rc5
+Version: 3.15.rc6
%if 0%{?is_kotd}
-Release: <RELEASE>.gcc68f12
+Release: <RELEASE>.g346029d
%else
Release: 0
%endif
++++++ kernel-obs-qa-xen.spec ++++++
--- /var/tmp/diff_new_pack.RyJQmM/_old 2014-05-27 18:58:52.000000000 +0200
+++ /var/tmp/diff_new_pack.RyJQmM/_new 2014-05-27 18:58:52.000000000 +0200
@@ -17,7 +17,7 @@
# needsrootforbuild
-%define patchversion 3.15.0-rc5
+%define patchversion 3.15.0-rc6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -36,9 +36,9 @@
Summary: Basic QA tests for the kernel
License: GPL-2.0
Group: SLES
-Version: 3.15.rc5
+Version: 3.15.rc6
%if 0%{?is_kotd}
-Release: <RELEASE>.gcc68f12
+Release: <RELEASE>.g346029d
%else
Release: 0
%endif
kernel-obs-qa.spec: same change
++++++ kernel-pae.spec ++++++
--- /var/tmp/diff_new_pack.RyJQmM/_old 2014-05-27 18:58:52.000000000 +0200
+++ /var/tmp/diff_new_pack.RyJQmM/_new 2014-05-27 18:58:52.000000000 +0200
@@ -19,8 +19,8 @@
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
-%define srcversion 3.15-rc5
-%define patchversion 3.15.0-rc5
+%define srcversion 3.15-rc6
+%define patchversion 3.15.0-rc6
%define variant %{nil}
%define vanilla_only 0
@@ -59,9 +59,9 @@
Summary: Kernel with PAE Support
License: GPL-2.0
Group: System/Kernel
-Version: 3.15.rc5
+Version: 3.15.rc6
%if 0%{?is_kotd}
-Release: <RELEASE>.gcc68f12
+Release: <RELEASE>.g346029d
%else
Release: 0
%endif
@@ -547,6 +547,20 @@
# mark the file 0644 again
chmod +x %buildroot/$vmlinux
if test $1 == "--compressed"; then
+%if 0%{?__debug_package:1}
+ # split the debug information just to keep the compressed file
+ # reasonably small
+ local vmlinux_debug=usr/lib/debug/$vmlinux.debug
+ mkdir -p $(dirname %buildroot/$vmlinux_debug)
+ objcopy --only-keep-debug \
+ %buildroot/$vmlinux \
+ %buildroot/$vmlinux_debug || :
+ objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
+ --strip-debug \
+ %buildroot/$vmlinux || :
+ # let find-debuginfo.sh do the real job
+ rm -f %buildroot/$vmlinux_debug
+%endif
gzip -n -k -9 %buildroot/$vmlinux
ghost_vmlinux=true
else
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.RyJQmM/_old 2014-05-27 18:58:52.000000000 +0200
+++ /var/tmp/diff_new_pack.RyJQmM/_new 2014-05-27 18:58:52.000000000 +0200
@@ -17,8 +17,8 @@
# icecream 0
-%define srcversion 3.15-rc5
-%define patchversion 3.15.0-rc5
+%define srcversion 3.15-rc6
+%define patchversion 3.15.0-rc6
%define variant %{nil}
%define vanilla_only 0
@@ -30,9 +30,9 @@
Summary: The Linux Kernel Sources
License: GPL-2.0
Group: Development/Sources
-Version: 3.15.rc5
+Version: 3.15.rc6
%if 0%{?is_kotd}
-Release: <RELEASE>.gcc68f12
+Release: <RELEASE>.g346029d
%else
Release: 0
%endif
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.RyJQmM/_old 2014-05-27 18:58:52.000000000 +0200
+++ /var/tmp/diff_new_pack.RyJQmM/_new 2014-05-27 18:58:52.000000000 +0200
@@ -24,10 +24,10 @@
Summary: Kernel Symbol Versions (modversions)
License: GPL-2.0
Group: Development/Sources
-Version: 3.15.rc5
+Version: 3.15.rc6
%if %using_buildservice
%if 0%{?is_kotd}
-Release: <RELEASE>.gcc68f12
+Release: <RELEASE>.g346029d
%else
Release: 0
%endif
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.RyJQmM/_old 2014-05-27 18:58:52.000000000 +0200
+++ /var/tmp/diff_new_pack.RyJQmM/_new 2014-05-27 18:58:52.000000000 +0200
@@ -19,8 +19,8 @@
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
-%define srcversion 3.15-rc5
-%define patchversion 3.15.0-rc5
+%define srcversion 3.15-rc6
+%define patchversion 3.15.0-rc6
%define variant %{nil}
%define vanilla_only 0
@@ -59,9 +59,9 @@
Summary: The Standard Kernel - without any SUSE patches
License: GPL-2.0
Group: System/Kernel
-Version: 3.15.rc5
+Version: 3.15.rc6
%if 0%{?is_kotd}
-Release: <RELEASE>.gcc68f12
+Release: <RELEASE>.g346029d
%else
Release: 0
%endif
@@ -535,6 +535,20 @@
# mark the file 0644 again
chmod +x %buildroot/$vmlinux
if test $1 == "--compressed"; then
+%if 0%{?__debug_package:1}
+ # split the debug information just to keep the compressed file
+ # reasonably small
+ local vmlinux_debug=usr/lib/debug/$vmlinux.debug
+ mkdir -p $(dirname %buildroot/$vmlinux_debug)
+ objcopy --only-keep-debug \
+ %buildroot/$vmlinux \
+ %buildroot/$vmlinux_debug || :
+ objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
+ --strip-debug \
+ %buildroot/$vmlinux || :
+ # let find-debuginfo.sh do the real job
+ rm -f %buildroot/$vmlinux_debug
+%endif
gzip -n -k -9 %buildroot/$vmlinux
ghost_vmlinux=true
else
kernel-xen.spec: same change
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.RyJQmM/_old 2014-05-27 18:58:52.000000000 +0200
+++ /var/tmp/diff_new_pack.RyJQmM/_new 2014-05-27 18:58:52.000000000 +0200
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=3.15-rc5
+SRCVERSION=3.15-rc6
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# buildservice projects to build the kernel against
++++++ config.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/arm64/default new/config/arm64/default
--- old/config/arm64/default 2014-05-21 19:34:45.000000000 +0200
+++ new/config/arm64/default 2014-05-23 15:27:33.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 3.15.0-rc5 Kernel Configuration
+# Linux/arm64 3.15.0-rc6 Kernel Configuration
#
CONFIG_ARM64=y
CONFIG_64BIT=y
@@ -3406,7 +3406,7 @@
# CONFIG_SAMSUNG_USB3PHY is not set
# CONFIG_USB_GPIO_VBUS is not set
# CONFIG_USB_ISP1301 is not set
-CONFIG_USB_RCAR_PHY=m
+# CONFIG_USB_RCAR_PHY is not set
# CONFIG_USB_GADGET is not set
CONFIG_MMC=m
# CONFIG_MMC_DEBUG is not set
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/armv6hl/default new/config/armv6hl/default
--- old/config/armv6hl/default 2014-05-21 19:34:45.000000000 +0200
+++ new/config/armv6hl/default 2014-05-23 15:27:33.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.15.0-rc5 Kernel Configuration
+# Linux/arm 3.15.0-rc6 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -2829,7 +2829,7 @@
# CONFIG_GPIO_ZEVIO is not set
CONFIG_GPIO_MXC=y
CONFIG_GPIO_PL061=y
-CONFIG_GPIO_RCAR=m
+# CONFIG_GPIO_RCAR is not set
# CONFIG_GPIO_SCH311X is not set
CONFIG_GPIO_SYSCON=m
CONFIG_GPIO_GRGPIO=m
@@ -3549,10 +3549,9 @@
CONFIG_VIDEO_OMAP2_VOUT_VRFB=y
CONFIG_VIDEO_OMAP2_VOUT=m
CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_SCALE_CROP=m
CONFIG_SOC_CAMERA_PLATFORM=m
# CONFIG_VIDEO_MX3 is not set
-CONFIG_VIDEO_RCAR_VIN=m
+# CONFIG_VIDEO_RCAR_VIN is not set
# CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
# CONFIG_VIDEO_SH_MOBILE_CEU is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
@@ -3849,8 +3848,7 @@
# CONFIG_DRM_EXYNOS is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_ARMADA=m
-CONFIG_DRM_RCAR_DU=m
-CONFIG_DRM_RCAR_LVDS=y
+# CONFIG_DRM_RCAR_DU is not set
CONFIG_DRM_SHMOBILE=m
CONFIG_DRM_OMAP=y
CONFIG_DRM_OMAP_NUM_CRTCS=1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/armv7hl/default new/config/armv7hl/default
--- old/config/armv7hl/default 2014-05-21 19:34:45.000000000 +0200
+++ new/config/armv7hl/default 2014-05-23 15:27:33.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.15.0-rc5 Kernel Configuration
+# Linux/arm 3.15.0-rc6 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/armv7hl/exynos new/config/armv7hl/exynos
--- old/config/armv7hl/exynos 2014-05-21 19:34:45.000000000 +0200
+++ new/config/armv7hl/exynos 2014-05-23 15:27:33.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.15.0-rc5 Kernel Configuration
+# Linux/arm 3.15.0-rc6 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_MIGHT_HAVE_PCI=y
@@ -3484,9 +3484,8 @@
CONFIG_VIDEO_EM28XX_RC=m
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_SCALE_CROP=m
CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_VIDEO_RCAR_VIN=m
+# CONFIG_VIDEO_RCAR_VIN is not set
# CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
# CONFIG_VIDEO_SH_MOBILE_CEU is not set
# CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS is not set
@@ -4363,7 +4362,7 @@
CONFIG_SAMSUNG_USB3PHY=m
CONFIG_USB_GPIO_VBUS=m
CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=m
+# CONFIG_USB_RCAR_PHY is not set
CONFIG_USB_ULPI=y
CONFIG_USB_GADGET=m
# CONFIG_USB_GADGET_DEBUG is not set
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/armv7hl/lpae new/config/armv7hl/lpae
--- old/config/armv7hl/lpae 2014-05-21 19:34:45.000000000 +0200
+++ new/config/armv7hl/lpae 2014-05-23 15:27:33.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.15.0-rc5 Kernel Configuration
+# Linux/arm 3.15.0-rc6 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -2925,7 +2925,7 @@
CONFIG_GPIO_MSM_V2=m
CONFIG_GPIO_MXC=y
CONFIG_GPIO_PL061=y
-CONFIG_GPIO_RCAR=m
+# CONFIG_GPIO_RCAR is not set
# CONFIG_GPIO_SCH311X is not set
CONFIG_GPIO_SYSCON=m
CONFIG_GPIO_GRGPIO=m
@@ -3649,10 +3649,9 @@
CONFIG_VIDEO_EM28XX_RC=m
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_SCALE_CROP=m
CONFIG_SOC_CAMERA_PLATFORM=m
# CONFIG_VIDEO_MX3 is not set
-CONFIG_VIDEO_RCAR_VIN=m
+# CONFIG_VIDEO_RCAR_VIN is not set
# CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
# CONFIG_VIDEO_SH_MOBILE_CEU is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
@@ -3954,8 +3953,7 @@
# CONFIG_DRM_EXYNOS is not set
CONFIG_DRM_UDL=m
CONFIG_DRM_ARMADA=m
-CONFIG_DRM_RCAR_DU=m
-CONFIG_DRM_RCAR_LVDS=y
+# CONFIG_DRM_RCAR_DU is not set
CONFIG_DRM_SHMOBILE=m
CONFIG_DRM_OMAP=y
CONFIG_DRM_OMAP_NUM_CRTCS=2
@@ -4592,7 +4590,7 @@
CONFIG_USB_GPIO_VBUS=m
CONFIG_USB_ISP1301=m
CONFIG_USB_MXS_PHY=m
-CONFIG_USB_RCAR_PHY=m
+# CONFIG_USB_RCAR_PHY is not set
CONFIG_USB_ULPI=y
CONFIG_USB_ULPI_VIEWPORT=y
CONFIG_USB_GADGET=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/debug new/config/i386/debug
--- old/config/i386/debug 2014-05-21 19:34:45.000000000 +0200
+++ new/config/i386/debug 2014-05-23 15:27:33.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.15.0-rc5 Kernel Configuration
+# Linux/i386 3.15.0-rc6 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -572,6 +572,7 @@
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_PROCFS_POWER=y
CONFIG_ACPI_EC_DEBUGFS=m
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m
@@ -4261,9 +4262,8 @@
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_SCALE_CROP=m
CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_VIDEO_RCAR_VIN=m
+# CONFIG_VIDEO_RCAR_VIN is not set
# CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
# CONFIG_VIDEO_SH_MOBILE_CEU is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
@@ -5343,7 +5343,7 @@
# CONFIG_SAMSUNG_USB3PHY is not set
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=m
+# CONFIG_USB_RCAR_PHY is not set
# CONFIG_USB_GADGET is not set
CONFIG_UWB=m
CONFIG_UWB_HWA=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/default new/config/i386/default
--- old/config/i386/default 2014-05-21 19:34:45.000000000 +0200
+++ new/config/i386/default 2014-05-23 15:27:33.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.15.0-rc5 Kernel Configuration
+# Linux/i386 3.15.0-rc6 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -560,6 +560,7 @@
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_PROCFS_POWER=y
CONFIG_ACPI_EC_DEBUGFS=m
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m
@@ -4287,9 +4288,8 @@
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_SCALE_CROP=m
CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_VIDEO_RCAR_VIN=m
+# CONFIG_VIDEO_RCAR_VIN is not set
# CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
# CONFIG_VIDEO_SH_MOBILE_CEU is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
@@ -5372,7 +5372,7 @@
# CONFIG_SAMSUNG_USB3PHY is not set
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=m
+# CONFIG_USB_RCAR_PHY is not set
# CONFIG_USB_GADGET is not set
CONFIG_UWB=m
CONFIG_UWB_HWA=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/desktop new/config/i386/desktop
--- old/config/i386/desktop 2014-05-21 19:34:45.000000000 +0200
+++ new/config/i386/desktop 2014-05-23 15:27:33.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.15.0-rc5 Kernel Configuration
+# Linux/i386 3.15.0-rc6 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -576,6 +576,7 @@
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_PROCFS_POWER=y
CONFIG_ACPI_EC_DEBUGFS=m
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m
@@ -4207,9 +4208,8 @@
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_SCALE_CROP=m
CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_VIDEO_RCAR_VIN=m
+# CONFIG_VIDEO_RCAR_VIN is not set
# CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
# CONFIG_VIDEO_SH_MOBILE_CEU is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
@@ -5222,7 +5222,7 @@
# CONFIG_SAMSUNG_USB3PHY is not set
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=m
+# CONFIG_USB_RCAR_PHY is not set
# CONFIG_USB_GADGET is not set
CONFIG_UWB=m
CONFIG_UWB_HWA=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/ec2 new/config/i386/ec2
--- old/config/i386/ec2 2014-05-21 19:34:45.000000000 +0200
+++ new/config/i386/ec2 2014-05-23 15:27:33.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.15.0-rc5 Kernel Configuration
+# Linux/i386 3.15.0-rc6 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/pae new/config/i386/pae
--- old/config/i386/pae 2014-05-21 19:34:45.000000000 +0200
+++ new/config/i386/pae 2014-05-23 15:27:33.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.15.0-rc5 Kernel Configuration
+# Linux/i386 3.15.0-rc6 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -577,6 +577,7 @@
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_PROCFS_POWER=y
CONFIG_ACPI_EC_DEBUGFS=m
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m
@@ -4208,9 +4209,8 @@
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_SCALE_CROP=m
CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_VIDEO_RCAR_VIN=m
+# CONFIG_VIDEO_RCAR_VIN is not set
# CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
# CONFIG_VIDEO_SH_MOBILE_CEU is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
@@ -5231,7 +5231,7 @@
# CONFIG_SAMSUNG_USB3PHY is not set
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=m
+# CONFIG_USB_RCAR_PHY is not set
# CONFIG_USB_GADGET is not set
CONFIG_UWB=m
CONFIG_UWB_HWA=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/vanilla new/config/i386/vanilla
--- old/config/i386/vanilla 2014-05-21 19:34:45.000000000 +0200
+++ new/config/i386/vanilla 2014-05-23 15:27:33.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.15.0-rc5 Kernel Configuration
+# Linux/i386 3.15.0-rc6 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -558,6 +558,7 @@
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_PROCFS_POWER=y
CONFIG_ACPI_EC_DEBUGFS=m
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m
@@ -4281,9 +4282,8 @@
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_SCALE_CROP=m
CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_VIDEO_RCAR_VIN=m
+# CONFIG_VIDEO_RCAR_VIN is not set
# CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
# CONFIG_VIDEO_SH_MOBILE_CEU is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
@@ -5366,7 +5366,7 @@
# CONFIG_SAMSUNG_USB3PHY is not set
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=m
+# CONFIG_USB_RCAR_PHY is not set
# CONFIG_USB_GADGET is not set
CONFIG_UWB=m
CONFIG_UWB_HWA=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/xen new/config/i386/xen
--- old/config/i386/xen 2014-05-21 19:34:45.000000000 +0200
+++ new/config/i386/xen 2014-05-23 15:27:33.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.15.0-rc5 Kernel Configuration
+# Linux/i386 3.15.0-rc6 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -479,6 +479,7 @@
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_PROCFS_POWER=y
CONFIG_ACPI_EC_DEBUGFS=m
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m
@@ -3979,9 +3980,8 @@
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_SCALE_CROP=m
CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_VIDEO_RCAR_VIN=m
+# CONFIG_VIDEO_RCAR_VIN is not set
# CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
# CONFIG_VIDEO_SH_MOBILE_CEU is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
@@ -4998,7 +4998,7 @@
# CONFIG_SAMSUNG_USB3PHY is not set
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=m
+# CONFIG_USB_RCAR_PHY is not set
# CONFIG_USB_GADGET is not set
CONFIG_UWB=m
CONFIG_UWB_HWA=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/default new/config/ppc/default
--- old/config/ppc/default 2014-05-21 19:34:45.000000000 +0200
+++ new/config/ppc/default 2014-05-23 15:27:33.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.15.0-rc5 Kernel Configuration
+# Linux/powerpc 3.15.0-rc6 Kernel Configuration
#
# CONFIG_PPC64 is not set
@@ -3548,11 +3548,10 @@
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_SCALE_CROP=m
CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_VIDEO_RCAR_VIN=m
-CONFIG_VIDEO_SH_MOBILE_CSI2=m
-CONFIG_VIDEO_SH_MOBILE_CEU=m
+# CONFIG_VIDEO_RCAR_VIN is not set
+# CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
+# CONFIG_VIDEO_SH_MOBILE_CEU is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
# CONFIG_VIDEO_SH_VEU is not set
@@ -4488,7 +4487,7 @@
# CONFIG_SAMSUNG_USB3PHY is not set
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=m
+# CONFIG_USB_RCAR_PHY is not set
# CONFIG_USB_GADGET is not set
CONFIG_UWB=m
CONFIG_UWB_HWA=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/vanilla new/config/ppc/vanilla
--- old/config/ppc/vanilla 2014-05-21 19:34:45.000000000 +0200
+++ new/config/ppc/vanilla 2014-05-23 15:27:33.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.15.0-rc5 Kernel Configuration
+# Linux/powerpc 3.15.0-rc6 Kernel Configuration
#
# CONFIG_PPC64 is not set
@@ -3542,11 +3542,10 @@
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_SCALE_CROP=m
CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_VIDEO_RCAR_VIN=m
-CONFIG_VIDEO_SH_MOBILE_CSI2=m
-CONFIG_VIDEO_SH_MOBILE_CEU=m
+# CONFIG_VIDEO_RCAR_VIN is not set
+# CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
+# CONFIG_VIDEO_SH_MOBILE_CEU is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
# CONFIG_VIDEO_SH_VEU is not set
@@ -4482,7 +4481,7 @@
# CONFIG_SAMSUNG_USB3PHY is not set
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=m
+# CONFIG_USB_RCAR_PHY is not set
# CONFIG_USB_GADGET is not set
CONFIG_UWB=m
CONFIG_UWB_HWA=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/debug new/config/ppc64/debug
--- old/config/ppc64/debug 2014-05-21 19:34:45.000000000 +0200
+++ new/config/ppc64/debug 2014-05-23 15:27:33.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.15.0-rc5 Kernel Configuration
+# Linux/powerpc 3.15.0-rc6 Kernel Configuration
#
CONFIG_PPC64=y
@@ -3687,9 +3687,8 @@
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_SCALE_CROP=m
CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_VIDEO_RCAR_VIN=m
+# CONFIG_VIDEO_RCAR_VIN is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
# CONFIG_VIDEO_SH_VEU is not set
@@ -4622,7 +4621,7 @@
# CONFIG_SAMSUNG_USB3PHY is not set
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=m
+# CONFIG_USB_RCAR_PHY is not set
# CONFIG_USB_GADGET is not set
CONFIG_UWB=m
CONFIG_UWB_HWA=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/default new/config/ppc64/default
--- old/config/ppc64/default 2014-05-21 19:34:45.000000000 +0200
+++ new/config/ppc64/default 2014-05-23 15:27:33.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.15.0-rc5 Kernel Configuration
+# Linux/powerpc 3.15.0-rc6 Kernel Configuration
#
CONFIG_PPC64=y
@@ -3677,9 +3677,8 @@
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_SCALE_CROP=m
CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_VIDEO_RCAR_VIN=m
+# CONFIG_VIDEO_RCAR_VIN is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
# CONFIG_VIDEO_SH_VEU is not set
@@ -4612,7 +4611,7 @@
# CONFIG_SAMSUNG_USB3PHY is not set
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=m
+# CONFIG_USB_RCAR_PHY is not set
# CONFIG_USB_GADGET is not set
CONFIG_UWB=m
CONFIG_UWB_HWA=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/vanilla new/config/ppc64/vanilla
--- old/config/ppc64/vanilla 2014-05-21 19:34:45.000000000 +0200
+++ new/config/ppc64/vanilla 2014-05-23 15:27:33.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.15.0-rc5 Kernel Configuration
+# Linux/powerpc 3.15.0-rc6 Kernel Configuration
#
CONFIG_PPC64=y
@@ -3669,9 +3669,8 @@
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_SCALE_CROP=m
CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_VIDEO_RCAR_VIN=m
+# CONFIG_VIDEO_RCAR_VIN is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
# CONFIG_VIDEO_SH_VEU is not set
@@ -4604,7 +4603,7 @@
# CONFIG_SAMSUNG_USB3PHY is not set
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=m
+# CONFIG_USB_RCAR_PHY is not set
# CONFIG_USB_GADGET is not set
CONFIG_UWB=m
CONFIG_UWB_HWA=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64le/debug new/config/ppc64le/debug
--- old/config/ppc64le/debug 2014-05-21 19:34:45.000000000 +0200
+++ new/config/ppc64le/debug 2014-05-23 15:27:33.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.15.0-rc5 Kernel Configuration
+# Linux/powerpc 3.15.0-rc6 Kernel Configuration
#
CONFIG_PPC64=y
@@ -3660,9 +3660,8 @@
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_SCALE_CROP=m
CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_VIDEO_RCAR_VIN=m
+# CONFIG_VIDEO_RCAR_VIN is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
# CONFIG_VIDEO_SH_VEU is not set
@@ -4595,7 +4594,7 @@
# CONFIG_SAMSUNG_USB3PHY is not set
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=m
+# CONFIG_USB_RCAR_PHY is not set
# CONFIG_USB_GADGET is not set
CONFIG_UWB=m
CONFIG_UWB_HWA=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64le/default new/config/ppc64le/default
--- old/config/ppc64le/default 2014-05-21 19:34:45.000000000 +0200
+++ new/config/ppc64le/default 2014-05-23 15:27:33.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.15.0-rc5 Kernel Configuration
+# Linux/powerpc 3.15.0-rc6 Kernel Configuration
#
CONFIG_PPC64=y
@@ -3650,9 +3650,8 @@
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_SCALE_CROP=m
CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_VIDEO_RCAR_VIN=m
+# CONFIG_VIDEO_RCAR_VIN is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
# CONFIG_VIDEO_SH_VEU is not set
@@ -4585,7 +4584,7 @@
# CONFIG_SAMSUNG_USB3PHY is not set
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=m
+# CONFIG_USB_RCAR_PHY is not set
# CONFIG_USB_GADGET is not set
CONFIG_UWB=m
CONFIG_UWB_HWA=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64le/vanilla new/config/ppc64le/vanilla
--- old/config/ppc64le/vanilla 2014-05-21 19:34:45.000000000 +0200
+++ new/config/ppc64le/vanilla 2014-05-23 15:27:33.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.15.0-rc5 Kernel Configuration
+# Linux/powerpc 3.15.0-rc6 Kernel Configuration
#
CONFIG_PPC64=y
@@ -3642,9 +3642,8 @@
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_SCALE_CROP=m
CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_VIDEO_RCAR_VIN=m
+# CONFIG_VIDEO_RCAR_VIN is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
# CONFIG_VIDEO_SH_VEU is not set
@@ -4577,7 +4576,7 @@
# CONFIG_SAMSUNG_USB3PHY is not set
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=m
+# CONFIG_USB_RCAR_PHY is not set
# CONFIG_USB_GADGET is not set
CONFIG_UWB=m
CONFIG_UWB_HWA=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/default new/config/s390x/default
--- old/config/s390x/default 2014-05-21 19:34:45.000000000 +0200
+++ new/config/s390x/default 2014-05-23 15:27:33.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 3.15.0-rc5 Kernel Configuration
+# Linux/s390 3.15.0-rc6 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/vanilla new/config/s390x/vanilla
--- old/config/s390x/vanilla 2014-05-21 19:34:45.000000000 +0200
+++ new/config/s390x/vanilla 2014-05-23 15:27:33.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 3.15.0-rc5 Kernel Configuration
+# Linux/s390 3.15.0-rc6 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/debug new/config/x86_64/debug
--- old/config/x86_64/debug 2014-05-21 19:34:45.000000000 +0200
+++ new/config/x86_64/debug 2014-05-23 15:27:33.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.15.0-rc5 Kernel Configuration
+# Linux/x86_64 3.15.0-rc6 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -553,6 +553,7 @@
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_PROCFS_POWER=y
CONFIG_ACPI_EC_DEBUGFS=m
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m
@@ -4160,9 +4161,8 @@
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_SCALE_CROP=m
CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_VIDEO_RCAR_VIN=m
+# CONFIG_VIDEO_RCAR_VIN is not set
# CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
# CONFIG_VIDEO_SH_MOBILE_CEU is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
@@ -5170,7 +5170,7 @@
# CONFIG_SAMSUNG_USB3PHY is not set
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=m
+# CONFIG_USB_RCAR_PHY is not set
# CONFIG_USB_GADGET is not set
CONFIG_UWB=m
CONFIG_UWB_HWA=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/default new/config/x86_64/default
--- old/config/x86_64/default 2014-05-21 19:34:45.000000000 +0200
+++ new/config/x86_64/default 2014-05-23 15:27:33.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.15.0-rc5 Kernel Configuration
+# Linux/x86_64 3.15.0-rc6 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -558,6 +558,7 @@
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_PROCFS_POWER=y
CONFIG_ACPI_EC_DEBUGFS=m
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m
@@ -4150,9 +4151,8 @@
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_SCALE_CROP=m
CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_VIDEO_RCAR_VIN=m
+# CONFIG_VIDEO_RCAR_VIN is not set
# CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
# CONFIG_VIDEO_SH_MOBILE_CEU is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
@@ -5160,7 +5160,7 @@
# CONFIG_SAMSUNG_USB3PHY is not set
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=m
+# CONFIG_USB_RCAR_PHY is not set
# CONFIG_USB_GADGET is not set
CONFIG_UWB=m
CONFIG_UWB_HWA=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/desktop new/config/x86_64/desktop
--- old/config/x86_64/desktop 2014-05-21 19:34:45.000000000 +0200
+++ new/config/x86_64/desktop 2014-05-23 15:27:33.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.15.0-rc5 Kernel Configuration
+# Linux/x86_64 3.15.0-rc6 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -557,6 +557,7 @@
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_PROCFS_POWER=y
CONFIG_ACPI_EC_DEBUGFS=m
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m
@@ -4149,9 +4150,8 @@
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_SCALE_CROP=m
CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_VIDEO_RCAR_VIN=m
+# CONFIG_VIDEO_RCAR_VIN is not set
# CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
# CONFIG_VIDEO_SH_MOBILE_CEU is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
@@ -5151,7 +5151,7 @@
# CONFIG_SAMSUNG_USB3PHY is not set
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=m
+# CONFIG_USB_RCAR_PHY is not set
# CONFIG_USB_GADGET is not set
CONFIG_UWB=m
CONFIG_UWB_HWA=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/ec2 new/config/x86_64/ec2
--- old/config/x86_64/ec2 2014-05-21 19:34:45.000000000 +0200
+++ new/config/x86_64/ec2 2014-05-23 15:27:33.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.15.0-rc5 Kernel Configuration
+# Linux/x86_64 3.15.0-rc6 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/vanilla new/config/x86_64/vanilla
--- old/config/x86_64/vanilla 2014-05-21 19:34:45.000000000 +0200
+++ new/config/x86_64/vanilla 2014-05-23 15:27:33.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.15.0-rc5 Kernel Configuration
+# Linux/x86_64 3.15.0-rc6 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -556,6 +556,7 @@
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_PROCFS_POWER=y
CONFIG_ACPI_EC_DEBUGFS=m
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m
@@ -4146,9 +4147,8 @@
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_SCALE_CROP=m
CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_VIDEO_RCAR_VIN=m
+# CONFIG_VIDEO_RCAR_VIN is not set
# CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
# CONFIG_VIDEO_SH_MOBILE_CEU is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
@@ -5156,7 +5156,7 @@
# CONFIG_SAMSUNG_USB3PHY is not set
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=m
+# CONFIG_USB_RCAR_PHY is not set
# CONFIG_USB_GADGET is not set
CONFIG_UWB=m
CONFIG_UWB_HWA=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/xen new/config/x86_64/xen
--- old/config/x86_64/xen 2014-05-21 19:34:45.000000000 +0200
+++ new/config/x86_64/xen 2014-05-23 15:27:33.000000000 +0200
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.15.0-rc5 Kernel Configuration
+# Linux/x86_64 3.15.0-rc6 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -464,6 +464,7 @@
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_PROCFS_POWER=y
CONFIG_ACPI_EC_DEBUGFS=m
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m
@@ -3934,9 +3935,8 @@
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_SCALE_CROP=m
CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_VIDEO_RCAR_VIN=m
+# CONFIG_VIDEO_RCAR_VIN is not set
# CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
# CONFIG_VIDEO_SH_MOBILE_CEU is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
@@ -4940,7 +4940,7 @@
# CONFIG_SAMSUNG_USB3PHY is not set
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=m
+# CONFIG_USB_RCAR_PHY is not set
# CONFIG_USB_GADGET is not set
CONFIG_UWB=m
CONFIG_UWB_HWA=m
++++++ kernel-binary.spec.in ++++++
--- /var/tmp/diff_new_pack.RyJQmM/_old 2014-05-27 18:58:53.000000000 +0200
+++ /var/tmp/diff_new_pack.RyJQmM/_new 2014-05-27 18:58:53.000000000 +0200
@@ -413,6 +413,20 @@
# mark the file 0644 again
chmod +x %buildroot/$vmlinux
if test $1 == "--compressed"; then
+%if 0%{?__debug_package:1}
+ # split the debug information just to keep the compressed file
+ # reasonably small
+ local vmlinux_debug=usr/lib/debug/$vmlinux.debug
+ mkdir -p $(dirname %buildroot/$vmlinux_debug)
+ objcopy --only-keep-debug \
+ %buildroot/$vmlinux \
+ %buildroot/$vmlinux_debug || :
+ objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
+ --strip-debug \
+ %buildroot/$vmlinux || :
+ # let find-debuginfo.sh do the real job
+ rm -f %buildroot/$vmlinux_debug
+%endif
gzip -n -k -9 %buildroot/$vmlinux
ghost_vmlinux=true
else
++++++ linux-3.15-rc5.tar.xz -> linux-3.15-rc6.tar.xz ++++++
/work/SRC/openSUSE:Factory/kernel-source/linux-3.15-rc5.tar.xz /work/SRC/openSUSE:Factory/.kernel-source.new/linux-3.15-rc6.tar.xz differ: char 27, line 1
++++++ source-timestamp ++++++
--- /var/tmp/diff_new_pack.RyJQmM/_old 2014-05-27 18:58:53.000000000 +0200
+++ /var/tmp/diff_new_pack.RyJQmM/_new 2014-05-27 18:58:53.000000000 +0200
@@ -1,3 +1,3 @@
-2014-05-21 19:34:45 +0200
-GIT Revision: cc68f1221265fcc29f06801efd7bf9022a1a985f
+2014-05-26 12:06:25 +0200
+GIT Revision: 346029d151a21d9a7a20e74d75685096b2d6f29e
GIT Branch: master
++++++ supported.conf ++++++
--- /var/tmp/diff_new_pack.RyJQmM/_old 2014-05-27 18:58:53.000000000 +0200
+++ /var/tmp/diff_new_pack.RyJQmM/_new 2014-05-27 18:58:53.000000000 +0200
@@ -917,7 +917,6 @@
drivers/media/video/saa717x
drivers/media/video/saa7185 # Philips SAA7185 video encoder driver
drivers/media/video/se401
- drivers/media/video/sh_mobile_ceu_camera
drivers/media/video/sn9c102/sn9c102
drivers/media/video/soc_camera
drivers/media/video/soc_camera_platform
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package virt-manager for openSUSE:Factory checked in at 2014-05-27 18:33:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/virt-manager (Old)
and /work/SRC/openSUSE:Factory/.virt-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-manager"
Changes:
--------
--- /work/SRC/openSUSE:Factory/virt-manager/virt-manager.changes 2014-05-16 18:17:53.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.virt-manager.new/virt-manager.changes 2014-05-27 18:33:19.000000000 +0200
@@ -1,0 +2,16 @@
+Tue May 27 09:13:49 UTC 2014 - cbosdonnat(a)suse.com
+
+- bnc#870587 - Don't create a default QEMU disk image in the new lxc
+ container wizard.
+ virtman-lxc-no-default-disk.patch
+
+-------------------------------------------------------------------
+Wed May 21 13:43:18 UTC 2014 - cbosdonnat(a)suse.com
+
+- Improve virt-manager default connections at first start
+ * virtman-default-lxc-uri.patch: when only libvirt's lxc driver
+ is available locally, add lxc:///
+ * virtman-add-connect-default.patch: when no hypervisor can be
+ found locally, open the new connection dialog
+
+-------------------------------------------------------------------
New:
----
virtman-add-connect-default.patch
virtman-default-lxc-uri.patch
virtman-lxc-no-default-disk.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virt-manager.spec ++++++
--- /var/tmp/diff_new_pack.odOydl/_old 2014-05-27 18:33:21.000000000 +0200
+++ /var/tmp/diff_new_pack.odOydl/_new 2014-05-27 18:33:21.000000000 +0200
@@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
%define with_guestfs 0
%define askpass_package "openssh-askpass"
%define qemu_user "qemu"
@@ -80,6 +81,10 @@
Patch68: virtman-stable-os-support.patch
Patch69: virtman-add-s390x-arch-support.patch
Patch70: virtman-prevent-double-click-starting-vm-twice.patch
+Patch71: virtman-default-lxc-uri.patch
+Patch72: virtman-add-connect-default.patch
+# PATCH-FIX-UPSTREAM virtman-lxc-no-default-disk.patch -- pending upstream review, bnc#870587
+Patch73: virtman-lxc-no-default-disk.patch
Patch151: virtinst-storage-ocfs2.patch
Patch152: virtinst-qed.patch
Patch153: virtinst-support-suse-distros.patch
@@ -224,6 +229,9 @@
%patch68 -p1
%patch69 -p1
%patch70 -p1
+%patch71 -p1
+%patch72 -p1
+%patch73 -p1
%patch151 -p1
%patch152 -p1
%patch153 -p1
@@ -232,7 +240,7 @@
%patch156 -p1
%patch157 -p1
%patch158 -p1
-%patch159 -p1
+###%patch159 -p1 nocow flag
%patch160 -p1
%patch161 -p1
++++++ virtman-add-connect-default.patch ++++++
Index: virt-manager-1.0.1/virtManager/engine.py
===================================================================
--- virt-manager-1.0.1.orig/virtManager/engine.py
+++ virt-manager-1.0.1/virtManager/engine.py
@@ -205,9 +205,6 @@ class vmmEngine(vmmGObject):
except:
logging.exception("Error talking to PackageKit")
- if tryuri is None:
- tryuri = "qemu:///system"
-
warnmsg = _("The 'libvirtd' service will need to be started.\n\n"
"After that, virt-manager will connect to libvirt on\n"
"the next application start up.")
@@ -221,7 +218,11 @@ class vmmEngine(vmmGObject):
if not connected and do_start:
manager.err.ok(_("Libvirt service must be started"), warnmsg)
- self.idle_add(idle_connect)
+ # If there is no default URI to be found, show the new connection dialog
+ if tryuri is None:
+ self._do_show_connect(self.windowManager)
+ else:
+ self.idle_add(idle_connect)
def load_stored_uris(self):
++++++ virtman-default-lxc-uri.patch ++++++
>From 02c2d2fcb3c445082a91807ab277a7c85d0a38db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cedric.bosdonnat(a)free.fr>
Date: Tue, 20 May 2014 17:14:27 +0200
Subject: [PATCH] Default connection URI if libvirt-daemon-driver-lxc is
installed
The default URI is set to lxc:/// if libvirt's lxc driver is installed
locally, but only if there is no kvm/xen URI to default to.
---
virtManager/connect.py | 4 ++++
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/virtManager/connect.py b/virtManager/connect.py
index 1247d75..34835fa 100644
--- a/virtManager/connect.py
+++ b/virtManager/connect.py
@@ -116,6 +116,10 @@ class vmmConnect(vmmGObjectUI):
return "qemu:///system"
else:
return "qemu:///session"
+
+ if (os.path.exists("/usr/lib/libvirt/libvirt_lxc") or
+ os.path.exists("/usr/lib64/libvirt/libvirt_lxc")):
+ return "lxc:///"
return None
def cancel(self, ignore1=None, ignore2=None):
--
1.8.4.5
++++++ virtman-lxc-no-default-disk.patch ++++++
>From a56edc5b454f5ac428e5a9380665001889cb017c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat(a)suse.com>
Date: Tue, 27 May 2014 10:52:35 +0200
Subject: [PATCH] Don't create a qemu disk image when creating containers
Make sure we don't create a default disk image if the option is checked
but not visible as this is the case for containers
---
virtManager/addstorage.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/virtManager/addstorage.py b/virtManager/addstorage.py
index b481fcb..654b620 100644
--- a/virtManager/addstorage.py
+++ b/virtManager/addstorage.py
@@ -256,7 +256,8 @@ class vmmAddStorage(vmmGObjectUI):
return path
def is_default_storage(self):
- return self.widget("config-storage-create").get_active()
+ return self.widget("config-storage-create").is_visible() and \
+ self.widget("config-storage-create").get_active()
def _check_ideal_path(self, path, vmname, collidelist):
# See if the ideal disk path (/default/pool/vmname.img)
--
1.8.4.5
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package solid for openSUSE:Factory checked in at 2014-05-27 18:33:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/solid (Old)
and /work/SRC/openSUSE:Factory/.solid.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "solid"
Changes:
--------
--- /work/SRC/openSUSE:Factory/solid/solid.changes 2014-05-14 20:28:20.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.solid.new/solid.changes 2014-05-27 18:33:02.000000000 +0200
@@ -1,0 +2,5 @@
+Tue May 27 09:55:43 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Build with pkgconfig(libudev), not pkgconfig(udev)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ solid.spec ++++++
--- /var/tmp/diff_new_pack.nurG7r/_old 2014-05-27 18:33:03.000000000 +0200
+++ /var/tmp/diff_new_pack.nurG7r/_new 2014-05-27 18:33:03.000000000 +0200
@@ -32,7 +32,7 @@
BuildRequires: pkgconfig(Qt5Test) >= 5.2.0
BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0
BuildRequires: pkgconfig(Qt5Xml) >= 5.2.0
-BuildRequires: pkgconfig(udev)
+BuildRequires: pkgconfig(libudev)
Summary: KDE Desktop hardware abstraction
License: LGPL-2.1+
Group: System/GUI/KDE
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package shorewall for openSUSE:Factory checked in at 2014-05-27 18:31:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/shorewall (Old)
and /work/SRC/openSUSE:Factory/.shorewall.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shorewall"
Changes:
--------
--- /work/SRC/openSUSE:Factory/shorewall/shorewall.changes 2014-05-21 16:30:56.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.shorewall.new/shorewall.changes 2014-05-27 18:31:24.000000000 +0200
@@ -1,0 +2,22 @@
+Tue May 27 10:42:42 UTC 2014 - toganm(a)opensuse.org
+
+- Update to version 4.6.0.2 For more details see changelog.txt and
+ releasenotes.txt
+
+ * The 'upgrade -A' command now converts the tcrules file to a
+ mangle file. Previously, that didn't happen.
+ * The install components now support RHEL7.
+ * Whitespace issues in the skeleton configuration files have been
+ corrected (Tuomo Soini).
+ * FAQ 2e has been added which describes additional steps required
+ to achieve hairpin NAT on a bridge where the modified packets are
+ to go out the same bridge port as they entered.
+ * shorewall-masq(5) has been corrected to include the word SOURCE
+ on the description of that column. Previously, the description
+ read '(formerly called SUBNET)'.
+ * The output of 'shorewall show filters' once again shows ingress
+ (policing) filters. This works around undocumented changes to
+ the behavior of the 'tc' utility.
+
+- removed backported CHECKSUM.patch
+-------------------------------------------------------------------
Old:
----
shorewall-4.6.0.tar.bz2
shorewall-core-4.6.0.tar.bz2
shorewall-docs-html-4.6.0.tar.bz2
shorewall-init-4.6.0.tar.bz2
shorewall-lite-4.6.0.tar.bz2
shorewall6-4.6.0.tar.bz2
shorewall6-lite-4.6.0.tar.bz2
New:
----
shorewall-4.6.0.2.tar.bz2
shorewall-core-4.6.0.2.tar.bz2
shorewall-docs-html-4.6.0.2.tar.bz2
shorewall-init-4.6.0.2.tar.bz2
shorewall-lite-4.6.0.2.tar.bz2
shorewall6-4.6.0.2.tar.bz2
shorewall6-lite-4.6.0.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ shorewall.spec ++++++
--- /var/tmp/diff_new_pack.kDXfa6/_old 2014-05-27 18:31:30.000000000 +0200
+++ /var/tmp/diff_new_pack.kDXfa6/_new 2014-05-27 18:31:30.000000000 +0200
@@ -20,7 +20,7 @@
%define have_systemd 1
Name: shorewall
-Version: 4.6.0
+Version: 4.6.0.2
Release: 0
Summary: Shoreline Firewall is an iptables-based firewall for Linux systems
License: GPL-2.0
@@ -41,8 +41,6 @@
Patch1: 0001-fillup-install.patch
# PATCH-FIX-UPSTREAM toganm(a)opensuse.org Shorewall-init init.suse.sh Required Start
Patch2: 0001-remote_fs.patch
-# PATCH-FIX-UPSTSREAM backported from git version
-Patch3: CHECKSUM.patch
%if 0%{?suse_version} >= 1210 || 0%{?fedora_version}
BuildRequires: systemd
%{?systemd_requires}
@@ -309,7 +307,6 @@
# apply patches to shorewall
pushd %name-%version
-%patch3 -p2
popd
# apply patches to shorewall-lite
pushd %name-lite-%version
++++++ shorewall-4.6.0.tar.bz2 -> shorewall-4.6.0.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/Perl/Shorewall/Compiler.pm new/shorewall-4.6.0.2/Perl/Shorewall/Compiler.pm
--- old/shorewall-4.6.0/Perl/Shorewall/Compiler.pm 2014-05-15 17:22:17.000000000 +0200
+++ new/shorewall-4.6.0.2/Perl/Shorewall/Compiler.pm 2014-05-23 18:31:41.000000000 +0200
@@ -730,7 +730,7 @@
#
# Do all of the zone-independent stuff (mostly /proc)
#
- add_common_rules( $convert );
+ add_common_rules( $convert, $tcrules );
#
# More /proc
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/Perl/Shorewall/Config.pm new/shorewall-4.6.0.2/Perl/Shorewall/Config.pm
--- old/shorewall-4.6.0/Perl/Shorewall/Config.pm 2014-05-15 17:22:17.000000000 +0200
+++ new/shorewall-4.6.0.2/Perl/Shorewall/Config.pm 2014-05-23 18:31:41.000000000 +0200
@@ -709,7 +709,7 @@
TC_SCRIPT => '',
EXPORT => 0,
KLUDGEFREE => '',
- VERSION => "4.6.0",
+ VERSION => "4.6.0.2",
CAPVERSION => 40600 ,
);
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/Perl/Shorewall/Misc.pm new/shorewall-4.6.0.2/Perl/Shorewall/Misc.pm
--- old/shorewall-4.6.0/Perl/Shorewall/Misc.pm 2014-05-15 17:22:17.000000000 +0200
+++ new/shorewall-4.6.0.2/Perl/Shorewall/Misc.pm 2014-05-23 18:31:41.000000000 +0200
@@ -775,8 +775,8 @@
sub setup_mss();
-sub add_common_rules ( $ ) {
- my $upgrade = shift;
+sub add_common_rules ( $$ ) {
+ my ( $upgrade_blacklist, $upgrade_tcrules ) = @_;
my $interface;
my $chainref;
my $target;
@@ -929,8 +929,8 @@
run_user_exit1 'initdone';
- if ( $upgrade ) {
- exit 0 unless convert_blacklist;
+ if ( $upgrade_blacklist ) {
+ exit 0 unless convert_blacklist || $upgrade_tcrules;
} else {
setup_blacklist;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/Perl/Shorewall/Tc.pm new/shorewall-4.6.0.2/Perl/Shorewall/Tc.pm
--- old/shorewall-4.6.0/Perl/Shorewall/Tc.pm 2014-05-15 17:22:17.000000000 +0200
+++ new/shorewall-4.6.0.2/Perl/Shorewall/Tc.pm 2014-05-23 18:31:41.000000000 +0200
@@ -338,7 +338,7 @@
minparams => 0,
maxparams => 0 ,
function => sub() {
- $target = 'CHECKSUM';
+ $target = 'CHECKSUM --checksum-fill';
},
},
@@ -693,7 +693,9 @@
( $cmd, $designator ) = split_action( $action );
if ( supplied $designator ) {
- fatal_error "Invalid chain designator ( $designator )" unless $designator = $designators{$designator};
+ my $temp = $designators{$designator};
+ fatal_error "Invalid chain designator ( $designator )" unless $temp;
+ $designator = $temp;
}
( $cmd , $params ) = get_target_param1( $cmd );
@@ -710,11 +712,11 @@
if ( $source ne '-' ) {
if ( $source eq $fw ) {
- fatal_error 'Rules with SOURCE $FW must use the OUTPUT chain' if $designator && $designator ne OUTPUT;
+ fatal_error 'Rules with SOURCE $FW must use the OUTPUT chain' if $designator && $designator != OUTPUT;
$chain = OUTPUT;
$source = '-';
} elsif ( $source =~ s/^($fw):// ) {
- fatal_error 'Rules with SOURCE $FW must use the OUTPUT chain' if $designator && $designator ne OUTPUT;
+ fatal_error 'Rules with SOURCE $FW must use the OUTPUT chain' if $designator && $designator != OUTPUT;
$chain = OUTPUT;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/Samples/three-interfaces/masq.annotated new/shorewall-4.6.0.2/Samples/three-interfaces/masq.annotated
--- old/shorewall-4.6.0/Samples/three-interfaces/masq.annotated 2014-05-15 17:23:52.000000000 +0200
+++ new/shorewall-4.6.0.2/Samples/three-interfaces/masq.annotated 2014-05-23 18:33:14.000000000 +0200
@@ -101,7 +101,7 @@
#
# See example 8 below.
#
-# (Formerly called SUBNET) - {interface|address[,address][exclusion]}
+# SOURCE (Formerly called SUBNET) - {interface|address[,address][exclusion]}
#
# Set of hosts that you wish to masquerade. You can specify this as an
# address (net or host) or as an interface (use of an interface is
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/Samples/two-interfaces/masq.annotated new/shorewall-4.6.0.2/Samples/two-interfaces/masq.annotated
--- old/shorewall-4.6.0/Samples/two-interfaces/masq.annotated 2014-05-15 17:23:57.000000000 +0200
+++ new/shorewall-4.6.0.2/Samples/two-interfaces/masq.annotated 2014-05-23 18:33:19.000000000 +0200
@@ -101,7 +101,7 @@
#
# See example 8 below.
#
-# (Formerly called SUBNET) - {interface|address[,address][exclusion]}
+# SOURCE (Formerly called SUBNET) - {interface|address[,address][exclusion]}
#
# Set of hosts that you wish to masquerade. You can specify this as an
# address (net or host) or as an interface (use of an interface is
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/changelog.txt new/shorewall-4.6.0.2/changelog.txt
--- old/shorewall-4.6.0/changelog.txt 2014-05-15 17:22:17.000000000 +0200
+++ new/shorewall-4.6.0.2/changelog.txt 2014-05-23 18:31:41.000000000 +0200
@@ -1,3 +1,29 @@
+Changes in 4.6.0.2
+
+1) Update release documents.
+
+2) Correct handling of tcrules upgrade with 'upgrade -A'.
+
+3) Apply Tuomo Soini's whitespace patch.
+
+4) Extend Orion Poplawski's RHEL7 patch.
+
+5) Add FAQ 2e.
+
+6) Update Support article.
+
+7) Fix shorewall-masq SOURCE description
+
+Changes in 4.6.0.1
+
+1) Update release documents.
+
+2) Correct CHECKSUM handling.
+
+3) Apply Simon Mater's cosmetic changes to 'mangle' file.
+
+4) Correct chain designator editing.
+
Changes in 4.6.0 Final
1) Update release documents.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/configfiles/blrules new/shorewall-4.6.0.2/configfiles/blrules
--- old/shorewall-4.6.0/configfiles/blrules 2014-05-15 17:20:10.000000000 +0200
+++ new/shorewall-4.6.0.2/configfiles/blrules 2014-05-23 18:26:12.000000000 +0200
@@ -6,7 +6,7 @@
# Please see http://shorewall.net/blacklisting_support.htm for additional
# information.
#
-###################################################################################################################################################################################################
-#ACTION SOURCE DEST PROTO DEST SOURCE ORIGINAL RATE USER/ MARK CONNLIMIT TIME HEADERS SWITCH
+################################################################################################################################################################################################
+#ACTION SOURCE DEST PROTO DEST SOURCE ORIGINAL RATE USER/ MARK CONNLIMIT TIME HEADERS SWITCH
# PORT PORT(S) DEST LIMIT GROUP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/configfiles/blrules.annotated new/shorewall-4.6.0.2/configfiles/blrules.annotated
--- old/shorewall-4.6.0/configfiles/blrules.annotated 2014-05-15 17:23:29.000000000 +0200
+++ new/shorewall-4.6.0.2/configfiles/blrules.annotated 2014-05-23 18:32:50.000000000 +0200
@@ -6,7 +6,7 @@
# Please see http://shorewall.net/blacklisting_support.htm for additional
# information.
#
-###################################################################################################################################################################################################
+################################################################################################################################################################################################
#
# This file is used to perform blacklisting and whitelisting.
#
@@ -155,6 +155,6 @@
#
# WHITELIST net:[2001:DB8::/64] all
#
-###################################################################################################################################################################################################
-#ACTION SOURCE DEST PROTO DEST SOURCE ORIGINAL RATE USER/ MARK CONNLIMIT TIME HEADERS SWITCH
+################################################################################################################################################################################################
+#ACTION SOURCE DEST PROTO DEST SOURCE ORIGINAL RATE USER/ MARK CONNLIMIT TIME HEADERS SWITCH
# PORT PORT(S) DEST LIMIT GROUP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/configfiles/clear new/shorewall-4.6.0.2/configfiles/clear
--- old/shorewall-4.6.0/configfiles/clear 2014-05-15 17:20:10.000000000 +0200
+++ new/shorewall-4.6.0.2/configfiles/clear 2014-05-23 18:26:12.000000000 +0200
@@ -3,8 +3,8 @@
#
# /etc/shorewall/clear
#
-# Add commands below that you want to be executed after Shorewall
-# has processed the 'clear' command.
+# Add commands below that you want to be executed after Shorewall has
+# processed the 'clear' command.
#
# See http://shorewall.net/shorewall_extension_scripts.htm for additional
# information.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/configfiles/findgw new/shorewall-4.6.0.2/configfiles/findgw
--- old/shorewall-4.6.0/configfiles/findgw 2014-05-15 17:20:10.000000000 +0200
+++ new/shorewall-4.6.0.2/configfiles/findgw 2014-05-23 18:26:12.000000000 +0200
@@ -3,12 +3,12 @@
#
# /etc/shorewall/findgw
#
-# The code in this file is executed when Shorewall is trying to detect the
-# gateway through an interface in /etc/shorewall/providers that has GATEWAY
-# specified as 'detect'.
+# The code in this file is executed when Shorewall is trying to detect the
+# gateway through an interface in /etc/shorewall/providers that has GATEWAY
+# specified as 'detect'.
#
-# The function should echo the IP address of the gateway if it knows what
-# it is; the name of the interface is in $1.
+# The function should echo the IP address of the gateway if it knows what
+# it is; the name of the interface is in $1.
#
# See http://shorewall.net/shorewall_extension_scripts.htm for additional
# information.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/configfiles/lib.private new/shorewall-4.6.0.2/configfiles/lib.private
--- old/shorewall-4.6.0/configfiles/lib.private 2014-05-15 17:20:10.000000000 +0200
+++ new/shorewall-4.6.0.2/configfiles/lib.private 2014-05-23 18:26:12.000000000 +0200
@@ -3,9 +3,9 @@
#
# /etc/shorewall/lib.private
#
-# Use this file to declare shell functions to be called in the other
-# run-time extension scripts. The file will be copied into the generated
-# firewall script.
+# Use this file to declare shell functions to be called in the other
+# run-time extension scripts. The file will be copied into the generated
+# firewall script.
#
# See http://shorewall.net/shorewall_extension_scripts.htm for additional
# information.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/configfiles/mangle new/shorewall-4.6.0.2/configfiles/mangle
--- old/shorewall-4.6.0/configfiles/mangle 2014-05-15 17:20:10.000000000 +0200
+++ new/shorewall-4.6.0.2/configfiles/mangle 2014-05-23 18:26:12.000000000 +0200
@@ -1,7 +1,7 @@
#
# Shorewall version 4 - Mangle File
#
-# For information about entries in this file, type "man shorewall-tcrules"
+# For information about entries in this file, type "man shorewall-mangle"
#
# See http://shorewall.net/traffic_shaping.htm for additional information.
# For usage in selecting among multiple ISPs, see
@@ -9,7 +9,6 @@
#
# See http://shorewall.net/PacketMarking.html for a detailed description of
# the Netfilter/Shorewall packet marking mechanism.
-##################################################################################################################################################
-#ACTION SOURCE DEST PROTO DEST SOURCE USER TEST LENGTH TOS CONNBYTES HELPER PROBABILITY DSCP
+####################################################################################################################################################
+#ACTION SOURCE DEST PROTO DEST SOURCE USER TEST LENGTH TOS CONNBYTES HELPER PROBABILITY DSCP
# PORT(S) PORT(S)
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/configfiles/mangle.annotated new/shorewall-4.6.0.2/configfiles/mangle.annotated
--- old/shorewall-4.6.0/configfiles/mangle.annotated 2014-05-15 17:23:33.000000000 +0200
+++ new/shorewall-4.6.0.2/configfiles/mangle.annotated 2014-05-23 18:32:55.000000000 +0200
@@ -1,7 +1,7 @@
#
# Shorewall version 4 - Mangle File
#
-# For information about entries in this file, type "man shorewall-tcrules"
+# For information about entries in this file, type "man shorewall-mangle"
#
# See http://shorewall.net/traffic_shaping.htm for additional information.
# For usage in selecting among multiple ISPs, see
@@ -9,7 +9,7 @@
#
# See http://shorewall.net/PacketMarking.html for a detailed description of
# the Netfilter/Shorewall packet marking mechanism.
-##################################################################################################################################################
+####################################################################################################################################################
#
# This file was introduced in Shorewall 4.6.0 and is intended to replace
# shorewall-rules(5). This file is only processed by the compiler if:
@@ -734,6 +734,6 @@
# eth0 192.168.1.0/24 1.1.1.3 ; mark=2:C
# eth0 192.168.1.0/24 1.1.1.4 ; mark=3:C
#
-##################################################################################################################################################
-#ACTION SOURCE DEST PROTO DEST SOURCE USER TEST LENGTH TOS CONNBYTES HELPER PROBABILITY DSCP
+####################################################################################################################################################
+#ACTION SOURCE DEST PROTO DEST SOURCE USER TEST LENGTH TOS CONNBYTES HELPER PROBABILITY DSCP
# PORT(S) PORT(S)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/configfiles/masq.annotated new/shorewall-4.6.0.2/configfiles/masq.annotated
--- old/shorewall-4.6.0/configfiles/masq.annotated 2014-05-15 17:23:34.000000000 +0200
+++ new/shorewall-4.6.0.2/configfiles/masq.annotated 2014-05-23 18:32:55.000000000 +0200
@@ -97,7 +97,7 @@
#
# See example 8 below.
#
-# (Formerly called SUBNET) - {interface|address[,address][exclusion]}
+# SOURCE (Formerly called SUBNET) - {interface|address[,address][exclusion]}
#
# Set of hosts that you wish to masquerade. You can specify this as an
# address (net or host) or as an interface (use of an interface is
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/configfiles/refresh new/shorewall-4.6.0.2/configfiles/refresh
--- old/shorewall-4.6.0/configfiles/refresh 2014-05-15 17:20:10.000000000 +0200
+++ new/shorewall-4.6.0.2/configfiles/refresh 2014-05-23 18:26:12.000000000 +0200
@@ -3,8 +3,8 @@
#
# /etc/shorewall/refresh
#
-# Add commands below that you want to be executed before Shorewall
-# has processed the 'refresh' command.
+# Add commands below that you want to be executed before Shorewall
+# has processed the 'refresh' command.
#
# See http://shorewall.net/shorewall_extension_scripts.htm for additional
# information.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/configfiles/refreshed new/shorewall-4.6.0.2/configfiles/refreshed
--- old/shorewall-4.6.0/configfiles/refreshed 2014-05-15 17:20:10.000000000 +0200
+++ new/shorewall-4.6.0.2/configfiles/refreshed 2014-05-23 18:26:12.000000000 +0200
@@ -3,8 +3,8 @@
#
# /etc/shorewall/refreshed
#
-# Add commands below that you want to be executed after Shorewall
-# has processed the 'refresh' command.
+# Add commands below that you want to be executed after Shorewall has
+# processed the 'refresh' command.
#
# See http://shorewall.net/shorewall_extension_scripts.htm for additional
# information.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/configfiles/scfilter new/shorewall-4.6.0.2/configfiles/scfilter
--- old/shorewall-4.6.0/configfiles/scfilter 2014-05-15 17:20:10.000000000 +0200
+++ new/shorewall-4.6.0.2/configfiles/scfilter 2014-05-23 18:26:12.000000000 +0200
@@ -3,8 +3,8 @@
#
# /etc/shorewall/scfilter
#
-# Replace the 'cat' command below to filter the output of
-# 'show connections.
+# Replace the 'cat' command below to filter the output of
+# 'show connections'.
#
# See http://shorewall.net/shorewall_extension_scripts.htm for additional
# information.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/configfiles/shorewall.conf new/shorewall-4.6.0.2/configfiles/shorewall.conf
--- old/shorewall-4.6.0/configfiles/shorewall.conf 2014-05-15 17:20:10.000000000 +0200
+++ new/shorewall-4.6.0.2/configfiles/shorewall.conf 2014-05-23 18:26:12.000000000 +0200
@@ -12,13 +12,13 @@
STARTUP_ENABLED=No
###############################################################################
-# V E R B O S I T Y
+# V E R B O S I T Y
###############################################################################
VERBOSITY=1
###############################################################################
-# L O G G I N G
+# L O G G I N G
###############################################################################
BLACKLIST_LOG_LEVEL=
@@ -100,7 +100,7 @@
REJECT_DEFAULT=Reject
###############################################################################
-# R S H / R C P C O M M A N D S
+# R S H / R C P C O M M A N D S
###############################################################################
RCP_COMMAND='scp ${files} ${root}@${system}:${destination}'
@@ -271,8 +271,8 @@
ZONE_BITS=0
################################################################################
-# L E G A C Y O P T I O N
-# D O N O T D E L E T E O R A L T E R
+# L E G A C Y O P T I O N
+# D O N O T D E L E T E O R A L T E R
################################################################################
IPSECFILE=zones
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/configfiles/shorewall.conf.annotated new/shorewall-4.6.0.2/configfiles/shorewall.conf.annotated
--- old/shorewall-4.6.0/configfiles/shorewall.conf.annotated 2014-05-15 17:23:41.000000000 +0200
+++ new/shorewall-4.6.0.2/configfiles/shorewall.conf.annotated 2014-05-23 18:33:03.000000000 +0200
@@ -62,7 +62,7 @@
# started before it has been configured.
#
###############################################################################
-# V E R B O S I T Y
+# V E R B O S I T Y
###############################################################################
VERBOSITY=1
#
@@ -80,7 +80,7 @@
# If not specified, then 2 is assumed.
#
###############################################################################
-# L O G G I N G
+# L O G G I N G
###############################################################################
BLACKLIST_LOG_LEVEL=
#
@@ -516,7 +516,7 @@
# action or body that does not already have a log level.
#
###############################################################################
-# R S H / R C P C O M M A N D S
+# R S H / R C P C O M M A N D S
###############################################################################
RCP_COMMAND='scp ${files} ${root}@${system}:${destination}'
#
@@ -1788,8 +1788,8 @@
# to be used for the zone mark. Default value is 0.
#
################################################################################
-# L E G A C Y O P T I O N
-# D O N O T D E L E T E O R A L T E R
+# L E G A C Y O P T I O N
+# D O N O T D E L E T E O R A L T E R
################################################################################
IPSECFILE=zones
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/configfiles/tcclasses new/shorewall-4.6.0.2/configfiles/tcclasses
--- old/shorewall-4.6.0/configfiles/tcclasses 2014-05-15 17:20:10.000000000 +0200
+++ new/shorewall-4.6.0.2/configfiles/tcclasses 2014-05-23 18:26:12.000000000 +0200
@@ -7,4 +7,4 @@
#
###############################################################################
#INTERFACE:CLASS MARK RATE: CEIL PRIORITY OPTIONS
-# DMAX:UMAX
+# DMAX:UMAX
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/configfiles/tcclasses.annotated new/shorewall-4.6.0.2/configfiles/tcclasses.annotated
--- old/shorewall-4.6.0/configfiles/tcclasses.annotated 2014-05-15 17:23:43.000000000 +0200
+++ new/shorewall-4.6.0.2/configfiles/tcclasses.annotated 2014-05-23 18:33:04.000000000 +0200
@@ -438,4 +438,4 @@
#
###############################################################################
#INTERFACE:CLASS MARK RATE: CEIL PRIORITY OPTIONS
-# DMAX:UMAX
+# DMAX:UMAX
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/configfiles/tcclear new/shorewall-4.6.0.2/configfiles/tcclear
--- old/shorewall-4.6.0/configfiles/tcclear 2014-05-15 17:20:10.000000000 +0200
+++ new/shorewall-4.6.0.2/configfiles/tcclear 2014-05-23 18:26:12.000000000 +0200
@@ -3,8 +3,8 @@
#
# /etc/shorewall/tcclear
#
-# Add commands below that you want to be executed before Shorewall
-# clears the traffic shaping configuration.
+# Add commands below that you want to be executed before Shorewall clears
+# the traffic shaping configuration.
#
# See http://shorewall.net/shorewall_extension_scripts.htm for additional
# information.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/configfiles/tcfilters new/shorewall-4.6.0.2/configfiles/tcfilters
--- old/shorewall-4.6.0/configfiles/tcfilters 2014-05-15 17:20:10.000000000 +0200
+++ new/shorewall-4.6.0.2/configfiles/tcfilters 2014-05-23 18:26:12.000000000 +0200
@@ -6,5 +6,5 @@
# See http://shorewall.net/traffic_shaping.htm for additional information.
#
########################################################################################################
-#INTERFACE: SOURCE DEST PROTO DEST SOURCE TOS LENGTH PRIORITY
+#INTERFACE: SOURCE DEST PROTO DEST SOURCE TOS LENGTH PRIORITY
#CLASS PORT(S) PORT(S)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/configfiles/tcfilters.annotated new/shorewall-4.6.0.2/configfiles/tcfilters.annotated
--- old/shorewall-4.6.0/configfiles/tcfilters.annotated 2014-05-15 17:23:44.000000000 +0200
+++ new/shorewall-4.6.0.2/configfiles/tcfilters.annotated 2014-05-23 18:33:06.000000000 +0200
@@ -166,5 +166,5 @@
# 1:10 0.0.0.0/0 0.0.0.0/0 icmp echo-reply 10
#
########################################################################################################
-#INTERFACE: SOURCE DEST PROTO DEST SOURCE TOS LENGTH PRIORITY
+#INTERFACE: SOURCE DEST PROTO DEST SOURCE TOS LENGTH PRIORITY
#CLASS PORT(S) PORT(S)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/configure new/shorewall-4.6.0.2/configure
--- old/shorewall-4.6.0/configure 2014-05-15 17:22:17.000000000 +0200
+++ new/shorewall-4.6.0.2/configure 2014-05-23 18:31:41.000000000 +0200
@@ -28,7 +28,7 @@
#
# Build updates this
#
-VERSION=4.6.0
+VERSION=4.6.0.2
case "$BASH_VERSION" in
[4-9].*)
@@ -98,7 +98,7 @@
eval $(cat /etc/os-release | grep ^ID=)
case $ID in
- fedora)
+ fedora|rhel)
vendor=redhat
;;
debian|ubuntu)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/configure.pl new/shorewall-4.6.0.2/configure.pl
--- old/shorewall-4.6.0/configure.pl 2014-05-15 17:22:17.000000000 +0200
+++ new/shorewall-4.6.0.2/configure.pl 2014-05-23 18:31:41.000000000 +0200
@@ -31,7 +31,7 @@
# Build updates this
#
use constant {
- VERSION => '4.6.0'
+ VERSION => '4.6.0.2'
};
my %params;
@@ -64,7 +64,7 @@
$id =~ s/ID=//;
- if ( $id eq 'fedora' ) {
+ if ( $id eq 'fedora' || $id eq 'rhel' ) {
$vendor = 'redhat';
} elsif ( $id eq 'opensuse' ) {
$vendor = 'suse';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/install.sh new/shorewall-4.6.0.2/install.sh
--- old/shorewall-4.6.0/install.sh 2014-05-15 17:22:17.000000000 +0200
+++ new/shorewall-4.6.0.2/install.sh 2014-05-23 18:31:41.000000000 +0200
@@ -22,7 +22,7 @@
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
-VERSION=4.6.0
+VERSION=4.6.0.2
#
# Change to the directory containing this script
@@ -216,7 +216,7 @@
eval $(cat /etc/os-release | grep ^ID)
case $ID in
- fedora)
+ fedora|rhel)
BUILD=redhat
;;
debian)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/known_problems.txt new/shorewall-4.6.0.2/known_problems.txt
--- old/shorewall-4.6.0/known_problems.txt 2014-05-15 17:22:17.000000000 +0200
+++ new/shorewall-4.6.0.2/known_problems.txt 2014-05-23 18:31:41.000000000 +0200
@@ -1,109 +1,31 @@
1) On systems running Upstart, shorewall-init cannot reliably secure
the firewall before interfaces are brought up.
-2) The Shorewall Init installer (install.sh) fails on Gentoo systems.
+2) The CHECKSUM target in the tcrules and mangle files is broken and
+ results in this error diagnostic:
- Corrected in Shorewall 4.5.21.1.
+ Running /sbin/iptables-restore...
+ iptables-restore v1.4.7: CHECKSUM target: Parameter --checksum-fill is
+ required
+ Error occurred at line: 41
+ Try `iptables-restore -h' or 'iptables-restore --help' for more
+ information.
+ ERROR: iptables-restore Failed. Input is in
+ /var/lib/shorewall/.iptables-restore-input
-3) The installers (install.sh) fail to start the products at boot time
- on Debian and derivatives. This problem was introduced in Shorewall
- 4.5.21.
+ Corrected in 4.6.0.1
- Corrected in Shorewall 4.5.21.1.
+3) The 'update -A' command does not convert an existing tcrules file
+ into the equivalent mangle file. A separate 'update -t' step is
+ required.
-4) Multiple ICMP/ICMP6 types listed in a rule result in a Perl runtime
- error on the compiler.
+ Corrected in 4.6.0.2
- Corrected in Shorewall 4.5.21.1.
+4) The 'update 't' command results in a Perl segfault when run on
+ RHEL5-based systems and the tcrules file contains '?FORMAT 2'
-5) An attempt to specify RAS or Q.931 in the HELPER column is rejected
- with an error.
+ Workaround: Replace '?FORMAT 2' by 'FORMAT 2'.
- Corrected in Shorewall 4.5.21.1.
-6) The 'nohostroute' provider option does not suppress the addition of
- a host route in the default routing table when USE_DEFAULT_RT=Yes.
-
- Corrected in Shorewall 4.5.21.1.
-
-7) The AutoBL action fails if the kernel and iptables does not support
- the Recent Match '--reap' option.
-
- Corrected in Shorewall 4.5.21.2.
-
-8) The Shorewall-core installer reports an error from 'cp'
- stating that it can not stat the shorewallrc file.
-
- Workaround: Run the installer a second time.
-
- Corrected in Shorewall 4.5.21.2.
-
-9) When a non-root user attempts to execute 'version -a', the CLI
- attempts to get the version of the compiled firewall resulting in
- the following diagnostic when run by non-root:
-
- /sbin/shorewall: /var/lib/shorewall/firewall: Permission denied
-
- Corrected in Shorewall 4.5.21.2.
-
-10) Shorewall uses 'fgrep' making it unusable on on systems without
- that utility.
-
- Corrected in Shorewall 4.5.21.2.
-
-11) Placing |<mark> in the ACTION column of the tcrules file raises a
- fatal compilation error.
-
- Corrected in Shorewall 4.5.21.2.
-
-12) The Shorewall-core installer fails when run on Ubuntu Raring.
-
- Corrected in Shorewall 4.5.21.2.
-
-13) The Shorewall-init installer fails when run on Ubuntu Raring.
-
- Workaround: Run as follows:
-
- BUILD=debian ./install.sh
-
- Corrected in Shorewall 4.5.21.3.
-
-14) The tarball installers don't run update-rc.d on Debian-based
- systems without insserv.
-
- Corrected in Shorewall 4.5.21.3.
-
-15) If an HFSC class is specified with dmax but not umax, then
- the firewall fails to start with the messages:
-
- Nov 14 13:42:42 Setting up Traffic Control...
- HFSC: Illegal "umax"
- HFSC: Illegal "sc"
- ERROR: Command "tc class add dev eth1 parent 1:1 classid 1:110 hfsc sc
- umax b dmax 150ms rate 1575kbit ul rate 3150kbit" Failed
-
- Workaround: Specify a umax value equal to the device MTU.
-
- Corrected in Shorewall 4.5.21.4.
-
-16) The 'add' command previously fails if 'IPSET=' appears in the
- shorewall.conf file.
-
- Workaround: Specify the correct pathname in the IPSET= entry.
-
- Corrected in Shorewall 4.5.21.5.
-
-16) When a non-terminating target specifies logging, the compiler
- erroneously generates a 'goto' (-g) iptables command rather than a
- 'jump' (-j) command. This causes the wrong set of rules to be
- traversed, usually the catchall 'REJECT' rule at the end of the
- INPUT or FORWARD chain.
-
- Corrected in Shorewall 4.5.21.6
-
-17) Existing connections are not blocked when ADMINISABSENTMINDED=No
- and the firewall is stopped.
-
- Corrected in Shorewall 4.5.21.7 (but read the release notes
- carefully).
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-accounting.5 new/shorewall-4.6.0.2/manpages/shorewall-accounting.5
--- old/shorewall-4.6.0/manpages/shorewall-accounting.5 2014-05-15 17:22:23.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-accounting.5 2014-05-23 18:31:45.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-accounting
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-ACCOUNTIN" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-ACCOUNTIN" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-actions.5 new/shorewall-4.6.0.2/manpages/shorewall-actions.5
--- old/shorewall-4.6.0/manpages/shorewall-actions.5 2014-05-15 17:22:24.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-actions.5 2014-05-23 18:31:46.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-actions
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-ACTIONS" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-ACTIONS" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-arprules.5 new/shorewall-4.6.0.2/manpages/shorewall-arprules.5
--- old/shorewall-4.6.0/manpages/shorewall-arprules.5 2014-05-15 17:22:25.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-arprules.5 2014-05-23 18:31:47.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-arprules
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-ARPRULES" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-ARPRULES" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-blacklist.5 new/shorewall-4.6.0.2/manpages/shorewall-blacklist.5
--- old/shorewall-4.6.0/manpages/shorewall-blacklist.5 2014-05-15 17:22:27.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-blacklist.5 2014-05-23 18:31:49.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-blacklist
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-BLACKLIST" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-BLACKLIST" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-blrules.5 new/shorewall-4.6.0.2/manpages/shorewall-blrules.5
--- old/shorewall-4.6.0/manpages/shorewall-blrules.5 2014-05-15 17:22:28.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-blrules.5 2014-05-23 18:31:50.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-blrules
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-BLRULES" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-BLRULES" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-conntrack.5 new/shorewall-4.6.0.2/manpages/shorewall-conntrack.5
--- old/shorewall-4.6.0/manpages/shorewall-conntrack.5 2014-05-15 17:22:34.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-conntrack.5 2014-05-23 18:31:57.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall6-conntrack
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL6\-CONNTRAC" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL6\-CONNTRAC" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-ecn.5 new/shorewall-4.6.0.2/manpages/shorewall-ecn.5
--- old/shorewall-4.6.0/manpages/shorewall-ecn.5 2014-05-15 17:22:36.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-ecn.5 2014-05-23 18:31:58.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-ecn
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-ECN" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-ECN" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-exclusion.5 new/shorewall-4.6.0.2/manpages/shorewall-exclusion.5
--- old/shorewall-4.6.0/manpages/shorewall-exclusion.5 2014-05-15 17:22:37.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-exclusion.5 2014-05-23 18:31:59.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-exclusion
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-EXCLUSION" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-EXCLUSION" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-hosts.5 new/shorewall-4.6.0.2/manpages/shorewall-hosts.5
--- old/shorewall-4.6.0/manpages/shorewall-hosts.5 2014-05-15 17:22:38.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-hosts.5 2014-05-23 18:32:01.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-hosts
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-HOSTS" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-HOSTS" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-init.8 new/shorewall-4.6.0.2/manpages/shorewall-init.8
--- old/shorewall-4.6.0/manpages/shorewall-init.8 2014-05-15 17:22:40.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-init.8 2014-05-23 18:32:02.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-init
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Administrative Commands
.\" Source: Administrative Commands
.\" Language: English
.\"
-.TH "SHOREWALL\-INIT" "8" "05/15/2014" "Administrative Commands" "Administrative Commands"
+.TH "SHOREWALL\-INIT" "8" "05/23/2014" "Administrative Commands" "Administrative Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-interfaces.5 new/shorewall-4.6.0.2/manpages/shorewall-interfaces.5
--- old/shorewall-4.6.0/manpages/shorewall-interfaces.5 2014-05-15 17:22:41.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-interfaces.5 2014-05-23 18:32:04.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-interfaces
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-INTERFACE" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-INTERFACE" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-ipsets.5 new/shorewall-4.6.0.2/manpages/shorewall-ipsets.5
--- old/shorewall-4.6.0/manpages/shorewall-ipsets.5 2014-05-15 17:22:43.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-ipsets.5 2014-05-23 18:32:05.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-ipsets
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-IPSETS" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-IPSETS" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-maclist.5 new/shorewall-4.6.0.2/manpages/shorewall-maclist.5
--- old/shorewall-4.6.0/manpages/shorewall-maclist.5 2014-05-15 17:22:44.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-maclist.5 2014-05-23 18:32:07.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-maclist
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-MACLIST" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-MACLIST" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-mangle.5 new/shorewall-4.6.0.2/manpages/shorewall-mangle.5
--- old/shorewall-4.6.0/manpages/shorewall-mangle.5 2014-05-15 17:22:46.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-mangle.5 2014-05-23 18:32:08.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-mangle
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-MANGLE" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-MANGLE" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-masq.5 new/shorewall-4.6.0.2/manpages/shorewall-masq.5
--- old/shorewall-4.6.0/manpages/shorewall-masq.5 2014-05-15 17:22:48.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-masq.5 2014-05-23 18:32:10.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-masq
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-MASQ" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-MASQ" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -176,7 +176,7 @@
See example 8 below\&.
.RE
.PP
-(Formerly called SUBNET) \- {\fIinterface\fR|\fIaddress\fR[\fB,\fR\fIaddress\fR][\fIexclusion\fR]}
+\fBSOURCE\fR (Formerly called SUBNET) \- {\fIinterface\fR|\fIaddress\fR[\fB,\fR\fIaddress\fR][\fIexclusion\fR]}
.RS 4
Set of hosts that you wish to masquerade\&. You can specify this as an
\fIaddress\fR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-modules.5 new/shorewall-4.6.0.2/manpages/shorewall-modules.5
--- old/shorewall-4.6.0/manpages/shorewall-modules.5 2014-05-15 17:22:49.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-modules.5 2014-05-23 18:32:11.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-modules
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-MODULES" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-MODULES" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-nat.5 new/shorewall-4.6.0.2/manpages/shorewall-nat.5
--- old/shorewall-4.6.0/manpages/shorewall-nat.5 2014-05-15 17:22:50.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-nat.5 2014-05-23 18:32:13.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-nat
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-NAT" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-NAT" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-nesting.5 new/shorewall-4.6.0.2/manpages/shorewall-nesting.5
--- old/shorewall-4.6.0/manpages/shorewall-nesting.5 2014-05-15 17:22:52.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-nesting.5 2014-05-23 18:32:14.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-nesting
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-NESTING" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-NESTING" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-netmap.5 new/shorewall-4.6.0.2/manpages/shorewall-netmap.5
--- old/shorewall-4.6.0/manpages/shorewall-netmap.5 2014-05-15 17:22:53.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-netmap.5 2014-05-23 18:32:15.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-netmap
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-NETMAP" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-NETMAP" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-params.5 new/shorewall-4.6.0.2/manpages/shorewall-params.5
--- old/shorewall-4.6.0/manpages/shorewall-params.5 2014-05-15 17:22:54.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-params.5 2014-05-23 18:32:17.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-params
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-PARAMS" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-PARAMS" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-policy.5 new/shorewall-4.6.0.2/manpages/shorewall-policy.5
--- old/shorewall-4.6.0/manpages/shorewall-policy.5 2014-05-15 17:22:56.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-policy.5 2014-05-23 18:32:18.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-policy
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-POLICY" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-POLICY" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-providers.5 new/shorewall-4.6.0.2/manpages/shorewall-providers.5
--- old/shorewall-4.6.0/manpages/shorewall-providers.5 2014-05-15 17:22:57.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-providers.5 2014-05-23 18:32:20.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-providers
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-PROVIDERS" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-PROVIDERS" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-proxyarp.5 new/shorewall-4.6.0.2/manpages/shorewall-proxyarp.5
--- old/shorewall-4.6.0/manpages/shorewall-proxyarp.5 2014-05-15 17:22:58.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-proxyarp.5 2014-05-23 18:32:21.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-proxyarp
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-PROXYARP" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-PROXYARP" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-routes.5 new/shorewall-4.6.0.2/manpages/shorewall-routes.5
--- old/shorewall-4.6.0/manpages/shorewall-routes.5 2014-05-15 17:23:01.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-routes.5 2014-05-23 18:32:24.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-routes
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-ROUTES" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-ROUTES" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-routestopped.5 new/shorewall-4.6.0.2/manpages/shorewall-routestopped.5
--- old/shorewall-4.6.0/manpages/shorewall-routestopped.5 2014-05-15 17:23:00.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-routestopped.5 2014-05-23 18:32:22.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-routestopped
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-ROUTESTOP" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-ROUTESTOP" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-rtrules.5 new/shorewall-4.6.0.2/manpages/shorewall-rtrules.5
--- old/shorewall-4.6.0/manpages/shorewall-rtrules.5 2014-05-15 17:23:02.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-rtrules.5 2014-05-23 18:32:25.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-rtrules
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-RTRULES" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-RTRULES" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-rules.5 new/shorewall-4.6.0.2/manpages/shorewall-rules.5
--- old/shorewall-4.6.0/manpages/shorewall-rules.5 2014-05-15 17:23:05.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-rules.5 2014-05-23 18:32:28.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-rules
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-RULES" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-RULES" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-secmarks.5 new/shorewall-4.6.0.2/manpages/shorewall-secmarks.5
--- old/shorewall-4.6.0/manpages/shorewall-secmarks.5 2014-05-15 17:23:06.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-secmarks.5 2014-05-23 18:32:29.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-secmarks
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-SECMARKS" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-SECMARKS" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-stoppedrules.5 new/shorewall-4.6.0.2/manpages/shorewall-stoppedrules.5
--- old/shorewall-4.6.0/manpages/shorewall-stoppedrules.5 2014-05-15 17:23:08.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-stoppedrules.5 2014-05-23 18:32:30.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-stoppedrules
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-STOPPEDRU" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-STOPPEDRU" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-tcclasses.5 new/shorewall-4.6.0.2/manpages/shorewall-tcclasses.5
--- old/shorewall-4.6.0/manpages/shorewall-tcclasses.5 2014-05-15 17:23:09.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-tcclasses.5 2014-05-23 18:32:32.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-tcclasses
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-TCCLASSES" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-TCCLASSES" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-tcdevices.5 new/shorewall-4.6.0.2/manpages/shorewall-tcdevices.5
--- old/shorewall-4.6.0/manpages/shorewall-tcdevices.5 2014-05-15 17:23:11.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-tcdevices.5 2014-05-23 18:32:33.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-tcdevices
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-TCDEVICES" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-TCDEVICES" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-tcfilters.5 new/shorewall-4.6.0.2/manpages/shorewall-tcfilters.5
--- old/shorewall-4.6.0/manpages/shorewall-tcfilters.5 2014-05-15 17:23:12.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-tcfilters.5 2014-05-23 18:32:35.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-tcfilters
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-TCFILTERS" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-TCFILTERS" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-tcinterfaces.5 new/shorewall-4.6.0.2/manpages/shorewall-tcinterfaces.5
--- old/shorewall-4.6.0/manpages/shorewall-tcinterfaces.5 2014-05-15 17:23:14.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-tcinterfaces.5 2014-05-23 18:32:36.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-tcinterfaces
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-TCINTERFA" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-TCINTERFA" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-tcpri.5 new/shorewall-4.6.0.2/manpages/shorewall-tcpri.5
--- old/shorewall-4.6.0/manpages/shorewall-tcpri.5 2014-05-15 17:23:15.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-tcpri.5 2014-05-23 18:32:37.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-tcpri
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-TCPRI" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-TCPRI" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-tcrules.5 new/shorewall-4.6.0.2/manpages/shorewall-tcrules.5
--- old/shorewall-4.6.0/manpages/shorewall-tcrules.5 2014-05-15 17:23:17.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-tcrules.5 2014-05-23 18:32:39.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-mangle
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: [FIXME: manual]
.\" Source: [FIXME: source]
.\" Language: English
.\"
-.TH "SHOREWALL\-MANGLE" "5" "05/15/2014" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-MANGLE" "5" "05/23/2014" "[FIXME: source]" "[FIXME: manual]"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-tos.5 new/shorewall-4.6.0.2/manpages/shorewall-tos.5
--- old/shorewall-4.6.0/manpages/shorewall-tos.5 2014-05-15 17:23:18.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-tos.5 2014-05-23 18:32:41.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-tos
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-TOS" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-TOS" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-tunnels.5 new/shorewall-4.6.0.2/manpages/shorewall-tunnels.5
--- old/shorewall-4.6.0/manpages/shorewall-tunnels.5 2014-05-15 17:23:20.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-tunnels.5 2014-05-23 18:32:42.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-tunnels
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-TUNNELS" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-TUNNELS" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-vardir.5 new/shorewall-4.6.0.2/manpages/shorewall-vardir.5
--- old/shorewall-4.6.0/manpages/shorewall-vardir.5 2014-05-15 17:23:21.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-vardir.5 2014-05-23 18:32:43.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-vardir
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-VARDIR" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-VARDIR" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall-zones.5 new/shorewall-4.6.0.2/manpages/shorewall-zones.5
--- old/shorewall-4.6.0/manpages/shorewall-zones.5 2014-05-15 17:23:25.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall-zones.5 2014-05-23 18:32:48.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-zones
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-ZONES" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-ZONES" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall.8 new/shorewall-4.6.0.2/manpages/shorewall.8
--- old/shorewall-4.6.0/manpages/shorewall.8 2014-05-15 17:23:24.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall.8 2014-05-23 18:32:46.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Administrative Commands
.\" Source: Administrative Commands
.\" Language: English
.\"
-.TH "SHOREWALL" "8" "05/15/2014" "Administrative Commands" "Administrative Commands"
+.TH "SHOREWALL" "8" "05/23/2014" "Administrative Commands" "Administrative Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/manpages/shorewall.conf.5 new/shorewall-4.6.0.2/manpages/shorewall.conf.5
--- old/shorewall-4.6.0/manpages/shorewall.conf.5 2014-05-15 17:22:33.000000000 +0200
+++ new/shorewall-4.6.0.2/manpages/shorewall.conf.5 2014-05-23 18:31:55.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall.conf
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\&.CONF" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\&.CONF" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/releasenotes.txt new/shorewall-4.6.0.2/releasenotes.txt
--- old/shorewall-4.6.0/releasenotes.txt 2014-05-15 17:22:17.000000000 +0200
+++ new/shorewall-4.6.0.2/releasenotes.txt 2014-05-23 18:31:41.000000000 +0200
@@ -1,7 +1,7 @@
----------------------------------------------------------------------------
- S H O R E W A L L 4 . 6 . 0
+ S H O R E W A L L 4 . 6 . 0 . 2
------------------------------------
- M a y 1 5 , 2 0 1 4
+ M a y 2 4 , 2 0 1 4
----------------------------------------------------------------------------
I. PROBLEMS CORRECTED IN THIS RELEASE
@@ -14,6 +14,54 @@
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
----------------------------------------------------------------------------
+4.6.0.2
+
+1) The 'upgrade -A' command now converts the tcrules file to a mangle
+ file. Previously, that didn't happen.
+
+2) The install components now support RHEL7.
+
+3) Whitespace issues in the skeleton configuration files have been
+ corrected (Tuomo Soini).
+
+4) The install components now support RHEL7.
+
+5) FAQ 2e has been added which describes additional steps required to
+ achieve hairpin NAT on a bridge where the modified packets are to
+ go out the same bridge port as they entered.
+
+6) shorewall-masq(5) has been corrected to include the word SOURCE on
+ the description of that column. Previously, the description read
+ '(formerly called SUBNET)'.
+
+7) The output of 'shorewall show filters' once again shows ingress
+ (policing filters). This works around undocumented changes to the
+ behavior of the 'tc' utility.
+
+4.6.0.1
+
+1) The CHECKSUM target in the tcrules and mangle files was broken and
+ resulted in this error diagnostic:
+
+ Running /sbin/iptables-restore...
+ iptables-restore v1.4.7: CHECKSUM target: Parameter --checksum-fill is
+ required
+ Error occurred at line: 41
+ Try `iptables-restore -h' or 'iptables-restore --help' for more
+ information.
+ ERROR: iptables-restore Failed. Input is in
+ /var/lib/shorewall/.iptables-restore-input
+
+ The compiler is now generating the correct rule.
+
+2) Some cosmetic issues in the 'mangle' files have been resolved.
+
+3) When an invalid chain designator was supplied in 'tcrules' or
+ 'mangle', the compiler's error message was garbled and a
+ Perl diagnostic was issued.
+
+4.6.0
+
This release includes all defect repair from releases up through
4.5.21.9.
@@ -329,9 +377,9 @@
See shorewall6(8) for limitations of 'update -t'.
-12) The default value LOAD_HELPERS_ONLY is now 'Yes'.
+15) The default value LOAD_HELPERS_ONLY is now 'Yes'.
-13) Beginning with Shorewall 4.5.0, FORMAT-1 actions and macros are
+16) Beginning with Shorewall 4.6.0, FORMAT-1 actions and macros are
deprecated and a warning will be issued for each FORMAT-1 action
or macro found.
@@ -374,7 +422,7 @@
MARK
CONNLIMIT
TIME
- HEADERS (Ipv6 only)
+ HEADERS (Used in IPv6 only)
CONDITION
HELPER
@@ -403,7 +451,7 @@
MARK
CONNLIMIT
TIME
- HEADERS (Ipv6 only)
+ HEADERS (Used in IPv6 only)
CONDITION
HELPER
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/shorewall.spec new/shorewall-4.6.0.2/shorewall.spec
--- old/shorewall-4.6.0/shorewall.spec 2014-05-15 17:22:17.000000000 +0200
+++ new/shorewall-4.6.0.2/shorewall.spec 2014-05-23 18:31:41.000000000 +0200
@@ -1,6 +1,6 @@
%define name shorewall
%define version 4.6.0
-%define release 0base
+%define release 2
Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
Name: %{name}
@@ -130,6 +130,10 @@
%doc COPYING INSTALL changelog.txt releasenotes.txt Contrib/* Samples
%changelog
+* Fri May 16 2014 Tom Eastep tom(a)shorewall.net
+- Updated to 4.6.0-2
+* Fri May 16 2014 Tom Eastep tom(a)shorewall.net
+- Updated to 4.6.0-1
* Sat May 10 2014 Tom Eastep tom(a)shorewall.net
- Updated to 4.6.0-0base
* Wed May 07 2014 Tom Eastep tom(a)shorewall.net
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.6.0/uninstall.sh new/shorewall-4.6.0.2/uninstall.sh
--- old/shorewall-4.6.0/uninstall.sh 2014-05-15 17:22:17.000000000 +0200
+++ new/shorewall-4.6.0.2/uninstall.sh 2014-05-23 18:31:41.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=4.6.0
+VERSION=4.6.0.2
usage() # $1 = exit status
{
++++++ shorewall-core-4.6.0.tar.bz2 -> shorewall-core-4.6.0.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.6.0/changelog.txt new/shorewall-core-4.6.0.2/changelog.txt
--- old/shorewall-core-4.6.0/changelog.txt 2014-05-15 17:22:17.000000000 +0200
+++ new/shorewall-core-4.6.0.2/changelog.txt 2014-05-23 18:31:41.000000000 +0200
@@ -1,3 +1,29 @@
+Changes in 4.6.0.2
+
+1) Update release documents.
+
+2) Correct handling of tcrules upgrade with 'upgrade -A'.
+
+3) Apply Tuomo Soini's whitespace patch.
+
+4) Extend Orion Poplawski's RHEL7 patch.
+
+5) Add FAQ 2e.
+
+6) Update Support article.
+
+7) Fix shorewall-masq SOURCE description
+
+Changes in 4.6.0.1
+
+1) Update release documents.
+
+2) Correct CHECKSUM handling.
+
+3) Apply Simon Mater's cosmetic changes to 'mangle' file.
+
+4) Correct chain designator editing.
+
Changes in 4.6.0 Final
1) Update release documents.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.6.0/configure new/shorewall-core-4.6.0.2/configure
--- old/shorewall-core-4.6.0/configure 2014-05-15 17:22:16.000000000 +0200
+++ new/shorewall-core-4.6.0.2/configure 2014-05-23 18:31:40.000000000 +0200
@@ -28,7 +28,7 @@
#
# Build updates this
#
-VERSION=4.6.0
+VERSION=4.6.0.2
case "$BASH_VERSION" in
[4-9].*)
@@ -98,7 +98,7 @@
eval $(cat /etc/os-release | grep ^ID=)
case $ID in
- fedora)
+ fedora|rhel)
vendor=redhat
;;
debian|ubuntu)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.6.0/configure.pl new/shorewall-core-4.6.0.2/configure.pl
--- old/shorewall-core-4.6.0/configure.pl 2014-05-15 17:22:16.000000000 +0200
+++ new/shorewall-core-4.6.0.2/configure.pl 2014-05-23 18:31:40.000000000 +0200
@@ -31,7 +31,7 @@
# Build updates this
#
use constant {
- VERSION => '4.6.0'
+ VERSION => '4.6.0.2'
};
my %params;
@@ -64,7 +64,7 @@
$id =~ s/ID=//;
- if ( $id eq 'fedora' ) {
+ if ( $id eq 'fedora' || $id eq 'rhel' ) {
$vendor = 'redhat';
} elsif ( $id eq 'opensuse' ) {
$vendor = 'suse';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.6.0/install.sh new/shorewall-core-4.6.0.2/install.sh
--- old/shorewall-core-4.6.0/install.sh 2014-05-15 17:22:16.000000000 +0200
+++ new/shorewall-core-4.6.0.2/install.sh 2014-05-23 18:31:40.000000000 +0200
@@ -22,7 +22,7 @@
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
-VERSION=4.6.0
+VERSION=4.6.0.2
usage() # $1 = exit status
{
@@ -198,7 +198,7 @@
eval $(cat /etc/os-release | grep ^ID)
case $ID in
- fedora)
+ fedora|rhel)
BUILD=redhat
;;
debian)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.6.0/known_problems.txt new/shorewall-core-4.6.0.2/known_problems.txt
--- old/shorewall-core-4.6.0/known_problems.txt 2014-05-15 17:22:17.000000000 +0200
+++ new/shorewall-core-4.6.0.2/known_problems.txt 2014-05-23 18:31:41.000000000 +0200
@@ -1,109 +1,31 @@
1) On systems running Upstart, shorewall-init cannot reliably secure
the firewall before interfaces are brought up.
-2) The Shorewall Init installer (install.sh) fails on Gentoo systems.
+2) The CHECKSUM target in the tcrules and mangle files is broken and
+ results in this error diagnostic:
- Corrected in Shorewall 4.5.21.1.
+ Running /sbin/iptables-restore...
+ iptables-restore v1.4.7: CHECKSUM target: Parameter --checksum-fill is
+ required
+ Error occurred at line: 41
+ Try `iptables-restore -h' or 'iptables-restore --help' for more
+ information.
+ ERROR: iptables-restore Failed. Input is in
+ /var/lib/shorewall/.iptables-restore-input
-3) The installers (install.sh) fail to start the products at boot time
- on Debian and derivatives. This problem was introduced in Shorewall
- 4.5.21.
+ Corrected in 4.6.0.1
- Corrected in Shorewall 4.5.21.1.
+3) The 'update -A' command does not convert an existing tcrules file
+ into the equivalent mangle file. A separate 'update -t' step is
+ required.
-4) Multiple ICMP/ICMP6 types listed in a rule result in a Perl runtime
- error on the compiler.
+ Corrected in 4.6.0.2
- Corrected in Shorewall 4.5.21.1.
+4) The 'update 't' command results in a Perl segfault when run on
+ RHEL5-based systems and the tcrules file contains '?FORMAT 2'
-5) An attempt to specify RAS or Q.931 in the HELPER column is rejected
- with an error.
+ Workaround: Replace '?FORMAT 2' by 'FORMAT 2'.
- Corrected in Shorewall 4.5.21.1.
-6) The 'nohostroute' provider option does not suppress the addition of
- a host route in the default routing table when USE_DEFAULT_RT=Yes.
-
- Corrected in Shorewall 4.5.21.1.
-
-7) The AutoBL action fails if the kernel and iptables does not support
- the Recent Match '--reap' option.
-
- Corrected in Shorewall 4.5.21.2.
-
-8) The Shorewall-core installer reports an error from 'cp'
- stating that it can not stat the shorewallrc file.
-
- Workaround: Run the installer a second time.
-
- Corrected in Shorewall 4.5.21.2.
-
-9) When a non-root user attempts to execute 'version -a', the CLI
- attempts to get the version of the compiled firewall resulting in
- the following diagnostic when run by non-root:
-
- /sbin/shorewall: /var/lib/shorewall/firewall: Permission denied
-
- Corrected in Shorewall 4.5.21.2.
-
-10) Shorewall uses 'fgrep' making it unusable on on systems without
- that utility.
-
- Corrected in Shorewall 4.5.21.2.
-
-11) Placing |<mark> in the ACTION column of the tcrules file raises a
- fatal compilation error.
-
- Corrected in Shorewall 4.5.21.2.
-
-12) The Shorewall-core installer fails when run on Ubuntu Raring.
-
- Corrected in Shorewall 4.5.21.2.
-
-13) The Shorewall-init installer fails when run on Ubuntu Raring.
-
- Workaround: Run as follows:
-
- BUILD=debian ./install.sh
-
- Corrected in Shorewall 4.5.21.3.
-
-14) The tarball installers don't run update-rc.d on Debian-based
- systems without insserv.
-
- Corrected in Shorewall 4.5.21.3.
-
-15) If an HFSC class is specified with dmax but not umax, then
- the firewall fails to start with the messages:
-
- Nov 14 13:42:42 Setting up Traffic Control...
- HFSC: Illegal "umax"
- HFSC: Illegal "sc"
- ERROR: Command "tc class add dev eth1 parent 1:1 classid 1:110 hfsc sc
- umax b dmax 150ms rate 1575kbit ul rate 3150kbit" Failed
-
- Workaround: Specify a umax value equal to the device MTU.
-
- Corrected in Shorewall 4.5.21.4.
-
-16) The 'add' command previously fails if 'IPSET=' appears in the
- shorewall.conf file.
-
- Workaround: Specify the correct pathname in the IPSET= entry.
-
- Corrected in Shorewall 4.5.21.5.
-
-16) When a non-terminating target specifies logging, the compiler
- erroneously generates a 'goto' (-g) iptables command rather than a
- 'jump' (-j) command. This causes the wrong set of rules to be
- traversed, usually the catchall 'REJECT' rule at the end of the
- INPUT or FORWARD chain.
-
- Corrected in Shorewall 4.5.21.6
-
-17) Existing connections are not blocked when ADMINISABSENTMINDED=No
- and the firewall is stopped.
-
- Corrected in Shorewall 4.5.21.7 (but read the release notes
- carefully).
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.6.0/lib.cli new/shorewall-core-4.6.0.2/lib.cli
--- old/shorewall-core-4.6.0/lib.cli 2014-05-15 17:20:10.000000000 +0200
+++ new/shorewall-core-4.6.0.2/lib.cli 2014-05-23 18:26:12.000000000 +0200
@@ -252,6 +252,7 @@
if [ -n "$qdisc" ]; then
echo Device $device:
+ qt tc -s filter ls root dev $device && tc -s filter ls root dev $device | grep -v '^$'
tc -s filter ls dev $device
echo
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.6.0/releasenotes.txt new/shorewall-core-4.6.0.2/releasenotes.txt
--- old/shorewall-core-4.6.0/releasenotes.txt 2014-05-15 17:22:17.000000000 +0200
+++ new/shorewall-core-4.6.0.2/releasenotes.txt 2014-05-23 18:31:41.000000000 +0200
@@ -1,7 +1,7 @@
----------------------------------------------------------------------------
- S H O R E W A L L 4 . 6 . 0
+ S H O R E W A L L 4 . 6 . 0 . 2
------------------------------------
- M a y 1 5 , 2 0 1 4
+ M a y 2 4 , 2 0 1 4
----------------------------------------------------------------------------
I. PROBLEMS CORRECTED IN THIS RELEASE
@@ -14,6 +14,54 @@
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
----------------------------------------------------------------------------
+4.6.0.2
+
+1) The 'upgrade -A' command now converts the tcrules file to a mangle
+ file. Previously, that didn't happen.
+
+2) The install components now support RHEL7.
+
+3) Whitespace issues in the skeleton configuration files have been
+ corrected (Tuomo Soini).
+
+4) The install components now support RHEL7.
+
+5) FAQ 2e has been added which describes additional steps required to
+ achieve hairpin NAT on a bridge where the modified packets are to
+ go out the same bridge port as they entered.
+
+6) shorewall-masq(5) has been corrected to include the word SOURCE on
+ the description of that column. Previously, the description read
+ '(formerly called SUBNET)'.
+
+7) The output of 'shorewall show filters' once again shows ingress
+ (policing filters). This works around undocumented changes to the
+ behavior of the 'tc' utility.
+
+4.6.0.1
+
+1) The CHECKSUM target in the tcrules and mangle files was broken and
+ resulted in this error diagnostic:
+
+ Running /sbin/iptables-restore...
+ iptables-restore v1.4.7: CHECKSUM target: Parameter --checksum-fill is
+ required
+ Error occurred at line: 41
+ Try `iptables-restore -h' or 'iptables-restore --help' for more
+ information.
+ ERROR: iptables-restore Failed. Input is in
+ /var/lib/shorewall/.iptables-restore-input
+
+ The compiler is now generating the correct rule.
+
+2) Some cosmetic issues in the 'mangle' files have been resolved.
+
+3) When an invalid chain designator was supplied in 'tcrules' or
+ 'mangle', the compiler's error message was garbled and a
+ Perl diagnostic was issued.
+
+4.6.0
+
This release includes all defect repair from releases up through
4.5.21.9.
@@ -329,9 +377,9 @@
See shorewall6(8) for limitations of 'update -t'.
-12) The default value LOAD_HELPERS_ONLY is now 'Yes'.
+15) The default value LOAD_HELPERS_ONLY is now 'Yes'.
-13) Beginning with Shorewall 4.5.0, FORMAT-1 actions and macros are
+16) Beginning with Shorewall 4.6.0, FORMAT-1 actions and macros are
deprecated and a warning will be issued for each FORMAT-1 action
or macro found.
@@ -374,7 +422,7 @@
MARK
CONNLIMIT
TIME
- HEADERS (Ipv6 only)
+ HEADERS (Used in IPv6 only)
CONDITION
HELPER
@@ -403,7 +451,7 @@
MARK
CONNLIMIT
TIME
- HEADERS (Ipv6 only)
+ HEADERS (Used in IPv6 only)
CONDITION
HELPER
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.6.0/shorewall-core.spec new/shorewall-core-4.6.0.2/shorewall-core.spec
--- old/shorewall-core-4.6.0/shorewall-core.spec 2014-05-15 17:22:17.000000000 +0200
+++ new/shorewall-core-4.6.0.2/shorewall-core.spec 2014-05-23 18:31:41.000000000 +0200
@@ -1,6 +1,6 @@
%define name shorewall-core
%define version 4.6.0
-%define release 0base
+%define release 2
Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
Name: %{name}
@@ -62,6 +62,10 @@
%doc COPYING INSTALL changelog.txt releasenotes.txt
%changelog
+* Fri May 16 2014 Tom Eastep tom(a)shorewall.net
+- Updated to 4.6.0-2
+* Fri May 16 2014 Tom Eastep tom(a)shorewall.net
+- Updated to 4.6.0-1
* Sat May 10 2014 Tom Eastep tom(a)shorewall.net
- Updated to 4.6.0-0base
* Wed May 07 2014 Tom Eastep tom(a)shorewall.net
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.6.0/uninstall.sh new/shorewall-core-4.6.0.2/uninstall.sh
--- old/shorewall-core-4.6.0/uninstall.sh 2014-05-15 17:22:16.000000000 +0200
+++ new/shorewall-core-4.6.0.2/uninstall.sh 2014-05-23 18:31:40.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=4.6.0
+VERSION=4.6.0.2
usage() # $1 = exit status
{
++++++ shorewall-docs-html-4.6.0.tar.bz2 -> shorewall-docs-html-4.6.0.2.tar.bz2 ++++++
++++ 6836 lines of diff (skipped)
++++++ shorewall-init-4.6.0.tar.bz2 -> shorewall-init-4.6.0.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-4.6.0/changelog.txt new/shorewall-init-4.6.0.2/changelog.txt
--- old/shorewall-init-4.6.0/changelog.txt 2014-05-15 17:22:18.000000000 +0200
+++ new/shorewall-init-4.6.0.2/changelog.txt 2014-05-23 18:31:42.000000000 +0200
@@ -1,3 +1,29 @@
+Changes in 4.6.0.2
+
+1) Update release documents.
+
+2) Correct handling of tcrules upgrade with 'upgrade -A'.
+
+3) Apply Tuomo Soini's whitespace patch.
+
+4) Extend Orion Poplawski's RHEL7 patch.
+
+5) Add FAQ 2e.
+
+6) Update Support article.
+
+7) Fix shorewall-masq SOURCE description
+
+Changes in 4.6.0.1
+
+1) Update release documents.
+
+2) Correct CHECKSUM handling.
+
+3) Apply Simon Mater's cosmetic changes to 'mangle' file.
+
+4) Correct chain designator editing.
+
Changes in 4.6.0 Final
1) Update release documents.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-4.6.0/configure new/shorewall-init-4.6.0.2/configure
--- old/shorewall-init-4.6.0/configure 2014-05-15 17:22:18.000000000 +0200
+++ new/shorewall-init-4.6.0.2/configure 2014-05-23 18:31:42.000000000 +0200
@@ -28,7 +28,7 @@
#
# Build updates this
#
-VERSION=4.6.0
+VERSION=4.6.0.2
case "$BASH_VERSION" in
[4-9].*)
@@ -98,7 +98,7 @@
eval $(cat /etc/os-release | grep ^ID=)
case $ID in
- fedora)
+ fedora|rhel)
vendor=redhat
;;
debian|ubuntu)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-4.6.0/configure.pl new/shorewall-init-4.6.0.2/configure.pl
--- old/shorewall-init-4.6.0/configure.pl 2014-05-15 17:22:18.000000000 +0200
+++ new/shorewall-init-4.6.0.2/configure.pl 2014-05-23 18:31:42.000000000 +0200
@@ -31,7 +31,7 @@
# Build updates this
#
use constant {
- VERSION => '4.6.0'
+ VERSION => '4.6.0.2'
};
my %params;
@@ -64,7 +64,7 @@
$id =~ s/ID=//;
- if ( $id eq 'fedora' ) {
+ if ( $id eq 'fedora' || $id eq 'rhel' ) {
$vendor = 'redhat';
} elsif ( $id eq 'opensuse' ) {
$vendor = 'suse';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-4.6.0/install.sh new/shorewall-init-4.6.0.2/install.sh
--- old/shorewall-init-4.6.0/install.sh 2014-05-15 17:22:18.000000000 +0200
+++ new/shorewall-init-4.6.0.2/install.sh 2014-05-23 18:31:42.000000000 +0200
@@ -27,7 +27,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
-VERSION=4.6.0
+VERSION=4.6.0.2
usage() # $1 = exit status
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-4.6.0/releasenotes.txt new/shorewall-init-4.6.0.2/releasenotes.txt
--- old/shorewall-init-4.6.0/releasenotes.txt 2014-05-15 17:22:18.000000000 +0200
+++ new/shorewall-init-4.6.0.2/releasenotes.txt 2014-05-23 18:31:42.000000000 +0200
@@ -1,7 +1,7 @@
----------------------------------------------------------------------------
- S H O R E W A L L 4 . 6 . 0
+ S H O R E W A L L 4 . 6 . 0 . 2
------------------------------------
- M a y 1 5 , 2 0 1 4
+ M a y 2 4 , 2 0 1 4
----------------------------------------------------------------------------
I. PROBLEMS CORRECTED IN THIS RELEASE
@@ -14,6 +14,54 @@
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
----------------------------------------------------------------------------
+4.6.0.2
+
+1) The 'upgrade -A' command now converts the tcrules file to a mangle
+ file. Previously, that didn't happen.
+
+2) The install components now support RHEL7.
+
+3) Whitespace issues in the skeleton configuration files have been
+ corrected (Tuomo Soini).
+
+4) The install components now support RHEL7.
+
+5) FAQ 2e has been added which describes additional steps required to
+ achieve hairpin NAT on a bridge where the modified packets are to
+ go out the same bridge port as they entered.
+
+6) shorewall-masq(5) has been corrected to include the word SOURCE on
+ the description of that column. Previously, the description read
+ '(formerly called SUBNET)'.
+
+7) The output of 'shorewall show filters' once again shows ingress
+ (policing filters). This works around undocumented changes to the
+ behavior of the 'tc' utility.
+
+4.6.0.1
+
+1) The CHECKSUM target in the tcrules and mangle files was broken and
+ resulted in this error diagnostic:
+
+ Running /sbin/iptables-restore...
+ iptables-restore v1.4.7: CHECKSUM target: Parameter --checksum-fill is
+ required
+ Error occurred at line: 41
+ Try `iptables-restore -h' or 'iptables-restore --help' for more
+ information.
+ ERROR: iptables-restore Failed. Input is in
+ /var/lib/shorewall/.iptables-restore-input
+
+ The compiler is now generating the correct rule.
+
+2) Some cosmetic issues in the 'mangle' files have been resolved.
+
+3) When an invalid chain designator was supplied in 'tcrules' or
+ 'mangle', the compiler's error message was garbled and a
+ Perl diagnostic was issued.
+
+4.6.0
+
This release includes all defect repair from releases up through
4.5.21.9.
@@ -329,9 +377,9 @@
See shorewall6(8) for limitations of 'update -t'.
-12) The default value LOAD_HELPERS_ONLY is now 'Yes'.
+15) The default value LOAD_HELPERS_ONLY is now 'Yes'.
-13) Beginning with Shorewall 4.5.0, FORMAT-1 actions and macros are
+16) Beginning with Shorewall 4.6.0, FORMAT-1 actions and macros are
deprecated and a warning will be issued for each FORMAT-1 action
or macro found.
@@ -374,7 +422,7 @@
MARK
CONNLIMIT
TIME
- HEADERS (Ipv6 only)
+ HEADERS (Used in IPv6 only)
CONDITION
HELPER
@@ -403,7 +451,7 @@
MARK
CONNLIMIT
TIME
- HEADERS (Ipv6 only)
+ HEADERS (Used in IPv6 only)
CONDITION
HELPER
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-4.6.0/shorewall-init.spec new/shorewall-init-4.6.0.2/shorewall-init.spec
--- old/shorewall-init-4.6.0/shorewall-init.spec 2014-05-15 17:22:18.000000000 +0200
+++ new/shorewall-init-4.6.0.2/shorewall-init.spec 2014-05-23 18:31:42.000000000 +0200
@@ -1,6 +1,6 @@
%define name shorewall-init
%define version 4.6.0
-%define release 0base
+%define release 2
Summary: Shorewall-init adds functionality to Shoreline Firewall (Shorewall).
Name: %{name}
@@ -125,6 +125,10 @@
%doc COPYING changelog.txt releasenotes.txt
%changelog
+* Fri May 16 2014 Tom Eastep tom(a)shorewall.net
+- Updated to 4.6.0-2
+* Fri May 16 2014 Tom Eastep tom(a)shorewall.net
+- Updated to 4.6.0-1
* Sat May 10 2014 Tom Eastep tom(a)shorewall.net
- Updated to 4.6.0-0base
* Wed May 07 2014 Tom Eastep tom(a)shorewall.net
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-4.6.0/uninstall.sh new/shorewall-init-4.6.0.2/uninstall.sh
--- old/shorewall-init-4.6.0/uninstall.sh 2014-05-15 17:22:18.000000000 +0200
+++ new/shorewall-init-4.6.0.2/uninstall.sh 2014-05-23 18:31:42.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=4.6.0
+VERSION=4.6.0.2
usage() # $1 = exit status
{
++++++ shorewall-lite-4.6.0.tar.bz2 -> shorewall-lite-4.6.0.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.6.0/changelog.txt new/shorewall-lite-4.6.0.2/changelog.txt
--- old/shorewall-lite-4.6.0/changelog.txt 2014-05-15 17:22:18.000000000 +0200
+++ new/shorewall-lite-4.6.0.2/changelog.txt 2014-05-23 18:31:42.000000000 +0200
@@ -1,3 +1,29 @@
+Changes in 4.6.0.2
+
+1) Update release documents.
+
+2) Correct handling of tcrules upgrade with 'upgrade -A'.
+
+3) Apply Tuomo Soini's whitespace patch.
+
+4) Extend Orion Poplawski's RHEL7 patch.
+
+5) Add FAQ 2e.
+
+6) Update Support article.
+
+7) Fix shorewall-masq SOURCE description
+
+Changes in 4.6.0.1
+
+1) Update release documents.
+
+2) Correct CHECKSUM handling.
+
+3) Apply Simon Mater's cosmetic changes to 'mangle' file.
+
+4) Correct chain designator editing.
+
Changes in 4.6.0 Final
1) Update release documents.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.6.0/configure new/shorewall-lite-4.6.0.2/configure
--- old/shorewall-lite-4.6.0/configure 2014-05-15 17:22:18.000000000 +0200
+++ new/shorewall-lite-4.6.0.2/configure 2014-05-23 18:31:42.000000000 +0200
@@ -28,7 +28,7 @@
#
# Build updates this
#
-VERSION=4.6.0
+VERSION=4.6.0.2
case "$BASH_VERSION" in
[4-9].*)
@@ -98,7 +98,7 @@
eval $(cat /etc/os-release | grep ^ID=)
case $ID in
- fedora)
+ fedora|rhel)
vendor=redhat
;;
debian|ubuntu)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.6.0/configure.pl new/shorewall-lite-4.6.0.2/configure.pl
--- old/shorewall-lite-4.6.0/configure.pl 2014-05-15 17:22:18.000000000 +0200
+++ new/shorewall-lite-4.6.0.2/configure.pl 2014-05-23 18:31:42.000000000 +0200
@@ -31,7 +31,7 @@
# Build updates this
#
use constant {
- VERSION => '4.6.0'
+ VERSION => '4.6.0.2'
};
my %params;
@@ -64,7 +64,7 @@
$id =~ s/ID=//;
- if ( $id eq 'fedora' ) {
+ if ( $id eq 'fedora' || $id eq 'rhel' ) {
$vendor = 'redhat';
} elsif ( $id eq 'opensuse' ) {
$vendor = 'suse';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.6.0/install.sh new/shorewall-lite-4.6.0.2/install.sh
--- old/shorewall-lite-4.6.0/install.sh 2014-05-15 17:22:18.000000000 +0200
+++ new/shorewall-lite-4.6.0.2/install.sh 2014-05-23 18:31:42.000000000 +0200
@@ -22,7 +22,7 @@
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
-VERSION=4.6.0
+VERSION=4.6.0.2
usage() # $1 = exit status
{
@@ -206,7 +206,7 @@
eval $(cat /etc/os-release | grep ^ID)
case $ID in
- fedora)
+ fedora|rhel)
BUILD=redhat
;;
debian)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.6.0/manpages/shorewall-lite-vardir.5 new/shorewall-lite-4.6.0.2/manpages/shorewall-lite-vardir.5
--- old/shorewall-lite-4.6.0/manpages/shorewall-lite-vardir.5 2014-05-15 17:25:39.000000000 +0200
+++ new/shorewall-lite-4.6.0.2/manpages/shorewall-lite-vardir.5 2014-05-23 18:34:58.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.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-LITE\-VAR" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-LITE\-VAR" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.6.0/manpages/shorewall-lite.8 new/shorewall-lite-4.6.0.2/manpages/shorewall-lite.8
--- old/shorewall-lite-4.6.0/manpages/shorewall-lite.8 2014-05-15 17:25:40.000000000 +0200
+++ new/shorewall-lite-4.6.0.2/manpages/shorewall-lite.8 2014-05-23 18:35:00.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: shorewall-lite
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Administrative Commands
.\" Source: Administrative Commands
.\" Language: English
.\"
-.TH "SHOREWALL\-LITE" "8" "05/15/2014" "Administrative Commands" "Administrative Commands"
+.TH "SHOREWALL\-LITE" "8" "05/23/2014" "Administrative Commands" "Administrative Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.6.0/manpages/shorewall-lite.conf.5 new/shorewall-lite-4.6.0.2/manpages/shorewall-lite.conf.5
--- old/shorewall-lite-4.6.0/manpages/shorewall-lite.conf.5 2014-05-15 17:25:37.000000000 +0200
+++ new/shorewall-lite-4.6.0.2/manpages/shorewall-lite.conf.5 2014-05-23 18:34:57.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.76.1 <http://docbook.sf.net/>
-.\" Date: 05/15/2014
+.\" Date: 05/23/2014
.\" Manual: Configuration Files
.\" Source: Configuration Files
.\" Language: English
.\"
-.TH "SHOREWALL\-LITE\&.CO" "5" "05/15/2014" "Configuration Files" "Configuration Files"
+.TH "SHOREWALL\-LITE\&.CO" "5" "05/23/2014" "Configuration Files" "Configuration Files"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.6.0/releasenotes.txt new/shorewall-lite-4.6.0.2/releasenotes.txt
--- old/shorewall-lite-4.6.0/releasenotes.txt 2014-05-15 17:22:18.000000000 +0200
+++ new/shorewall-lite-4.6.0.2/releasenotes.txt 2014-05-23 18:31:42.000000000 +0200
@@ -1,7 +1,7 @@
----------------------------------------------------------------------------
- S H O R E W A L L 4 . 6 . 0
+ S H O R E W A L L 4 . 6 . 0 . 2
------------------------------------
- M a y 1 5 , 2 0 1 4
+ M a y 2 4 , 2 0 1 4
----------------------------------------------------------------------------
I. PROBLEMS CORRECTED IN THIS RELEASE
@@ -14,6 +14,54 @@
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
----------------------------------------------------------------------------
+4.6.0.2
+
+1) The 'upgrade -A' command now converts the tcrules file to a mangle
+ file. Previously, that didn't happen.
+
+2) The install components now support RHEL7.
+
+3) Whitespace issues in the skeleton configuration files have been
+ corrected (Tuomo Soini).
+
+4) The install components now support RHEL7.
+
+5) FAQ 2e has been added which describes additional steps required to
+ achieve hairpin NAT on a bridge where the modified packets are to
+ go out the same bridge port as they entered.
+
+6) shorewall-masq(5) has been corrected to include the word SOURCE on
+ the description of that column. Previously, the description read
+ '(formerly called SUBNET)'.
+
+7) The output of 'shorewall show filters' once again shows ingress
+ (policing filters). This works around undocumented changes to the
+ behavior of the 'tc' utility.
+
+4.6.0.1
+
+1) The CHECKSUM target in the tcrules and mangle files was broken and
+ resulted in this error diagnostic:
+
+ Running /sbin/iptables-restore...
+ iptables-restore v1.4.7: CHECKSUM target: Parameter --checksum-fill is
+ required
+ Error occurred at line: 41
+ Try `iptables-restore -h' or 'iptables-restore --help' for more
+ information.
+ ERROR: iptables-restore Failed. Input is in
+ /var/lib/shorewall/.iptables-restore-input
+
+ The compiler is now generating the correct rule.
+
+2) Some cosmetic issues in the 'mangle' files have been resolved.
+
+3) When an invalid chain designator was supplied in 'tcrules' or
+ 'mangle', the compiler's error message was garbled and a
+ Perl diagnostic was issued.
+
+4.6.0
+
This release includes all defect repair from releases up through
4.5.21.9.
@@ -329,9 +377,9 @@
See shorewall6(8) for limitations of 'update -t'.
-12) The default value LOAD_HELPERS_ONLY is now 'Yes'.
+15) The default value LOAD_HELPERS_ONLY is now 'Yes'.
-13) Beginning with Shorewall 4.5.0, FORMAT-1 actions and macros are
+16) Beginning with Shorewall 4.6.0, FORMAT-1 actions and macros are
deprecated and a warning will be issued for each FORMAT-1 action
or macro found.
@@ -374,7 +422,7 @@
MARK
CONNLIMIT
TIME
- HEADERS (Ipv6 only)
+ HEADERS (Used in IPv6 only)
CONDITION
HELPER
@@ -403,7 +451,7 @@
MARK
CONNLIMIT
TIME
- HEADERS (Ipv6 only)
+ HEADERS (Used in IPv6 only)
CONDITION
HELPER
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.6.0/shorewall-lite.spec new/shorewall-lite-4.6.0.2/shorewall-lite.spec
--- old/shorewall-lite-4.6.0/shorewall-lite.spec 2014-05-15 17:22:18.000000000 +0200
+++ new/shorewall-lite-4.6.0.2/shorewall-lite.spec 2014-05-23 18:31:42.000000000 +0200
@@ -1,6 +1,6 @@
%define name shorewall-lite
%define version 4.6.0
-%define release 0base
+%define release 2
%define initdir /etc/init.d
Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems.
@@ -105,6 +105,10 @@
%doc COPYING changelog.txt releasenotes.txt
%changelog
+* Fri May 16 2014 Tom Eastep tom(a)shorewall.net
+- Updated to 4.6.0-2
+* Fri May 16 2014 Tom Eastep tom(a)shorewall.net
+- Updated to 4.6.0-1
* Sat May 10 2014 Tom Eastep tom(a)shorewall.net
- Updated to 4.6.0-0base
* Wed May 07 2014 Tom Eastep tom(a)shorewall.net
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.6.0/uninstall.sh new/shorewall-lite-4.6.0.2/uninstall.sh
--- old/shorewall-lite-4.6.0/uninstall.sh 2014-05-15 17:22:18.000000000 +0200
+++ new/shorewall-lite-4.6.0.2/uninstall.sh 2014-05-23 18:31:42.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=4.6.0
+VERSION=4.6.0.2
usage() # $1 = exit status
{
++++++ shorewall-4.6.0.tar.bz2 -> shorewall6-4.6.0.2.tar.bz2 ++++++
++++ 124574 lines of diff (skipped)
++++++ shorewall-lite-4.6.0.tar.bz2 -> shorewall6-lite-4.6.0.2.tar.bz2 ++++++
++++ 7379 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package setools for openSUSE:Factory checked in at 2014-05-27 18:30:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/setools (Old)
and /work/SRC/openSUSE:Factory/.setools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "setools"
Changes:
--------
--- /work/SRC/openSUSE:Factory/setools/setools.changes 2013-10-14 22:05:49.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.setools.new/setools.changes 2014-05-27 18:30:23.000000000 +0200
@@ -1,0 +2,6 @@
+Mon May 26 20:47:23 CEST 2014 - ro(a)suse.de
+
+- add patch: setools-3.3.7-libselinux-2.3.patch
+ fix build with libselinux-2.3
+
+-------------------------------------------------------------------
New:
----
setools-3.3.7-libselinux-2.3.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ setools.spec ++++++
--- /var/tmp/diff_new_pack.yTv8YS/_old 2014-05-27 18:30:24.000000000 +0200
+++ /var/tmp/diff_new_pack.yTv8YS/_new 2014-05-27 18:30:24.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package setools
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -43,6 +43,7 @@
Patch15: 0006-Changes-to-support-named-file_trans-rules.patch
Patch16: 0007-Remove-unused-variables.patch
Patch23: add-to-header-define_cond_filename_trans.patch
+Patch24: setools-3.3.7-libselinux-2.3.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
@@ -237,6 +238,7 @@
%patch15 -p1
%patch16 -p1
%patch23 -p1
+%patch24 -p1
%build
autoreconf -fi
++++++ setools-3.3.7-libselinux-2.3.patch ++++++
--- a/secmds/replcon.cc
+++ b/secmds/replcon.cc
@@ -60,7 +60,7 @@
{NULL, 0, NULL, 0}
};
-extern int lsetfilecon_raw(const char *, security_context_t) __attribute__ ((weak));
+extern int lsetfilecon_raw(const char *, const char *) __attribute__ ((weak));
/**
* As that setools must work with older libselinux versions that may
@@ -68,7 +68,7 @@
* does indeed have the new functions then use them; otherwise
* fallback to the originals.
*/
-static int replcon_lsetfilecon(const char *path, security_context_t context)
+static int replcon_lsetfilecon(const char *path, const char *context)
{
if (lsetfilecon_raw != NULL)
{
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package python-tornado for openSUSE:Factory checked in at 2014-05-27 18:30:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-tornado (Old)
and /work/SRC/openSUSE:Factory/.python-tornado.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-tornado"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-tornado/python-tornado.changes 2013-11-18 10:54:12.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python-tornado.new/python-tornado.changes 2014-05-27 18:30:17.000000000 +0200
@@ -1,0 +2,12 @@
+Tue May 20 13:05:18 UTC 2014 - toddrme2178(a)gmail.com
+
+- Update dependencies
+
+-------------------------------------------------------------------
+Sun May 11 14:00:00 UTC 2014 - andrea(a)opensuse.org
+
+- new upstream version 3.2.1
+ - several new modules and bugfixes check website for details
+ http://www.tornadoweb.org/en/stable/releases.html
+
+-------------------------------------------------------------------
Old:
----
tornado-3.1.1.tar.gz
New:
----
tornado-3.2.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-tornado.spec ++++++
--- /var/tmp/diff_new_pack.XuOEKQ/_old 2014-05-27 18:30:19.000000000 +0200
+++ /var/tmp/diff_new_pack.XuOEKQ/_new 2014-05-27 18:30:19.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-tornado
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,7 @@
#
Name: python-tornado
-Version: 3.1.1
+Version: 3.2.1
Release: 0
Url: http://www.tornadoweb.org
Summary: Open source version of scalable, non-blocking web server that power FriendFeed
@@ -25,13 +25,20 @@
Source: https://pypi.python.org/packages/source/t/tornado/tornado-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: python-devel
-Requires: python-pycurl
+BuildRequires: python-backports.ssl_match_hostname
+BuildRequires: python-futures
+BuildRequires: python-pycurl
+BuildRequires: python-simplejson
+Requires: python-backports.ssl_match_hostname
Requires: python-simplejson
+Recommends: python-futures
+Recommends: python-Monotime
+Recommends: python-pycares
+Recommends: python-pycurl
+Recommends: python-Twisted
BuildRequires: fdupes
%if 0%{?suse_version} <= 1110
-%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%else
-BuildArch: noarch
+%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True);")}
%endif
%description
@@ -60,11 +67,12 @@
%install
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%fdupes demos
%files
%defattr(-,root,root,-)
%doc demos
-%{python_sitelib}/tornado
-%{python_sitelib}/tornado-%{version}-py%{py_ver}.egg-info
+%{python_sitearch}/tornado
+%{python_sitearch}/tornado-%{version}-py%{py_ver}.egg-info
%changelog
++++++ tornado-3.1.1.tar.gz -> tornado-3.2.1.tar.gz ++++++
++++ 11827 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0