ls

(Portage version: 2.0.53_rc7)

9 files changed, 391 insertions, 11 deletions

diff --git a/media-sound/gnump3d/ChangeLog b/media-sound/gnump3d/ChangeLog
index e419e80a3a3a..38b518eea284 100644
--- a/media-sound/gnump3d/ChangeLog
+++ b/media-sound/gnump3d/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/gnump3d
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/ChangeLog,v 1.44 2005/11/16 17:12:51 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/ChangeLog,v 1.45 2005/11/18 01:32:46 eradicator Exp $
+
+*gnump3d-2.9.8 (18 Nov 2005)
+*gnump3d-2.9.7-r1 (18 Nov 2005)
+
+  18 Nov 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/gnump3d-index.lok.diff, +files/gnump3d-traversal.diff,
+  +files/gnump3d-tmpfile.diff, +gnump3d-2.9.7-r1.ebuild,
+  +gnump3d-2.9.8.ebuild:
+  Revbump and version bump for security bug #111990.
 
   16 Nov 2005; Jeremy Huddleston <eradicator@gentoo.org>
   -gnump3d-2.9.3.ebuild, -gnump3d-2.9.6.ebuild:
diff --git a/media-sound/gnump3d/Manifest b/media-sound/gnump3d/Manifest
index 8e7fae8e1088..c4930b70fb3b 100644
--- a/media-sound/gnump3d/Manifest
+++ b/media-sound/gnump3d/Manifest
@@ -1,16 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 e7ac085e4beba05a3999388d3ce3df42 ChangeLog 6023
 MD5 fc8c45be4cb18a2b33cd0c321917b268 files/digest-gnump3d-2.9.7 66
+MD5 fc8c45be4cb18a2b33cd0c321917b268 files/digest-gnump3d-2.9.7-r1 66
+MD5 0bc04392e8eeeaff28091d69ab5e3b12 files/digest-gnump3d-2.9.8 66
+MD5 f82313fc517478141296f216e4e835d0 files/gnump3d-index.lok.diff 3249
+MD5 27b7feff197e10f51c5607f4bfccbcf4 files/gnump3d-tmpfile.diff 1197
+MD5 eef3ef350b208e39d1c1b99ac54b4b7e files/gnump3d-traversal.diff 702
 MD5 53ddcd88da020240ac2ec48f0100c4a9 files/gnump3d.conf.d 159
 MD5 27e1721a1708176c950425eeb3d4cfdd files/gnump3d.init.d 740
+MD5 501cceba293b9f6a86227a8cab284172 gnump3d-2.9.7-r1.ebuild 2233
 MD5 cb9bb8fdb84fc2146a4324aed5703bbb gnump3d-2.9.7.ebuild 2100
