[arch-commits] Commit in xl2tpd/repos (28 files)

Sergej Pupykin spupykin at nymeria.archlinux.org
Sun Jan 12 22:03:07 UTC 2014


    Date: Sunday, January 12, 2014 @ 23:03:07
  Author: spupykin
Revision: 103870

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

Added:
  xl2tpd/repos/community-i686/PKGBUILD
    (from rev 103869, xl2tpd/trunk/PKGBUILD)
  xl2tpd/repos/community-i686/ipparam.patch
    (from rev 103869, xl2tpd/trunk/ipparam.patch)
  xl2tpd/repos/community-i686/options.l2tpd
    (from rev 103869, xl2tpd/trunk/options.l2tpd)
  xl2tpd/repos/community-i686/xl2tpd.conf.client-example
    (from rev 103869, xl2tpd/trunk/xl2tpd.conf.client-example)
  xl2tpd/repos/community-i686/xl2tpd.conf.server-example
    (from rev 103869, xl2tpd/trunk/xl2tpd.conf.server-example)
  xl2tpd/repos/community-i686/xl2tpd.service
    (from rev 103869, xl2tpd/trunk/xl2tpd.service)
  xl2tpd/repos/community-i686/xl2tpd.tmpfiles
    (from rev 103869, xl2tpd/trunk/xl2tpd.tmpfiles)
  xl2tpd/repos/community-x86_64/PKGBUILD
    (from rev 103869, xl2tpd/trunk/PKGBUILD)
  xl2tpd/repos/community-x86_64/ipparam.patch
    (from rev 103869, xl2tpd/trunk/ipparam.patch)
  xl2tpd/repos/community-x86_64/options.l2tpd
    (from rev 103869, xl2tpd/trunk/options.l2tpd)
  xl2tpd/repos/community-x86_64/xl2tpd.conf.client-example
    (from rev 103869, xl2tpd/trunk/xl2tpd.conf.client-example)
  xl2tpd/repos/community-x86_64/xl2tpd.conf.server-example
    (from rev 103869, xl2tpd/trunk/xl2tpd.conf.server-example)
  xl2tpd/repos/community-x86_64/xl2tpd.service
    (from rev 103869, xl2tpd/trunk/xl2tpd.service)
  xl2tpd/repos/community-x86_64/xl2tpd.tmpfiles
    (from rev 103869, xl2tpd/trunk/xl2tpd.tmpfiles)
Deleted:
  xl2tpd/repos/community-i686/PKGBUILD
  xl2tpd/repos/community-i686/ipparam.patch
  xl2tpd/repos/community-i686/options.l2tpd
  xl2tpd/repos/community-i686/xl2tpd.conf.client-example
  xl2tpd/repos/community-i686/xl2tpd.conf.server-example
  xl2tpd/repos/community-i686/xl2tpd.service
  xl2tpd/repos/community-i686/xl2tpd.tmpfiles
  xl2tpd/repos/community-x86_64/PKGBUILD
  xl2tpd/repos/community-x86_64/ipparam.patch
  xl2tpd/repos/community-x86_64/options.l2tpd
  xl2tpd/repos/community-x86_64/xl2tpd.conf.client-example
  xl2tpd/repos/community-x86_64/xl2tpd.conf.server-example
  xl2tpd/repos/community-x86_64/xl2tpd.service
  xl2tpd/repos/community-x86_64/xl2tpd.tmpfiles

---------------------------------------------+
 /PKGBUILD                                   |   98 ++++++++++++++++++++++++++
 /ipparam.patch                              |   72 +++++++++++++++++++
 /options.l2tpd                              |   48 ++++++++++++
 /xl2tpd.conf.client-example                 |   38 ++++++++++
 /xl2tpd.conf.server-example                 |   42 +++++++++++
 /xl2tpd.service                             |   30 +++++++
 /xl2tpd.tmpfiles                            |    2 
 community-i686/PKGBUILD                     |   49 -------------
 community-i686/ipparam.patch                |   36 ---------
 community-i686/options.l2tpd                |   24 ------
 community-i686/xl2tpd.conf.client-example   |   19 -----
 community-i686/xl2tpd.conf.server-example   |   21 -----
 community-i686/xl2tpd.service               |   15 ---
 community-i686/xl2tpd.tmpfiles              |    1 
 community-x86_64/PKGBUILD                   |   49 -------------
 community-x86_64/ipparam.patch              |   36 ---------
 community-x86_64/options.l2tpd              |   24 ------
 community-x86_64/xl2tpd.conf.client-example |   19 -----
 community-x86_64/xl2tpd.conf.server-example |   21 -----
 community-x86_64/xl2tpd.service             |   15 ---
 community-x86_64/xl2tpd.tmpfiles            |    1 
 21 files changed, 330 insertions(+), 330 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-01-12 22:02:36 UTC (rev 103869)
