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

Eric Bélanger eric at archlinux.org
Mon Oct 1 18:24:40 UTC 2012


    Date: Monday, October 1, 2012 @ 14:24:40
  Author: eric
Revision: 167376

db-move: moved rp-pppoe from [testing] to [core] (i686, x86_64)

Added:
  rp-pppoe/repos/core-i686/PKGBUILD
    (from rev 167375, rp-pppoe/repos/testing-i686/PKGBUILD)
  rp-pppoe/repos/core-i686/adsl
    (from rev 167375, rp-pppoe/repos/testing-i686/adsl)
  rp-pppoe/repos/core-i686/adsl.service
    (from rev 167375, rp-pppoe/repos/testing-i686/adsl.service)
  rp-pppoe/repos/core-i686/rp-pppoe.install
    (from rev 167375, rp-pppoe/repos/testing-i686/rp-pppoe.install)
  rp-pppoe/repos/core-x86_64/PKGBUILD
    (from rev 167375, rp-pppoe/repos/testing-x86_64/PKGBUILD)
  rp-pppoe/repos/core-x86_64/adsl
    (from rev 167375, rp-pppoe/repos/testing-x86_64/adsl)
  rp-pppoe/repos/core-x86_64/adsl.service
    (from rev 167375, rp-pppoe/repos/testing-x86_64/adsl.service)
  rp-pppoe/repos/core-x86_64/rp-pppoe.install
    (from rev 167375, rp-pppoe/repos/testing-x86_64/rp-pppoe.install)
Deleted:
  rp-pppoe/repos/core-i686/PKGBUILD
  rp-pppoe/repos/core-i686/adsl
  rp-pppoe/repos/core-i686/rp-pppoe.install
  rp-pppoe/repos/core-x86_64/PKGBUILD
  rp-pppoe/repos/core-x86_64/adsl
  rp-pppoe/repos/core-x86_64/rp-pppoe.install
  rp-pppoe/repos/testing-i686/
  rp-pppoe/repos/testing-x86_64/

------------------------------+
 core-i686/PKGBUILD           |   75 +++++++++++++++++++----------------------
 core-i686/adsl               |   70 +++++++++++++++++++-------------------
 core-i686/adsl.service       |   10 +++++
 core-i686/rp-pppoe.install   |   24 ++++++-------
 core-x86_64/PKGBUILD         |   75 +++++++++++++++++++----------------------
 core-x86_64/adsl             |   70 +++++++++++++++++++-------------------
 core-x86_64/adsl.service     |   10 +++++
 core-x86_64/rp-pppoe.install |   24 ++++++-------
 8 files changed, 186 insertions(+), 172 deletions(-)

Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD	2012-10-01 18:09:59 UTC (rev 167375)
+++ core-i686/PKGBUILD	2012-10-01 18:24:40 UTC (rev 167376)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Daniel Isenmann <daniel at archlinux.org>
-# Contributor: orelien <aurelien.foret at wanadoo.fr>
-
-pkgname=rp-pppoe
-pkgver=3.10
-pkgrel=7
-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.5' 'sh' 'net-tools')
-options=('!makeflags')
-backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq etc/ppp/pppoe-server-options)
-source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz adsl)
-install=rp-pppoe.install
-md5sums=('d58a13cc4185bca6121a606ff456dec0'
-         'adace1ad441aa88dcb3db52fb7f9c97f')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver/src
-  ./configure --prefix=/usr --enable-plugin
-  make PLUGIN_DIR="/usr/lib/rp-pppoe"
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver/src
-  make DESTDIR=$pkgdir install
-
-  #moving .so files to /usr/lib according to FS#13876
-  mkdir -p ${pkgdir}/usr/lib/rp-pppoe
-  mv ${pkgdir}/etc/ppp/plugins/rp-pppoe.so ${pkgdir}/usr/lib/rp-pppoe/
-  #not necessary after moving the plugin
-  rm -rf ${pkgdir}/etc/ppp/plugins
-  #changing config to the new path
-  #sed -i 's/LINUX_PLUGIN=/LINUX_PLUGIN=\/usr\/lib\/rp-pppoe\/rp-pppoe.so/g' ${pkgdir}/etc/ppp/pppoe.conf
-
-  install -Dm755 $srcdir/adsl $pkgdir/etc/rc.d/adsl
-}

