[arch-commits] Commit in slmodem-utils/trunk (6 files)

[Sergej Pupykin]

    Date: Tuesday, June 4, 2013 @ 18:47:19
  Author: spupykin
Revision: 92400

upgpkg: slmodem-utils 2.9.11-19

upd

Added:
  slmodem-utils/trunk/slmodem.service
Modified:
  slmodem-utils/trunk/PKGBUILD
Deleted:
  slmodem-utils/trunk/slmodem-alsa.conf.d
  slmodem-utils/trunk/slmodem-alsa.rc.d
  slmodem-utils/trunk/slmodem.conf.d
  slmodem-utils/trunk/slmodem.rc.d

---------------------+
 PKGBUILD            |   25 +++++++------------------
 slmodem-alsa.conf.d |    4 ----
 slmodem-alsa.rc.d   |   39 ---------------------------------------
 slmodem.conf.d      |    4 ----
 slmodem.rc.d        |   42 ------------------------------------------
 slmodem.service     |    9 +++++++++
 6 files changed, 16 insertions(+), 107 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-04 16:39:33 UTC (rev 92399)
+++ PKGBUILD	2013-06-04 16:47:19 UTC (rev 92400)
@@ -5,23 +5,18 @@
 pkgname=slmodem-utils
 pkgver=2.9.11
 _date=20080126
-pkgrel=18
+pkgrel=19
 pkgdesc="Userspace tools for the Smartlink winmodems"
 arch=('i686')
 license=('custom')
 url="http://linmodems.technion.ac.il/packages/smartlink/"
 depends=('bash' 'alsa-lib')
 options=('!libtool')
-source=("http://linmodems.technion.ac.il/packages/smartlink/slmodem-${pkgver}-${_date}.tar.gz"
-        'slmodem.rc.d'
-        'slmodem-alsa.rc.d'
-        'slmodem.conf.d'
-        'slmodem-alsa.conf.d')
+#source=("http://linmodems.technion.ac.il/packages/smartlink/slmodem-${pkgver}-${_date}.tar.gz"
+source=("ftp://ftp.archlinux.org/other/community/slmodem/slmodem-${pkgver}-${_date}.tar.gz"
+        'slmodem.service')
 md5sums=('8670dd7e1e1a46296ac4c80f7ac0471d'
-         '838e1bde2a3e6fed35c075c25ee79da6'
-         '1494b0c87d9ccd3615a1708f24d78f8d'
-         '31f9d0eafe052a37e83c150146472956'
-         '03accf76458cbf8afde07e445e9b72d0')
+         '840fed2a25fe7e6c33fd74ed4a23b464')
 
 build() {
   cd "${srcdir}"/slmodem-$pkgver-${_date}
@@ -41,14 +36,8 @@
 
 package() {
   cd "${srcdir}"/slmodem-$pkgver-${_date}
-
-  #Install driver loader
-  install -D -m755 modem/slmodemd "${pkgdir}"/usr/sbin/slmodemd
-  # Install daemon files
-  install -D -m755 "${srcdir}"/slmodem.rc.d "${pkgdir}"/etc/rc.d/slmodem
-  install -D -m755 "${srcdir}"/slmodem-alsa.rc.d "${pkgdir}"/etc/rc.d/slmodem-alsa
-  install -D -m644 "${srcdir}"/slmodem.conf.d "${pkgdir}"/etc/conf.d/slmodem
-  install -D -m644 "${srcdir}"/slmodem-alsa.conf.d "${pkgdir}"/etc/conf.d/slmodem-alsa
+  install -D -m755 modem/slmodemd "${pkgdir}"/usr/bin/slmodemd
+  install -D -m644 "${srcdir}"/slmodem.service "${pkgdir}"/usr/lib/systemd/system/slmodem.service
   # adding udev symlink for /dev/modem
   install -d "${pkgdir}"/etc/udev/rules.d
   echo 'ACTION=="add", DRIVERS=="slamr", RUN+="/lib/udev/load-modules.sh ppp-generic"' > "${pkgdir}"/etc/udev/rules.d/slmodem.rules

Deleted: slmodem-alsa.conf.d
===================================================================
--- slmodem-alsa.conf.d	2013-06-04 16:39:33 UTC (rev 92399)
+++ slmodem-alsa.conf.d	2013-06-04 16:47:19 UTC (rev 92400)
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to slmodemd
-#
-SLMODEM_ARGS="--country=USA --alsa"
\ No newline at end of file

Deleted: slmodem-alsa.rc.d
===================================================================
--- slmodem-alsa.rc.d	2013-06-04 16:39:33 UTC (rev 92399)
+++ slmodem-alsa.rc.d	2013-06-04 16:47:19 UTC (rev 92400)
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-SLMODEM_ARGS=
-[ -f /etc/conf.d/slmodem-alsa ] && . /etc/conf.d/slmodem-alsa
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-    start)
-    stat_busy "Starting SL-Modem Drivers" 
-    slmodemd ${SLMODEM_ARGS} > /dev/null 2>&1 &
-   if [ $? -gt 0 ]; then 
- stat_fail
-    else 
- add_daemon slmodem
- stat_done
-    fi  
-    ;;
-    stop)
-    stat_busy "Stopping SL-Modem Drivers"
-    killall -9 slmodemd
-    if [ $? -gt 0 ]; then
- stat_fail
-    else
- rm_daemon slmodem
- stat_done
-    fi
-    ;;
-    restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-    *)
-    echo "Usage $0 {start|stop|restart}"
-    ;;
-esac

Deleted: slmodem.conf.d
===================================================================
--- slmodem.conf.d	2013-06-04 16:39:33 UTC (rev 92399)
+++ slmodem.conf.d	2013-06-04 16:47:19 UTC (rev 92400)
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to slmodemd
-#
-SLMODEM_ARGS="--country=USA /dev/slamr0"
\ No newline at end of file

Deleted: slmodem.rc.d
===================================================================
--- slmodem.rc.d	2013-06-04 16:39:33 UTC (rev 92399)
+++ slmodem.rc.d	2013-06-04 16:47:19 UTC (rev 92400)
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-SLMODEM_ARGS=
-[ -f /etc/conf.d/slmodem ] && . /etc/conf.d/slmodem
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting SL-Modem Drivers" 
-    if ! [ -e /dev/slamr0 ]; then
-      mknod /dev/slamr0 c 242 0
-    fi
-    slmodemd ${SLMODEM_ARGS} > /dev/null 2>&1 &
-    if [ $? -gt 0 ]; then 
-      stat_fail
-    else 
-      add_daemon slmodem
-      stat_done
-    fi  
-    ;;
-  stop)
-    stat_busy "Stopping SL-Modem Drivers"
-    killall -9 slmodemd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon slmodem
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "Usage $0 {start|stop|restart}"
-    ;;
-esac

Added: slmodem.service
===================================================================
--- slmodem.service	                        (rev 0)
+++ slmodem.service	2013-06-04 16:47:19 UTC (rev 92400)
@@ -0,0 +1,9 @@
+[Unit]
+Description=SLModem daemon
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/slmodemd --country=USA --alsa
+
+[Install]
+WantedBy=multi-user.target