.gear/rules | 2 + .../tags/ac3174c070a77b57d56f9e5302527f40a338a6a9 | 6 + .gear/tags/list | 1 + .gear/upstream/remotes | 3 + libproxy.spec | 296 +++++++++++++++++++++ src/backend/px-manager.c | 6 + src/tools/meson.build | 3 +- 7 files changed, 316 insertions(+), 1 deletion(-) diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 0000000..4fcfd99 --- /dev/null +++ b/.gear/rules @@ -0,0 +1,2 @@ +tar: @version@:. +diff: @version@:. . diff --git a/.gear/tags/ac3174c070a77b57d56f9e5302527f40a338a6a9 b/.gear/tags/ac3174c070a77b57d56f9e5302527f40a338a6a9 new file mode 100644 index 0000000..244b9e3 --- /dev/null +++ b/.gear/tags/ac3174c070a77b57d56f9e5302527f40a338a6a9 @@ -0,0 +1,6 @@ +object e4f467b05c8adf25e5a2d5464914fc7e92bb7990 +type commit +tag 0.5.2 +tagger Jan-Michael Brummer 1686927674 +0200 + +0.5.2 diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 0000000..0b2702d --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1 @@ +ac3174c070a77b57d56f9e5302527f40a338a6a9 0.5.2 diff --git a/.gear/upstream/remotes b/.gear/upstream/remotes new file mode 100644 index 0000000..b5a6ed1 --- /dev/null +++ b/.gear/upstream/remotes @@ -0,0 +1,3 @@ +[remote "upstream"] + url = https://github.com/libproxy/libproxy.git + fetch = +refs/heads/*:refs/remotes/upstream/* diff --git a/libproxy.spec b/libproxy.spec new file mode 100644 index 0000000..0751ce3 --- /dev/null +++ b/libproxy.spec @@ -0,0 +1,296 @@ +%define _unpackaged_files_terminate_build 1 + +%def_with curl +%def_with gnome +%def_with kde +%def_with env +%def_with sysconfig +%def_with duktape + +Name: libproxy +Version: 0.5.2 +Release: alt1 +Summary: A library that provides automatic proxy configuration management + +Group: System/Libraries +License: GPL-2.0-or-later AND LGPL-2.1-or-later +Url: http://libproxy.github.io/libproxy +Vcs: https://github.com/libproxy/libproxy.git +Source: %name-%version.tar +Patch: %name-%version-%release.patch + +BuildRequires(pre): rpm-macros-meson +BuildRequires: meson >= 0.59.0 rpm-build-vala vala-tools rpm-build-gir gir(Gio) = 2.0 +BuildRequires: pkgconfig(glib-2.0) >= 2.71.3 pkgconfig(gio-2.0) >= 2.71.3 +BuildRequires: gi-docgen +%{?_with_curl:BuildRequires: pkgconfig(libcurl)} +%{?_with_gnome:BuildRequires: pkgconfig(gsettings-desktop-schemas)} +%{?_with_duktape:BuildRequires: pkgconfig(duktape)} + +Provides: %name-gnome = %EVR +Obsoletes: %name-gnome < 0.5.0 +Provides: %name-gnome3 = %EVR +Obsoletes: %name-gnome3 < 0.5.0 +Provides: %name-kde = %EVR +Obsoletes: %name-kde < 0.5.0 +Provides: %name-kde4 = %EVR +Obsoletes: %name-kde4 < 0.5.0 +Provides: %name-mozjs = %EVR +Obsoletes: %name-mozjs < 0.5.0 +Provides: %name-webkit = %EVR +Obsoletes: %name-webkit < 0.5.0 +Provides: %name-networkmanager = %EVR +Obsoletes: %name-networkmanager < 0.5.0 + +%description +libproxy is a library that provides automatic proxy configuration management. + +libproxy offers the following features: +- support for all major platforms: Windows, Mac and Linux/UNIX +- extremely small core footprint +- minimal dependencies within libproxy core +- only 4 functions in the stable-ish external API +- dynamic adjustment to changing network topology +- a standard way of dealing with proxy settings across all scenarios +- a sublime sense of joy and accomplishment + +%package tools +Summary: A sample & test application to test what libproxy will reply +Group: Networking/Other +Requires: %name = %version-%release + +%description tools +A simple application that will use libproxy to give the results you can expect from. +other applications. Great to debug what would happen. + +%package gir +Summary: GObject introspection data for the %name library +Group: System/Libraries +Requires: %name = %version-%release + +%description gir +GObject introspection data for the %name library. + +%package devel +Summary: Development files for %name +Group: Development/C +Requires: %name = %version-%release + +%description devel +The %name-devel package contains libraries and header files for +developing applications that use %name. + +%package devel-doc +Summary: Development docs package for %name libraries +Group: Development/Documentation +BuildArch: noarch +Conflicts: %name < %version + +%description devel-doc +Development docs package for %name libraries. + +%prep +%setup -q +%patch -p1 + +%build +%meson \ + %{?_without_curl:-Dcurl=false} \ + %{?_without_gnome:-Dconfig-gnome=false} \ + %{?_without_kde:-Dconfig-kde=false} \ + %{?_without_env:-Dconfig-env=false} \ + %{?_without_sysconfig:-Dconfig-sysconfig=false} \ + %{?_without_duktape:-Dpacrunner-duktape=false} \ + -Dconfig-windows=false \ + -Dconfig-osx=false + +%meson_build + +%install +%meson_install + +%check +%meson_test + +%files +%doc README.md +%_libdir/*.so.* +%_libdir/%name + +%files tools +%_bindir/proxy +%_man8dir/proxy.* + +%files gir +%_typelibdir/*.typelib + +%files devel +%_includedir/* +%_libdir/*.so +%_pkgconfigdir/*.pc +%_girdir/*.gir +%_vapidir/libproxy-1.0.* + +%files devel-doc +%_defaultdocdir/libproxy-1.0 + +%changelog +* Mon Jul 03 2023 Alexey Shabalin 0.5.2-alt1 +- 0.5.2 + +* Thu Sep 29 2022 Alexey Shabalin 0.4.18-alt1 +- 0.4.18 + +* Wed Mar 23 2022 Alexey Shabalin 0.4.17-alt2 +- Support Python 3.10 and above +- Use kf5-config instead of qtpaths + +* Tue Apr 27 2021 Arseny Maslennikov 0.4.17-alt1.1 +- NMU: spec: adapted to new cmake macros. + +* Tue Jan 19 2021 Alexey Shabalin 0.4.17-alt1 +- 0.4.17 +- Build withot pacrunner mozjs. + +* Wed Nov 11 2020 Aleksei Nikiforov 0.4.15-alt5 +- Fixed python2 and python3 switches. + +* Wed Nov 11 2020 Aleksei Nikiforov 0.4.15-alt4 +- Applied security fixes from upstream (Fixes: CVE-2020-25219, CVE-2020-26154) + +* Fri Apr 03 2020 Igor Vlasenko 0.4.15-alt3.1 +- NMU: applied logoved fixes + +* Sat Apr 20 2019 Alexey Shabalin 0.4.15-alt3 +- fixed build with python-3.7 +- build with mozjs-60 + +* Wed Oct 03 2018 Alexey Shabalin 0.4.15-alt2 +- backport patches for build with mozjs-52 + +* Fri Jun 16 2017 Alexey Shabalin 0.4.15-alt1 +- 0.4.15 + +* Fri Jan 20 2017 Alexey Shabalin 0.4.14-alt1 +- 0.4.14 +- add python3 package + +* Tue Jun 14 2016 Alexey Shabalin 0.4.13-alt1 +- 0.4.13 + +* Wed Mar 16 2016 Alexey Shabalin 0.4.12-alt1 +- 0.4.12 + +* Tue Jan 29 2013 Alexey Shabalin 0.4.11-alt1 +- 0.4.11 + +* Fri Oct 26 2012 Alexey Shabalin 0.4.10-alt1 +- 0.4.10 + +* Tue Jan 17 2012 Alexey Shabalin 0.4.7-alt3 +- disable build with RPATH + +* Mon Oct 31 2011 Vitaly Kuznetsov 0.4.7-alt2.1 +- Rebuild with Python-2.7 + +* Mon Oct 24 2011 Alexey Shabalin 0.4.7-alt2 +- build svn snapshot (20110903) +- rebuild with new libwebkitgtk-1.6.1 +- build with libmozjs + +* Mon Aug 22 2011 Alexey Shabalin 0.4.7-alt1 +- 0.4.7 +- build without mozjs support +- build without gnome and webkitgtk support (but with gnome3 and webkitgtk3) + +* Thu May 05 2011 Alexey Shabalin 0.4.6-alt3 +- pre 0.4.7 +- add gnome3 subpackage +- build gnome2 and gnome3 support +- build python binding as noarch +- build with xulrunner-2.0 + +* Fri Oct 08 2010 Alexey Shabalin 0.4.6-alt2 +- rebuild with new libwebkitgtk + +* Tue Oct 05 2010 Alexey Shabalin 0.4.6-alt1 +- 0.4.6 +- run tests + +* Wed May 19 2010 Alexey Shabalin 0.4.1-alt1 +- 0.4.1 + +* Fri May 07 2010 Alexey Shabalin 0.4.0-alt3 +- fix upstream bug #108 (http://code.google.com/p/libproxy/issues/detail?id=108) + +* Thu Apr 08 2010 Alexey Shabalin 0.4.0-alt2 +- svn snapshot r659 +- enable build with RPATH + +* Thu Mar 11 2010 Alexey Shabalin 0.4.0-alt1 +- 0.4.0 + svn snapshot r622 +- disable mono binding + +* Wed Nov 25 2009 Eugeny A. Rostovtsev (REAL) 0.3.1-alt1.1 +- Rebuilt with python 2.6 + +* Thu Oct 29 2009 Alexey Shabalin 0.3.1-alt1 +- 0.3.1 + +* Wed Sep 23 2009 Alexey Shabalin 0.3.0-alt1 +- 0.3.0 +- networkmanager package +- .Net bindings package +- update descriptions +- add versioning + +* Tue May 05 2009 Alexey Shabalin 0.2.3-alt2.r334 +- svn r334 +- update spec for build from git.alt + +* Fri Apr 10 2009 Alexey Shabalin 0.2.3-alt1.1 +- rebuild with webkit-1.1.4 + +* Tue Feb 03 2009 Yuri N. Sedunov 0.2.3-alt1 +- adapted for Sisyphus + +* Thu Jan 22 2009 kwizart < kwizart at gmail.com > - 0.2.3-8 +- Merge NetworkManager module into the main libproxy package +- Main Requires the -python and -bin subpackage + (splitted for multilibs compliance). + +* Fri Oct 24 2008 kwizart < kwizart at gmail.com > - 0.2.3-7 +- Disable Gnome/KDE default support via builtin modules. + (it needs to be integrated via Gconf2/neon instead). + +* Tue Oct 21 2008 kwizart < kwizart at gmail.com > - 0.2.3-6 +- Disable Obsoletes. +- Requires ev instead of evr for optionnals sub-packages. + +* Tue Oct 21 2008 kwizart < kwizart at gmail.com > - 0.2.3-5 +- Use conditionals build. + +* Mon Sep 15 2008 kwizart < kwizart at gmail.com > - 0.2.3-4 +- Remove plugin- in the name of the packages + +* Mon Aug 4 2008 kwizart < kwizart at gmail.com > - 0.2.3-3 +- Move proxy.h to libproxy/proxy.h + This will prevent it to be included in the default include path +- Split main to libs and util and use libproxy to install all + +* Mon Aug 4 2008 kwizart < kwizart at gmail.com > - 0.2.3-2 +- Rename binding-python to python +- Add Requires: gecko-libs >= %%{gecko_version} +- Fix some descriptions +- Add plugin-webkit package + +* Fri Jul 11 2008 kwizart < kwizart at gmail.com > - 0.2.3-1 +- Convert to Fedora spec + +* Fri Jun 6 2008 - dominique-rpm@leuenberger.net +- Updated to version 0.2.3 +* Wed Jun 4 2008 - dominique-rpm@leuenberger.net +- Extended spec file to build all available plugins +* Tue Jun 3 2008 - dominique-rpm@leuenberger.net +- Initial spec file for Version 0.2.2 + diff --git a/src/backend/px-manager.c b/src/backend/px-manager.c index 204d517..dc63b37 100644 --- a/src/backend/px-manager.c +++ b/src/backend/px-manager.c @@ -697,6 +697,9 @@ ignore_domain (GUri *uri, if (g_strcmp0 (ignore, "*") == 0) return TRUE; + if (!host) + return FALSE; + ignore_split = g_strsplit (ignore, ":", -1); port = g_uri_get_port (uri); @@ -736,6 +739,9 @@ ignore_hostname (GUri *uri, { const char *host = g_uri_get_host (uri); + if (!host) + return FALSE; + if (g_strcmp0 (ignore, "") == 0 && strchr (host, ':') == NULL && strchr (host, '.') == NULL) return TRUE; diff --git a/src/tools/meson.build b/src/tools/meson.build index fde05a4..d7f11f5 100644 --- a/src/tools/meson.build +++ b/src/tools/meson.build @@ -7,7 +7,8 @@ executable( sources: proxy_sources, dependencies: libproxy_dep, install: true, + install_rpath: pkglibdir, include_directories: libproxy_inc ) -install_man('proxy.8') \ No newline at end of file +install_man('proxy.8')