summarylogtreecommitdiffstats
diff options
context:
space:
mode:
author4le34n2017-11-14 18:51:48 +1100
committer4le34n2017-11-14 18:51:48 +1100
commit12c3f4e35b1f7aacddc4260e3269b261c17b02f4 (patch)
treea113a17c961b06cbdaa81e4b0d5df076146619dd
parent50bddbb5f1ab669f686c174723c4a3e20b6602a4 (diff)
downloadaur-12c3f4e35b1f7aacddc4260e3269b261c17b02f4.tar.gz
Fix error build, add patch shaper.patch
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD26
-rw-r--r--shaper.patch15
3 files changed, 35 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 07db464eafbb..bb4d64be7aac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Sep 5 01:32:39 UTC 2017
+# Tue Nov 14 07:51:07 UTC 2017
pkgbase = accel-ppp
pkgdesc = High performance PPTP/L2TP/PPPoE/IPoE server
pkgver = 1.11.2
- pkgrel = 1
+ pkgrel = 2
url = http://sourceforge.net/apps/trac/accel-ppp/
install = accel-ppp.install
arch = i686
@@ -31,6 +31,7 @@ pkgbase = accel-ppp
source = accel-pppd.service
source = dictionary.abills
source = dictionary.accel_ipoe
+ source = shaper.patch
md5sums = 81a3312cd0ff468ab5ee5edad3424a91
md5sums = 0536dd60960e76cf5a6cdbf0518782d8
md5sums = 816dd5ea9534a077dfd63b6cd529738a
@@ -38,6 +39,7 @@ pkgbase = accel-ppp
md5sums = a171d28760bf411be85dc4a964df2c0a
md5sums = 4e0d4fc5975ea8794ea286e8fbfa56cd
md5sums = 7e58716f1249f924ce218bd348d4c03a
+ md5sums = c203b966d62f3b04bf413f7b46af4212
pkgname = accel-ppp
diff --git a/PKGBUILD b/PKGBUILD
index 5abcfc0206cd..9ed5ce9a8925 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Alexandr Boiko <4le34n at gmail dot com>
pkgname=accel-ppp
pkgver=1.11.2
-pkgrel=1
+pkgrel=2
pkgdesc="High performance PPTP/L2TP/PPPoE/IPoE server"
arch=('i686' 'x86_64')
url="http://sourceforge.net/apps/trac/accel-ppp/"
@@ -14,17 +14,22 @@ conflicts=('accel-ppp-git')
install='accel-ppp.install'
options=('docs')
backup=('etc/accel-ppp.conf' 'etc/accel-ppp.lua' 'etc/snmp/accel-ppp.conf')
-source=(http://sourceforge.net/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2
- accel-ppp.logrotate
- accel-ppp.lua
- accel-ppp.tmpfiles
- accel-pppd.service
- dictionary.abills
- dictionary.accel_ipoe)
+source=("http://sourceforge.net/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2"
+ 'accel-ppp.logrotate'
+ 'accel-ppp.lua'
+ 'accel-ppp.tmpfiles'
+ 'accel-pppd.service'
+ 'dictionary.abills'
+ 'dictionary.accel_ipoe'
+ 'shaper.patch')
prepare() {
cd "$srcdir/$pkgname-$pkgver"
- sed -i 's|RUNTIME DESTINATION sbin|RUNTIME DESTINATION bin|' \
+
+ # Fix error build:
+ patch -p1 <../shaper.patch
+
+ sed -i 's|RUNTIME DESTINATION sbin|RUNTIME DESTINATION bin|' \
"accel-pppd/CMakeLists.txt"
if [ -d "build" ]; then
@@ -77,4 +82,5 @@ md5sums=('81a3312cd0ff468ab5ee5edad3424a91'
'312fd63b9688a05b71a6b33ddd3a9f4b'
'a171d28760bf411be85dc4a964df2c0a'
'4e0d4fc5975ea8794ea286e8fbfa56cd'
- '7e58716f1249f924ce218bd348d4c03a')
+ '7e58716f1249f924ce218bd348d4c03a'
+ 'c203b966d62f3b04bf413f7b46af4212')
diff --git a/shaper.patch b/shaper.patch
new file mode 100644
index 000000000000..158ddf1c32b0
--- /dev/null
+++ b/shaper.patch
@@ -0,0 +1,15 @@
+diff --git a/accel-pppd/shaper/tc_core.h b/accel-pppd/shaper/tc_core.h
+index cb85cc4..e38b579 100644
+--- a/accel-pppd/shaper/tc_core.h
++++ b/accel-pppd/shaper/tc_core.h
+@@ -6,6 +6,10 @@
+
+ #define TIME_UNITS_PER_SEC 1000000
+
++#ifndef UINT16_MAX
++#define UINT16_MAX 65535
++#endif
++
+ enum link_layer {
+ LINKLAYER_UNSPEC,
+ LINKLAYER_ETHERNET, \ No newline at end of file