[arch-commits] Commit in stunnel/trunk (PKGBUILD)

[Balló György]

    Date: Friday, January 10, 2014 @ 22:24:58
  Author: bgyorgy
Revision: 103726

upgpkg: stunnel 4.56-4

Rename stunnel.cnf to avoid confusion (FS#37390), minor cleanup

Modified:
  stunnel/trunk/PKGBUILD

----------+
 PKGBUILD |   13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-10 14:07:03 UTC (rev 103725)
+++ PKGBUILD	2014-01-10 21:24:58 UTC (rev 103726)
@@ -6,7 +6,7 @@
 
 pkgname=stunnel
 pkgver=4.56
-pkgrel=3
+pkgrel=4
 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL"
 arch=('i686' 'x86_64')
 url="http://www.stunnel.org"
@@ -42,17 +42,10 @@
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 
-  for i in ca.pl importCA.sh; do
-    install -Dm755 "tools/$i" "$pkgdir/usr/share/stunnel/$i"
-  done
-
-  install -Dm644 tools/stunnel.cnf "$pkgdir/etc/stunnel/stunnel.cnf"
+  install -Dm644 tools/stunnel.cnf "$pkgdir/etc/stunnel/stunnel-openssl.cnf-sample"
+  install -Dm644 tools/stunnel.service "$pkgdir/usr/lib/systemd/system/stunnel.service"
   install -Dm644 "$srcdir/stunnel.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/stunnel.conf"
 
-  # move systemd service into place
-  install -dm755 "$pkgdir/usr/lib/systemd/system"
-  mv "tools/stunnel.service" "$pkgdir/usr/lib/systemd/system/"
-
   sed -e "s:/usr/var/lib/stunnel/:/var/run/stunnel:g" \
       -e "s:/usr/etc/stunnel/:/etc/stunnel/:g" \
       -e "s:no\(body\|group\):stunnel:g" \