[arch-commits] Commit in pptpd/repos (18 files)

Sergej Pupykin spupykin at nymeria.archlinux.org
Mon May 13 10:34:49 EDT 2013


    Date: Monday, May 13, 2013 @ 16:34:48
  Author: spupykin
Revision: 90707

archrelease: copy trunk to community-i686, community-x86_64

Added:
  pptpd/repos/community-i686/ChangeLog
    (from rev 90706, pptpd/trunk/ChangeLog)
  pptpd/repos/community-i686/PKGBUILD
    (from rev 90706, pptpd/trunk/PKGBUILD)
  pptpd/repos/community-i686/pptpd.service
    (from rev 90706, pptpd/trunk/pptpd.service)
  pptpd/repos/community-i686/unrecognized-opt.patch
    (from rev 90706, pptpd/trunk/unrecognized-opt.patch)
  pptpd/repos/community-x86_64/ChangeLog
    (from rev 90706, pptpd/trunk/ChangeLog)
  pptpd/repos/community-x86_64/PKGBUILD
    (from rev 90706, pptpd/trunk/PKGBUILD)
  pptpd/repos/community-x86_64/pptpd.service
    (from rev 90706, pptpd/trunk/pptpd.service)
  pptpd/repos/community-x86_64/unrecognized-opt.patch
    (from rev 90706, pptpd/trunk/unrecognized-opt.patch)
Deleted:
  pptpd/repos/community-i686/ChangeLog
  pptpd/repos/community-i686/PKGBUILD
  pptpd/repos/community-i686/pptpd
  pptpd/repos/community-i686/pptpd.service
  pptpd/repos/community-i686/unrecognized-opt.patch
  pptpd/repos/community-x86_64/ChangeLog
  pptpd/repos/community-x86_64/PKGBUILD
  pptpd/repos/community-x86_64/pptpd
  pptpd/repos/community-x86_64/pptpd.service
  pptpd/repos/community-x86_64/unrecognized-opt.patch

-----------------------------------------+
 /ChangeLog                              |    6 ++
 /PKGBUILD                               |   88 ++++++++++++++++++++++++++++++
 /pptpd.service                          |   20 ++++++
 /unrecognized-opt.patch                 |   26 ++++++++
 community-i686/ChangeLog                |    3 -
 community-i686/PKGBUILD                 |   46 ---------------
 community-i686/pptpd                    |   35 -----------
 community-i686/pptpd.service            |   10 ---
 community-i686/unrecognized-opt.patch   |   13 ----
 community-x86_64/ChangeLog              |    3 -
 community-x86_64/PKGBUILD               |   46 ---------------
 community-x86_64/pptpd                  |   35 -----------
 community-x86_64/pptpd.service          |   10 ---
 community-x86_64/unrecognized-opt.patch |   13 ----
 14 files changed, 140 insertions(+), 214 deletions(-)

Deleted: community-i686/ChangeLog
===================================================================
--- community-i686/ChangeLog	2013-05-13 14:34:24 UTC (rev 90706)
+++ community-i686/ChangeLog	2013-05-13 14:34:48 UTC (rev 90707)
@@ -1,3 +0,0 @@
-2007-06-29 tardo <tardo at nagi-fanboi.net>
-* Built for x86_64
-* Added autoreconf to help with proper installation of libs

