CVS commit: pkgsrc/www/libproxy

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Tue Sep 22 18:23:00 UTC 2020

Modified Files:
        pkgsrc/www/libproxy: Makefile distinfo
Added Files:
        pkgsrc/www/libproxy/patches: patch-libproxy_url.cpp

Log Message:
libproxy: add patch for recent vulnerability

Add upstream patch for CVE-2020-25219. Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/www/libproxy/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/www/libproxy/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/libproxy/patches/patch-libproxy_url.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/libproxy/Makefile
diff -u pkgsrc/www/libproxy/Makefile:1.33 pkgsrc/www/libproxy/Makefile:1.34
--- pkgsrc/www/libproxy/Makefile:1.33   Fri Mar 27 08:54:47 2020
+++ pkgsrc/www/libproxy/Makefile        Tue Sep 22 18:22:59 2020
@@ -1,9 +1,14 @@
-# $NetBSD: Makefile,v 1.33 2020/03/27 08:54:47 nia Exp $
+# $NetBSD: Makefile,v 1.34 2020/09/22 18:22:59 bsiegert Exp $
 
 DISTNAME=      libproxy-0.4.15
+PKGREVISION=   1
 CATEGORIES=    www gnome
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=libproxy/}
 
+PATCH_SITES=           https://github.com/libproxy/libproxy/commit/
+PATCHFILES=            a83dae404feac517695c23ff43ce1e116e2bfbe0.patch
+PATCH_DIST_STRIP=      -p1
+
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://libproxy.github.io/libproxy/
 COMMENT=       Library that provides automatic proxy configuration management

Index: pkgsrc/www/libproxy/distinfo
diff -u pkgsrc/www/libproxy/distinfo:1.20 pkgsrc/www/libproxy/distinfo:1.21
--- pkgsrc/www/libproxy/distinfo:1.20   Thu Jun  8 11:27:05 2017
+++ pkgsrc/www/libproxy/distinfo        Tue Sep 22 18:22:59 2020
@@ -1,8 +1,13 @@
-$NetBSD: distinfo,v 1.20 2017/06/08 11:27:05 adam Exp $
+$NetBSD: distinfo,v 1.21 2020/09/22 18:22:59 bsiegert Exp $
 
+SHA1 (a83dae404feac517695c23ff43ce1e116e2bfbe0.patch) = d5c71fa0be6d61417d3fcbb34445044ca3b64e3c
+RMD160 (a83dae404feac517695c23ff43ce1e116e2bfbe0.patch) = 26d3f2bd4defa6c6073846e2a8eabbc121eddf67
+SHA512 (a83dae404feac517695c23ff43ce1e116e2bfbe0.patch) = 908fbf49bec18764a8c2ab81ef5d5e6e1fc2423cf9a6608cc7d3a6d5ac44676e171646b0f95b39b7ade108afd62cc2ede8f7b57d6ba0d67025f30b18e5084292
+Size (a83dae404feac517695c23ff43ce1e116e2bfbe0.patch) = 1585 bytes
 SHA1 (libproxy-0.4.15.tar.gz) = 2dc0fc31cad78ce3d7a5ceb8fa8df07010f5c13e
 RMD160 (libproxy-0.4.15.tar.gz) = 4818e264398035b10b1cd015d429bff8b637daba
 SHA512 (libproxy-0.4.15.tar.gz) = 8f68bd56e44aeb3f553f4657bef82a5d14302780508dafa32454d6f724b724c884ceed6042f8df53a081d26ea0b05598cf35eab44823257c47c5ef8afb36442b
 Size (libproxy-0.4.15.tar.gz) = 93084 bytes
 SHA1 (patch-libproxy_CMakeLists.txt) = fc283f97eebf0ef0cfbd81341a7db311755ab2ec
 SHA1 (patch-libproxy_get-pac-test.cpp) = 2b625dca29c031d334581a2756a2a9777e39c3f9
+SHA1 (patch-libproxy_url.cpp) = 985ad1a668327b59036e3a7c5b7bf6fa2b61b8b7

Added files:

Index: pkgsrc/www/libproxy/patches/patch-libproxy_url.cpp
diff -u /dev/null pkgsrc/www/libproxy/patches/patch-libproxy_url.cpp:1.1
--- /dev/null   Tue Sep 22 18:23:00 2020
+++ pkgsrc/www/libproxy/patches/patch-libproxy_url.cpp  Tue Sep 22 18:23:00 2020
@@ -0,0 +1,14 @@
+$NetBSD: patch-libproxy_url.cpp,v 1.1 2020/09/22 18:23:00 bsiegert Exp $
+
+Unbreak compilation after upstream patch.
+
+--- libproxy/url.cpp.orig      2020-09-22 17:58:59.242281079 +0000
++++ libproxy/url.cpp
+@@ -34,6 +34,7 @@
+ #include <sys/stat.h> // For stat()
+ #include <algorithm> // For transform()
+ #include <unistd.h>  // For read() close()
++#include <errno.h>
+ 
+ #ifdef WIN32
+ #include <io.h>