[arch-commits] Commit in gnump3d/repos/community-any (11 files)

Sergej Pupykin spupykin at nymeria.archlinux.org
Mon May 13 10:24:57 EDT 2013


    Date: Monday, May 13, 2013 @ 16:24:56
  Author: spupykin
Revision: 90669

archrelease: copy trunk to community-any

Added:
  gnump3d/repos/community-any/ChangeLog
    (from rev 90668, gnump3d/trunk/ChangeLog)
  gnump3d/repos/community-any/PKGBUILD
    (from rev 90668, gnump3d/trunk/PKGBUILD)
  gnump3d/repos/community-any/gnump3d-proxy.patch
    (from rev 90668, gnump3d/trunk/gnump3d-proxy.patch)
  gnump3d/repos/community-any/gnump3d.install
    (from rev 90668, gnump3d/trunk/gnump3d.install)
  gnump3d/repos/community-any/gnump3d.service
    (from rev 90668, gnump3d/trunk/gnump3d.service)
Deleted:
  gnump3d/repos/community-any/ChangeLog
  gnump3d/repos/community-any/PKGBUILD
  gnump3d/repos/community-any/gnump3d
  gnump3d/repos/community-any/gnump3d-proxy.patch
  gnump3d/repos/community-any/gnump3d.install
  gnump3d/repos/community-any/gnump3d.service

---------------------+
 ChangeLog           |   14 +-
 PKGBUILD            |  117 ++++++++--------
 gnump3d             |   46 ------
 gnump3d-proxy.patch |  350 +++++++++++++++++++++++++-------------------------
 gnump3d.install     |   46 +++---
 gnump3d.service     |   22 +--
 6 files changed, 273 insertions(+), 322 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2013-05-13 14:24:38 UTC (rev 90668)
+++ ChangeLog	2013-05-13 14:24:56 UTC (rev 90669)
@@ -1,7 +0,0 @@
-2008-01-20 JJDaNiMoTh <jjdanimoth at gmail.com>
-    * Changed place for manpage.
-
-2008-01-05  Douglas Soares de Andrade  <dsa at aur.archlinux.org>
-
-	* Added for x86_64
-

Copied: gnump3d/repos/community-any/ChangeLog (from rev 90668, gnump3d/trunk/ChangeLog)
===================================================================
--- ChangeLog	                        (rev 0)
+++ ChangeLog	2013-05-13 14:24:56 UTC (rev 90669)
@@ -0,0 +1,7 @@
+2008-01-20 JJDaNiMoTh <jjdanimoth at gmail.com>
+    * Changed place for manpage.
+
+2008-01-05  Douglas Soares de Andrade  <dsa at aur.archlinux.org>
+
+	* Added for x86_64
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-13 14:24:38 UTC (rev 90668)
+++ PKGBUILD	2013-05-13 14:24:56 UTC (rev 90669)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Stefan Bergstrom <stefan.bergstrom at gmail.com>
-
-pkgname=gnump3d
-pkgver=3.0
-pkgrel=7
-url="http://www.gnu.org/software/gnump3d/"
-arch=(any)
-pkgdesc="A streaming server for MP3s, OGG vorbis files, movies and other media formats."
-license=("GPL")
-depends=('sh' 'perl')
-backup=('etc/gnump3d/gnump3d.conf')
-install=gnump3d.install
-source=("http://savannah.gnu.org/download/$pkgname/$pkgname-$pkgver.tar.bz2"
-	'gnump3d'
-	'gnump3d.service'
-	'gnump3d-proxy.patch')
-md5sums=('41786650bbc591484c08014a89478bf9'
-         '4ac4fd5f3637613a5b5a191081437e23'
-         'a9b8a415da859775ce30f1c1ff659739'
-         '9978f8a8c10a87496e8920a09fb5e9e6')
-
-build() {
-    cd $srcdir/$pkgname-$pkgver
-
-    patch -p1 <$srcdir/gnump3d-proxy.patch
-
-    install -d $pkgdir/var/log/gnump3d
-    install -d $pkgdir/var/cache/gnump3d/serving
-
-    install -d $pkgdir/usr/share/perl5/vendor_perl/gnump3d/plugins
-    install -d $pkgdir/usr/share/perl5/vendor_perl/gnump3d/lang
-    install -m 644 lib/gnump3d/*.pm         $pkgdir/usr/share/perl5/vendor_perl/gnump3d
-    install -m 644 lib/gnump3d/plugins/*.pm $pkgdir/usr/share/perl5/vendor_perl/gnump3d/plugins
-    install -m 644 lib/gnump3d/lang/*.pm    $pkgdir/usr/share/perl5/vendor_perl/gnump3d/lang
-
-    install -d $pkgdir/usr/bin
-    install -m 755 bin/gnump3d2 $pkgdir/usr/bin/gnump3d
-    install -m 755 bin/gnump3d-top bin/gnump3d-index $pkgdir/usr/bin
-
-    install -d $pkgdir/usr/share/man/man1
-    install -m 644 man/gnump3d-top.1 man/gnump3d-index.1 man/gnump3d.1 man/gnump3d.conf.1 $pkgdir/usr/share/man/man1
-
-    install -d $pkgdir/usr/share/gnump3d
-    cp -R templates/* $pkgdir/usr/share/gnump3d
-    chmod -R a+r $pkgdir/usr/share/gnump3d
-    chmod +rx $pkgdir/usr/share/gnump3d/*/
-
-    sed -i "s|PLUGINDIR|/usr/share/perl5/vendor_perl|g" etc/gnump3d.conf
-    install -d $pkgdir/etc/gnump3d
-    install -m 644 etc/gnump3d.conf etc/mime.types $pkgdir/etc/gnump3d
-    install -m 644 etc/gnump3d.conf etc/file.types $pkgdir/etc/gnump3d
-
-    mkdir -p $pkgdir/srv/mp3
-    sed -i "s|/home/mp3|/srv/mp3|" $pkgdir/etc/gnump3d/gnump3d.conf
-
-    install -D -m 755 $srcdir/gnump3d $pkgdir/etc/rc.d/gnump3d
-    install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
-}

Copied: gnump3d/repos/community-any/PKGBUILD (from rev 90668, gnump3d/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2013-05-13 14:24:56 UTC (rev 90669)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Stefan Bergstrom <stefan.bergstrom at gmail.com>
+
+pkgname=gnump3d
+pkgver=3.0
+pkgrel=8
+url="http://www.gnu.org/software/gnump3d/"
+arch=(any)
+pkgdesc="A streaming server for MP3s, OGG vorbis files, movies and other media formats."
+license=("GPL")
+depends=('sh' 'perl')
+backup=('etc/gnump3d/gnump3d.conf')
+install=gnump3d.install
+source=("http://savannah.gnu.org/download/$pkgname/$pkgname-$pkgver.tar.bz2"
+	'gnump3d.service'
+	'gnump3d-proxy.patch')
+md5sums=('41786650bbc591484c08014a89478bf9'
+         'a9b8a415da859775ce30f1c1ff659739'
+         '9978f8a8c10a87496e8920a09fb5e9e6')
+
+package() {
+    cd $srcdir/$pkgname-$pkgver
+
+    patch -p1 <$srcdir/gnump3d-proxy.patch
+
+    install -d $pkgdir/var/log/gnump3d
+    install -d $pkgdir/var/cache/gnump3d/serving
+
+    install -d $pkgdir/usr/share/perl5/vendor_perl/gnump3d/plugins
+    install -d $pkgdir/usr/share/perl5/vendor_perl/gnump3d/lang
+    install -m 644 lib/gnump3d/*.pm         $pkgdir/usr/share/perl5/vendor_perl/gnump3d
+    install -m 644 lib/gnump3d/plugins/*.pm $pkgdir/usr/share/perl5/vendor_perl/gnump3d/plugins
+    install -m 644 lib/gnump3d/lang/*.pm    $pkgdir/usr/share/perl5/vendor_perl/gnump3d/lang
+
+    install -d $pkgdir/usr/bin
+    install -m 755 bin/gnump3d2 $pkgdir/usr/bin/gnump3d
+    install -m 755 bin/gnump3d-top bin/gnump3d-index $pkgdir/usr/bin
+
+    install -d $pkgdir/usr/share/man/man1
+    install -m 644 man/gnump3d-top.1 man/gnump3d-index.1 man/gnump3d.1 man/gnump3d.conf.1 $pkgdir/usr/share/man/man1
+
+    install -d $pkgdir/usr/share/gnump3d
+    cp -R templates/* $pkgdir/usr/share/gnump3d
+    chmod -R a+r $pkgdir/usr/share/gnump3d
+    chmod +rx $pkgdir/usr/share/gnump3d/*/
+
+    sed -i "s|PLUGINDIR|/usr/share/perl5/vendor_perl|g" etc/gnump3d.conf
+    install -d $pkgdir/etc/gnump3d
+    install -m 644 etc/gnump3d.conf etc/mime.types $pkgdir/etc/gnump3d
+    install -m 644 etc/gnump3d.conf etc/file.types $pkgdir/etc/gnump3d
+
+    mkdir -p $pkgdir/srv/mp3
+    sed -i "s|/home/mp3|/srv/mp3|" $pkgdir/etc/gnump3d/gnump3d.conf
+
+    install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
+}

Deleted: gnump3d
===================================================================
--- gnump3d	2013-05-13 14:24:38 UTC (rev 90668)
+++ gnump3d	2013-05-13 14:24:56 UTC (rev 90669)
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_gnump3d_pid() {
-  ps -C gnump3d -o pid= -o args= | grep /usr/bin/gnump3d | awk '{print $1}' | tr '\n' ' '
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting GNUMP3d Streaming Server"
-    [ "x$(get_gnump3d_pid)" == "x" ] && /usr/bin/gnump3d --quiet --background &
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon gnump3d
-      stat_done
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping GNUMP3d Streaming Server"
-    for PID in $(get_gnump3d_pid) ; do
-      kill $PID 2> /dev/null
-    done
-    if [ $? -gt 0 ]; then
-      stat_fail   
-    else
-      rm_daemon gnump3d
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-
-exit 0
-

Deleted: gnump3d-proxy.patch
===================================================================
--- gnump3d-proxy.patch	2013-05-13 14:24:38 UTC (rev 90668)
+++ gnump3d-proxy.patch	2013-05-13 14:24:56 UTC (rev 90669)
@@ -1,175 +0,0 @@
-diff -wbBur gnump3d-3.0/bin/gnump3d2 gnump3d-3.0.my/bin/gnump3d2
---- gnump3d-3.0/bin/gnump3d2	2007-10-18 17:34:02.000000000 +0000
-+++ gnump3d-3.0.my/bin/gnump3d2	2010-07-21 16:30:13.000000000 +0000
-@@ -357,11 +357,9 @@
- #
- # Make sure our host is defined.
- #
--if ( ! $host_rewrite ) { $host .= ":$PORT"; }
-+if ( ! $host_rewrite ) { $host = "http://".$host.":$PORT"; }
- else { $host = $host_rewrite; }
- 
--
--
- #
- #  Print a little banner unless the user specified a quiet startup.
- #
-@@ -738,12 +736,12 @@
- 		    if ( $chost =~ /(.*):([0-9]+)/ )
- 		    {
- 			# Host already contains a port.
--			$host = $chost;
-+			$host = "http://" . $chost;
- 		    }
- 		    else
- 		    {
- 			# Host was missing a port number.
--			$host = $chost . ":" . $PORT;
-+			$host = "http://" . $chost . ":" . $PORT;
- 		    }
- 		}
- 	    }
-@@ -966,7 +964,7 @@
- 		    my $header   = getHTTPHeader( 200, "audio/x-mpegurl" );
- 		    &sendData( $data, $header );
- 
--		    my $link = "http://" . $host . &urlEncode( $plainFile );
-+		    my $link = $host . &urlEncode( $plainFile );
- 
- 		    #
- 		    # Get ready to add on any bitrate settings to the file
-@@ -1545,7 +1543,7 @@
-     #
-     # Escape the filename.
-     #
--    $file = "http://" . $host . urlEncode( $file ) . $quality;
-+    $file = $host . urlEncode( $file ) . $quality;
- 
-     #
-     # Add to the playlist
-@@ -1658,7 +1656,7 @@
- 	    #
- 	    # Line is fully qualified path.
- 	    #
--	    $line = "http://" . $host . "/" . &urlEncode($1);
-+	    $line = $host . "/" . &urlEncode($1);
- 	}
- 	elsif ( $line =~ /^\// )
- 	{
-@@ -1666,14 +1664,14 @@
- 	    # Line is fully qualified.  Just prepend the
- 	    # server name to it.
- 	    #
--	    $line = "http://" . $host . &urlEncode($line);
-+	    $line = $host . &urlEncode($line);
- 	}
- 	else
- 	{
- 	    #
- 	    # Line is just a straight filename, it needs
- 	    # server:port + directory prepended to it.
--	    $line = "http://" . $host . &urlEncode( $dir . "/" . $line );
-+	    $line = $host . &urlEncode( $dir . "/" . $line );
- 	}
- 
- 	#
-@@ -2216,7 +2214,7 @@
- 		$link    = &urlEncode( $link );
- 
- 		my $name = $file;
--		my $rec  = "<a href=\"${link}recurse.m3u\">$play_rec</a>";
-+		my $rec  = "<a href=\"${host}${link}recurse.m3u\">$play_rec</a>";
- 		my $row;
- 
- 		if ( $totalSubdirs % 2 == 0 )
-@@ -2314,10 +2312,10 @@
- 		#
- 		#  Do the interpolation.
- 		#
--		$row =~ s/\$LINK/$link/g;
-+		$row =~ s/\$LINK/$host$link/g;
- 		$row =~ s/\$DIR_NAME/$name/g;
- 		$row =~ s/\$RECURSE/$rec/g;
--		$row =~ s/\$LINK/$link/g;
-+		$row =~ s/\$LINK/$host$link/g;
- 
- 		#
- 		# Add to the text we're building up.
-@@ -2455,8 +2453,10 @@
- 		{
- 		  $output = $file_format2;
- 		}
--		$output    =~ s/\$LINK/$link/g;
--		$output    =~ s/\$PLAINLINK/$link/g;
-+		$output    =~ s/\$LINK/$host$link/g;
-+		$output    =~ s/\$PLAINLINK/$host$link/g;
-+		$output    =~ s/\$RELPATH/$link/g;
-+		$output    =~ s/\$HOST/$host/g;
- 		$output    =~ s/\$SONG_FORMAT/$display/g;
- 
- 		#
-@@ -2555,8 +2555,10 @@
- 		  $output = $file_format2;
- 		}
- 
--		$output    =~ s/\$LINK/$link/g;
--		$output    =~ s/\$PLAINLINK/$plink/g;
-+		$output    =~ s/\$LINK/$host$link/g;
-+		$output    =~ s/\$PLAINLINK/$host$plink/g;
-+		$output    =~ s/\$RELPATH/$plink/g;
-+		$output    =~ s/\$HOST/$host/g;
- 		$output    =~ s/\$SONG_FORMAT/$display/g;
- 
- 		#
-@@ -2677,8 +2679,10 @@
- 	$output = $file_format2;
-       }
- 
--      $output    =~ s/\$LINK/$link/g;
--      $output    =~ s/\$PLAINLINK/$plink/g;
-+      $output    =~ s/\$LINK/$host$link/g;
-+      $output    =~ s/\$PLAINLINK/$host$plink/g;
-+      $output    =~ s/\$RELPATH/$plink/g;
-+      $output    =~ s/\$HOST/$host/g;
-       $output    =~ s/\$SONG_FORMAT/$display/g;
- 
-       #
-@@ -2783,7 +2787,7 @@
-     my ( $dir ) = (@_);
-     my $prev = "";
- 
--    my $banner = "[ <a href=\"/\">Home</a>";
-+    my $banner = "[ <a href=\"${host}/\">Home</a>";
- 
-     my @list = splitPath( $host, $dir );
- 
-@@ -2800,7 +2804,7 @@
- 	    {
- 			$component =~ s/$host//g;
- 			$component = &urlEncode( $component );
--			$banner .= " · <a href=\"http://$host$component\">$path</a>";
-+			$banner .= " · <a href=\"$host$component\">$path</a>";
- 	    }
- 	}
-     }
-@@ -2811,7 +2815,7 @@
-         #
-         $dir =~ s/(.*)\/?/$1/;
-         $dir = &urlEncode( $dir );
--        $banner .= " | <a href=\"$dir/recurse.m3u\">$play_rec</a>";
-+        $banner .= " | <a href=\"${host}${dir}/recurse.m3u\">$play_rec</a>";
-     }
-     $banner .= " ]";
- 
-diff -wbBur gnump3d-3.0/etc/gnump3d.conf gnump3d-3.0.my/etc/gnump3d.conf
---- gnump3d-3.0/etc/gnump3d.conf	2007-10-18 17:34:02.000000000 +0000
-+++ gnump3d-3.0.my/etc/gnump3d.conf	2010-07-21 16:31:31.000000000 +0000
-@@ -490,7 +490,7 @@
- #  This is useful if you want to have alternating background colors for
- #  each entry in a table, for example.
- #
--file_format = <tr><td width="10%"> </td><td><a href="$LINK">$SONG_FORMAT</a></td><td align="right">[<a href="/info$PLAINLINK">Info</a>] [<a href="$PLAINLINK">Download</a>]</td></tr>
-+file_format = <tr><td width="10%"> </td><td><a href="$LINK">$SONG_FORMAT</a></td><td align="right">[<a href="$HOST/info$RELPATH">Info</a>] [<a href="$PLAINLINK">Download</a>]</td></tr>
- 
- 
- 

Copied: gnump3d/repos/community-any/gnump3d-proxy.patch (from rev 90668, gnump3d/trunk/gnump3d-proxy.patch)
===================================================================
--- gnump3d-proxy.patch	                        (rev 0)
+++ gnump3d-proxy.patch	2013-05-13 14:24:56 UTC (rev 90669)
@@ -0,0 +1,175 @@
+diff -wbBur gnump3d-3.0/bin/gnump3d2 gnump3d-3.0.my/bin/gnump3d2
+--- gnump3d-3.0/bin/gnump3d2	2007-10-18 17:34:02.000000000 +0000
++++ gnump3d-3.0.my/bin/gnump3d2	2010-07-21 16:30:13.000000000 +0000
+@@ -357,11 +357,9 @@
+ #
+ # Make sure our host is defined.
+ #
+-if ( ! $host_rewrite ) { $host .= ":$PORT"; }
++if ( ! $host_rewrite ) { $host = "http://".$host.":$PORT"; }
+ else { $host = $host_rewrite; }
+ 
+-
+-
+ #
+ #  Print a little banner unless the user specified a quiet startup.
+ #
+@@ -738,12 +736,12 @@
+ 		    if ( $chost =~ /(.*):([0-9]+)/ )
+ 		    {
+ 			# Host already contains a port.
+-			$host = $chost;
++			$host = "http://" . $chost;
+ 		    }
+ 		    else
+ 		    {
+ 			# Host was missing a port number.
+-			$host = $chost . ":" . $PORT;
++			$host = "http://" . $chost . ":" . $PORT;
+ 		    }
+ 		}
+ 	    }
+@@ -966,7 +964,7 @@
+ 		    my $header   = getHTTPHeader( 200, "audio/x-mpegurl" );
+ 		    &sendData( $data, $header );
+ 
+-		    my $link = "http://" . $host . &urlEncode( $plainFile );
++		    my $link = $host . &urlEncode( $plainFile );
+ 
+ 		    #
+ 		    # Get ready to add on any bitrate settings to the file
+@@ -1545,7 +1543,7 @@
+     #
+     # Escape the filename.
+     #
+-    $file = "http://" . $host . urlEncode( $file ) . $quality;
++    $file = $host . urlEncode( $file ) . $quality;
+ 
+     #
+     # Add to the playlist
+@@ -1658,7 +1656,7 @@
+ 	    #
+ 	    # Line is fully qualified path.
+ 	    #
+-	    $line = "http://" . $host . "/" . &urlEncode($1);
++	    $line = $host . "/" . &urlEncode($1);
+ 	}
+ 	elsif ( $line =~ /^\// )
+ 	{
+@@ -1666,14 +1664,14 @@
+ 	    # Line is fully qualified.  Just prepend the
+ 	    # server name to it.
+ 	    #
+-	    $line = "http://" . $host . &urlEncode($line);
++	    $line = $host . &urlEncode($line);
+ 	}
+ 	else
+ 	{
+ 	    #
+ 	    # Line is just a straight filename, it needs
+ 	    # server:port + directory prepended to it.
+-	    $line = "http://" . $host . &urlEncode( $dir . "/" . $line );
++	    $line = $host . &urlEncode( $dir . "/" . $line );
+ 	}
+ 
+ 	#
+@@ -2216,7 +2214,7 @@
+ 		$link    = &urlEncode( $link );
+ 
+ 		my $name = $file;
+-		my $rec  = "<a href=\"${link}recurse.m3u\">$play_rec</a>";
++		my $rec  = "<a href=\"${host}${link}recurse.m3u\">$play_rec</a>";
+ 		my $row;
+ 
+ 		if ( $totalSubdirs % 2 == 0 )
+@@ -2314,10 +2312,10 @@
+ 		#
+ 		#  Do the interpolation.
+ 		#
+-		$row =~ s/\$LINK/$link/g;
++		$row =~ s/\$LINK/$host$link/g;
+ 		$row =~ s/\$DIR_NAME/$name/g;
+ 		$row =~ s/\$RECURSE/$rec/g;
+-		$row =~ s/\$LINK/$link/g;
++		$row =~ s/\$LINK/$host$link/g;
+ 
+ 		#
+ 		# Add to the text we're building up.
+@@ -2455,8 +2453,10 @@
+ 		{
+ 		  $output = $file_format2;
+ 		}
+-		$output    =~ s/\$LINK/$link/g;
+-		$output    =~ s/\$PLAINLINK/$link/g;
++		$output    =~ s/\$LINK/$host$link/g;
++		$output    =~ s/\$PLAINLINK/$host$link/g;
++		$output    =~ s/\$RELPATH/$link/g;
++		$output    =~ s/\$HOST/$host/g;
+ 		$output    =~ s/\$SONG_FORMAT/$display/g;
+ 
+ 		#
+@@ -2555,8 +2555,10 @@
+ 		  $output = $file_format2;
+ 		}
+ 
+-		$output    =~ s/\$LINK/$link/g;
+-		$output    =~ s/\$PLAINLINK/$plink/g;
++		$output    =~ s/\$LINK/$host$link/g;
++		$output    =~ s/\$PLAINLINK/$host$plink/g;
++		$output    =~ s/\$RELPATH/$plink/g;
++		$output    =~ s/\$HOST/$host/g;
+ 		$output    =~ s/\$SONG_FORMAT/$display/g;
+ 
+ 		#
+@@ -2677,8 +2679,10 @@
+ 	$output = $file_format2;
+       }
+ 
+-      $output    =~ s/\$LINK/$link/g;
+-      $output    =~ s/\$PLAINLINK/$plink/g;
++      $output    =~ s/\$LINK/$host$link/g;
++      $output    =~ s/\$PLAINLINK/$host$plink/g;
++      $output    =~ s/\$RELPATH/$plink/g;
++      $output    =~ s/\$HOST/$host/g;
+       $output    =~ s/\$SONG_FORMAT/$display/g;
+ 
+       #
+@@ -2783,7 +2787,7 @@
+     my ( $dir ) = (@_);
+     my $prev = "";
+ 
+-    my $banner = "[ <a href=\"/\">Home</a>";
++    my $banner = "[ <a href=\"${host}/\">Home</a>";
+ 
+     my @list = splitPath( $host, $dir );
+ 
+@@ -2800,7 +2804,7 @@
+ 	    {
+ 			$component =~ s/$host//g;
+ 			$component = &urlEncode( $component );
+-			$banner .= " · <a href=\"http://$host$component\">$path</a>";
++			$banner .= " · <a href=\"$host$component\">$path</a>";
+ 	    }
+ 	}
+     }
+@@ -2811,7 +2815,7 @@
+         #
+         $dir =~ s/(.*)\/?/$1/;
+         $dir = &urlEncode( $dir );
+-        $banner .= " | <a href=\"$dir/recurse.m3u\">$play_rec</a>";
++        $banner .= " | <a href=\"${host}${dir}/recurse.m3u\">$play_rec</a>";
+     }
+     $banner .= " ]";
+ 
+diff -wbBur gnump3d-3.0/etc/gnump3d.conf gnump3d-3.0.my/etc/gnump3d.conf
+--- gnump3d-3.0/etc/gnump3d.conf	2007-10-18 17:34:02.000000000 +0000
++++ gnump3d-3.0.my/etc/gnump3d.conf	2010-07-21 16:31:31.000000000 +0000
+@@ -490,7 +490,7 @@
+ #  This is useful if you want to have alternating background colors for
+ #  each entry in a table, for example.
+ #
+-file_format = <tr><td width="10%"> </td><td><a href="$LINK">$SONG_FORMAT</a></td><td align="right">[<a href="/info$PLAINLINK">Info</a>] [<a href="$PLAINLINK">Download</a>]</td></tr>
++file_format = <tr><td width="10%"> </td><td><a href="$LINK">$SONG_FORMAT</a></td><td align="right">[<a href="$HOST/info$RELPATH">Info</a>] [<a href="$PLAINLINK">Download</a>]</td></tr>
+ 
+ 
+ 