+++ community-i686/PKGBUILD	2014-01-12 22:03:07 UTC (rev 103870)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Hengfu <rhfcaesar at gmail.com>
-
-pkgname=xl2tpd
-pkgver=1.3.1
-pkgrel=3
-pkgdesc="an open source implementation of the L2TP maintained by Xelerance Corporation"
-arch=('i686' 'x86_64')
-url="http://www.xelerance.com/services/software/xl2tpd/"
-license=('GPL')
-depends=('ppp')
-options=(emptydirs zipman docs)
-backup=(etc/ppp/options.l2tpd)
-source=($pkgname-$pkgver.tar.gz::https://github.com/xelerance/xl2tpd/archive/v$pkgver.tar.gz
-	xl2tpd.conf.client-example
-	xl2tpd.conf.server-example
-	options.l2tpd
-	xl2tpd.service
-	xl2tpd.tmpfiles
-	ipparam.patch)
-md5sums=('38c2461d3562f98b08454ca403706886'
-         '5f0ae07026e61a3dd15a76fd4144a6d5'
-         '16ed0886115d4dcc21072cfb847250bb'
-         'ed57eb67335cdf246251285dad502cc7'
-         '219942dd098ce4fdba37d1db327baf57'
-         '2e95e4fc03e1521ab20fd7e249efab5a'
-         '4d258a58cc109d5c4d96af8f81d481cf')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  patch -p1 <$srcdir/ipparam.patch
-
-  make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr SBINDIR=/usr/bin
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr DESTDIR=$pkgdir  SBINDIR=$pkgdir/usr/bin install
-
-  install -D -m0644 $srcdir/xl2tpd.conf.client-example $pkgdir/etc/xl2tpd/xl2tpd.conf.client-example
-  install -D -m0644 $srcdir/xl2tpd.conf.server-example $pkgdir/etc/xl2tpd/xl2tpd.conf.server-example
-  install -D -m0644 $srcdir/options.l2tpd $pkgdir/etc/ppp/options.l2tpd
-
-  install -Dm0644 $srcdir/xl2tpd.service $pkgdir/usr/lib/systemd/system/xl2tpd.service
-  install -Dm0644 $srcdir/xl2tpd.tmpfiles $pkgdir/usr/lib/tmpfiles.d/xl2tpd.conf
-}

Copied: xl2tpd/repos/community-i686/PKGBUILD (from rev 103869, xl2tpd/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2014-01-12 22:03:07 UTC (rev 103870)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Hengfu <rhfcaesar at gmail.com>
+
+pkgname=xl2tpd
+pkgver=1.3.4rc1
+pkgrel=1
+pkgdesc="an open source implementation of the L2TP maintained by Xelerance Corporation"
+arch=('i686' 'x86_64')
+url="http://www.xelerance.com/services/software/xl2tpd/"
+license=('GPL')
+depends=('ppp')
+options=(emptydirs zipman docs)
+backup=(etc/ppp/options.l2tpd)
+source=($pkgname-$pkgver.tar.gz::https://github.com/xelerance/xl2tpd/archive/v$pkgver.tar.gz
+	xl2tpd.conf.client-example
+	xl2tpd.conf.server-example
+	options.l2tpd
+	xl2tpd.service
+	xl2tpd.tmpfiles
+	ipparam.patch)
+md5sums=('5d26c43791a8347a252c9307794d6179'
+         '5f0ae07026e61a3dd15a76fd4144a6d5'
+         '16ed0886115d4dcc21072cfb847250bb'
+         'ed57eb67335cdf246251285dad502cc7'
+         '219942dd098ce4fdba37d1db327baf57'
+         '2e95e4fc03e1521ab20fd7e249efab5a'
+         '4d258a58cc109d5c4d96af8f81d481cf')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+#  patch -p1 <$srcdir/ipparam.patch
+
+  make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr SBINDIR=/usr/bin
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr DESTDIR=$pkgdir  SBINDIR=$pkgdir/usr/bin install
+
+  install -D -m0644 $srcdir/xl2tpd.conf.client-example $pkgdir/etc/xl2tpd/xl2tpd.conf.client-example
+  install -D -m0644 $srcdir/xl2tpd.conf.server-example $pkgdir/etc/xl2tpd/xl2tpd.conf.server-example
+  install -D -m0644 $srcdir/options.l2tpd $pkgdir/etc/ppp/options.l2tpd
+
+  install -Dm0644 $srcdir/xl2tpd.service $pkgdir/usr/lib/systemd/system/xl2tpd.service
+  install -Dm0644 $srcdir/xl2tpd.tmpfiles $pkgdir/usr/lib/tmpfiles.d/xl2tpd.conf
+}

