[arch-commits] Commit in libproxy/trunk (3 files)

[Jan de Groot]

    Date: Friday, February 19, 2016 @ 15:44:19
  Author: jgc
Revision: 259996

upgpkg: libproxy 0.4.12-8

Modified:
  libproxy/trunk/PKGBUILD
Deleted:
  libproxy/trunk/dont_segfault_on_exit.patch
  libproxy/trunk/libproxy-0.4.11-fdleak.patch

------------------------------+
 PKGBUILD                     |   19 ++++++-------------
 dont_segfault_on_exit.patch  |   14 --------------
 libproxy-0.4.11-fdleak.patch |   20 --------------------
 3 files changed, 6 insertions(+), 47 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-02-19 13:28:42 UTC (rev 259995)
+++ PKGBUILD	2016-02-19 14:44:19 UTC (rev 259996)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=libproxy
-pkgver=0.4.11
+pkgver=0.4.12
 pkgrel=8
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
@@ -15,17 +15,13 @@
             'js17: PAC proxy support - Mozilla based pacrunner'
             'webkitgtk: PAC proxy support - Webkit based pacrunner')
 makedepends=('cmake' 'networkmanager' 'python2' 'perl' 'js17' 'webkitgtk')
-url="http://libproxy.googlecode.com"
-source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz
+url="http://libproxy.github.io/libproxy/"
+source=(https://github.com/libproxy/libproxy/archive/${pkgver}.tar.gz
         0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch
-        libproxy-0.4.11-crash.patch
-        libproxy-0.4.11-fdleak.patch
-        dont_segfault_on_exit.patch)
-md5sums=('3cd1ae2a4abecf44b3f24d6639d2cd84'
+        libproxy-0.4.11-crash.patch)
+md5sums=('258d89cc052e0a3c09aa1f42d7f93045'
          '16cb8ad1292f04279108a80f36434c7b'
-         'a45f2195c164a48639e963e8341f5d93'
-         '6302b995c570e42691007f3b09953a59'
-         '0a4980304ee93764162dbdbd0eb5e519')
+         'a45f2195c164a48639e963e8341f5d93')
 
 prepare() {
   mkdir build
@@ -32,8 +28,6 @@
   cd $pkgname-$pkgver
   patch -Np1 -i ../0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch
   patch -Np1 -i ../libproxy-0.4.11-crash.patch
-  patch -Np1 -i ../libproxy-0.4.11-fdleak.patch
-  patch -Np1 -i ../dont_segfault_on_exit.patch
 }
 
 build() {
@@ -48,7 +42,6 @@
     -DWITH_MOZJS=ON \
     -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
     -DCMAKE_C_FLAGS="${CFLAGS}" \
-    -DWITH_KDE4=OFF \
     -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2
   make
 }

Deleted: dont_segfault_on_exit.patch
===================================================================
--- dont_segfault_on_exit.patch	2016-02-19 13:28:42 UTC (rev 259995)
+++ dont_segfault_on_exit.patch	2016-02-19 14:44:19 UTC (rev 259996)
@@ -1,14 +0,0 @@
---- libproxy-0.4.11/libproxy/modules/pxgsettings.cpp.orig	2013-05-30 13:18:11.597138996 +0200
-+++ libproxy-0.4.11/libproxy/modules/pxgsettings.cpp	2013-05-30 13:18:19.801139269 +0200
-@@ -156,10 +156,7 @@
- 
- 	g_main_loop_run(loop);
- 
--	// Cleanup
--	while (G_IS_OBJECT(client)) {
--		g_object_unref(client);
--	}
-+	g_object_unref(client);
- 	g_io_channel_shutdown(inchan,  FALSE, NULL);
- 	g_io_channel_shutdown(outchan, FALSE, NULL);
- 	g_io_channel_unref(inchan);

Deleted: libproxy-0.4.11-fdleak.patch
===================================================================
--- libproxy-0.4.11-fdleak.patch	2016-02-19 13:28:42 UTC (rev 259995)
+++ libproxy-0.4.11-fdleak.patch	2016-02-19 14:44:19 UTC (rev 259996)
@@ -1,20 +0,0 @@
-diff -up libproxy-0.4.11/libproxy/url.cpp.fdleak libproxy-0.4.11/libproxy/url.cpp
---- libproxy-0.4.11/libproxy/url.cpp.fdleak	2013-09-19 08:45:48.718145364 -0400
-+++ libproxy-0.4.11/libproxy/url.cpp	2013-09-19 08:46:31.374147676 -0400
-@@ -403,6 +403,7 @@ char* url::get_pac() {
- 				buffer = NULL;
- 			}
- 		}
-+		close (sock);
- 		return buffer;
- 	}
- 
-@@ -495,7 +496,7 @@ char* url::get_pac() {
- 	}
- 
- 	// Clean up
--	shutdown(sock, SHUT_RDWR);
-+	close(sock);
- 	return buffer;
- }
-