cleanups

4 files changed, 58 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 296f68542977..1a77be0322c2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Aug  8 12:17:31 UTC 2016
+# Fri Dec 23 16:25:35 UTC 2016
 pkgbase = liquidsoap
-	pkgdesc = a swiss-army knife for multimedia streaming, notably used for netradios and webtvs
+	pkgdesc = A swiss-army knife for multimedia streaming, notably used for netradios and webtvs
 	pkgver = 1.2.1
-	pkgrel = 4
+	pkgrel = 5
 	url = http://savonet.sourceforge.net/
 	install = liquidsoap.install
 	arch = i686
@@ -45,10 +45,12 @@ pkgbase = liquidsoap
 	source = PACKAGES
 	source = liquidsoap.service
 	source = liquidsoap.tmpfilesd
-	sha256sums = f44bd012ac80e1fc13d58fde832e4e782b82b6d43d2ba7d80a3560e9992c226b
-	sha256sums = 7aada825a04a63566b57df3258525edc7d2f797300d5725c47f6920ef03a07b2
-	sha256sums = df6d2cec1be47a57a02ed04a1f527c0349221fad39d8d152aca13734d3808661
-	sha256sums = 9f286958af0c751c2a43d74614cdd1c4629c0583d619875385c09417a5383675
+	source = ocaml-alsa.patch
+	md5sums = a665fda35f2cf7395cf46970a8ff3ff6
+	md5sums = 21d7e17ac7114edfd0a944c7773aa5af
+	md5sums = 762d6607ff0889e34b8c874970b38bc9
+	md5sums = f9106e5c42cabc21c4c8464d9b1ad63e
+	md5sums = 81769723888a75306c51323d86774c34
 
 pkgname = liquidsoap
 
diff --git a/PKGBUILD b/PKGBUILD
index 5d1c6209b13f..147cfe6897e7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,25 +2,21 @@
 
 pkgname=liquidsoap
 pkgver=1.2.1
-pkgrel=4
-pkgdesc="a swiss-army knife for multimedia streaming, notably used for netradios and webtvs"
+pkgrel=5
+pkgdesc="A swiss-army knife for multimedia streaming, notably used for netradios and webtvs"
 arch=('i686' 'x86_64')
 url="http://savonet.sourceforge.net/"
 license=('GPL')
-depends=('faad2' 'ffmpeg' 'gavl' 'gd' 'giflib' 'gst-plugins-base-libs' 'libao' 'libfdk-aac' 'liblo' 'libmad' 'libxpm' 
-'ocaml-camomile' 'openssl' 'portaudio' 'sdl_image' 'sdl_ttf' 'soundtouch' 'taglib')
+depends=('faad2' 'ffmpeg' 'gavl' 'gd' 'giflib' 'gst-plugins-base-libs' 'libao' 'libfdk-aac' 'liblo' 'libmad' 'libxpm' 'ocaml-camomile' 'openssl' 'portaudio' 'sdl_image' 'sdl_ttf' 'soundtouch' 'taglib')
 makedepends=('dssi' 'frei0r-plugins' 'ladspa' 'libxml-perl' 'ocaml-gd4o' 'ocaml-ocamlsdl' 'ocaml-pcre' 'ocaml-ssl' 'ocaml-xmlm' 'ocaml-yojson' 'perl-xml-dom')
 source=(https://github.com/savonet/$pkgname/releases/download/$pkgver/$pkgname-$pkgver-full.tar.gz
-PACKAGES
-$pkgname.service
-$pkgname.tmpfilesd)
+	PACKAGES
+	$pkgname.service
+	$pkgname.tmpfilesd
+	ocaml-alsa.patch)
 install=$pkgname.install
 options=(!makeflags)
 conflicts=('liquidsoap-git' 'liquidsoap-full')
