diff options
| author | 4le34n | 2017-11-14 18:06:03 +1100 |
|---|---|---|
| committer | 4le34n | 2017-11-14 18:06:03 +1100 |
| commit | 9ff0b8fd6b691bb0ea3c1e9e7909e2b5a0651bb1 (patch) | |
| tree | eebfca91f1dc31f8bb36643a5d9ac59c618ee3f4 | |
| parent | 0b9e8b075334049ddb4dc861a014c35c533459b1 (diff) | |
| download | aur-9ff0b8fd6b691bb0ea3c1e9e7909e2b5a0651bb1.tar.gz | |
Fix error build:
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 19 | ||||
| -rw-r--r-- | shaper.patch | 15 |
3 files changed, 33 insertions, 11 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Tue Sep 5 02:24:50 UTC 2017 +# Tue Nov 14 07:05:38 UTC 2017 pkgbase = accel-ppp-git pkgdesc = High performance PPTP/L2TP/PPPoE/IPoE server - pkgver = r1421.b363f17 + pkgver = r1443.34fac26 pkgrel = 1 url = http://sourceforge.net/apps/trac/accel-ppp/ install = accel-ppp.install @@ -13,10 +13,10 @@ pkgbase = accel-ppp-git makedepends = cmake>=2.6 makedepends = libnl1 makedepends = net-snmp>=5.x - makedepends = lua51 + makedepends = lua depends = openssl>=1.0.0 depends = pcre>=8.30 - depends = libnl + depends = libnl>=2.0 optdepends = accel-ppp-ipoe-dkms-git optdepends = accel-ppp-vlanmon-dkms-git optdepends = logrotate @@ -32,6 +32,7 @@ pkgbase = accel-ppp-git source = accel-pppd.service source = dictionary.abills source = dictionary.accel_ipoe + source = shaper.patch md5sums = SKIP md5sums = 0536dd60960e76cf5a6cdbf0518782d8 md5sums = 816dd5ea9534a077dfd63b6cd529738a @@ -39,6 +40,7 @@ pkgbase = accel-ppp-git md5sums = a171d28760bf411be85dc4a964df2c0a md5sums = 4e0d4fc5975ea8794ea286e8fbfa56cd md5sums = 7e58716f1249f924ce218bd348d4c03a + md5sums = c203b966d62f3b04bf413f7b46af4212 pkgname = accel-ppp-git @@ -1,13 +1,13 @@ # Maintainer: Alexandr Boiko <4le34n at gmail dot com> pkgname=accel-ppp-git -pkgver=r1421.b363f17 +pkgver=r1443.34fac26 pkgrel=1 pkgdesc="High performance PPTP/L2TP/PPPoE/IPoE server" arch=('i686' 'x86_64') url="http://sourceforge.net/apps/trac/accel-ppp/" license=('GPL') -depends=('openssl>=1.0.0' 'pcre>=8.30' 'libnl') -makedepends=('git' 'cmake>=2.6' 'libnl1' 'net-snmp>=5.x' 'lua51') +depends=('openssl>=1.0.0' 'pcre>=8.30' 'libnl>=2.0') +makedepends=('git' 'cmake>=2.6' 'libnl1' 'net-snmp>=5.x' 'lua') optdepends=('accel-ppp-ipoe-dkms-git' 'accel-ppp-vlanmon-dkms-git' 'logrotate') conflicts=('accel-ppp') install='accel-ppp.install' @@ -19,7 +19,8 @@ source=('accel-ppp::git+git://git.code.sf.net/p/accel-ppp/code' 'accel-ppp.tmpfiles' 'accel-pppd.service' 'dictionary.abills' - 'dictionary.accel_ipoe') + 'dictionary.accel_ipoe' + 'shaper.patch') md5sums=('SKIP' '0536dd60960e76cf5a6cdbf0518782d8' @@ -27,7 +28,8 @@ md5sums=('SKIP' '312fd63b9688a05b71a6b33ddd3a9f4b' 'a171d28760bf411be85dc4a964df2c0a' '4e0d4fc5975ea8794ea286e8fbfa56cd' - '7e58716f1249f924ce218bd348d4c03a') + '7e58716f1249f924ce218bd348d4c03a' + 'c203b966d62f3b04bf413f7b46af4212') _pkgname=accel-ppp @@ -38,6 +40,9 @@ pkgver() { prepare() { cd "$srcdir/${pkgname%-git}" + + # Fix error build tc shaper: + patch -p1 <../shaper.patch sed -i 's|RUNTIME DESTINATION sbin|RUNTIME DESTINATION bin|' \ "accel-pppd/CMakeLists.txt" @@ -61,8 +66,8 @@ build() { -DSHAPER=TRUE \ -DRADIUS=TRUE \ -DNETSNMP=FALSE \ - -DLUA=TRUE \ - -DLUA_INCLUDE_DIR="/usr/include/lua5.1" \ + -DLUA=5.3 \ + -DLUA_INCLUDE_DIR="/usr/include" \ "$srcdir/${pkgname%-git}" make || return 1 } 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 |