Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	extra/avidemux/PKGBUILD
	extra/kdesdk/PKGBUILD
	extra/swh-plugins/PKGBUILD
	kde-unstable/kdesdk/PKGBUILD
	multilib/nspluginwrapper/PKGBUILD

4 files changed, 216 insertions, 0 deletions

diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD
new file mode 100644
index 000000000..9607756d8
--- /dev/null
+++ b/libre/rp-pppoe-libre/PKGBUILD
@@ -0,0 +1,59 @@
+# $Id: PKGBUILD 119995 2011-04-18 07:09:47Z daniel $
+# Maintainer: Daniel Isenmann <daniel@archlinux.org>
+# Contributor: orelien <aurelien.foret@wanadoo.fr>
+
+pkgname=rp-pppoe-libre
+pkgver=3.10
+pkgrel=6
+pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client. Unfree software recommendation removed."
+arch=('i686' 'x86_64')
+url="http://www.roaringpenguin.com/pppoe/"
+license=('GPL')
+depends=('ppp>=2.4.5' 'sh')
+options=('!makeflags')
+backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq etc/ppp/pppoe-server-options)
+source=(http://repo.parabolagnulinux.org/other/$pkgname-$pkgver.tar.gz adsl
+        $pkgname.patch)
+install=rp-pppoe.install
+provides=("rp-pppoe=$pkgver")
+replaces=('rp-pppoe')
+conflicts=('rp-pppoe')
+
+mksource() {
+    wget http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz \
+         -O - | tar xzf -
+
+    pushd rp-pppoe-$pkgver >/dev/null
+
+    patch -Np1 -i ../rp-pppoe-libre.patch
+
+    popd >/dev/null
+
+    mv -v rp-pppoe-$pkgver $pkgname-$pkgver
+
+    tar czvf $pkgname-$pkgver.tar.gz $pkgname-$pkgver/
+}
+
+build() {
+  cd $srcdir/$pkgname-$pkgver/src
+  ./configure --prefix=/usr --enable-plugin
+  make PLUGIN_DIR="/usr/lib/rp-pppoe" || return 1
+}
+
+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
+}
+md5sums=('2c4a678fa684269ff4579bb639674198'
+         'adace1ad441aa88dcb3db52fb7f9c97f'
+         '9f0d49c3a550c5ad76bb70d65c9d97b2')
diff --git a/libre/rp-pppoe-libre/adsl b/libre/rp-pppoe-libre/adsl
new file mode 100644
index 000000000..33bd91839
--- /dev/null
+++ b/libre/rp-pppoe-libre/adsl
@@ -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
diff --git a/libre/rp-pppoe-libre/rp-pppoe-libre.patch b/libre/rp-pppoe-libre/rp-pppoe-libre.patch
new file mode 100644
index 000000000..4f2302496
--- /dev/null
+++ b/libre/rp-pppoe-libre/rp-pppoe-libre.patch
@@ -0,0 +1,110 @@
+diff -rauNp rp-pppoe-3.10/rp-pppoe.spec rp-pppoe-3.10-libre//rp-pppoe.spec
+--- rp-pppoe-3.10/rp-pppoe.spec	2008-06-30 11:00:41.000000000 -0300
++++ rp-pppoe-3.10-libre//rp-pppoe.spec	2011-06-05 21:03:06.000000000 -0300
+@@ -55,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT
+ 
+ %files
+ %defattr(-,root,root)
+-%doc doc/CHANGES doc/HOW-TO-CONNECT doc/LICENSE doc/KERNEL-MODE-PPPOE README SERVPOET
++%doc doc/CHANGES doc/HOW-TO-CONNECT doc/LICENSE doc/KERNEL-MODE-PPPOE README
+ %config(noreplace) /etc/ppp/pppoe.conf
+ %config(noreplace) /etc/ppp/pppoe-server-options
+ %config(noreplace) /etc/ppp/firewall-masq
+diff -rauNp rp-pppoe-3.10/SERVPOET rp-pppoe-3.10-libre//SERVPOET
+--- rp-pppoe-3.10/SERVPOET	2008-06-30 11:00:41.000000000 -0300
++++ rp-pppoe-3.10-libre//SERVPOET	1969-12-31 21:00:00.000000000 -0300
+@@ -1,18 +0,0 @@
+-# LIC: GPL
+-
+-ServPoET
+---------
+-
+-ServPoET is a commercial version of the PPPoE server.  While everything
+-you received in this package is licensed under the GNU General Public
+-License, ServPoET is not free software and is licensed under a traditional
+-commercial license.
+-
+-ServPoET features RADIUS support, support for different realms,
+-real-time server status reporting and a friendly curses-based GUI for
+-administration.  For information on ServPoET:
+-
+-Contact Fine Point Technologies, Inc.  (http://www.finepoint.com/)
+-
+---
+-David F. Skoll <dfs@roaringpenguin.com>
+diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in
+--- rp-pppoe-3.10/src/Makefile.in	2008-06-30 11:00:42.000000000 -0300
++++ rp-pppoe-3.10-libre//src/Makefile.in	2011-06-05 21:03:51.000000000 -0300
+@@ -44,9 +44,6 @@ PPPOE_RELAY=@PPPOE_RELAY@
+ PPPOE_PATH=$(sbindir)/pppoe
+ PPPD_PATH=@PPPD@
+ 
+-# Include ServPoET version if we're building for ServPoET
+-@LIC_MAKEFILE_INCLUDE@
+-
+ # Kernel-mode plugin gets installed here.
+ PLUGIN_DIR=/etc/ppp/plugins
+ PLUGIN_PATH=$(PLUGIN_DIR)/rp-pppoe.so
+@@ -151,7 +148,6 @@ install: all
+ 	$(install) -m 644 ../doc/HOW-TO-CONNECT $(DESTDIR)$(docdir)
+ 	$(install) -m 644 ../doc/LICENSE $(DESTDIR)$(docdir)
+ 	$(install) -m 644 ../README $(DESTDIR)$(docdir)
+-	$(install) -m 644 ../SERVPOET $(DESTDIR)$(docdir)
+ 	$(install) -m 644 ../configs/pap-secrets $(DESTDIR)$(docdir)
+ 	-mkdir -p $(DESTDIR)$(mandir)/man8
+ 	for i in $(TARGETS) ; do \
+@@ -209,25 +205,15 @@ install: all
+ 	@echo ""
+ 	@echo "Type 'pppoe-setup' to configure the software."
+ 
+-servpoet-tgz: distro-servpoet
+-	cd .. && tar cvf servpoet-$(VERSION)$(BETA).tar servpoet-$(VERSION)$(BETA)
+-	gzip -f -v -9 ../servpoet-$(VERSION)$(BETA).tar
+-	rm -rf ../servpoet-$(VERSION)$(BETA)
+-
+ tgz: distro
+ 	cd .. && tar cvf rp-pppoe-$(VERSION)$(BETA).tar rp-pppoe-$(VERSION)$(BETA)
+ 	gzip -f -v -9 ../rp-pppoe-$(VERSION)$(BETA).tar
+ 	rm -rf ../rp-pppoe-$(VERSION)$(BETA)
+ 
+-distro-servpoet: distro
+-	cp ../servpoet.spec ../rp-pppoe-$(VERSION)$(BETA)
+-	$(MAKE) -C licensed-only distro VERSION=$(VERSION) BETA=$(BETA)
+-	mv ../rp-pppoe-$(VERSION)$(BETA) ../servpoet-$(VERSION)$(BETA)
+-
+ distro:
+ 	rm -rf ../rp-pppoe-$(VERSION)$(BETA)
+ 	mkdir ../rp-pppoe-$(VERSION)$(BETA)
+-	for i in README SERVPOET go go-gui rp-pppoe.spec ; do \
++	for i in README go go-gui rp-pppoe.spec ; do \
+ 		cp ../$$i ../rp-pppoe-$(VERSION)$(BETA) || exit 1; \
+ 	done
+ 	mkdir ../rp-pppoe-$(VERSION)$(BETA)/gui
+@@ -282,10 +268,6 @@ rpms: tgz
+ 		/usr/src/redhat/RPMS/i386/rp-pppoe-$(VERSION)-1.i386.rpm \
+ 		/usr/src/redhat/RPMS/i386/rp-pppoe-gui-$(VERSION)-1.i386.rpm
+ 
+-servpoet-rpms: servpoet-tgz
+-	cp ../servpoet-$(VERSION).tar.gz /usr/src/redhat/SOURCES
+-	cd .. && rpm -ba servpoet.spec
+-
+ clean:
+ 	rm -f *.o pppoe pppoe-sniff pppoe-server core rp-pppoe.so plugin/*.o plugin/libplugin.a *~
+ 	test -f licensed-only/Makefile && $(MAKE) -C licensed-only clean || true
+@@ -300,15 +282,13 @@ distclean: clean
+ update-version:
+ 	sed -e 's/^Version: .*$$/Version: $(VERSION)/' ../rp-pppoe.spec > ../rp-pppoe.spec.new && mv ../rp-pppoe.spec.new ../rp-pppoe.spec
+ 	sed -e 's+^Source: .*$$+Source: http://www.roaringpenguin.com/pppoe/rp-pppoe-$(VERSION).tar.gz+' ../rp-pppoe.spec > ../rp-pppoe.spec.new && mv ../rp-pppoe.spec.new ../rp-pppoe.spec
+-	test -f ../servpoet.spec && sed -e 's/^Version: .*$$/Version: $(VERSION)/' ../servpoet.spec > ../servpoet.spec.new && mv ../servpoet.spec.new ../servpoet.spec || true
+-	test -f ../servpoet.spec && sed -e 's+^Source: .*$$+Source: http://www.roaringpenguin.com/pppoe/servpoet-$(VERSION).tar.gz+' ../servpoet.spec > ../servpoet.spec.new && mv ../servpoet.spec.new ../servpoet.spec || true
+ 
+ # Convenience target for David!  Don't try to use this one.
+ km:
+ 	./configure --enable-plugin=/home/dfs/Archive/PPP/ppp-2.4.0.pppoe4-patched-dfs
+ 
+ licensed-only:
+-	$(MAKE) -C licensed-only all VERSION=$(VERSION) SERVPOET_VERSION=$(SERVPOET_VERSION)
++	$(MAKE) -C licensed-only all VERSION=$(VERSION) 
+ 
+ l2tp: libevent/libevent.a
+ 	$(MAKE) -C l2tp all
diff --git a/libre/rp-pppoe-libre/rp-pppoe.install b/libre/rp-pppoe-libre/rp-pppoe.install
new file mode 100644
index 000000000..1d4bccce2
--- /dev/null
+++ b/libre/rp-pppoe-libre/rp-pppoe.install
@@ -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
+}