mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-21 04:06:46 +00:00
Update libproxy and its slave ports to 0.4.12.
After being dormant since 2013, libproxy development picked up some steam at
the end of last year, and the project moved from Google Code to GitHub,
where its releases are also being hosted. A summary of changes between 0.4.6
and 0.4.12 can be found here:
https://github.com/libproxy/libproxy/blob/0.4.12/NEWS
The libproxy ports themselves have undergone several changes too:
* net/libproxy
- Drop a lot of patches that are no longer necessary.
- Add a few patches that I have sent upstream, and add some context to the
0.4.6 patches that are still required.
- Explicitly disable a few build options (.NET bindings, for example).
- Switch to an out-of-source CMake build (also applies to the slave
ports).
- Drop the unnecessary post-install target, likely added before pkg and
our ports system got smart enough to remove directories when needed.
* net/libproxy-gnome
- Explicitly add dependency on devel/glib20 as the code links against
GObject.
- Make it clear that this plug-in targets GNOME2 desktops and uses GConf
to read proxy settings.
* net/libproxy-gnome3
- New port. Similar to libproxy-gnome, but targets GNOME3/Mate and reads
proxy settings via GSettings instead. libproxy-gnome retained its name
to avoid confusing users and requiring instructions in UPDATING.
* net/libproxy-kde
- The KDE configuration plug-in has been rewritten upstream and no longer
links against Qt or any KDE libraries. Instead, it just has a run-time
dependency on either kreadconfig (from KDE4) or kreadconfig5 (from KDE
Frameworks 5).
* net/libproxy-mozjs
- Resurrect the port; the plug-in has been rewritten and now uses
lang/spidermonkey185 to parse the JavaScript in .pac files.
* net/libproxy-webkit
- Switch to depending www/webkit-gtk3 instead of www/webkit-gtk2. In
practice, there is no huge difference since libproxy only uses the
JavaScriptCore layer (which is toolkit-independent) to parse .pac files.
Finally, thanks to mat@ for answering some questions about libproxy-perl and
which Perl patches still needed to be retained or rewritten.
Approved by: gnome (kwm)
This commit is contained in:
Raphael Kubo da Costa
parent
e799f2f50a
commit
13d74ef592
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=406680
1
MOVED
1
MOVED
@ -4887,7 +4887,6 @@ graphics/phpsview||2013-09-01|Has expired: Broken on FreeBSD 8 and newer
|
||||
misc/usbrh||2013-09-01|Has expired: Broken on FreeBSD 8 and newer
|
||||
net/atmsupport||2013-09-01|Has expired: Broken on FreeBSD 8 and newer
|
||||
comms/ib-kmod||2013-09-01|Has expired: Broken on FreeBSD 8 and newer
|
||||
net/libproxy-mozjs||2013-09-01|Has expired: Does not work with newer libxul
|
||||
www/helixplugin||2013-09-01|Has expired: Does not work with newer libxul
|
||||
deskutils/chmsee||2013-09-01|Has expired: Does not work with newer libxul
|
||||
www/moonshine||2013-09-01|Has expired: Does not work with newer libxul
|
||||
|
||||
@ -339,7 +339,9 @@
|
||||
SUBDIR += libpcapnav
|
||||
SUBDIR += libproxy
|
||||
SUBDIR += libproxy-gnome
|
||||
SUBDIR += libproxy-gnome3
|
||||
SUBDIR += libproxy-kde
|
||||
SUBDIR += libproxy-mozjs
|
||||
SUBDIR += libproxy-perl
|
||||
SUBDIR += libproxy-python
|
||||
SUBDIR += libproxy-webkit
|
||||
|
||||
@ -2,28 +2,30 @@
|
||||
# $FreeBSD$
|
||||
# $MCom: ports/net/libproxy-gnome/Makefile,v 1.1 2011/01/12 13:10:53 kwm Exp $
|
||||
|
||||
PORTREVISION= 2
|
||||
PORTREVISION= 0
|
||||
CATEGORIES= net devel
|
||||
PKGNAMESUFFIX= -gnome
|
||||
|
||||
MAINTAINER= gnome@FreeBSD.org
|
||||
COMMENT= GNOME plug-in for libproxy
|
||||
COMMENT= GConf-based plug-in for libproxy
|
||||
|
||||
LIB_DEPENDS= libproxy.so:${PORTSDIR}/net/libproxy
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../libproxy
|
||||
DESCR= ${.CURDIR}/pkg-descr
|
||||
PLIST= ${.CURDIR}/pkg-plist
|
||||
USE_GNOME= gconf2
|
||||
|
||||
ALL_TARGET= config_gnome pxgconf
|
||||
USE_GNOME= gconf2 glib20
|
||||
USES= pkgconfig
|
||||
|
||||
LIBPROXY_SLAVE= gnome
|
||||
|
||||
do-install:
|
||||
${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/modules/
|
||||
${INSTALL_LIB} ${WRKSRC}/libproxy/config_gnome.so \
|
||||
${INSTALL_LIB} ${BUILD_WRKSRC}/libproxy/config_gnome.so \
|
||||
${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/modules/
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/libproxy/pxgconf \
|
||||
${INSTALL_PROGRAM} ${BUILD_WRKSRC}/libproxy/pxgconf \
|
||||
${STAGEDIR}${PREFIX}/libexec/
|
||||
|
||||
.include "${MASTERDIR}/Makefile"
|
||||
|
||||
@ -2,6 +2,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 allows the GNOME Desktop to make use of libproxy.
|
||||
This plug-in allows libproxy to obtain proxy settings from a GNOME2 desktop
|
||||
by using GConf.
|
||||
|
||||
WWW: https://libproxy.github.io/libproxy/
|
||||
|
||||
29
net/libproxy-gnome3/Makefile
Normal file
29
net/libproxy-gnome3/Makefile
Normal file
@ -0,0 +1,29 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTREVISION= 0
|
||||
CATEGORIES= net devel
|
||||
PKGNAMESUFFIX= -gnome3
|
||||
|
||||
MAINTAINER= gnome@FreeBSD.org
|
||||
COMMENT= GSettings-based configuration plug-in for libproxy
|
||||
|
||||
LIB_DEPENDS= libproxy.so:${PORTSDIR}/net/libproxy
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../libproxy
|
||||
DESCR= ${.CURDIR}/pkg-descr
|
||||
PLIST= ${.CURDIR}/pkg-plist
|
||||
|
||||
ALL_TARGET= config_gnome3 pxgsettings
|
||||
USE_GNOME= glib20
|
||||
USES= pkgconfig
|
||||
|
||||
LIBPROXY_SLAVE= gnome3
|
||||
|
||||
do-install:
|
||||
${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/modules/
|
||||
${INSTALL_LIB} ${BUILD_WRKSRC}/libproxy/config_gnome3.so \
|
||||
${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/modules/
|
||||
${INSTALL_PROGRAM} ${BUILD_WRKSRC}/libproxy/pxgsettings \
|
||||
${STAGEDIR}${PREFIX}/libexec/
|
||||
|
||||
.include "${MASTERDIR}/Makefile"
|
||||
8
net/libproxy-gnome3/pkg-descr
Normal file
8
net/libproxy-gnome3/pkg-descr
Normal file
@ -0,0 +1,8 @@
|
||||
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 allows libproxy to obtain proxy settings from a GNOME3 desktop
|
||||
by using GSettings.
|
||||
|
||||
WWW: https://libproxy.github.io/libproxy/
|
||||
2
net/libproxy-gnome3/pkg-plist
Normal file
2
net/libproxy-gnome3/pkg-plist
Normal file
@ -0,0 +1,2 @@
|
||||
lib/libproxy/%%VERSION%%/modules/config_gnome3.so
|
||||
libexec/pxgsettings
|
||||
@ -2,7 +2,7 @@
|
||||
# $FreeBSD$
|
||||
# $MCom: ports/net/libproxy-kde/Makefile,v 1.1 2011/01/12 13:10:53 kwm Exp $
|
||||
|
||||
PORTREVISION= 6
|
||||
PORTREVISION= 0
|
||||
CATEGORIES= net devel
|
||||
PKGNAMESUFFIX= -kde
|
||||
|
||||
@ -14,14 +14,15 @@ LIB_DEPENDS= libproxy.so:${PORTSDIR}/net/libproxy
|
||||
MASTERDIR= ${.CURDIR}/../libproxy
|
||||
DESCR= ${.CURDIR}/pkg-descr
|
||||
PLIST= ${.CURDIR}/pkg-plist
|
||||
USE_QT4= corelib moc_build qmake_build uic_build rcc_build
|
||||
USE_KDE4= automoc4 kdelibs
|
||||
|
||||
ALL_TARGET= config_kde
|
||||
USE_KDE4= runtime
|
||||
|
||||
LIBPROXY_SLAVE= kde
|
||||
|
||||
do-install:
|
||||
@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/modules/
|
||||
${INSTALL_LIB} ${WRKSRC}/lib/config_kde4.so \
|
||||
${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/modules/
|
||||
${INSTALL_LIB} ${BUILD_WRKSRC}/libproxy/config_kde.so \
|
||||
${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/modules/
|
||||
|
||||
.include "${MASTERDIR}/Makefile"
|
||||
|
||||
@ -1 +1 @@
|
||||
lib/libproxy/%%VERSION%%/modules/config_kde4.so
|
||||
lib/libproxy/%%VERSION%%/modules/config_kde.so
|
||||
|
||||
29
net/libproxy-mozjs/Makefile
Normal file
29
net/libproxy-mozjs/Makefile
Normal file
@ -0,0 +1,29 @@
|
||||
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
|
||||
# $FreeBSD$
|
||||
# $MCom: ports/net/libproxy-mozjs/Makefile,v 1.5 2011/01/12 13:10:53 kwm Exp $
|
||||
|
||||
PORTREVISION= 0
|
||||
CATEGORIES= net www
|
||||
PKGNAMESUFFIX= -mozjs
|
||||
|
||||
MAINTAINER= gnome@FreeBSD.org
|
||||
COMMENT= Mozilla JavaScript plug-in for libproxy
|
||||
|
||||
LIB_DEPENDS= libmozjs185.so:${PORTSDIR}/lang/spidermonkey185 \
|
||||
libproxy.so:${PORTSDIR}/net/libproxy
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../libproxy
|
||||
DESCR= ${.CURDIR}/pkg-descr
|
||||
PLIST= ${.CURDIR}/pkg-plist
|
||||
|
||||
ALL_TARGET= pacrunner_mozjs
|
||||
USES= pkgconfig
|
||||
|
||||
LIBPROXY_SLAVE= mozjs
|
||||
|
||||
do-install:
|
||||
${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/modules/
|
||||
${INSTALL_LIB} ${BUILD_WRKSRC}/libproxy/pacrunner_mozjs.so \
|
||||
${STAGEDIR}${PREFIX}/lib/libproxy/${PORTVERSION}/modules/
|
||||
|
||||
.include "${MASTERDIR}/Makefile"
|
||||
7
net/libproxy-mozjs/pkg-descr
Normal file
7
net/libproxy-mozjs/pkg-descr
Normal file
@ -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 allows Mozilla-based browsers to make use of libproxy.
|
||||
|
||||
WWW: http://code.google.com/p/libproxy/
|
||||
1
net/libproxy-mozjs/pkg-plist
Normal file
1
net/libproxy-mozjs/pkg-plist
Normal file
@ -0,0 +1 @@
|
||||
lib/libproxy/%%VERSION%%/modules/pacrunner_mozjs.so
|
||||
@ -2,7 +2,7 @@
|
||||
# $FreeBSD$
|
||||
# $MCom: ports/net/libproxy-perl/Makefile,v 1.1 2011/01/12 13:10:53 kwm Exp $
|
||||
|
||||
PORTREVISION= 3
|
||||
PORTREVISION= 0
|
||||
CATEGORIES= net lang
|
||||
PKGNAMESUFFIX= -perl
|
||||
|
||||
@ -14,8 +14,10 @@ LIB_DEPENDS= libproxy.so:${PORTSDIR}/net/libproxy
|
||||
MASTERDIR= ${.CURDIR}/../libproxy
|
||||
DESCR= ${.CURDIR}/pkg-descr
|
||||
PLIST= ${.CURDIR}/pkg-plist
|
||||
|
||||
BUILD_WRKSRC= ${CONFIGURE_WRKSRC}/bindings/perl
|
||||
INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}/bindings/perl
|
||||
USES= perl5
|
||||
INSTALL_WRKSRC= ${WRKSRC}/bindings/perl
|
||||
|
||||
LIBPROXY_SLAVE= perl
|
||||
|
||||
|
||||
@ -1,3 +1,2 @@
|
||||
%%SITE_ARCH%%/Net/Libproxy.pm
|
||||
%%SITE_ARCH%%/auto/Net/Libproxy/Libproxy.so
|
||||
@dir lib/libproxy/%%VERSION%%/modules
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# $FreeBSD$
|
||||
# $MCom: ports/net/libproxy-python/Makefile,v 1.1 2011/01/12 13:10:54 kwm Exp $
|
||||
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 0
|
||||
CATEGORIES= net lang
|
||||
PKGNAMESUFFIX= -python
|
||||
|
||||
|
||||
@ -2,26 +2,28 @@
|
||||
# $FreeBSD$
|
||||
# $MCom: ports/net/libproxy-webkit/Makefile,v 1.13 2011/03/06 23:12:41 kwm Exp $
|
||||
|
||||
PORTREVISION= 4
|
||||
PORTREVISION= 0
|
||||
CATEGORIES= net www
|
||||
PKGNAMESUFFIX= -webkit
|
||||
|
||||
MAINTAINER= gnome@FreeBSD.org
|
||||
COMMENT= WebKit JavaScript plug-in for libproxy
|
||||
|
||||
LIB_DEPENDS= libproxy.so:${PORTSDIR}/net/libproxy \
|
||||
libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
|
||||
LIB_DEPENDS= libjavascriptcoregtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 \
|
||||
libproxy.so:${PORTSDIR}/net/libproxy
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../libproxy
|
||||
DESCR= ${.CURDIR}/pkg-descr
|
||||
PLIST= ${.CURDIR}/pkg-plist
|
||||
|
||||
ALL_TARGET= pacrunner_webkit
|
||||
USES= pkgconfig
|
||||
|
||||
LIBPROXY_SLAVE= webkit
|
||||
|
||||
do-install:
|
||||
${MKDIR} ${STAGEDIR}${PREFIX}/lib/libproxy/${PORTVERSION}/modules/
|
||||
${INSTALL_LIB} ${WRKSRC}/libproxy/pacrunner_webkit.so \
|
||||
${INSTALL_LIB} ${BUILD_WRKSRC}/libproxy/pacrunner_webkit.so \
|
||||
${STAGEDIR}${PREFIX}/lib/libproxy/${PORTVERSION}/modules/
|
||||
|
||||
.include "${MASTERDIR}/Makefile"
|
||||
|
||||
@ -3,25 +3,30 @@
|
||||
# $MCom: ports/net/libproxy/Makefile,v 1.1 2011/01/12 13:10:52 kwm Exp $
|
||||
|
||||
PORTNAME= libproxy
|
||||
PORTVERSION= 0.4.6
|
||||
PORTREVISION?= 1
|
||||
PORTVERSION= 0.4.12
|
||||
PORTREVISION?= 0
|
||||
CATEGORIES?= net devel
|
||||
MASTER_SITES= GOOGLE_CODE
|
||||
|
||||
MAINTAINER= gnome@FreeBSD.org
|
||||
COMMENT?= Library that provides automatic proxy configuration management
|
||||
|
||||
USES+= cmake cpe
|
||||
CPE_VENDOR= libproxy_project
|
||||
CPE_VENDOR= libproxy_project
|
||||
PATHFIX_CMAKELISTSTXT= devfiles.cmk
|
||||
USE_GITHUB= yes
|
||||
USES+= cmake:outsource cpe pathfix
|
||||
|
||||
PLIST_SUB+= VERSION=${PORTVERSION}
|
||||
|
||||
CMAKE_ARGS= -DBIPR:BOOL=OFF -DWITH_DOTNET:BOOL=OFF \
|
||||
-DWITH_NATUS:BOOL=OFF -DWITH_NM:BOOL=OFF \
|
||||
-DWITH_VALA:BOOL=ON
|
||||
|
||||
.if !defined(LIBPROXY_SLAVE)
|
||||
USE_LDCONFIG= yes
|
||||
CMAKE_ARGS+= -DWITH_PYTHON:BOOL=OFF -DWITH_PERL:BOOL=OFF \
|
||||
-DWITH_GNOME:BOOL=OFF -DWITH_KDE4:BOOL=OFF \
|
||||
-DWITH_WEBKIT:BOOL=OFF -DWITH_MOZJS:BOOL=OFF \
|
||||
-DWITH_NETWORKMANAGER:BOOL=OFF -DWITH_VALA:BOOL=ON
|
||||
CMAKE_ARGS+= -DWITH_PYTHON:BOOL=OFF -DWITH_PERL:BOOL=OFF \
|
||||
-DWITH_GNOME2:BOOL=OFF -DWITH_GNOME3:BOOL=OFF \
|
||||
-DWITH_KDE:BOOL=OFF -DWITH_MOZJS:BOOL=OFF \
|
||||
-DWITH_WEBKIT:BOOL=OFF -DWITH_WEBKIT3:BOOL=OFF
|
||||
.else
|
||||
PORTSCOUT= ignore:1
|
||||
|
||||
@ -42,21 +47,27 @@ CMAKE_ARGS+= -DWITH_PERL:BOOL=OFF
|
||||
. endif
|
||||
|
||||
. if ${LIBPROXY_SLAVE}=="gnome"
|
||||
CMAKE_ARGS+= -DWITH_GNOME:BOOL=ON
|
||||
CMAKE_ARGS+= -DWITH_GNOME2:BOOL=ON
|
||||
. else
|
||||
CMAKE_ARGS+= -DWITH_GNOME:BOOL=OFF
|
||||
CMAKE_ARGS+= -DWITH_GNOME2:BOOL=OFF
|
||||
. endif
|
||||
|
||||
. if ${LIBPROXY_SLAVE}=="gnome3"
|
||||
CMAKE_ARGS+= -DWITH_GNOME3:BOOL=ON
|
||||
. else
|
||||
CMAKE_ARGS+= -DWITH_GNOME3:BOOL=OFF
|
||||
. endif
|
||||
|
||||
. if ${LIBPROXY_SLAVE}=="kde"
|
||||
CMAKE_ARGS+= -DWITH_KDE4:BOOL=ON
|
||||
CMAKE_ARGS+= -DWITH_KDE:BOOL=ON
|
||||
. else
|
||||
CMAKE_ARGS+= -DWITH_KDE4:BOOL=OFF
|
||||
CMAKE_ARGS+= -DWITH_KDE:BOOL=OFF
|
||||
. endif
|
||||
|
||||
. if ${LIBPROXY_SLAVE}=="webkit"
|
||||
CMAKE_ARGS+= -DWITH_WEBKIT:BOOL=ON
|
||||
CMAKE_ARGS+= -DWITH_WEBKIT3:BOOL=ON
|
||||
. else
|
||||
CMAKE_ARGS+= -DWITH_WEBKIT:BOOL=OFF
|
||||
CMAKE_ARGS+= -DWITH_WEBKIT3:BOOL=OFF -DWITH_WEBKIT:BOOL=OFF
|
||||
. endif
|
||||
|
||||
. if ${LIBPROXY_SLAVE}=="mozjs"
|
||||
@ -66,10 +77,4 @@ CMAKE_ARGS+= -DWITH_MOZJS:BOOL=OFF
|
||||
. endif
|
||||
.endif
|
||||
|
||||
# This will be removed after the update to 0.4.12.
|
||||
.if !target(post-install)
|
||||
post-install:
|
||||
@${MKDIR} ${STAGEDIR}${PREFIX}/lib/libproxy/${PORTVERSION}/modules/
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (libproxy-0.4.6.tar.gz) = 9ad912e63b1efca98fb442240a2bc7302e6021c1d0b1b9363327729f29462f30
|
||||
SIZE (libproxy-0.4.6.tar.gz) = 82483
|
||||
SHA256 (libproxy-libproxy-0.4.12_GH0.tar.gz) = add9c5e30767c17b00f842f6280d818ece1eb23ab92e1fc68661204c95d7e22b
|
||||
SIZE (libproxy-libproxy-0.4.12_GH0.tar.gz) = 87765
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
commit c440553c12836664afd24a24fb3a4d10a2facd2c
|
||||
Author: nicolas.dufresne@gmail.com <nicolas.dufresne@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56>
|
||||
Date: Wed Oct 10 16:14:27 2012 +0000
|
||||
|
||||
Fix buffer overflow downloading large pac file
|
||||
|
||||
This fixes CVE CVE-2012-4504
|
||||
|
||||
--- libproxy/url.cpp
|
||||
+++ libproxy/url.cpp
|
||||
@@ -474,9 +474,10 @@ char* url::get_pac() {
|
||||
// Add this chunk to our content length,
|
||||
// ensuring that we aren't over our max size
|
||||
content_length += chunk_length;
|
||||
- if (content_length >= PAC_MAX_SIZE) break;
|
||||
}
|
||||
|
||||
+ if (content_length >= PAC_MAX_SIZE) break;
|
||||
+
|
||||
while (recvd != content_length) {
|
||||
int r = recv(sock, buffer + recvd, content_length - recvd, 0);
|
||||
if (r < 0) break;
|
||||
@ -1,10 +1,21 @@
|
||||
--- bindings/perl/src/CMakeLists.txt.orig 2010-09-01 20:23:34 UTC
|
||||
* Explicitly against libperl.so.x.y.
|
||||
This is being discussed in https://github.com/libproxy/libproxy/pull/7.
|
||||
We need this for `make stage-qa' to pass, as the Libproxy.so binding uses
|
||||
libperl symbols and thus should link against it.
|
||||
|
||||
* Set RPATH in Libproxy.so.
|
||||
We do not install libperl.so into ${LOCALBASE}/lib, so the Libproxy.so ELF
|
||||
binary must be told the non-default location where it should look for
|
||||
libperl.so.x.y.
|
||||
--- bindings/perl/src/CMakeLists.txt.orig 2016-01-12 16:41:07 UTC
|
||||
+++ bindings/perl/src/CMakeLists.txt
|
||||
@@ -12,6 +12,7 @@ set(Libproxy_LIB_SRCS Libproxy.c)
|
||||
|
||||
set(CMAKE_C_COMPILER ${CMAKE_CXX_COMPILER})
|
||||
set(CMAKE_C_FLAGS ${PERL_CXX_FLAGS} )
|
||||
+SET(CMAKE_INSTALL_RPATH ${PERL_INCLUDE_DIR})
|
||||
|
||||
@@ -12,7 +12,8 @@ set(Libproxy_LIB_SRCS Libproxy.c)
|
||||
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/perl/blib/arch/auto/Net)
|
||||
add_library(PLlibproxy SHARED ${Libproxy_LIB_SRCS})
|
||||
|
||||
-target_link_libraries(PLlibproxy libproxy pthread)
|
||||
+target_link_libraries(PLlibproxy ${PERL_LIBRARY} libproxy pthread)
|
||||
+set_target_properties(PLlibproxy PROPERTIES INSTALL_RPATH "${PERL_INCLUDE_DIR}")
|
||||
set_target_properties(PLlibproxy PROPERTIES OUTPUT_NAME "Libproxy")
|
||||
set_target_properties(PLlibproxy PROPERTIES PREFIX "")
|
||||
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
--- libmodman/CMakeLists.txt.orig 2010-09-01 22:23:34.000000000 +0200
|
||||
+++ libmodman/CMakeLists.txt 2011-01-08 01:39:09.000000000 +0100
|
||||
@@ -12,9 +12,9 @@
|
||||
module_manager.hpp
|
||||
module_manager.cpp)
|
||||
if(NOT WIN32)
|
||||
- target_link_libraries(modman dl)
|
||||
+ target_link_libraries(modman)
|
||||
endif()
|
||||
-set_target_properties(modman PROPERTIES PREFIX "lib" VERSION 1.0.0 SOVERSION 1)
|
||||
+set_target_properties(modman PROPERTIES PREFIX "lib" VERSION 1 SOVERSION 1)
|
||||
install(TARGETS modman DESTINATION ${LIB_INSTALL_DIR})
|
||||
|
||||
### Tests
|
||||
@ -1,11 +1,28 @@
|
||||
--- libproxy/CMakeLists.txt.orig 2010-09-01 22:23:34.000000000 +0200
|
||||
+++ libproxy/CMakeLists.txt 2010-12-27 10:59:14.000000000 +0100
|
||||
@@ -6,7 +6,7 @@
|
||||
Setting _POSIX_C_SOURCE unsets __BSD_VISIBLE by default, and several symbols
|
||||
end up being hidden, leading to failures such as:
|
||||
|
||||
In file included from /wrkdir/libproxy-0.4.12/libproxy/test/url-encode.cpp:2:
|
||||
In file included from /usr/include/c++/v1/iostream:38:
|
||||
In file included from /usr/include/c++/v1/ios:216:
|
||||
/usr/include/c++/v1/__locale:545:16: error: use of undeclared identifier 'isascii'
|
||||
return isascii(__c) ? (__tab_[static_cast<int>(__c)] & __m) !=0 : false;
|
||||
^
|
||||
/usr/include/c++/v1/__locale:552:22: error: use of undeclared identifier 'isascii'
|
||||
*__vec = isascii(*__low) ? __tab_[static_cast<int>(*__low)] : 0;
|
||||
^
|
||||
/usr/include/c++/v1/__locale:560:17: error: use of undeclared identifier 'isascii'
|
||||
if (isascii(*__low) && (__tab_[static_cast<int>(*__low)] & __m))
|
||||
^
|
||||
/usr/include/c++/v1/__locale:569:19: error: use of undeclared identifier 'isascii'
|
||||
if (!(isascii(*__low) && (__tab_[static_cast<int>(*__low)] & __m)))
|
||||
^
|
||||
--- libproxy/CMakeLists.txt.orig 2016-01-12 16:41:07 UTC
|
||||
+++ libproxy/CMakeLists.txt
|
||||
@@ -6,7 +6,6 @@ set_project_version(0 4 12)
|
||||
if (WIN32)
|
||||
add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)
|
||||
else(WIN32)
|
||||
- add_definitions(-D_POSIX_C_SOURCE=1)
|
||||
+# add_definitions(-D_POSIX_C_SOURCE=1)
|
||||
- add_definitions(-D_POSIX_C_SOURCE=200112L)
|
||||
set(CMAKE_CXX_FLAGS "-fvisibility=hidden ${CMAKE_CXX_FLAGS}")
|
||||
endif(WIN32)
|
||||
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- libproxy/cmake/devfiles.cmk.orig 2010-09-01 22:23:34.000000000 +0200
|
||||
+++ libproxy/cmake/devfiles.cmk 2010-12-27 11:23:34.000000000 +0100
|
||||
@@ -15,7 +15,7 @@
|
||||
endif(IS_ABSOLUTE ${INCLUDE_INSTALL_DIR})
|
||||
|
||||
configure_file(${CMAKE_SOURCE_DIR}/libproxy/libproxy-1.0.pc.in ${CMAKE_BINARY_DIR}/libproxy-1.0.pc @ONLY)
|
||||
- install(FILES ${CMAKE_BINARY_DIR}/libproxy-1.0.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
|
||||
+ install(FILES ${CMAKE_BINARY_DIR}/libproxy-1.0.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata//pkgconfig)
|
||||
|
||||
# CMake Find helper
|
||||
configure_file(${CMAKE_SOURCE_DIR}/libproxy/Findlibproxy.cmake.in ${CMAKE_BINARY_DIR}/Findlibproxy.cmake @ONLY)
|
||||
@ -1,19 +0,0 @@
|
||||
--- libproxy/cmake/libproxy.cmk.orig 2010-09-01 22:23:34.000000000 +0200
|
||||
+++ libproxy/cmake/libproxy.cmk 2011-01-08 01:32:46.000000000 +0100
|
||||
@@ -2,7 +2,7 @@ add_library(libproxy SHARED extension_co
|
||||
if(WIN32)
|
||||
target_link_libraries(libproxy modman;ws2_32;${LIBPROXY_LIBRARIES})
|
||||
else()
|
||||
- target_link_libraries(libproxy modman;m;pthread;dl;${LIBPROXY_LIBRARIES})
|
||||
+ target_link_libraries(libproxy modman;m;pthread;${LIBPROXY_LIBRARIES})
|
||||
endif()
|
||||
file(TO_NATIVE_PATH ${MODULE_INSTALL_DIR} MODULE_INSTALL_DIR)
|
||||
if(WIN32)
|
||||
@@ -17,6 +17,6 @@ endif()
|
||||
|
||||
set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp
|
||||
PROPERTY COMPILE_DEFINITIONS MODULEDIR="${MODULEDIR}";BUILTIN_MODULES=${BUILTIN_MODULES})
|
||||
-set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1)
|
||||
+set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1 SOVERSION 1)
|
||||
install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR})
|
||||
install(FILES proxy.h DESTINATION ${INCLUDE_INSTALL_DIR})
|
||||
@ -1,16 +1,15 @@
|
||||
--- libproxy/cmake/modules.cmk.orig 2011-01-08 01:06:52.000000000 +0100
|
||||
+++ libproxy/cmake/modules.cmk 2011-01-08 01:07:02.000000000 +0100
|
||||
@@ -17,10 +17,10 @@ include(cmake/modules/pacrunner_mozjs.cm
|
||||
include(cmake/modules/pacrunner_webkit.cmk)
|
||||
|
||||
# Build the pacrunner into libproxy unless we are building for multiple engines
|
||||
-set(BIPR 1)
|
||||
-if(MOZJS_FOUND AND WEBKIT_FOUND)
|
||||
+#set(BIPR 1)
|
||||
+#if(MOZJS_FOUND AND WEBKIT_FOUND)
|
||||
set(BIPR 0)
|
||||
-endif()
|
||||
+#endif()
|
||||
|
||||
#
|
||||
## Module definition
|
||||
Use only the value of WITH_KDE to determine whether to build config_kde.
|
||||
|
||||
See the changes in patch-libproxy_cmake_modules_config__kde.cmk for more
|
||||
information.
|
||||
--- libproxy/cmake/modules.cmk.orig 2016-01-18 19:41:03 UTC
|
||||
+++ libproxy/cmake/modules.cmk
|
||||
@@ -32,7 +32,7 @@ px_module(config_envvar "${EN
|
||||
px_module(config_sysconfig "${SYSCONFIG_FOUND}" 1)
|
||||
px_module(config_gnome "${GNOME2_FOUND}" 0)
|
||||
px_module(config_gnome3 "${GNOME3_FOUND}" 0)
|
||||
-px_module(config_kde "${KDE_FOUND}" 0)
|
||||
+px_module(config_kde "${WITH_KDE}" 0)
|
||||
px_module(config_macosx "${SC_FOUND}" 1 ${SC_LIBRARIES} ${CF_LIBRARIES})
|
||||
px_module(config_w32reg "${WIN32}" 1)
|
||||
px_module(ignore_domain 1 1)
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
--- libproxy/cmake/modules/config_gnome.cmk.orig 2011-01-08 01:14:36.000000000 +0100
|
||||
+++ libproxy/cmake/modules/config_gnome.cmk 2011-01-08 01:16:19.000000000 +0100
|
||||
@@ -1,4 +1,5 @@
|
||||
if (NOT WIN32 AND NOT APPLE)
|
||||
+ option(WITH_GNOME "Search for GConf2 package" ON)
|
||||
px_check_modules(GNOME gconf-2.0 gobject-2.0)
|
||||
|
||||
# GNOME (gconf) helper
|
||||
@ -0,0 +1,32 @@
|
||||
commit f30191930114cc334e02bb471f2c547198cad91c
|
||||
Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
|
||||
Date: Mon Jan 18 20:19:09 2016 +0100
|
||||
|
||||
config_kde: Decide whether to build the module based only on WITH_KDE.
|
||||
|
||||
kreadconfig/kreadconfig5 are runtime dependencies only. As such, there
|
||||
should not be a build-time dependency on those in CMake at all. In other
|
||||
words, building without those binaries works perfectly fine, and they
|
||||
are only required when running libproxy.
|
||||
|
||||
commit 8ca0db36983e9154c808288fea4cbdfc9a7ea4c5
|
||||
Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
|
||||
Date: Mon Jan 18 16:59:28 2016 +0100
|
||||
|
||||
Make the KDE config module optional again.
|
||||
|
||||
This is a follow-up to bd9bf72 ("Add generic KDE config module"): make
|
||||
it possible for distributions to not build the KDE config module at all,
|
||||
even if it does not have any dependencies on Qt/KDE/KF5.
|
||||
--- libproxy/cmake/modules/config_kde.cmk.orig 2016-01-12 16:41:07 UTC
|
||||
+++ libproxy/cmake/modules/config_kde.cmk
|
||||
@@ -1,6 +1,4 @@
|
||||
-find_program(KDE4_CONF kreadconfig)
|
||||
-find_program(KF5_CONF kreadconfig5)
|
||||
+option(WITH_KDE "Build module to read proxy settings from KDE4/KF5" ON)
|
||||
|
||||
-if (KDE4_CONF OR KF5_CONF)
|
||||
- set(KDE_FOUND 1)
|
||||
-endif()
|
||||
+# There are no additional detections; kreadconfig (from KDE4) and kreadconfig5
|
||||
+# (from KF5) are only needed at runtime.
|
||||
@ -1,9 +0,0 @@
|
||||
--- libproxy/cmake/modules/network_networkmanager.cmk.orig 2011-01-08 01:21:37.000000000 +0100
|
||||
+++ libproxy/cmake/modules/network_networkmanager.cmk 2011-01-08 01:22:18.000000000 +0100
|
||||
@@ -1,3 +1,4 @@
|
||||
if (NOT WIN32 AND NOT APPLE)
|
||||
+ option(WITH_NETWORKMANAGER "Search for NetworkManager package" ON)
|
||||
px_check_modules(NM NetworkManager dbus-1)
|
||||
-endif()
|
||||
\ No newline at end of file
|
||||
+endif()
|
||||
@ -1,11 +0,0 @@
|
||||
--- libproxy/cmake/modules/pacrunner_webkit.cmk.orig 2011-01-08 01:14:30.000000000 +0100
|
||||
+++ libproxy/cmake/modules/pacrunner_webkit.cmk 2011-01-08 01:16:05.000000000 +0100
|
||||
@@ -12,5 +12,6 @@ elseif(APPLE)
|
||||
set(WEBKIT_FOUND 1)
|
||||
endif()
|
||||
else()
|
||||
+ option(WITH_WEBKIT "Search for WebKit package" ON)
|
||||
px_check_modules(WEBKIT webkit-1.0)
|
||||
-endif()
|
||||
\ No newline at end of file
|
||||
+endif()
|
||||
@ -1,10 +0,0 @@
|
||||
--- libproxy/modules/pacrunner_webkit.cpp.orig 2010-09-01 20:23:34.000000000 +0000
|
||||
+++ libproxy/modules/pacrunner_webkit.cpp
|
||||
@@ -20,6 +20,7 @@
|
||||
#include "../extension_pacrunner.hpp"
|
||||
using namespace libproxy;
|
||||
|
||||
+#include <unistd.h>
|
||||
#ifdef __APPLE__
|
||||
// JavaScriptCore.h requires CoreFoundation
|
||||
// This is only found on Mac OS X
|
||||
@ -1,11 +0,0 @@
|
||||
--- libproxy/proxy.cpp.orig 2010-09-01 14:31:50.000000000 +0200
|
||||
+++ libproxy/proxy.cpp 2010-09-01 14:32:09.000000000 +0200
|
||||
@@ -17,6 +17,8 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
******************************************************************************/
|
||||
|
||||
+#include <sys/types.h>
|
||||
+
|
||||
#include <vector>
|
||||
#include <cstring> // For strdup()
|
||||
#include <iostream> // For cerr
|
||||
@ -1,10 +0,0 @@
|
||||
--- libproxy/url.cpp~
|
||||
+++ libproxy/url.cpp
|
||||
@@ -27,6 +27,7 @@
|
||||
#define close _close
|
||||
#endif
|
||||
#include <fcntl.h> // For ::open()
|
||||
+#include <unistd.h> // For close()
|
||||
#include <cstring> // For memcpy()
|
||||
#include <sstream> // For int/string conversion (using stringstream)
|
||||
#include <cstdio> // For sscanf()
|
||||
@ -1,11 +0,0 @@
|
||||
--- libproxy/url.hpp.orig 2010-09-01 14:30:33.000000000 +0200
|
||||
+++ libproxy/url.hpp 2010-09-01 14:31:13.000000000 +0200
|
||||
@@ -20,6 +20,8 @@
|
||||
#ifndef URL_HPP_
|
||||
#define URL_HPP_
|
||||
|
||||
+#include <sys/types.h>
|
||||
+
|
||||
#include <map>
|
||||
#include <stdexcept>
|
||||
#include <string>
|
||||
@ -1,8 +0,0 @@
|
||||
--- utils/CMakeLists.txt~
|
||||
+++ utils/CMakeLists.txt
|
||||
@@ -3,4 +3,5 @@ link_directories(${LIBPROXY_LIBRARY_DIRS
|
||||
|
||||
add_executable(proxy proxy.c)
|
||||
target_link_libraries(proxy libproxy)
|
||||
+set(CMAKE_C_COMPILER ${CMAKE_CXX_COMPILER})
|
||||
install(TARGETS proxy RUNTIME DESTINATION ${BIN_INSTALL_DIR})
|
||||
@ -1,10 +1,8 @@
|
||||
bin/proxy
|
||||
include/proxy.h
|
||||
lib/libmodman.so
|
||||
lib/libmodman.so.1
|
||||
lib/libproxy.so
|
||||
lib/libproxy.so.1
|
||||
lib/libproxy.so.1.0.0
|
||||
libdata/pkgconfig/libproxy-1.0.pc
|
||||
share/cmake/Modules/Findlibproxy.cmake
|
||||
share/vala/vapi/libproxy-1.0.vapi
|
||||
@dir lib/libproxy/%%VERSION%%/modules
|
||||
|
||||
Loading…
Reference in New Issue
Block a user