Copied: rp-pppoe/repos/core-i686/PKGBUILD (from rev 167375, rp-pppoe/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD	                        (rev 0)
+++ core-i686/PKGBUILD	2012-10-01 18:24:40 UTC (rev 167376)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Daniel Isenmann <daniel at archlinux.org>
+# Contributor: orelien <aurelien.foret at wanadoo.fr>
+
+pkgname=rp-pppoe
+pkgver=3.11
+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.5' '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 adsl.service)
+md5sums=('13b5900c56bd602df6cc526e5e520722'
+         '8fc724aa146dba52ef7b3fbe5b8784c6'
+         'adace1ad441aa88dcb3db52fb7f9c97f'
+         'af234125f956f3a356ab0d0fcaa9e8a2')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver/src"
+  ./configure --prefix=/usr --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 -Dm755 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service"
+}

Deleted: core-i686/adsl
===================================================================
--- core-i686/adsl	2012-10-01 18:09:59 UTC (rev 167375)
+++ core-i686/adsl	2012-10-01 18:24:40 UTC (rev 167376)
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting ADSL Connection"
-    /usr/sbin/pppoe-start &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon adsl
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping ADSL Connection"
-    /usr/sbin/pppoe-stop &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon adsl
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0

Copied: rp-pppoe/repos/core-i686/adsl (from rev 167375, rp-pppoe/repos/testing-i686/adsl)
===================================================================
--- core-i686/adsl	                        (rev 0)
+++ core-i686/adsl	2012-10-01 18:24:40 UTC (rev 167376)
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+  start)
+    stat_busy "Starting ADSL Connection"
+    /usr/sbin/pppoe-start &>/dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon adsl
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping ADSL Connection"
+    /usr/sbin/pppoe-stop &>/dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon adsl
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0

Copied: rp-pppoe/repos/core-i686/adsl.service (from rev 167375, rp-pppoe/repos/testing-i686/adsl.service)
===================================================================
--- core-i686/adsl.service	                        (rev 0)
+++ core-i686/adsl.service	2012-10-01 18:24:40 UTC (rev 167376)
@@ -0,0 +1,10 @@
+[Unit]
+Description=ADSL Deamon
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/pppoe-start
+ExecStop=/usr/sbin/pppoe-stop
+
+[Install]
+WantedBy=multi-user.target

Deleted: core-i686/rp-pppoe.install
===================================================================
--- core-i686/rp-pppoe.install	2012-10-01 18:09:59 UTC (rev 167375)
+++ core-i686/rp-pppoe.install	2012-10-01 18:24:40 UTC (rev 167376)
@@ -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/core-i686/rp-pppoe.install (from rev 167375, rp-pppoe/repos/testing-i686/rp-pppoe.install)
===================================================================
--- core-i686/rp-pppoe.install	                        (rev 0)
+++ core-i686/rp-pppoe.install	2012-10-01 18:24:40 UTC (rev 167376)
@@ -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
+}

Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD	2012-10-01 18:09:59 UTC (rev 167375)
+++ core-x86_64/PKGBUILD	2012-10-01 18:24:40 UTC (rev 167376)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Daniel Isenmann <daniel at archlinux.org>
-# Contributor: orelien <aurelien.foret at wanadoo.fr>
-
-pkgname=rp-pppoe
-pkgver=3.10
-pkgrel=7
-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.5' 'sh' 'net-tools')
-options=('!makeflags')
-backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq etc/ppp/pppoe-server-options)
-source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz adsl)
-install=rp-pppoe.install
-md5sums=('d58a13cc4185bca6121a606ff456dec0'
-         'adace1ad441aa88dcb3db52fb7f9c97f')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver/src
-  ./configure --prefix=/usr --enable-plugin
-  make PLUGIN_DIR="/usr/lib/rp-pppoe"
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver/src
-  make DESTDIR=$pkgdir install
-
-  #moving .so files to /usr/lib according to FS#13876
-  mkdir -p ${pkgdir}/usr/lib/rp-pppoe
-  mv ${pkgdir}/etc/ppp/plugins/rp-pppoe.so ${pkgdir}/usr/lib/rp-pppoe/
-  #not necessary after moving the plugin
-  rm -rf ${pkgdir}/etc/ppp/plugins
-  #changing config to the new path
-  #sed -i 's/LINUX_PLUGIN=/LINUX_PLUGIN=\/usr\/lib\/rp-pppoe\/rp-pppoe.so/g' ${pkgdir}/etc/ppp/pppoe.conf
-
-  install -Dm755 $srcdir/adsl $pkgdir/etc/rc.d/adsl
-}

Copied: rp-pppoe/repos/core-x86_64/PKGBUILD (from rev 167375, rp-pppoe/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD	                        (rev 0)
+++ core-x86_64/PKGBUILD	2012-10-01 18:24:40 UTC (rev 167376)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Daniel Isenmann <daniel at archlinux.org>
+# Contributor: orelien <aurelien.foret at wanadoo.fr>
+
+pkgname=rp-pppoe
+pkgver=3.11
+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.5' '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 adsl.service)
+md5sums=('13b5900c56bd602df6cc526e5e520722'
+         '8fc724aa146dba52ef7b3fbe5b8784c6'
+         'adace1ad441aa88dcb3db52fb7f9c97f'
+         'af234125f956f3a356ab0d0fcaa9e8a2')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver/src"
+  ./configure --prefix=/usr --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 -Dm755 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service"
+}

Deleted: core-x86_64/adsl
===================================================================
--- core-x86_64/adsl	2012-10-01 18:09:59 UTC (rev 167375)
+++ core-x86_64/adsl	2012-10-01 18:24:40 UTC (rev 167376)
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting ADSL Connection"
-    /usr/sbin/pppoe-start &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon adsl
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping ADSL Connection"
-    /usr/sbin/pppoe-stop &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon adsl
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0

Copied: rp-pppoe/repos/core-x86_64/adsl (from rev 167375, rp-pppoe/repos/testing-x86_64/adsl)
===================================================================
--- core-x86_64/adsl	                        (rev 0)
+++ core-x86_64/adsl	2012-10-01 18:24:40 UTC (rev 167376)
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+  start)
+    stat_busy "Starting ADSL Connection"
+    /usr/sbin/pppoe-start &>/dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon adsl
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping ADSL Connection"
+    /usr/sbin/pppoe-stop &>/dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon adsl
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0

Copied: rp-pppoe/repos/core-x86_64/adsl.service (from rev 167375, rp-pppoe/repos/testing-x86_64/adsl.service)
===================================================================
--- core-x86_64/adsl.service	                        (rev 0)
+++ core-x86_64/adsl.service	2012-10-01 18:24:40 UTC (rev 167376)
@@ -0,0 +1,10 @@
+[Unit]
+Description=ADSL Deamon
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/pppoe-start
+ExecStop=/usr/sbin/pppoe-stop
+
+[Install]
+WantedBy=multi-user.target

Deleted: core-x86_64/rp-pppoe.install
===================================================================
--- core-x86_64/rp-pppoe.install	2012-10-01 18:09:59 UTC (rev 167375)
+++ core-x86_64/rp-pppoe.install	2012-10-01 18:24:40 UTC (rev 167376)
@@ -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/core-x86_64/rp-pppoe.install (from rev 167375, rp-pppoe/repos/testing-x86_64/rp-pppoe.install)
===================================================================
--- core-x86_64/rp-pppoe.install	                        (rev 0)
+++ core-x86_64/rp-pppoe.install	2012-10-01 18:24:40 UTC (rev 167376)
@@ -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