Deleted: community-i686/ipparam.patch
===================================================================
--- community-i686/ipparam.patch	2014-01-12 22:02:36 UTC (rev 103869)
+++ community-i686/ipparam.patch	2014-01-12 22:03:07 UTC (rev 103870)
@@ -1,36 +0,0 @@
-diff -wbBur xl2tpd-1.2.8/control.c xl2tpd-1.2.8.my/control.c
---- xl2tpd-1.2.8/control.c	2011-02-23 08:10:21.000000000 +0300
-+++ xl2tpd-1.2.8.my/control.c	2011-03-25 21:29:29.896518014 +0300
-@@ -892,8 +892,8 @@
-                 po = add_opt (po, c->lac->pppoptfile);
-             }
-         };
--	po = add_opt (po, "ipparam");
--        po = add_opt (po, IPADDY (t->peer.sin_addr));
-+//	po = add_opt (po, "ipparam");
-+//        po = add_opt (po, IPADDY (t->peer.sin_addr));
-         start_pppd (c, po);
-         opt_destroy (po);
-         if (c->lac)
-@@ -966,8 +966,8 @@
-             po = add_opt (po, "file");
-             po = add_opt (po, c->lns->pppoptfile);
-         }
--	po = add_opt (po, "ipparam");
--        po = add_opt (po, IPADDY (t->peer.sin_addr));
-+//	po = add_opt (po, "ipparam");
-+//        po = add_opt (po, IPADDY (t->peer.sin_addr));
-         start_pppd (c, po);
-         opt_destroy (po);
-         l2tp_log (LOG_NOTICE,
-@@ -1026,8 +1026,8 @@
-                 po = add_opt (po, c->lac->pppoptfile);
-             }
-         };
--	po = add_opt (po, "ipparam");
--        po = add_opt (po, IPADDY (t->peer.sin_addr));
-+//	po = add_opt (po, "ipparam");
-+//        po = add_opt (po, IPADDY (t->peer.sin_addr));
-         start_pppd (c, po);
- 
-         /*  jz: just show some information */

Copied: xl2tpd/repos/community-i686/ipparam.patch (from rev 103869, xl2tpd/trunk/ipparam.patch)
===================================================================
--- community-i686/ipparam.patch	                        (rev 0)
+++ community-i686/ipparam.patch	2014-01-12 22:03:07 UTC (rev 103870)
@@ -0,0 +1,36 @@
+diff -wbBur xl2tpd-1.2.8/control.c xl2tpd-1.2.8.my/control.c
+--- xl2tpd-1.2.8/control.c	2011-02-23 08:10:21.000000000 +0300
++++ xl2tpd-1.2.8.my/control.c	2011-03-25 21:29:29.896518014 +0300
+@@ -892,8 +892,8 @@
+                 po = add_opt (po, c->lac->pppoptfile);
+             }
+         };
+-	po = add_opt (po, "ipparam");
+-        po = add_opt (po, IPADDY (t->peer.sin_addr));
++//	po = add_opt (po, "ipparam");
++//        po = add_opt (po, IPADDY (t->peer.sin_addr));
+         start_pppd (c, po);
+         opt_destroy (po);
+         if (c->lac)
+@@ -966,8 +966,8 @@
+             po = add_opt (po, "file");
+             po = add_opt (po, c->lns->pppoptfile);
+         }
+-	po = add_opt (po, "ipparam");
+-        po = add_opt (po, IPADDY (t->peer.sin_addr));
++//	po = add_opt (po, "ipparam");
++//        po = add_opt (po, IPADDY (t->peer.sin_addr));
+         start_pppd (c, po);
+         opt_destroy (po);
+         l2tp_log (LOG_NOTICE,
+@@ -1026,8 +1026,8 @@
+                 po = add_opt (po, c->lac->pppoptfile);
+             }
+         };
+-	po = add_opt (po, "ipparam");
+-        po = add_opt (po, IPADDY (t->peer.sin_addr));
++//	po = add_opt (po, "ipparam");
++//        po = add_opt (po, IPADDY (t->peer.sin_addr));
+         start_pppd (c, po);
+ 
+         /*  jz: just show some information */

