From 6c0346390f001f8916a45f46eccd047a019258ef Mon Sep 17 00:00:00 2001 From: wsnipex Date: Thu, 27 Mar 2014 10:38:52 +0100 Subject: [PATCH] Imported Debian patch 0.9.0-6~trusty --- debian/changelog | 28 ++++++++++ debian/compat | 1 + debian/control | 31 +++++++++++ debian/copyright | 54 +++++++++++++++++++ debian/docs | 1 + debian/libshairplay-dev.install | 2 + debian/libshairplay0.install | 1 + debian/patches/fix-ipv4-ipv6-race.patch | 13 +++++ debian/patches/passwd-auth-with-itunes.patch | 12 +++++ debian/patches/read_airportkey_from_etc.patch | 16 ++++++ debian/patches/series | 3 ++ debian/rules | 25 +++++++++ debian/shairplay.install | 2 + debian/source/format | 1 + debian/source/include-binaries | 5 ++ 15 files changed, 195 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/docs create mode 100644 debian/libshairplay-dev.install create mode 100644 debian/libshairplay0.install create mode 100644 debian/patches/fix-ipv4-ipv6-race.patch create mode 100644 debian/patches/passwd-auth-with-itunes.patch create mode 100644 debian/patches/read_airportkey_from_etc.patch create mode 100644 debian/patches/series create mode 100755 debian/rules create mode 100644 debian/shairplay.install create mode 100644 debian/source/format create mode 100644 debian/source/include-binaries diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..aeb0137 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,28 @@ +shairplay (0.9.0-6~trusty) trusty; urgency=high + + * fix password auth with itunes + * fix race condition between ipv4 and ipv6 + + -- wsnipex Tue, 27 Mar 2014 10:38:52 +0100 + +shairplay (0.9.0-5~trusty) trusty; urgency=high + + * port to trusty + + -- wsnipex Wed, 29 Jan 2014 10:38:52 +0100 + +shairplay (0.9.0-5~saucy) saucy; urgency=low + + * build for saucy + + -- wsnipex Thu, 27 Jun 2013 11:58:29 +0200 + +shairplay (0.9.0-5~raring) raring; urgency=low + + * debian multiarch + + * add patch to read airport.key from /etc/shairport/airport.key + + * Initial release + + -- wsnipex Thu, 18 Apr 2013 22:20:27 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..0d8151b --- /dev/null +++ b/debian/control @@ -0,0 +1,31 @@ +Source: shairplay +Section: net +Priority: extra +Maintainer: wsnipex +Build-Depends: debhelper (>= 9.0.0), autotools-dev, libao-dev, pkg-config, autoconf, automake, libtool +Standards-Version: 3.9.3 +Homepage: https://github.com/juhovh/shairplay +Vcs-Git: git://github.com/juhovh/shairplay + +Package: shairplay +Architecture: any +Depends: libshairplay0, libavahi-compat-libdnssd-dev, ${shlibs:Depends}, ${misc:Depends} +Description: Free portable AirPlay server implementation + Free portable AirPlay server implementation similar to ShairPort. + +Package: libshairplay-dev +Multi-Arch: same +Section: libdevel +Architecture: any +Depends: libao-dev, libshairplay0 (= ${binary:Version}), ${misc:Depends} +Description: Free portable AirPlay server implementation (development files) + Free portable AirPlay server implementation similar to ShairPort. + +Package: libshairplay0 +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: libao4, ${shlibs:Depends}, ${misc:Depends} +Description: Free portable AirPlay server implementation (development files) + Free portable AirPlay server implementation similar to ShairPort. + diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..ddb10fa --- /dev/null +++ b/debian/copyright @@ -0,0 +1,54 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: shairplay +Source: https://github.com/juhovh/shairplay + +Files: * +Copyright: 2012 Juho Vähä-Herttua +License: MIT + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Files: src/lib/* +License: LGPLv2.1+ + +Files: AirTV-Qt/* +License: LGPLv2.1+ + +Files: src/lib/crypto/* +License: New BSD License + +Files: debian/* +Copyright: 2013 wsnipex +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..b43bf86 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +README.md diff --git a/debian/libshairplay-dev.install b/debian/libshairplay-dev.install new file mode 100644 index 0000000..146a603 --- /dev/null +++ b/debian/libshairplay-dev.install @@ -0,0 +1,2 @@ +usr/include +usr/lib/*/*.so diff --git a/debian/libshairplay0.install b/debian/libshairplay0.install new file mode 100644 index 0000000..3de3b10 --- /dev/null +++ b/debian/libshairplay0.install @@ -0,0 +1 @@ +usr/lib/*/*.so.* diff --git a/debian/patches/fix-ipv4-ipv6-race.patch b/debian/patches/fix-ipv4-ipv6-race.patch new file mode 100644 index 0000000..94333f7 --- /dev/null +++ b/debian/patches/fix-ipv4-ipv6-race.patch @@ -0,0 +1,13 @@ +--- 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 new file mode 100644 index 0000000..0a91596 --- /dev/null +++ b/debian/patches/passwd-auth-with-itunes.patch @@ -0,0 +1,12 @@ +--- 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 new file mode 100644 index 0000000..80d4d17 --- /dev/null +++ b/debian/patches/read_airportkey_from_etc.patch @@ -0,0 +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[]) + + raop = raop_init_from_keyfile(10, &raop_cbs, "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; ++ } + } + + if (strlen(options.password)) { diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..d77a2fa --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +read_airportkey_from_etc.patch +fix-ipv4-ipv6-race.patch +passwd-auth-with-itunes.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..417dc66 --- /dev/null +++ b/debian/rules @@ -0,0 +1,25 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. +# +# Modified to make a template file for a multi-binary package with separated +# build-arch and build-indep targets by Bill Allombert 2001 + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + + +%: + dh $@ --with autotools-dev + +override_dh_auto_configure: + ./configure --disable-static --prefix=/usr --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) diff --git a/debian/shairplay.install b/debian/shairplay.install new file mode 100644 index 0000000..8093b25 --- /dev/null +++ b/debian/shairplay.install @@ -0,0 +1,2 @@ +usr/bin +airport.key /etc/shairplay diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/include-binaries b/debian/source/include-binaries new file mode 100644 index 0000000..ba08270 --- /dev/null +++ b/debian/source/include-binaries @@ -0,0 +1,5 @@ +src/lib/.libs/libshairplay.a +src/lib/alac/.libs/libalac.a +src/lib/crypto/.libs/libcrypto.a +src/shairplay +src/shairplay-shairplay.o -- 2.34.1