[arch-commits] Commit in dante/trunk (PKGBUILD sockd.rc)

Sergej Pupykin spupykin at nymeria.archlinux.org
Mon May 13 10:18:30 EDT 2013


    Date: Monday, May 13, 2013 @ 16:18:30
  Author: spupykin
Revision: 90648

upgpkg: dante 1.3.2-4

upd

Modified:
  dante/trunk/PKGBUILD
Deleted:
  dante/trunk/sockd.rc

----------+
 PKGBUILD |    8 -------
 sockd.rc |   68 -------------------------------------------------------------
 2 files changed, 1 insertion(+), 75 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-13 14:18:25 UTC (rev 90647)
+++ PKGBUILD	2013-05-13 14:18:30 UTC (rev 90648)
@@ -4,7 +4,7 @@
 
 pkgname=dante
 pkgver=1.3.2
-pkgrel=3
+pkgrel=4
 pkgdesc="SOCKS v4 and v5 compatible proxy server and client"
 url="http://www.inet.no/dante"
 arch=(i686 x86_64)
@@ -14,10 +14,8 @@
 	'etc/sockd.conf')
 options=('!libtool')
 source=(ftp://ftp.inet.no/pub/socks/${pkgname}-${pkgver}.tar.gz
-	sockd.rc
 	sockd.service)
 md5sums=('250c6456cd3fefa17f07fa80c9ccf6bd'
-         '5110dfd78a2b38fff27a886ee88b58a6'
          'ceb86b5bd97f7e3ceff28c6e6172a25b')
 
 build() {
@@ -30,13 +28,9 @@
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
-  # Config files
   mkdir -p ${pkgdir}/etc/conf.d
   cp example/{socks,sockd}.conf ${pkgdir}/etc
-  # License
   install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  # rc-script
-  install -D -m755 ${srcdir}/sockd.rc ${pkgdir}/etc/rc.d/sockd
   echo 'SOCKD_OPTS="-D"' >${pkgdir}/etc/conf.d/sockd.conf
   install -Dm0644 $srcdir/sockd.service $pkgdir/usr/lib/systemd/system/sockd.service
 }

Deleted: sockd.rc
===================================================================
--- sockd.rc	2013-05-13 14:18:25 UTC (rev 90647)
+++ sockd.rc	2013-05-13 14:18:30 UTC (rev 90648)
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-daemon_name=sockd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/sockd.conf
-
-get_pid() {
-	cat /var/run/sockd.pid 2>/dev/null
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
-      # RUN
-      $daemon_name $SOCKD_OPTS 1>/dev/null 2>/dev/null
-      #
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > /var/run/$daemon_name.pid
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/$daemon_name.pid &> /dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0



More information about the arch-commits mailing list