-sha256sums=('f44bd012ac80e1fc13d58fde832e4e782b82b6d43d2ba7d80a3560e9992c226b'
-            '7aada825a04a63566b57df3258525edc7d2f797300d5725c47f6920ef03a07b2'
-            'df6d2cec1be47a57a02ed04a1f527c0349221fad39d8d152aca13734d3808661'
-            '9f286958af0c751c2a43d74614cdd1c4629c0583d619875385c09417a5383675')
 
 prepare() {
   cd $srcdir/$pkgname-$pkgver-full
@@ -29,6 +25,7 @@ prepare() {
 
 build() {
   cd $srcdir/$pkgname-$pkgver-full
+  patch -Np1 -i ../ocaml-alsa.patch
   ./configure --prefix=/usr  --localstatedir=/var --sysconfdir=/etc --without-user --without-group
   make all && make doc
 }
@@ -40,6 +37,11 @@ package() {
  # install systemd unit
   install -Dm0644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/liquidsoap@.service"
 # Install the tmpfilesd file
-        install -Dm0644 $srcdir/$pkgname.tmpfilesd $pkgdir/usr/lib/tmpfiles.d/liquidsoap.conf
+  install -Dm0644 $srcdir/$pkgname.tmpfilesd $pkgdir/usr/lib/tmpfiles.d/liquidsoap.conf
 }
-# vim:set ts=2 sw=2 et:
+
+md5sums=('a665fda35f2cf7395cf46970a8ff3ff6'
+         '21d7e17ac7114edfd0a944c7773aa5af'
+         '762d6607ff0889e34b8c874970b38bc9'
+         'f9106e5c42cabc21c4c8464d9b1ad63e'
+         '81769723888a75306c51323d86774c34')
diff --git a/liquidsoap.install b/liquidsoap.install
index ac5bb3e8e186..516ec89e20f9 100644
--- a/liquidsoap.install
+++ b/liquidsoap.install
@@ -1,34 +1,34 @@
-# arg 1:  the new package version
-post_install() {
-  # Make sure the group and user "liquidsoap" exists on this system and have the correct values
-  if getent group liquidsoap &> /dev/null ; then
-    groupmod -g 140 -n liquidsoap liquidsoap &> /dev/null
-  else
-    groupadd -g 140 liquidsoap &> /dev/null
-  fi
+usr=liquidsoap
+home=/var/lib/liquidsoap
 
-  if getent passwd liquidsoap &> /dev/null ; then
-    usermod -s /bin/false -c "liquidsoap user" -d /var/lib/liquidsoap -u 140 -g liquidsoap -G audio -a liquidsoap &> /dev/null
-  else
-    useradd -m -s /bin/false -c "liquidsoap user" -d /var/lib/liquidsoap -u 140 -g liquidsoap -G audio -r liquidsoap &> /dev/null
-  fi
-  # create the logs folder
-  install -do140 -g19 -m0755 /var/log/liquidsoap
+post_install() {
+  _mkuser
+  _chown
 # Create /run/liquidsoap 
-        if [[ ! -d run/liquidsoap ]]; then
-                usr/bin/systemd-tmpfiles --create liquidsoap.conf
-        fi
+   if [[ ! -d run/liquidsoap ]]; then
+	 systemd-tmpfiles --create liquidsoap.conf
+   fi
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
     post_install $1
 }
 
-# arg 1:  the old package version
 pre_remove() {
     userdel liquidsoap &> /dev/null
-    groupdel liquidsoap &> /dev/null || /bin/true
-    rm -rf /var/log/liquidsoap/ &> /dev/null || /bin/true
+    groupdel liquidsoap &> /dev/null || true
+    rm -rf /var/log/liquidsoap/ &> /dev/null || true
+}
+
+_chown() {
+  chown -R $usr:$usr $home
+}
+
+_mkuser() {
+  getent passwd $usr &>/dev/null || {
+    echo -n "Creating $usr user... "
+    grep -E "^$usr:" /etc/group >/dev/null || groupadd $usr
+    useradd -m -d $home -g $usr -G audio -s /usr/bin/nologin $usr 2>/dev/null
+    echo "done"
+  }
 }
diff --git a/ocaml-alsa.patch b/ocaml-alsa.patch
new file mode 100644
index 000000000000..fb3b7574487b
--- /dev/null
+++ b/ocaml-alsa.patch
@@ -0,0 +1,11 @@
+--- a/ocaml-alsa-0.2.2/src/alsa_stubs.c 2015-07-29 23:28:18.000000000 +0200
++++ b/ocaml-alsa-0.2.2/src/alsa_stubs.c 2016-11-17 20:12:42.925962121 +0100
+@@ -228,7 +228,7 @@
+
+ static value create_hw_params()
+ {
+-  CAMLlocal1(ans);
++  value ans;
+   snd_pcm_hw_params_t *params;
+
+   check_for_err(snd_pcm_hw_params_malloc(&params));