diff --git a/packages/network/libshairplay/package.mk b/packages/network/libshairplay/package.mk index 0413bf3eee..db0b6db51f 100644 --- a/packages/network/libshairplay/package.mk +++ b/packages/network/libshairplay/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="libshairplay" -PKG_VERSION="6e521c7" +PKG_VERSION="0f41ade" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/network/libshairplay/patches/libshairplay-fixipv4ipv6race.patch b/packages/network/libshairplay/patches/libshairplay-fixipv4ipv6race.patch deleted file mode 100644 index 4580d3cf7d..0000000000 --- a/packages/network/libshairplay/patches/libshairplay-fixipv4ipv6race.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ac9240fa569df5a10d534a4cd45740a44ee00f63 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Juho=20V=C3=A4h=C3=A4-Herttua?= -Date: Mon, 24 Mar 2014 20:35:29 +0200 -Subject: [PATCH] Fix #23 on issue tracker. - -There is a race condition if IPv4 and IPv6 connections come at the same time. ---- - src/lib/httpd.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/lib/httpd.c b/src/lib/httpd.c -index 1d9e7e2..f081c5e 100644 ---- a/src/lib/httpd.c -+++ b/src/lib/httpd.c -@@ -237,7 +237,8 @@ struct httpd_s { - continue; - } - } -- if (httpd->server_fd6 != -1 && FD_ISSET(httpd->server_fd6, &rfds)) { -+ if (httpd->open_connections < httpd->max_connections && -+ httpd->server_fd6 != -1 && FD_ISSET(httpd->server_fd6, &rfds)) { - ret = httpd_accept_connection(httpd, httpd->server_fd6, 1); - if (ret == -1) { - break; --- -1.8.5.5 - diff --git a/packages/network/libshairplay/patches/libshairplay-read_airportkey_from_etc.patch b/packages/network/libshairplay/patches/libshairplay-read_airportkey_from_etc.patch index 0658d8f83f..d7ecbd0b77 100644 --- a/packages/network/libshairplay/patches/libshairplay-read_airportkey_from_etc.patch +++ b/packages/network/libshairplay/patches/libshairplay-read_airportkey_from_etc.patch @@ -1,14 +1,16 @@ --- shairplay-0.9.0.orig/src/shairplay.c +++ shairplay-0.9.0/src/shairplay.c -@@ -313,8 +313,11 @@ main(int argc, char *argv[]) +@@ -313,9 +313,12 @@ main(int argc, char *argv[]) raop = raop_init_from_keyfile(10, &raop_cbs, "airport.key", NULL); if (raop == NULL) { - fprintf(stderr, "Could not initialize the RAOP service\n"); +- fprintf(stderr, "Please make sure the airport.key file is in the current directory.\n"); - return -1; + raop = raop_init_from_keyfile(10, &raop_cbs, "/etc/shairplay/airport.key", NULL); + if (raop == NULL) { + fprintf(stderr, "Could not initialize the RAOP service\n"); ++ fprintf(stderr, "Please make sure the airport.key file is in the current directory.\n"); + return -1; + } } diff --git a/packages/sysutils/libevdev/package.mk b/packages/sysutils/libevdev/package.mk index b66f5d620a..d21212b755 100644 --- a/packages/sysutils/libevdev/package.mk +++ b/packages/sysutils/libevdev/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="libevdev" -PKG_VERSION="1.4.2" +PKG_VERSION="1.4.3" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/tools/nano/package.mk b/packages/tools/nano/package.mk index d39f55e382..dc2843c027 100644 --- a/packages/tools/nano/package.mk +++ b/packages/tools/nano/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="nano" -PKG_VERSION="2.4.1" +PKG_VERSION="2.4.2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL"