[arch-commits] Commit in gnump3d/repos (6 files)
Felix Yan
felixonmars at archlinux.org
Thu Jun 1 08:42:02 UTC 2017
Date: Thursday, June 1, 2017 @ 08:42:00
Author: felixonmars
Revision: 231765
archrelease: copy trunk to community-staging-any
Added:
gnump3d/repos/community-staging-any/
gnump3d/repos/community-staging-any/ChangeLog
(from rev 231763, gnump3d/trunk/ChangeLog)
gnump3d/repos/community-staging-any/PKGBUILD
(from rev 231763, gnump3d/trunk/PKGBUILD)
gnump3d/repos/community-staging-any/gnump3d-proxy.patch
(from rev 231763, gnump3d/trunk/gnump3d-proxy.patch)
gnump3d/repos/community-staging-any/gnump3d.install
(from rev 231763, gnump3d/trunk/gnump3d.install)
gnump3d/repos/community-staging-any/gnump3d.service
(from rev 231763, gnump3d/trunk/gnump3d.service)
---------------------+
ChangeLog | 7 ++
PKGBUILD | 59 ++++++++++++++++
gnump3d-proxy.patch | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++
gnump3d.install | 23 ++++++
gnump3d.service | 11 +++
5 files changed, 275 insertions(+)
Copied: gnump3d/repos/community-staging-any/ChangeLog (from rev 231763, gnump3d/trunk/ChangeLog)
===================================================================
--- community-staging-any/ChangeLog (rev 0)
+++ community-staging-any/ChangeLog 2017-06-01 08:42:00 UTC (rev 231765)
@@ -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
+
Copied: gnump3d/repos/community-staging-any/PKGBUILD (from rev 231763, gnump3d/trunk/PKGBUILD)
===================================================================
--- community-staging-any/PKGBUILD (rev 0)
+++ community-staging-any/PKGBUILD 2017-06-01 08:42:00 UTC (rev 231765)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Stefan Bergstrom <stefan.bergstrom at gmail.com>
+
+pkgname=gnump3d
+pkgver=3.0
+pkgrel=9
+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
+validpgpkeys=('DB1FF3FB1D08FC01ED222243C0CFC6B3CD4C0D9D')
+source=("https://savannah.gnu.org/download/$pkgname/$pkgname-$pkgver.tar.bz2"{,.sig}
+ 'gnump3d.service'
+ 'gnump3d-proxy.patch')
+sha256sums=('1ac5bd0e850b0e18ccd9d19219f5108fa84b50d8ae3825a361e8b907eab7f19c'
+ 'SKIP'
+ 'a8fb63b0bb49e7fb4149a7f8c15e1a337bfa4787f630fa9fcd696a6bdf6418e8'
+ '1a1829bf55f46fbfa249053732033b59f7ab1dc27a2f3c4e7ed71f03ac10a1ae')
+
+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
+}
Copied: gnump3d/repos/community-staging-any/gnump3d-proxy.patch (from rev 231763, gnump3d/trunk/gnump3d-proxy.patch)
===================================================================
--- community-staging-any/gnump3d-proxy.patch (rev 0)
+++ community-staging-any/gnump3d-proxy.patch 2017-06-01 08:42:00 UTC (rev 231765)
@@ -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>
+
+
+
Copied: gnump3d/repos/community-staging-any/gnump3d.install (from rev 231763, gnump3d/trunk/gnump3d.install)
===================================================================
--- community-staging-any/gnump3d.install (rev 0)
+++ community-staging-any/gnump3d.install 2017-06-01 08:42:00 UTC (rev 231765)
@@ -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
+}
+
+
Copied: gnump3d/repos/community-staging-any/gnump3d.service (from rev 231763, gnump3d/trunk/gnump3d.service)
===================================================================
--- community-staging-any/gnump3d.service (rev 0)
+++ community-staging-any/gnump3d.service 2017-06-01 08:42:00 UTC (rev 231765)
@@ -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