From e11d53a834240787ecff395da0b573358b0aa584 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Wed, 26 Nov 2014 01:48:26 +0100 Subject: [PATCH] Refresh the patches list. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- debian/patches/fix-ipv4-ipv6-race.patch | 13 ----------- debian/patches/passwd-auth-with-itunes.patch | 12 ---------- debian/patches/read_airportkey_from_etc.patch | 23 +++++++++---------- debian/patches/series | 2 -- 4 files changed, 11 insertions(+), 39 deletions(-) diff --git a/debian/patches/fix-ipv4-ipv6-race.patch b/debian/patches/fix-ipv4-ipv6-race.patch index 94333f7..e69de29 100644 --- a/debian/patches/fix-ipv4-ipv6-race.patch +++ b/debian/patches/fix-ipv4-ipv6-race.patch @@ -1,13 +0,0 @@ ---- 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; - diff --git a/debian/patches/passwd-auth-with-itunes.patch b/debian/patches/passwd-auth-with-itunes.patch index 0a91596..e69de29 100644 --- a/debian/patches/passwd-auth-with-itunes.patch +++ b/debian/patches/passwd-auth-with-itunes.patch @@ -1,12 +0,0 @@ ---- a/src/lib/raop.c.orig 2013-04-17 15:17:49.000000000 +0200 -+++ b/src/lib/raop.c 2014-03-24 23:22:30.000000000 +0100 -@@ -139,7 +139,7 @@ - } - - res = http_response_init("RTSP/1.0", 200, "OK"); -- if (strlen(raop->password)) { -+ if (strcmp(method, "OPTIONS") && strlen(raop->password)) { - const char *authorization; - - authorization = http_request_get_header(request, "Authorization"); - diff --git a/debian/patches/read_airportkey_from_etc.patch b/debian/patches/read_airportkey_from_etc.patch index 80d4d17..8b3f33d 100644 --- a/debian/patches/read_airportkey_from_etc.patch +++ b/debian/patches/read_airportkey_from_etc.patch @@ -1,16 +1,15 @@ ---- shairplay-0.9.0.orig/src/shairplay.c -+++ shairplay-0.9.0/src/shairplay.c -@@ -313,8 +313,11 @@ main(int argc, char *argv[]) +--- a/src/shairplay.c ++++ b/src/shairplay.c +@@ -346,10 +346,10 @@ + raop_cbs.audio_destroy = audio_destroy; + raop_cbs.audio_set_volume = audio_set_volume; - raop = raop_init_from_keyfile(10, &raop_cbs, "airport.key", NULL); +- raop = raop_init_from_keyfile(10, &raop_cbs, "airport.key", NULL); ++ 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"); -- 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"); -+ return -1; -+ } + fprintf(stderr, "Could not initialize the RAOP service\n"); +- fprintf(stderr, "Please make sure the airport.key file is in the current directory.\n"); ++ fprintf(stderr, "Please make sure the /etc/shairplay/airport.key file is in the current directory.\n"); + return -1; } - if (strlen(options.password)) { diff --git a/debian/patches/series b/debian/patches/series index d77a2fa..5e6fbad 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ read_airportkey_from_etc.patch -fix-ipv4-ipv6-race.patch -passwd-auth-with-itunes.patch -- 2.34.1