* [gentoo-commits] gentoo-x86 commit in media-sound/squeezeboxserver/files: squeezeboxserver-7.5.4-uuid-gentoo.patch squeezeboxserver.init.d squeezeboxserver-7.5.4-build-perl-modules-gentoo.patch build-modules-7.5.4.sh squeezeboxserver-7.5.4-squeezeslave.patch
@ 2011-05-14 15:26 Joe Peterson (lavajoe)
0 siblings, 0 replies; only message in thread
From: Joe Peterson (lavajoe) @ 2011-05-14 15:26 UTC (permalink / raw
To: gentoo-commits
lavajoe 11/05/14 15:26:12
Modified: squeezeboxserver.init.d
Added: squeezeboxserver-7.5.4-uuid-gentoo.patch
squeezeboxserver-7.5.4-build-perl-modules-gentoo.patch
build-modules-7.5.4.sh
squeezeboxserver-7.5.4-squeezeslave.patch
Log:
Add new version 7.5.4
(Portage version: 2.1.9.48/cvs/Linux x86_64)
Revision Changes Path
1.5 media-sound/squeezeboxserver/files/squeezeboxserver.init.d
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/squeezeboxserver/files/squeezeboxserver.init.d?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/squeezeboxserver/files/squeezeboxserver.init.d?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/squeezeboxserver/files/squeezeboxserver.init.d?r1=1.4&r2=1.5
Index: squeezeboxserver.init.d
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/files/squeezeboxserver.init.d,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- squeezeboxserver.init.d 5 Jan 2011 19:53:27 -0000 1.4
+++ squeezeboxserver.init.d 14 May 2011 15:26:12 -0000 1.5
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/files/squeezeboxserver.init.d,v 1.4 2011/01/05 19:53:27 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/files/squeezeboxserver.init.d,v 1.5 2011/05/14 15:26:12 lavajoe Exp $
# These fit the Squeezebox Server ebuild and so shouldn't need to be changed;
# user-servicable parts go in /etc/conf.d/squeezeboxserver.
@@ -24,12 +24,11 @@
cd /
start-stop-daemon \
- --start --exec /usr/bin/perl /usr/sbin/${scname} \
- --pidfile ${pidfile} \
- --startas /usr/sbin/${scname} \
+ --start --exec /usr/sbin/${scname} \
--chuid ${scuser} \
+ --background \
-- \
- --quiet --daemon \
+ --quiet \
--pidfile=${pidfile} \
--cachedir=${cachedir} \
--prefsfile=${prefsfile} \
@@ -44,6 +43,6 @@
stop() {
ebegin "Stopping Squeezebox Server"
- start-stop-daemon --oknodo --retry 10 --stop --pidfile ${pidfile}
+ start-stop-daemon --retry 10 --stop --pidfile ${pidfile}
eend $? "Failed to stop Squeezebox Server"
}
1.1 media-sound/squeezeboxserver/files/squeezeboxserver-7.5.4-uuid-gentoo.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/squeezeboxserver/files/squeezeboxserver-7.5.4-uuid-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/squeezeboxserver/files/squeezeboxserver-7.5.4-uuid-gentoo.patch?rev=1.1&content-type=text/plain
Index: squeezeboxserver-7.5.4-uuid-gentoo.patch
===================================================================
--- slimserver.pl.old 2010-07-06 08:30:49.267542493 +0100
+++ slimserver.pl 2010-07-06 08:30:49.267542493 +0100
@@ -397,8 +397,9 @@
# Generate a UUID for this SC instance on first-run
if ( !$prefs->get('server_uuid') ) {
- require UUID::Tiny;
- $prefs->set( server_uuid => UUID::Tiny::create_UUID_as_string( UUID::Tiny::UUID_V4() ) );
+ require Data::UUID;
+ my $ug = new Data::UUID;
+ $prefs->set( server_uuid => lc $ug->create_str() );
}
main::INFOLOG && $log->info("Squeezebox Server binary search path init...");
1.1 media-sound/squeezeboxserver/files/squeezeboxserver-7.5.4-build-perl-modules-gentoo.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/squeezeboxserver/files/squeezeboxserver-7.5.4-build-perl-modules-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/squeezeboxserver/files/squeezeboxserver-7.5.4-build-perl-modules-gentoo.patch?rev=1.1&content-type=text/plain
Index: squeezeboxserver-7.5.4-build-perl-modules-gentoo.patch
===================================================================
--- Slim/bootstrap.pm.old 2010-07-06 08:30:49.267542493 +0100
+++ Slim/bootstrap.pm 2010-07-06 08:30:49.255502095 +0100
@@ -192,27 +192,6 @@
print "To run from source on Windows, please install ActivePerl 5.10. ActivePerl 5.8.8 is no longer supported.\n";
print "http://www.activestate.com/activeperl/\n\n";
}
- else {
- print qq{
-*******
-
-NOTE:
-
-If you're running some unsupported Linux/Unix platform, please use the buildme.sh
-script located here:
-
-http://svn.slimdevices.com/repos/slim/7.5/trunk/vendor/CPAN/
-
-You should never need to do this if you're on Windows or Mac OSX. If the installers
-don't work for you, ask for help and/or report a bug.
-
-If 7.5 is outdated by the time you read this, Replace "7.5" with the major version
-of Squeezebox Server you are running.
-
-*******
-
- \n};
- }
print "Exiting..\n";
1.1 media-sound/squeezeboxserver/files/build-modules-7.5.4.sh
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/squeezeboxserver/files/build-modules-7.5.4.sh?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/squeezeboxserver/files/build-modules-7.5.4.sh?rev=1.1&content-type=text/plain
Index: build-modules-7.5.4.sh
===================================================================
#!/bin/bash
#
# $Id: build-modules-7.5.4.sh,v 1.1 2011/05/14 15:26:12 lavajoe Exp $
#
# This script builds all binary Perl modules required by Squeezebox Server.
DISTDIR="$1"; shift
D="$1"; shift
# Build dir
BUILD=$PWD
# Require modules to pass tests
RUN_TESTS=1
FLAGS=""
# $1 = module to build
# $2 = Makefile.PL arg(s)
function build_module {
tar zxvf $DISTDIR/SqueezeboxServer-$1.tar.gz || exit 1
cd $1
perl Makefile.PL PREFIX=$D $2
if [ $RUN_TESTS -eq 1 ]; then
make test
else
make
fi
if [ $? != 0 ]; then
if [ $RUN_TESTS -eq 1 ]; then
echo "make test failed, aborting"
else
echo "make failed, aborting"
fi
exit $?
fi
make install || exit 1
make clean || exit 1
cd ..
rm -rf $1
}
function build_all {
export PERL_MM_USE_DEFAULT=1
RUN_TESTS=0
build_module EV-3.8
RUN_TESTS=1
export PERL_MM_USE_DEFAULT=
}
# Build a single module if requested, or all
if [ $1 ]; then
build $1
else
build_all
fi
# Reset PERL5LIB
export PERL5LIB=
# clean out useless .bs/.packlist files, etc
find $BUILD -name '*.bs' -exec rm -f {} \;
find $BUILD -name '*.packlist' -exec rm -f {} \;
1.1 media-sound/squeezeboxserver/files/squeezeboxserver-7.5.4-squeezeslave.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/squeezeboxserver/files/squeezeboxserver-7.5.4-squeezeslave.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/squeezeboxserver/files/squeezeboxserver-7.5.4-squeezeslave.patch?rev=1.1&content-type=text/plain
Index: squeezeboxserver-7.5.4-squeezeslave.patch
===================================================================
--- Slim/Web/HTTP.pm.old 2010-07-06 08:30:49.243499965 +0100
+++ Slim/Web/HTTP.pm 2010-07-06 08:30:49.243499965 +0100
@@ -2214,9 +2214,10 @@
# only kill the timer if we were called for the active streaming connection;
# otherwise we might kill the timer related to the next connection too.
Slim::Utils::Timers::killTimers($client, \&tryStreamingLater);
-
- Slim::Networking::Select::addWrite($httpClient, \&sendStreamingResponse, 1);
}
+
+ # Bug 14740 - always call sendStreamingResponse so we ensure the socket gets closed
+ Slim::Networking::Select::addWrite($httpClient, \&sendStreamingResponse, 1);
}
sub forgetClient {
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-05-14 15:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-14 15:26 [gentoo-commits] gentoo-x86 commit in media-sound/squeezeboxserver/files: squeezeboxserver-7.5.4-uuid-gentoo.patch squeezeboxserver.init.d squeezeboxserver-7.5.4-build-perl-modules-gentoo.patch build-modules-7.5.4.sh squeezeboxserver-7.5.4-squeezeslave.patch Joe Peterson (lavajoe)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox