svn commit: r566630 - in head/net: . libproxy libproxy-kde libproxy-mozjs libproxy-pacrunner libproxy/files

Fri Feb 26 19:27:17 UTC 2021

Author: tcberner
Date: Fri Feb 26 19:27:14 2021
New Revision: 566630
URL: https://svnweb.freebsd.org/changeset/ports/566630

Log:
  net/libproxy: update to 0.4.17
  
  - mark libproxy-mozjs borken
  - add new port for pacrunner
  - drop support for python2
  
  Changelog:
   - 0.4.16:
      * Port to, and require, SpiderMonkey 68
      * Use closesocket() instead of close() on Windows
      * Add symbol versions - be ready to introduce new APIs as needed
      * Add public px_proxy_factory_free_proxies function
      * Add PacRunner config backend (largely untested; feedback welcome!)
      * Small performance improvements
      * pxgsettings: use the correct syntax to connect to the changed signal (silences annoying output on console)
      * Support python3 up to version 3.9
      * Fix buffer overflow when PAC is enabled (CVE-2020-26154)
      * Rewrite url::recvline to be nonrecursive (CVE-2020-25219)
      * Remove nonfunctional and crashy pacrunner caching
      * Never use system libmodman (no other consumers, not maintained)
   - 0.4.17:
      * python bindings: fix "TypeError: argtypes must be a sequence of types" (#125)

Added:
  head/net/libproxy-pacrunner/
  head/net/libproxy-pacrunner/Makefile   (contents, props changed)
  head/net/libproxy-pacrunner/pkg-descr   (contents, props changed)
  head/net/libproxy-pacrunner/pkg-plist   (contents, props changed)
  head/net/libproxy/files/patch-libproxy_cmake_modules.cmk   (contents, props changed)
Deleted:
  head/net/libproxy/files/libproxy-0.4.15-mozjs52.patch
  head/net/libproxy/files/patch-libproxy_test_get-pac-test.cpp
Modified:
  head/net/Makefile
  head/net/libproxy-kde/Makefile
  head/net/libproxy-mozjs/Makefile
  head/net/libproxy/Makefile
  head/net/libproxy/distinfo
  head/net/libproxy/files/patch-CMakeLists.txt

Modified: head/net/Makefile
==============================================================================

--- head/net/Makefile	Fri Feb 26 19:06:01 2021	(r566629)
+++ head/net/Makefile	Fri Feb 26 19:27:14 2021	(r566630)
@@ -388,6 +388,7 @@
     SUBDIR += libproxy-gnome3
     SUBDIR += libproxy-kde
     SUBDIR += libproxy-mozjs
+    SUBDIR += libproxy-pacrunner
     SUBDIR += libproxy-perl
     SUBDIR += libproxy-python
     SUBDIR += libproxy-webkit3

Modified: head/net/libproxy-kde/Makefile
==============================================================================
--- head/net/libproxy-kde/Makefile	Fri Feb 26 19:06:01 2021	(r566629)
+++ head/net/libproxy-kde/Makefile	Fri Feb 26 19:27:14 2021	(r566630)
@@ -1,7 +1,7 @@
 # Created by: Joe Marcus Clarke <marcus at FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	net devel
 PKGNAMESUFFIX=	-${LIBPROXY_SLAVE}
 

Modified: head/net/libproxy-mozjs/Makefile
==============================================================================
--- head/net/libproxy-mozjs/Makefile	Fri Feb 26 19:06:01 2021	(r566629)
+++ head/net/libproxy-mozjs/Makefile	Fri Feb 26 19:27:14 2021	(r566630)
@@ -1,7 +1,7 @@
 # Created by: Joe Marcus Clarke <marcus at FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	4
+PORTREVISION=	0
 CATEGORIES=	net www
 PKGNAMESUFFIX=	-${LIBPROXY_SLAVE}
 
@@ -18,7 +18,7 @@ LIBPROXY_SLAVE=	mozjs
 MASTERDIR=	${.CURDIR}/../libproxy
 
 # See https://github.com/libproxy/libproxy/commit/2203f710988eaa3061e75b083296944e34e17d59
-DEPRECATED=	Discouraged by upstream, will be marked broken in next update
+BROKEN=		Discouraged by upstream, requires spidermonkey68
 EXPIRATION_DATE=	2021-03-31
 
 .include "${MASTERDIR}/Makefile"

Added: head/net/libproxy-pacrunner/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/libproxy-pacrunner/Makefile	Fri Feb 26 19:27:14 2021	(r566630)
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+PORTREVISION=	0
+CATEGORIES=	net devel
+PKGNAMESUFFIX=	-${LIBPROXY_SLAVE}
+
+COMMENT=	pacrunner plug-in for libproxy
+
+LIBPROXY_SLAVE=	pacrunner
+MASTERDIR=	${.CURDIR}/../libproxy
+
+.include "${MASTERDIR}/Makefile"

Added: head/net/libproxy-pacrunner/pkg-descr
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/libproxy-pacrunner/pkg-descr	Fri Feb 26 19:27:14 2021	(r566630)
@@ -0,0 +1,7 @@
+Libproxy exists to answer the question: Given a network resource, how do I
+reach it?  It handles all the details, enabling you to get back to
+programming.
+
+This plug-in contains the pacrunner of libproxy.
+
+WWW: https://libproxy.github.io/libproxy/

Added: head/net/libproxy-pacrunner/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/libproxy-pacrunner/pkg-plist	Fri Feb 26 19:27:14 2021	(r566630)
@@ -0,0 +1 @@
+lib/libproxy/%%VERSION%%/modules/config_pacrunner.so

Modified: head/net/libproxy/Makefile
==============================================================================
--- head/net/libproxy/Makefile	Fri Feb 26 19:06:01 2021	(r566629)
+++ head/net/libproxy/Makefile	Fri Feb 26 19:27:14 2021	(r566630)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libproxy
-PORTVERSION=	0.4.15
+DISTVERSION=	0.4.17
 PORTREVISION?=	0
 CATEGORIES?=	net devel
 
@@ -46,19 +46,22 @@ CMAKE_ON+=	WITH_WEBKIT
 CMAKE_OFF:=	${CMAKE_OFF:C/WITH_WEBKIT//}
 .endif
 
+.if ${LIBPROXY_SLAVE:Mpacrunner}
+LIB_DEPENDS+=	 libdbus-1.so:devel/dbus
+CMAKE_ON=	BUILD_CONFIG_PACRUNNER
+.endif
+
+.if ${LIBPROXY_SLAVE:Mkde} || ${LIBPROXY_SLAVE:Mwebkit3}
+RUN_DEPENDS+=	libproxy-pacrunner>=${DISTVERSION}:net/libproxy-pacrunner
+.endif
+
 .include <bsd.port.pre.mk>
 
 # Hackery for the to python backends.
 .if ${LIBPROXY_SLAVE:Mpython}
-.  if ${PYTHON_MAJOR_VER} == 2
-CMAKE_ON+=		WITH_PYTHON2
-CMAKE_OFF+=		WITH_PYTHON3
-CMAKE_ARGS+=		-DPYTHON2_EXECUTABLE:FILEPATH=${PYTHON_CMD}
-.  else
 CMAKE_ON+=		WITH_PYTHON3
 CMAKE_OFF+=		WITH_PYTHON2
 CMAKE_ARGS+=		-DPYTHON3_EXECUTABLE:FILEPATH=${PYTHON_CMD}
-.  endif
 .else
 CMAKE_OFF+=		WITH_PYTHON2 WITH_PYTHON3
 .endif

Modified: head/net/libproxy/distinfo
==============================================================================
--- head/net/libproxy/distinfo	Fri Feb 26 19:06:01 2021	(r566629)
+++ head/net/libproxy/distinfo	Fri Feb 26 19:27:14 2021	(r566630)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499371033
-SHA256 (libproxy-libproxy-0.4.15_GH0.tar.gz) = 18f58b0a0043b6881774187427ead158d310127fc46a1c668ad6d207fb28b4e0
-SIZE (libproxy-libproxy-0.4.15_GH0.tar.gz) = 93084
+TIMESTAMP = 1614342859
+SHA256 (libproxy-libproxy-0.4.17_GH0.tar.gz) = 88c624711412665515e2800a7e564aabb5b3ee781b9820eca9168035b0de60a9
+SIZE (libproxy-libproxy-0.4.17_GH0.tar.gz) = 95542

Modified: head/net/libproxy/files/patch-CMakeLists.txt
==============================================================================
--- head/net/libproxy/files/patch-CMakeLists.txt	Fri Feb 26 19:06:01 2021	(r566629)
+++ head/net/libproxy/files/patch-CMakeLists.txt	Fri Feb 26 19:27:14 2021	(r566630)
@@ -2,9 +2,9 @@ As the library is only built in the master port, and t
 build directory for the slave ports, find it via pkg-config and link against it,
 when building a slave.
 
---- CMakeLists.txt.orig	2017-05-11 09:33:33 UTC
+--- CMakeLists.txt.orig	2020-12-29 11:30:46 UTC
 +++ CMakeLists.txt
-@@ -23,6 +23,15 @@ else()
+@@ -26,6 +26,15 @@ else()
    set(CMAKE_INSTALL_CONFIG_NAME ${CMAKE_BUILD_TYPE})
  endif()
  
@@ -20,7 +20,7 @@ when building a slave.
  include(cmake/cpack.cmk)
  include(cmake/ctest.cmk)
  include(cmake/paths.cmk)
-@@ -56,5 +65,7 @@ endif()
+@@ -44,5 +53,7 @@ endif()
  
  # Always build these
  add_subdirectory(libproxy)

Added: head/net/libproxy/files/patch-libproxy_cmake_modules.cmk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/libproxy/files/patch-libproxy_cmake_modules.cmk	Fri Feb 26 19:27:14 2021	(r566630)
@@ -0,0 +1,12 @@
+--- libproxy/cmake/modules.cmk.orig	2021-02-26 18:24:03 UTC
++++ libproxy/cmake/modules.cmk
+@@ -29,7 +29,9 @@ endif()
+ ## Module definition
+ #
+ message("MODULES TO BUILD:")
++if(BUILD_CONFIG_PACRUNNER)
+ px_module(config_pacrunner         "${DBUS_FOUND}"   0       ${DBUS_LIBRARIES})
++endif()
+ px_module(config_envvar            "${ENVVAR_FOUND}" 1)
+ px_module(config_sysconfig         "${SYSCONFIG_FOUND}" 1)
+ px_module(config_gnome             "${GNOME2_FOUND}" 0)
