Merge branch 'master' of ssh://projects.parabola.nu/~git/abslibre

27 files changed, 98 insertions, 184 deletions

diff --git a/.gitignore b/.gitignore
index 9700ac529..63bbf834f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,14 +7,15 @@ src-libre/
 pkg-libre/
 grsecurity*.patch*
 tcp_stealth*.diff*
-*.oxt
+*.bdf*
 *.deb
 *.log
+*.orig
+*.oxt
 *.tar*
 *.tgz
-*.zip
 *.xpi
 *.xz
-*.orig
+*.zip
 *.7z
 .*
diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD
index 2730e7cf9..ca5650c6a 100644
--- a/libre/blender/PKGBUILD
+++ b/libre/blender/PKGBUILD
@@ -29,7 +29,7 @@ _pkgver=2.72b
 _depver=${_pkgver%[a-z]}
 [[ $_git == no  ]] && pkgver=$_pkgver
 [[ $_git == yes ]] && pkgver=$_pkgver.git1.$_gitcommit
-pkgrel=1.parabola1
+pkgrel=1.parabola2
 epoch=15
 _jpgver=1.5
 _llvmver=3.5
diff --git a/libre/dpkg/PKGBUILD b/libre/dpkg/PKGBUILD
index 99681df3e..318ef9643 100644
--- a/libre/dpkg/PKGBUILD
+++ b/libre/dpkg/PKGBUILD
@@ -98,7 +98,7 @@ _debhelper_install() {
 
 prepare() {
 	cd "${srcdir}/${pkgbase}-${pkgver}"
-	# {Arch Linux,Parabola}'s gzip doesn't support --rsyncable
+	# {Arch,Parabola}'s gzip doesn't support --rsyncable
 	patch -Np1 -i "${srcdir}/dpkg-gzip-rsyncable.patch"
 }
 
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index 0038abd3e..b101effbb 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=filesystem
 pkgver=2014.10
-pkgrel=3.parabola1
+pkgrel=3.parabola2
 pkgdesc='Base filesystem (Parabola rebranded)'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -32,7 +32,7 @@ md5sums=('d46cb1adf8175888cc827a3dad8857d2'
          'a998d1e6c7cc5791a7f4a2b49b2d10ce'
          '1ec1b16e2a71fad63ab8f147069a5d97'
          '693c97f2c9a519bb97a17008e92c2b74'
-         'f0a5071f50d8864d2810c44e23eb00cc'
+         '49639d107b75fe4e668ae27749da32ab'
          '7bc65f234dfb6abf24e7c3b03e86f4ff'
          'd41d8cd98f00b204e9800998ecf8427e'
          '83e0de34441a56684db8f813099d62f8'
diff --git a/libre/filesystem/crypttab b/libre/filesystem/crypttab
index 087d09eee..247bec61c 100644
--- a/libre/filesystem/crypttab
+++ b/libre/filesystem/crypttab
@@ -3,7 +3,7 @@
 # Each mapped device will be created in /dev/mapper, so your /etc/fstab
 # should use the /dev/mapper/<name> paths for encrypted devices.
 #
-# The Arch specific syntax has been deprecated, see crypttab(5) for the
+# The Parabola specific syntax has been deprecated, see crypttab(5) for the
 # new supported syntax.
 #
 # NOTE: Do not list your root (/) partition here, it must be set up
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index d67df30a8..fbc375f75 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -68,7 +68,7 @@ md5sums=('SKIP'
          'SKIP'
          '728b7439ac733a7c0d56049adec364c7'
          'SKIP'
-         '945527e0de8d384166a4cf23439ae9ee'
+         '43ca769bfbab419d44158656cf63f501'
          'e506ae4a9f9f7d1b765febfa84e10d48'
          'be55eabc102f2c60b38ed35c203686d6'
          '8d1dd54ae4a1b550c097e056892ce953'
diff --git a/libre/grub/grub-10_linux-detect-parabola-initramfs.patch b/libre/grub/grub-10_linux-detect-parabola-initramfs.patch
index 18d9d520c..18a0a1c16 100644
--- a/libre/grub/grub-10_linux-detect-parabola-initramfs.patch
+++ b/libre/grub/grub-10_linux-detect-parabola-initramfs.patch
@@ -1,7 +1,7 @@
 From b470ffd22e43acc7c11231180187a720efd88de1 Mon Sep 17 00:00:00 2001
 From: Keshav Amburay <the.ridikulus.rat@gmail.com>
 Date: Sat, 5 Apr 2014 20:40:51 -0400
-Subject: [PATCH] 10_linux: Detect Arch Linux main and fallback initramfs
+Subject: [PATCH] 10_linux: Detect main and fallback initramfs
  images
 
 ---
diff --git a/libre/texlive-bin/PKGBUILD b/libre/texlive-bin/PKGBUILD
index 1f8a69cc7..c7df0afa5 100644
--- a/libre/texlive-bin/PKGBUILD
+++ b/libre/texlive-bin/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=texlive-bin
 pkgver=2014.34260
-pkgrel=2.parabola1
+pkgrel=2.parabola2
 pkgdesc="TeX Live binaries, without biber binaries (Parabola rebranded)"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/texlive-bin/texmf.cnf b/libre/texlive-bin/texmf.cnf
index 76975ee5c..4d9183e40 100644
--- a/libre/texlive-bin/texmf.cnf
+++ b/libre/texlive-bin/texmf.cnf
@@ -1,4 +1,4 @@
-% texmf.cnf for TeXLive/Arch Linux -- runtime path configuration file for kpathsea.
+% texmf.cnf for TeXLive -- runtime path configuration file for kpathsea.
 % Public domain.
 % 
 % If you modify this original file, YOUR CHANGES WILL BE LOST when it is
diff --git a/pcr/emacs-jabber/PKGBUILD b/pcr/emacs-jabber/PKGBUILD
index 522cb7cc5..fcfc16384 100644
--- a/pcr/emacs-jabber/PKGBUILD
+++ b/pcr/emacs-jabber/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=emacs-jabber
 pkgver=0.8.92
-pkgrel=1
+pkgrel=2
 pkgdesc="Jabber.el: a minimal jabber client for emacs"
 url=http://emacs-jabber.sourceforge.net
 arch=('any')
diff --git a/pcr/emacs-jabber/jabber.el.install b/pcr/emacs-jabber/jabber.el.install
index 556888995..cee8a6b63 100644
--- a/pcr/emacs-jabber/jabber.el.install
+++ b/pcr/emacs-jabber/jabber.el.install
@@ -3,11 +3,11 @@ filelist=(jabber.info.gz)
 pkgname=emacs-jabber
 
 pre_upgrade() {
-  /usr/sbin/gconfpkg --uninstall $pkgname
+  /usr/bin/gconfpkg --uninstall $pkgname
 }
 
 post_install() {
-  /usr/sbin/gconfpkg --install $pkgname
+  /usr/bin/gconfpkg --install $pkgname
   for file in ${filelist[@]}; do
     install-info $infodir/$file $infodir/dir 2> /dev/null
   done
@@ -20,7 +20,7 @@ post_upgrade() {
 }
 
 pre_remove() {
-  /usr/sbin/gconfpkg --uninstall $pkgname
+  /usr/bin/gconfpkg --uninstall $pkgname
   for file in ${filelist[@]}; do
     install-info --delete $infodir/$file $infodir/dir 2> /dev/null
   done
diff --git a/pcr/gcc-gcj/PKGBUILD b/pcr/gcc-gcj/PKGBUILD
index aed422a43..cefb1ccc1 100644
--- a/pcr/gcc-gcj/PKGBUILD
+++ b/pcr/gcc-gcj/PKGBUILD
@@ -28,10 +28,10 @@ build() {
   # Do not run fixincludes
   sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
   
-  # Arch Linux installs x86_64 libraries /lib
+  # Installs x86_64 libraries /lib
   [[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
   
-  # Arch uses python version 3 as default python 
+  # Uses python version 3 as default python
   sed -i '1s+python+python2+' libjava/contrib/aot-compile.in
 
   echo ${pkgver} > gcc/BASE-VER
diff --git a/pcr/haveged/PKGBUILD b/pcr/haveged/PKGBUILD
index 257e1f39f..cddf37363 100644
--- a/pcr/haveged/PKGBUILD
+++ b/pcr/haveged/PKGBUILD
@@ -2,20 +2,20 @@
 # Contributor (Arch): pootzko <pootzko at gmail dot com>
 
 pkgname=haveged
-pkgver=1.1
+pkgver=1.9.1
 pkgrel=1
 pkgdesc="A simple entropy daemon."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.issihosts.com/haveged"
 license="GPL"
 source=(${url}/${pkgname}-${pkgver}.tar.gz
-        haveged)
-md5sums=('f7752f0355a0e89d8f196658db5f6884'
-         '264b725be5271288b40f363d7cfc6b68')
+        haveged.service)
+md5sums=('015ff58cd10607db0e0de60aeca2f5f8'
+         'ff884d546792ec37625a3c20864dba16')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sbindir=/usr/bin
   make
 }
 
@@ -24,5 +24,5 @@ package() {
   make DESTDIR=${pkgdir} install
   rm -rf ${pkgdir}/etc/init.d
   cd ${srcdir}
-  install -D -m755 haveged ${pkgdir}/etc/rc.d/haveged
+  install -vDm755 haveged.service ${pkgdir}/usr/lib/systemd/system/haveged.service
 }
diff --git a/pcr/haveged/haveged b/pcr/haveged/haveged
deleted file mode 100644
index c0e13b40d..000000000
--- a/pcr/haveged/haveged
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-##
-# chkconfig: 2345 75 25
-# description: havege entropy daemon
-#
-# source function library
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-RETVAL=0
-prog="haveged"
-
-case "$1" in
-start)
-  stat_busy $"Starting $prog"
-  /usr/sbin/$prog -w 1024 -v 1
-  if [ $? -gt 0 ]; then
-    stat_fail
-  else
-    add_daemon $prog
-    stat_done
-  fi
-  ;;
-
-stop)
-  stat_busy $"Stopping $prog"
-  kill `cat /var/run/$prog.pid`
-  if [ $? -gt 0 ]; then
-    stat_fail
-  else
-    rm_daemon $prog
-    stat_done
-    rm -f /var/lock/$prog
-  fi
-  ;;
-  
-restart)
-  $0 stop
-  $0 start
-  ;;
-
-*)
-  echo "usage: $prog [start|stop|restart]"
-esac
diff --git a/pcr/haveged/haveged.service b/pcr/haveged/haveged.service
new file mode 100644
index 000000000..82871f9dd
--- /dev/null
+++ b/pcr/haveged/haveged.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=A simple entropy daemon
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/haveged -w 1024 -v 1
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/hwd/PKGBUILD b/pcr/hwd/PKGBUILD
index 0470efa41..bffd46937 100644
--- a/pcr/hwd/PKGBUILD
+++ b/pcr/hwd/PKGBUILD
@@ -4,8 +4,8 @@
 
 pkgname=hwd
 pkgver=5.5.2
-pkgrel=2
-pkgdesc="Hardware detect and xorg.conf generator for Arch Linux"
+pkgrel=3
+pkgdesc="Hardware detect and xorg.conf generator"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://user-contributions.org/projects/hwd/hwd.html"
 license=('GPL')
diff --git a/pcr/snort/PKGBUILD b/pcr/snort/PKGBUILD
index e5a2107b6..f3ad01df5 100644
--- a/pcr/snort/PKGBUILD
+++ b/pcr/snort/PKGBUILD
@@ -7,8 +7,8 @@
 # Maintainer  (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>
 
 pkgname=snort
-pkgver=2.9.6.1
-pkgrel=2
+pkgver=2.9.7.0
+pkgrel=1
 pkgdesc='A lightweight network intrusion detection system.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.snort.org'
@@ -23,6 +23,9 @@ install='snort.install'
 source=("http://www.snort.org/dl/snort-current/${pkgname}-${pkgver}.tar.gz"
 	"http://rules.emergingthreats.net/open/${pkgname}-2.9.0/emerging.rules.tar.gz"
 	'snort.service')
+md5sums=('c2a45bc56441ee9456478f219dd8d1e2'
+         '6cca6bfa6448fee136749a887043dc03'
+         '43ed16fd3906854528a62a58f88f7227')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/pcr/snort/snort.install b/pcr/snort/snort.install
index 673f22c6c..4320c2fae 100644
--- a/pcr/snort/snort.install
+++ b/pcr/snort/snort.install
@@ -1,6 +1,6 @@
 post_install() {
-  getent group snort >/dev/null || usr/sbin/groupadd -g 29 snort
-  getent passwd snort >/dev/null || usr/sbin/useradd -c 'Snort user' -u 29 -g snort -d /var/log/snort -s /bin/false snort
+  getent group snort >/dev/null || usr/bin/groupadd -g 29 snort
+  getent passwd snort >/dev/null || usr/bin/useradd -c 'Snort user' -u 29 -g snort -d /var/log/snort -s /bin/false snort
   usr/bin/passwd -l snort &>/dev/null
 
   [ -f var/log/snort/alert ] || : >var/log/snort/alert
@@ -19,8 +19,8 @@ post_upgrade() {
 }
 
 pre_remove() {
-  usr/sbin/userdel snort &>/dev/null
-  usr/sbin/groupdel snort &>/dev/null
+  usr/bin/userdel snort &>/dev/null
+  usr/bin/groupdel snort &>/dev/null
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/pcr/snort/snort.service b/pcr/snort/snort.service
index d3d0da01f..4d02428f8 100644
--- a/pcr/snort/snort.service
+++ b/pcr/snort/snort.service
@@ -3,7 +3,7 @@ Description=Snort IDS system listening on '%I'
 
 [Service]
 Type=simple
-ExecStartPre=/usr/sbin/ip link set up dev %I
+ExecStartPre=/usr/bin/ip link set up dev %I
 ExecStart=/usr/bin/snort -A fast -b -p -u snort -g snort -c /etc/snort/snort.conf -i %I
 
 [Install]
diff --git a/pcr/yate/PKGBUILD b/pcr/yate/PKGBUILD
index bb84d1a67..e25c7401b 100644
--- a/pcr/yate/PKGBUILD
+++ b/pcr/yate/PKGBUILD
@@ -1,37 +1,36 @@
-    # Maintainer (Arch): said
-    # Contributor (Arch): Yejun Yang <yejunx AT gmail DOT com>
-    # Contributor (Arch): Biru Ionut <ionut@archlinux.ro>
-    pkgname=yate
-    pkgver=4.2.0
-    pkgrel=1
-    pkgdesc="next-generation telephony engine"
-    arch=('i686' 'x86_64')
-    url="http://yate.null.ro"
-    license=('GPL')
-    depends=('speex' 'gsm' 'postgresql-libs' 'libmysqlclient' \
-             'alsa-lib' 'qt')
-    makedepends=('pkgconfig')
-    source=(http://yate.null.ro/tarballs/yate4/${pkgname}-${pkgver}-2.tar.gz yate.init)
-    options=(!makeflags)
-    
-    md5sums=('e6fd37f26ff5c50aa3fa16f6b2803d68'
-	     'c0d344607046c47c1d75ac23d323817a')
+# Maintainer (Arch): said
+# Contributor (Arch): Yejun Yang <yejunx AT gmail DOT com>
+# Contributor (Arch): Biru Ionut <ionut@archlinux.ro>
 
-         
-    build() {
-      cd $srcdir/${pkgname}
-      export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
-      ./configure --prefix=/usr \
-                  --sysconfdir=/etc \
-                  --with-libpq \
-                  --with-mysql \
-                  --without-openh323   
-      make    
-    }
-    
-    package(){
-      cd $srcdir/${pkgname}
-      make DESTDIR=$pkgdir install
-      install -D -m755 $srcdir/yate.init $pkgdir/etc/rc.d/yate
-    }
-    
\ No newline at end of file
+pkgname=yate
+pkgver=5.4.0.1
+pkgrel=1
+pkgdesc="next-generation telephony engine"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://yate.null.ro"
+license=('GPL')
+depends=('speex' 'gsm' 'postgresql-libs' 'libmariadbclient' \
+         'alsa-lib' 'qt4')
+makedepends=('pkgconfig')
+source=(http://$pkgname.null.ro/tarballs/${pkgname}${pkgver%%.*}/$pkgname-${pkgver%.*}-${pkgver##*.}.tar.gz $pkgname.service)
+options=(!makeflags)
+
+md5sums=('427fd2ffde51116271534f398bf913e8'
+         '2fbcac43ec3bef1e386fcd456d1ee6f9')
+
+build() {
+  cd $srcdir/${pkgname}
+  export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
+  ./configure --prefix=/usr \
+              --sysconfdir=/etc \
+              --with-libpq \
+              --with-mysql \
+              --without-openh323
+  make
+}
+
+package(){
+  cd $srcdir/${pkgname}
+  make DESTDIR=$pkgdir install
+  install -vDm 755 $srcdir/yate.service $pkgdir/usr/lib/systemd/system/yate.service
+}
diff --git a/pcr/yate/yate.init b/pcr/yate/yate.init
deleted file mode 100644
index 762fff8c7..000000000
--- a/pcr/yate/yate.init
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-OPTS="-rs -vvv -l /var/log/yate"
-
-# Source function library.
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-RETVAL=0
-
-# See how we were called.
-case "$1" in
-    start)
-	stat_busy "Starting YATE"
-        unset DISPLAY
-
-	yate -d -p /var/run/yate.pid $OPTS
-        RETVAL=$?
-	if [ $RETVAL -gt 0 ]; then
-	    stat_fail
-	else
-	    add_daemon yate
-	    touch /var/lock/yate
-	    stat_done
-	fi
-	;;
-    stop)
-	stat_busy "Stopping YATE"
-	[ -f /var/run/yate.pid ] && kill $(cat /var/run/yate.pid) > /dev/null 2>&1
-	RETVAL=$?
-	if [ $RETVAL -gt 0 ]; then
-	    stat_fail
-	else
-	    rm -f /var/run/yate.pid
-	    rm -f /var/lock/yate
-	    rm_daemon yate
-	    stat_done
-	fi
-	;;
-    status)
-        [ -f /var/run/yate.pid ]  && echo -e "Yate is running" || echo -e "Yate is not running"
-        ;;
-    restart)
-	$0 stop
-	sleep 1
-	$1 start
-	;;
-    condrestart)
-	if [ -f /var/lock/yate ]; then
-	    $0 stop
-	    $0 start
-	fi
-	;;
-    reload)
-  	pkill yate -HUP
-	RETVAL=$?
-        ;;
-    *)
-	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
-	;;
-esac
-exit $RETVAL
diff --git a/pcr/yate/yate.service b/pcr/yate/yate.service
new file mode 100644
index 000000000..de2fb14a4
--- /dev/null
+++ b/pcr/yate/yate.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Next-generation telephony engine
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/yate -d -p /run/yate.pid -rs -vvv -l /var/log/yate
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/torque/PKGBUILD b/~coadde/torque/PKGBUILD
index 2d35202e0..c482c515c 100644
--- a/pcr/torque/PKGBUILD
+++ b/~coadde/torque/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=torque
 pkgver=4.2.2
 _pkgver=1065
