[arch-commits] Commit in rp-pppoe/repos (6 files)

[Felix Yan]

    Date: Saturday, December 29, 2018 @ 21:21:05
  Author: felixonmars
Revision: 342785

archrelease: copy trunk to testing-x86_64

Added:
  rp-pppoe/repos/testing-x86_64/
  rp-pppoe/repos/testing-x86_64/PKGBUILD
    (from rev 342784, rp-pppoe/trunk/PKGBUILD)
  rp-pppoe/repos/testing-x86_64/adsl.service
    (from rev 342784, rp-pppoe/trunk/adsl.service)
  rp-pppoe/repos/testing-x86_64/kmode.patch
    (from rev 342784, rp-pppoe/trunk/kmode.patch)
  rp-pppoe/repos/testing-x86_64/rp-pppoe-linux-headers.patch
    (from rev 342784, rp-pppoe/trunk/rp-pppoe-linux-headers.patch)
  rp-pppoe/repos/testing-x86_64/rp-pppoe.install
    (from rev 342784, rp-pppoe/trunk/rp-pppoe.install)

------------------------------+
 PKGBUILD                     |   36 ++++++++++++++++++++++++++++++++++++
 adsl.service                 |   10 ++++++++++
 kmode.patch                  |   19 +++++++++++++++++++
 rp-pppoe-linux-headers.patch |   28 ++++++++++++++++++++++++++++
 rp-pppoe.install             |   12 ++++++++++++
 5 files changed, 105 insertions(+)

Copied: rp-pppoe/repos/testing-x86_64/PKGBUILD (from rev 342784, rp-pppoe/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2018-12-29 21:21:05 UTC (rev 342785)
@@ -0,0 +1,36 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Daniel Isenmann <daniel at archlinux.org>
+# Contributor: orelien <aurelien.foret at wanadoo.fr>
+
+pkgname=rp-pppoe
+pkgver=3.13
+pkgrel=1
+pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client"
+arch=('x86_64')
+url="https://dianne.skoll.ca/projects/rp-pppoe"
+license=('GPL')
+depends=('ppp=2.4.7' 'sh' 'net-tools')
+backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq 
+        etc/ppp/pppoe-server-options)
+options=('!makeflags')
+install=rp-pppoe.install
+source=(https://dianne.skoll.ca/projects/rp-pppoe/download/rp-pppoe-$pkgver.tar.gz{,.sig} 
+       adsl.service)
+validpgpkeys=('FC2E9B645468698FD7B21655C1842E2A126F42E0') # Dianne Skoll
+sha512sums=('e29ddc39252a0e71d509096e275f6f195f86a5871052dd558e8fb174d13086b1c601e6652f45619279a1eb2fbda96ba0ec85dea9edb27459af56ded4a52b5f36'
+            'SKIP'
+            '75fdb55b872e6388053aa0c1ba0b98ab9eda6b6f59a7452843cff8de5a68276be3f48dbd9a6324917254d4fe0d1b2d7442f7a9bbfa1355b6f500db13c9409089')
+
+build() {
+  cd $pkgname-$pkgver/src
+  ./configure --prefix=/usr --sbindir=/usr/bin --enable-plugin
+  make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so
+}
+
+package() {
+  cd $pkgname-$pkgver/src
+  make PLUGIN_DIR="/usr/lib/rp-pppoe" DESTDIR="$pkgdir" install
+
+  #install -Dm755 "$srcdir/adsl" "$pkgdir/etc/rc.d/adsl"
+  install -Dm644 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service"
+}

Copied: rp-pppoe/repos/testing-x86_64/adsl.service (from rev 342784, rp-pppoe/trunk/adsl.service)
===================================================================
--- testing-x86_64/adsl.service	                        (rev 0)
+++ testing-x86_64/adsl.service	2018-12-29 21:21:05 UTC (rev 342785)
@@ -0,0 +1,10 @@
+[Unit]
+Description=ADSL Daemon
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/pppoe-start
+ExecStop=/usr/bin/pppoe-stop
+
+[Install]
+WantedBy=multi-user.target

Copied: rp-pppoe/repos/testing-x86_64/kmode.patch (from rev 342784, rp-pppoe/trunk/kmode.patch)
===================================================================
--- testing-x86_64/kmode.patch	                        (rev 0)
+++ testing-x86_64/kmode.patch	2018-12-29 21:21:05 UTC (rev 342785)
@@ -0,0 +1,19 @@
+diff -up rp-pppoe-3.11/src/configure.orig rp-pppoe-3.11/src/configure
+--- rp-pppoe-3.11/src/configure.orig	2012-08-17 12:31:25.000000000 -0600
++++ rp-pppoe-3.11/src/configure	2013-02-11 14:23:05.000000000 -0700
+@@ -3709,6 +3709,7 @@ do :
+ #include<net/ethernet.h>
+ #include<linux/if.h>
+ #include<linux/in.h>
++#include<linux/in6.h>
+ 
+ "
+ if test "x$ac_cv_header_linux_if_pppox_h" = x""yes; then :
+@@ -4559,6 +4559,7 @@ else
+ #include <net/ethernet.h>
+ #include <linux/if.h>
+ #include <netinet/in.h>
++#include <linux/in6.h>
+ #include <linux/if_pppox.h>
+ int main()
+ {

Copied: rp-pppoe/repos/testing-x86_64/rp-pppoe-linux-headers.patch (from rev 342784, rp-pppoe/trunk/rp-pppoe-linux-headers.patch)
===================================================================
--- testing-x86_64/rp-pppoe-linux-headers.patch	                        (rev 0)
+++ testing-x86_64/rp-pppoe-linux-headers.patch	2018-12-29 21:21:05 UTC (rev 342785)
@@ -0,0 +1,28 @@
+the linux headers have started adding shims to not define types or structs
+when C lib headers are active, but in order to work, the C lib headers have
+to be included before the linux headers.
+
+move the netinet/in.h include up above the linux/ includes.
+
+Mike Frysinger <vapier at gentoo.org>
+
+--- a/src/pppoe.h
++++ b/src/pppoe.h
+@@ -47,6 +47,8 @@
+ #include <sys/socket.h>
+ #endif
+ 
++#include <netinet/in.h>
++
+ /* Ugly header files on some Linux boxes... */
+ #if defined(HAVE_LINUX_IF_H)
+ #include <linux/if.h>
+@@ -84,8 +86,6 @@ typedef unsigned long UINT32_t;
+ #include <linux/if_ether.h>
+ #endif
+ 
+-#include <netinet/in.h>
+-
+ #ifdef HAVE_NETINET_IF_ETHER_H
+ #include <sys/types.h>
+ 

Copied: rp-pppoe/repos/testing-x86_64/rp-pppoe.install (from rev 342784, rp-pppoe/trunk/rp-pppoe.install)
===================================================================
--- testing-x86_64/rp-pppoe.install	                        (rev 0)
+++ testing-x86_64/rp-pppoe.install	2018-12-29 21:21:05 UTC (rev 342785)
@@ -0,0 +1,12 @@
+#arg 1:  the new package version
+post_install() {
+echo ">>> The kernel-mode plugin has a new place."
+echo ">>> It's now located under /usr/lib/rp-pppoe/rp-pppoe.so"
+echo ">>> Change LINUX_PLUGIN to the new path in your /etc/ppp/pppoe.conf"
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  post_install $1
+}