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

[Sergej Pupykin]

    Date: Monday, May 13, 2013 @ 16:34:24
  Author: spupykin
Revision: 90706

upgpkg: pptpd 1.3.4-12

upd

Modified:
  pptpd/trunk/PKGBUILD
Deleted:
  pptpd/trunk/pptpd

----------+
 PKGBUILD |    6 ++----
 pptpd    |   35 -----------------------------------
 2 files changed, 2 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-13 14:34:19 UTC (rev 90705)
+++ PKGBUILD	2013-05-13 14:34:24 UTC (rev 90706)
@@ -3,7 +3,7 @@
 
 pkgname=pptpd
 pkgver=1.3.4
-pkgrel=11
+pkgrel=12
 pkgdesc="Poptop server"
 arch=(i686 x86_64)
 url="http://poptop.sourceforge.net/"
@@ -11,11 +11,9 @@
 depends=(ppp glibc)
 backup=(etc/pptpd.conf)
 source=(http://downloads.sourceforge.net/sourceforge/poptop/pptpd-$pkgver.tar.gz
-	pptpd
 	pptpd.service
 	unrecognized-opt.patch)
 md5sums=('b38df9c431041922c997c1148bedf591'
-         'e09f81beb5d59a0fdfba94e3a60d992b'
          '144c17c7d5c1b95cfb3450eb73aa2e50'
          'cfa02c86d0413eb94fac15599986f54c')
 
@@ -26,6 +24,7 @@
 
   cd $srcdir/$pkgname-$pkgver
   patch -p1 <$srcdir/unrecognized-opt.patch
+  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADER|g' configure.in
   autoreconf -i
   ./configure --prefix=/usr --libdir=/usr/lib --exec-prefix=/usr --mandir=/usr/share/man
   sed -i "s|#define VERSION.*|#define VERSION \"${_pppver}\"|" plugins/patchlevel.h
@@ -39,7 +38,6 @@
   make DESTDIR=$pkgdir install
   mkdir -p $pkgdir/etc/
   echo -e "# Read man pptpd.conf, see samples in /usr/share/doc/pptpd\n# and write your pptpd configuration here" >$pkgdir/etc/pptpd.conf
-  install -Dm0755 ../pptpd $pkgdir/etc/rc.d/pptpd
   install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
   mkdir -p $pkgdir/usr/share/doc/pptpd
   cp -a samples $pkgdir/usr/share/doc/pptpd/

Deleted: pptpd
===================================================================
--- pptpd	2013-05-13 14:34:19 UTC (rev 90705)
+++ pptpd	2013-05-13 14:34:24 UTC (rev 90706)
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting PPTP Daemon"
-    pptpd -c /etc/pptpd.conf -p /var/run/pptpd.pid
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon pptpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping PPTP Daemon"
-    kill `cat /var/run/pptpd.pid`
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon pptpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac