libre/rp-pppoe: updated to 3.13

1 files changed, 21 insertions, 24 deletions

diff --git a/libre/rp-pppoe/PKGBUILD b/libre/rp-pppoe/PKGBUILD
index 7931e0d54..289e9c761 100644
--- a/libre/rp-pppoe/PKGBUILD
+++ b/libre/rp-pppoe/PKGBUILD
@@ -1,39 +1,42 @@
-# $Id: PKGBUILD 257681 2016-01-09 09:49:01Z arojas $
-# Maintainer (Arch): Daniel Isenmann <daniel@archlinux.org>
+# Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
+# Contributor (Arch): Daniel Isenmann <daniel@archlinux.org>
 # Contributor (Arch): orelien <aurelien.foret@wanadoo.fr>
 # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
+# parabola changes and rationale:
+#   - remove nonfree software recommendation (ServPoET)
+
 pkgname=rp-pppoe
-pkgver=3.12
-pkgrel=3.parabola1
-pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client, without nonfree ServPoET recommendation"
-arch=('i686' 'x86_64' 'armv7h')
-url="https://www.roaringpenguin.com/products/pppoe"
+pkgver=3.13
+pkgrel=1
+pkgrel+=.parabola1
+pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client"
+pkgdesc+=", without nonfree ServPoET recommendation"
+arch=('x86_64')
+arch+=('i686' 'armv7h')
+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')
-replaces=('rp-pppoe-libre')
-conflicts=('rp-pppoe-libre')
 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
-       libre.patch)
+source=(https://dianne.skoll.ca/projects/rp-pppoe/download/rp-pppoe-$pkgver.tar.gz{,.sig} 
+       adsl.service)
+source+=(libre.patch)
 validpgpkeys=('FC2E9B645468698FD7B21655C1842E2A126F42E0') # Dianne Skoll
+sha512sums=('e29ddc39252a0e71d509096e275f6f195f86a5871052dd558e8fb174d13086b1c601e6652f45619279a1eb2fbda96ba0ec85dea9edb27459af56ded4a52b5f36'
+            'SKIP'
+            '75fdb55b872e6388053aa0c1ba0b98ab9eda6b6f59a7452843cff8de5a68276be3f48dbd9a6324917254d4fe0d1b2d7442f7a9bbfa1355b6f500db13c9409089'
+            'eaaea24d2bd3f9b2a16f20e58c5751523f4c512a3f2e83277e80a2c6e6c61b1d650792b87b0d42dac1437553331fbe429f39c6e0a7fa68591f6ccc81f146996c')
 
 prepare() {
   cd $pkgname-$pkgver
-  
+
   ## remove nonfree software recommendation (ServPoET)
   rm -v SERVPOET
   patch -Np1 -i ../libre.patch
-
-  patch -Np1 -i ../kmode.patch
-  patch -Np1 -i ../rp-pppoe-linux-headers.patch
 }
 
 build() {
@@ -49,9 +52,3 @@ package() {
   #install -Dm755 "$srcdir/adsl" "$pkgdir/etc/rc.d/adsl"
   install -Dm644 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service"
 }
-sha256sums=('00794e04031546b0e9b8cf286f2a6d1ccfc4a621b2a3abb2d7ef2a7ab7cc86c2'
-            'SKIP'
-            '6593ca054834a6d3bc046456b127ba3652b6203e287ef0f6a57f8db27059f6d2'
-            'c690186ba48a3ee78b87e655801a8ac5bb1b21a67ded9aa7942eb3514e98505f'
-            '99761e5f84535d02e2004000567cab009ef49ed96f0534a5937e63d15dbed184'
-            'd3810c2c8d6f4b606a073922a6afdf0eb6e38441de68e918f198afa6e020150e')