cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bring a couple of fixes from upstream, including a mem leak.

Browse Source
This commit is contained in:
ajacoutot 2013-05-08 16:14:34 +00:00
parent a779f0ee53
commit 70ac08ef70
3 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/libproxy/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.34 2013/04/14 08:31:00 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.35 2013/05/08 16:14:34 ajacoutot Exp $
# sync with ONLY_FOR_ARCHS in devel/spidermonkey
ONLY_FOR_ARCHS-mozilla= alpha amd64 i386 hppa mips64el mips64 powerpc sparc64
@ -16,6 +16,8 @@ PKGNAME-main= libproxy-${VERSION}
PKGNAME-mozilla= libproxy-mozilla-${VERSION}
PKGNAME-webkit= libproxy-webkit-${VERSION}
REVISION-main= 0
CATEGORIES= net
SHARED_LIBS += proxy 1.1 # 0.0

8
net/libproxy/patches/patch-bindings_perl_src_CMakeLists_txt
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-bindings_perl_src_CMakeLists_txt,v 1.2 2012/10/12 13:01:15 sthen Exp $
--- bindings/perl/src/CMakeLists.txt.orig Fri Oct 12 13:39:38 2012
+++ bindings/perl/src/CMakeLists.txt Fri Oct 12 13:39:42 2012
$OpenBSD: patch-bindings_perl_src_CMakeLists_txt,v 1.3 2013/05/08 16:14:34 ajacoutot Exp $
--- bindings/perl/src/CMakeLists.txt.orig Wed Nov 24 21:50:12 2010
+++ bindings/perl/src/CMakeLists.txt Wed May 8 18:10:13 2013
@@ -4,7 +4,7 @@ include_directories( ${PERL_INCLUDE_PATH} ${CMAKE_SOUR
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/Libproxy.c
COMMAND ${PERL_EXECUTABLE} ARGS ${CMAKE_CURRENT_SOURCE_DIR}/doxsubpp.pl
@ -15,7 +15,7 @@ $OpenBSD: patch-bindings_perl_src_CMakeLists_txt,v 1.2 2012/10/12 13:01:15 sthen
add_library(PLlibproxy SHARED ${Libproxy_LIB_SRCS})
-target_link_libraries(PLlibproxy ${PERL_LIBRARY} libproxy)
+target_link_libraries(PLlibproxy ${PERL_LIBRARY} proxy)
+target_link_libraries(PLlibproxy ${PERL_LIBRARY} proxy pthread)
set_target_properties(PLlibproxy PROPERTIES OUTPUT_NAME "Libproxy")
set_target_properties(PLlibproxy PROPERTIES PREFIX "")

22
net/libproxy/patches/patch-libproxy_url_cpp Normal file
View File

@ -0,0 +1,22 @@
$OpenBSD: patch-libproxy_url_cpp,v 1.2 2013/05/08 16:14:34 ajacoutot Exp $
https://code.google.com/p/libproxy/source/detail?r=870
--- libproxy/url.cpp.orig Wed May 8 18:02:23 2013
+++ libproxy/url.cpp Wed May 8 18:02:51 2013
@@ -403,6 +403,7 @@ char* url::get_pac() {
buffer = NULL;
}
}
+ close(sock);
return buffer;
}
@@ -496,6 +497,7 @@ char* url::get_pac() {
// Clean up
shutdown(sock, SHUT_RDWR);
+ close(sock);
return buffer;
}