[arch-commits] Commit in dante/trunk (PKGBUILD sockd.service sockd.tmpfiles.d)

[Sergej Pupykin]

    Date: Monday, March 24, 2014 @ 08:54:51
  Author: spupykin
Revision: 108158

upgpkg: dante 1.4.0-2

upd

Added:
  dante/trunk/sockd.tmpfiles.d
Modified:
  dante/trunk/PKGBUILD
  dante/trunk/sockd.service

------------------+
 PKGBUILD         |   10 ++++++----
 sockd.service    |    4 ++--
 sockd.tmpfiles.d |    1 +
 3 files changed, 9 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-24 07:46:34 UTC (rev 108157)
+++ PKGBUILD	2014-03-24 07:54:51 UTC (rev 108158)
@@ -4,7 +4,7 @@
 
 pkgname=dante
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="SOCKS v4 and v5 compatible proxy server and client"
 url="http://www.inet.no/dante"
 arch=(i686 x86_64)
@@ -13,9 +13,11 @@
 backup=('etc/socks.conf'
 	'etc/sockd.conf')
 source=(ftp://ftp.inet.no/pub/socks/${pkgname}-${pkgver}.tar.gz
+	sockd.tmpfiles.d
 	sockd.service)
 md5sums=('c117a3ce25afb936f13b76f1d2524879'
-         '9bb18a0165764092bd01da0ff6303fbf')
+         '8588bb1cf6e9cde0f542a96edc0a0f17'
+         '1cdfc0c1cd932cfe0fe3c0319e2be3f0')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -28,9 +30,9 @@
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
-  mkdir -p ${pkgdir}/etc/conf.d
+  install -dm0755 ${pkgdir}/etc
   cp example/{socks,sockd}.conf ${pkgdir}/etc
   install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  echo 'SOCKD_OPTS="-D"' >${pkgdir}/etc/conf.d/sockd.conf
   install -Dm0644 $srcdir/sockd.service $pkgdir/usr/lib/systemd/system/sockd.service
+  install -Dm0644 $srcdir/sockd.tmpfiles.d $pkgdir/usr/lib/tmpfiles.d/sockd.conf
 }

Modified: sockd.service
===================================================================
--- sockd.service	2014-03-24 07:46:34 UTC (rev 108157)
+++ sockd.service	2014-03-24 07:54:51 UTC (rev 108158)
@@ -5,8 +5,8 @@
 [Service]
 Type=forking
 EnvironmentFile=/etc/conf.d/sockd.conf
-PIDFile=/run/sockd.pid
-ExecStart=/usr/bin/sockd $SOCKD_OPTS
+PIDFile=/run/dante/sockd.pid
+ExecStart=/usr/bin/sockd -D -p/run/dante/sockd.pid
 
 [Install]
 WantedBy=multi-user.target

Added: sockd.tmpfiles.d
===================================================================
--- sockd.tmpfiles.d	                        (rev 0)
+++ sockd.tmpfiles.d	2014-03-24 07:54:51 UTC (rev 108158)
@@ -0,0 +1 @@
+d /run/dante 0755 root root -