Copied: pptpd/repos/community-i686/ChangeLog (from rev 90706, pptpd/trunk/ChangeLog)
===================================================================
--- community-i686/ChangeLog	                        (rev 0)
+++ community-i686/ChangeLog	2013-05-13 14:34:48 UTC (rev 90707)
@@ -0,0 +1,3 @@
+2007-06-29 tardo <tardo at nagi-fanboi.net>
+* Built for x86_64
+* Added autoreconf to help with proper installation of libs

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2013-05-13 14:34:24 UTC (rev 90706)
+++ community-i686/PKGBUILD	2013-05-13 14:34:48 UTC (rev 90707)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=pptpd
-pkgver=1.3.4
-pkgrel=11
-pkgdesc="Poptop server"
-arch=(i686 x86_64)
-url="http://poptop.sourceforge.net/"
-license=('GPL')
-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')
-
-build() {
-  local _pppver=`pacman -Q ppp`
-  _pppver=${_pppver%-*}
-  _pppver=${_pppver#ppp }
-
-  cd $srcdir/$pkgname-$pkgver
-  patch -p1 <$srcdir/unrecognized-opt.patch
-  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
-  make
-  sed -i 's|install -o root|install|g' plugins/Makefile
-  sed -i 's|?=|=|g' plugins/Makefile
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  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/
-}

Copied: pptpd/repos/community-i686/PKGBUILD (from rev 90706, pptpd/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2013-05-13 14:34:48 UTC (rev 90707)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=pptpd
+pkgver=1.3.4
+pkgrel=12
+pkgdesc="Poptop server"
+arch=(i686 x86_64)
+url="http://poptop.sourceforge.net/"
+license=('GPL')
+depends=(ppp glibc)
+backup=(etc/pptpd.conf)
+source=(http://downloads.sourceforge.net/sourceforge/poptop/pptpd-$pkgver.tar.gz
+	pptpd.service
+	unrecognized-opt.patch)
+md5sums=('b38df9c431041922c997c1148bedf591'
+         '144c17c7d5c1b95cfb3450eb73aa2e50'
+         'cfa02c86d0413eb94fac15599986f54c')
+
+build() {
+  local _pppver=`pacman -Q ppp`
+  _pppver=${_pppver%-*}
+  _pppver=${_pppver#ppp }
+
+  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
+  make
+  sed -i 's|install -o root|install|g' plugins/Makefile
+  sed -i 's|?=|=|g' plugins/Makefile
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  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 -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: community-i686/pptpd
===================================================================
--- community-i686/pptpd	2013-05-13 14:34:24 UTC (rev 90706)
+++ community-i686/pptpd	2013-05-13 14:34:48 UTC (rev 90707)
@@ -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

Deleted: community-i686/pptpd.service
===================================================================
--- community-i686/pptpd.service	2013-05-13 14:34:24 UTC (rev 90706)
+++ community-i686/pptpd.service	2013-05-13 14:34:48 UTC (rev 90707)
@@ -1,10 +0,0 @@
-[Unit]
-Description=PPTP Server
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/pptpd -c /etc/pptpd.conf -p /var/run/pptpd.pid -f
-StandardOutput=null
-
-[Install]
-WantedBy=multi-user.target

Copied: pptpd/repos/community-i686/pptpd.service (from rev 90706, pptpd/trunk/pptpd.service)
===================================================================
--- community-i686/pptpd.service	                        (rev 0)
+++ community-i686/pptpd.service	2013-05-13 14:34:48 UTC (rev 90707)
@@ -0,0 +1,10 @@
+[Unit]
+Description=PPTP Server
+After=network.target
+
+[Service]
+ExecStart=/usr/sbin/pptpd -c /etc/pptpd.conf -p /var/run/pptpd.pid -f
+StandardOutput=null
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-i686/unrecognized-opt.patch
===================================================================
--- community-i686/unrecognized-opt.patch	2013-05-13 14:34:24 UTC (rev 90706)
+++ community-i686/unrecognized-opt.patch	2013-05-13 14:34:48 UTC (rev 90707)
@@ -1,13 +0,0 @@
-diff -wbBur pptpd-1.3.4/pptpctrl.c pptpd-1.3.4.my/pptpctrl.c
---- pptpd-1.3.4/pptpctrl.c	2006-12-08 03:01:40.000000000 +0300
-+++ pptpd-1.3.4.my/pptpctrl.c	2012-05-09 21:13:30.000000000 +0400
-@@ -759,8 +759,8 @@
- 			syslog(LOG_DEBUG, "CTRL (PPPD Launcher): remote address = %s", pppaddrs[1]);
- 	}
- 	
--	if (*pppaddrs[0] || *pppaddrs[1]) {
- 		char pppInterfaceIPs[33];
-+	if (*pppaddrs[0] || *pppaddrs[1]) {
- 		sprintf(pppInterfaceIPs, "%s:%s", pppaddrs[0], pppaddrs[1]);
- 		pppd_argv[an++] = pppInterfaceIPs;
- 	}

Copied: pptpd/repos/community-i686/unrecognized-opt.patch (from rev 90706, pptpd/trunk/unrecognized-opt.patch)
===================================================================
--- community-i686/unrecognized-opt.patch	                        (rev 0)
+++ community-i686/unrecognized-opt.patch	2013-05-13 14:34:48 UTC (rev 90707)
@@ -0,0 +1,13 @@
+diff -wbBur pptpd-1.3.4/pptpctrl.c pptpd-1.3.4.my/pptpctrl.c
+--- pptpd-1.3.4/pptpctrl.c	2006-12-08 03:01:40.000000000 +0300
++++ pptpd-1.3.4.my/pptpctrl.c	2012-05-09 21:13:30.000000000 +0400
+@@ -759,8 +759,8 @@
+ 			syslog(LOG_DEBUG, "CTRL (PPPD Launcher): remote address = %s", pppaddrs[1]);
+ 	}
+ 	
+-	if (*pppaddrs[0] || *pppaddrs[1]) {
+ 		char pppInterfaceIPs[33];
++	if (*pppaddrs[0] || *pppaddrs[1]) {
+ 		sprintf(pppInterfaceIPs, "%s:%s", pppaddrs[0], pppaddrs[1]);
+ 		pppd_argv[an++] = pppInterfaceIPs;
+ 	}

Deleted: community-x86_64/ChangeLog
===================================================================
--- community-x86_64/ChangeLog	2013-05-13 14:34:24 UTC (rev 90706)
+++ community-x86_64/ChangeLog	2013-05-13 14:34:48 UTC (rev 90707)
@@ -1,3 +0,0 @@
-2007-06-29 tardo <tardo at nagi-fanboi.net>
-* Built for x86_64
-* Added autoreconf to help with proper installation of libs

Copied: pptpd/repos/community-x86_64/ChangeLog (from rev 90706, pptpd/trunk/ChangeLog)
===================================================================
--- community-x86_64/ChangeLog	                        (rev 0)
+++ community-x86_64/ChangeLog	2013-05-13 14:34:48 UTC (rev 90707)
@@ -0,0 +1,3 @@
+2007-06-29 tardo <tardo at nagi-fanboi.net>
+* Built for x86_64
+* Added autoreconf to help with proper installation of libs

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2013-05-13 14:34:24 UTC (rev 90706)
+++ community-x86_64/PKGBUILD	2013-05-13 14:34:48 UTC (rev 90707)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=pptpd
-pkgver=1.3.4
-pkgrel=11
-pkgdesc="Poptop server"
-arch=(i686 x86_64)
-url="http://poptop.sourceforge.net/"
-license=('GPL')
-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')
-
-build() {
-  local _pppver=`pacman -Q ppp`
-  _pppver=${_pppver%-*}
-  _pppver=${_pppver#ppp }
-
-  cd $srcdir/$pkgname-$pkgver
-  patch -p1 <$srcdir/unrecognized-opt.patch
-  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
-  make
-  sed -i 's|install -o root|install|g' plugins/Makefile
-  sed -i 's|?=|=|g' plugins/Makefile
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  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/
-}

Copied: pptpd/repos/community-x86_64/PKGBUILD (from rev 90706, pptpd/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2013-05-13 14:34:48 UTC (rev 90707)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=pptpd
+pkgver=1.3.4
+pkgrel=12
+pkgdesc="Poptop server"
+arch=(i686 x86_64)
+url="http://poptop.sourceforge.net/"
+license=('GPL')
+depends=(ppp glibc)
+backup=(etc/pptpd.conf)
+source=(http://downloads.sourceforge.net/sourceforge/poptop/pptpd-$pkgver.tar.gz
+	pptpd.service
+	unrecognized-opt.patch)
+md5sums=('b38df9c431041922c997c1148bedf591'
+         '144c17c7d5c1b95cfb3450eb73aa2e50'
+         'cfa02c86d0413eb94fac15599986f54c')
+
+build() {
+  local _pppver=`pacman -Q ppp`
+  _pppver=${_pppver%-*}
+  _pppver=${_pppver#ppp }
+
+  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
+  make
+  sed -i 's|install -o root|install|g' plugins/Makefile
+  sed -i 's|?=|=|g' plugins/Makefile
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  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 -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: community-x86_64/pptpd
===================================================================
--- community-x86_64/pptpd	2013-05-13 14:34:24 UTC (rev 90706)
+++ community-x86_64/pptpd	2013-05-13 14:34:48 UTC (rev 90707)
@@ -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

Deleted: community-x86_64/pptpd.service
===================================================================
--- community-x86_64/pptpd.service	2013-05-13 14:34:24 UTC (rev 90706)
+++ community-x86_64/pptpd.service	2013-05-13 14:34:48 UTC (rev 90707)
@@ -1,10 +0,0 @@
-[Unit]
-Description=PPTP Server
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/pptpd -c /etc/pptpd.conf -p /var/run/pptpd.pid -f
-StandardOutput=null
-
-[Install]
-WantedBy=multi-user.target

Copied: pptpd/repos/community-x86_64/pptpd.service (from rev 90706, pptpd/trunk/pptpd.service)
===================================================================
--- community-x86_64/pptpd.service	                        (rev 0)
+++ community-x86_64/pptpd.service	2013-05-13 14:34:48 UTC (rev 90707)
@@ -0,0 +1,10 @@
+[Unit]
+Description=PPTP Server
+After=network.target
+
+[Service]
+ExecStart=/usr/sbin/pptpd -c /etc/pptpd.conf -p /var/run/pptpd.pid -f
+StandardOutput=null
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-x86_64/unrecognized-opt.patch
===================================================================
--- community-x86_64/unrecognized-opt.patch	2013-05-13 14:34:24 UTC (rev 90706)
+++ community-x86_64/unrecognized-opt.patch	2013-05-13 14:34:48 UTC (rev 90707)
@@ -1,13 +0,0 @@
-diff -wbBur pptpd-1.3.4/pptpctrl.c pptpd-1.3.4.my/pptpctrl.c
---- pptpd-1.3.4/pptpctrl.c	2006-12-08 03:01:40.000000000 +0300
-+++ pptpd-1.3.4.my/pptpctrl.c	2012-05-09 21:13:30.000000000 +0400
-@@ -759,8 +759,8 @@
- 			syslog(LOG_DEBUG, "CTRL (PPPD Launcher): remote address = %s", pppaddrs[1]);
- 	}
- 	
--	if (*pppaddrs[0] || *pppaddrs[1]) {
- 		char pppInterfaceIPs[33];
-+	if (*pppaddrs[0] || *pppaddrs[1]) {
- 		sprintf(pppInterfaceIPs, "%s:%s", pppaddrs[0], pppaddrs[1]);
- 		pppd_argv[an++] = pppInterfaceIPs;
- 	}

Copied: pptpd/repos/community-x86_64/unrecognized-opt.patch (from rev 90706, pptpd/trunk/unrecognized-opt.patch)
===================================================================
--- community-x86_64/unrecognized-opt.patch	                        (rev 0)
+++ community-x86_64/unrecognized-opt.patch	2013-05-13 14:34:48 UTC (rev 90707)
@@ -0,0 +1,13 @@
+diff -wbBur pptpd-1.3.4/pptpctrl.c pptpd-1.3.4.my/pptpctrl.c
+--- pptpd-1.3.4/pptpctrl.c	2006-12-08 03:01:40.000000000 +0300
++++ pptpd-1.3.4.my/pptpctrl.c	2012-05-09 21:13:30.000000000 +0400
+@@ -759,8 +759,8 @@
+ 			syslog(LOG_DEBUG, "CTRL (PPPD Launcher): remote address = %s", pppaddrs[1]);
+ 	}
+ 	
+-	if (*pppaddrs[0] || *pppaddrs[1]) {
+ 		char pppInterfaceIPs[33];
++	if (*pppaddrs[0] || *pppaddrs[1]) {
+ 		sprintf(pppInterfaceIPs, "%s:%s", pppaddrs[0], pppaddrs[1]);
+ 		pppd_argv[an++] = pppInterfaceIPs;
+ 	}



More information about the arch-commits mailing list