Thu Jun 8 11:27:06 2017 UTC ()
Version 0.4.15
Port to, and require, SpiderMonkey 38.
Fix "NetworkManager plugin not being built"
Fix "networkmanager plugin not working
Fix "Invalid read after free"
Fix intermittent unit test failures.


(adam)
diff -r1.28 -r1.29 pkgsrc/www/libproxy/Makefile
diff -r1.5 -r1.6 pkgsrc/www/libproxy/buildlink3.mk
diff -r1.19 -r1.20 pkgsrc/www/libproxy/distinfo
diff -r0 -r1.1 pkgsrc/www/libproxy/patches/patch-libproxy_get-pac-test.cpp

cvs diff -r1.28 -r1.29 pkgsrc/www/libproxy/Makefile (expand / switch to unified diff)

--- pkgsrc/www/libproxy/Makefile 2016/06/26 12:03:53 1.28
+++ pkgsrc/www/libproxy/Makefile 2017/06/08 11:27:05 1.29
@@ -1,29 +1,31 @@ @@ -1,29 +1,31 @@
1# $NetBSD: Makefile,v 1.28 2016/06/26 12:03:53 kamil Exp $ 1# $NetBSD: Makefile,v 1.29 2017/06/08 11:27:05 adam Exp $
2 2
3DISTNAME= libproxy-0.4.13 3DISTNAME= libproxy-0.4.15
4CATEGORIES= www gnome 4CATEGORIES= www gnome
5MASTER_SITES= ${MASTER_SITE_GITHUB:=libproxy/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=libproxy/}
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://libproxy.github.io/libproxy/ 8HOMEPAGE= http://libproxy.github.io/libproxy/
9COMMENT= Library that provides automatic proxy configuration management 9COMMENT= Library that provides automatic proxy configuration management
10LICENSE= gnu-lgpl-v2.1 10LICENSE= gnu-lgpl-v2.1
11 11
12USE_CMAKE= yes 12USE_CMAKE= yes
13USE_LIBTOOL= yes 
14USE_TOOLS+= pkg-config gmake 
15USE_LANGUAGES= c99 c++ 13USE_LANGUAGES= c99 c++
16CMAKE_ARGS+= -DWITH_PYTHON:BOOL=OFF 14#USE_LIBTOOL= yes
 15USE_TOOLS+= pkg-config gmake
 16CMAKE_ARGS+= -DWITH_PERL:BOOL=OFF
 17CMAKE_ARGS+= -DWITH_PYTHON2:BOOL=OFF
 18CMAKE_ARGS+= -DWITH_PYTHON3:BOOL=OFF
17CMAKE_ARGS+= -DWITH_KDE:BOOL=OFF 19CMAKE_ARGS+= -DWITH_KDE:BOOL=OFF
18 20
19# Need socket libraries on SunOS for both the shared library and test programs. 21# Need socket libraries on SunOS for both the shared library and test programs.
20CMAKE_ARGS.SunOS+= -DCMAKE_EXE_LINKER_FLAGS:STRING="-lnsl -lsocket -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib" 22CMAKE_ARGS.SunOS+= -DCMAKE_EXE_LINKER_FLAGS:STRING="-lnsl -lsocket -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib"
21CMAKE_ARGS.SunOS+= -DCMAKE_SHARED_LINKER_FLAGS:STRING="-lnsl -lsocket -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib" 23CMAKE_ARGS.SunOS+= -DCMAKE_SHARED_LINKER_FLAGS:STRING="-lnsl -lsocket -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib"
22 24
23PKGCONFIG_OVERRIDE+= bindings/csharp/libproxy-sharp-1.0.pc.cmake 25PKGCONFIG_OVERRIDE+= bindings/csharp/libproxy-sharp-1.0.pc.cmake
24PKGCONFIG_OVERRIDE+= libproxy/libproxy-1.0.pc.in 26PKGCONFIG_OVERRIDE+= libproxy/libproxy-1.0.pc.in
25 27
26.include "../../devel/zlib/buildlink3.mk" 28.include "../../devel/zlib/buildlink3.mk"
27.include "../../mk/dlopen.buildlink3.mk" 29.include "../../mk/dlopen.buildlink3.mk"
28.include "../../mk/pthread.buildlink3.mk" 30.include "../../mk/pthread.buildlink3.mk"
29.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"

