pcr/mediatomb: bumped pkgrel and rebuilt

4 files changed, 63 insertions, 35 deletions

diff --git a/pcr/mediatomb/PKGBUILD b/pcr/mediatomb/PKGBUILD
index 5581a57ce..ecb25821a 100644
--- a/pcr/mediatomb/PKGBUILD
+++ b/pcr/mediatomb/PKGBUILD
@@ -1,15 +1,19 @@
-# Maintainer (Arch): S Leduc <sebastien@sleduc.fr>
-# Contributor (Arch): Martin Villagra <mvillagra0@gmail.com>
-# Contributor (Arch): William Rea <sillywilly@gmail.com>
-# Contributor (Arch): Nikhil Bysani <nikron@gmail.com>
-# Contributor (Arch): Mika Hynnä <igheax@gmail.com>
-# Contributor (Arch): Jonathan Conder <jonno.conder@gmail.com>
-# Contributor (Arch): Peter Richard Lewis <plewis@aur.archlinux.org>
+# Maintainer (AUR): Jakob Gahde <j5lx@fmail.co.uk>
+# Contributor (AUR): S Leduc <sebastien@sleduc.fr>
+# Contributor (AUR): Martin Villagra <mvillagra0@gmail.com>
+# Contributor (AUR): William Rea <sillywilly@gmail.com>
+# Contributor (AUR): Nikhil Bysani <nikron@gmail.com>
+# Contributor (AUR): Mika Hynnä <igheax@gmail.com>
+# Contributor (AUR): Jonathan Conder <jonno.conder@gmail.com>
+# Contributor (AUR): Peter Richard Lewis <plewis@aur.archlinux.org>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
+# parabola changes and rationale:
+#  no changes.
+
 pkgname=mediatomb
 pkgver=0.12.1
-pkgrel=13
+pkgrel=15
 pkgdesc="Free UPnP/DLNA media server"
 arch=('i686' 'x86_64' 'armv7h')
 url="http://mediatomb.cc/"
@@ -18,7 +22,8 @@ depends=('file' 'curl' 'ffmpegthumbnailer' 'libexif' 'libmp4v2' 'sqlite3' 'tagli
 optdepends=('mariadb: to store your music database in mariadb')
 backup=('etc/conf.d/mediatomb')
 install=mediatomb.install
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'mediatomb.sysusers'
         'mediatomb.service'
         'mediatomb-mariadb.service'
         'mediatomb.conf'
@@ -28,8 +33,10 @@ source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
         'libav_0.7_support.patch'
         'libmp4v2_191_p497.patch'
         'libavformat.patch'
-        'symlinks.patch')
+        'symlinks.patch'
+        'truncated_auxdata.patch')
 sha256sums=('31163c34a7b9d1c9735181737cb31306f29f1f2a0335fb4f53ecccf8f62f11cd'
+            '99e2602eebb9f5236107b0bee473a4187c7df7732745ad83542a3dcca9cb7d5a'
             'e46de674e49aa85116a8ff127908f7bac21198ce7625404004b8b7832eccd3f4'
             '9c917f0d6e568ce0ad77c0ed17e4bbaabc0e7a1c0a3e4772b786fb1565db9768'
             '70e4a4b89cef9a7f6f5f800e1793a6cb807f52b39e5a17d0a91356608b95e62d'
@@ -39,17 +46,25 @@ sha256sums=('31163c34a7b9d1c9735181737cb31306f29f1f2a0335fb4f53ecccf8f62f11cd'
             'c6523e8bf5e2da89b7475d6777ef9bffe7d089752ef2f7b27b5e39a4130fb0ff'
             'd39c2f9aab051c5447461718fd0ec72cf5982f6c920a4a985a50831f34babe84'
             '76b11706d70ed8f5e157d96ca441c90c46c42176102fcb651b4ab1102b61bfee'
-            '72f7532d7cd827ab655df652d2912175739fe16d2b1ad989d987a0b147a1d2e8')
+            '72f7532d7cd827ab655df652d2912175739fe16d2b1ad989d987a0b147a1d2e8'
+            'a831bc5d107345bcb6e2d417b7cb0d6890dfde8e262f0cf532d21998cfc42db7')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 < "${srcdir}/gcc46.patch"
+  patch -Np1 < "${srcdir}/tonewjs.patch"
+  patch -Np1 < "${srcdir}/jsparse.patch"
+  patch -Np1 < "${srcdir}/libav_0.7_support.patch"
+  patch -Np1 < "${srcdir}/libmp4v2_191_p497.patch"
+  patch -Np1 < "${srcdir}/libavformat.patch"
+  patch -Np1 < "${srcdir}/symlinks.patch"
+  # See https://sourceforge.net/p/mediatomb/bugs/78/
+  patch -Np1 < "${srcdir}/truncated_auxdata.patch"
+}
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/gcc46.patch"
-  patch -Np1 -i "$srcdir/tonewjs.patch"
-  patch -Np1 -i "$srcdir/jsparse.patch"
-  patch -Np1 -i "$srcdir/libav_0.7_support.patch"
-  patch -Np1 -i "$srcdir/libmp4v2_191_p497.patch"
-  patch -Np1 -i "$srcdir/libavformat.patch"
-  patch -Np1 -i "$srcdir/symlinks.patch"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr \
               --enable-mysql \
@@ -60,11 +75,12 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR="${pkgdir}" install
 
-  install -D -m0644 "$srcdir/mediatomb.service" "$pkgdir/usr/lib/systemd/system/mediatomb.service"
-  install -D -m0644 "$srcdir/mediatomb-mariadb.service" "$pkgdir/usr/lib/systemd/system/mediatomb-mariadb.service"
-  install -D -m0644 "$srcdir/mediatomb.conf" "$pkgdir/etc/conf.d/mediatomb"
+  install -Dm644 "${srcdir}/mediatomb.sysusers" "${pkgdir}/usr/lib/sysusers.d/mediatomb.conf"
+  install -Dm644 "${srcdir}/mediatomb.service" "${pkgdir}/usr/lib/systemd/system/mediatomb.service"
+  install -Dm644 "${srcdir}/mediatomb-mariadb.service" "${pkgdir}/usr/lib/systemd/system/mediatomb-mariadb.service"
+  install -Dm644 "${srcdir}/mediatomb.conf" "${pkgdir}/etc/conf.d/mediatomb"
 }
diff --git a/pcr/mediatomb/mediatomb.install b/pcr/mediatomb/mediatomb.install
index 27f71d5a4..cb343b455 100644
--- a/pcr/mediatomb/mediatomb.install
+++ b/pcr/mediatomb/mediatomb.install
@@ -1,20 +1,18 @@
 post_install() {
-  post_upgrade
-  passwd -l mediatomb &>/dev/null
+  systemd-sysusers mediatomb.conf
+  install -dm700 -omediatomb -gmediatomb /var/lib/mediatomb
+
   echo 'Warning: the MediaTomb web interface exposes your filesystem to the network'
   echo 'For maximum security, set <ui enabled="no"> in your MediaTomb config file'
 }
 
 post_upgrade() {
-  # create user/group that the daemon will run as by default, do not delete this on uninstall, as it will own files
-  getent group mediatomb >/dev/null || groupadd -g 241 mediatomb &>/dev/null
-  getent passwd mediatomb >/dev/null || useradd -c 'Mediatomb DLNA Server' -u 241 -g mediatomb -b '/var/lib' -m -s /bin/false mediatomb &>/dev/null
+  systemd-sysusers mediatomb.conf
 
-  echo 'Attention: By default, MediaTomb now runs as its own user: mediatomb.'
-  echo 'Ensuring ownership of /var/lib/mediatomb is mediatomb:mediatomb...'
-  chown -R mediatomb:mediatomb /var/lib/mediatomb &>/dev/null
-  echo
-  echo 'Please note that the old rc script has been replaced with systemd service files.'
-  echo
+  if [ $(vercmp $2 0.12.1-12) -lt 1 ]; then
+    echo 'Attention: By default, MediaTomb now runs as its own user: mediatomb.'
+    echo 'Ensuring ownership of /var/lib/mediatomb is mediatomb:mediatomb...'
+    chown -R mediatomb:mediatomb /var/lib/mediatomb &>/dev/null
+  fi
 }
 
diff --git a/pcr/mediatomb/mediatomb.sysusers b/pcr/mediatomb/mediatomb.sysusers
new file mode 100644
index 000000000..373b39a91
--- /dev/null
+++ b/pcr/mediatomb/mediatomb.sysusers
@@ -0,0 +1 @@
+u mediatomb 241 "Mediatomb DLNA Server" /var/lib/mediatomb
diff --git a/pcr/mediatomb/truncated_auxdata.patch b/pcr/mediatomb/truncated_auxdata.patch
new file mode 100644
index 000000000..89957c2c4
--- /dev/null
+++ b/pcr/mediatomb/truncated_auxdata.patch
@@ -0,0 +1,13 @@
+diff -Nru mediatomb-0.12.1/src/metadata/taglib_handler.cc mediatomb-0.12.1.new/src/metadata/taglib_handler.cc
+--- mediatomb-0.12.1/src/metadata/taglib_handler.cc	2010-03-25 15:58:10.000000000 +0100
++++ mediatomb-0.12.1.new/src/metadata/taglib_handler.cc	2013-04-16 14:23:00.772805429 +0200
+@@ -227,7 +227,8 @@
+                             {
+                                 TagLib::String frameContents = textFrame->toString();
+                                 //log_debug("We have a match!!!!: %s\n", frameContents.toCString(true));
+-                                String value(frameContents.toCString(true), frameContents.size());
++                                //String value(frameContents.toCString(true), frameContents.size());
++                                String value(frameContents.toCString(true));
+                                 value = sc->convert(value);
+                                 log_debug("Adding frame: %s with value %s\n", desiredFrame.c_str(), value.c_str());
+                                 item->setAuxData(desiredFrame, value);