Merge branch 'master' of ssh://gregfrost@knoppmyth.net/mount/repository/LinHES-PKGBUILD

4 files changed, 48 insertions, 3 deletions

diff --git a/abs/core-testing/ntfs-3g/20-ntfs-config-write-policy.fdi b/abs/core-testing/ntfs-3g/20-ntfs-config-write-policy.fdi
new file mode 100644
index 0000000..b0f5961
--- /dev/null
+++ b/abs/core-testing/ntfs-3g/20-ntfs-config-write-policy.fdi
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<deviceinfo version="0.2">
+   <device>
+       <match key="volume.fstype" string="ntfs">
+           <merge key="volume.fstype" type="string">ntfs-3g</merge>
+           <merge key="volume.policy.mount_filesystem" type="string">ntfs-3g</merge>
+           <append key="volume.mount.valid_options" type="strlist">locale=</append>
+           <append key="volume.mount.valid_options" type="strlist">dmask=</append>
+           <append key="volume.mount.valid_options" type="strlist">fmask=</append>
+       </match>
+   </device>
+</deviceinfo>
+
diff --git a/abs/core-testing/ntfs-3g/PKGBUILD b/abs/core-testing/ntfs-3g/PKGBUILD
new file mode 100644
index 0000000..738f131
--- /dev/null
+++ b/abs/core-testing/ntfs-3g/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 35598 2009-04-14 08:38:34Z ronald $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Thomas Bächler <thomas.archlinux.org>
+
+pkgname=ntfs-3g
+pkgver=2009.4.4
+pkgrel=1
+pkgdesc="Stable read and write NTFS driver"
+url="http://www.ntfs-3g.org/"
+arch=('i686' 'x86_64')
+license=('GPL2')
+depends=('glibc')
+makedepends=('pkgconfig')
+options=('!libtool')
+source=(http://www.ntfs-3g.org/${pkgname}-${pkgver}.tgz
+	20-ntfs-config-write-policy.fdi)
+md5sums=('e0b5c170f088a8d82968f0a6b34d31da'
+         'ece35a9108837e2008e5a47f3390755e')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  # use internal fuse at least until fuse 2.8.0 is relased, it contains
+  # some bug & security fixes
+  ac_cv_path_LDCONFIG=/bin/true ./configure --prefix=/usr \
+	--with-fuse=internal || return 1
+  make || return 1
+  make DESTDIR=${pkgdir} install || return 1
+  install -m755 -d "${pkgdir}/usr/share/hal/fdi/policy/10osvendor"
+  install -m644 "${srcdir}/20-ntfs-config-write-policy.fdi" "${pkgdir}/usr/share/hal/fdi/policy/10osvendor/" || return 1
+}
diff --git a/abs/extra-testing/fuppes-svn/PKGBUILD b/abs/extra-testing/fuppes-svn/PKGBUILD
index 3c14ddd..295863a 100644
--- a/abs/extra-testing/fuppes-svn/PKGBUILD
+++ b/abs/extra-testing/fuppes-svn/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=fuppes-svn
 pkgver=636
-pkgrel=5
+pkgrel=6
 pkgdesc="A free, multiplatform Universal Plug and Play A/V MediaServer"
 arch=('i686' 'x86_64')
 url="http://fuppes.ulrich-voelkel.de/"
@@ -13,7 +13,7 @@ makdepends=('pkgconfig' 'autoconf' 'subversion')
 install=fuppes.install
 source=(fuppes-r634-archlinux.patch fuppes.diff fuppes.cfg run fuppes.ch)
 md5sums=('5d9f6331cc91b64aab69449ce327b214' 'c495fa1bd9a870ae36820632434319ee' \
-	 'b0cef07d8e60d01c8146a69870672e1f' 'd8615e017b9929498076c312f134b2ed' \
+	 'b0cef07d8e60d01c8146a69870672e1f' '3850001378088e5efac60487e5550d54' \
 	 '3c355b860f1b0d273f5aa8b2bea1bde6')
 
 _svnmod="fuppes"
@@ -44,6 +44,8 @@ build()
 	mkdir -p $startdir/pkg/etc/fuppes
 	cp $startdir/src/fuppes.cfg $startdir/pkg/etc/fuppes
 	mkdir -p $startdir/pkg/etc/cron.hourly
+	mkdir -p $startdir/pkg/etc/sve/fuppes/supervise
 	install -D -m755 $startdir/src/fuppes.ch $startdir/pkg/etc/cron.hourly
+	install -D -m755 $startdir/src/run $startdir/pkg/etc/sv/fuppes
 }
 
diff --git a/abs/extra-testing/fuppes-svn/run b/abs/extra-testing/fuppes-svn/run
index 670a3dd..dc69879 100755
--- a/abs/extra-testing/fuppes-svn/run
+++ b/abs/extra-testing/fuppes-svn/run
@@ -1,2 +1,2 @@
 #!/bin/bash
-exec /usr/bin/fuppes --config-dir /etc/fuppes --database-file /data/srv/fuppes/fuppes.db --temp-dir /myth/tmp
+exec su mythtv -c "/usr/bin/fuppes --config-dir /etc/fuppes --database-file /data/srv/fuppes/fuppes.db --temp-dir /myth/tmp"