cvs diff -r1.5 -r1.6 pkgsrc/www/libproxy/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/www/libproxy/buildlink3.mk 2013/05/24 18:22:57 1.5
+++ pkgsrc/www/libproxy/buildlink3.mk 2017/06/08 11:27:05 1.6
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1# $NetBSD: buildlink3.mk,v 1.5 2013/05/24 18:22:57 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.6 2017/06/08 11:27:05 adam Exp $
2 2
3BUILDLINK_TREE+= libproxy 3BUILDLINK_TREE+= libproxy
4 4
5.if !defined(LIBPROXY_BUILDLINK3_MK) 5.if !defined(LIBPROXY_BUILDLINK3_MK)
6LIBPROXY_BUILDLINK3_MK:= 6LIBPROXY_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.libproxy+= libproxy>=0.2.3 8BUILDLINK_API_DEPENDS.libproxy+= libproxy>=0.2.3
9BUILDLINK_ABI_DEPENDS.libproxy+= libproxy>=0.4.11 9BUILDLINK_ABI_DEPENDS.libproxy+= libproxy>=0.4.11
10BUILDLINK_PKGSRCDIR.libproxy?= ../../www/libproxy 10BUILDLINK_PKGSRCDIR.libproxy?= ../../www/libproxy
11.endif # LIBPROXY_BUILDLINK3_MK 11.endif # LIBPROXY_BUILDLINK3_MK
12 12
13BUILDLINK_TREE+= -libproxy 13BUILDLINK_TREE+= -libproxy

cvs diff -r1.19 -r1.20 pkgsrc/www/libproxy/distinfo (expand / switch to unified diff)

--- pkgsrc/www/libproxy/distinfo 2016/06/26 12:03:53 1.19
+++ pkgsrc/www/libproxy/distinfo 2017/06/08 11:27:05 1.20
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.19 2016/06/26 12:03:53 kamil Exp $ 1$NetBSD: distinfo,v 1.20 2017/06/08 11:27:05 adam Exp $
2 2
3SHA1 (libproxy-0.4.13.tar.gz) = fadd9e3c9c418496b0836527c89ac6d84f0e37c9 3SHA1 (libproxy-0.4.15.tar.gz) = 2dc0fc31cad78ce3d7a5ceb8fa8df07010f5c13e
4RMD160 (libproxy-0.4.13.tar.gz) = 497000d2c9276e10b17a00f5326f1eeb05df388d 4RMD160 (libproxy-0.4.15.tar.gz) = 4818e264398035b10b1cd015d429bff8b637daba
5SHA512 (libproxy-0.4.13.tar.gz) = babbe5e9326cb2bfdf4504662533b314f72c3475687f8b57c235614698cb18e0ed31752b834cb1d33cc94ecd3af6589684b2846e73830f0be3557c465a1f1c42 5SHA512 (libproxy-0.4.15.tar.gz) = 8f68bd56e44aeb3f553f4657bef82a5d14302780508dafa32454d6f724b724c884ceed6042f8df53a081d26ea0b05598cf35eab44823257c47c5ef8afb36442b
6Size (libproxy-0.4.13.tar.gz) = 89296 bytes 6Size (libproxy-0.4.15.tar.gz) = 93084 bytes
7SHA1 (patch-libproxy_CMakeLists.txt) = fc283f97eebf0ef0cfbd81341a7db311755ab2ec 7SHA1 (patch-libproxy_CMakeLists.txt) = fc283f97eebf0ef0cfbd81341a7db311755ab2ec
 8SHA1 (patch-libproxy_get-pac-test.cpp) = 2b625dca29c031d334581a2756a2a9777e39c3f9

File Added: pkgsrc/www/libproxy/patches/Attic/patch-libproxy_get-pac-test.cpp
$NetBSD: patch-libproxy_get-pac-test.cpp,v 1.1 2017/06/08 11:27:06 adam Exp $

Fix a typo.

--- libproxy/test/get-pac-test.cpp.orig	2017-06-08 10:13:10.000000000 +0000
+++ libproxy/test/get-pac-test.cpp
@@ -130,7 +130,7 @@ class TestServer {
 
 #ifdef SO_NOSIGPIPE
 			int i = 1;
-			setsockopt(c_sock, SOL_SOCKET, SO_NOSIGPIPE, &i, sizeof(i));
+			setsockopt(csock, SOL_SOCKET, SO_NOSIGPIPE, &i, sizeof(i));
 #endif
 
 			// Read request