Deleted: gnump3d.install
===================================================================
--- gnump3d.install	2013-05-13 14:24:38 UTC (rev 90668)
+++ gnump3d.install	2013-05-13 14:24:56 UTC (rev 90669)
@@ -1,23 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-    chown nobody:root /var/cache/gnump3d /var/cache/gnump3d/serving
-
-    echo 
-    echo "----[ NOTE ]----------------------------------------------------------"
-    echo "| Before starting the server, edit /etc/gnump3d/gnump3d.conf to your |"
-    echo "| liking. For instance, you will probably want to change the \"root\"  |"
-    echo "| variable so that it points to your music collection.               |"
-    echo "|                                                                    |"
-    echo "| When the \"root\" variable is properly set, run                      |"
-    echo "|     /usr/bin/gnump3d-index                                         |"
-    echo "| This will create a database in /var/cache/gnump3d/ for gnump3d.    |"
-    echo "|                                                                    |"
-    echo "| Per default, the server runs as \"nobody\", which is a Good Thing.   |"
-    echo "|                                                                    |"
-    echo "| To make the server start on boot, add \"gnump3d\" to the DAEMONS     |"
-    echo "| array in /etc/rc.conf.                                             |"
-    echo "----------------------------------------------------------------------"
-    echo
-}
-
-