Deleted: community-i686/options.l2tpd
===================================================================
--- community-i686/options.l2tpd	2014-01-12 22:02:36 UTC (rev 103869)
+++ community-i686/options.l2tpd	2014-01-12 22:03:07 UTC (rev 103870)
@@ -1,24 +0,0 @@
-login
-lcp-echo-interval 10
-lcp-echo-failure 2
-noipx
-
-refuse-pap
-refuse-chap
-refuse-mschap
-
-require-mppe
-require-mschap-v2
-
-nodefaultroute
-proxyarp
-
-#bsdcomp
-#deflate
-#accomp
-#noccp
-#nopcomp
-#nopredictor1
-#novj
-#novjccomp
-#debug 7

Copied: xl2tpd/repos/community-i686/options.l2tpd (from rev 103869, xl2tpd/trunk/options.l2tpd)
===================================================================
--- community-i686/options.l2tpd	                        (rev 0)
+++ community-i686/options.l2tpd	2014-01-12 22:03:07 UTC (rev 103870)
@@ -0,0 +1,24 @@
+login
+lcp-echo-interval 10
+lcp-echo-failure 2
+noipx
+
+refuse-pap
+refuse-chap
+refuse-mschap
+
+require-mppe
+require-mschap-v2
+
+nodefaultroute
+proxyarp
+
+#bsdcomp
+#deflate
+#accomp
+#noccp
+#nopcomp
+#nopredictor1
+#novj
+#novjccomp
+#debug 7

Deleted: community-i686/xl2tpd.conf.client-example
===================================================================
--- community-i686/xl2tpd.conf.client-example	2014-01-12 22:02:36 UTC (rev 103869)
+++ community-i686/xl2tpd.conf.client-example	2014-01-12 22:03:07 UTC (rev 103870)
@@ -1,19 +0,0 @@
-[global]
-access control = no
-auth file = /etc/ppp/chap-secrets
-debug avp = no
-debug network = no
-debug packet = no
-debug state = no
-debug tunnel = no
-
-[lac <name>]
-lns = <host>
-redial = yes
-redial timeout = 5
-require chap = yes
-require authentication = no
-ppp debug = no
-pppoptfile = /etc/ppp/peers/<ppp-opts>
-require pap = no
-autodial = yes

Copied: xl2tpd/repos/community-i686/xl2tpd.conf.client-example (from rev 103869, xl2tpd/trunk/xl2tpd.conf.client-example)
===================================================================
--- community-i686/xl2tpd.conf.client-example	                        (rev 0)
+++ community-i686/xl2tpd.conf.client-example	2014-01-12 22:03:07 UTC (rev 103870)
@@ -0,0 +1,19 @@
+[global]
+access control = no
+auth file = /etc/ppp/chap-secrets
+debug avp = no
+debug network = no
+debug packet = no
+debug state = no
+debug tunnel = no
+
+[lac <name>]
+lns = <host>
+redial = yes
+redial timeout = 5
+require chap = yes
+require authentication = no
+ppp debug = no
+pppoptfile = /etc/ppp/peers/<ppp-opts>
+require pap = no
+autodial = yes

Deleted: community-i686/xl2tpd.conf.server-example
===================================================================
--- community-i686/xl2tpd.conf.server-example	2014-01-12 22:02:36 UTC (rev 103869)
+++ community-i686/xl2tpd.conf.server-example	2014-01-12 22:03:07 UTC (rev 103870)
@@ -1,21 +0,0 @@
-[global]
-access control = yes
-auth file = /etc/ppp/chap-secrets
-debug avp = no
-debug network = no
-debug packet = no
-debug state = no
-debug tunnel = no
-
-[lns <name>]
-require chap = yes
-ppp debug = no
-pppoptfile = /etc/ppp/options.l2tpd
-require pap = no
-assign ip = yes
-hostname = <hostname>
-ip range = <range>
-local ip = <ip>
-challenge = no
-lac = <lacs>
-require authentication = no

Copied: xl2tpd/repos/community-i686/xl2tpd.conf.server-example (from rev 103869, xl2tpd/trunk/xl2tpd.conf.server-example)
===================================================================
--- community-i686/xl2tpd.conf.server-example	                        (rev 0)
+++ community-i686/xl2tpd.conf.server-example	2014-01-12 22:03:07 UTC (rev 103870)
@@ -0,0 +1,21 @@
+[global]
+access control = yes
+auth file = /etc/ppp/chap-secrets
+debug avp = no
+debug network = no
+debug packet = no
+debug state = no
+debug tunnel = no
+
+[lns <name>]
+require chap = yes
+ppp debug = no
+pppoptfile = /etc/ppp/options.l2tpd
+require pap = no
+assign ip = yes
+hostname = <hostname>
+ip range = <range>
+local ip = <ip>
+challenge = no
+lac = <lacs>
+require authentication = no

