summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/kdebase-konqueror-libre/PKGBUILD4
-rw-r--r--libre/kdebase-runtime-libre/PKGBUILD4
-rw-r--r--libre/kdelibs-libre/PKGBUILD6
-rw-r--r--libre/kdenetwork-kopete-libre/PKGBUILD6
-rw-r--r--libre/kdeutils-ark-libre/PKGBUILD4
-rw-r--r--libre/kile-libre/PKGBUILD6
-rw-r--r--libre/liferea-libre/PKGBUILD6
-rw-r--r--libre/linux-libre-tools/PKGBUILD14
-rw-r--r--libre/linux-libre-tools/cpupower.conf5
-rw-r--r--libre/linux-libre-tools/cpupower.rc1
-rw-r--r--libre/lirc-libre/PKGBUILD38
-rw-r--r--libre/lirc-libre/irexec.service11
-rw-r--r--libre/lirc-libre/lirc-utils.install7
-rw-r--r--libre/lirc-libre/lirc.service11
-rw-r--r--libre/lirc-libre/lirc.tmpfiles1
-rw-r--r--libre/lirc-libre/lircm.service11
-rw-r--r--libre/rp-pppoe-libre/PKGBUILD63
-rw-r--r--libre/rp-pppoe-libre/adsl.service10
-rw-r--r--libre/rp-pppoe-libre/rp-pppoe-libre.patch34
19 files changed, 147 insertions, 95 deletions
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index f69e561be..17fafa08c 100644
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -6,7 +6,7 @@
_pkgname='kdebase-konqueror'
pkgname='kdebase-konqueror-libre'
-pkgver=4.9.1
+pkgver=4.9.2
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://kde.org/applications/internet/konqueror/"
@@ -15,7 +15,7 @@ groups=('kde' 'kdebase')
makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml')
source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
"konq-about-fsdg.diff")
-sha1sums=('9014332fd6fb18999c8290a3cbb498793d8caa2f'
+sha1sums=('8b5a45cfd77e7e67a57c06cdbf387692e8547b66'
'f41541371414dcbe5e76687835e648112b3ff364')
pkgdesc='KDE File Manager & Web Browser'
depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD
index ba6273763..bcf1c0922 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -5,7 +5,7 @@
_pkgname=kdebase-runtime
pkgname=kdebase-runtime-libre
-pkgver=4.9.1
+pkgver=4.9.2
pkgrel=1
pkgdesc="Plugins and applications necessary for the running of KDE applications (without non-privacy search providers)"
arch=('i686' 'x86_64' 'mips64el')
@@ -25,7 +25,7 @@ provides=("${_pkgname}=${pkgver}")
install="${_pkgname}.install"
source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"
'duckduckgo_lite.desktop')
-sha1sums=('4b67e0f12617c478ee29546da4d98f605cd35dec'
+sha1sums=('97c811e404322e520f62320c919eecd73db8c5dd'
'265d4ca95c3a022b5f6f1d5daea6f8e3a25dee85')
build() {
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index e5fdb1ea6..ce44c6bcd 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 165921 2012-09-03 21:48:13Z andrea $
+# $Id: PKGBUILD 167425 2012-10-02 09:09:06Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
_pkgname=kdelibs
pkgname=kdelibs-libre
-pkgver=4.9.1
+pkgver=4.9.2
pkgrel=1
pkgdesc="KDE Core Libraries"
arch=('i686' 'x86_64' 'mips64el')
@@ -25,7 +25,7 @@ source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.
'kde-applications-menu.patch'
'use-pythondontwritebytecode.patch'
'khtml-fsdg.diff')
-sha1sums=('33fb26ec7735122b2bb084b79f8fcffb826c58f0'
+sha1sums=('e86ee16ac7c412b0f6abe3754cb372a45d41c71b'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
'bbacbbe2194f3961cd7557d98a9ddef158ca11aa'
'a1502a964081ad583a00cf90c56e74bf60121830')
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index 0721a4ed6..0ddb44e32 100644
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -5,8 +5,8 @@
pkgbase=kdenetwork
pkgname=('kdenetwork-kopete-libre')
-pkgver=4.9.1
-pkgrel=3
+pkgver=4.9.2
+pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
@@ -16,7 +16,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp'
'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn'
'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('22f8cde8b5617ba7e401d82b0669a06899b17320')
+sha1sums=('6779039e5354fae02cf7faa3442385b95befb430')
build() {
cd "${srcdir}"
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index a71990231..68954e29b 100644
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -4,7 +4,7 @@
_pkgname=kdeutils-ark
pkgname=kdeutils-ark-libre
-pkgver=4.9.1
+pkgver=4.9.2
pkgrel=1
pkgdesc='Archiving Tool'
url='http://kde.org/applications/utilities/ark/'
@@ -19,7 +19,7 @@ provides=("kdeutils-ark=$pkgver")
replaces=('kdeutils-ark')
conflicts=('kdeutils-ark')
source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz")
-sha1sums=('2f7d32b9f99913d14801b56f0c858eda128a7b91')
+sha1sums=('180ad836ebfc6bdc26d245e6bd27c2fc7a59918c')
build() {
cd "${srcdir}"
diff --git a/libre/kile-libre/PKGBUILD b/libre/kile-libre/PKGBUILD
index 2637c5ea4..a28bce338 100644
--- a/libre/kile-libre/PKGBUILD
+++ b/libre/kile-libre/PKGBUILD
@@ -2,11 +2,11 @@
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
_pkgname=kile
pkgname=kile-libre
-pkgver=2.1.2
+pkgver=2.1.3
pkgrel=1
pkgdesc="A user friendly TeX/LaTeX frontend for KDE"
arch=("i686" "x86_64" "mips64el")
@@ -20,7 +20,7 @@ provides=('kile')
install=${_pkgname}.install
source=("http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.bz2"
"no-acroread.patch")
-sha1sums=('238a8fde4fca00e06b314c13671ff53e2ac4845c'
+sha1sums=('1a80748d5f01f359b5e5c28140ec90691f0166c5'
'9bbe5d1b0e2a78b13667fcf4e5e21f801447f9d6')
build() {
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index c41112a07..70fba1db5 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -5,8 +5,8 @@
_pkgname=liferea
pkgname=liferea-libre
-pkgver=1.8.8
-pkgrel=1.2
+pkgver=1.8.9
+pkgrel=1
pkgdesc="A desktop news aggregator for online news feeds and weblogs"
arch=('i686' 'x86_64' 'mips64el')
url="http://liferea.sourceforge.net/"
@@ -20,7 +20,7 @@ options=('!libtool' '!emptydirs')
install=liferea.install
source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz
remove-non-free-suggestions.patch)
-sha1sums=('9dfbf5ff8bd91060bdea93d74c37a8a828a2edfe'
+sha1sums=('35452b46d987ba37d5a81ea3e4c0f7199c9c0403'
'0d68c567c3d37932a49709c58c37c3f138fd19cb')
build() {
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 802800fa0..d3154ac86 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -4,11 +4,11 @@
pkgbase=linux-libre-tools
pkgname=('perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre' 'usbip-libre')
-_basekernel=3.5
+_basekernel=3.6
#_sublevel=1
#pkgver=${_basekernel}.${_sublevel}
pkgver=${_basekernel}
-pkgrel=5
+pkgrel=1
license=('GPL2')
arch=('i686' 'x86_64' 'mips64el')
url='http://linux-libre.fsfla.org/'
@@ -32,9 +32,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'usbipd.conf'
'usbipd.rc'
'usbipd.service')
-md5sums=('2407fc9563a74acaf38aa0c06516eb1c'
- '18d5aa9e4c6bb23bb02bf65e155e0f0e'
- '1d9214637968b91706b6e616a100d44b'
+md5sums=('a2312edd0265b5b07bd4b50afae2b380'
+ '56883c159381ba89e50ab8ea65efec77'
+ '5fc1fcda4cef93f16e752b1931db23e3'
'c0d17b5295fe964623c772a2dd981771'
'2450e8ff41b30eb58d43b5fffbfde1f4'
'e8fac9c45a628015644b4150b139278a'
@@ -102,7 +102,7 @@ package_cpupower-libre() {
pkgdesc='Linux-libre kernel tool to examine and tune power saving related features of your processor'
backup=('etc/conf.d/cpupower')
depends=('bash' 'pciutils')
- replaces=('cpupower')
+ replaces=('cpupower' 'cpufrequtils')
conflicts=('cpupower' 'cpufrequtils')
provides=("cpupower=$pkgver")
@@ -152,4 +152,4 @@ package_usbip-libre() {
install -Dm 644 usbipd.service "$pkgdir/usr/lib/systemd/system/usbipd.service"
}
-# vim:set ts=2 sw=2 ft=sh et:
+# vim:set ts=2 sw=2 et:
diff --git a/libre/linux-libre-tools/cpupower.conf b/libre/linux-libre-tools/cpupower.conf
index f4e9cc4c8..b5c522ea1 100644
--- a/libre/linux-libre-tools/cpupower.conf
+++ b/libre/linux-libre-tools/cpupower.conf
@@ -8,10 +8,11 @@
#max_freq="3GHz"
# Specific frequency to be set.
-# Requires userspace governor to be available and loaded.
+# Requires userspace governor to be available.
+# Do not set governor field if you use this one.
#freq=
-# Utilizes cores in one processor package/socket first before processes are
+# Utilizes cores in one processor package/socket first before processes are
# scheduled to other processor packages/sockets.
# See man (1) CPUPOWER-SET for additional details.
#mc_scheduler=
diff --git a/libre/linux-libre-tools/cpupower.rc b/libre/linux-libre-tools/cpupower.rc
index 2c4441c4e..88edaf791 100644
--- a/libre/linux-libre-tools/cpupower.rc
+++ b/libre/linux-libre-tools/cpupower.rc
@@ -2,7 +2,6 @@
. /etc/rc.conf
. /etc/rc.d/functions
-. /etc/conf.d/${0##*/}
case "$1" in
start|restart)
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index bcb82132a..eea164fc3 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -6,7 +6,7 @@ _pkgbase=lirc
pkgbase=lirc-libre
pkgname=('lirc-libre' 'lirc-utils-libre')
pkgver=0.9.0
-pkgrel=27
+pkgrel=28
epoch=1
_extramodules=extramodules-3.5-LIBRE
arch=('i686' 'x86_64' 'mips64el')
@@ -20,18 +20,10 @@ source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar
lircd-handle-large-config.patch
lirc_atiusb-kfifo.patch
kernel-2.6.39.patch
- lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd)
-md5sums=('b232aef26f23fe33ea8305d276637086'
- '1cce37e18e3f6f46044abab29016d18f'
- 'b70cc9640505205446ec47b7d4779f38'
- '1f8b104a2365d9f93404b143f499059b'
- '087a7d102e1c96bf1179f38db2b0b237'
- '8d0e238dc0eda95e340fe570605da492'
- '85f7fdac55e5256967241864049bf5e9'
- '3deb02604b37811d41816e9b4385fcc3'
- '5b1f8c9cd788a39a6283f93302ce5c6e'
- 'f0c0ac930326168035f0c8e24357ae55'
- '69d099e6deedfa3c1ee2b6e82d9b8bfb')
+ lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd
+ lirc.service lircm.service irexec.service
+ lirc.tmpfiles
+ )
build() {
_kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
@@ -88,11 +80,16 @@ package_lirc-utils-libre() {
conflicts=('lirc-utils')
provides=("lirc-utils=$pkgver")
backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf')
+ install=lirc-utils.install
cd "${srcdir}/lirc-${pkgver}"
make DESTDIR="${pkgdir}" install
install -d "${pkgdir}/usr/share/lirc" "${pkgdir}/etc/rc.d"
cp "${srcdir}"/{lircd,lircmd,irexecd} "${pkgdir}/etc/rc.d"
+ install -D -m644 "${srcdir}"/lirc.service "${pkgdir}"/usr/lib/systemd/system/lirc.service
+ install -D -m644 "${srcdir}"/lircm.service "${pkgdir}"/usr/lib/systemd/system/lircm.service
+ install -D -m644 "${srcdir}"/irexec.service "${pkgdir}"/usr/lib/systemd/system/irexec.service
+ install -D -m644 "${srcdir}"/lirc.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/lirc.conf
cp -rp remotes "${pkgdir}/usr/share/lirc"
chmod -R go-w "${pkgdir}/usr/share/lirc/"
@@ -110,3 +107,18 @@ package_lirc-utils-libre() {
# remove built modules
rm -r "${pkgdir}/usr/lib/modules"
}
+md5sums=('b232aef26f23fe33ea8305d276637086'
+ '1cce37e18e3f6f46044abab29016d18f'
+ 'b70cc9640505205446ec47b7d4779f38'
+ '1f8b104a2365d9f93404b143f499059b'
+ '087a7d102e1c96bf1179f38db2b0b237'
+ '8d0e238dc0eda95e340fe570605da492'
+ '85f7fdac55e5256967241864049bf5e9'
+ '3deb02604b37811d41816e9b4385fcc3'
+ '5b1f8c9cd788a39a6283f93302ce5c6e'
+ 'f0c0ac930326168035f0c8e24357ae55'
+ '69d099e6deedfa3c1ee2b6e82d9b8bfb'
+ 'dab8a73bcc5fd5479d8750493d8d97dc'
+ 'c2e20fe68b034df752dba2773db16ebe'
+ '07131d117fcfe9dcd50c453c3a5e9531'
+ 'febf25c154a7d36f01159e84f26c2d9a') \ No newline at end of file
diff --git a/libre/lirc-libre/irexec.service b/libre/lirc-libre/irexec.service
new file mode 100644
index 000000000..5d7915b29
--- /dev/null
+++ b/libre/lirc-libre/irexec.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=IR Exec
+After=lirc.service
+Wants=lirc.service
+
+[Service]
+ExecStart=/usr/bin/irexec --daemon
+Type=forking
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/lirc-libre/lirc-utils.install b/libre/lirc-libre/lirc-utils.install
new file mode 100644
index 000000000..293d1ed7c
--- /dev/null
+++ b/libre/lirc-libre/lirc-utils.install
@@ -0,0 +1,7 @@
+post_install() {
+ systemd-tmpfiles --create lirc.conf
+}
+
+post_upgrade() {
+ post_install
+}
diff --git a/libre/lirc-libre/lirc.service b/libre/lirc-libre/lirc.service
new file mode 100644
index 000000000..953601fd3
--- /dev/null
+++ b/libre/lirc-libre/lirc.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Linux Infrared Remote Control
+
+[Service]
+ExecStartPre=/usr/bin/ln -sf /run/lirc/lircd /dev/lircd
+ExecStart=/usr/sbin/lircd --pidfile=/run/lirc/lircd.pid
+Type=forking
+PIDFile=/run/lirc/lircd.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/lirc-libre/lirc.tmpfiles b/libre/lirc-libre/lirc.tmpfiles
new file mode 100644
index 000000000..0b80e2e47
--- /dev/null
+++ b/libre/lirc-libre/lirc.tmpfiles
@@ -0,0 +1 @@
+d /run/lirc 0755 root root -
diff --git a/libre/lirc-libre/lircm.service b/libre/lirc-libre/lircm.service
new file mode 100644
index 000000000..6b258e312
--- /dev/null
+++ b/libre/lirc-libre/lircm.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=LIRC Mouse
+After=lirc.service
+Wants=lirc.service
+
+[Service]
+ExecStart=/usr/sbin/lircmd -u
+Type=forking
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD
index cea9ca4d3..7d44e458e 100644
--- a/libre/rp-pppoe-libre/PKGBUILD
+++ b/libre/rp-pppoe-libre/PKGBUILD
@@ -1,59 +1,48 @@
-# $Id: PKGBUILD 119995 2011-04-18 07:09:47Z daniel $
+# $Id: PKGBUILD 166893 2012-09-20 23:56:51Z eric $
# Maintainer: Daniel Isenmann <daniel@archlinux.org>
# Contributor: orelien <aurelien.foret@wanadoo.fr>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+_pkgname=rp-pppoe
pkgname=rp-pppoe-libre
-pkgver=3.10
-pkgrel=7
+pkgver=3.11
+pkgrel=1
pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client. Unfree software recommendation removed."
arch=('i686' 'x86_64' 'mips64el')
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')
-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')
+install=rp-pppoe.install
+source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig}
+ adsl adsl.service $pkgname.patch)
+md5sums=('13b5900c56bd602df6cc526e5e520722'
+ '8fc724aa146dba52ef7b3fbe5b8784c6'
+ 'adace1ad441aa88dcb3db52fb7f9c97f'
+ 'af234125f956f3a356ab0d0fcaa9e8a2'
+ '3c53d550ac408608abb0b6cd6b76b6c2')
-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
+build() {
+ cd "$srcdir/$_pkgname-$pkgver"
+
+ ## Adding patch to remove unfree software recommendation (ServPoET)
+ patch -Np1 -i "$srcdir/rp-pppoe-libre.patch"
- tar czvf $pkgname-$pkgver.tar.gz $pkgname-$pkgver/
-}
+ cd ./src
-build() {
- cd $srcdir/$pkgname-$pkgver/src
./configure --prefix=/usr --enable-plugin
- make PLUGIN_DIR="/usr/lib/rp-pppoe"
+ make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so
}
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
+ 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" "$pkgdir/etc/rc.d/adsl"
+ install -Dm755 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service"
}
-md5sums=('2c4a678fa684269ff4579bb639674198'
- 'adace1ad441aa88dcb3db52fb7f9c97f'
- '9f0d49c3a550c5ad76bb70d65c9d97b2')
diff --git a/libre/rp-pppoe-libre/adsl.service b/libre/rp-pppoe-libre/adsl.service
new file mode 100644
index 000000000..324164943
--- /dev/null
+++ b/libre/rp-pppoe-libre/adsl.service
@@ -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
diff --git a/libre/rp-pppoe-libre/rp-pppoe-libre.patch b/libre/rp-pppoe-libre/rp-pppoe-libre.patch
index 4f2302496..9cf16d7d7 100644
--- a/libre/rp-pppoe-libre/rp-pppoe-libre.patch
+++ b/libre/rp-pppoe-libre/rp-pppoe-libre.patch
@@ -1,7 +1,7 @@
-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
+diff -Nur rp-pppoe-3.11.orig/rp-pppoe.spec rp-pppoe-3.11/rp-pppoe.spec
+--- rp-pppoe-3.11.orig/rp-pppoe.spec 2012-08-17 15:31:25.000000000 -0300
++++ rp-pppoe-3.11/rp-pppoe.spec 2012-10-05 01:42:29.964508454 -0300
+@@ -55,7 +55,7 @@
%files
%defattr(-,root,root)
@@ -10,9 +10,9 @@ diff -rauNp rp-pppoe-3.10/rp-pppoe.spec rp-pppoe-3.10-libre//rp-pppoe.spec
%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
+diff -Nur rp-pppoe-3.11.orig/SERVPOET /dev/null
+--- rp-pppoe-3.11.orig/SERVPOET 2012-08-17 15:31:25.000000000 -0300
++++ /dev/null 2012-10-05 01:27:08.580078512 -0300
@@ -1,18 +0,0 @@
-# LIC: GPL
-
@@ -32,10 +32,10 @@ diff -rauNp rp-pppoe-3.10/SERVPOET rp-pppoe-3.10-libre//SERVPOET
-
---
-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@
+diff -Nur rp-pppoe-3.11.orig/src/Makefile.in rp-pppoe-3.11/src/Makefile.in
+--- rp-pppoe-3.11.orig/src/Makefile.in 2012-08-17 15:31:25.000000000 -0300
++++ rp-pppoe-3.11/src/Makefile.in 2012-10-05 01:46:13.121336619 -0300
+@@ -44,9 +44,6 @@
PPPOE_PATH=$(sbindir)/pppoe
PPPD_PATH=@PPPD@
@@ -45,7 +45,7 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in
# Kernel-mode plugin gets installed here.
PLUGIN_DIR=/etc/ppp/plugins
PLUGIN_PATH=$(PLUGIN_DIR)/rp-pppoe.so
-@@ -151,7 +148,6 @@ install: all
+@@ -152,7 +149,6 @@
$(install) -m 644 ../doc/HOW-TO-CONNECT $(DESTDIR)$(docdir)
$(install) -m 644 ../doc/LICENSE $(DESTDIR)$(docdir)
$(install) -m 644 ../README $(DESTDIR)$(docdir)
@@ -53,7 +53,7 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in
$(install) -m 644 ../configs/pap-secrets $(DESTDIR)$(docdir)
-mkdir -p $(DESTDIR)$(mandir)/man8
for i in $(TARGETS) ; do \
-@@ -209,25 +205,15 @@ install: all
+@@ -210,25 +206,15 @@
@echo ""
@echo "Type 'pppoe-setup' to configure the software."
@@ -80,7 +80,7 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in
cp ../$$i ../rp-pppoe-$(VERSION)$(BETA) || exit 1; \
done
mkdir ../rp-pppoe-$(VERSION)$(BETA)/gui
-@@ -282,10 +268,6 @@ rpms: tgz
+@@ -286,10 +272,6 @@
/usr/src/redhat/RPMS/i386/rp-pppoe-$(VERSION)-1.i386.rpm \
/usr/src/redhat/RPMS/i386/rp-pppoe-gui-$(VERSION)-1.i386.rpm
@@ -89,9 +89,9 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in
- cd .. && rpm -ba servpoet.spec
-
clean:
- rm -f *.o pppoe pppoe-sniff pppoe-server core rp-pppoe.so plugin/*.o plugin/libplugin.a *~
+ rm -f *.o pppoe-relay 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
+@@ -304,15 +286,13 @@
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
@@ -104,7 +104,7 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in
licensed-only:
- $(MAKE) -C licensed-only all VERSION=$(VERSION) SERVPOET_VERSION=$(SERVPOET_VERSION)
-+ $(MAKE) -C licensed-only all VERSION=$(VERSION)
++ $(MAKE) -C licensed-only all VERSION=$(VERSION)
l2tp: libevent/libevent.a
$(MAKE) -C l2tp all