+MD5 cb9bb8fdb84fc2146a4324aed5703bbb gnump3d-2.9.8.ebuild 2100
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDe2iUOpjtAl+gMRURAqCxAKCrFSq3o04q1XYsQXwe3+j2HlINJwCeK9m9
-GiqMAPLbvQm5dFPa2r2K3qo=
-=phzl
------END PGP SIGNATURE-----
diff --git a/media-sound/gnump3d/files/digest-gnump3d-2.9.7-r1 b/media-sound/gnump3d/files/digest-gnump3d-2.9.7-r1
new file mode 100644
index 000000000000..39d124b23ddd
--- /dev/null
+++ b/media-sound/gnump3d/files/digest-gnump3d-2.9.7-r1
@@ -0,0 +1 @@
+MD5 1c94428bc77b2b2ec109b9cd28478340 gnump3d-2.9.7.tar.bz2 617906
diff --git a/media-sound/gnump3d/files/digest-gnump3d-2.9.8 b/media-sound/gnump3d/files/digest-gnump3d-2.9.8
new file mode 100644
index 000000000000..472ee10951f3
--- /dev/null
+++ b/media-sound/gnump3d/files/digest-gnump3d-2.9.8
@@ -0,0 +1 @@
+MD5 60abbe007d5771a072727ea8aab9552a gnump3d-2.9.8.tar.bz2 623334
diff --git a/media-sound/gnump3d/files/gnump3d-index.lok.diff b/media-sound/gnump3d/files/gnump3d-index.lok.diff
new file mode 100644
index 000000000000..0bb81ed81d94
--- /dev/null
+++ b/media-sound/gnump3d/files/gnump3d-index.lok.diff
@@ -0,0 +1,153 @@
+--- a/bin/gnump3d-index	2005-11-13 20:17:59.000000000 +0000
++++ a/bin/gnump3d-index	2005-11-13 20:19:30.000000000 +0000
+@@ -88,7 +88,6 @@
+ # Global variables.
+ #
+ my $root     = "" ;
+-my $lockfile = "" ;
+ my $cache    = "" ;
+ my %cache;
+ 
+@@ -96,13 +95,6 @@
+ 
+ 
+ #
+-#  Make sure that signals cause our END segment to run
+-# so that our lockfile is removed on abnormal termination.
+-#
+-use sigtrap qw(die normal-signals error-signals);
+-
+-
+-#
+ #  Parse the command line arguments.
+ #
+ &parseArguments();
+@@ -134,10 +126,6 @@
+ {
+   $root = &getConfig( "root",      "/home/mp3" ); 
+ }
+-if ( !length( $lockfile ) )
+-{
+-  $lockfile = &getConfig( "lockfile",  "/tmp/index.lok" );
+-}
+ if ( !length( $cache ) )
+ {
+   $cache    = &getConfig( "tag_cache", "/tmp/tags.cache" );
+@@ -164,28 +152,11 @@
+ 
+ 
+ #
+-# Test for a lockfile indicating that we're already running.
+-#
+-if ( &lockPresent() )
+-{
+-    print "gnump3d-index appears to be already running.\n";
+-    print "if this is in error remove the lockfile $lockfile\n";
+-    exit;
+-}
+-
+-
+-#
+-# Create our lock file.
+-&createLock();
+-
+-
+-#
+ # Sanity check the code.
+ #
+ if ( ! -e $root )
+ {
+     print "The server root directory you are trying to index '$root' doesn't exist.\n";
+-    &removeLock();
+     exit;
+ }
+ 
+@@ -372,13 +343,6 @@
+ 
+     foreach my $file ( sort @FOUND )
+     {
+-	#
+-	# Update our progress count every ten tracks.
+-	if ( ( $count % 10 ) == 0 )
+-	{
+-	    &updateLock( $count, $total );
+-	}
+-
+         # If we looked for an old cache file, and it existed, we can now
+         # look to see if the mtime in the cache is the same as the mtime
+         # of the file.  If they are the same, trust the cache.
+@@ -475,45 +439,6 @@
+     close( OUT );
+ }
+ 
+-#
+-#  Test to see if our lockfile is present.
+-sub lockPresent( )
+-{
+-    return( -e $lockfile );
+-}
+-
+-#
+-#  Unconditionally remove our lock file.
+-sub removeLock( )
+-{
+-    unlink( $lockfile );
+-}
+-
+-#
+-#  Update our lockfile with the current progress count.
+-sub updateLock( )
+-{
+-    my ( $cur, $total ) = ( @_ );
+-    my $PER = ( ( $total - $cur  ) / $total ) * 100.0;
+-    if ( $PER =~ /([0-9]+)\.([0-9]+)/ )
+-    {
+-    	$PER = $1;
+-    }
+-    open( LOK, ">$lockfile" );
+-    print LOK "Processing file $cur of $total ( \%$PER remaining )\n";
+-    close( LOK );
+-
+-}
+-
+-#
+-# Create our lockfile.
+-sub createLock(  )
+-{
+-    open( LOK, ">>$lockfile" );
+-    close( LOK );
+-}
+-
+-
+ 
+ #
+ #  Parse the command line options.
+@@ -523,7 +448,6 @@
+ 	       "config=s", \$CONFIG_FILE,
+ 	       "debug",    \$DEBUG,
+                "help",     \$SHOW_HELP,
+-	       "lock=s",   \$lockfile,
+ 	       "output=s", \$cache,
+ 	       "root=s",   \$root,
+ 	       "stats",    \$SHOW_STATS,
+@@ -553,7 +477,6 @@
+ Options:
+     --config file      The configuration file to read.
+     --help             Show this help.
+-    --lock file        Use the given lockfile rather than the default.
+     --output file      Write the output to the given file.
+     --root directory   Start the indexing at the given directory.
+     --stats            Don't update the cache file, just display audio stats.
+@@ -610,12 +533,3 @@
+   }
+   close( CACHE );
+ }
+-
+-
+-#
+-#  This section of code always runs when the script terminates.
+-#
+-END
+-{
+-	&removeLock();
+-}
diff --git a/media-sound/gnump3d/files/gnump3d-tmpfile.diff b/media-sound/gnump3d/files/gnump3d-tmpfile.diff
new file mode 100644
index 000000000000..d8f28b7aceb6
--- /dev/null
+++ b/media-sound/gnump3d/files/gnump3d-tmpfile.diff
@@ -0,0 +1,32 @@
+Index: bin/gnump3d2
+===================================================================
+RCS file: /cvsroot/gnump3d/gnump3d/bin/gnump3d2,v
+retrieving revision 1.109
+diff --unified -r1.109 gnump3d2
+--- a/bin/gnump3d2	28 Oct 2005 14:07:55 -0000	1.109
++++ a/bin/gnump3d2	13 Nov 2005 20:17:46 -0000
+@@ -3351,7 +3351,7 @@
+   $advanced_playlist = getConfig( "advanced_playlists", 1 );
+ 
+   # Tag cache
+-  $tag_cache   = getConfig( "tag_cache", "/tmp/tags.cache" );
++  $tag_cache   = getConfig( "tag_cache", "" );
+ 
+   #
+   # Experimental features.
+Index: lib/gnump3d/plugins/search.pm
+===================================================================
+RCS file: /cvsroot/gnump3d/gnump3d/lib/gnump3d/plugins/search.pm,v
+retrieving revision 1.10
+diff --unified -r1.10 search.pm
+--- a/lib/gnump3d/plugins/search.pm	6 Feb 2005 14:07:27 -0000	1.10
++++ a/lib/gnump3d/plugins/search.pm	13 Nov 2005 20:17:46 -0000
+@@ -70,7 +70,7 @@
+     #
+     # Make sure that the song tag cache exists before anything else.
+     #
+-    my $tagCache = &getConfig( "tag_cache", "/tmp/tags.cache" );
++    my $tagCache = &getConfig( "tag_cache", "" );
+     if ( ( ! defined( $tagCache ) ) ||
+          ( ! -e $tagCache ) )
+     {
diff --git a/media-sound/gnump3d/files/gnump3d-traversal.diff b/media-sound/gnump3d/files/gnump3d-traversal.diff
new file mode 100644
index 000000000000..b97b6edccc98
--- /dev/null
+++ b/media-sound/gnump3d/files/gnump3d-traversal.diff
@@ -0,0 +1,28 @@
+--- a/bin/gnump3d2	2005-11-14 23:50:36.000000000 +0000
++++ a/bin/gnump3d2	2005-11-14 23:52:59.000000000 +0000
+@@ -756,6 +756,12 @@
+ 			$val =~ s/^\s+//;
+ 			$val =~ s/\s+$//;
+ 
++			if ( $key =~ /^theme$/i )
++			{
++			    # Themes may only be named using numbers + letters
++			    $val =~ tr[A-Za-z0-9]||cd;
++			}
++
+ 			# Could cookie traversal cause problems?
+ 			$val = &sanitizePath( $val );
+ 
+@@ -829,6 +835,12 @@
+ 			$key = &urlDecode( $key );
+ 			$val = &urlDecode( $val );
+ 
++			if ( $key =~ /^theme$/i )
++			{
++			    # Themes may only be named using numbers + letters
++			    $val =~ tr[A-Za-z0-9]||cd;
++			}
++
+ 			# Avoid "../" attacks in parameter values.
+ 			$val = &sanitizePath( $val );
+ 
diff --git a/media-sound/gnump3d/gnump3d-2.9.7-r1.ebuild b/media-sound/gnump3d/gnump3d-2.9.7-r1.ebuild
new file mode 100644
index 000000000000..da0a21168867
--- /dev/null
+++ b/media-sound/gnump3d/gnump3d-2.9.7-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/gnump3d-2.9.7-r1.ebuild,v 1.1 2005/11/18 01:32:46 eradicator Exp $
+
+inherit eutils
+
+DESCRIPTION="A streaming server for MP3, OGG vorbis and other streamable files"
+HOMEPAGE="http://www.gnump3d.org/"
+SRC_URI="http://savannah.gnu.org/download/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ppc ~ppc-macos ~ppc64 sparc x86"
+IUSE=""
+
+DEPEND="sys-apps/sed"
+RDEPEND=">=dev-lang/perl-5.8.0"
+
+pkg_setup() {
+	enewuser gnump3d '' '' '' nogroup || die "couldnt add new user"
+	LIBDIR=/usr/$(get_libdir)/gnump3d
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-index.lok.diff
+	epatch ${FILESDIR}/${PN}-tmpfile.diff
+	epatch ${FILESDIR}/${PN}-traversal.diff
+
+	cd ${S}/bin
+	for binary in gnump3d-index gnump3d-top gnump3d2; do
+		sed -i "s,/usr/bin/perl,/usr/bin/perl -I${LIBDIR},g" $binary
+	done
+}
+
+src_install() {
+	insinto ${LIBDIR}/gnump3d; doins lib/gnump3d/*.pm
+	insinto ${LIBDIR}/gnump3d/plugins; doins lib/gnump3d/plugins/*.pm
+	insinto ${LIBDIR}/gnump3d/lang; doins lib/gnump3d/lang/*.pm
+	dobin bin/gnump3d2 bin/gnump3d-top bin/gnump3d-index
+	dosym /usr/bin/gnump3d2 /usr/bin/gnump3d
+	doman man/*.1
+	dodir /usr/share/gnump3d; cp -R templates/* ${D}/usr/share/gnump3d/
+	insinto /etc/gnump3d
+	doins etc/mime.types
+	doins etc/gnump3d.conf
+	dosed "s,PLUGINDIR,${LIBDIR},g" /etc/gnump3d/gnump3d.conf
+	dosed 's,^user *= *\(.*\)$,user = gnump3d,g' /etc/gnump3d/gnump3d.conf
+
+	dodoc AUTHORS ChangeLog README TODO
+
+	newinitd ${FILESDIR}/${PN}.init.d gnump3d
+	newconfd ${FILESDIR}/${PN}.conf.d gnump3d
+
+	dodir /etc/env.d
+	cat >${D}/etc/env.d/50gnump3d <<EOF
+# PERL5LIB="${LIBDIR}"
+EOF
+	dodir /var/log/gnump3d
+	dodir /var/cache/gnump3d/serving
+
+	keepdir /var/log/gnump3d
+	keepdir /var/cache/gnump3d/serving
+
+	touch ${D}/var/cache/gnump3d/song.tags
+	touch ${D}/var/cache/gnump3d/serving/.keep
+}
+
+pkg_postinst() {
+	chown -R gnump3d:nogroup /var/log/gnump3d
+	chown -R gnump3d:nogroup /var/cache/gnump3d
+	while read line; do einfo "${line}"; done <<EOF
+
+Please edit your /etc/gnump3d/gnump3d.conf before running
+/etc/init.d/gnump3d start
+
+EOF
+}
+
+src_test() { :; }
diff --git a/media-sound/gnump3d/gnump3d-2.9.8.ebuild b/media-sound/gnump3d/gnump3d-2.9.8.ebuild
new file mode 100644
index 000000000000..1978b372d3b3
--- /dev/null
+++ b/media-sound/gnump3d/gnump3d-2.9.8.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/gnump3d-2.9.8.ebuild,v 1.1 2005/11/18 01:32:46 eradicator Exp $
+
+inherit eutils
+
+DESCRIPTION="A streaming server for MP3, OGG vorbis and other streamable files"
+HOMEPAGE="http://www.gnump3d.org/"
+SRC_URI="http://savannah.gnu.org/download/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="sys-apps/sed"
+RDEPEND=">=dev-lang/perl-5.8.0"
+
+pkg_setup() {
+	enewuser gnump3d '' '' '' nogroup || die "couldnt add new user"
+	LIBDIR=/usr/$(get_libdir)/gnump3d
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}/bin
+	for binary in gnump3d-index gnump3d-top gnump3d2; do
+		sed -i "s,/usr/bin/perl,/usr/bin/perl -I${LIBDIR},g" $binary
+	done
+}
+
+src_install() {
+	insinto ${LIBDIR}/gnump3d; doins lib/gnump3d/*.pm
+	insinto ${LIBDIR}/gnump3d/plugins; doins lib/gnump3d/plugins/*.pm
+	insinto ${LIBDIR}/gnump3d/lang; doins lib/gnump3d/lang/*.pm
+	dobin bin/gnump3d2 bin/gnump3d-top bin/gnump3d-index
+	dosym /usr/bin/gnump3d2 /usr/bin/gnump3d
+	doman man/*.1
+	dodir /usr/share/gnump3d; cp -R templates/* ${D}/usr/share/gnump3d/
+	insinto /etc/gnump3d
+	doins etc/mime.types
+	doins etc/gnump3d.conf
+	dosed "s,PLUGINDIR,${LIBDIR},g" /etc/gnump3d/gnump3d.conf
+	dosed 's,^user *= *\(.*\)$,user = gnump3d,g' /etc/gnump3d/gnump3d.conf
+
+	dodoc AUTHORS ChangeLog README TODO
+
+	newinitd ${FILESDIR}/${PN}.init.d gnump3d
+	newconfd ${FILESDIR}/${PN}.conf.d gnump3d
+
+	dodir /etc/env.d
+	cat >${D}/etc/env.d/50gnump3d <<EOF
+# PERL5LIB="${LIBDIR}"
+EOF
+	dodir /var/log/gnump3d
+	dodir /var/cache/gnump3d/serving
+
+	keepdir /var/log/gnump3d
+	keepdir /var/cache/gnump3d/serving
+
+	touch ${D}/var/cache/gnump3d/song.tags
+	touch ${D}/var/cache/gnump3d/serving/.keep
+}
+
+pkg_postinst() {
+	chown -R gnump3d:nogroup /var/log/gnump3d
+	chown -R gnump3d:nogroup /var/cache/gnump3d
+	while read line; do einfo "${line}"; done <<EOF
+
+Please edit your /etc/gnump3d/gnump3d.conf before running
+/etc/init.d/gnump3d start
+
+EOF
+}
+
+src_test() { :; }