July 2012 - openSUSE Commits - openSUSE Mailing Lists

commit shutter for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package shutter for openSUSE:Factory checked in at 2012-07-02 11:15:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shutter (Old) and /work/SRC/openSUSE:Factory/.shutter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "shutter", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/shutter/shutter.changes 2011-09-23 12:46:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.shutter.new/shutter.changes 2012-07-02 11:15:19.000000000 +0200 @@ -1,0 +2,204 @@ +Thu Jun 28 15:53:36 UTC 2012 - swyear(a)gmail.com + +- fix Provides: perl(Dropbox) +- re-add perl-Net-Dropbox-API as recommends + +------------------------------------------------------------------- +Thu Jun 28 11:31:42 UTC 2012 - swyear(a)gmail.com + +- remove perl-Net-Dropbox-API dependency + +------------------------------------------------------------------- +Thu Jun 28 05:39:42 UTC 2012 - swyear(a)gmail.com + +- remove script of fix script-without-shebang + will cause ERROR: upload-plugin exists but is not executable - /usr/share/shutter/resources/system/upload_plugins/upload/Dropbox.pm... + +------------------------------------------------------------------- +Thu Jun 28 05:17:09 UTC 2012 - swyear(a)gmail.com + +- add section in README.openSUSE about relative packages not in oss repository +- fix script-without-shebang + +------------------------------------------------------------------- +Thu Jun 28 01:08:42 UTC 2012 - swyear(a)gmail.com + +- perl-Net-Dropbox-API is not provided by oss, move to recommends + +------------------------------------------------------------------- +Thu Jun 28 00:22:12 UTC 2012 - swyear(a)gmail.com + +- add perl-Net-DBus-GLib for SUSE user's UbuntuOne support ^^ + +------------------------------------------------------------------- +Wed Jun 27 16:17:09 UTC 2012 - swyear(a)gmail.com + +- fix incorrect fsf address issue + +------------------------------------------------------------------- +Wed Jun 27 03:39:53 UTC 2012 - swyear(a)gmail.com + +- fix depensicies by adding perl-Gnome2-* package + +------------------------------------------------------------------- +Wed Jun 27 01:38:23 UTC 2012 - swyear(a)gmail.com + +- try to minimize depensicies +- try fix files-duplicate warning + +------------------------------------------------------------------- +Tue Jun 26 16:45:49 UTC 2012 - swyear(a)gmail.com + +- remove nautilus-sendto as recommends, nautilus-sendto will install too + many gnome-related packages +- add gtk-update-icon-cache to post scriptlet + +------------------------------------------------------------------- +Tue Jun 26 15:46:10 UTC 2012 - swyear(a)gmail.com + +- update to 0.88.3 +- Shutter 0.88.3 adds minor features, fixes a few bugs and updates translations. + +------------------------------------------------------------------- +Wed Mar 14 17:53:06 UTC 2012 - Sascha.Manns(a)open-slx.de + +- Made nautilus-sendto as recommends instead of required. + +------------------------------------------------------------------- +Sat Mar 3 17:58:59 UTC 2012 - Sascha.Manns(a)open-slx.de + +- fixed bnc#722266 + +------------------------------------------------------------------- +Sat Mar 3 10:08:44 UTC 2012 - Sascha.Manns(a)open-slx.de + +- updated to 0.88.2 +- This release adds minor features, fixes some annoying bugs, and + updates translations. + +------------------------------------------------------------------- +Fri Mar 2 21:48:13 UTC 2012 - Sascha.Manns(a)open-slx.de + +- added /usr/share/doc/shutter to %%dir + +------------------------------------------------------------------- +Tue Feb 14 19:51:48 UTC 2012 - Sascha.Manns(a)open-slx.de + +- add shutter-bnc746606-fix-script-without-shebang.patch + +------------------------------------------------------------------- +Tue Feb 14 19:16:39 UTC 2012 - Sascha.Manns(a)open-slx.de + +- fixed bnc#746606 +- made *.pm available with executive rights + +------------------------------------------------------------------- +Mon Feb 13 10:56:05 UTC 2012 - coolo(a)suse.com + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- +Mon Dec 12 16:36:31 UTC 2011 - Sascha.Manns(a)open-slx.de + +- removed Extra Install of sel_window_tooltip.svg (OBS should find the + right one in the sources) +- Added *.desktop File. The original is optimized for Ubuntu + +------------------------------------------------------------------- +Tue Dec 6 19:10:39 UTC 2011 - Sascha.Manns(a)open-slx.de + +- changed datapath to %%{__datadir}/%{name} + +------------------------------------------------------------------- +Tue Dec 6 15:18:51 UTC 2011 - Sascha.Manns(a)open-slx.de + +- Extra install of sel_window_tooltip.svg + +------------------------------------------------------------------- +Tue Dec 6 14:10:53 UTC 2011 - Sascha.Manns(a)open-slx.de + +- testenviroment before committing to Factory + +------------------------------------------------------------------- +Sun Dec 4 21:04:40 UTC 2011 - Sascha.Manns(a)open-slx.de + +shutter (0.88.1) + + * Fixed bugs / minor improvements + -- LP: #894416 + [Some upload plugins fail with unicode characters in filename] + -- LP: #894577 + [Minus service doesn't work] + * updated translations + + -- Mario Kemper <mario.kemper(a)googlemail.com> Thu, 01 Dec 2011 +22:01:50 +0100 + +shutter (0.88) + + * New Features + -- Refactored the uploading code (added support for plugins) + -- Added new upload plugins + -- Public links are now saved when a screenshot was uploaded + -- New command line option: specify filename + * New Upload Plugins + -- Dropbox + -- ImageBanana + -- ImageShack + -- Imgur + -- ImmIO + -- ITmages + -- Minus + -- Omploader + -- ToileLibre + -- TwitPic + -- UbuntuPics + * Fixed bugs / minor improvements + -- LP: #342622 + [Remember upload links] + -- LP: #841328 + [black corners if window is selected from the window list] + -- LP: #888441 + [dialog not clickable when renaming a file] + -- LP: #889031 + [Package should'nt provide own perl libraries] + -- LP: #892703 + [After unlinking from Dropbox there is no way to relink it +again] + -- LP: #650701 + [retrieve Public URL if screenshot is already uploaded] + -- LP: #675911 + [Url not selected when i do single click] + -- LP: #793462 + [Short URL in imageshack.us] + -- LP: #870556 + [specify file name on command line] + -- LP: #374024 + [http://omploader.org/ as new image hoster] + -- LP: #486490 + [Feature Request: Upload to imgur] + -- LP: #489598 + [Wish: Add Twitpic support] + -- LP: #598818 + [feature request: extensible imagehost/upload tools] + -- LP: #602209 + [Add integration with Dropbox] + -- LP: #619748 + [Add ubuntuusers.de thumbnail code to any of the hosting +plugins] + -- LP: #651029 + [Feature Request: Upload to ITmages] + -- LP: #703299 + [Add upload to http://pix.toile-libre.org/] + -- LP: #785032 + [min.us uploading support] + -- LP: #793463 + [More image services to upload] + * improved support for Gnome-Shell ++++ 7 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/shutter/shutter.changes ++++ and /work/SRC/openSUSE:Factory/.shutter.new/shutter.changes Old: ---- shutter-0.87.3.tar.bz2 New: ---- desktop-shortcut-fix.diff fsf-address-fix.diff remove-provide-dropbox.diff shutter-0.88.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shutter.spec ++++++ --- /var/tmp/diff_new_pack.KVpa7h/_old 2012-07-02 11:15:21.000000000 +0200 +++ /var/tmp/diff_new_pack.KVpa7h/_new 2012-07-02 11:15:21.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package shutter # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 8/2011 - now by open-slx GmbH <Sascha.Manns(a)open-slx.de> # Copyright (c) 12/2010 - 7/2011 by Sascha Manns <saigkill(a)opensuse.org> # Copyright (c) 7/2010 - 12/2010 by Ray Chen <swyear(a)gmail.com> @@ -19,33 +19,41 @@ # - Name: shutter -Version: 0.87.3 -Release: 1 -License: GPL 3 +Version: 0.88.3 +Release: 0 Summary: Featureful screenshot tool -Url: http://shutter-project.org/ +License: GPL-3.0 Group: Productivity/Graphics/Other -Source0: %{name}-%{version}.tar.bz2 +Url: http://shutter-project.org/ +Source0: %{name}-%{version}.tar.gz Source1: README.openSUSE +Patch0: desktop-shortcut-fix.diff +Patch1: fsf-address-fix.diff +Patch2: remove-provide-dropbox.diff +Requires: %{name}-lang = %{version} Requires: ImageMagick -Requires: gnome-web-photo -Requires: perl-gettext -Requires: perl(Glib) +Requires: hicolor-icon-theme +Requires: perl-File-BaseDir +Requires: perl-File-Copy-Recursive +Requires: perl-File-Which Requires: perl-Gnome2 Requires: perl-Gnome2-Canvas Requires: perl-Gnome2-GConf Requires: perl-Gnome2-VFS Requires: perl-Gnome2-Wnck -Requires: perl-Goo-Canvas Requires: perl-Gtk2 Requires: perl-Gtk2-ImageView Requires: perl-Gtk2-Unique -Requires: perl-HTML-Form -Requires: perl-HTML-FormHandler +Requires: perl-JSON +Requires: perl-JSON-XS Requires: perl-Net-DBus +Requires: perl-Path-Class +Requires: perl-PathTools Requires: perl-PerlMagick +Requires: perl-Proc-ProcessTable +Requires: perl-Proc-Simple +Requires: perl-Sort-Naturally Requires: perl-WWW-Mechanize Requires: perl-X11-Protocol Requires: perl-XML-Simple @@ -53,15 +61,16 @@ Requires: perl-libwww-perl Requires: procps Requires: xdg-utils -Requires: %{name}-lang = %{version} -BuildRequires: perl-Gtk2-Unique +Requires: perl(Glib) +#Recommends: nautilus-sendto +Recommends: perl-Image-ExifTool +Recommends: perl-Goo-Canvas +Recommends: gnome-web-photo +Recommends: perl-Net-DBus-GLib +Recommends: perl-Net-Dropbox-API BuildRequires: fdupes -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%if 0%{?suse_version} >= 1110 BuildRequires: update-desktop-files -%endif -#Requires: nautilus-sendto +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %lang_package @@ -78,8 +87,10 @@ %prep %setup -q -cp %{S:1} . -rm -rf share/shutter/resources/modules/{Proc,File,Net,Sort,X11} +%patch0 -p1 +%patch1 -p1 +%patch2 +cp %{S:1} share/doc/shutter %build @@ -88,51 +99,39 @@ %{__install} -d -m 0755 -p %{buildroot}%{_bindir} %{__install} -m 755 bin/%{name} %{buildroot}%{_bindir} -# create a Folder in docdir and move all relevant content to it -%{__install} -d -m 755 %{buildroot}%{_docdir}/%{name} -%{__cp} -pfr share/doc/%{name}/* %{buildroot}%{_docdir}/%{name} -%{__cp} %{S:1} %{buildroot}%{_docdir}/%{name} - # Create Datadir Folder -%{__install} -d -m 755 %{buildroot}%{_datadir} -%{__install} -d -m 755 %{buildroot}%{_datadir}/applications -%{__install} -d -m 755 %{buildroot}%{_datadir}/icons -%{__install} -d -m 755 %{buildroot}%{_datadir}/locale -%{__install} -d -m 755 %{buildroot}%{_datadir}/man -%{__install} -d -m 755 %{buildroot}%{_datadir}/pixmaps -%{__install} -d -m 755 %{buildroot}%{_datadir}/%{name} -%{__cp} -pfr share/applications/* %{buildroot}%{_datadir}/applications -%{__cp} -pfr share/icons/* %{buildroot}%{_datadir}/icons -%{__cp} -pfr share/locale/* %{buildroot}%{_datadir}/locale -%{__cp} -pfr share/man/* %{buildroot}%{_mandir} -%{__cp} -pfr share/pixmaps/* %{buildroot}%{_datadir}/pixmaps -%{__cp} -pfr share/%{name}/* %{buildroot}%{_datadir}/%{name} +%{__install} -d -m 755 %{buildroot}%{_datadir}/ +%{__cp} -pfr share/* %{buildroot}%{_datadir}/ %suse_update_desktop_file -r %{name} Utility DesktopUtility %find_lang %{name} --all-name -%fdupes -s %{buildroot} + +rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop~ + +%fdupes %{buildroot}%{_datadir}/ %clean rm -rf %{buildroot} %post update-desktop-database %{_datadir}/applications &>/dev/null || : +gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %postun update-desktop-database %{_datadir}/applications &>/dev/null || : %files %defattr(-,root,root) +%doc %{_datadir}/doc/%{name}/* %dir %{_datadir}/%{name} -%dir %{_docdir}/%{name} +%dir %{_datadir}/doc/%{name} %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/* %{_datadir}/pixmaps/* %{_datadir}/%{name}/* -%{_mandir}/man1/* -%doc %{_docdir}/%{name}/* +%{_mandir}/man1/%{name}.1.gz %files lang -f %{name}.lang %defattr(-,root,root) ++++++ README.openSUSE ++++++ --- /var/tmp/diff_new_pack.KVpa7h/_old 2012-07-02 11:15:21.000000000 +0200 +++ /var/tmp/diff_new_pack.KVpa7h/_new 2012-07-02 11:15:21.000000000 +0200 @@ -9,3 +9,20 @@ There you can see "Command/Adress", and on this place you can write "shutter --full" instread of KSnapshot. That's all folks. + + +FULL Features Support +==================== + +For GNOME users, you may need nautilus-sendto to do nautilus integration +You can install this package manually +Some perl modules are not supplied by oss repository +so you may not use all features with shutter +You can get these perl- packages from devel:languages:perl repository +use +sudo zypper ar obs://devel:languages:perl/openSUSE_VERSION perl +to add the repository + +For Dropbox support, install perl-Net-Dropbox-API + +For UbuntuOne suppert, install perl-Net-DBus-GLib ++++++ desktop-shortcut-fix.diff ++++++ diff -uprN shutter-0.87.2.orig/share/applications/shutter.desktop shutter-0.87.2/share/applications/shutter.desktop --- shutter-0.87.2.orig/share/applications/shutter.desktop 2011-03-25 18:55:50.000000000 +0800 +++ shutter-0.87.2/share/applications/shutter.desktop 2011-06-04 11:13:43.066662084 +0800 @@ -17,23 +17,3 @@ Categories=Utility;Application; MimeType=image/bmp;image/jpeg;image/gif;image/png;image/tiff;image/x-bmp;image/x-ico;image/x-png;image/x-pcx;image/x-tga;image/xpm;image/svg+xml; X-Ayatana-Desktop-Shortcuts=Select;Screen;Window;Active -[Select Shortcut Group] -Name=Capture an area of the screen -Exec=shutter --select -OnlyShowIn=Unity - -[Screen Shortcut Group] -Name=Capture the entire screen -Exec=shutter --full -OnlyShowIn=Unity - -[Window Shortcut Group] -Name=Select a window to capture -Exec=shutter --window -OnlyShowIn=Unity - -[Active Shortcut Group] -Name=Capture the current active window -Exec=shutter --active -OnlyShowIn=Unity - diff -uprN shutter-0.87.2.orig/share/applications/shutter.desktop~ shutter-0.87.2/share/applications/shutter.desktop~ --- shutter-0.87.2.orig/share/applications/shutter.desktop~ 1970-01-01 08:00:00.000000000 +0800 +++ shutter-0.87.2/share/applications/shutter.desktop~ 2011-03-25 18:55:50.000000000 +0800 @@ -0,0 +1,39 @@ +[Desktop Entry] +Version=1.0 +Name=Shutter +Name[de_DE]=Shutter +Name[pt_BR]=Shutter +GenericName=Screenshot Tool +GenericName[de_DE]=Anwendung für Bildschirmfotos +GenericName[pt_BR]=Captura de tela +Comment=Capture, edit and share screenshots +Comment[de_DE]=Bildschirmfotos aufnehmen, bearbeiten und mit Anderen teilen +Comment[pt_BR]=Aplicativo avançado para capturar imagens da tela +Exec=shutter %F +Icon=shutter +Terminal=false +Type=Application +Categories=Utility;Application; +MimeType=image/bmp;image/jpeg;image/gif;image/png;image/tiff;image/x-bmp;image/x-ico;image/x-png;image/x-pcx;image/x-tga;image/xpm;image/svg+xml; +X-Ayatana-Desktop-Shortcuts=Select;Screen;Window;Active + +[Select Shortcut Group] +Name=Capture an area of the screen +Exec=shutter --select +OnlyShowIn=Unity + +[Screen Shortcut Group] +Name=Capture the entire screen +Exec=shutter --full +OnlyShowIn=Unity + +[Window Shortcut Group] +Name=Select a window to capture +Exec=shutter --window +OnlyShowIn=Unity + +[Active Shortcut Group] +Name=Capture the current active window +Exec=shutter --active +OnlyShowIn=Unity + ++++++ fsf-address-fix.diff ++++++ ++++ 804 lines (skipped) ++++++ remove-provide-dropbox.diff ++++++ --- share/shutter/resources/system/upload_plugins/upload/Dropbox.pm-orig 2012-06-28 23:46:52.000000000 +0800 +++ share/shutter/resources/system/upload_plugins/upload/Dropbox.pm 2012-06-28 23:46:52.000000000 +0800 @@ -21,7 +21,7 @@ # ################################################### -package Dropbox; + use lib $ENV{'SHUTTER_ROOT'}.'/share/shutter/resources/modules'; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit shorewall for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package shorewall for openSUSE:Factory checked in at 2012-07-02 11:13:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shorewall (Old) and /work/SRC/openSUSE:Factory/.shorewall.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "shorewall", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/shorewall/shorewall.changes 2012-06-16 11:45:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.shorewall.new/shorewall.changes 2012-07-02 11:13:56.000000000 +0200 @@ -1,0 +2,13 @@ +Sun Jul 1 11:24:54 UTC 2012 - toganm(a)opensuse.org + +- Update to 4.5.5.3 For more details see changelog.txt and + releasenotes.txt + * When logical interface names were used, an entry in tcrules + that included a classid could result in the compiler failing with + this Perl diagnostic: + + Can't use an undefined value as an ARRAY reference at + /usr/share/shorewall/Shorewall/Tc.pm line nnn, <$currentfile> + line 20. + +------------------------------------------------------------------- Old: ---- shorewall-4.5.5.1.tar.bz2 shorewall-core-4.5.5.1.tar.bz2 shorewall-docs-html-4.5.5.1.tar.bz2 shorewall-init-4.5.5.1.tar.bz2 shorewall-lite-4.5.5.1.tar.bz2 shorewall6-4.5.5.1.tar.bz2 shorewall6-lite-4.5.5.1.tar.bz2 New: ---- shorewall-4.5.5.3.tar.bz2 shorewall-core-4.5.5.3.tar.bz2 shorewall-docs-html-4.5.5.3.tar.bz2 shorewall-init-4.5.5.3.tar.bz2 shorewall-lite-4.5.5.3.tar.bz2 shorewall6-4.5.5.3.tar.bz2 shorewall6-lite-4.5.5.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shorewall.spec ++++++ --- /var/tmp/diff_new_pack.G2eZVZ/_old 2012-07-02 11:13:58.000000000 +0200 +++ /var/tmp/diff_new_pack.G2eZVZ/_new 2012-07-02 11:13:58.000000000 +0200 @@ -17,7 +17,7 @@ Name: shorewall -Version: 4.5.5.1 +Version: 4.5.5.3 Release: 0 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems License: GPL-2.0 ++++++ shorewall-4.5.5.1.tar.bz2 -> shorewall-4.5.5.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/Perl/Shorewall/Chains.pm new/shorewall-4.5.5.3/Perl/Shorewall/Chains.pm --- old/shorewall-4.5.5.1/Perl/Shorewall/Chains.pm 2012-06-14 22:12:48.000000000 +0200 +++ new/shorewall-4.5.5.3/Perl/Shorewall/Chains.pm 2012-06-28 17:00:50.000000000 +0200 @@ -249,7 +249,7 @@ Exporter::export_ok_tags('internal'); -our $VERSION = '4.5_4'; +our $VERSION = '4.5_5'; # # Chain Table @@ -1038,6 +1038,7 @@ push @{$chainref->{rules}}, $ruleref; $chainref->{referenced} = 1; + $chainref->{optflags} |= DONT_MOVE if ( $ruleref->{target} || '' ) eq 'RETURN'; trace( $chainref, 'A', @{$chainref->{rules}}, "-A $chainref->{name} $_[1]" ) if $debug; $ruleref; @@ -1229,6 +1230,7 @@ if ( $jump ) { $ruleref->{jump} = $jump; $ruleref->{target} = $target; + $chainref->{optflags} |= DONT_MOVE if $target eq 'RETURN'; $ruleref->{targetopts} = $targetopts if $targetopts; } else { $ruleref->{target} = ''; @@ -4199,12 +4201,12 @@ if ( supplied $2 ) { $user = $2; - $user = resolve_id( $user, 'user' ) unless $user =~ /\d+$/; + $user = resolve_id( $user, 'user' ) unless $user =~ /\d+(-\d+)?$/; $rule .= "${invert}--uid-owner $user "; } if ( $group ne '' ) { - $group = resolve_id( $group, 'group' ) unless $group =~ /^\d+$/; + $group = resolve_id( $group, 'group' ) unless $group =~ /^\d+(-\d+)?$/; $rule .= "${invert}--gid-owner $group "; } } elsif ( $user =~ /^(!)?(.*)$/ ) { @@ -4212,10 +4214,10 @@ $user = $2; fatal_error "Invalid USER/GROUP (!)" if $user eq ''; - $user = resolve_id ($user, 'user' ) unless $user =~ /\d+$/; + $user = resolve_id ($user, 'user' ) unless $user =~ /\d+(-\d+)?$/; $rule .= "${invert}--uid-owner $user "; } else { - $user = resolve_id( $user, 'user' ) unless $user =~ /\d+$/; + $user = resolve_id( $user, 'user' ) unless $user =~ /\d+(-\d+)?$/; $rule .= "--uid-owner $user "; } @@ -6057,7 +6059,7 @@ # my $echain = newexclusionchain( $table ); - my $echainref = new_chain $table, $echain; + my $echainref = dont_move new_chain $table, $echain; # # Use the current rule and send all possible matches to the exclusion chain # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/Perl/Shorewall/Config.pm new/shorewall-4.5.5.3/Perl/Shorewall/Config.pm --- old/shorewall-4.5.5.1/Perl/Shorewall/Config.pm 2012-06-14 22:12:48.000000000 +0200 +++ new/shorewall-4.5.5.3/Perl/Shorewall/Config.pm 2012-06-28 17:00:50.000000000 +0200 @@ -164,7 +164,7 @@ Exporter::export_ok_tags('internal'); -our $VERSION = '4.5_4'; +our $VERSION = '4.5_5'; # # describe the current command, it's present progressive, and it's completion. @@ -519,7 +519,7 @@ KLUDGEFREE => '', STATEMATCH => '-m state --state', UNTRACKED => 0, - VERSION => "4.5.5.1", + VERSION => "4.5.5.3", CAPVERSION => 40504 , ); # @@ -1684,11 +1684,12 @@ if ( $keyword =~ /^IF/ ) { cond_error $linenumber, "Missing IF variable" unless $rest; my $invert = $rest =~ s/^!\s*//; - cond_error $linenumber, "Invalid IF variable ($rest)" unless ($rest =~ s/^\$// || $rest =~ /^__/ ) && $rest =~ /^\w+$/; push @ifstack, [ 'IF', $omitting, $omitting, $linenumber ]; + $lastomit = $omitting; + if ( $rest eq '__IPV6' ) { $omitting = $family == F_IPV4; } elsif ( $rest eq '__IPV4' ) { @@ -4185,10 +4186,10 @@ } if ( ( my $userbits = $config{PROVIDER_OFFSET} - $config{TC_BITS} ) > 0 ) { - $globals{USER_MASK} = make_mask( $userbits ) << $config{TC_BITS}; + $globals{USER_BITS} = $userbits; } else { - $globals{USER_MASK} = 0; + $globals{USER_MASK} = $globals{USER_BITS} = 0; } if ( supplied ( $val = $config{ZONE2ZONE} ) ) { @@ -4606,7 +4607,7 @@ $globals{TC_MASK} ); dumpout( "User", - $globals{USER_MASK}, + $globals{USER_BITS}, $globals{TC_MAX} + 1, $globals{USER_MASK}, $globals{USER_MASK} ); @@ -4628,6 +4629,12 @@ $globals{EXCLUSION_MASK}, $globals{EXCLUSION_MASK}, $globals{EXCLUSION_MASK} ); + + dumpout( "TProxy", + 1, + $globals{TPROXY_MARK}, + $globals{TPROXY_MARK}, + $globals{TPROXY_MARK} ); } END { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/Perl/Shorewall/Misc.pm new/shorewall-4.5.5.3/Perl/Shorewall/Misc.pm --- old/shorewall-4.5.5.1/Perl/Shorewall/Misc.pm 2012-06-14 22:12:48.000000000 +0200 +++ new/shorewall-4.5.5.3/Perl/Shorewall/Misc.pm 2012-06-28 17:00:50.000000000 +0200 @@ -45,7 +45,7 @@ generate_matrix ); our @EXPORT_OK = qw( initialize ); -our $VERSION = '4.5_4'; +our $VERSION = '4.5_5'; my $family; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/Perl/Shorewall/Nat.pm new/shorewall-4.5.5.3/Perl/Shorewall/Nat.pm --- old/shorewall-4.5.5.1/Perl/Shorewall/Nat.pm 2012-06-14 22:12:48.000000000 +0200 +++ new/shorewall-4.5.5.3/Perl/Shorewall/Nat.pm 2012-06-28 17:00:50.000000000 +0200 @@ -40,7 +40,7 @@ Exporter::export_ok_tags('rules'); -our $VERSION = '4.5_3'; +our $VERSION = '4.5_5'; my @addresses_to_add; my %addresses_to_add; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/Perl/Shorewall/Providers.pm new/shorewall-4.5.5.3/Perl/Shorewall/Providers.pm --- old/shorewall-4.5.5.1/Perl/Shorewall/Providers.pm 2012-06-14 22:12:48.000000000 +0200 +++ new/shorewall-4.5.5.3/Perl/Shorewall/Providers.pm 2012-06-28 17:00:50.000000000 +0200 @@ -64,6 +64,7 @@ my $first_default_route; my $first_fallback_route; my $maxload; +my $tproxies; my %providers; @@ -99,6 +100,7 @@ $first_default_route = 1; $first_fallback_route = 1; $maxload = 0; + $tproxies = 0; %providers = ( local => { number => LOCAL_TABLE , mark => 0 , optional => 0 ,routes => [], rules => [] } , main => { number => MAIN_TABLE , mark => 0 , optional => 0 ,routes => [], rules => [] } , @@ -462,10 +464,11 @@ } if ( $local ) { - fatal_error "GATEWAY not valid with 'local' provider" unless $gatewaycase eq 'none'; - fatal_error "'track' not valid with 'local'" if $track; - fatal_error "DUPLICATE not valid with 'local'" if $duplicate ne '-'; + fatal_error "GATEWAY not valid with 'local' provider" unless $gatewaycase eq 'none'; + fatal_error "'track' not valid with 'local'" if $track; + fatal_error "DUPLICATE not valid with 'local'" if $duplicate ne '-'; } elsif ( $tproxy ) { + fatal_error "Only one 'tproxy' provider is allowed" if $tproxies++; fatal_error "GATEWAY not valid with 'tproxy' provider" unless $gatewaycase eq 'none'; fatal_error "'track' not valid with 'tproxy'" if $track; fatal_error "DUPLICATE not valid with 'tproxy'" if $duplicate ne '-'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/Perl/Shorewall/Rules.pm new/shorewall-4.5.5.3/Perl/Shorewall/Rules.pm --- old/shorewall-4.5.5.1/Perl/Shorewall/Rules.pm 2012-06-14 22:12:48.000000000 +0200 +++ new/shorewall-4.5.5.3/Perl/Shorewall/Rules.pm 2012-06-28 17:00:50.000000000 +0200 @@ -53,7 +53,7 @@ ); our @EXPORT_OK = qw( initialize ); -our $VERSION = '4.5_3'; +our $VERSION = '4.5_5'; # # Globals are documented in the initialize() function # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/Perl/Shorewall/Tc.pm new/shorewall-4.5.5.3/Perl/Shorewall/Tc.pm --- old/shorewall-4.5.5.1/Perl/Shorewall/Tc.pm 2012-06-14 22:12:48.000000000 +0200 +++ new/shorewall-4.5.5.3/Perl/Shorewall/Tc.pm 2012-06-28 17:00:50.000000000 +0200 @@ -1642,7 +1642,7 @@ ); add_ijump( $mangle_table->{tcpost} , - j => 'CONNMARK --save-mark --ctmask ' . in_hex( $globals{TC_MASK} ), + j => 'CONNMARK --save-mark --mask ' . in_hex( $globals{TC_MASK} ), mark => '! --mark 0/' . in_hex( $globals{TC_MASK} ) ); } @@ -1765,7 +1765,7 @@ my $rate = "$tcref->{rate}kbit"; my $quantum = calculate_quantum $rate, calculate_r2q( $devref->{out_bandwidth} ); - $classids{$classid}=$device; + $classids{$classid}=$devname; my $priority = $tcref->{priority} << 8; my $parent = in_hexp $tcref->{parent}; @@ -1856,7 +1856,7 @@ my $devicenumber = in_hexp $devref->{number}; my $classid = join( ':', $devicenumber, $classnum); - $classids{$classid}=$device; + $classids{$classid}=$devname; } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/Perl/Shorewall/Zones.pm new/shorewall-4.5.5.3/Perl/Shorewall/Zones.pm --- old/shorewall-4.5.5.1/Perl/Shorewall/Zones.pm 2012-06-14 22:12:48.000000000 +0200 +++ new/shorewall-4.5.5.3/Perl/Shorewall/Zones.pm 2012-06-28 17:00:50.000000000 +0200 @@ -93,7 +93,7 @@ ); our @EXPORT_OK = qw( initialize ); -our $VERSION = '4.5_4'; +our $VERSION = '4.5_5'; # # IPSEC Option types diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/changelog.txt new/shorewall-4.5.5.3/changelog.txt --- old/shorewall-4.5.5.1/changelog.txt 2012-06-14 22:12:48.000000000 +0200 +++ new/shorewall-4.5.5.3/changelog.txt 2012-06-28 17:00:50.000000000 +0200 @@ -1,3 +1,33 @@ +Changes in 4.5.5.3 + +1) Correct a Perl trap caused by using logical names with 'classify'. + +2) Ensure that exclusion chains always have the 'DONT_MOVE' flag set. + +Changes in 4.5.5.2 + +1) Allow UID/GID ranges in the USER/GROUP column (undocumented) + +2) Don't use '--ctmark' when saving marks. + +3) Display PROXY_MARK in 'show marks'. + +4) Another fix for nested ?IFs + +Changes in 4.5.5.1 + +1) Fix handling of multiple fallback providers. + +2) Allow logical device names in the REDIRECTED column. + +Changes in 4.5.5 Final + +1) Restore fix to configure script. + +2) Fix installer's handling of SYSCONFDIR + +3) Add DIGEST support. + Changes in 4.5.5 RC 1 1) Change in 'ignore' behavior. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/configfiles/providers.annotated new/shorewall-4.5.5.3/configfiles/providers.annotated --- old/shorewall-4.5.5.1/configfiles/providers.annotated 2012-06-14 22:14:33.000000000 +0200 +++ new/shorewall-4.5.5.3/configfiles/providers.annotated 2012-06-28 17:02:35.000000000 +0200 @@ -151,7 +151,7 @@ # shorewall-tcrules(5). See http://www.shorewall.net/ # Shorewall_Squid_Usage.html. When specified, the MARK, DUPLICATE and # GATEWAY columns should be empty, INTERFACE should be set to 'lo' and -# tproxy should be the only OPTION. +# tproxy should be the only OPTION. Only one tproxy provider is allowed. # # COPY - [{none|interface[,interface]...}] # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/configure new/shorewall-4.5.5.3/configure --- old/shorewall-4.5.5.1/configure 2012-06-14 22:12:48.000000000 +0200 +++ new/shorewall-4.5.5.3/configure 2012-06-28 17:00:50.000000000 +0200 @@ -28,7 +28,7 @@ # # Build updates this # -VERSION=4.5.5.1 +VERSION=4.5.5.3 case "$BASH_VERSION" in [4-9].*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/configure.pl new/shorewall-4.5.5.3/configure.pl --- old/shorewall-4.5.5.1/configure.pl 2012-06-14 22:12:48.000000000 +0200 +++ new/shorewall-4.5.5.3/configure.pl 2012-06-28 17:00:50.000000000 +0200 @@ -31,7 +31,7 @@ # Build updates this # use constant { - VERSION => '4.5.5.1' + VERSION => '4.5.5.3' }; my %params; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/install.sh new/shorewall-4.5.5.3/install.sh --- old/shorewall-4.5.5.1/install.sh 2012-06-14 22:12:48.000000000 +0200 +++ new/shorewall-4.5.5.3/install.sh 2012-06-28 17:00:50.000000000 +0200 @@ -22,7 +22,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -VERSION=4.5.5.1 +VERSION=4.5.5.3 # # Change to the directory containing this script diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/known_problems.txt new/shorewall-4.5.5.3/known_problems.txt --- old/shorewall-4.5.5.1/known_problems.txt 2012-06-14 22:12:48.000000000 +0200 +++ new/shorewall-4.5.5.3/known_problems.txt 2012-06-28 17:00:50.000000000 +0200 @@ -16,3 +16,53 @@ failure. Corrected in Shorewall 4.5.5.1. + +4) When ipp2p is used in the /etc/shorewall/tcpri file, the generated + code for saving the packet mark is clearing the connection marks + fields not having to do with traffic shaping. + + Corrected in Shorewall 4.5.5.2. + +5) Shorewall 4.4.11 allows UID and GID ranges to be specified in the + USER:GROUP column of the rules file. That undocumented feature + is not present in Shorewall 4.5. + + Corrected in Shorewall 4.5.5.2. + +6) The special TPROXY mark value is not shown in the output of + 'shorewall show marks'. + + Corrected in Shorewall 4.5.5.2. + +7) Assuming that A = 0 and B = 1, the following conditionals produce + incorrect results: + + ?IF $A + ?IF $B + <text> + ?ENDIF + ?ENDIF + + The <text> is included when it should be omitted. + + Corrected in Shorewall 4.5.5.2. + +8) When logical interface names are used, an entry in tcrules that + includes a classid can result in the compiler failing with this + Perl diagnostic: + + Can't use an undefined value as an ARRAY reference at + /usr/share/shorewall/Shorewall/Tc.pm line nnn, <$currentfile> + line 20. + + Workarounds: + + a: Use only physical names for interfaces appearing in the + tcrules file when classids are needed. + + b: Follow classids in the rules file with ':T' (e.g., 1:4:T). + + Corrected in Shorewall 4.5.5.3. + + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-accounting.5 new/shorewall-4.5.5.3/manpages/shorewall-accounting.5 --- old/shorewall-4.5.5.1/manpages/shorewall-accounting.5 2012-06-14 22:12:51.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-accounting.5 2012-06-28 17:00:53.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-accounting .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-ACCOUNTIN" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-ACCOUNTIN" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-actions.5 new/shorewall-4.5.5.3/manpages/shorewall-actions.5 --- old/shorewall-4.5.5.1/manpages/shorewall-actions.5 2012-06-14 22:12:53.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-actions.5 2012-06-28 17:00:55.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-actions .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-ACTIONS" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-ACTIONS" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-blacklist.5 new/shorewall-4.5.5.3/manpages/shorewall-blacklist.5 --- old/shorewall-4.5.5.1/manpages/shorewall-blacklist.5 2012-06-14 22:12:55.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-blacklist.5 2012-06-28 17:00:57.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-blacklist .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-BLACKLIST" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-BLACKLIST" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-blrules.5 new/shorewall-4.5.5.3/manpages/shorewall-blrules.5 --- old/shorewall-4.5.5.1/manpages/shorewall-blrules.5 2012-06-14 22:12:57.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-blrules.5 2012-06-28 17:00:59.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-blrules .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-BLRULES" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-BLRULES" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-ecn.5 new/shorewall-4.5.5.3/manpages/shorewall-ecn.5 --- old/shorewall-4.5.5.1/manpages/shorewall-ecn.5 2012-06-14 22:13:03.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-ecn.5 2012-06-28 17:01:05.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-ecn .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-ECN" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-ECN" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-exclusion.5 new/shorewall-4.5.5.3/manpages/shorewall-exclusion.5 --- old/shorewall-4.5.5.1/manpages/shorewall-exclusion.5 2012-06-14 22:13:05.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-exclusion.5 2012-06-28 17:01:07.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-exclusion .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-EXCLUSION" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-EXCLUSION" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-hosts.5 new/shorewall-4.5.5.3/manpages/shorewall-hosts.5 --- old/shorewall-4.5.5.1/manpages/shorewall-hosts.5 2012-06-14 22:13:07.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-hosts.5 2012-06-28 17:01:09.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-hosts .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-HOSTS" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-HOSTS" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-init.8 new/shorewall-4.5.5.3/manpages/shorewall-init.8 --- old/shorewall-4.5.5.1/manpages/shorewall-init.8 2012-06-14 22:13:09.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-init.8 2012-06-28 17:01:11.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-init .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-INIT" "8" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-INIT" "8" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-interfaces.5 new/shorewall-4.5.5.3/manpages/shorewall-interfaces.5 --- old/shorewall-4.5.5.1/manpages/shorewall-interfaces.5 2012-06-14 22:13:11.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-interfaces.5 2012-06-28 17:01:14.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-interfaces .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-INTERFACE" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-INTERFACE" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-ipsets.5 new/shorewall-4.5.5.3/manpages/shorewall-ipsets.5 --- old/shorewall-4.5.5.1/manpages/shorewall-ipsets.5 2012-06-14 22:13:13.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-ipsets.5 2012-06-28 17:01:16.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-ipsets .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-IPSETS" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-IPSETS" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-maclist.5 new/shorewall-4.5.5.3/manpages/shorewall-maclist.5 --- old/shorewall-4.5.5.1/manpages/shorewall-maclist.5 2012-06-14 22:13:16.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-maclist.5 2012-06-28 17:01:18.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-maclist .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-MACLIST" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-MACLIST" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-masq.5 new/shorewall-4.5.5.3/manpages/shorewall-masq.5 --- old/shorewall-4.5.5.1/manpages/shorewall-masq.5 2012-06-14 22:13:18.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-masq.5 2012-06-28 17:01:20.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-masq .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-MASQ" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-MASQ" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-modules.5 new/shorewall-4.5.5.3/manpages/shorewall-modules.5 --- old/shorewall-4.5.5.1/manpages/shorewall-modules.5 2012-06-14 22:13:20.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-modules.5 2012-06-28 17:01:22.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-modules .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-MODULES" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-MODULES" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-nat.5 new/shorewall-4.5.5.3/manpages/shorewall-nat.5 --- old/shorewall-4.5.5.1/manpages/shorewall-nat.5 2012-06-14 22:13:22.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-nat.5 2012-06-28 17:01:24.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-nat .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-NAT" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-NAT" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-nesting.5 new/shorewall-4.5.5.3/manpages/shorewall-nesting.5 --- old/shorewall-4.5.5.1/manpages/shorewall-nesting.5 2012-06-14 22:13:24.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-nesting.5 2012-06-28 17:01:26.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-nesting .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-NESTING" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-NESTING" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-netmap.5 new/shorewall-4.5.5.3/manpages/shorewall-netmap.5 --- old/shorewall-4.5.5.1/manpages/shorewall-netmap.5 2012-06-14 22:13:26.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-netmap.5 2012-06-28 17:01:28.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-netmap .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-NETMAP" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-NETMAP" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-notrack.5 new/shorewall-4.5.5.3/manpages/shorewall-notrack.5 --- old/shorewall-4.5.5.1/manpages/shorewall-notrack.5 2012-06-14 22:13:28.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-notrack.5 2012-06-28 17:01:30.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall6-notrack .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL6\-NOTRACK" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL6\-NOTRACK" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-params.5 new/shorewall-4.5.5.3/manpages/shorewall-params.5 --- old/shorewall-4.5.5.1/manpages/shorewall-params.5 2012-06-14 22:13:30.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-params.5 2012-06-28 17:01:32.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-params .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-PARAMS" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-PARAMS" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-policy.5 new/shorewall-4.5.5.3/manpages/shorewall-policy.5 --- old/shorewall-4.5.5.1/manpages/shorewall-policy.5 2012-06-14 22:13:32.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-policy.5 2012-06-28 17:01:34.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-policy .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-POLICY" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-POLICY" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-providers.5 new/shorewall-4.5.5.3/manpages/shorewall-providers.5 --- old/shorewall-4.5.5.1/manpages/shorewall-providers.5 2012-06-14 22:13:34.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-providers.5 2012-06-28 17:01:36.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-providers .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-PROVIDERS" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-PROVIDERS" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -218,7 +218,9 @@ Added in Shorewall 4\&.5\&.4\&. Used for supporting the TPROXY action in shorewall\-tcrules(5)\&. See \m[blue]\fBhttp://www\&.shorewall\&.net/Shorewall_Squid_Usage\&.html\fR\m[]\&. When specified, the MARK, DUPLICATE and GATEWAY columns should be empty, INTERFACE should be set to \*(Aqlo\*(Aq and \fBtproxy\fR -should be the only OPTION\&. +should be the only OPTION\&. Only one +\fBtproxy\fR +provider is allowed\&. .RE .RE .PP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-proxyarp.5 new/shorewall-4.5.5.3/manpages/shorewall-proxyarp.5 --- old/shorewall-4.5.5.1/manpages/shorewall-proxyarp.5 2012-06-14 22:13:36.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-proxyarp.5 2012-06-28 17:01:38.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-proxyarp .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-PROXYARP" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-PROXYARP" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-routes.5 new/shorewall-4.5.5.3/manpages/shorewall-routes.5 --- old/shorewall-4.5.5.1/manpages/shorewall-routes.5 2012-06-14 22:13:40.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-routes.5 2012-06-28 17:01:42.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-routes .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-ROUTES" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-ROUTES" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-routestopped.5 new/shorewall-4.5.5.3/manpages/shorewall-routestopped.5 --- old/shorewall-4.5.5.1/manpages/shorewall-routestopped.5 2012-06-14 22:13:38.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-routestopped.5 2012-06-28 17:01:40.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-routestopped .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-ROUTESTOP" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-ROUTESTOP" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-rtrules.5 new/shorewall-4.5.5.3/manpages/shorewall-rtrules.5 --- old/shorewall-4.5.5.1/manpages/shorewall-rtrules.5 2012-06-14 22:13:42.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-rtrules.5 2012-06-28 17:01:44.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-rtrules .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-RTRULES" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-RTRULES" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-rules.5 new/shorewall-4.5.5.3/manpages/shorewall-rules.5 --- old/shorewall-4.5.5.1/manpages/shorewall-rules.5 2012-06-14 22:13:45.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-rules.5 2012-06-28 17:01:47.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-rules .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-RULES" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-RULES" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-secmarks.5 new/shorewall-4.5.5.3/manpages/shorewall-secmarks.5 --- old/shorewall-4.5.5.1/manpages/shorewall-secmarks.5 2012-06-14 22:13:47.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-secmarks.5 2012-06-28 17:01:49.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-secmarks .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-SECMARKS" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-SECMARKS" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-tcclasses.5 new/shorewall-4.5.5.3/manpages/shorewall-tcclasses.5 --- old/shorewall-4.5.5.1/manpages/shorewall-tcclasses.5 2012-06-14 22:13:49.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-tcclasses.5 2012-06-28 17:01:51.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-tcclasses .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-TCCLASSES" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-TCCLASSES" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-tcdevices.5 new/shorewall-4.5.5.3/manpages/shorewall-tcdevices.5 --- old/shorewall-4.5.5.1/manpages/shorewall-tcdevices.5 2012-06-14 22:13:51.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-tcdevices.5 2012-06-28 17:01:53.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-tcdevices .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-TCDEVICES" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-TCDEVICES" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-tcfilters.5 new/shorewall-4.5.5.3/manpages/shorewall-tcfilters.5 --- old/shorewall-4.5.5.1/manpages/shorewall-tcfilters.5 2012-06-14 22:13:53.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-tcfilters.5 2012-06-28 17:01:56.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-tcfilters .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-TCFILTERS" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-TCFILTERS" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-tcinterfaces.5 new/shorewall-4.5.5.3/manpages/shorewall-tcinterfaces.5 --- old/shorewall-4.5.5.1/manpages/shorewall-tcinterfaces.5 2012-06-14 22:13:56.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-tcinterfaces.5 2012-06-28 17:01:58.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-tcinterfaces .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-TCINTERFA" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-TCINTERFA" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-tcpri.5 new/shorewall-4.5.5.3/manpages/shorewall-tcpri.5 --- old/shorewall-4.5.5.1/manpages/shorewall-tcpri.5 2012-06-14 22:13:58.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-tcpri.5 2012-06-28 17:02:00.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-tcpri .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-TCPRI" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-TCPRI" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-tcrules.5 new/shorewall-4.5.5.3/manpages/shorewall-tcrules.5 --- old/shorewall-4.5.5.1/manpages/shorewall-tcrules.5 2012-06-14 22:14:00.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-tcrules.5 2012-06-28 17:02:02.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-tcrules .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-TCRULES" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-TCRULES" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-tos.5 new/shorewall-4.5.5.3/manpages/shorewall-tos.5 --- old/shorewall-4.5.5.1/manpages/shorewall-tos.5 2012-06-14 22:14:02.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-tos.5 2012-06-28 17:02:04.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-tos .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-TOS" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-TOS" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-tunnels.5 new/shorewall-4.5.5.3/manpages/shorewall-tunnels.5 --- old/shorewall-4.5.5.1/manpages/shorewall-tunnels.5 2012-06-14 22:14:04.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-tunnels.5 2012-06-28 17:02:06.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-tunnels .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-TUNNELS" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-TUNNELS" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-vardir.5 new/shorewall-4.5.5.3/manpages/shorewall-vardir.5 --- old/shorewall-4.5.5.1/manpages/shorewall-vardir.5 2012-06-14 22:14:06.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-vardir.5 2012-06-28 17:02:08.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-vardir .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-VARDIR" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-VARDIR" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall-zones.5 new/shorewall-4.5.5.3/manpages/shorewall-zones.5 --- old/shorewall-4.5.5.1/manpages/shorewall-zones.5 2012-06-14 22:14:11.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall-zones.5 2012-06-28 17:02:13.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-zones .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-ZONES" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-ZONES" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall.8 new/shorewall-4.5.5.3/manpages/shorewall.8 --- old/shorewall-4.5.5.1/manpages/shorewall.8 2012-06-14 22:14:09.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall.8 2012-06-28 17:02:11.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL" "8" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL" "8" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/manpages/shorewall.conf.5 new/shorewall-4.5.5.3/manpages/shorewall.conf.5 --- old/shorewall-4.5.5.1/manpages/shorewall.conf.5 2012-06-14 22:13:01.000000000 +0200 +++ new/shorewall-4.5.5.3/manpages/shorewall.conf.5 2012-06-28 17:01:03.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall.conf .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\&.CONF" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\&.CONF" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/releasenotes.txt new/shorewall-4.5.5.3/releasenotes.txt --- old/shorewall-4.5.5.1/releasenotes.txt 2012-06-14 22:12:48.000000000 +0200 +++ new/shorewall-4.5.5.3/releasenotes.txt 2012-06-28 17:00:50.000000000 +0200 @@ -1,7 +1,7 @@ ---------------------------------------------------------------------------- - S H O R E W A L L 4 . 5 . 5 . 1 + S H O R E W A L L 4 . 5 . 5 . 3 ------------------------------------ - J u n e 1 7 , 2 0 1 2 + J u n e 2 8 , 2 0 1 2 ---------------------------------------------------------------------------- I. PROBLEMS CORRECTED IN THIS RELEASE @@ -15,6 +15,42 @@ 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.5.5.3 + +1) When logical interface names were used, an entry in tcrules that + included a classid could result in the compiler failing with this + Perl diagnostic: + + Can't use an undefined value as an ARRAY reference at + /usr/share/shorewall/Shorewall/Tc.pm line nnn, <$currentfile> + line 20. + +4.5.5.2 + +1) Previously, when ipp2p was used in the /etc/shorewall/tcpri file, + the generated code for saving the packet mark was clearing the + connection marks fields not having to do with traffic shaping. It + now only alters the traffic-shaping part of the connection mark. + +2) Shorewall 4.4.11 allowed UID and GID ranges to be specified in the + USER:GROUP column of the rules file. That undocumented capability + has been restored for the benefit of Debian users upgrading from + Squeeze to Wheezy. + +3) The special TPROXY mark value is now shown in the output of + 'shorewall show marks'. + +4) Assuming that A = 0 and B = 1, the following conditionals + previously produced incorrect results: + + ?IF $A + ?IF $B + <text> + ?ENDIF + ?ENDIF + + The <text> was included when it should have been omitted. + 4.5.5.1 1) The change in Shorewall 4.5.4 that cleared the 'default' table if @@ -28,7 +64,7 @@ 2) When a logical device name was specified in the REDIRECTED INTERFACES column of /etc/shorewall/tcdevices, that name was used - in the generated script rather than the devices's physical + in the generated script rather than the device's physical name. Unless the two were the same, this caused start/restart failure. Shorewall now uses the physical name. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/shorewall.spec new/shorewall-4.5.5.3/shorewall.spec --- old/shorewall-4.5.5.1/shorewall.spec 2012-06-14 22:12:48.000000000 +0200 +++ new/shorewall-4.5.5.3/shorewall.spec 2012-06-28 17:00:50.000000000 +0200 @@ -1,6 +1,6 @@ %define name shorewall %define version 4.5.5 -%define release 1 +%define release 3 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. Name: %{name} @@ -118,6 +118,10 @@ %doc COPYING INSTALL changelog.txt releasenotes.txt Contrib/* Samples %changelog +* Thu Jun 28 2012 Tom Eastep tom(a)shorewall.net +- Updated to 4.5.5-3 +* Fri Jun 22 2012 Tom Eastep tom(a)shorewall.net +- Updated to 4.5.5-2 * Tue Jun 12 2012 Tom Eastep tom(a)shorewall.net - Updated to 4.5.5-1 * Sat Jun 09 2012 Tom Eastep tom(a)shorewall.net diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-4.5.5.1/uninstall.sh new/shorewall-4.5.5.3/uninstall.sh --- old/shorewall-4.5.5.1/uninstall.sh 2012-06-14 22:12:48.000000000 +0200 +++ new/shorewall-4.5.5.3/uninstall.sh 2012-06-28 17:00:50.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.5.5.1 +VERSION=4.5.5.3 usage() # $1 = exit status { ++++++ shorewall-core-4.5.5.1.tar.bz2 -> shorewall-core-4.5.5.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.5.5.1/changelog.txt new/shorewall-core-4.5.5.3/changelog.txt --- old/shorewall-core-4.5.5.1/changelog.txt 2012-06-14 15:39:21.000000000 +0200 +++ new/shorewall-core-4.5.5.3/changelog.txt 2012-06-28 17:00:50.000000000 +0200 @@ -1,3 +1,33 @@ +Changes in 4.5.5.3 + +1) Correct a Perl trap caused by using logical names with 'classify'. + +2) Ensure that exclusion chains always have the 'DONT_MOVE' flag set. + +Changes in 4.5.5.2 + +1) Allow UID/GID ranges in the USER/GROUP column (undocumented) + +2) Don't use '--ctmark' when saving marks. + +3) Display PROXY_MARK in 'show marks'. + +4) Another fix for nested ?IFs + +Changes in 4.5.5.1 + +1) Fix handling of multiple fallback providers. + +2) Allow logical device names in the REDIRECTED column. + +Changes in 4.5.5 Final + +1) Restore fix to configure script. + +2) Fix installer's handling of SYSCONFDIR + +3) Add DIGEST support. + Changes in 4.5.5 RC 1 1) Change in 'ignore' behavior. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.5.5.1/configure new/shorewall-core-4.5.5.3/configure --- old/shorewall-core-4.5.5.1/configure 2012-06-14 15:39:21.000000000 +0200 +++ new/shorewall-core-4.5.5.3/configure 2012-06-28 17:00:50.000000000 +0200 @@ -28,7 +28,7 @@ # # Build updates this # -VERSION=4.5.5.1 +VERSION=4.5.5.3 case "$BASH_VERSION" in [4-9].*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.5.5.1/configure.pl new/shorewall-core-4.5.5.3/configure.pl --- old/shorewall-core-4.5.5.1/configure.pl 2012-06-14 15:39:21.000000000 +0200 +++ new/shorewall-core-4.5.5.3/configure.pl 2012-06-28 17:00:50.000000000 +0200 @@ -31,7 +31,7 @@ # Build updates this # use constant { - VERSION => '4.5.5.1' + VERSION => '4.5.5.3' }; my %params; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.5.5.1/install.sh new/shorewall-core-4.5.5.3/install.sh --- old/shorewall-core-4.5.5.1/install.sh 2012-06-14 15:39:21.000000000 +0200 +++ new/shorewall-core-4.5.5.3/install.sh 2012-06-28 17:00:50.000000000 +0200 @@ -22,7 +22,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -VERSION=4.5.5.1 +VERSION=4.5.5.3 usage() # $1 = exit status { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.5.5.1/known_problems.txt new/shorewall-core-4.5.5.3/known_problems.txt --- old/shorewall-core-4.5.5.1/known_problems.txt 2012-06-14 15:39:21.000000000 +0200 +++ new/shorewall-core-4.5.5.3/known_problems.txt 2012-06-28 17:00:50.000000000 +0200 @@ -16,3 +16,53 @@ failure. Corrected in Shorewall 4.5.5.1. + +4) When ipp2p is used in the /etc/shorewall/tcpri file, the generated + code for saving the packet mark is clearing the connection marks + fields not having to do with traffic shaping. + + Corrected in Shorewall 4.5.5.2. + +5) Shorewall 4.4.11 allows UID and GID ranges to be specified in the + USER:GROUP column of the rules file. That undocumented feature + is not present in Shorewall 4.5. + + Corrected in Shorewall 4.5.5.2. + +6) The special TPROXY mark value is not shown in the output of + 'shorewall show marks'. + + Corrected in Shorewall 4.5.5.2. + +7) Assuming that A = 0 and B = 1, the following conditionals produce + incorrect results: + + ?IF $A + ?IF $B + <text> + ?ENDIF + ?ENDIF + + The <text> is included when it should be omitted. + + Corrected in Shorewall 4.5.5.2. + +8) When logical interface names are used, an entry in tcrules that + includes a classid can result in the compiler failing with this + Perl diagnostic: + + Can't use an undefined value as an ARRAY reference at + /usr/share/shorewall/Shorewall/Tc.pm line nnn, <$currentfile> + line 20. + + Workarounds: + + a: Use only physical names for interfaces appearing in the + tcrules file when classids are needed. + + b: Follow classids in the rules file with ':T' (e.g., 1:4:T). + + Corrected in Shorewall 4.5.5.3. + + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.5.5.1/releasenotes.txt new/shorewall-core-4.5.5.3/releasenotes.txt --- old/shorewall-core-4.5.5.1/releasenotes.txt 2012-06-14 15:39:21.000000000 +0200 +++ new/shorewall-core-4.5.5.3/releasenotes.txt 2012-06-28 17:00:50.000000000 +0200 @@ -1,7 +1,7 @@ ---------------------------------------------------------------------------- - S H O R E W A L L 4 . 5 . 5 . 1 + S H O R E W A L L 4 . 5 . 5 . 3 ------------------------------------ - J u n e 1 7 , 2 0 1 2 + J u n e 2 8 , 2 0 1 2 ---------------------------------------------------------------------------- I. PROBLEMS CORRECTED IN THIS RELEASE @@ -15,6 +15,42 @@ 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.5.5.3 + +1) When logical interface names were used, an entry in tcrules that + included a classid could result in the compiler failing with this + Perl diagnostic: + + Can't use an undefined value as an ARRAY reference at + /usr/share/shorewall/Shorewall/Tc.pm line nnn, <$currentfile> + line 20. + +4.5.5.2 + +1) Previously, when ipp2p was used in the /etc/shorewall/tcpri file, + the generated code for saving the packet mark was clearing the + connection marks fields not having to do with traffic shaping. It + now only alters the traffic-shaping part of the connection mark. + +2) Shorewall 4.4.11 allowed UID and GID ranges to be specified in the + USER:GROUP column of the rules file. That undocumented capability + has been restored for the benefit of Debian users upgrading from + Squeeze to Wheezy. + +3) The special TPROXY mark value is now shown in the output of + 'shorewall show marks'. + +4) Assuming that A = 0 and B = 1, the following conditionals + previously produced incorrect results: + + ?IF $A + ?IF $B + <text> + ?ENDIF + ?ENDIF + + The <text> was included when it should have been omitted. + 4.5.5.1 1) The change in Shorewall 4.5.4 that cleared the 'default' table if @@ -28,7 +64,7 @@ 2) When a logical device name was specified in the REDIRECTED INTERFACES column of /etc/shorewall/tcdevices, that name was used - in the generated script rather than the devices's physical + in the generated script rather than the device's physical name. Unless the two were the same, this caused start/restart failure. Shorewall now uses the physical name. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.5.5.1/shorewall-core.spec new/shorewall-core-4.5.5.3/shorewall-core.spec --- old/shorewall-core-4.5.5.1/shorewall-core.spec 2012-06-14 15:39:21.000000000 +0200 +++ new/shorewall-core-4.5.5.3/shorewall-core.spec 2012-06-28 17:00:50.000000000 +0200 @@ -1,6 +1,6 @@ %define name shorewall-core %define version 4.5.5 -%define release 1 +%define release 3 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 +* Thu Jun 28 2012 Tom Eastep tom(a)shorewall.net +- Updated to 4.5.5-3 +* Fri Jun 22 2012 Tom Eastep tom(a)shorewall.net +- Updated to 4.5.5-2 * Tue Jun 12 2012 Tom Eastep tom(a)shorewall.net - Updated to 4.5.5-1 * Sat Jun 09 2012 Tom Eastep tom(a)shorewall.net diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-core-4.5.5.1/uninstall.sh new/shorewall-core-4.5.5.3/uninstall.sh --- old/shorewall-core-4.5.5.1/uninstall.sh 2012-06-14 15:39:21.000000000 +0200 +++ new/shorewall-core-4.5.5.3/uninstall.sh 2012-06-28 17:00:50.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.5.5.1 +VERSION=4.5.5.3 usage() # $1 = exit status { ++++++ shorewall-docs-html-4.5.5.1.tar.bz2 -> shorewall-docs-html-4.5.5.3.tar.bz2 ++++++ ++++ 6151 lines of diff (skipped) ++++++ shorewall-init-4.5.5.1.tar.bz2 -> shorewall-init-4.5.5.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-4.5.5.1/changelog.txt new/shorewall-init-4.5.5.3/changelog.txt --- old/shorewall-init-4.5.5.1/changelog.txt 2012-06-14 15:39:22.000000000 +0200 +++ new/shorewall-init-4.5.5.3/changelog.txt 2012-06-28 17:00:50.000000000 +0200 @@ -1,3 +1,33 @@ +Changes in 4.5.5.3 + +1) Correct a Perl trap caused by using logical names with 'classify'. + +2) Ensure that exclusion chains always have the 'DONT_MOVE' flag set. + +Changes in 4.5.5.2 + +1) Allow UID/GID ranges in the USER/GROUP column (undocumented) + +2) Don't use '--ctmark' when saving marks. + +3) Display PROXY_MARK in 'show marks'. + +4) Another fix for nested ?IFs + +Changes in 4.5.5.1 + +1) Fix handling of multiple fallback providers. + +2) Allow logical device names in the REDIRECTED column. + +Changes in 4.5.5 Final + +1) Restore fix to configure script. + +2) Fix installer's handling of SYSCONFDIR + +3) Add DIGEST support. + Changes in 4.5.5 RC 1 1) Change in 'ignore' behavior. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-4.5.5.1/configure new/shorewall-init-4.5.5.3/configure --- old/shorewall-init-4.5.5.1/configure 2012-06-14 15:39:22.000000000 +0200 +++ new/shorewall-init-4.5.5.3/configure 2012-06-28 17:00:50.000000000 +0200 @@ -28,7 +28,7 @@ # # Build updates this # -VERSION=4.5.5.1 +VERSION=4.5.5.3 case "$BASH_VERSION" in [4-9].*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-4.5.5.1/configure.pl new/shorewall-init-4.5.5.3/configure.pl --- old/shorewall-init-4.5.5.1/configure.pl 2012-06-14 15:39:22.000000000 +0200 +++ new/shorewall-init-4.5.5.3/configure.pl 2012-06-28 17:00:50.000000000 +0200 @@ -31,7 +31,7 @@ # Build updates this # use constant { - VERSION => '4.5.5.1' + VERSION => '4.5.5.3' }; my %params; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-4.5.5.1/install.sh new/shorewall-init-4.5.5.3/install.sh --- old/shorewall-init-4.5.5.1/install.sh 2012-06-14 15:39:22.000000000 +0200 +++ new/shorewall-init-4.5.5.3/install.sh 2012-06-28 17:00:50.000000000 +0200 @@ -23,7 +23,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -VERSION=4.5.5.1 +VERSION=4.5.5.3 usage() # $1 = exit status { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-4.5.5.1/releasenotes.txt new/shorewall-init-4.5.5.3/releasenotes.txt --- old/shorewall-init-4.5.5.1/releasenotes.txt 2012-06-14 15:39:22.000000000 +0200 +++ new/shorewall-init-4.5.5.3/releasenotes.txt 2012-06-28 17:00:50.000000000 +0200 @@ -1,7 +1,7 @@ ---------------------------------------------------------------------------- - S H O R E W A L L 4 . 5 . 5 . 1 + S H O R E W A L L 4 . 5 . 5 . 3 ------------------------------------ - J u n e 1 7 , 2 0 1 2 + J u n e 2 8 , 2 0 1 2 ---------------------------------------------------------------------------- I. PROBLEMS CORRECTED IN THIS RELEASE @@ -15,6 +15,42 @@ 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.5.5.3 + +1) When logical interface names were used, an entry in tcrules that + included a classid could result in the compiler failing with this + Perl diagnostic: + + Can't use an undefined value as an ARRAY reference at + /usr/share/shorewall/Shorewall/Tc.pm line nnn, <$currentfile> + line 20. + +4.5.5.2 + +1) Previously, when ipp2p was used in the /etc/shorewall/tcpri file, + the generated code for saving the packet mark was clearing the + connection marks fields not having to do with traffic shaping. It + now only alters the traffic-shaping part of the connection mark. + +2) Shorewall 4.4.11 allowed UID and GID ranges to be specified in the + USER:GROUP column of the rules file. That undocumented capability + has been restored for the benefit of Debian users upgrading from + Squeeze to Wheezy. + +3) The special TPROXY mark value is now shown in the output of + 'shorewall show marks'. + +4) Assuming that A = 0 and B = 1, the following conditionals + previously produced incorrect results: + + ?IF $A + ?IF $B + <text> + ?ENDIF + ?ENDIF + + The <text> was included when it should have been omitted. + 4.5.5.1 1) The change in Shorewall 4.5.4 that cleared the 'default' table if @@ -28,7 +64,7 @@ 2) When a logical device name was specified in the REDIRECTED INTERFACES column of /etc/shorewall/tcdevices, that name was used - in the generated script rather than the devices's physical + in the generated script rather than the device's physical name. Unless the two were the same, this caused start/restart failure. Shorewall now uses the physical name. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-4.5.5.1/shorewall-init.spec new/shorewall-init-4.5.5.3/shorewall-init.spec --- old/shorewall-init-4.5.5.1/shorewall-init.spec 2012-06-14 15:39:22.000000000 +0200 +++ new/shorewall-init-4.5.5.3/shorewall-init.spec 2012-06-28 17:00:50.000000000 +0200 @@ -1,6 +1,6 @@ %define name shorewall-init %define version 4.5.5 -%define release 1 +%define release 3 Summary: Shorewall-init adds functionality to Shoreline Firewall (Shorewall). Name: %{name} @@ -125,6 +125,10 @@ %doc COPYING changelog.txt releasenotes.txt %changelog +* Thu Jun 28 2012 Tom Eastep tom(a)shorewall.net +- Updated to 4.5.5-3 +* Fri Jun 22 2012 Tom Eastep tom(a)shorewall.net +- Updated to 4.5.5-2 * Tue Jun 12 2012 Tom Eastep tom(a)shorewall.net - Updated to 4.5.5-1 * Sat Jun 09 2012 Tom Eastep tom(a)shorewall.net diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-init-4.5.5.1/uninstall.sh new/shorewall-init-4.5.5.3/uninstall.sh --- old/shorewall-init-4.5.5.1/uninstall.sh 2012-06-14 15:39:22.000000000 +0200 +++ new/shorewall-init-4.5.5.3/uninstall.sh 2012-06-28 17:00:50.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.5.5.1 +VERSION=4.5.5.3 usage() # $1 = exit status { ++++++ shorewall-lite-4.5.5.1.tar.bz2 -> shorewall-lite-4.5.5.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.5.5.1/changelog.txt new/shorewall-lite-4.5.5.3/changelog.txt --- old/shorewall-lite-4.5.5.1/changelog.txt 2012-06-14 15:39:22.000000000 +0200 +++ new/shorewall-lite-4.5.5.3/changelog.txt 2012-06-28 17:00:51.000000000 +0200 @@ -1,3 +1,33 @@ +Changes in 4.5.5.3 + +1) Correct a Perl trap caused by using logical names with 'classify'. + +2) Ensure that exclusion chains always have the 'DONT_MOVE' flag set. + +Changes in 4.5.5.2 + +1) Allow UID/GID ranges in the USER/GROUP column (undocumented) + +2) Don't use '--ctmark' when saving marks. + +3) Display PROXY_MARK in 'show marks'. + +4) Another fix for nested ?IFs + +Changes in 4.5.5.1 + +1) Fix handling of multiple fallback providers. + +2) Allow logical device names in the REDIRECTED column. + +Changes in 4.5.5 Final + +1) Restore fix to configure script. + +2) Fix installer's handling of SYSCONFDIR + +3) Add DIGEST support. + Changes in 4.5.5 RC 1 1) Change in 'ignore' behavior. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.5.5.1/configure new/shorewall-lite-4.5.5.3/configure --- old/shorewall-lite-4.5.5.1/configure 2012-06-14 15:39:22.000000000 +0200 +++ new/shorewall-lite-4.5.5.3/configure 2012-06-28 17:00:51.000000000 +0200 @@ -28,7 +28,7 @@ # # Build updates this # -VERSION=4.5.5.1 +VERSION=4.5.5.3 case "$BASH_VERSION" in [4-9].*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.5.5.1/configure.pl new/shorewall-lite-4.5.5.3/configure.pl --- old/shorewall-lite-4.5.5.1/configure.pl 2012-06-14 15:39:22.000000000 +0200 +++ new/shorewall-lite-4.5.5.3/configure.pl 2012-06-28 17:00:51.000000000 +0200 @@ -31,7 +31,7 @@ # Build updates this # use constant { - VERSION => '4.5.5.1' + VERSION => '4.5.5.3' }; my %params; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.5.5.1/install.sh new/shorewall-lite-4.5.5.3/install.sh --- old/shorewall-lite-4.5.5.1/install.sh 2012-06-14 15:39:22.000000000 +0200 +++ new/shorewall-lite-4.5.5.3/install.sh 2012-06-28 17:00:51.000000000 +0200 @@ -22,7 +22,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -VERSION=4.5.5.1 +VERSION=4.5.5.3 usage() # $1 = exit status { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.5.5.1/manpages/shorewall-lite-vardir.5 new/shorewall-lite-4.5.5.3/manpages/shorewall-lite-vardir.5 --- old/shorewall-lite-4.5.5.1/manpages/shorewall-lite-vardir.5 2012-06-14 15:44:51.000000000 +0200 +++ new/shorewall-lite-4.5.5.3/manpages/shorewall-lite-vardir.5 2012-06-28 17:06:20.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-lite-vardir .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-LITE\-VAR" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-LITE\-VAR" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.5.5.1/manpages/shorewall-lite.8 new/shorewall-lite-4.5.5.3/manpages/shorewall-lite.8 --- old/shorewall-lite-4.5.5.1/manpages/shorewall-lite.8 2012-06-14 15:44:53.000000000 +0200 +++ new/shorewall-lite-4.5.5.3/manpages/shorewall-lite.8 2012-06-28 17:06:22.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: shorewall-lite .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-LITE" "8" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-LITE" "8" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.5.5.1/manpages/shorewall-lite.conf.5 new/shorewall-lite-4.5.5.3/manpages/shorewall-lite.conf.5 --- old/shorewall-lite-4.5.5.1/manpages/shorewall-lite.conf.5 2012-06-14 15:44:48.000000000 +0200 +++ new/shorewall-lite-4.5.5.3/manpages/shorewall-lite.conf.5 2012-06-28 17:06:17.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.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2012 +.\" Date: 06/28/2012 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "SHOREWALL\-LITE\&.CO" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]" +.TH "SHOREWALL\-LITE\&.CO" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.5.5.1/releasenotes.txt new/shorewall-lite-4.5.5.3/releasenotes.txt --- old/shorewall-lite-4.5.5.1/releasenotes.txt 2012-06-14 15:39:22.000000000 +0200 +++ new/shorewall-lite-4.5.5.3/releasenotes.txt 2012-06-28 17:00:51.000000000 +0200 @@ -1,7 +1,7 @@ ---------------------------------------------------------------------------- - S H O R E W A L L 4 . 5 . 5 . 1 + S H O R E W A L L 4 . 5 . 5 . 3 ------------------------------------ - J u n e 1 7 , 2 0 1 2 + J u n e 2 8 , 2 0 1 2 ---------------------------------------------------------------------------- I. PROBLEMS CORRECTED IN THIS RELEASE @@ -15,6 +15,42 @@ 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.5.5.3 + +1) When logical interface names were used, an entry in tcrules that + included a classid could result in the compiler failing with this + Perl diagnostic: + + Can't use an undefined value as an ARRAY reference at + /usr/share/shorewall/Shorewall/Tc.pm line nnn, <$currentfile> + line 20. + +4.5.5.2 + +1) Previously, when ipp2p was used in the /etc/shorewall/tcpri file, + the generated code for saving the packet mark was clearing the + connection marks fields not having to do with traffic shaping. It + now only alters the traffic-shaping part of the connection mark. + +2) Shorewall 4.4.11 allowed UID and GID ranges to be specified in the + USER:GROUP column of the rules file. That undocumented capability + has been restored for the benefit of Debian users upgrading from + Squeeze to Wheezy. + +3) The special TPROXY mark value is now shown in the output of + 'shorewall show marks'. + +4) Assuming that A = 0 and B = 1, the following conditionals + previously produced incorrect results: + + ?IF $A + ?IF $B + <text> + ?ENDIF + ?ENDIF + + The <text> was included when it should have been omitted. + 4.5.5.1 1) The change in Shorewall 4.5.4 that cleared the 'default' table if @@ -28,7 +64,7 @@ 2) When a logical device name was specified in the REDIRECTED INTERFACES column of /etc/shorewall/tcdevices, that name was used - in the generated script rather than the devices's physical + in the generated script rather than the device's physical name. Unless the two were the same, this caused start/restart failure. Shorewall now uses the physical name. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.5.5.1/shorewall-lite.spec new/shorewall-lite-4.5.5.3/shorewall-lite.spec --- old/shorewall-lite-4.5.5.1/shorewall-lite.spec 2012-06-14 15:39:22.000000000 +0200 +++ new/shorewall-lite-4.5.5.3/shorewall-lite.spec 2012-06-28 17:00:51.000000000 +0200 @@ -1,6 +1,6 @@ %define name shorewall-lite %define version 4.5.5 -%define release 1 +%define release 3 %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 +* Thu Jun 28 2012 Tom Eastep tom(a)shorewall.net +- Updated to 4.5.5-3 +* Fri Jun 22 2012 Tom Eastep tom(a)shorewall.net +- Updated to 4.5.5-2 * Tue Jun 12 2012 Tom Eastep tom(a)shorewall.net - Updated to 4.5.5-1 * Sat Jun 09 2012 Tom Eastep tom(a)shorewall.net diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shorewall-lite-4.5.5.1/uninstall.sh new/shorewall-lite-4.5.5.3/uninstall.sh --- old/shorewall-lite-4.5.5.1/uninstall.sh 2012-06-14 15:39:22.000000000 +0200 +++ new/shorewall-lite-4.5.5.3/uninstall.sh 2012-06-28 17:00:51.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.5.5.1 +VERSION=4.5.5.3 usage() # $1 = exit status { ++++++ shorewall-4.5.5.1.tar.bz2 -> shorewall6-4.5.5.3.tar.bz2 ++++++ ++++ 99674 lines of diff (skipped) ++++++ shorewall-lite-4.5.5.1.tar.bz2 -> shorewall6-lite-4.5.5.3.tar.bz2 ++++++ ++++ 6721 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

