Hello community, here is the log from the commit of package libproxy for openSUSE:11.4 checked in at Fri Aug 19 15:20:09 CEST 2011.
-------- --- old-versions/11.4/all/libproxy/libproxy-plugins.changes 2011-02-18 14:43:33.000000000 +0100 +++ 11.4/libproxy/libproxy-plugins.changes 2011-08-08 17:41:48.000000000 +0200 @@ -1,0 +2,26 @@ +Mon Aug 8 15:29:41 UTC 2011 - [email protected] + +- Add libproxy-trim-ignores.patch: Trim strings in ignore list. + Fix bnc#679322. + +------------------------------------------------------------------- +Wed Jun 22 19:08:18 UTC 2011 - [email protected] + +- Update to version 0.4.7 (for bnc#701059): + + Support/require xulrunner 2.0+ + + Support linking againgst libwebkit-gtk3 (-DWITH_WEBKIT3=ON) + + Port to gsettings for gnome3. (-DWITH_GNOME3=ON[default]) + + Issues closed: + - #149: always test for the right python noarch module path + - #155: Cannot compile with Firefox 4 + - #156: libproxy should build against webkitgtk-3.0 + - #158: Won't compile w/ xulrunner 2.0 final + - #159: libproxy fails with autoconfiguration + "http://proxy.domain.com"; + - #131: GSettings-based GNOME plugin + - #150: SUSE sysconfig/proxy config support +- Build gnome2 module and webkitgtk linked against gtk2. + -DWITH_GNOME3=OFF + -DWITH_WEBKIGTK3=OFF + +------------------------------------------------------------------- libproxy.changes: same change Package does not exist at destination yet. Using Fallback old-versions/11.4/all/libproxy Destination is old-versions/11.4/UPDATES/all/libproxy calling whatdependson for 11.4-i586 Old: ---- libproxy-0.4.6.tar.bz2 libproxy-backports.patch libproxy-sysconfig-support.patch libproxy-xul2.patch New: ---- libproxy-0.4.7.tar.gz libproxy-trim-ignores.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libproxy-plugins.spec ++++++ --- /var/tmp/diff_new_pack.t4S5ks/_old 2011-08-19 15:19:19.000000000 +0200 +++ /var/tmp/diff_new_pack.t4S5ks/_new 2011-08-19 15:19:19.000000000 +0200 @@ -42,23 +42,19 @@ Name: libproxy-plugins Group: System/Libraries Summary: Libproxy provides consistent proxy configuration to applications -Version: 0.4.6 +Version: 0.4.7 Release: 3.<RELEASE2> %if 0%{?build_snapshot} %define _sourcename %{_name} %else %define _sourcename %{_name}-%{version} %endif -Source: http://libproxy.googlecode.com/files/%{_sourcename}.tar.bz2 +Source: http://libproxy.googlecode.com/files/%{_sourcename}.tar.gz # Script used for automatic snapshot updates Source98: update-from-svn.sh Source99: baselibs.conf -# PATCH-FEATURE-UPSTREAM libproxy-sysconfig-support.patch bnc#655483 [email protected] -- Add /etc/sysconfig support. Also tracked at http://code.google.com/p/libproxy/issues/detail?id=150 -Patch0: libproxy-sysconfig-support.patch -# PATCH-FEATURE-UPSTREAM libproxy-xul2.patch [email protected] -- Add compatibility to build against xulrunner 2.0 -Patch1: libproxy-xul2.patch -# PATCH-FIX-UPSTREAM libproxy-backports.patch [email protected] -- Backport from upstream source: svn revs: 769,771,776,777,778,780,781,782 -Patch2: libproxy-backports.patch +# PATCH-FIX-UPSTREAM libproxy-trim-ignores.patch bnc#679322 [email protected] -- Trim strings in ignore list. +Patch0: libproxy-trim-ignores.patch License: GPLv2+ ; LGPLv2.1+ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake @@ -109,6 +105,7 @@ %if %build_core_not_modules %package tools + License: GPLv2+ ; LGPLv2.1+ Summary: A simple application using libproxy Group: System/Libraries @@ -121,6 +118,7 @@ %package devel + License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy provides consistent proxy configuration to applications - Development Files Group: Development/Libraries/C and C++ @@ -138,6 +136,7 @@ %package -n libproxy1 + License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy provides consistent proxy configuration to applications Group: System/Libraries @@ -153,6 +152,7 @@ * a standard way of dealing with proxy settings across all scenarios %package -n python-libproxy + License: GPLv2+ ; LGPLv2.1+ Summary: Python bindings for libproxy Group: System/Libraries @@ -174,6 +174,7 @@ %package -n perl-Net-Libproxy + License: GPLv2+ ; LGPLv2.1+ Summary: Perl bindings for libproxy Group: Development/Libraries/Perl @@ -194,6 +195,7 @@ %if 0%{?have_mono} %package -n libproxy-sharp + License: GPLv2+ ; LGPLv2.1+ Summary: .Net bindings for libproxy Group: Development/Languages/Mono @@ -213,6 +215,7 @@ %else %package -n libproxy1-config-gnome + License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for GNOME configuration Group: System/Libraries @@ -232,6 +235,7 @@ %package -n libproxy1-config-kde4 + License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for KDE configuration Group: System/Libraries @@ -251,6 +255,7 @@ %package -n libproxy1-pacrunner-mozjs + License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module to support wpad/pac parsing via Mozilla JavaScript Engine Group: System/Libraries @@ -267,6 +272,7 @@ %package -n libproxy1-pacrunner-webkit + License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module to support WPAD/PAC parsing via WebKit JavaScript Engine Group: System/Libraries @@ -282,6 +288,7 @@ WPAD/PAC script and have it find the correct proxy. %package -n libproxy1-networkmanager + License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for NetworkManager configuration Group: System/Libraries @@ -298,10 +305,8 @@ %prep %setup -q -n %{_sourcename} -mkdir build %patch0 -p0 -%patch1 -p0 -%patch2 -p0 +mkdir build %build cd build @@ -322,6 +327,8 @@ -DWITH_VALA=yes \ -DWITH_DOTNET=%{have_mono} \ -DFORCE_SYSTEM_LIBMODMAN=ON \ + -DWITH_GNOME3=OFF \ + -DWITH_WEBKIGTK3=OFF \ %endif -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DBIN_INSTALL_DIR=%{_bindir} \ ++++++ libproxy.spec ++++++ --- /var/tmp/diff_new_pack.t4S5ks/_old 2011-08-19 15:19:19.000000000 +0200 +++ /var/tmp/diff_new_pack.t4S5ks/_new 2011-08-19 15:19:19.000000000 +0200 @@ -42,23 +42,19 @@ Name: libproxy Group: System/Libraries Summary: Libproxy provides consistent proxy configuration to applications -Version: 0.4.6 -Release: 6.<RELEASE3> +Version: 0.4.7 +Release: 6.<RELEASE2> %if 0%{?build_snapshot} %define _sourcename %{_name} %else %define _sourcename %{_name}-%{version} %endif -Source: http://libproxy.googlecode.com/files/%{_sourcename}.tar.bz2 +Source: http://libproxy.googlecode.com/files/%{_sourcename}.tar.gz # Script used for automatic snapshot updates Source98: update-from-svn.sh Source99: baselibs.conf -# PATCH-FEATURE-UPSTREAM libproxy-sysconfig-support.patch bnc#655483 [email protected] -- Add /etc/sysconfig support. Also tracked at http://code.google.com/p/libproxy/issues/detail?id=150 -Patch0: libproxy-sysconfig-support.patch -# PATCH-FEATURE-UPSTREAM libproxy-xul2.patch [email protected] -- Add compatibility to build against xulrunner 2.0 -Patch1: libproxy-xul2.patch -# PATCH-FIX-UPSTREAM libproxy-backports.patch [email protected] -- Backport from upstream source: svn revs: 769,771,776,777,778,780,781,782 -Patch2: libproxy-backports.patch +# PATCH-FIX-UPSTREAM libproxy-trim-ignores.patch bnc#679322 [email protected] -- Trim strings in ignore list. +Patch0: libproxy-trim-ignores.patch License: GPLv2+ ; LGPLv2.1+ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake @@ -213,6 +209,7 @@ %else %package -n libproxy1-config-gnome + License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for GNOME configuration Group: System/Libraries @@ -232,6 +229,7 @@ %package -n libproxy1-config-kde4 + License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for KDE configuration Group: System/Libraries @@ -251,6 +249,7 @@ %package -n libproxy1-pacrunner-mozjs + License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module to support wpad/pac parsing via Mozilla JavaScript Engine Group: System/Libraries @@ -267,6 +266,7 @@ %package -n libproxy1-pacrunner-webkit + License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module to support WPAD/PAC parsing via WebKit JavaScript Engine Group: System/Libraries @@ -282,6 +282,7 @@ WPAD/PAC script and have it find the correct proxy. %package -n libproxy1-networkmanager + License: GPLv2+ ; LGPLv2.1+ Summary: Libproxy module for NetworkManager configuration Group: System/Libraries @@ -298,10 +299,8 @@ %prep %setup -q -n %{_sourcename} -mkdir build %patch0 -p0 -%patch1 -p0 -%patch2 -p0 +mkdir build %build cd build @@ -322,6 +321,8 @@ -DWITH_VALA=yes \ -DWITH_DOTNET=%{have_mono} \ -DFORCE_SYSTEM_LIBMODMAN=ON \ + -DWITH_GNOME3=OFF \ + -DWITH_WEBKIGTK3=OFF \ %endif -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DBIN_INSTALL_DIR=%{_bindir} \ ++++++ libproxy-trim-ignores.patch ++++++ Index: libproxy/proxy.cpp =================================================================== --- libproxy/proxy.cpp (revision 819) +++ libproxy/proxy.cpp (working copy) @@ -268,6 +268,7 @@ if (next == string::npos) next = confign.length(); if (next > (i+1)) { string ignorestr = confign.substr (i, next - i); + ignorestr = ignorestr.substr(ignorestr.find_first_not_of(" \t\n"), ignorestr.find_last_not_of(" \t\n")+1); for (vector<ignore_extension*>::iterator it=ignores.begin() ; it != ignores.end() && !ignored ; it++) ignored = ((*it)->ignore(*realurl, ignorestr)); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