Deleted: community-i686/xl2tpd.service
===================================================================
--- community-i686/xl2tpd.service	2014-01-12 22:02:36 UTC (rev 103869)
+++ community-i686/xl2tpd.service	2014-01-12 22:03:07 UTC (rev 103870)
@@ -1,15 +0,0 @@
-[Unit]
-Description=Level 2 Tunnel Protocol Daemon (L2TP)
-After=syslog.target network.target
-After=ipsec.service
-# Some ISPs in Russia use l2tp without IPsec, so don't insist anymore
-#Wants=ipsec.service
-
-[Service]
-Type=simple
-PIDFile=/run/xl2tpd/xl2tpd.pid
-ExecStart=/usr/bin/xl2tpd -D
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target

Copied: xl2tpd/repos/community-i686/xl2tpd.service (from rev 103869, xl2tpd/trunk/xl2tpd.service)
===================================================================
--- community-i686/xl2tpd.service	                        (rev 0)
+++ community-i686/xl2tpd.service	2014-01-12 22:03:07 UTC (rev 103870)
@@ -0,0 +1,15 @@
+[Unit]
+Description=Level 2 Tunnel Protocol Daemon (L2TP)
+After=syslog.target network.target
+After=ipsec.service
+# Some ISPs in Russia use l2tp without IPsec, so don't insist anymore
+#Wants=ipsec.service
+
+[Service]
+Type=simple
+PIDFile=/run/xl2tpd/xl2tpd.pid
+ExecStart=/usr/bin/xl2tpd -D
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-i686/xl2tpd.tmpfiles
===================================================================
--- community-i686/xl2tpd.tmpfiles	2014-01-12 22:02:36 UTC (rev 103869)
+++ community-i686/xl2tpd.tmpfiles	2014-01-12 22:03:07 UTC (rev 103870)
@@ -1 +0,0 @@
-d /var/run/xl2tpd 0755 root root -

Copied: xl2tpd/repos/community-i686/xl2tpd.tmpfiles (from rev 103869, xl2tpd/trunk/xl2tpd.tmpfiles)
===================================================================
--- community-i686/xl2tpd.tmpfiles	                        (rev 0)
+++ community-i686/xl2tpd.tmpfiles	2014-01-12 22:03:07 UTC (rev 103870)
@@ -0,0 +1 @@
+d /var/run/xl2tpd 0755 root root -

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2014-01-12 22:02:36 UTC (rev 103869)
+++ community-x86_64/PKGBUILD	2014-01-12 22:03:07 UTC (rev 103870)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Hengfu <rhfcaesar at gmail.com>
-
-pkgname=xl2tpd
-pkgver=1.3.1
-pkgrel=3
-pkgdesc="an open source implementation of the L2TP maintained by Xelerance Corporation"
-arch=('i686' 'x86_64')
-url="http://www.xelerance.com/services/software/xl2tpd/"
-license=('GPL')
-depends=('ppp')
-options=(emptydirs zipman docs)
-backup=(etc/ppp/options.l2tpd)
-source=($pkgname-$pkgver.tar.gz::https://github.com/xelerance/xl2tpd/archive/v$pkgver.tar.gz
-	xl2tpd.conf.client-example
-	xl2tpd.conf.server-example
-	options.l2tpd
-	xl2tpd.service
-	xl2tpd.tmpfiles
-	ipparam.patch)
-md5sums=('38c2461d3562f98b08454ca403706886'
-         '5f0ae07026e61a3dd15a76fd4144a6d5'
-         '16ed0886115d4dcc21072cfb847250bb'
-         'ed57eb67335cdf246251285dad502cc7'
-         '219942dd098ce4fdba37d1db327baf57'
-         '2e95e4fc03e1521ab20fd7e249efab5a'
-         '4d258a58cc109d5c4d96af8f81d481cf')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  patch -p1 <$srcdir/ipparam.patch
-
-  make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr SBINDIR=/usr/bin
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr DESTDIR=$pkgdir  SBINDIR=$pkgdir/usr/bin install
-
-  install -D -m0644 $srcdir/xl2tpd.conf.client-example $pkgdir/etc/xl2tpd/xl2tpd.conf.client-example
-  install -D -m0644 $srcdir/xl2tpd.conf.server-example $pkgdir/etc/xl2tpd/xl2tpd.conf.server-example
-  install -D -m0644 $srcdir/options.l2tpd $pkgdir/etc/ppp/options.l2tpd
-
-  install -Dm0644 $srcdir/xl2tpd.service $pkgdir/usr/lib/systemd/system/xl2tpd.service
-  install -Dm0644 $srcdir/xl2tpd.tmpfiles $pkgdir/usr/lib/tmpfiles.d/xl2tpd.conf
-}

