diff --git a/0.4.14.tar.gz b/0.4.14.tar.gz deleted file mode 100644 index 286742c..0000000 --- a/0.4.14.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6220a6cab837a8996116a0568324cadfd09a07ec16b930d2a330e16d5c2e1eb6 -size 92783 diff --git a/0.4.15.tar.gz b/0.4.15.tar.gz new file mode 100644 index 0000000..d530db2 --- /dev/null +++ b/0.4.15.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18f58b0a0043b6881774187427ead158d310127fc46a1c668ad6d207fb28b4e0 +size 93084 diff --git a/libproxy-plugins.changes b/libproxy-plugins.changes index 5f37431..a8dd978 100644 --- a/libproxy-plugins.changes +++ b/libproxy-plugins.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu May 11 09:36:16 UTC 2017 - dimstar@opensuse.org + +- Update to version 0.4.15: + + Port to, and require, SpiderMonkey 38. + + Fix "NetworkManager plugin not being built" + (gh#libproxy/libproxy#53). + + Fix "networkmanager plugin not working + (gh#libproxy/libproxy#58). + + Fix "Invalid read after free" (gh#libproxy/libproxy#59). + + Fix intermittent unit test failures. +- Replace pkgconfig(mozjs185) buildRequires with + pkgconfig(mozjs-38), following upstream. + ------------------------------------------------------------------- Mon Feb 6 12:30:17 UTC 2017 - dimstar@opensuse.org diff --git a/libproxy-plugins.spec b/libproxy-plugins.spec index 3a7ab23..4495265 100644 --- a/libproxy-plugins.spec +++ b/libproxy-plugins.spec @@ -23,24 +23,24 @@ %else %bcond_with mono %endif - -Url: http://code.google.com/p/libproxy/ %define _name libproxy - -Name: libproxy-plugins -Summary: Libproxy provides consistent proxy configuration to applications -License: GPL-2.0+ and LGPL-2.1+ -Group: System/Libraries -Version: 0.4.14 -Release: 0 %if 0%{?build_snapshot} %define _sourcename %{_name} %else %define _sourcename %{_name}-%{version} %endif +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%{!?_assemblies_dir: %global _assemblies_dir %(pkg-config cecil --variable=assemblies_dir)} +Name: libproxy-plugins +Version: 0.4.15 +Release: 0 +Summary: Libproxy provides consistent proxy configuration to applications +License: GPL-2.0+ AND LGPL-2.1+ +Group: System/Libraries +Url: http://code.google.com/p/libproxy/ Source: https://github.com/libproxy/%{_name}/archive/%{version}.tar.gz Source99: baselibs.conf -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libmodman-devel @@ -50,11 +50,15 @@ BuildRequires: pkgconfig BuildRequires: zlib-devel %if !%{build_core_not_modules} %if ! 0%{?windows} +BuildRequires: NetworkManager-devel BuildRequires: dbus-1-devel BuildRequires: gconf2-devel # For directory ownership, but also because we want to rebuild the modules if # the library changed BuildRequires: libproxy1 = %{version} +BuildRequires: perl +BuildRequires: python-devel +BuildRequires: python3-devel %if 0%{?favor_gtk2} BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gobject-2.0) @@ -64,26 +68,18 @@ BuildRequires: pkgconfig(gio-2.0) >= 2.26 BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(javascriptcoregtk-4.0) %endif -BuildRequires: NetworkManager-devel %if 0%{?is_opensuse} BuildRequires: libKF5ConfigCore5 %endif %if %{build_mozjs} -BuildRequires: pkgconfig(mozjs185) +BuildRequires: pkgconfig(mozjs-38) %endif %if %{with mono} BuildRequires: mono-devel %endif -BuildRequires: perl -BuildRequires: python-devel -BuildRequires: python3-devel %endif %endif -%{!?python_sitelib: %global python_sitelib %(%__python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python_sitearch: %global python_sitearch %(%__python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} -%{!?_assemblies_dir: %global _assemblies_dir %(pkg-config cecil --variable=assemblies_dir)} - %description libproxy offers the following features: * extremely small core footprint (< 35K) @@ -94,9 +90,7 @@ libproxy offers the following features: * extremely small core * dynamic adjustment to changing network topology * a standard way of dealing with proxy settings across all scenarios - %if %build_core_not_modules - %package tools Summary: A simple application using libproxy Group: System/Libraries @@ -107,7 +101,6 @@ A simple application that will use libproxy to give the results you can expect from other applications. It can be used to debug what would happen in various cases. - %package devel Summary: Libproxy provides consistent proxy configuration to applications - Development Files Group: Development/Libraries/C and C++ @@ -123,7 +116,6 @@ libproxy offers the following features: * extremely small core * dynamic adjustment to changing network topology * a standard way of dealing with proxy settings across all scenarios - %package -n libproxy1 Summary: Libproxy provides consistent proxy configuration to applications Group: System/Libraries @@ -142,20 +134,17 @@ libproxy offers the following features: * extremely small core * a standard way of dealing with proxy settings across all scenarios %else - %if 0%{?favor_gtk2} - %package -n libproxy1-config-gnome - Summary: Libproxy module for GNOME configuration Group: System/Libraries %else - %package -n libproxy1-config-gnome3 Summary: Libproxy module for GNOME3 configuration Group: System/Libraries %endif Requires: libproxy1 = %{version} + %if 0%{?suse_version} Recommends: libproxy1-pacrunner = %{version} %if 0%{?favor_gtk2} @@ -170,11 +159,9 @@ Provides: libproxy-gnome = %{version} Obsoletes: libproxy-gnome < %{version} %if 0%{?favor_gtk2} - %description -n libproxy1-config-gnome %else - %description -n libproxy1-config-gnome3 %endif @@ -184,9 +171,13 @@ proxy settings. %package -n libproxy1-config-kde Summary: Libproxy module for KDE configuration Group: System/Libraries -Requires: libproxy1 = %{version} # We don't really need the library, but this package brings kreadconfig5 Requires: libKF5ConfigCore5 +Requires: libproxy1 = %{version} +Provides: libproxy-kde = %{version} +Obsoletes: libproxy-kde < %{version} +# A generic KDE config loader was introduced in 0.4.12 +Obsoletes: libproxy1-config-kde4 < 0.4.12 # The kde plugin requires 'qtpaths', which is part of libqt5-qtpaths in TW / libqt5-qttools in older releases %if %{?suse_version} > 1320 Requires: libqt5-qtpaths @@ -200,10 +191,6 @@ Supplements: packageand(libproxy1:plasma5-session) %else Requires: libproxy1-pacrunner = %{version} %endif -Provides: libproxy-kde = %{version} -Obsoletes: libproxy-kde < %{version} -# A generic KDE config loader was introduced in 0.4.12 -Obsoletes: libproxy1-config-kde4 < 0.4.12 %description -n libproxy1-config-kde A module to extend libproxy with capabilities to query KDE4 about proxy @@ -214,11 +201,11 @@ settings. Summary: Libproxy module to support wpad/pac parsing via Mozilla JavaScript Engine Group: System/Libraries Requires: libproxy1 = %{version} +# A virtual symbol to identify that this is a pacrunner. +Provides: libproxy1-pacrunner = %{version} %if 0%{?suse_version} Supplements: packageand(libproxy1:libmozjs185-1_0) %endif -# A virtual symbol to identify that this is a pacrunner. -Provides: libproxy1-pacrunner = %{version} %description -n libproxy1-pacrunner-mozjs A module to extend libproxy with capabilities to pass addresses to a @@ -229,6 +216,8 @@ WPAD/PAC script and have it find the correct proxy. Summary: Libproxy module to support WPAD/PAC parsing via WebKit JavaScript Engine Group: System/Libraries Requires: libproxy1 = %{version} +# A virtual symbol to identify that this is a pacrunner. +Provides: libproxy1-pacrunner = %{version} %if 0%{?suse_version} %if 0%{?favor_gtk2} Supplements: packageand(libproxy1:libjavascriptcoregtk-1_0-0) @@ -236,8 +225,6 @@ Supplements: packageand(libproxy1:libjavascriptcoregtk-1_0-0) Supplements: packageand(libproxy1:libjavascriptcoregtk-3_0-0) %endif %endif -# A virtual symbol to identify that this is a pacrunner. -Provides: libproxy1-pacrunner = %{version} %description -n libproxy1-pacrunner-webkit A module to extend libproxy with capabilities to pass addresses to a @@ -258,10 +245,10 @@ about network configuration changes. %package -n python3-libproxy Summary: Python3 bindings for libproxy Group: System/Libraries +Requires: libproxy1 = %{version} %if 0%{?suse_version} > 1110 BuildArch: noarch %endif -Requires: libproxy1 = %{version} %description -n python3-libproxy libproxy offers the following features: * extremely small core @@ -276,11 +263,11 @@ libproxy offers the following features: * extremely small core %package -n python-libproxy Summary: Python bindings for libproxy Group: System/Libraries +Requires: libproxy1 = %{version} %if 0%{?suse_version} > 1110 BuildArch: noarch %py_requires %endif -Requires: libproxy1 = %{version} %description -n python-libproxy libproxy offers the following features: * extremely small core @@ -314,7 +301,6 @@ libproxy offers the following features: * extremely small core * a standard way of dealing with proxy settings across all scenarios %if %{with mono} - %package -n libproxy-sharp Summary: .Net bindings for libproxy Group: Development/Languages/Mono @@ -393,7 +379,7 @@ cmake \ -DWITH_GNOME3=ON \ %endif .. -%{__make} VERBOSE=1 +make VERBOSE=1 %install cd build @@ -426,7 +412,6 @@ cd build make test %if %build_core_not_modules - %post -n libproxy1 -p /sbin/ldconfig %postun -n libproxy1 -p /sbin/ldconfig @@ -460,7 +445,6 @@ make test %endif %else - %if ! 0%{?windows} %if 0%{?is_opensuse} %files -n libproxy1-config-kde @@ -469,13 +453,11 @@ make test %endif %if 0%{?favor_gtk2} - %files -n libproxy1-config-gnome %defattr(-, root, root) %{_libdir}/libproxy-%{version}/modules/config_gnome.so %{_libexecdir}/libproxy-%{version}/pxgconf %else - %files -n libproxy1-config-gnome3 %defattr(-, root, root) %{_libdir}/libproxy-%{version}/modules/config_gnome3.so @@ -513,7 +495,6 @@ make test %{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so %if %{with mono} - %files -n libproxy-sharp %defattr(-, root, root) %{_assemblies_dir}/gac/libproxy-sharp diff --git a/libproxy.changes b/libproxy.changes index 5f37431..a8dd978 100644 --- a/libproxy.changes +++ b/libproxy.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu May 11 09:36:16 UTC 2017 - dimstar@opensuse.org + +- Update to version 0.4.15: + + Port to, and require, SpiderMonkey 38. + + Fix "NetworkManager plugin not being built" + (gh#libproxy/libproxy#53). + + Fix "networkmanager plugin not working + (gh#libproxy/libproxy#58). + + Fix "Invalid read after free" (gh#libproxy/libproxy#59). + + Fix intermittent unit test failures. +- Replace pkgconfig(mozjs185) buildRequires with + pkgconfig(mozjs-38), following upstream. + ------------------------------------------------------------------- Mon Feb 6 12:30:17 UTC 2017 - dimstar@opensuse.org diff --git a/libproxy.spec b/libproxy.spec index 1310368..b96a0b2 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -23,24 +23,24 @@ %else %bcond_with mono %endif - -Url: http://code.google.com/p/libproxy/ %define _name libproxy - -Name: libproxy -Summary: Libproxy provides consistent proxy configuration to applications -License: GPL-2.0+ and LGPL-2.1+ -Group: System/Libraries -Version: 0.4.14 -Release: 0 %if 0%{?build_snapshot} %define _sourcename %{_name} %else %define _sourcename %{_name}-%{version} %endif +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%{!?_assemblies_dir: %global _assemblies_dir %(pkg-config cecil --variable=assemblies_dir)} +Name: libproxy +Version: 0.4.15 +Release: 0 +Summary: Libproxy provides consistent proxy configuration to applications +License: GPL-2.0+ AND LGPL-2.1+ +Group: System/Libraries +Url: http://code.google.com/p/libproxy/ Source: https://github.com/libproxy/%{_name}/archive/%{version}.tar.gz Source99: baselibs.conf -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libmodman-devel @@ -50,11 +50,15 @@ BuildRequires: pkgconfig BuildRequires: zlib-devel %if !%{build_core_not_modules} %if ! 0%{?windows} +BuildRequires: NetworkManager-devel BuildRequires: dbus-1-devel BuildRequires: gconf2-devel # For directory ownership, but also because we want to rebuild the modules if # the library changed BuildRequires: libproxy1 = %{version} +BuildRequires: perl +BuildRequires: python-devel +BuildRequires: python3-devel %if 0%{?favor_gtk2} BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gobject-2.0) @@ -64,26 +68,18 @@ BuildRequires: pkgconfig(gio-2.0) >= 2.26 BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(javascriptcoregtk-4.0) %endif -BuildRequires: NetworkManager-devel %if 0%{?is_opensuse} BuildRequires: libKF5ConfigCore5 %endif %if %{build_mozjs} -BuildRequires: pkgconfig(mozjs185) +BuildRequires: pkgconfig(mozjs-38) %endif %if %{with mono} BuildRequires: mono-devel %endif -BuildRequires: perl -BuildRequires: python-devel -BuildRequires: python3-devel %endif %endif -%{!?python_sitelib: %global python_sitelib %(%__python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python_sitearch: %global python_sitearch %(%__python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} -%{!?_assemblies_dir: %global _assemblies_dir %(pkg-config cecil --variable=assemblies_dir)} - %description libproxy offers the following features: * extremely small core footprint (< 35K) @@ -94,9 +90,7 @@ libproxy offers the following features: * extremely small core * dynamic adjustment to changing network topology * a standard way of dealing with proxy settings across all scenarios - %if %build_core_not_modules - %package tools Summary: A simple application using libproxy Group: System/Libraries @@ -107,7 +101,6 @@ A simple application that will use libproxy to give the results you can expect from other applications. It can be used to debug what would happen in various cases. - %package devel Summary: Libproxy provides consistent proxy configuration to applications - Development Files Group: Development/Libraries/C and C++ @@ -123,7 +116,6 @@ libproxy offers the following features: * extremely small core * dynamic adjustment to changing network topology * a standard way of dealing with proxy settings across all scenarios - %package -n libproxy1 Summary: Libproxy provides consistent proxy configuration to applications Group: System/Libraries @@ -142,20 +134,17 @@ libproxy offers the following features: * extremely small core * a standard way of dealing with proxy settings across all scenarios %else - %if 0%{?favor_gtk2} - %package -n libproxy1-config-gnome - Summary: Libproxy module for GNOME configuration Group: System/Libraries %else - %package -n libproxy1-config-gnome3 Summary: Libproxy module for GNOME3 configuration Group: System/Libraries %endif Requires: libproxy1 = %{version} + %if 0%{?suse_version} Recommends: libproxy1-pacrunner = %{version} %if 0%{?favor_gtk2} @@ -170,11 +159,9 @@ Provides: libproxy-gnome = %{version} Obsoletes: libproxy-gnome < %{version} %if 0%{?favor_gtk2} - %description -n libproxy1-config-gnome %else - %description -n libproxy1-config-gnome3 %endif @@ -184,9 +171,13 @@ proxy settings. %package -n libproxy1-config-kde Summary: Libproxy module for KDE configuration Group: System/Libraries -Requires: libproxy1 = %{version} # We don't really need the library, but this package brings kreadconfig5 Requires: libKF5ConfigCore5 +Requires: libproxy1 = %{version} +Provides: libproxy-kde = %{version} +Obsoletes: libproxy-kde < %{version} +# A generic KDE config loader was introduced in 0.4.12 +Obsoletes: libproxy1-config-kde4 < 0.4.12 # The kde plugin requires 'qtpaths', which is part of libqt5-qtpaths in TW / libqt5-qttools in older releases %if %{?suse_version} > 1320 Requires: libqt5-qtpaths @@ -200,10 +191,6 @@ Supplements: packageand(libproxy1:plasma5-session) %else Requires: libproxy1-pacrunner = %{version} %endif -Provides: libproxy-kde = %{version} -Obsoletes: libproxy-kde < %{version} -# A generic KDE config loader was introduced in 0.4.12 -Obsoletes: libproxy1-config-kde4 < 0.4.12 %description -n libproxy1-config-kde A module to extend libproxy with capabilities to query KDE4 about proxy @@ -214,11 +201,11 @@ settings. Summary: Libproxy module to support wpad/pac parsing via Mozilla JavaScript Engine Group: System/Libraries Requires: libproxy1 = %{version} +# A virtual symbol to identify that this is a pacrunner. +Provides: libproxy1-pacrunner = %{version} %if 0%{?suse_version} Supplements: packageand(libproxy1:libmozjs185-1_0) %endif -# A virtual symbol to identify that this is a pacrunner. -Provides: libproxy1-pacrunner = %{version} %description -n libproxy1-pacrunner-mozjs A module to extend libproxy with capabilities to pass addresses to a @@ -229,6 +216,8 @@ WPAD/PAC script and have it find the correct proxy. Summary: Libproxy module to support WPAD/PAC parsing via WebKit JavaScript Engine Group: System/Libraries Requires: libproxy1 = %{version} +# A virtual symbol to identify that this is a pacrunner. +Provides: libproxy1-pacrunner = %{version} %if 0%{?suse_version} %if 0%{?favor_gtk2} Supplements: packageand(libproxy1:libjavascriptcoregtk-1_0-0) @@ -236,8 +225,6 @@ Supplements: packageand(libproxy1:libjavascriptcoregtk-1_0-0) Supplements: packageand(libproxy1:libjavascriptcoregtk-3_0-0) %endif %endif -# A virtual symbol to identify that this is a pacrunner. -Provides: libproxy1-pacrunner = %{version} %description -n libproxy1-pacrunner-webkit A module to extend libproxy with capabilities to pass addresses to a @@ -258,10 +245,10 @@ about network configuration changes. %package -n python3-libproxy Summary: Python3 bindings for libproxy Group: System/Libraries +Requires: libproxy1 = %{version} %if 0%{?suse_version} > 1110 BuildArch: noarch %endif -Requires: libproxy1 = %{version} %description -n python3-libproxy libproxy offers the following features: * extremely small core @@ -276,11 +263,11 @@ libproxy offers the following features: * extremely small core %package -n python-libproxy Summary: Python bindings for libproxy Group: System/Libraries +Requires: libproxy1 = %{version} %if 0%{?suse_version} > 1110 BuildArch: noarch %py_requires %endif -Requires: libproxy1 = %{version} %description -n python-libproxy libproxy offers the following features: * extremely small core @@ -314,7 +301,6 @@ libproxy offers the following features: * extremely small core * a standard way of dealing with proxy settings across all scenarios %if %{with mono} - %package -n libproxy-sharp Summary: .Net bindings for libproxy Group: Development/Languages/Mono @@ -393,7 +379,7 @@ cmake \ -DWITH_GNOME3=ON \ %endif .. -%{__make} VERBOSE=1 +make VERBOSE=1 %install cd build @@ -426,7 +412,6 @@ cd build make test %if %build_core_not_modules - %post -n libproxy1 -p /sbin/ldconfig %postun -n libproxy1 -p /sbin/ldconfig @@ -460,7 +445,6 @@ make test %endif %else - %if ! 0%{?windows} %if 0%{?is_opensuse} %files -n libproxy1-config-kde @@ -469,13 +453,11 @@ make test %endif %if 0%{?favor_gtk2} - %files -n libproxy1-config-gnome %defattr(-, root, root) %{_libdir}/libproxy-%{version}/modules/config_gnome.so %{_libexecdir}/libproxy-%{version}/pxgconf %else - %files -n libproxy1-config-gnome3 %defattr(-, root, root) %{_libdir}/libproxy-%{version}/modules/config_gnome3.so @@ -513,7 +495,6 @@ make test %{perl_vendorarch}/auto/Net/Libproxy/Libproxy.so %if %{with mono} - %files -n libproxy-sharp %defattr(-, root, root) %{_assemblies_dir}/gac/libproxy-sharp