summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/libproxy/libproxy/0001-test-Include-sys-select.h-for-select.patch37
-rw-r--r--meta/recipes-support/libproxy/libproxy_0.4.13.bb (renamed from meta/recipes-support/libproxy/libproxy_0.4.11.bb)14
2 files changed, 7 insertions, 44 deletions
diff --git a/meta/recipes-support/libproxy/libproxy/0001-test-Include-sys-select.h-for-select.patch b/meta/recipes-support/libproxy/libproxy/0001-test-Include-sys-select.h-for-select.patch
deleted file mode 100644
index 5ae52f2d43..0000000000
--- a/meta/recipes-support/libproxy/libproxy/0001-test-Include-sys-select.h-for-select.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From f5f2c2289eb35eb804c1c35e46ca41b58e4cae01 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 6 Apr 2015 14:13:49 -0700
4Subject: [PATCH] test: Include <sys/select.h> for select()
5
6As per posix we need to include this file otherwise we end up with errors like
7
8/home/kraj/work/bleeding/openembedded-core/build/tmp-musl/work/mips32r2-oe-linux-musl/libproxy/0.4.11-r0/libproxy-0.4.11/libproxy/test/get-pac-test.cpp: In member function 'bool TestServer::loop()':
9/home/kraj/work/bleeding/openembedded-core/build/tmp-musl/work/mips32r2-oe-linux-musl/libproxy/0.4.11-r0/libproxy-0.4.11/libproxy/test/get-pac-test.cpp:80:4: error: 'fd_set' was not declared in this scope
10 fd_set fds;
11 ^
12/home/kraj/work/bleeding/openembedded-core/build/tmp-musl/work/mips32r2-oe-linux-musl/libproxy/0.4.11-r0/libproxy-0.4.11/libproxy/test/get-pac-test.cpp:89:14: error: 'fds' was not declared in this scope
13 FD_ZERO (&fds);
14<JIRA TICKET #1>, <JIRA TICKET #2>, <JIRA TICKET #n> : <one line summary of change>
15
16Upstream-Status: Pending
17
18Signed-off-by: Khem Raj <raj.khem@gmail.com>
19---
20 libproxy/test/get-pac-test.cpp | 1 +
21 1 file changed, 1 insertion(+)
22
23diff --git a/libproxy/test/get-pac-test.cpp b/libproxy/test/get-pac-test.cpp
24index a61fc4b..bda4646 100644
25--- a/libproxy/test/get-pac-test.cpp
26+++ b/libproxy/test/get-pac-test.cpp
27@@ -3,6 +3,7 @@
28 #include <sstream>
29 #include <string>
30
31+#include <sys/select.h>
32 #include <sys/socket.h>
33 #include <netinet/in.h>
34 #include <arpa/inet.h>
35--
362.1.4
37
diff --git a/meta/recipes-support/libproxy/libproxy_0.4.11.bb b/meta/recipes-support/libproxy/libproxy_0.4.13.bb
index 8cc90bb8e7..3940e228d3 100644
--- a/meta/recipes-support/libproxy/libproxy_0.4.11.bb
+++ b/meta/recipes-support/libproxy/libproxy_0.4.13.bb
@@ -1,6 +1,6 @@
1SUMMARY = "Library providing automatic proxy configuration management" 1SUMMARY = "Library providing automatic proxy configuration management"
2HOMEPAGE = "http://code.google.com/p/libproxy/" 2HOMEPAGE = "https://github.com/libproxy/libproxy"
3BUGTRACKER = "http://code.google.com/p/libproxy/issues/list" 3BUGTRACKER = "https://github.com/libproxy/libproxy/issues"
4SECTION = "libs" 4SECTION = "libs"
5LICENSE = "LGPLv2.1+" 5LICENSE = "LGPLv2.1+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
@@ -8,12 +8,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
8 8
9DEPENDS = "glib-2.0" 9DEPENDS = "glib-2.0"
10 10
11SRC_URI = "${DEBIAN_MIRROR}/main/libp/${BPN}/${BPN}_${PV}.orig.tar.gz \ 11SRC_URI = "https://github.com/${BPN}/${BPN}/archive/${PV}.tar.gz"
12 file://0001-test-Include-sys-select.h-for-select.patch \
13 "
14 12
15SRC_URI[md5sum] = "3cd1ae2a4abecf44b3f24d6639d2cd84" 13UPSTREAM_CHECK_URI = "https://github.com/libproxy/libproxy/releases"
16SRC_URI[sha256sum] = "dc3f33de54163718f82b3e7c496a7de97f8862578414b8ecaad3cbfe4821864b" 14
15SRC_URI[md5sum] = "de293bb311f185a2ffa3492700a694c2"
16SRC_URI[sha256sum] = "d610bc0ef81a18ba418d759c5f4f87bf7102229a9153fb397d7d490987330ffd"
17 17
18inherit cmake pkgconfig 18inherit cmake pkgconfig
19 19