Copied: xl2tpd/repos/community-x86_64/PKGBUILD (from rev 103869, xl2tpd/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2014-01-12 22:03:07 UTC (rev 103870)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Hengfu <rhfcaesar at gmail.com>
+
+pkgname=xl2tpd
+pkgver=1.3.4rc1
+pkgrel=1
+pkgdesc="an open source implementation of the L2TP maintained by Xelerance Corporation"
+arch=('i686' 'x86_64')
+url="http://www.xelerance.com/services/software/xl2tpd/"
+license=('GPL')
+depends=('ppp')
+options=(emptydirs zipman docs)
+backup=(etc/ppp/options.l2tpd)
+source=($pkgname-$pkgver.tar.gz::https://github.com/xelerance/xl2tpd/archive/v$pkgver.tar.gz
+	xl2tpd.conf.client-example
+	xl2tpd.conf.server-example
+	options.l2tpd
+	xl2tpd.service
+	xl2tpd.tmpfiles
+	ipparam.patch)
+md5sums=('5d26c43791a8347a252c9307794d6179'
+         '5f0ae07026e61a3dd15a76fd4144a6d5'
+         '16ed0886115d4dcc21072cfb847250bb'
+         'ed57eb67335cdf246251285dad502cc7'
+         '219942dd098ce4fdba37d1db327baf57'
+         '2e95e4fc03e1521ab20fd7e249efab5a'
+         '4d258a58cc109d5c4d96af8f81d481cf')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+#  patch -p1 <$srcdir/ipparam.patch
+
+  make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr SBINDIR=/usr/bin
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr DESTDIR=$pkgdir  SBINDIR=$pkgdir/usr/bin install
+
+  install -D -m0644 $srcdir/xl2tpd.conf.client-example $pkgdir/etc/xl2tpd/xl2tpd.conf.client-example
+  install -D -m0644 $srcdir/xl2tpd.conf.server-example $pkgdir/etc/xl2tpd/xl2tpd.conf.server-example
+  install -D -m0644 $srcdir/options.l2tpd $pkgdir/etc/ppp/options.l2tpd
+
+  install -Dm0644 $srcdir/xl2tpd.service $pkgdir/usr/lib/systemd/system/xl2tpd.service
+  install -Dm0644 $srcdir/xl2tpd.tmpfiles $pkgdir/usr/lib/tmpfiles.d/xl2tpd.conf
+}

Deleted: community-x86_64/ipparam.patch
===================================================================
--- community-x86_64/ipparam.patch	2014-01-12 22:02:36 UTC (rev 103869)
+++ community-x86_64/ipparam.patch	2014-01-12 22:03:07 UTC (rev 103870)
@@ -1,36 +0,0 @@
-diff -wbBur xl2tpd-1.2.8/control.c xl2tpd-1.2.8.my/control.c
---- xl2tpd-1.2.8/control.c	2011-02-23 08:10:21.000000000 +0300
-+++ xl2tpd-1.2.8.my/control.c	2011-03-25 21:29:29.896518014 +0300
-@@ -892,8 +892,8 @@
-                 po = add_opt (po, c->lac->pppoptfile);
-             }
-         };
--	po = add_opt (po, "ipparam");
--        po = add_opt (po, IPADDY (t->peer.sin_addr));
-+//	po = add_opt (po, "ipparam");
-+//        po = add_opt (po, IPADDY (t->peer.sin_addr));
-         start_pppd (c, po);
-         opt_destroy (po);
-         if (c->lac)
-@@ -966,8 +966,8 @@
-             po = add_opt (po, "file");
-             po = add_opt (po, c->lns->pppoptfile);
-         }
--	po = add_opt (po, "ipparam");
--        po = add_opt (po, IPADDY (t->peer.sin_addr));
-+//	po = add_opt (po, "ipparam");
-+//        po = add_opt (po, IPADDY (t->peer.sin_addr));
-         start_pppd (c, po);
-         opt_destroy (po);
-         l2tp_log (LOG_NOTICE,
-@@ -1026,8 +1026,8 @@
-                 po = add_opt (po, c->lac->pppoptfile);
-             }
-         };
--	po = add_opt (po, "ipparam");
--        po = add_opt (po, IPADDY (t->peer.sin_addr));
-+//	po = add_opt (po, "ipparam");
-+//        po = add_opt (po, IPADDY (t->peer.sin_addr));
-         start_pppd (c, po);
- 
-         /*  jz: just show some information */

Copied: xl2tpd/repos/community-x86_64/ipparam.patch (from rev 103869, xl2tpd/trunk/ipparam.patch)
===================================================================
--- community-x86_64/ipparam.patch	                        (rev 0)
+++ community-x86_64/ipparam.patch	2014-01-12 22:03:07 UTC (rev 103870)
@@ -0,0 +1,36 @@
+diff -wbBur xl2tpd-1.2.8/control.c xl2tpd-1.2.8.my/control.c
+--- xl2tpd-1.2.8/control.c	2011-02-23 08:10:21.000000000 +0300
++++ xl2tpd-1.2.8.my/control.c	2011-03-25 21:29:29.896518014 +0300
+@@ -892,8 +892,8 @@
+                 po = add_opt (po, c->lac->pppoptfile);
+             }
+         };
+-	po = add_opt (po, "ipparam");
+-        po = add_opt (po, IPADDY (t->peer.sin_addr));
++//	po = add_opt (po, "ipparam");
++//        po = add_opt (po, IPADDY (t->peer.sin_addr));
+         start_pppd (c, po);
+         opt_destroy (po);
+         if (c->lac)
+@@ -966,8 +966,8 @@
+             po = add_opt (po, "file");
+             po = add_opt (po, c->lns->pppoptfile);
+         }
+-	po = add_opt (po, "ipparam");
+-        po = add_opt (po, IPADDY (t->peer.sin_addr));
++//	po = add_opt (po, "ipparam");
++//        po = add_opt (po, IPADDY (t->peer.sin_addr));
+         start_pppd (c, po);
+         opt_destroy (po);
+         l2tp_log (LOG_NOTICE,
+@@ -1026,8 +1026,8 @@
+                 po = add_opt (po, c->lac->pppoptfile);
+             }
+         };
+-	po = add_opt (po, "ipparam");
+-        po = add_opt (po, IPADDY (t->peer.sin_addr));
++//	po = add_opt (po, "ipparam");
++//        po = add_opt (po, IPADDY (t->peer.sin_addr));
+         start_pppd (c, po);
+ 
+         /*  jz: just show some information */

Deleted: community-x86_64/options.l2tpd
===================================================================
--- community-x86_64/options.l2tpd	2014-01-12 22:02:36 UTC (rev 103869)
+++ community-x86_64/options.l2tpd	2014-01-12 22:03:07 UTC (rev 103870)
@@ -1,24 +0,0 @@
-login
-lcp-echo-interval 10
-lcp-echo-failure 2
-noipx
-
-refuse-pap
-refuse-chap
-refuse-mschap
-
-require-mppe
-require-mschap-v2
-
-nodefaultroute
-proxyarp
-
-#bsdcomp
-#deflate
-#accomp
-#noccp
-#nopcomp
-#nopredictor1
-#novj
-#novjccomp
-#debug 7

Copied: xl2tpd/repos/community-x86_64/options.l2tpd (from rev 103869, xl2tpd/trunk/options.l2tpd)
===================================================================
--- community-x86_64/options.l2tpd	                        (rev 0)
+++ community-x86_64/options.l2tpd	2014-01-12 22:03:07 UTC (rev 103870)
@@ -0,0 +1,24 @@
+login
+lcp-echo-interval 10
+lcp-echo-failure 2
+noipx
+
+refuse-pap
+refuse-chap
+refuse-mschap
+
+require-mppe
+require-mschap-v2
+
+nodefaultroute
+proxyarp
+
+#bsdcomp
+#deflate
+#accomp
+#noccp
+#nopcomp
+#nopredictor1
+#novj
+#novjccomp
+#debug 7

Deleted: community-x86_64/xl2tpd.conf.client-example
===================================================================
--- community-x86_64/xl2tpd.conf.client-example	2014-01-12 22:02:36 UTC (rev 103869)
+++ community-x86_64/xl2tpd.conf.client-example	2014-01-12 22:03:07 UTC (rev 103870)
@@ -1,19 +0,0 @@
-[global]
-access control = no
-auth file = /etc/ppp/chap-secrets
-debug avp = no
-debug network = no
-debug packet = no
-debug state = no
-debug tunnel = no
-
-[lac <name>]
-lns = <host>
-redial = yes
-redial timeout = 5
-require chap = yes
-require authentication = no
-ppp debug = no
-pppoptfile = /etc/ppp/peers/<ppp-opts>
-require pap = no
-autodial = yes

Copied: xl2tpd/repos/community-x86_64/xl2tpd.conf.client-example (from rev 103869, xl2tpd/trunk/xl2tpd.conf.client-example)
===================================================================
--- community-x86_64/xl2tpd.conf.client-example	                        (rev 0)
+++ community-x86_64/xl2tpd.conf.client-example	2014-01-12 22:03:07 UTC (rev 103870)
@@ -0,0 +1,19 @@
+[global]
+access control = no
+auth file = /etc/ppp/chap-secrets
+debug avp = no
+debug network = no
+debug packet = no
+debug state = no
+debug tunnel = no
+
+[lac <name>]
+lns = <host>
+redial = yes
+redial timeout = 5
+require chap = yes
+require authentication = no
+ppp debug = no
+pppoptfile = /etc/ppp/peers/<ppp-opts>
+require pap = no
+autodial = yes

