merge, plus some robustness options for install_db_chroot.sh

11 files changed, 387 insertions, 26 deletions

diff --git a/abs/extra-testing/community/vsftpd/PKGBUILD b/abs/extra-testing/community/vsftpd/PKGBUILD
new file mode 100644
index 0000000..32a4007
--- /dev/null
+++ b/abs/extra-testing/community/vsftpd/PKGBUILD
@@ -0,0 +1,52 @@
+# $Id: PKGBUILD 29700 2009-03-11 22:18:56Z hugo $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+
+pkgname=vsftpd
+pkgver=2.1.0
+pkgrel=4
+pkgdesc="Very Secure FTP daemon"
+arch=('i686' 'x86_64')
+license=('GPL')
+backup=(etc/vsftpd.conf etc/xinetd.d/vsftpd)
+url="http://vsftpd.beasts.org/"
+#makedepends=('vim')
+depends=('glibc' 'pam' 'tcp_wrappers>=7.6-8' 'openssl>=0.9.8j-1' 'libcap>=2.16')
+install=vsftpd.install
+source=(ftp://vsftpd.beasts.org/users/cevans/vsftpd-$pkgver.tar.gz \
+        vsftpd.xinetd vsftpd.d run)
+md5sums=('7890b54e7ffa6106ffbdfda53f47fa41'
+         'b07fd4609c70063c1d6b20142910c1a6'
+         'e46ed8e4c4a6e6a3de59f60b98e4f569'
+	 '8abbed7cc75f9a9d2944e0e83c8dd90d')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  # build-time config
+  sed \
+    -e 's|^#undef VSF_BUILD_TCPWRAPPERS$|#define VSF_BUILD_TCPWRAPPERS|' \
+    -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \
+    -i builddefs.h
+  make CFLAGS="${CFLAGS}" || return 1
+  install -D -m755 vsftpd ${pkgdir}/usr/sbin/vsftpd || return 1
+  install -D -m644 vsftpd.conf ${pkgdir}/etc/vsftpd.conf || return 1
+  install -D -m644 vsftpd.8 ${pkgdir}/usr/share/man/man8/vsftpd.8 || return 1
+  install -D -m644 vsftpd.conf.5 ${pkgdir}/usr/share/man/man5/vsftpd.conf.5 || return 1
+  install -D -m644 ../vsftpd.xinetd ${pkgdir}/etc/xinetd.d/vsftpd  || return 1
+  install -D -m755 ../vsftpd.d ${pkgdir}/etc/rc.d/vsftpd || return 1
+  mkdir -p $startdir/pkg/usr/share/empty
+#  ex ${pkgdir}/etc/vsftpd.conf <<_EOF
+#2
+#i
+##
+## Use this to use vsftpd in standalone mode, otherwise it runs through (x)inetd
+##listen=YES
+#.
+#w
+#q
+#_EOF
+#}
+# Below added for LinHES
+  mkdir -p $startdir/pkg/etc/sv/vsftpd/supervise
+  install -D -m755 $startdir/src/run $startdir/pkg/etc/sv/vsftpd/
+}
diff --git a/abs/extra-testing/community/vsftpd/run b/abs/extra-testing/community/vsftpd/run
new file mode 100644
index 0000000..1fd5202
--- /dev/null
+++ b/abs/extra-testing/community/vsftpd/run
@@ -0,0 +1,13 @@
+#!/bin/sh
+exec 2>&1
+. /etc/profile
+. /etc/systemconfig
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+stat_runit "Starting VSFTPD"
+export HOME=/root
+
+# Start vsftpd
+/usr/sbin/vsftpd /etc/vsftpd.conf
diff --git a/abs/extra-testing/community/vsftpd/vsftpd.d b/abs/extra-testing/community/vsftpd/vsftpd.d
new file mode 100644
index 0000000..b43a6d0
--- /dev/null
+++ b/abs/extra-testing/community/vsftpd/vsftpd.d
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/vsftpd`
+case "$1" in
+	start)
+		stat_busy "Starting vsftpd FTP Daemon"
+		if [ -z "$PID" ]; then 
+			/usr/sbin/vsftpd &
+			PID=`pidof -o %PPID /usr/sbin/vsftpd`
+			if [ -z $PID ]; then
+				stat_fail
+			else
+				add_daemon vsftpd
+				stat_done
+			fi
+		else
+			stat_fail
+		fi
+	;;
+	stop)
+		stat_busy "Stopping vsftpd FTP Daemon"
+		[ ! -z "$PID" ]  && kill $PID &> /dev/null
+		if [ $? -gt 0 ]; then
+			stat_fail
+		else
+			rm_daemon vsftpd
+			stat_done
+		fi
+	;;
+	restart)
+		$0 stop
+		sleep 1
+		$0 start
+	;;
+	*)
+		echo "usage: $0 {start|stop|restart}"  
+esac
diff --git a/abs/extra-testing/community/vsftpd/vsftpd.install b/abs/extra-testing/community/vsftpd/vsftpd.install
new file mode 100644
index 0000000..3bbb2cc
--- /dev/null
+++ b/abs/extra-testing/community/vsftpd/vsftpd.install
@@ -0,0 +1,22 @@
+# arg 1:  the new package version
+post_install() {
+  if [ -f lib/modules/`uname -r`/kernel/security/capability.ko ]; then
+    echo ">>> It appears that your current kernel has linux security"
+    echo ">>> capabilities built as a module.  vsftpd requires this"
+    echo ">>> functionality to operate."
+    echo ">>>"
+    echo ">>> To activate the module, please load it now (modprobe capability)."
+    echo ">>> Also, you should add it to your MODULES array in rc.conf, so"
+    echo ">>> it will be activated automatically at boot-up."
+  fi
+# Below added for LinHES
+  add_service.sh vsftpd
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+	remove_service.sh vsftpd
+}
diff --git a/abs/extra-testing/community/vsftpd/vsftpd.xinetd b/abs/extra-testing/community/vsftpd/vsftpd.xinetd
new file mode 100644
index 0000000..eff2eb3
--- /dev/null
+++ b/abs/extra-testing/community/vsftpd/vsftpd.xinetd
@@ -0,0 +1,10 @@
+service ftp
+{
+        socket_type             = stream
+        wait                    = no
+        user                    = root
+        server                  = /usr/sbin/vsftpd
+        log_on_success  += HOST DURATION
+        log_on_failure  += HOST
+        disable                 = yes
+}
diff --git a/abs/extra-testing/fuppes-svn/PKGBUILD b/abs/extra-testing/fuppes-svn/PKGBUILD
index fd794b6..3c14ddd 100644
--- a/abs/extra-testing/fuppes-svn/PKGBUILD
+++ b/abs/extra-testing/fuppes-svn/PKGBUILD
@@ -3,15 +3,18 @@
 
 pkgname=fuppes-svn
 pkgver=636
-pkgrel=2
+pkgrel=5
 pkgdesc="A free, multiplatform Universal Plug and Play A/V MediaServer"
 arch=('i686' 'x86_64')
 url="http://fuppes.ulrich-voelkel.de/"
 license=('GPL2')
 depends=('pcre' 'libxml2' 'sqlite3' 'gettext' 'taglib' 'imagemagick' 'ffmpeg' 'libmp4v2' 'lame' 'libvorbis' 'libmpcdec' 'flac' 'faad2' 'libmad')
 makdepends=('pkgconfig' 'autoconf' 'subversion')
-source=(fuppes-r634-archlinux.patch fuppes.diff)
-md5sums=('5d9f6331cc91b64aab69449ce327b214' 'c495fa1bd9a870ae36820632434319ee')
+install=fuppes.install
+source=(fuppes-r634-archlinux.patch fuppes.diff fuppes.cfg run fuppes.ch)
+md5sums=('5d9f6331cc91b64aab69449ce327b214' 'c495fa1bd9a870ae36820632434319ee' \
+	 'b0cef07d8e60d01c8146a69870672e1f' 'd8615e017b9929498076c312f134b2ed' \
+	 '3c355b860f1b0d273f5aa8b2bea1bde6')
 
 _svnmod="fuppes"
 _svntrunk="https://fuppes.svn.sourceforge.net/svnroot/fuppes/trunk"
@@ -36,5 +39,11 @@ build()
 	
 	make || return 1
 	make DESTDIR=$startdir/pkg install || return 1
+	mkdir -p $startdir/pkg/etc/sv/fuppes/supervise
+	install -D -m755 $startdir/src/run $startdir/pkg/etc/sv/fuppes/
+	mkdir -p $startdir/pkg/etc/fuppes
+	cp $startdir/src/fuppes.cfg $startdir/pkg/etc/fuppes
+	mkdir -p $startdir/pkg/etc/cron.hourly
+	install -D -m755 $startdir/src/fuppes.ch $startdir/pkg/etc/cron.hourly
 }
 
diff --git a/abs/extra-testing/fuppes-svn/fuppes.cfg b/abs/extra-testing/fuppes-svn/fuppes.cfg
new file mode 100644
index 0000000..beb81cf
--- /dev/null
+++ b/abs/extra-testing/fuppes-svn/fuppes.cfg
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fuppes_config version="0.7.2.3">
+  <shared_objects>
+    <!--<dir>/mnt/music</dir>-->
+    <!--<itunes>/Users/.../iTunes.xml</itunes>-->
+    <dir>/myth/tv</dir>
+    <dir>/myth/video</dir>
+    <dir>/myth/music</dir>
+    <dir>/myth/gallery</dir>
+    <dir>/myth/pretty</dir>
+  </shared_objects>
+  <network>
+    <!--empty = automatic detection-->
+    <interface>192.168.1.253</interface>
+    <!--empty or 0 = random port-->
+    <http_port>81</http_port>
+    <!--list of ip addresses allowed to access fuppes. if empty all ips are allowed-->
+    <allowed_ips>
+      <!--<ip>192.168.0.1</ip>-->
+    </allowed_ips>
+  </network>
+  <content_directory>
+    <!--a list of possible charsets can be found under:
+      http://www.gnu.org/software/libiconv/-->
+    <local_charset>UTF-8</local_charset>
+    <!--libs used for metadata extraction when building the database. [true|false]-->
+    <use_imagemagick>true</use_imagemagick>
+    <use_taglib>true</use_taglib>
+    <use_libavformat>true</use_libavformat>
+  </content_directory>
+  <global_settings>
+    <temp_dir/>
+    <!--uuid is written to and read from <config-dir>/uuid.txt if set to true-->
+    <use_fixed_uuid>false</use_fixed_uuid>
+  </global_settings>
+  <device_settings>
+    <!--"default" settings are inhertied by specific devices and can be overwritten-->
+    <!--do NOT remove the "default" device settings-->
+    <!--all new file types have to be added to the default settings-->
+    <!--adding new file types just to a specific device will have no affect-->
+    <device name="default">
+      <!--specify the maximum length for file names (0 or empty = unlimited)-->
+      <max_file_name_length>0</max_file_name_length>
+      <!--[file|container]-->
+      <playlist_style>file</playlist_style>
+      <show_childcount_in_title>false</show_childcount_in_title>
+      <enable_dlna>false</enable_dlna>
+      <transcoding_release_delay>4</transcoding_release_delay>
+      <file_settings>
+        <!--audio files-->
+        <file ext="mp3">
+          <type>AUDIO_ITEM</type>
+          <mime_type>audio/mpeg</mime_type>
+          <dlna>MP3</dlna>
+        </file>
+        <file ext="ogg">
+          <type>AUDIO_ITEM</type>
+          <mime_type>application/octet-stream</mime_type>
+          <transcode enabled="true">
+            <ext>mp3</ext>
+            <mime_type>audio/mpeg</mime_type>
+            <dlna>MP3</dlna>
+            <http_encoding>chunked</http_encoding>
+            <decoder>vorbis</decoder>
+            <encoder>lame</encoder>
+            <bitrate>192</bitrate>
+            <samplerate>44100</samplerate>
+          </transcode>
+        </file>
+        <file ext="mpc">
+          <type>AUDIO_ITEM</type>
+          <mime_type>application/octet-stream</mime_type>
+          <transcode enabled="true">
+            <ext>mp3</ext>
+            <mime_type>audio/mpeg</mime_type>
+            <dlna>MP3</dlna>
+            <http_encoding>chunked</http_encoding>
+            <decoder>musepack</decoder>
+            <encoder>lame</encoder>
+            <bitrate>192</bitrate>
+            <samplerate>44100</samplerate>
+          </transcode>
+        </file>
+        <file ext="wav">
+          <type>AUDIO_ITEM</type>
+          <mime_type>audio/x-wav</mime_type>
+        </file>
+        <file ext="flac">
+          <type>AUDIO_ITEM</type>
+          <mime_type>audio/x-flac</mime_type>
+          <transcode enabled="true">
+            <ext>mp3</ext>
+            <mime_type>audio/mpeg</mime_type>
+            <dlna>MP3</dlna>
+            <http_encoding>chunked</http_encoding>
+            <decoder>flac</decoder>
+            <encoder>lame</encoder>
+            <bitrate>192</bitrate>
+            <samplerate>44100</samplerate>
+          </transcode>
+        </file>
+        <file ext="wma">
+          <type>AUDIO_ITEM</type>
+          <mime_type>audio/x-ms-wma</mime_type>
+          <dlna>WMAFULL</dlna>
+        </file>
+        <!--image files-->
+        <file ext="jpg">
+          <ext>jpeg</ext>
+          <type>IMAGE_ITEM</type>
+          <mime_type>image/jpeg</mime_type>
+          <convert enabled="false">
+            <!--<dcraw enabled="true">-q 0</dcraw>-->
+            <ext>png</ext>
+            <mime_type>image/png</mime_type>
+            <height>0</height>
+            <width>0</width>
+            <!--set "greater" to "true" if you only want to resize images greater than "height" or "width"-->
+            <greater>false</greater>
+            <!--set "less" to "true" if you only want to resize images less than "height" or "width"-->
+            <less>false</less>
+            <!--set "less" and "greater" to "false" if you always want to resize-->
+          </convert>
+        </file>
+        <file ext="bmp">
+          <type>IMAGE_ITEM</type>
+          <mime_type>image/bmp</mime_type>
+        </file>
+        <file ext="png">
+          <type>IMAGE_ITEM</type>
+          <mime_type>image/png</mime_type>
+        </file>
+        <file ext="gif">
+          <type>IMAGE_ITEM</type>
+          <mime_type>image/gif</mime_type>
+        </file>
+        <!--video files-->
+        <file ext="mpg">
+          <ext>mpeg</ext>
+          <type>VIDEO_ITEM</type>
+          <mime_type>video/mpeg</mime_type>
+        </file>
+        <file ext="mp4">
+          <type>VIDEO_ITEM</type>
+          <mime_type>video/mp4</mime_type>
+        </file>
+        <file ext="avi">
+          <type>VIDEO_ITEM</type>
+          <mime_type>video/x-msvideo</mime_type>
+        </file>
+        <file ext="wmv">
+          <type>VIDEO_ITEM</type>
+          <mime_type>video/x-ms-wmv</mime_type>
+        </file>
+        <file ext="vob">
+          <type>VIDEO_ITEM</type>
+          <mime_type>video/x-ms-vob</mime_type>
+        </file>
+        <file ext="vdr">
+          <type>VIDEO_ITEM</type>
+          <mime_type>video/x-extension-vdr</mime_type>
+          <transcode enabled="true">
+            <ext>vob</ext>
+            <mime_type>video/x-ms-vob</mime_type>
+          </transcode>
+        </file>
+        <file ext="flv">
+          <type>VIDEO_ITEM</type>
+          <mime_type>application/x-flash-video</mime_type>
+        </file>
+        <file ext="asf">
+          <type>VIDEO_ITEM</type>
+          <mime_type>video/x-ms-asf</mime_type>
+        </file>
+        <!--playlists-->
+        <file ext="pls">
+          <type>PLAYLIST</type>
+          <mime_type>audio/x-scpls</mime_type>
+        </file>
+        <file ext="m3u">
+          <type>PLAYLIST</type>
+          <mime_type>audio/x-mpegurl</mime_type>
+        </file>
+      </file_settings>
+    </device>
+    <!--For other device settings take a look at http://fuppes.ulrich-voelkel.de/wiki/index.php/Category:Device-->
+    <!--If you have more than one device it is a good idea to set the ip address as some devices may have conflicting "user agents".-->
+    <!--It is safe to remove unneeded devices-->
+    <device name="PS3" enabled="false">
+      <user_agent>UPnP/1.0 DLNADOC/1.00</user_agent>
+      <user_agent>PLAYSTATION3</user_agent>
+      <!--<ip></ip>-->
+      <enable_dlna>true</enable_dlna>
+      <transcoding_release_delay>50</transcoding_release_delay>
+      <file_settings>
+        <file ext="ogg">
+          <type>AUDIO_ITEM_MUSIC_TRACK</type>
+          <transcode enabled="true">
+            <http_encoding>stream</http_encoding>
+          </transcode>
+        </file>
+      </file_settings>
+    </device>
+    <device name="Xbox 360" virtual="Xbox 360" enabled="false">
+      <user_agent>Xbox/2.0.\d+.\d+ UPnP/1.0 Xbox/2.0.\d+.\d+</user_agent>
+      <user_agent>Xenon</user_agent>
+      <xbox360>true</xbox360>
+      <show_empty_resolution>true</show_empty_resolution>
+      <description_values>
+        <friendly_name>%s %v : 1 : Windows Media Connect</friendly_name>
+        <model_name>Windows Media Connect compatible (%s)</model_name>
+        <model_number>2.0</model_number>
+      </description_values>
+    </device>
+  </device_settings>
+</fuppes_config>
diff --git a/abs/extra-testing/fuppes-svn/fuppes.ch b/abs/extra-testing/fuppes-svn/fuppes.ch
new file mode 100644
index 0000000..60960b5
--- /dev/null
+++ b/abs/extra-testing/fuppes-svn/fuppes.ch
@@ -0,0 +1,2 @@
+#!/bin/bash
+/usr/bin/wget -O /dev/null -q http://localhost:81/presentation/options.html?db=update &> /dev/null
diff --git a/abs/extra-testing/fuppes-svn/fuppes.install b/abs/extra-testing/fuppes-svn/fuppes.install
new file mode 100644
index 0000000..a35aebe
--- /dev/null
+++ b/abs/extra-testing/fuppes-svn/fuppes.install
@@ -0,0 +1,18 @@
+# arg 1:  the new package version
+post_install() {
+  sv stop mythbackend
+  mv /etc/sv/mythbackend/run /tmp
+  sed 's/logfile/noupnp\ --logfile/' </tmp/run >/etc/sv/mythbackend/run
+  sv start mythbackend
+  add_service.sh fuppes
+  sv start fuppes
+}
+
+post_remove() {
+	sv stop fuppes
+	remove_service.sh fuppes
+	mv /etc/sv/mythbackend/run /tmp/run
+	sv stop mythbackend
+	sed 's/--noupnp\ --logfile/--logfile/' </tmp/run >/etc/sv/mythbackend/run
+	sv start mythbackend
+}
diff --git a/abs/extra-testing/fuppes-svn/run b/abs/extra-testing/fuppes-svn/run
new file mode 100755
index 0000000..670a3dd
--- /dev/null
+++ b/abs/extra-testing/fuppes-svn/run
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec /usr/bin/fuppes --config-dir /etc/fuppes --database-file /data/srv/fuppes/fuppes.db --temp-dir /myth/tmp
diff --git a/abs/extra-testing/perl-algorithm-diff/PKGBUILD b/abs/extra-testing/perl-algorithm-diff/PKGBUILD
deleted file mode 100644
index 43d53c1..0000000
--- a/abs/extra-testing/perl-algorithm-diff/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman
-# Contributor: François Charette <firmicus ατ gmx δοτ net>
-
-pkgname=perl-algorithm-diff
-pkgver=1.1902
-pkgrel=1
-pkgdesc="Compute intelligent differences between two files / lists"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/~TJMATHER/XML-RegExp"
-license=('GPL' 'PerlArtistic')
-depends=('perl>=5.10.0')
-options=('!emptydirs')
-source=(http://search.cpan.org/CPAN/authors/id/T/TY/TYEMQ/Algorithm-Diff-$pkgver.tar.gz) 
-md5sums=('ff3e17ae485f8adfb8857b183991fbce')
-
-build() {
-  cd  $startdir/src/Algorithm-Diff-$pkgver
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 
-  make || return 1
-  make install DESTDIR=$startdir/pkg || return 1
-  find $startdir/pkg -name '.packlist' -delete
-  find $startdir/pkg -name '*.pod' -delete
-}