[arch-commits] Commit in rp-pppoe/repos/extra-x86_64 (9 files)
Antonio Rojas
arojas at archlinux.org
Thu Jun 7 07:51:32 UTC 2018
Date: Thursday, June 7, 2018 @ 07:51:31
Author: arojas
Revision: 326190
archrelease: copy trunk to extra-x86_64
Added:
rp-pppoe/repos/extra-x86_64/PKGBUILD
(from rev 326189, rp-pppoe/trunk/PKGBUILD)
rp-pppoe/repos/extra-x86_64/adsl.service
(from rev 326189, rp-pppoe/trunk/adsl.service)
rp-pppoe/repos/extra-x86_64/kmode.patch
(from rev 326189, rp-pppoe/trunk/kmode.patch)
rp-pppoe/repos/extra-x86_64/rp-pppoe-linux-headers.patch
(from rev 326189, rp-pppoe/trunk/rp-pppoe-linux-headers.patch)
rp-pppoe/repos/extra-x86_64/rp-pppoe.install
(from rev 326189, rp-pppoe/trunk/rp-pppoe.install)
Deleted:
rp-pppoe/repos/extra-x86_64/PKGBUILD
rp-pppoe/repos/extra-x86_64/adsl.service
rp-pppoe/repos/extra-x86_64/kmode.patch
rp-pppoe/repos/extra-x86_64/rp-pppoe.install
------------------------------+
PKGBUILD | 88 ++++++++++++++++++++---------------------
adsl.service | 20 ++++-----
kmode.patch | 38 ++++++++---------
rp-pppoe-linux-headers.patch | 28 +++++++++++++
rp-pppoe.install | 24 +++++------
5 files changed, 114 insertions(+), 84 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-06-07 07:51:07 UTC (rev 326189)
+++ PKGBUILD 2018-06-07 07:51:31 UTC (rev 326190)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Daniel Isenmann <daniel at archlinux.org>
-# Contributor: orelien <aurelien.foret at wanadoo.fr>
-
-pkgname=rp-pppoe
-pkgver=3.12
-pkgrel=1
-pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client"
-arch=('i686' 'x86_64')
-url="http://www.roaringpenguin.com/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=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig}
- adsl.service
- kmode.patch)
-validpgpkeys=('FC2E9B645468698FD7B21655C1842E2A126F42E0') # Dianne Skoll
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver/src"
- patch -Np2 -i ../../kmode.patch
-}
-
-build() {
- cd "$srcdir/$pkgname-$pkgver/src"
- ./configure --prefix=/usr --sbindir=/usr/bin --enable-plugin
- make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so
-}
-
-package() {
- cd "$srcdir/$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"
-}
-md5sums=('216eb52b69062b92a64ee37fd71f4b66'
- 'SKIP'
- '926b00aa2a0c0d3a21970acde9695e47'
- '8df35e67558b6b4567d1ab24c9202898')
Copied: rp-pppoe/repos/extra-x86_64/PKGBUILD (from rev 326189, rp-pppoe/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-06-07 07:51:31 UTC (rev 326190)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Daniel Isenmann <daniel at archlinux.org>
+# Contributor: orelien <aurelien.foret at wanadoo.fr>
+
+pkgname=rp-pppoe
+pkgver=3.12
+pkgrel=3
+pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client"
+arch=('x86_64')
+url="https://www.roaringpenguin.com/products/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=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig}
+ adsl.service
+ kmode.patch rp-pppoe-linux-headers.patch)
+validpgpkeys=('FC2E9B645468698FD7B21655C1842E2A126F42E0') # Dianne Skoll
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p1 -i ../kmode.patch
+ patch -p1 -i ../rp-pppoe-linux-headers.patch # Gentoo patch
+}
+
+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"
+}
+md5sums=('216eb52b69062b92a64ee37fd71f4b66'
+ 'SKIP'
+ '926b00aa2a0c0d3a21970acde9695e47'
+ '8df35e67558b6b4567d1ab24c9202898'
+ 'e78dfb8f459784ff3e1cc4cd56b63a8c')
Deleted: adsl.service
===================================================================
--- adsl.service 2018-06-07 07:51:07 UTC (rev 326189)
+++ adsl.service 2018-06-07 07:51:31 UTC (rev 326190)
@@ -1,10 +0,0 @@
-[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/extra-x86_64/adsl.service (from rev 326189, rp-pppoe/trunk/adsl.service)
===================================================================
--- adsl.service (rev 0)
+++ adsl.service 2018-06-07 07:51:31 UTC (rev 326190)
@@ -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
Deleted: kmode.patch
===================================================================
--- kmode.patch 2018-06-07 07:51:07 UTC (rev 326189)
+++ kmode.patch 2018-06-07 07:51:31 UTC (rev 326190)
@@ -1,19 +0,0 @@
-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/extra-x86_64/kmode.patch (from rev 326189, rp-pppoe/trunk/kmode.patch)
===================================================================
--- kmode.patch (rev 0)
+++ kmode.patch 2018-06-07 07:51:31 UTC (rev 326190)
@@ -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/extra-x86_64/rp-pppoe-linux-headers.patch (from rev 326189, rp-pppoe/trunk/rp-pppoe-linux-headers.patch)
===================================================================
--- rp-pppoe-linux-headers.patch (rev 0)
+++ rp-pppoe-linux-headers.patch 2018-06-07 07:51:31 UTC (rev 326190)
@@ -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>
+
Deleted: rp-pppoe.install
===================================================================
--- rp-pppoe.install 2018-06-07 07:51:07 UTC (rev 326189)
+++ rp-pppoe.install 2018-06-07 07:51:31 UTC (rev 326190)
@@ -1,12 +0,0 @@
-#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
-}
Copied: rp-pppoe/repos/extra-x86_64/rp-pppoe.install (from rev 326189, rp-pppoe/trunk/rp-pppoe.install)
===================================================================
--- rp-pppoe.install (rev 0)
+++ rp-pppoe.install 2018-06-07 07:51:31 UTC (rev 326190)
@@ -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
+}
More information about the arch-commits
mailing list