Deleted: community-x86_64/xl2tpd.conf.server-example
===================================================================
--- community-x86_64/xl2tpd.conf.server-example	2014-01-12 22:02:36 UTC (rev 103869)
+++ community-x86_64/xl2tpd.conf.server-example	2014-01-12 22:03:07 UTC (rev 103870)
@@ -1,21 +0,0 @@
-[global]
-access control = yes
-auth file = /etc/ppp/chap-secrets
-debug avp = no
-debug network = no
-debug packet = no
-debug state = no
-debug tunnel = no
-
-[lns <name>]
-require chap = yes
-ppp debug = no
-pppoptfile = /etc/ppp/options.l2tpd
-require pap = no
-assign ip = yes
-hostname = <hostname>
-ip range = <range>
-local ip = <ip>
-challenge = no
-lac = <lacs>
-require authentication = no

Copied: xl2tpd/repos/community-x86_64/xl2tpd.conf.server-example (from rev 103869, xl2tpd/trunk/xl2tpd.conf.server-example)
===================================================================
--- community-x86_64/xl2tpd.conf.server-example	                        (rev 0)
+++ community-x86_64/xl2tpd.conf.server-example	2014-01-12 22:03:07 UTC (rev 103870)
@@ -0,0 +1,21 @@
+[global]
+access control = yes
+auth file = /etc/ppp/chap-secrets
+debug avp = no
+debug network = no
+debug packet = no
+debug state = no
+debug tunnel = no
+
+[lns <name>]
+require chap = yes
+ppp debug = no
+pppoptfile = /etc/ppp/options.l2tpd
+require pap = no
+assign ip = yes
+hostname = <hostname>
+ip range = <range>
+local ip = <ip>
+challenge = no
+lac = <lacs>
+require authentication = no

Deleted: community-x86_64/xl2tpd.service
===================================================================
--- community-x86_64/xl2tpd.service	2014-01-12 22:02:36 UTC (rev 103869)
+++ community-x86_64/xl2tpd.service	2014-01-12 22:03:07 UTC (rev 103870)
@@ -1,15 +0,0 @@
-[Unit]
-Description=Level 2 Tunnel Protocol Daemon (L2TP)
-After=syslog.target network.target
-After=ipsec.service
-# Some ISPs in Russia use l2tp without IPsec, so don't insist anymore
-#Wants=ipsec.service
-
-[Service]
-Type=simple
-PIDFile=/run/xl2tpd/xl2tpd.pid
-ExecStart=/usr/bin/xl2tpd -D
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target

Copied: xl2tpd/repos/community-x86_64/xl2tpd.service (from rev 103869, xl2tpd/trunk/xl2tpd.service)
===================================================================
--- community-x86_64/xl2tpd.service	                        (rev 0)
+++ community-x86_64/xl2tpd.service	2014-01-12 22:03:07 UTC (rev 103870)
@@ -0,0 +1,15 @@
+[Unit]
+Description=Level 2 Tunnel Protocol Daemon (L2TP)
+After=syslog.target network.target
+After=ipsec.service
+# Some ISPs in Russia use l2tp without IPsec, so don't insist anymore
+#Wants=ipsec.service
+
+[Service]
+Type=simple
+PIDFile=/run/xl2tpd/xl2tpd.pid
+ExecStart=/usr/bin/xl2tpd -D
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-x86_64/xl2tpd.tmpfiles
===================================================================
--- community-x86_64/xl2tpd.tmpfiles	2014-01-12 22:02:36 UTC (rev 103869)
+++ community-x86_64/xl2tpd.tmpfiles	2014-01-12 22:03:07 UTC (rev 103870)
@@ -1 +0,0 @@
-d /var/run/xl2tpd 0755 root root -

Copied: xl2tpd/repos/community-x86_64/xl2tpd.tmpfiles (from rev 103869, xl2tpd/trunk/xl2tpd.tmpfiles)
===================================================================
--- community-x86_64/xl2tpd.tmpfiles	                        (rev 0)
+++ community-x86_64/xl2tpd.tmpfiles	2014-01-12 22:03:07 UTC (rev 103870)
@@ -0,0 +1 @@
+d /var/run/xl2tpd 0755 root root -




More information about the arch-commits mailing list