commit sgi-bitmap-fonts for openSUSE:12.2
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package sgi-bitmap-fonts for openSUSE:12.2 checked in at 2012-07-02 11:13:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/sgi-bitmap-fonts (Old) and /work/SRC/openSUSE:12.2/.sgi-bitmap-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sgi-bitmap-fonts", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.2/sgi-bitmap-fonts/sgi-bitmap-fonts.changes 2012-06-25 15:53:04.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.sgi-bitmap-fonts.new/sgi-bitmap-fonts.changes 2012-07-02 11:13:43.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Jun 30 10:00:31 UTC 2012 - i(a)marguerite.su + +- fix build 12.2. + * now bdftopcf is a separated package from xorg-x11. + * xmkmf now in imake. + * Imake.tmpl now in xorg-cf-files. + * mkfontdir is now splitted to a separated package from xorg-x11-util-devel + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sgi-bitmap-fonts.spec ++++++ --- /var/tmp/diff_new_pack.br7P5C/_old 2012-07-02 11:13:43.000000000 +0200 +++ /var/tmp/diff_new_pack.br7P5C/_new 2012-07-02 11:13:43.000000000 +0200 @@ -25,16 +25,24 @@ # fonts gathered from # ftp://patches-europe.sgi.com/pub/linux/ProPack1.4/SRPMS/sgi-fonts-1.0-1.src… # -> added COPYING file (MIT license), bug #752246 -License: MIT Summary: Very nice bitmapped fonts from SGI +License: MIT Group: System/X11/Fonts Source0: %{upstream_name}.tar.bz2 Source1: COPYING # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch0: %{name}-%{version}.patch BuildRequires: freetype2 +%if 0%{?suse_version} >= 1220 +BuildRequires: bdftopcf +BuildRequires: imake +BuildRequires: xorg-cf-files +BuildRequires: mkfontdir +BuildRequires: fontconfig +%else BuildRequires: xorg-x11 BuildRequires: xorg-x11-devel +%endif BuildRequires: xorg-x11-fonts Provides: sgi-fonts = %{version} # FIXME: This causes a rpmlint warning; change <= to < once here's a new upstream version -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sgi-bitmap-fonts for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package sgi-bitmap-fonts for openSUSE:Factory checked in at 2012-07-02 11:13:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sgi-bitmap-fonts (Old) and /work/SRC/openSUSE:Factory/.sgi-bitmap-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sgi-bitmap-fonts", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/sgi-bitmap-fonts/sgi-bitmap-fonts.changes 2012-05-26 09:28:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sgi-bitmap-fonts.new/sgi-bitmap-fonts.changes 2012-07-02 11:13:39.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Jun 30 10:00:31 UTC 2012 - i(a)marguerite.su + +- fix build 12.2. + * now bdftopcf is a separated package from xorg-x11. + * xmkmf now in imake. + * Imake.tmpl now in xorg-cf-files. + * mkfontdir is now splitted to a separated package from xorg-x11-util-devel + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sgi-bitmap-fonts.spec ++++++ --- /var/tmp/diff_new_pack.Tof13X/_old 2012-07-02 11:13:41.000000000 +0200 +++ /var/tmp/diff_new_pack.Tof13X/_new 2012-07-02 11:13:41.000000000 +0200 @@ -25,16 +25,24 @@ # fonts gathered from # ftp://patches-europe.sgi.com/pub/linux/ProPack1.4/SRPMS/sgi-fonts-1.0-1.src… # -> added COPYING file (MIT license), bug #752246 -License: MIT Summary: Very nice bitmapped fonts from SGI +License: MIT Group: System/X11/Fonts Source0: %{upstream_name}.tar.bz2 Source1: COPYING # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch0: %{name}-%{version}.patch BuildRequires: freetype2 +%if 0%{?suse_version} >= 1220 +BuildRequires: bdftopcf +BuildRequires: imake +BuildRequires: xorg-cf-files +BuildRequires: mkfontdir +BuildRequires: fontconfig +%else BuildRequires: xorg-x11 BuildRequires: xorg-x11-devel +%endif BuildRequires: xorg-x11-fonts Provides: sgi-fonts = %{version} # FIXME: This causes a rpmlint warning; change <= to < once here's a new upstream version -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit scite for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package scite for openSUSE:Factory checked in at 2012-07-02 11:12:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scite (Old) and /work/SRC/openSUSE:Factory/.scite.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "scite", Maintainer is "nadvornik(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/scite/scite.changes 2012-02-28 14:16:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.scite.new/scite.changes 2012-07-02 11:12:39.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Jun 25 06:32:31 UTC 2012 - badshah400(a)gmail.com + +- Update to version 3.2.0: + + Long list of changes since the last packaged version, see + http://www.scintilla.org/ScintillaHistory.html for a detailed + list. + +------------------------------------------------------------------- Old: ---- scite303.tgz New: ---- scite320.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scite.spec ++++++ --- /var/tmp/diff_new_pack.jDCVp5/_old 2012-07-02 11:12:41.000000000 +0200 +++ /var/tmp/diff_new_pack.jDCVp5/_new 2012-07-02 11:12:41.000000000 +0200 @@ -18,13 +18,13 @@ Name: scite -Version: 3.0.3 +Version: 3.2.0 Release: 0 Summary: Source Code Editor based on Scintilla License: MIT Group: Productivity/Text/Editors Url: http://www.scintilla.org/SciTE.html -Source0: http://voxel.dl.sourceforge.net/project/scintilla/SciTE/3.0.3/scite303.tgz +Source0: http://download.sourceforge.net/scintilla/%{name}320.tgz # PATCH-FIX-UPSTREAM scite-fix-desktop-categories.patch sf#3491187 malcolmlewis(a)opensuse.org -- Update desktop catgories. Patch0: scite-fix-desktop-categories.patch BuildRequires: gcc-c++ ++++++ scite303.tgz -> scite320.tgz ++++++ ++++ 22525 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

commit python-web.py for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package python-web.py for openSUSE:Factory checked in at 2012-07-02 11:07:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-web.py (Old) and /work/SRC/openSUSE:Factory/.python-web.py.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-web.py", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-web.py/python-web.py.changes 2012-03-22 12:39:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-web.py.new/python-web.py.changes 2012-07-02 11:07:48.000000000 +0200 @@ -1,0 +2,19 @@ +Fri Jun 29 08:23:50 UTC 2012 - cfarrell(a)suse.com + +- Updated to 0.37 +* Fixed datestr issue on Windows -- #155 +* Fixed Python 2.4 compatability issues (tx fredludlow) +* Fixed error in utils.safewrite (tx shuge) -- #95 +* Allow use of web.data() with app.request() -- #105 +* Fixed an issue with session initializaton (tx beardedprojamz) -- #109 +* Allow custom message on 400 Bad Request (tx patryk) -- #121 +* Made djangoerror work on GAE. -- #80 +* Handle malformatted data in the urls. -- #117 +* Made it easier to stop the dev server -- #100, #122 +* Added support fot customizing cookie_path in session (tx larsga) -- #89 +* Added exception for "415 Unsupported Media" (tx JirkaChadima) -- #145 +* Added GroupedDropdown to support `<optgroup>` tag (tx jzellman) -- #152 +* Fixed failure in embedded interpreter - #87 +* Optimized web.cookies (tx benhoyt) - #148 + +------------------------------------------------------------------- Old: ---- web.py-0.36.tar.gz New: ---- web.py-0.37.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-web.py.spec ++++++ --- /var/tmp/diff_new_pack.paMyRr/_old 2012-07-02 11:07:50.000000000 +0200 +++ /var/tmp/diff_new_pack.paMyRr/_new 2012-07-02 11:07:50.000000000 +0200 @@ -11,12 +11,13 @@ # 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/ # + Name: python-web.py -Version: 0.36 +Version: 0.37 Release: 0 Url: http://webpy.org/ Summary: web.py: makes web apps ++++++ web.py-0.36.tar.gz -> web.py-0.37.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/web.py-0.36/PKG-INFO new/web.py-0.37/PKG-INFO --- old/web.py-0.36/PKG-INFO 2011-07-04 12:11:27.000000000 +0200 +++ new/web.py-0.37/PKG-INFO 2012-06-26 07:21:31.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: web.py -Version: 0.36 +Version: 0.37 Summary: web.py: makes web apps Home-page: http://webpy.org/ Author: Anand Chitipothu diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/web.py-0.36/web/__init__.py new/web.py-0.37/web/__init__.py --- old/web.py-0.36/web/__init__.py 2011-07-04 12:10:39.000000000 +0200 +++ new/web.py-0.37/web/__init__.py 2012-06-26 07:19:55.000000000 +0200 @@ -3,7 +3,7 @@ from __future__ import generators -__version__ = "0.36" +__version__ = "0.37" __author__ = [ "Aaron Swartz <me(a)aaronsw.com>", "Anand Chitipothu <anandology(a)gmail.com>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/web.py-0.36/web/application.py new/web.py-0.37/web/application.py --- old/web.py-0.36/web/application.py 2011-07-04 12:10:39.000000000 +0200 +++ new/web.py-0.37/web/application.py 2012-06-26 07:19:55.000000000 +0200 @@ -5,6 +5,8 @@ import webapi as web import webapi, wsgi, utils import debugerror +import httpserver + from utils import lstrips, safeunicode import sys @@ -201,7 +203,7 @@ if 'HTTP_CONTENT_TYPE' in env: env['CONTENT_TYPE'] = env.pop('HTTP_CONTENT_TYPE') - if method in ["POST", "PUT"]: + if method not in ["HEAD", "GET"]: data = data or '' import StringIO if isinstance(data, dict): @@ -309,6 +311,13 @@ function. """ return wsgi.runwsgi(self.wsgifunc(*middleware)) + + def stop(self): + """Stops the http server started by run. + """ + if httpserver.server: + httpserver.server.stop() + httpserver.server = None def cgirun(self, *middleware): """ @@ -366,8 +375,10 @@ ctx.fullpath = ctx.path + ctx.query for k, v in ctx.iteritems(): + # convert all string values to unicode values and replace + # malformed data with a suitable replacement marker. if isinstance(v, str): - ctx[k] = safeunicode(v) + ctx[k] = v.decode('utf-8', 'replace') # status must always be str ctx.status = '200 OK' @@ -636,9 +647,12 @@ if so, reloads them. """ - SUFFIX = '$py.class' if sys.platform.startswith('java') else '.pyc' """File suffix of compiled modules.""" - + if sys.platform.startswith('java'): + SUFFIX = '$py.class' + else: + SUFFIX = '.pyc' + def __init__(self): self.mtimes = {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/web.py-0.36/web/db.py new/web.py-0.37/web/db.py --- old/web.py-0.36/web/db.py 2011-07-04 12:10:39.000000000 +0200 +++ new/web.py-0.37/web/db.py 2012-06-26 07:19:55.000000000 +0200 @@ -1019,6 +1019,7 @@ self.paramstyle = db.paramstyle keywords['database'] = keywords.pop('db') + keywords['pooling'] = False # sqlite don't allows connections to be shared by threads self.dbname = "sqlite" DB.__init__(self, db, keywords) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/web.py-0.36/web/debugerror.py new/web.py-0.37/web/debugerror.py --- old/web.py-0.36/web/debugerror.py 2011-07-04 12:10:39.000000000 +0200 +++ new/web.py-0.37/web/debugerror.py 2012-06-26 07:19:55.000000000 +0200 @@ -217,7 +217,7 @@ <div id="explanation"> <p> You're seeing this error because you have <code>web.config.debug</code> - set to <code>True</code>. Set that to <code>False</code> if you don't to see this. + set to <code>True</code>. Set that to <code>False</code> if you don't want to see this. </p> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/web.py-0.36/web/form.py new/web.py-0.37/web/form.py --- old/web.py-0.36/web/form.py 2011-07-04 12:10:39.000000000 +0200 +++ new/web.py-0.37/web/form.py 2012-06-26 07:19:55.000000000 +0200 @@ -8,8 +8,15 @@ import utils, net def attrget(obj, attr, value=None): - if hasattr(obj, 'has_key') and obj.has_key(attr): return obj[attr] - if hasattr(obj, attr): return getattr(obj, attr) + try: + if hasattr(obj, 'has_key') and obj.has_key(attr): + return obj[attr] + except TypeError: + # Handle the case where has_key takes different number of arguments. + # This is the case with Model objects on appengine. See #134 + pass + if hasattr(obj, attr): + return getattr(obj, attr) return value class Form(object): @@ -18,7 +25,7 @@ >>> f = Form(Textbox("x")) >>> f.render() - '<table>\n <tr><th><label for="x">x</label></th><td><input type="text" id="x" name="x"/></td></tr>\n</table>' + u'<table>\n <tr><th><label for="x">x</label></th><td><input type="text" id="x" name="x"/></td></tr>\n</table>' """ def __init__(self, *inputs, **kw): self.inputs = inputs @@ -187,9 +194,9 @@ """Textbox input. >>> Textbox(name='foo', value='bar').render() - '<input type="text" id="foo" value="bar" name="foo"/>' + u'<input type="text" id="foo" value="bar" name="foo"/>' >>> Textbox(name='foo', value=0).render() - '<input type="text" id="foo" value="0" name="foo"/>' + u'<input type="text" id="foo" value="0" name="foo"/>' """ def get_type(self): return 'text' @@ -198,7 +205,7 @@ """Password input. >>> Password(name='password', value='secret').render() - '<input type="password" id="password" value="secret" name="password"/>' + u'<input type="password" id="password" value="secret" name="password"/>' """ def get_type(self): @@ -208,7 +215,7 @@ """Textarea input. >>> Textarea(name='foo', value='bar').render() - '<textarea id="foo" name="foo">bar</textarea>' + u'<textarea id="foo" name="foo">bar</textarea>' """ def render(self): attrs = self.attrs.copy() @@ -220,9 +227,9 @@ r"""Dropdown/select input. >>> Dropdown(name='foo', args=['a', 'b', 'c'], value='b').render() - '<select id="foo" name="foo">\n <option value="a">a</option>\n <option selected="selected" value="b">b</option>\n <option value="c">c</option>\n</select>\n' + u'<select id="foo" name="foo">\n <option value="a">a</option>\n <option selected="selected" value="b">b</option>\n <option value="c">c</option>\n</select>\n' >>> Dropdown(name='foo', args=[('a', 'aa'), ('b', 'bb'), ('c', 'cc')], value='b').render() - '<select id="foo" name="foo">\n <option value="a">aa</option>\n <option selected="selected" value="b">bb</option>\n <option value="c">cc</option>\n</select>\n' + u'<select id="foo" name="foo">\n <option value="a">aa</option>\n <option selected="selected" value="b">bb</option>\n <option value="c">cc</option>\n</select>\n' """ def __init__(self, name, args, *validators, **attrs): self.args = args @@ -235,15 +242,48 @@ x = '<select %s>\n' % attrs for arg in self.args: - if isinstance(arg, (tuple, list)): - value, desc= arg - else: - value, desc = arg, arg + x += self._render_option(arg) + + x += '</select>\n' + return x + + def _render_option(self, arg, indent=' '): + if isinstance(arg, (tuple, list)): + value, desc= arg + else: + value, desc = arg, arg + + if self.value == value or (isinstance(self.value, list) and value in self.value): + select_p = ' selected="selected"' + else: + select_p = '' + return indent + '<option%s value="%s">%s</option>\n' % (select_p, net.websafe(value), net.websafe(desc)) + + +class GroupedDropdown(Dropdown): + r"""Grouped Dropdown/select input. + + >>> GroupedDropdown(name='car_type', args=(('Swedish Cars', ('Volvo', 'Saab')), ('German Cars', ('Mercedes', 'Audi'))), value='Audi').render() + u'<select id="car_type" name="car_type">\n <optgroup label="Swedish Cars">\n <option value="Volvo">Volvo</option>\n <option value="Saab">Saab</option>\n </optgroup>\n <optgroup label="German Cars">\n <option value="Mercedes">Mercedes</option>\n <option selected="selected" value="Audi">Audi</option>\n </optgroup>\n</select>\n' + >>> GroupedDropdown(name='car_type', args=(('Swedish Cars', (('v', 'Volvo'), ('s', 'Saab'))), ('German Cars', (('m', 'Mercedes'), ('a', 'Audi')))), value='a').render() + u'<select id="car_type" name="car_type">\n <optgroup label="Swedish Cars">\n <option value="v">Volvo</option>\n <option value="s">Saab</option>\n </optgroup>\n <optgroup label="German Cars">\n <option value="m">Mercedes</option>\n <option selected="selected" value="a">Audi</option>\n </optgroup>\n</select>\n' - if self.value == value or (isinstance(self.value, list) and value in self.value): - select_p = ' selected="selected"' - else: select_p = '' - x += ' <option%s value="%s">%s</option>\n' % (select_p, net.websafe(value), net.websafe(desc)) + """ + def __init__(self, name, args, *validators, **attrs): + self.args = args + super(Dropdown, self).__init__(name, *validators, **attrs) + + def render(self): + attrs = self.attrs.copy() + attrs['name'] = self.name + + x = '<select %s>\n' % attrs + + for label, options in self.args: + x += ' <optgroup label="%s">\n' % net.websafe(label) + for arg in options: + x += self._render_option(arg, indent = ' ') + x += ' </optgroup>\n' x += '</select>\n' return x @@ -274,14 +314,14 @@ """Checkbox input. >>> Checkbox('foo', value='bar', checked=True).render() - '<input checked="checked" type="checkbox" id="foo_bar" value="bar" name="foo"/>' + u'<input checked="checked" type="checkbox" id="foo_bar" value="bar" name="foo"/>' >>> Checkbox('foo', value='bar').render() - '<input type="checkbox" id="foo_bar" value="bar" name="foo"/>' + u'<input type="checkbox" id="foo_bar" value="bar" name="foo"/>' >>> c = Checkbox('foo', value='bar') >>> c.validate('on') True >>> c.render() - '<input checked="checked" type="checkbox" id="foo_bar" value="bar" name="foo"/>' + u'<input checked="checked" type="checkbox" id="foo_bar" value="bar" name="foo"/>' """ def __init__(self, name, *validators, **attrs): self.checked = attrs.pop('checked', False) @@ -311,9 +351,9 @@ """HTML Button. >>> Button("save").render() - '<button id="save" name="save">save</button>' + u'<button id="save" name="save">save</button>' >>> Button("action", value="save", html="<b>Save Changes</b>").render() - '<button id="action" value="save" name="action"><b>Save Changes</b></button>' + u'<button id="action" value="save" name="action"><b>Save Changes</b></button>' """ def __init__(self, name, *validators, **attrs): super(Button, self).__init__(name, *validators, **attrs) @@ -331,7 +371,7 @@ """Hidden Input. >>> Hidden(name='foo', value='bar').render() - '<input type="hidden" id="foo" value="bar" name="foo"/>' + u'<input type="hidden" id="foo" value="bar" name="foo"/>' """ def is_hidden(self): return True @@ -343,7 +383,7 @@ """File input. >>> File(name='f').render() - '<input type="file" id="f" name="f"/>' + u'<input type="file" id="f" name="f"/>' """ def get_type(self): return 'file' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/web.py-0.36/web/http.py new/web.py-0.37/web/http.py --- old/web.py-0.36/web/http.py 2011-07-04 12:10:39.000000000 +0200 +++ new/web.py-0.37/web/http.py 2012-06-26 07:19:55.000000000 +0200 @@ -122,7 +122,7 @@ def url(path=None, doseq=False, **kw): """ - Makes url by concatinating web.ctx.homepath and path and the + Makes url by concatenating web.ctx.homepath and path and the query string created using the arguments. """ if path is None: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/web.py-0.36/web/httpserver.py new/web.py-0.37/web/httpserver.py --- old/web.py-0.36/web/httpserver.py 2011-07-04 12:10:40.000000000 +0200 +++ new/web.py-0.37/web/httpserver.py 2012-06-26 07:19:55.000000000 +0200 @@ -131,6 +131,10 @@ print "http://%s:%d/" % server_address WSGIServer(func, server_address).serve_forever() +# The WSGIServer instance. +# Made global so that it can be stopped in embedded mode. +server = None + def runsimple(func, server_address=("0.0.0.0", 8080)): """ Runs [CherryPy][cp] WSGI server hosting WSGI app `func`. @@ -138,16 +142,22 @@ [cp]: http://www.cherrypy.org """ + global server func = StaticMiddleware(func) func = LogMiddleware(func) server = WSGIServer(server_address, func) - print "http://%s:%d/" % server_address + if server.ssl_adapter: + print "https://%s:%d/" % server_address + else: + print "http://%s:%d/" % server_address + try: server.start() - except KeyboardInterrupt: + except (KeyboardInterrupt, SystemExit): server.stop() + server = None def WSGIServer(server_address, wsgi_app): """Creates CherryPy WSGI server listening at `server_address` to serve `wsgi_app`. @@ -155,7 +165,7 @@ """ import wsgiserver - # Default values of wsgiserver.ssl_adapters uses cheerypy.wsgiserver + # Default values of wsgiserver.ssl_adapters uses cherrypy.wsgiserver # prefix. Overwriting it make it work with web.wsgiserver. wsgiserver.ssl_adapters = { 'builtin': 'web.wsgiserver.ssl_builtin.BuiltinSSLAdapter', @@ -163,6 +173,32 @@ } server = wsgiserver.CherryPyWSGIServer(server_address, wsgi_app, server_name="localhost") + + def create_ssl_adapter(cert, key): + # wsgiserver tries to import submodules as cherrypy.wsgiserver.foo. + # That doesn't work as not it is web.wsgiserver. + # Patching sys.modules temporarily to make it work. + import types + cherrypy = types.ModuleType('cherrypy') + cherrypy.wsgiserver = wsgiserver + sys.modules['cherrypy'] = cherrypy + sys.modules['cherrypy.wsgiserver'] = wsgiserver + + from wsgiserver.ssl_pyopenssl import pyOpenSSLAdapter + adapter = pyOpenSSLAdapter(cert, key) + + # We are done with our work. Cleanup the patches. + del sys.modules['cherrypy'] + del sys.modules['cherrypy.wsgiserver'] + + return adapter + + # SSL backward compatibility + if (server.ssl_adapter is None and + getattr(server, 'ssl_certificate', None) and + getattr(server, 'ssl_private_key', None)): + server.ssl_adapter = create_ssl_adapter(server.ssl_certificate, server.ssl_private_key) + server.nodelay = not sys.platform.startswith('java') # TCP_NODELAY isn't supported on the JVM return server diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/web.py-0.36/web/session.py new/web.py-0.37/web/session.py --- old/web.py-0.36/web/session.py 2011-07-04 12:10:40.000000000 +0200 +++ new/web.py-0.37/web/session.py 2012-06-26 07:19:55.000000000 +0200 @@ -5,6 +5,7 @@ import os, time, datetime, random, base64 import os.path +from copy import deepcopy try: import cPickle as pickle except ImportError: @@ -27,6 +28,7 @@ web.config.session_parameters = utils.storage({ 'cookie_name': 'webpy_session_id', 'cookie_domain': None, + 'cookie_path' : None, 'timeout': 86400, #24 * 60 * 60, # 24 hours in seconds 'ignore_expiry': True, 'ignore_change_ip': True, @@ -91,6 +93,7 @@ """Load the session from the store, by the id from cookie""" cookie_name = self._config.cookie_name cookie_domain = self._config.cookie_domain + cookie_path = self._config.cookie_path httponly = self._config.httponly self.session_id = web.cookies().get(cookie_name) @@ -109,7 +112,7 @@ if self._initializer: if isinstance(self._initializer, dict): - self.update(self._initializer) + self.update(deepcopy(self._initializer)) elif hasattr(self._initializer, '__call__'): self._initializer() @@ -139,9 +142,10 @@ def _setcookie(self, session_id, expires='', **kw): cookie_name = self._config.cookie_name cookie_domain = self._config.cookie_domain + cookie_path = self._config.cookie_path httponly = self._config.httponly secure = self._config.secure - web.setcookie(cookie_name, session_id, expires=expires, domain=cookie_domain, httponly=httponly, secure=secure) + web.setcookie(cookie_name, session_id, expires=expires, domain=cookie_domain, httponly=httponly, secure=secure, path=cookie_path) def _generate_session_id(self): """Generate a random id for session""" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/web.py-0.36/web/template.py new/web.py-0.37/web/template.py --- old/web.py-0.36/web/template.py 2011-07-04 12:10:40.000000000 +0200 +++ new/web.py-0.37/web/template.py 2012-06-26 07:19:55.000000000 +0200 @@ -41,6 +41,7 @@ import glob import re from UserDict import DictMixin +import warnings from utils import storage, safeunicode, safestr, re_compile from webapi import config @@ -920,11 +921,13 @@ # make sure code is safe - but not with jython, it doesn't have a working compiler module if not sys.platform.startswith('java'): - import compiler - ast = compiler.parse(code) - SafeVisitor().walk(ast, filename) + try: + import compiler + ast = compiler.parse(code) + SafeVisitor().walk(ast, filename) + except ImportError: + warnings.warn("Unabled to import compiler module. Unable to check templates for safety.") else: - import warnings warnings.warn("SECURITY ISSUE: You are using Jython, which does not support checking templates for safety. Your templates can execute arbitrary code.") return compiled_code diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/web.py-0.36/web/utils.py new/web.py-0.37/web/utils.py --- old/web.py-0.36/web/utils.py 2011-07-04 12:10:40.000000000 +0200 +++ new/web.py-0.37/web/utils.py 2012-06-26 07:19:55.000000000 +0200 @@ -131,8 +131,14 @@ <Storage {'x': u'a'}> """ _unicode = defaults.pop('_unicode', False) + + # if _unicode is callable object, use it convert a string to unicode. + to_unicode = safeunicode + if _unicode is not False and hasattr(_unicode, "__call__"): + to_unicode = _unicode + def unicodify(s): - if _unicode and isinstance(s, str): return safeunicode(s) + if _unicode and isinstance(s, str): return to_unicode(s) else: return s def getvalue(x): @@ -715,7 +721,7 @@ f = file(filename + '.tmp', 'w') f.write(content) f.close() - os.rename(f.name, path) + os.rename(f.name, filename) def dictreverse(mapping): """ @@ -905,7 +911,12 @@ if abs(deltadays) < 4: return agohence(deltadays, 'day') - out = then.strftime('%B %e') # e.g. 'June 13' + try: + out = then.strftime('%B %e') # e.g. 'June 3' + except ValueError: + # %e doesn't work on Windows. + out = then.strftime('%B %d') # e.g. 'June 03' + if then.year != now.year or deltadays < 0: out += ', %s' % then.year return out @@ -1199,7 +1210,7 @@ def clear_all(): """Clears all ThreadedDict instances. """ - for t in ThreadedDict._instances: + for t in list(ThreadedDict._instances): t.clear() clear_all = staticmethod(clear_all) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/web.py-0.36/web/webapi.py new/web.py-0.37/web/webapi.py --- old/web.py-0.36/web/webapi.py 2011-07-04 12:10:40.000000000 +0200 +++ new/web.py-0.37/web/webapi.py 2012-06-26 07:19:55.000000000 +0200 @@ -19,9 +19,9 @@ "Redirect", "Found", "SeeOther", "NotModified", "TempRedirect", "redirect", "found", "seeother", "notmodified", "tempredirect", - # 400, 401, 403, 404, 405, 406, 409, 410, 412 - "BadRequest", "Unauthorized", "Forbidden", "NotFound", "NoMethod", "NotAcceptable", "Conflict", "Gone", "PreconditionFailed", - "badrequest", "unauthorized", "forbidden", "notfound", "nomethod", "notacceptable", "conflict", "gone", "preconditionfailed", + # 400, 401, 403, 404, 405, 406, 409, 410, 412, 415 + "BadRequest", "Unauthorized", "Forbidden", "NotFound", "NoMethod", "NotAcceptable", "Conflict", "Gone", "PreconditionFailed", "UnsupportedMediaType", + "badrequest", "unauthorized", "forbidden", "notfound", "nomethod", "notacceptable", "conflict", "gone", "preconditionfailed", "unsupportedmediatype", # 500 "InternalError", @@ -122,13 +122,33 @@ class BadRequest(HTTPError): """`400 Bad Request` error.""" message = "bad request" - def __init__(self): + def __init__(self, message=None): status = "400 Bad Request" headers = {'Content-Type': 'text/html'} - HTTPError.__init__(self, status, headers, self.message) + HTTPError.__init__(self, status, headers, message or self.message) badrequest = BadRequest +class Unauthorized(HTTPError): + """`401 Unauthorized` error.""" + message = "unauthorized" + def __init__(self): + status = "401 Unauthorized" + headers = {'Content-Type': 'text/html'} + HTTPError.__init__(self, status, headers, self.message) + +unauthorized = Unauthorized + +class Forbidden(HTTPError): + """`403 Forbidden` error.""" + message = "forbidden" + def __init__(self): + status = "403 Forbidden" + headers = {'Content-Type': 'text/html'} + HTTPError.__init__(self, status, headers, self.message) + +forbidden = Forbidden + class _NotFound(HTTPError): """`404 Not Found` error.""" message = "not found" @@ -149,12 +169,6 @@ notfound = NotFound -unauthorized = Unauthorized = _status_code("401 Unauthorized") -forbidden = Forbidden = _status_code("403 Forbidden") -notacceptable = NotAcceptable = _status_code("406 Not Acceptable") -conflict = Conflict = _status_code("409 Conflict") -preconditionfailed = PreconditionFailed = _status_code("412 Precondition Failed") - class NoMethod(HTTPError): """A `405 Method Not Allowed` error.""" def __init__(self, cls=None): @@ -172,6 +186,26 @@ nomethod = NoMethod +class NotAcceptable(HTTPError): + """`406 Not Acceptable` error.""" + message = "not acceptable" + def __init__(self): + status = "406 Not Acceptable" + headers = {'Content-Type': 'text/html'} + HTTPError.__init__(self, status, headers, self.message) + +notacceptable = NotAcceptable + +class Conflict(HTTPError): + """`409 Conflict` error.""" + message = "conflict" + def __init__(self): + status = "409 Conflict" + headers = {'Content-Type': 'text/html'} + HTTPError.__init__(self, status, headers, self.message) + +conflict = Conflict + class Gone(HTTPError): """`410 Gone` error.""" message = "gone" @@ -182,6 +216,26 @@ gone = Gone +class PreconditionFailed(HTTPError): + """`412 Precondition Failed` error.""" + message = "precondition failed" + def __init__(self): + status = "412 Precondition Failed" + headers = {'Content-Type': 'text/html'} + HTTPError.__init__(self, status, headers, self.message) + +preconditionfailed = PreconditionFailed + +class UnsupportedMediaType(HTTPError): + """`415 Unsupported Media Type` error.""" + message = "unsupported media type" + def __init__(self): + status = "415 Unsupported Media Type" + headers = {'Content-Type': 'text/html'} + HTTPError.__init__(self, status, headers, self.message) + +unsupportedmediatype = UnsupportedMediaType + class _InternalError(HTTPError): """500 Internal Server Error`.""" message = "internal server error" @@ -305,19 +359,101 @@ if httponly: value += '; httponly' header('Set-Cookie', value) + +def decode_cookie(value): + r"""Safely decodes a cookie value to unicode. + + Tries us-ascii, utf-8 and io8859 encodings, in that order. -def cookies(*requireds, **defaults): + >>> decode_cookie('') + u'' + >>> decode_cookie('asdf') + u'asdf' + >>> decode_cookie('foo \xC3\xA9 bar') + u'foo \xe9 bar' + >>> decode_cookie('foo \xE9 bar') + u'foo \xe9 bar' """ - Returns a `storage` object with all the cookies in it. + try: + # First try plain ASCII encoding + return unicode(value, 'us-ascii') + except UnicodeError: + # Then try UTF-8, and if that fails, ISO8859 + try: + return unicode(value, 'utf-8') + except UnicodeError: + return unicode(value, 'iso8859', 'ignore') + +def parse_cookies(http_cookie): + r"""Parse a HTTP_COOKIE header and return dict of cookie names and decoded values. + + >>> sorted(parse_cookies('').items()) + [] + >>> sorted(parse_cookies('a=1').items()) + [('a', '1')] + >>> sorted(parse_cookies('a=1%202').items()) + [('a', '1 2')] + >>> sorted(parse_cookies('a=Z%C3%A9Z').items()) + [('a', 'Z\xc3\xa9Z')] + >>> sorted(parse_cookies('a=1; b=2; c=3').items()) + [('a', '1'), ('b', '2'), ('c', '3')] + >>> sorted(parse_cookies('a=1; b=w("x")|y=z; c=3').items()) + [('a', '1'), ('b', 'w('), ('c', '3')] + >>> sorted(parse_cookies('a=1; b=w(%22x%22)|y=z; c=3').items()) + [('a', '1'), ('b', 'w("x")|y=z'), ('c', '3')] + + >>> sorted(parse_cookies('keebler=E=mc2').items()) + [('keebler', 'E=mc2')] + >>> sorted(parse_cookies(r'keebler="E=mc2; L=\"Loves\"; fudge=\012;"').items()) + [('keebler', 'E=mc2; L="Loves"; fudge=\n;')] + """ + #print "parse_cookies" + if '"' in http_cookie: + # HTTP_COOKIE has quotes in it, use slow but correct cookie parsing + cookie = Cookie.SimpleCookie() + try: + cookie.load(http_cookie) + except Cookie.CookieError: + # If HTTP_COOKIE header is malformed, try at least to load the cookies we can by + # first splitting on ';' and loading each attr=value pair separately + cookie = Cookie.SimpleCookie() + for attr_value in http_cookie.split(';'): + try: + cookie.load(attr_value) + except Cookie.CookieError: + pass + cookies = dict((k, urllib.unquote(v.value)) for k, v in cookie.iteritems()) + else: + # HTTP_COOKIE doesn't have quotes, use fast cookie parsing + cookies = {} + for key_value in http_cookie.split(';'): + key_value = key_value.split('=', 1) + if len(key_value) == 2: + key, value = key_value + cookies[key.strip()] = urllib.unquote(value.strip()) + return cookies + +def cookies(*requireds, **defaults): + r"""Returns a `storage` object with all the request cookies in it. + See `storify` for how `requireds` and `defaults` work. + + This is forgiving on bad HTTP_COOKIE input, it tries to parse at least + the cookies it can. + + The values are converted to unicode if _unicode=True is passed. """ - cookie = Cookie.SimpleCookie() - cookie.load(ctx.env.get('HTTP_COOKIE', '')) + # If _unicode=True is specified, use decode_cookie to convert cookie value to unicode + if defaults.get("_unicode") is True: + defaults['_unicode'] = decode_cookie + + # parse cookie string and cache the result for next time. + if '_parsed_cookies' not in ctx: + http_cookie = ctx.env.get("HTTP_COOKIE", "") + ctx._parsed_cookies = parse_cookies(http_cookie) + try: - d = storify(cookie, *requireds, **defaults) - for k, v in d.items(): - d[k] = v and urllib.unquote(v) - return d + return storify(ctx._parsed_cookies, *requireds, **defaults) except KeyError: badrequest() raise StopIteration @@ -383,3 +519,7 @@ `output` : A string to be used as the response. """ + +if __name__ == "__main__": + import doctest + doctest.testmod() \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/web.py-0.36/web/wsgi.py new/web.py-0.37/web/wsgi.py --- old/web.py-0.36/web/wsgi.py 2011-07-04 12:10:40.000000000 +0200 +++ new/web.py-0.37/web/wsgi.py 2012-06-26 07:19:55.000000000 +0200 @@ -54,11 +54,15 @@ return httpserver.runsimple(func, validip(listget(sys.argv, 1, ''))) def _is_dev_mode(): + # Some embedded python interpreters won't have sys.arv + # For details, see https://github.com/webpy/webpy/issues/87 + argv = getattr(sys, "argv", []) + # quick hack to check if the program is running in dev mode. if os.environ.has_key('SERVER_SOFTWARE') \ or os.environ.has_key('PHP_FCGI_CHILDREN') \ - or 'fcgi' in sys.argv or 'fastcgi' in sys.argv \ - or 'mod_wsgi' in sys.argv: + or 'fcgi' in argv or 'fastcgi' in argv \ + or 'mod_wsgi' in argv: return False return True -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit oxygen-gtk2 for openSUSE:12.2
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package oxygen-gtk2 for openSUSE:12.2 checked in at 2012-07-02 11:06:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/oxygen-gtk2 (Old) and /work/SRC/openSUSE:12.2/.oxygen-gtk2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "oxygen-gtk2", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.2/oxygen-gtk2/oxygen-gtk2.changes 2012-06-25 15:48:00.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.oxygen-gtk2.new/oxygen-gtk2.changes 2012-07-02 11:06:46.000000000 +0200 @@ -1,0 +2,4 @@ +Mon Jul 2 09:15:00 UTC 2012 - renda.krell(a)gmail.com +- Crash fix, fixes #bko 302197 and JRE crashes + +------------------------------------------------------------------- New: ---- changeset_rebda9cf5273f62ce226612d3080f49f135f3f2d4.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen-gtk2.spec ++++++ --- /var/tmp/diff_new_pack.JVlq4w/_old 2012-07-02 11:06:46.000000000 +0200 +++ /var/tmp/diff_new_pack.JVlq4w/_new 2012-07-02 11:06:46.000000000 +0200 @@ -24,6 +24,7 @@ Group: System/GUI/KDE Url: https://projects.kde.org/projects/playground/artwork/oxygen-gtk/ Source0: ftp://ftp.kde.org/pub/kde/stable/oxygen-gtk2/%{version}/src/%{name}-%{versi… +Patch0: changeset_rebda9cf5273f62ce226612d3080f49f135f3f2d4.diff Source100: baselibs.conf BuildRequires: cmake BuildRequires: gcc-c++ @@ -91,6 +92,7 @@ %prep %setup -q +%patch0 %build mkdir -p build ++++++ changeset_rebda9cf5273f62ce226612d3080f49f135f3f2d4.diff ++++++ commit ebda9cf5273f62ce226612d3080f49f135f3f2d4 Author: Hugo Pereira Da Costa <hugo(a)oxygen-icons.org> Date: Fri Jun 22 11:27:45 2012 +0200 Check clipRect validity before altering its width CCBUG: 302197 diff --git a/src/oxygenstylewrapper.cpp b/src/oxygenstylewrapper.cpp index 8795b9d..5fa8fce 100644 --- src/oxygenstylewrapper.cpp +++ src/oxygenstylewrapper.cpp @@ -2178,10 +2178,8 @@ namespace Oxygen } else if( d.isCheck() && ( GTK_IS_CHECK_MENU_ITEM( widget ) || /* for LibreOffice */GTK_IS_MENU_ITEM( widget ) ) ) { // Fix cliprect for LibreOffice - if(GTK_IS_MENU_ITEM(widget)) - { - ++clipRect->width; - } + if( clipRect && GTK_IS_MENU_ITEM(widget)) + { ++clipRect->width; } StyleOptions options( widget, state, shadow ); options |= (Blend|Flat|NoFill); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit oxygen-gtk2 for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package oxygen-gtk2 for openSUSE:Factory checked in at 2012-07-02 11:06:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oxygen-gtk2 (Old) and /work/SRC/openSUSE:Factory/.oxygen-gtk2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "oxygen-gtk2", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/oxygen-gtk2/oxygen-gtk2.changes 2012-06-25 11:52:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.oxygen-gtk2.new/oxygen-gtk2.changes 2012-07-02 11:06:41.000000000 +0200 @@ -1,0 +2,4 @@ +Mon Jul 2 09:15:00 UTC 2012 - renda.krell(a)gmail.com +- Crash fix, fixes #bko 302197 and JRE crashes + +------------------------------------------------------------------- New: ---- changeset_rebda9cf5273f62ce226612d3080f49f135f3f2d4.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen-gtk2.spec ++++++ --- /var/tmp/diff_new_pack.qalvPF/_old 2012-07-02 11:06:42.000000000 +0200 +++ /var/tmp/diff_new_pack.qalvPF/_new 2012-07-02 11:06:42.000000000 +0200 @@ -24,6 +24,7 @@ Group: System/GUI/KDE Url: https://projects.kde.org/projects/playground/artwork/oxygen-gtk/ Source0: ftp://ftp.kde.org/pub/kde/stable/oxygen-gtk2/%{version}/src/%{name}-%{versi… +Patch0: changeset_rebda9cf5273f62ce226612d3080f49f135f3f2d4.diff Source100: baselibs.conf BuildRequires: cmake BuildRequires: gcc-c++ @@ -91,6 +92,7 @@ %prep %setup -q +%patch0 %build mkdir -p build ++++++ changeset_rebda9cf5273f62ce226612d3080f49f135f3f2d4.diff ++++++ commit ebda9cf5273f62ce226612d3080f49f135f3f2d4 Author: Hugo Pereira Da Costa <hugo(a)oxygen-icons.org> Date: Fri Jun 22 11:27:45 2012 +0200 Check clipRect validity before altering its width CCBUG: 302197 diff --git a/src/oxygenstylewrapper.cpp b/src/oxygenstylewrapper.cpp index 8795b9d..5fa8fce 100644 --- src/oxygenstylewrapper.cpp +++ src/oxygenstylewrapper.cpp @@ -2178,10 +2178,8 @@ namespace Oxygen } else if( d.isCheck() && ( GTK_IS_CHECK_MENU_ITEM( widget ) || /* for LibreOffice */GTK_IS_MENU_ITEM( widget ) ) ) { // Fix cliprect for LibreOffice - if(GTK_IS_MENU_ITEM(widget)) - { - ++clipRect->width; - } + if( clipRect && GTK_IS_MENU_ITEM(widget)) + { ++clipRect->width; } StyleOptions options( widget, state, shadow ); options |= (Blend|Flat|NoFill); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit osc for openSUSE:12.2
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package osc for openSUSE:12.2 checked in at 2012-07-02 11:05:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/osc (Old) and /work/SRC/openSUSE:12.2/.osc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "osc", Maintainer is "adrian(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.2/osc/osc.changes 2012-06-28 16:31:04.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.osc.new/osc.changes 2012-07-02 11:05:10.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jun 29 08:59:05 UTC 2012 - adrian(a)suse.de + +- update to 0.135.1 + * do not forward submit requests to targets which link to request target + * fix creator name in forwarded message + +------------------------------------------------------------------- Old: ---- osc-0.135.0.tar.gz New: ---- osc-0.135.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc.spec ++++++ --- /var/tmp/diff_new_pack.dKi6Hz/_old 2012-07-02 11:05:10.000000000 +0200 +++ /var/tmp/diff_new_pack.dKi6Hz/_new 2012-07-02 11:05:10.000000000 +0200 @@ -17,7 +17,7 @@ Name: osc -Version: 0.135.0 +Version: 0.135.1 Release: 0 Summary: openSUSE Build Service Commander License: GPL-2.0+ ++++++ _service ++++++ --- /var/tmp/diff_new_pack.dKi6Hz/_old 2012-07-02 11:05:10.000000000 +0200 +++ /var/tmp/diff_new_pack.dKi6Hz/_new 2012-07-02 11:05:10.000000000 +0200 @@ -1,6 +1,6 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="version">0.135.0</param> + <param name="version">0.135.1</param> <param name="url">git://github.com/openSUSE/osc.git</param> <param name="scm">git</param> </service> ++++++ osc-0.135.0.tar.gz -> osc-0.135.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.135.0/NEWS new/osc-0.135.1/NEWS --- old/osc-0.135.0/NEWS 2012-06-28 11:22:35.000000000 +0200 +++ new/osc-0.135.1/NEWS 2012-06-30 11:24:14.000000000 +0200 @@ -1,3 +1,6 @@ +0.135.1 + - do not forward requests to packages which do link anyway to original request target + 0.135 - request accept is offering now to forward submit request if it is a devel area like webui does - support archlinux builds (requires OBS 2.4) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.135.0/osc/commandline.py new/osc-0.135.1/osc/commandline.py --- old/osc-0.135.0/osc/commandline.py 2012-06-28 11:22:35.000000000 +0200 +++ new/osc-0.135.1/osc/commandline.py 2012-06-30 11:24:14.000000000 +0200 @@ -2170,14 +2170,34 @@ for node in root.findall('package'): project = node.get('project') package = node.get('name') + # skip it when this is anyway a link to me + link_url = makeurl(apiurl, ['source', project, package]) + links_to_project = links_to_package = None + try: + file = http_GET(link_url) + root = ET.parse(file).getroot() + link_node = root.find('linkinfo') + if link_node != None: + links_to_project = link_node.get('project') or project + links_to_package = link_node.get('package') or package + except urllib2.HTTPError, e: + if e.code != 404: + print >>sys.stderr, 'Cannot get list of files for %s/%s: %s' % (project, package, e) + except SyntaxError, e: + print >>sys.stderr, 'Cannot parse list of files for %s/%s: %s' % (project, package, e) + if links_to_project==action.tgt_project and links_to_package==action.tgt_package: + # links to my request target anyway, no need to forward submit + continue + print project, if package != action.tgt_package: print "/", package, repl = raw_input('\nForward this submit to it? ([y]/n)') if repl.lower() == 'y' or repl == '': - msg = cgi.escape("%s (forwarded request %s from %s)" % ( rq.description, reqid, rq.get_creator)) + msg = "%s (forwarded request %s from %s)" % ( rq.description, reqid, rq.get_creator()) + print msg rid = create_submit_request(apiurl, action.tgt_project, action.tgt_package, - project, package, msg) + project, package, cgi.escape(msg)) print "New request #", rid # editmeta and its aliases are all depracated diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.135.0/osc/core.py new/osc-0.135.1/osc/core.py --- old/osc-0.135.0/osc/core.py 2012-06-28 11:22:35.000000000 +0200 +++ new/osc-0.135.1/osc/core.py 2012-06-30 11:24:14.000000000 +0200 @@ -1830,7 +1830,7 @@ print print "The link in this package is currently broken. Checking" print "out the last working version instead; please use 'osc pull'" - print "to repair the link." + print "to merge the conflicts." print def unmark_frozen(self): ++++++ osc.dsc ++++++ --- /var/tmp/diff_new_pack.dKi6Hz/_old 2012-07-02 11:05:10.000000000 +0200 +++ /var/tmp/diff_new_pack.dKi6Hz/_new 2012-07-02 11:05:10.000000000 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.135.0 +Version: 0.135.1 Binary: osc Maintainer: Adrian Schroeter <adrian(a)suse.de> Architecture: any -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit osc for openSUSE:Factory
by root＠hilbert.suse.de 02 Jul '12

