Update to 0.4.14

.gitignore

@@ -1,3 +1,4 @@
 /libproxy-0.*.tar.gz
 /0.4.12.tar.gz
 /0.4.13.tar.gz
+/libproxy-0.4.14.tar.xz

libproxy-0.4.13-fix-get-pac-test.patch

@@ -1,55 +0,0 @@
-diff -urN libproxy-0.4.13.old/libproxy/test/get-pac-test.cpp libproxy-0.4.13/libproxy/test/get-pac-test.cpp
---- libproxy-0.4.13.old/libproxy/test/get-pac-test.cpp	2016-04-28 18:04:41.000000000 +0100
-+++ libproxy-0.4.13/libproxy/test/get-pac-test.cpp	2017-01-01 16:44:28.736433853 +0000
-@@ -164,7 +164,6 @@
- 			ret = send(csock, (void*)basic, strlen(basic), 0);
- 			assert(ret == strlen(basic));
- 			shutdown(csock, SHUT_RDWR);
--			close(ret);
- 		}
- 
- 		void sendTruncated(int csock)
-@@ -179,29 +178,27 @@
- 			ret = send(csock, (void*)basic, strlen(basic), 0);
- 			assert(ret == strlen(basic));
- 			shutdown(csock, SHUT_RDWR);
--			close(ret);
- 		}
- 
- 		void sendOverflow(int csock)
- 		{
- 			int ret;
--			int size = 500000;
-+			int size = 50000000; // Must be larger than the kernel TCP receive buffer
- 			char *buf = new char[size];
- 			memset(buf, 1, size);
- 
- 			const char *basic =
- 				"HTTP/1.1 200 OK\n" \
- 				"Content-Type: text/plain\n" \
--				"Content-Length: 500000\n" \
-+				"Content-Length: 50000000\n" \
- 				"\n";
--			ret = send(csock, (void*)basic, strlen(basic), 0);
-+			ret = send(csock, (void*)basic, strlen(basic), MSG_NOSIGNAL);
- 			assert(ret == strlen(basic));
--			ret = send(csock, (void*)buf, size, 0);
--			if (!(errno == EBADF))
--				abort(); // Test failed... the socket did not close on us
-+			ret = send(csock, (void*)buf, size, MSG_NOSIGNAL);
-+			if (ret == size)
-+				abort(); // Test failed... the socket should not accept the whole buffer
- 			delete[] buf;
- 			shutdown(csock, SHUT_RDWR);
--			close(ret);
- 		}
- 
- 		void sendChunked(int csock)
-@@ -221,7 +218,6 @@
- 			ret = send(csock, (void*)chunked, strlen(chunked), 0);
- 			assert(ret == strlen(chunked));
- 			shutdown(csock, SHUT_RDWR);
--			close(ret);
- 		}
- 
- 		in_port_t m_port;

libproxy.spec

@@ -3,21 +3,18 @@
 %{!?_with_bootstrap: %global bootstrap 0}
 
 Name:           libproxy
-Version:        0.4.13
+Version:        0.4.14
 Release:        1%{?dist}
 Summary:        A library handling all the details of proxy configuration
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            https://libproxy.github.io/libproxy/
-Source0:        https://github.com/libproxy/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
+Source0:        https://github.com/libproxy/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
 # Taken from the Debian package.
 Source1:        proxy.1
 # http://code.google.com/p/libproxy/issues/detail?id=152
 Patch0:         0001-Add-config-module-for-querying-PacRunner-d-mon.patch
-# Avoid get-pac-test failure.
-# https://github.com/libproxy/libproxy/pull/48
-Patch1:         libproxy-0.4.13-fix-get-pac-test.patch
 
 BuildRequires:  libmodman-devel >= 2.0.1
 BuildRequires:  cmake >= 2.6.0
@@ -28,7 +25,7 @@ BuildRequires:  pkgconfig(gio-2.0) >= 2.26
 # mozjs
 BuildRequires:  pkgconfig(mozjs185)
 # NetworkManager
-BuildRequires:  pkgconfig(NetworkManager)
+BuildRequires:  pkgconfig(libnm)
 # pacrunner (and NetworkManager)
 BuildRequires:  pkgconfig(dbus-1)
 # webkit (gtk3)
@@ -42,8 +39,8 @@ BuildRequires:  python3-devel
 # Obsoletes of disabled subpackages.
 Provides: %{name}-mozjs = %{version}-%{release}
 Obsoletes: %{name}-mozjs < %{version}-%{release}
-Provides: %{name}-webkitgtk3 = %{version}-%{release}
+Provides: %{name}-webkitgtk4 = %{version}-%{release}
-Obsoletes: %{name}-webkitgtk3 < %{version}-%{release}
+Obsoletes: %{name}-webkitgtk4 < %{version}-%{release}
 %endif
 
 
@@ -165,11 +162,13 @@ developing applications that use %{name}.
   -DWITH_PERL=OFF \
 %if ! 0%{?bootstrap}
   -DWITH_GNOME3=ON \
-  -DWITH_PYTHON=ON \
+  -DWITH_PYTHON2=ON \
+  -DWITH_PYTHON3=ON \
   -DWITH_WEBKIT3=ON \
   -DWITH_MOZJS=ON \
 %else
-  -DWITH_PYTHON=OFF \
+  -DWITH_PYTHON2=OFF \
+  -DWITH_PYTHON3=OFF \
 %endif
    .
 %make_build
@@ -184,12 +183,6 @@ mkdir -p %{buildroot}%{_libdir}/%{name}/%{version}/modules
 # Man page.
 install -Dpm 0644 %{SOURCE1} %{buildroot}/%{_mandir}/man1/proxy.1
 
-# Install Python module for Python 3.
-%if ! 0%{?bootstrap}
-install -d %{buildroot}/%{python3_sitelib}
-cp -p %{buildroot}/%{python2_sitelib}/%{name}.* \
-      %{buildroot}/%{python3_sitelib}/
-%endif
 
 %check
 make test
@@ -247,6 +240,9 @@ make test
 
 
 %changelog
+* Mon Jan 09 2017 David King <amigadave@amigadave.com> - 0.4.14-1
+- Update to 0.4.14
+
 * Sun Jan 01 2017 David King <amigadave@amigadave.com> - 0.4.13-1
 - Update to 0.4.13
 

sources

@@ -1 +1 @@
-SHA512 (libproxy-0.4.13.tar.gz) = babbe5e9326cb2bfdf4504662533b314f72c3475687f8b57c235614698cb18e0ed31752b834cb1d33cc94ecd3af6589684b2846e73830f0be3557c465a1f1c42
+SHA512 (libproxy-0.4.14.tar.xz) = 610d5d8ffb812efd75541a8da2b2ab5882529364b3e736f26c57fba57183464b531f84d04bdc73fabd4d3899a63b909db59ead81081d55753386da511e5381b3