Copied: gnump3d/repos/community-any/gnump3d.install (from rev 90668, gnump3d/trunk/gnump3d.install)
===================================================================
--- gnump3d.install	                        (rev 0)
+++ gnump3d.install	2013-05-13 14:24:56 UTC (rev 90669)
@@ -0,0 +1,23 @@
+# arg 1:  the new package version
+post_install() {
+    chown nobody:root /var/cache/gnump3d /var/cache/gnump3d/serving
+
+    echo 
+    echo "----[ NOTE ]----------------------------------------------------------"
+    echo "| Before starting the server, edit /etc/gnump3d/gnump3d.conf to your |"
+    echo "| liking. For instance, you will probably want to change the \"root\"  |"
+    echo "| variable so that it points to your music collection.               |"
+    echo "|                                                                    |"
+    echo "| When the \"root\" variable is properly set, run                      |"
+    echo "|     /usr/bin/gnump3d-index                                         |"
+    echo "| This will create a database in /var/cache/gnump3d/ for gnump3d.    |"
+    echo "|                                                                    |"
+    echo "| Per default, the server runs as \"nobody\", which is a Good Thing.   |"
+    echo "|                                                                    |"
+    echo "| To make the server start on boot, add \"gnump3d\" to the DAEMONS     |"
+    echo "| array in /etc/rc.conf.                                             |"
+    echo "----------------------------------------------------------------------"
+    echo
+}
+
+

Deleted: gnump3d.service
===================================================================
--- gnump3d.service	2013-05-13 14:24:38 UTC (rev 90668)
+++ gnump3d.service	2013-05-13 14:24:56 UTC (rev 90669)
@@ -1,11 +0,0 @@
-[Unit]
-Description=A streaming server
-After=network.target remote-fs.target nss-lookup.target
-
-[Service]
-Type=simple
-PIDFile=/var/run/ajaxterm.pid
-ExecStart=/usr/bin/gnump3d --quiet
-
-[Install]
-WantedBy=multi-user.target

Copied: gnump3d/repos/community-any/gnump3d.service (from rev 90668, gnump3d/trunk/gnump3d.service)
===================================================================
--- gnump3d.service	                        (rev 0)
+++ gnump3d.service	2013-05-13 14:24:56 UTC (rev 90669)
@@ -0,0 +1,11 @@
+[Unit]
+Description=A streaming server
+After=network.target remote-fs.target nss-lookup.target
+
+[Service]
+Type=simple
+PIDFile=/var/run/ajaxterm.pid
+ExecStart=/usr/bin/gnump3d --quiet
+
+[Install]
+WantedBy=multi-user.target



More information about the arch-commits mailing list