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.diff -r1.28 -r1.29 pkgsrc/www/libproxy/Makefile
(adam)
@@ -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 | |||
3 | DISTNAME= libproxy-0.4.13 | 3 | DISTNAME= libproxy-0.4.15 | |
4 | CATEGORIES= www gnome | 4 | CATEGORIES= www gnome | |
5 | MASTER_SITES= ${MASTER_SITE_GITHUB:=libproxy/} | 5 | MASTER_SITES= ${MASTER_SITE_GITHUB:=libproxy/} | |
6 | 6 | |||
7 | MAINTAINER= pkgsrc-users@NetBSD.org | 7 | MAINTAINER= pkgsrc-users@NetBSD.org | |
8 | HOMEPAGE= http://libproxy.github.io/libproxy/ | 8 | HOMEPAGE= http://libproxy.github.io/libproxy/ | |
9 | COMMENT= Library that provides automatic proxy configuration management | 9 | COMMENT= Library that provides automatic proxy configuration management | |
10 | LICENSE= gnu-lgpl-v2.1 | 10 | LICENSE= gnu-lgpl-v2.1 | |
11 | 11 | |||
12 | USE_CMAKE= yes | 12 | USE_CMAKE= yes | |
13 | USE_LIBTOOL= yes | |||
14 | USE_TOOLS+= pkg-config gmake | |||
15 | USE_LANGUAGES= c99 c++ | 13 | USE_LANGUAGES= c99 c++ | |
16 | CMAKE_ARGS+= -DWITH_PYTHON:BOOL=OFF | 14 | #USE_LIBTOOL= yes | |
15 | USE_TOOLS+= pkg-config gmake | |||
16 | CMAKE_ARGS+= -DWITH_PERL:BOOL=OFF | |||
17 | CMAKE_ARGS+= -DWITH_PYTHON2:BOOL=OFF | |||
18 | CMAKE_ARGS+= -DWITH_PYTHON3:BOOL=OFF | |||
17 | CMAKE_ARGS+= -DWITH_KDE:BOOL=OFF | 19 | CMAKE_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. | |
20 | CMAKE_ARGS.SunOS+= -DCMAKE_EXE_LINKER_FLAGS:STRING="-lnsl -lsocket -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib" | 22 | CMAKE_ARGS.SunOS+= -DCMAKE_EXE_LINKER_FLAGS:STRING="-lnsl -lsocket -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib" | |
21 | CMAKE_ARGS.SunOS+= -DCMAKE_SHARED_LINKER_FLAGS:STRING="-lnsl -lsocket -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib" | 23 | CMAKE_ARGS.SunOS+= -DCMAKE_SHARED_LINKER_FLAGS:STRING="-lnsl -lsocket -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib" | |
22 | 24 | |||
23 | PKGCONFIG_OVERRIDE+= bindings/csharp/libproxy-sharp-1.0.pc.cmake | 25 | PKGCONFIG_OVERRIDE+= bindings/csharp/libproxy-sharp-1.0.pc.cmake | |
24 | PKGCONFIG_OVERRIDE+= libproxy/libproxy-1.0.pc.in | 26 | PKGCONFIG_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" |
@@ -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 | |||
3 | BUILDLINK_TREE+= libproxy | 3 | BUILDLINK_TREE+= libproxy | |
4 | 4 | |||
5 | .if !defined(LIBPROXY_BUILDLINK3_MK) | 5 | .if !defined(LIBPROXY_BUILDLINK3_MK) | |
6 | LIBPROXY_BUILDLINK3_MK:= | 6 | LIBPROXY_BUILDLINK3_MK:= | |
7 | 7 | |||
8 | BUILDLINK_API_DEPENDS.libproxy+= libproxy>=0.2.3 | 8 | BUILDLINK_API_DEPENDS.libproxy+= libproxy>=0.2.3 | |
9 | BUILDLINK_ABI_DEPENDS.libproxy+= libproxy>=0.4.11 | 9 | BUILDLINK_ABI_DEPENDS.libproxy+= libproxy>=0.4.11 | |
10 | BUILDLINK_PKGSRCDIR.libproxy?= ../../www/libproxy | 10 | BUILDLINK_PKGSRCDIR.libproxy?= ../../www/libproxy | |
11 | .endif # LIBPROXY_BUILDLINK3_MK | 11 | .endif # LIBPROXY_BUILDLINK3_MK | |
12 | 12 | |||
13 | BUILDLINK_TREE+= -libproxy | 13 | BUILDLINK_TREE+= -libproxy |
@@ -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 | |||
3 | SHA1 (libproxy-0.4.13.tar.gz) = fadd9e3c9c418496b0836527c89ac6d84f0e37c9 | 3 | SHA1 (libproxy-0.4.15.tar.gz) = 2dc0fc31cad78ce3d7a5ceb8fa8df07010f5c13e | |
4 | RMD160 (libproxy-0.4.13.tar.gz) = 497000d2c9276e10b17a00f5326f1eeb05df388d | 4 | RMD160 (libproxy-0.4.15.tar.gz) = 4818e264398035b10b1cd015d429bff8b637daba | |
5 | SHA512 (libproxy-0.4.13.tar.gz) = babbe5e9326cb2bfdf4504662533b314f72c3475687f8b57c235614698cb18e0ed31752b834cb1d33cc94ecd3af6589684b2846e73830f0be3557c465a1f1c42 | 5 | SHA512 (libproxy-0.4.15.tar.gz) = 8f68bd56e44aeb3f553f4657bef82a5d14302780508dafa32454d6f724b724c884ceed6042f8df53a081d26ea0b05598cf35eab44823257c47c5ef8afb36442b | |
6 | Size (libproxy-0.4.13.tar.gz) = 89296 bytes | 6 | Size (libproxy-0.4.15.tar.gz) = 93084 bytes | |
7 | SHA1 (patch-libproxy_CMakeLists.txt) = fc283f97eebf0ef0cfbd81341a7db311755ab2ec | 7 | SHA1 (patch-libproxy_CMakeLists.txt) = fc283f97eebf0ef0cfbd81341a7db311755ab2ec | |
8 | SHA1 (patch-libproxy_get-pac-test.cpp) = 2b625dca29c031d334581a2756a2a9777e39c3f9 |
$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