jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-6.0

Browse Source
This commit is contained in:
Stephan Raue 2015-07-07 22:01:16 +02:00
commit a989596f09
5 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/network/libshairplay/package.mk
View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="libshairplay"
PKG_VERSION="6e521c7"
PKG_VERSION="0f41ade"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

27
packages/network/libshairplay/patches/libshairplay-fixipv4ipv6race.patch
View File

@ -1,27 +0,0 @@
From ac9240fa569df5a10d534a4cd45740a44ee00f63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juho=20V=C3=A4h=C3=A4-Herttua?= <juhovh@iki.fi>
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

4
packages/network/libshairplay/patches/libshairplay-read_airportkey_from_etc.patch
View File

@ -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;
+ }
}

2
packages/sysutils/libevdev/package.mk
View File

@ -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"

2
packages/tools/nano/package.mk
View File

@ -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"