-pkgrel=2
+pkgrel=3
 pkgdesc='An open source resource manager providing control over batch jobs and distributed compute nodes.'
 url=http://www.adaptivecomputing.com/products/open-source/$pkgname/
 arch=(
@@ -28,12 +28,10 @@ source=(
   $pkgname-$pkgver.tar.gz::http://www.adaptivecomputing.com/index.php?wpfb_dl=$_pkgver
   $pkgname-{node,scheduler,server}.service
 )
-sha512sums=(
-  d53af8dc05e2d1ffa699da2a79e2c82247a882d868784c38d685fc77c3bb8a334e036e835bac2988d39675c5df7a04c2b567b826df4bf6975b437a9955164ae2
-  532c007cf3fcf171d071b67438fca430cdda4ec19d5e6c51ff5388b73610817825dd4cc86866c3d8a9411b6fdee6f76c64cd764dbd2277c1e7ca48e843ff9221
-  290620b00b2bd636b47c3c60158a4e6cff06e9a764ac7fc7d4996f9be1aace58ee248a075b4c3cf84951af9013a655b29ea6adec789fe6e170df62b07b05cc85
-  2977fbd4d7b7241a2aadef4bc5575483a882a62dd65b74cfb26958530ce99030ee0c3e6c8a093d1e2ccc2bfe4ebed4f90bc7b52aaece7fd43ea2f9af08781fed
-)
+sha512sums=('9ad0bbe4afdec57a261d079ee236e9f52cd50345a91264888100a2d7bc2ee3026c05195715bf33e2eef8d7e2bf86342638d65ae814a27ca3401a19ae051c2c4d'
+            'aa25cc61eb09aad7e6b43f9ac6b955095846e1db84501a2a1dfabdb44c59335f68be6c4916f934cbf6b6b56f6a42aafd80dfe9660c6e8e956af9b5e0fe5eb255'
+            'c6c4be41fa4a66da0a64a28d373bae3b8821d7f1b64001464e62e2827c0a0655689e9d93801d3082752733d21dee3aae87544fb4816cb98e9848ef2c3a3388f0'
+            '566a782ea0327cbf946a698434e0fb1650aacf73a26c30a3789848162f574cc353c18d61ddc4b04e97690cfbc777b655efa1dc66d16390f608f27c1e6b823acb')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/pcr/torque/torque-node.service b/~coadde/torque/torque-node.service
index 67edef4f5..f8fcb46a2 100644
--- a/pcr/torque/torque-node.service
+++ b/~coadde/torque/torque-node.service
@@ -6,7 +6,7 @@ After=basic.target network.target
 [Service]
 Type=forking
 PIDFile=/var/spool/torque/mom_priv/mom.lock
-ExecStart=/usr/sbin/pbs_mom
+ExecStart=/usr/bin/pbs_mom
 
 [Install]
 WantedBy=multi-user.target
diff --git a/pcr/torque/torque-scheduler.service b/~coadde/torque/torque-scheduler.service
index 97ec6a093..fa417cdf3 100644
--- a/pcr/torque/torque-scheduler.service
+++ b/~coadde/torque/torque-scheduler.service
@@ -6,7 +6,7 @@ After=torque-server.service
 [Service]
 Type=forking
 PIDFile=/var/spool/torque/sched_priv/sched.lock
-ExecStart=/usr/sbin/pbs_sched
+ExecStart=/usr/bin/pbs_sched
 
 [Install]
 WantedBy=multi-user.target
diff --git a/pcr/torque/torque-server.service b/~coadde/torque/torque-server.service
index 80fcb1860..a491bbff7 100644
--- a/pcr/torque/torque-server.service
+++ b/~coadde/torque/torque-server.service
@@ -6,7 +6,7 @@ After=basic.target network.target
 [Service]
 Type=forking
 PIDFile=/var/spool/torque/server_priv/server.lock
-ExecStart=/usr/sbin/pbs_server
+ExecStart=/usr/bin/pbs_server
 
 [Install]
 WantedBy=multi-user.target
diff --git a/pcr/torque/torque.install b/~coadde/torque/torque.install
index 2e90bd1ba..2e90bd1ba 100644
--- a/pcr/torque/torque.install
+++ b/~coadde/torque/torque.install