02 Jul '12

Hello community, here is the log from the commit of package osc for openSUSE:Factory checked in at 2012-07-02 11:05:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osc (Old) and /work/SRC/openSUSE:Factory/.osc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "osc", Maintainer is "adrian(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/osc/osc.changes 2012-06-28 16:30:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.osc.new/osc.changes 2012-07-02 11:05:03.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jun 29 08:59:05 UTC 2012 - adrian(a)suse.de + +- update to 0.135.1 + * do not forward submit requests to targets which link to request target + * fix creator name in forwarded message + +------------------------------------------------------------------- Old: ---- osc-0.135.0.tar.gz New: ---- osc-0.135.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc.spec ++++++ --- /var/tmp/diff_new_pack.EJL1vq/_old 2012-07-02 11:05:05.000000000 +0200 +++ /var/tmp/diff_new_pack.EJL1vq/_new 2012-07-02 11:05:05.000000000 +0200 @@ -17,7 +17,7 @@ Name: osc -Version: 0.135.0 +Version: 0.135.1 Release: 0 Summary: openSUSE Build Service Commander License: GPL-2.0+ ++++++ _service ++++++ --- /var/tmp/diff_new_pack.EJL1vq/_old 2012-07-02 11:05:05.000000000 +0200 +++ /var/tmp/diff_new_pack.EJL1vq/_new 2012-07-02 11:05:05.000000000 +0200 @@ -1,6 +1,6 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="version">0.135.0</param> + <param name="version">0.135.1</param> <param name="url">git://github.com/openSUSE/osc.git</param> <param name="scm">git</param> </service> ++++++ osc-0.135.0.tar.gz -> osc-0.135.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.135.0/NEWS new/osc-0.135.1/NEWS --- old/osc-0.135.0/NEWS 2012-06-28 11:22:35.000000000 +0200 +++ new/osc-0.135.1/NEWS 2012-06-30 11:24:14.000000000 +0200 @@ -1,3 +1,6 @@ +0.135.1 + - do not forward requests to packages which do link anyway to original request target + 0.135 - request accept is offering now to forward submit request if it is a devel area like webui does - support archlinux builds (requires OBS 2.4) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.135.0/osc/commandline.py new/osc-0.135.1/osc/commandline.py --- old/osc-0.135.0/osc/commandline.py 2012-06-28 11:22:35.000000000 +0200 +++ new/osc-0.135.1/osc/commandline.py 2012-06-30 11:24:14.000000000 +0200 @@ -2170,14 +2170,34 @@ for node in root.findall('package'): project = node.get('project') package = node.get('name') + # skip it when this is anyway a link to me + link_url = makeurl(apiurl, ['source', project, package]) + links_to_project = links_to_package = None + try: + file = http_GET(link_url) + root = ET.parse(file).getroot() + link_node = root.find('linkinfo') + if link_node != None: + links_to_project = link_node.get('project') or project + links_to_package = link_node.get('package') or package + except urllib2.HTTPError, e: + if e.code != 404: + print >>sys.stderr, 'Cannot get list of files for %s/%s: %s' % (project, package, e) + except SyntaxError, e: + print >>sys.stderr, 'Cannot parse list of files for %s/%s: %s' % (project, package, e) + if links_to_project==action.tgt_project and links_to_package==action.tgt_package: + # links to my request target anyway, no need to forward submit + continue + print project, if package != action.tgt_package: print "/", package, repl = raw_input('\nForward this submit to it? ([y]/n)') if repl.lower() == 'y' or repl == '': - msg = cgi.escape("%s (forwarded request %s from %s)" % ( rq.description, reqid, rq.get_creator)) + msg = "%s (forwarded request %s from %s)" % ( rq.description, reqid, rq.get_creator()) + print msg rid = create_submit_request(apiurl, action.tgt_project, action.tgt_package, - project, package, msg) + project, package, cgi.escape(msg)) print "New request #", rid # editmeta and its aliases are all depracated diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.135.0/osc/core.py new/osc-0.135.1/osc/core.py --- old/osc-0.135.0/osc/core.py 2012-06-28 11:22:35.000000000 +0200 +++ new/osc-0.135.1/osc/core.py 2012-06-30 11:24:14.000000000 +0200 @@ -1830,7 +1830,7 @@ print print "The link in this package is currently broken. Checking" print "out the last working version instead; please use 'osc pull'" - print "to repair the link." + print "to merge the conflicts." print def unmark_frozen(self): ++++++ osc.dsc ++++++ --- /var/tmp/diff_new_pack.EJL1vq/_old 2012-07-02 11:05:06.000000000 +0200 +++ /var/tmp/diff_new_pack.EJL1vq/_new 2012-07-02 11:05:06.000000000 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.135.0 +Version: 0.135.1 Binary: osc Maintainer: Adrian Schroeter <adrian(a)suse.de> Architecture: any -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0