* [PR PATCH] New package: accel-ppp-20230127
@ 2023-04-18 6:32 le34-void
2023-04-18 7:48 ` [PR PATCH] [Updated] " le34-void
` (9 more replies)
0 siblings, 10 replies; 11+ messages in thread
From: le34-void @ 2023-04-18 6:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 599 bytes --]
There is a new pull request by le34-void against master on the void-packages repository
https://github.com/le34-void/void-packages mystuff
https://github.com/void-linux/void-packages/pull/43505
New package: accel-ppp-20230127
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
A patch file from https://github.com/void-linux/void-packages/pull/43505.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mystuff-43505.patch --]
[-- Type: text/x-diff, Size: 8534 bytes --]
From b1dc66645aa956945db7b3dfc38265649b720667 Mon Sep 17 00:00:00 2001
From: Alexandr <joe.satriani@le34.ru>
Date: Tue, 18 Apr 2023 17:00:42 +1100
Subject: [PATCH] New package: accel-ppp-20230127
---
srcpkgs/accel-ppp-ipoe-dkms | 1 +
srcpkgs/accel-ppp-vlanmon-dkms | 1 +
srcpkgs/accel-ppp/files/accel-ppp.logrotate | 7 ++
srcpkgs/accel-ppp/files/accel-ppp.lua | 31 ++++++++
srcpkgs/accel-ppp/files/accel-pppd/run | 6 ++
srcpkgs/accel-ppp/files/dictionary.abills | 13 ++++
srcpkgs/accel-ppp/files/dictionary.accel_ipoe | 6 ++
srcpkgs/accel-ppp/files/ipoe.dkms | 5 ++
srcpkgs/accel-ppp/files/vlanmon.dkms | 5 ++
srcpkgs/accel-ppp/template | 72 +++++++++++++++++++
10 files changed, 147 insertions(+)
create mode 120000 srcpkgs/accel-ppp-ipoe-dkms
create mode 120000 srcpkgs/accel-ppp-vlanmon-dkms
create mode 100644 srcpkgs/accel-ppp/files/accel-ppp.logrotate
create mode 100644 srcpkgs/accel-ppp/files/accel-ppp.lua
create mode 100644 srcpkgs/accel-ppp/files/accel-pppd/run
create mode 100644 srcpkgs/accel-ppp/files/dictionary.abills
create mode 100644 srcpkgs/accel-ppp/files/dictionary.accel_ipoe
create mode 100644 srcpkgs/accel-ppp/files/ipoe.dkms
create mode 100644 srcpkgs/accel-ppp/files/vlanmon.dkms
create mode 100644 srcpkgs/accel-ppp/template
diff --git a/srcpkgs/accel-ppp-ipoe-dkms b/srcpkgs/accel-ppp-ipoe-dkms
new file mode 120000
index 000000000000..17460e43b1cb
--- /dev/null
+++ b/srcpkgs/accel-ppp-ipoe-dkms
@@ -0,0 +1 @@
+accel-ppp
\ No newline at end of file
diff --git a/srcpkgs/accel-ppp-vlanmon-dkms b/srcpkgs/accel-ppp-vlanmon-dkms
new file mode 120000
index 000000000000..17460e43b1cb
--- /dev/null
+++ b/srcpkgs/accel-ppp-vlanmon-dkms
@@ -0,0 +1 @@
+accel-ppp
\ No newline at end of file
diff --git a/srcpkgs/accel-ppp/files/accel-ppp.logrotate b/srcpkgs/accel-ppp/files/accel-ppp.logrotate
new file mode 100644
index 000000000000..3c4e32b8f12f
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/accel-ppp.logrotate
@@ -0,0 +1,7 @@
+/var/log/accel-ppp/*.log {
+ missingok
+ sharedscripts
+ postrotate
+ test -r /run/accel-pppd.pid && kill -HUP `cat /run/accel-pppd.pid`
+ endscript
+}
diff --git a/srcpkgs/accel-ppp/files/accel-ppp.lua b/srcpkgs/accel-ppp/files/accel-ppp.lua
new file mode 100644
index 000000000000..5156270dd098
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/accel-ppp.lua
@@ -0,0 +1,31 @@
+function opt82_dlink(pkt)
+ v,b1,b2,b3,b4=string.unpack(pkt:agent_remote_id():sub(-4),'bbbb')
+ ip=b1..'.'..b2..'.'..b3..'.'..b4
+ v,port=string.unpack(string.sub(pkt:agent_circuit_id(),'-1'),'b')
+ local opt82=ip..'-'..port
+-- print(opt82)
+ return opt82
+end
+function example(ses)
+-- print('xid='..ses:hdr('xid'))
+-- print('ciaddr='..ses:hdr('ciaddr'))
+-- print('giaddr='..ses:hdr('giaddr'))
+-- print('chaddr='..ses:hdr('chaddr'))
+-- print('ifname='..ses:ifname())
+-- options=ses:options()
+-- for k,opt in ipairs(options) do print(opt) end
+ return '1234'
+end
+function ifname(pkt)
+ local ifname=pkt:ifname()
+ return ifname
+end
+function mac(pkt)
+ local mac=pkt:hdr("chaddr")
+ return mac
+end
+function qinq(pkt)
+ local qinq = string.sub(pkt:ifname(), string.find(pkt:ifname(), ".", 1, true)+1, 32)
+ return qinq
+end
+
diff --git a/srcpkgs/accel-ppp/files/accel-pppd/run b/srcpkgs/accel-ppp/files/accel-pppd/run
new file mode 100644
index 000000000000..f803d33d63fc
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/accel-pppd/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+exec 2>&1
+
+exec accel-pppd -p /run/accel-pppd.pid -c /etc/accel-ppp.conf
+
diff --git a/srcpkgs/accel-ppp/files/dictionary.abills b/srcpkgs/accel-ppp/files/dictionary.abills
new file mode 100644
index 000000000000..d1dea6a0d14f
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/dictionary.abills
@@ -0,0 +1,13 @@
+# Limit session traffic
+ATTRIBUTE Session-Octets-Limit 227 integer
+# What to assume as limit - 0 in+out, 1 in, 2 out, 3 max(in,out)
+ATTRIBUTE Octets-Direction 228 integer
+# Connection Speed Limit
+ATTRIBUTE PPPD-Upstream-Speed-Limit 230 integer
+ATTRIBUTE PPPD-Downstream-Speed-Limit 231 integer
+ATTRIBUTE PPPD-Upstream-Speed-Limit-1 232 integer
+ATTRIBUTE PPPD-Downstream-Speed-Limit-1 233 integer
+ATTRIBUTE PPPD-Upstream-Speed-Limit-2 234 integer
+ATTRIBUTE PPPD-Downstream-Speed-Limit-2 235 integer
+ATTRIBUTE PPPD-Upstream-Speed-Limit-3 236 integer
+ATTRIBUTE PPPD-Downstream-Speed-Limit-3 237 integer
diff --git a/srcpkgs/accel-ppp/files/dictionary.accel_ipoe b/srcpkgs/accel-ppp/files/dictionary.accel_ipoe
new file mode 100644
index 000000000000..fbe6f0ce7b7d
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/dictionary.accel_ipoe
@@ -0,0 +1,6 @@
+ATTRIBUTE DHCP-Client-IP-Address 240 ipaddr
+ATTRIBUTE DHCP-Router-IP-Address 241 ipaddr
+ATTRIBUTE DHCP-Mask 242 integer
+ATTRIBUTE DHCP-Lease-Time 242 integer
+ATTRIBUTE L4-Redirect 242 integer
+
diff --git a/srcpkgs/accel-ppp/files/ipoe.dkms b/srcpkgs/accel-ppp/files/ipoe.dkms
new file mode 100644
index 000000000000..3ae9bca31287
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/ipoe.dkms
@@ -0,0 +1,5 @@
+PACKAGE_NAME=@PKGNAME@
+PACKAGE_VERSION=@PKGVER@
+BUILT_MODULE_NAME="ipoe"
+DEST_MODULE_LOCATION="/kernel/misc"
+
diff --git a/srcpkgs/accel-ppp/files/vlanmon.dkms b/srcpkgs/accel-ppp/files/vlanmon.dkms
new file mode 100644
index 000000000000..d363e98c6b13
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/vlanmon.dkms
@@ -0,0 +1,5 @@
+PACKAGE_NAME=@PKGNAME@
+PACKAGE_VERSION=@PKGVER@
+BUILT_MODULE_NAME="vlan_mon"
+DEST_MODULE_LOCATION="/kernel/misc"
+
diff --git a/srcpkgs/accel-ppp/template b/srcpkgs/accel-ppp/template
new file mode 100644
index 000000000000..5de51bfd2f1d
--- /dev/null
+++ b/srcpkgs/accel-ppp/template
@@ -0,0 +1,72 @@
+# Template file for 'accel-ppp'
+pkgname=accel-ppp
+version=20230127
+revision=1
+_commit=cc8f2bada5635768d425e2fa2bafb095acda8ca9
+archs="i686 x86_64"
+build_style=cmake
+configure_args="-DCMAKE_SYSTEM_NAME=Linux
+ -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_BUILD_TYPE=Release
+ -DLOG_FILE=TRUE
+ -DLOG_PGSQL=FALSE
+ -DSHAPER=TRUE
+ -DRADIUS=TRUE
+ -DNETSNMP=FALSE
+ -DLUA=TRUE
+ -DLUA_INCLUDE_DIR="/usr/include/lua5.1""
+conf_files="/etc/accel-ppp.conf /etc/accel-ppp.lua"
+make_dirs="
+ /var/log/accel-ppp 0755 root root
+ /var/lib/accel-ppp 0755 root root"
+makedepends="libnl-devel lua51-devel openssl-devel pcre-devel"
+depends="openssl pcre libnl lua51"
+short_desc="High performance PPTP/L2TP/PPPoE/IPoE server"
+maintainer="le34 <4le34n at gmail dot com>"
+license="GPL-2.0-or-later"
+homepage="https://accel-ppp.org"
+distfiles="https://github.com/xebd/accel-ppp/archive/cc8f2bada5635768d425e2fa2bafb095acda8ca9.tar.gz"
+checksum=d0e6b858b56402b9478b9a40a4e2887ff5f53756211dde3fa49bfa5f63c31d3e
+
+do_patch() {
+ vsed -i 's@RUNTIME DESTINATION sbin@RUNTIME DESTINATION bin@' \
+ "${wrksrc}/accel-pppd/CMakeLists.txt"
+}
+post_install() {
+ vdoc README
+ vlicense COPYING
+ vsv accel-pppd
+ vconf "${wrksrc}/accel-pppd/accel-ppp.conf"
+ vsconf "${wrksrc}/accel-pppd/accel-ppp.conf"
+ vconf ${FILESDIR}/accel-ppp.lua
+ vinstall ${FILESDIR}/accel-ppp.logrotate 644 etc/logrotate.d accel-ppp
+ vinstall ${FILESDIR}/dictionary.accel_ipoe 644 usr/share/accel-ppp/radius
+ vinstall ${FILESDIR}/dictionary.abills 644 usr/share/accel-ppp/radius
+ vinstall ${wrksrc}/accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt 644 usr/share/snmp/mibs
+}
+accel-ppp-ipoe-dkms_package() {
+ short_desc+=" - kernel module sources for dkms"
+ dkms_modules="accel-ppp-ipoe ${version}"
+ depends="dkms lua51-devel"
+
+ pkg_install() {
+ vmkdir usr/src/accel-ppp-ipoe-${version}
+ vcopy "drivers/ipoe/*" usr/src/accel-ppp-ipoe-${version}
+ vinstall "${FILESDIR}/ipoe.dkms" 0644 usr/src/accel-ppp-ipoe-${version} dkms.conf
+ sed -e "s/@PKGNAME@/${pkgname}/" \
+ -e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-ipoe-${version}/dkms.conf
+ }
+}
+accel-ppp-vlanmon-dkms_package() {
+ short_desc+=" - kernel module sources for dkms"
+ dkms_modules="accel-ppp-vlanmon ${version}"
+ depends="dkms"
+
+ pkg_install() {
+ vmkdir usr/src/accel-ppp-vlanmon-${version}
+ vcopy "drivers/vlan_mon/*" usr/src/accel-ppp-vlanmon-${version}
+ vinstall "${FILESDIR}/vlanmon.dkms" 0644 usr/src/accel-ppp-vlanmon-${version} dkms.conf
+ sed -e "s/@PKGNAME@/${pkgname}/" \
+ -e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-vlanmon-${version}/dkms.conf
+ }
+}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] New package: accel-ppp-20230127
2023-04-18 6:32 [PR PATCH] New package: accel-ppp-20230127 le34-void
@ 2023-04-18 7:48 ` le34-void
2023-04-18 8:02 ` le34-void
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: le34-void @ 2023-04-18 7:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 603 bytes --]
There is an updated pull request by le34-void against master on the void-packages repository
https://github.com/le34-void/void-packages mystuff
https://github.com/void-linux/void-packages/pull/43505
New package: accel-ppp-20230127
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/43505.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mystuff-43505.patch --]
[-- Type: text/x-diff, Size: 9469 bytes --]
From b1dc66645aa956945db7b3dfc38265649b720667 Mon Sep 17 00:00:00 2001
From: Alexandr <joe.satriani@le34.ru>
Date: Tue, 18 Apr 2023 17:00:42 +1100
Subject: [PATCH 1/2] New package: accel-ppp-20230127
---
srcpkgs/accel-ppp-ipoe-dkms | 1 +
srcpkgs/accel-ppp-vlanmon-dkms | 1 +
srcpkgs/accel-ppp/files/accel-ppp.logrotate | 7 ++
srcpkgs/accel-ppp/files/accel-ppp.lua | 31 ++++++++
srcpkgs/accel-ppp/files/accel-pppd/run | 6 ++
srcpkgs/accel-ppp/files/dictionary.abills | 13 ++++
srcpkgs/accel-ppp/files/dictionary.accel_ipoe | 6 ++
srcpkgs/accel-ppp/files/ipoe.dkms | 5 ++
srcpkgs/accel-ppp/files/vlanmon.dkms | 5 ++
srcpkgs/accel-ppp/template | 72 +++++++++++++++++++
10 files changed, 147 insertions(+)
create mode 120000 srcpkgs/accel-ppp-ipoe-dkms
create mode 120000 srcpkgs/accel-ppp-vlanmon-dkms
create mode 100644 srcpkgs/accel-ppp/files/accel-ppp.logrotate
create mode 100644 srcpkgs/accel-ppp/files/accel-ppp.lua
create mode 100644 srcpkgs/accel-ppp/files/accel-pppd/run
create mode 100644 srcpkgs/accel-ppp/files/dictionary.abills
create mode 100644 srcpkgs/accel-ppp/files/dictionary.accel_ipoe
create mode 100644 srcpkgs/accel-ppp/files/ipoe.dkms
create mode 100644 srcpkgs/accel-ppp/files/vlanmon.dkms
create mode 100644 srcpkgs/accel-ppp/template
diff --git a/srcpkgs/accel-ppp-ipoe-dkms b/srcpkgs/accel-ppp-ipoe-dkms
new file mode 120000
index 000000000000..17460e43b1cb
--- /dev/null
+++ b/srcpkgs/accel-ppp-ipoe-dkms
@@ -0,0 +1 @@
+accel-ppp
\ No newline at end of file
diff --git a/srcpkgs/accel-ppp-vlanmon-dkms b/srcpkgs/accel-ppp-vlanmon-dkms
new file mode 120000
index 000000000000..17460e43b1cb
--- /dev/null
+++ b/srcpkgs/accel-ppp-vlanmon-dkms
@@ -0,0 +1 @@
+accel-ppp
\ No newline at end of file
diff --git a/srcpkgs/accel-ppp/files/accel-ppp.logrotate b/srcpkgs/accel-ppp/files/accel-ppp.logrotate
new file mode 100644
index 000000000000..3c4e32b8f12f
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/accel-ppp.logrotate
@@ -0,0 +1,7 @@
+/var/log/accel-ppp/*.log {
+ missingok
+ sharedscripts
+ postrotate
+ test -r /run/accel-pppd.pid && kill -HUP `cat /run/accel-pppd.pid`
+ endscript
+}
diff --git a/srcpkgs/accel-ppp/files/accel-ppp.lua b/srcpkgs/accel-ppp/files/accel-ppp.lua
new file mode 100644
index 000000000000..5156270dd098
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/accel-ppp.lua
@@ -0,0 +1,31 @@
+function opt82_dlink(pkt)
+ v,b1,b2,b3,b4=string.unpack(pkt:agent_remote_id():sub(-4),'bbbb')
+ ip=b1..'.'..b2..'.'..b3..'.'..b4
+ v,port=string.unpack(string.sub(pkt:agent_circuit_id(),'-1'),'b')
+ local opt82=ip..'-'..port
+-- print(opt82)
+ return opt82
+end
+function example(ses)
+-- print('xid='..ses:hdr('xid'))
+-- print('ciaddr='..ses:hdr('ciaddr'))
+-- print('giaddr='..ses:hdr('giaddr'))
+-- print('chaddr='..ses:hdr('chaddr'))
+-- print('ifname='..ses:ifname())
+-- options=ses:options()
+-- for k,opt in ipairs(options) do print(opt) end
+ return '1234'
+end
+function ifname(pkt)
+ local ifname=pkt:ifname()
+ return ifname
+end
+function mac(pkt)
+ local mac=pkt:hdr("chaddr")
+ return mac
+end
+function qinq(pkt)
+ local qinq = string.sub(pkt:ifname(), string.find(pkt:ifname(), ".", 1, true)+1, 32)
+ return qinq
+end
+
diff --git a/srcpkgs/accel-ppp/files/accel-pppd/run b/srcpkgs/accel-ppp/files/accel-pppd/run
new file mode 100644
index 000000000000..f803d33d63fc
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/accel-pppd/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+exec 2>&1
+
+exec accel-pppd -p /run/accel-pppd.pid -c /etc/accel-ppp.conf
+
diff --git a/srcpkgs/accel-ppp/files/dictionary.abills b/srcpkgs/accel-ppp/files/dictionary.abills
new file mode 100644
index 000000000000..d1dea6a0d14f
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/dictionary.abills
@@ -0,0 +1,13 @@
+# Limit session traffic
+ATTRIBUTE Session-Octets-Limit 227 integer
+# What to assume as limit - 0 in+out, 1 in, 2 out, 3 max(in,out)
+ATTRIBUTE Octets-Direction 228 integer
+# Connection Speed Limit
+ATTRIBUTE PPPD-Upstream-Speed-Limit 230 integer
+ATTRIBUTE PPPD-Downstream-Speed-Limit 231 integer
+ATTRIBUTE PPPD-Upstream-Speed-Limit-1 232 integer
+ATTRIBUTE PPPD-Downstream-Speed-Limit-1 233 integer
+ATTRIBUTE PPPD-Upstream-Speed-Limit-2 234 integer
+ATTRIBUTE PPPD-Downstream-Speed-Limit-2 235 integer
+ATTRIBUTE PPPD-Upstream-Speed-Limit-3 236 integer
+ATTRIBUTE PPPD-Downstream-Speed-Limit-3 237 integer
diff --git a/srcpkgs/accel-ppp/files/dictionary.accel_ipoe b/srcpkgs/accel-ppp/files/dictionary.accel_ipoe
new file mode 100644
index 000000000000..fbe6f0ce7b7d
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/dictionary.accel_ipoe
@@ -0,0 +1,6 @@
+ATTRIBUTE DHCP-Client-IP-Address 240 ipaddr
+ATTRIBUTE DHCP-Router-IP-Address 241 ipaddr
+ATTRIBUTE DHCP-Mask 242 integer
+ATTRIBUTE DHCP-Lease-Time 242 integer
+ATTRIBUTE L4-Redirect 242 integer
+
diff --git a/srcpkgs/accel-ppp/files/ipoe.dkms b/srcpkgs/accel-ppp/files/ipoe.dkms
new file mode 100644
index 000000000000..3ae9bca31287
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/ipoe.dkms
@@ -0,0 +1,5 @@
+PACKAGE_NAME=@PKGNAME@
+PACKAGE_VERSION=@PKGVER@
+BUILT_MODULE_NAME="ipoe"
+DEST_MODULE_LOCATION="/kernel/misc"
+
diff --git a/srcpkgs/accel-ppp/files/vlanmon.dkms b/srcpkgs/accel-ppp/files/vlanmon.dkms
new file mode 100644
index 000000000000..d363e98c6b13
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/vlanmon.dkms
@@ -0,0 +1,5 @@
+PACKAGE_NAME=@PKGNAME@
+PACKAGE_VERSION=@PKGVER@
+BUILT_MODULE_NAME="vlan_mon"
+DEST_MODULE_LOCATION="/kernel/misc"
+
diff --git a/srcpkgs/accel-ppp/template b/srcpkgs/accel-ppp/template
new file mode 100644
index 000000000000..5de51bfd2f1d
--- /dev/null
+++ b/srcpkgs/accel-ppp/template
@@ -0,0 +1,72 @@
+# Template file for 'accel-ppp'
+pkgname=accel-ppp
+version=20230127
+revision=1
+_commit=cc8f2bada5635768d425e2fa2bafb095acda8ca9
+archs="i686 x86_64"
+build_style=cmake
+configure_args="-DCMAKE_SYSTEM_NAME=Linux
+ -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_BUILD_TYPE=Release
+ -DLOG_FILE=TRUE
+ -DLOG_PGSQL=FALSE
+ -DSHAPER=TRUE
+ -DRADIUS=TRUE
+ -DNETSNMP=FALSE
+ -DLUA=TRUE
+ -DLUA_INCLUDE_DIR="/usr/include/lua5.1""
+conf_files="/etc/accel-ppp.conf /etc/accel-ppp.lua"
+make_dirs="
+ /var/log/accel-ppp 0755 root root
+ /var/lib/accel-ppp 0755 root root"
+makedepends="libnl-devel lua51-devel openssl-devel pcre-devel"
+depends="openssl pcre libnl lua51"
+short_desc="High performance PPTP/L2TP/PPPoE/IPoE server"
+maintainer="le34 <4le34n at gmail dot com>"
+license="GPL-2.0-or-later"
+homepage="https://accel-ppp.org"
+distfiles="https://github.com/xebd/accel-ppp/archive/cc8f2bada5635768d425e2fa2bafb095acda8ca9.tar.gz"
+checksum=d0e6b858b56402b9478b9a40a4e2887ff5f53756211dde3fa49bfa5f63c31d3e
+
+do_patch() {
+ vsed -i 's@RUNTIME DESTINATION sbin@RUNTIME DESTINATION bin@' \
+ "${wrksrc}/accel-pppd/CMakeLists.txt"
+}
+post_install() {
+ vdoc README
+ vlicense COPYING
+ vsv accel-pppd
+ vconf "${wrksrc}/accel-pppd/accel-ppp.conf"
+ vsconf "${wrksrc}/accel-pppd/accel-ppp.conf"
+ vconf ${FILESDIR}/accel-ppp.lua
+ vinstall ${FILESDIR}/accel-ppp.logrotate 644 etc/logrotate.d accel-ppp
+ vinstall ${FILESDIR}/dictionary.accel_ipoe 644 usr/share/accel-ppp/radius
+ vinstall ${FILESDIR}/dictionary.abills 644 usr/share/accel-ppp/radius
+ vinstall ${wrksrc}/accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt 644 usr/share/snmp/mibs
+}
+accel-ppp-ipoe-dkms_package() {
+ short_desc+=" - kernel module sources for dkms"
+ dkms_modules="accel-ppp-ipoe ${version}"
+ depends="dkms lua51-devel"
+
+ pkg_install() {
+ vmkdir usr/src/accel-ppp-ipoe-${version}
+ vcopy "drivers/ipoe/*" usr/src/accel-ppp-ipoe-${version}
+ vinstall "${FILESDIR}/ipoe.dkms" 0644 usr/src/accel-ppp-ipoe-${version} dkms.conf
+ sed -e "s/@PKGNAME@/${pkgname}/" \
+ -e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-ipoe-${version}/dkms.conf
+ }
+}
+accel-ppp-vlanmon-dkms_package() {
+ short_desc+=" - kernel module sources for dkms"
+ dkms_modules="accel-ppp-vlanmon ${version}"
+ depends="dkms"
+
+ pkg_install() {
+ vmkdir usr/src/accel-ppp-vlanmon-${version}
+ vcopy "drivers/vlan_mon/*" usr/src/accel-ppp-vlanmon-${version}
+ vinstall "${FILESDIR}/vlanmon.dkms" 0644 usr/src/accel-ppp-vlanmon-${version} dkms.conf
+ sed -e "s/@PKGNAME@/${pkgname}/" \
+ -e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-vlanmon-${version}/dkms.conf
+ }
+}
From 0b6f707962ca10c79cbb7113ac06c2c3ab5579ab Mon Sep 17 00:00:00 2001
From: Alexandr <joe.satriani@le34.ru>
Date: Tue, 18 Apr 2023 18:46:15 +1100
Subject: [PATCH 2/2] Fix: Check build / Lint template Failing (maintainer)
---
srcpkgs/accel-ppp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/accel-ppp/template b/srcpkgs/accel-ppp/template
index 5de51bfd2f1d..57df48ebd1cc 100644
--- a/srcpkgs/accel-ppp/template
+++ b/srcpkgs/accel-ppp/template
@@ -22,7 +22,7 @@ make_dirs="
makedepends="libnl-devel lua51-devel openssl-devel pcre-devel"
depends="openssl pcre libnl lua51"
short_desc="High performance PPTP/L2TP/PPPoE/IPoE server"
-maintainer="le34 <4le34n at gmail dot com>"
+maintainer="Alexandr <joe.satriani@le34.ru>"
license="GPL-2.0-or-later"
homepage="https://accel-ppp.org"
distfiles="https://github.com/xebd/accel-ppp/archive/cc8f2bada5635768d425e2fa2bafb095acda8ca9.tar.gz"
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] New package: accel-ppp-20230127
2023-04-18 6:32 [PR PATCH] New package: accel-ppp-20230127 le34-void
2023-04-18 7:48 ` [PR PATCH] [Updated] " le34-void
@ 2023-04-18 8:02 ` le34-void
2023-04-18 8:08 ` le34-void
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: le34-void @ 2023-04-18 8:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 603 bytes --]
There is an updated pull request by le34-void against master on the void-packages repository
https://github.com/le34-void/void-packages mystuff
https://github.com/void-linux/void-packages/pull/43505
New package: accel-ppp-20230127
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/43505.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mystuff-43505.patch --]
[-- Type: text/x-diff, Size: 13406 bytes --]
From b1dc66645aa956945db7b3dfc38265649b720667 Mon Sep 17 00:00:00 2001
From: Alexandr <joe.satriani@le34.ru>
Date: Tue, 18 Apr 2023 17:00:42 +1100
Subject: [PATCH 1/3] New package: accel-ppp-20230127
---
srcpkgs/accel-ppp-ipoe-dkms | 1 +
srcpkgs/accel-ppp-vlanmon-dkms | 1 +
srcpkgs/accel-ppp/files/accel-ppp.logrotate | 7 ++
srcpkgs/accel-ppp/files/accel-ppp.lua | 31 ++++++++
srcpkgs/accel-ppp/files/accel-pppd/run | 6 ++
srcpkgs/accel-ppp/files/dictionary.abills | 13 ++++
srcpkgs/accel-ppp/files/dictionary.accel_ipoe | 6 ++
srcpkgs/accel-ppp/files/ipoe.dkms | 5 ++
srcpkgs/accel-ppp/files/vlanmon.dkms | 5 ++
srcpkgs/accel-ppp/template | 72 +++++++++++++++++++
10 files changed, 147 insertions(+)
create mode 120000 srcpkgs/accel-ppp-ipoe-dkms
create mode 120000 srcpkgs/accel-ppp-vlanmon-dkms
create mode 100644 srcpkgs/accel-ppp/files/accel-ppp.logrotate
create mode 100644 srcpkgs/accel-ppp/files/accel-ppp.lua
create mode 100644 srcpkgs/accel-ppp/files/accel-pppd/run
create mode 100644 srcpkgs/accel-ppp/files/dictionary.abills
create mode 100644 srcpkgs/accel-ppp/files/dictionary.accel_ipoe
create mode 100644 srcpkgs/accel-ppp/files/ipoe.dkms
create mode 100644 srcpkgs/accel-ppp/files/vlanmon.dkms
create mode 100644 srcpkgs/accel-ppp/template
diff --git a/srcpkgs/accel-ppp-ipoe-dkms b/srcpkgs/accel-ppp-ipoe-dkms
new file mode 120000
index 000000000000..17460e43b1cb
--- /dev/null
+++ b/srcpkgs/accel-ppp-ipoe-dkms
@@ -0,0 +1 @@
+accel-ppp
\ No newline at end of file
diff --git a/srcpkgs/accel-ppp-vlanmon-dkms b/srcpkgs/accel-ppp-vlanmon-dkms
new file mode 120000
index 000000000000..17460e43b1cb
--- /dev/null
+++ b/srcpkgs/accel-ppp-vlanmon-dkms
@@ -0,0 +1 @@
+accel-ppp
\ No newline at end of file
diff --git a/srcpkgs/accel-ppp/files/accel-ppp.logrotate b/srcpkgs/accel-ppp/files/accel-ppp.logrotate
new file mode 100644
index 000000000000..3c4e32b8f12f
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/accel-ppp.logrotate
@@ -0,0 +1,7 @@
+/var/log/accel-ppp/*.log {
+ missingok
+ sharedscripts
+ postrotate
+ test -r /run/accel-pppd.pid && kill -HUP `cat /run/accel-pppd.pid`
+ endscript
+}
diff --git a/srcpkgs/accel-ppp/files/accel-ppp.lua b/srcpkgs/accel-ppp/files/accel-ppp.lua
new file mode 100644
index 000000000000..5156270dd098
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/accel-ppp.lua
@@ -0,0 +1,31 @@
+function opt82_dlink(pkt)
+ v,b1,b2,b3,b4=string.unpack(pkt:agent_remote_id():sub(-4),'bbbb')
+ ip=b1..'.'..b2..'.'..b3..'.'..b4
+ v,port=string.unpack(string.sub(pkt:agent_circuit_id(),'-1'),'b')
+ local opt82=ip..'-'..port
+-- print(opt82)
+ return opt82
+end
+function example(ses)
+-- print('xid='..ses:hdr('xid'))
+-- print('ciaddr='..ses:hdr('ciaddr'))
+-- print('giaddr='..ses:hdr('giaddr'))
+-- print('chaddr='..ses:hdr('chaddr'))
+-- print('ifname='..ses:ifname())
+-- options=ses:options()
+-- for k,opt in ipairs(options) do print(opt) end
+ return '1234'
+end
+function ifname(pkt)
+ local ifname=pkt:ifname()
+ return ifname
+end
+function mac(pkt)
+ local mac=pkt:hdr("chaddr")
+ return mac
+end
+function qinq(pkt)
+ local qinq = string.sub(pkt:ifname(), string.find(pkt:ifname(), ".", 1, true)+1, 32)
+ return qinq
+end
+
diff --git a/srcpkgs/accel-ppp/files/accel-pppd/run b/srcpkgs/accel-ppp/files/accel-pppd/run
new file mode 100644
index 000000000000..f803d33d63fc
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/accel-pppd/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+exec 2>&1
+
+exec accel-pppd -p /run/accel-pppd.pid -c /etc/accel-ppp.conf
+
diff --git a/srcpkgs/accel-ppp/files/dictionary.abills b/srcpkgs/accel-ppp/files/dictionary.abills
new file mode 100644
index 000000000000..d1dea6a0d14f
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/dictionary.abills
@@ -0,0 +1,13 @@
+# Limit session traffic
+ATTRIBUTE Session-Octets-Limit 227 integer
+# What to assume as limit - 0 in+out, 1 in, 2 out, 3 max(in,out)
+ATTRIBUTE Octets-Direction 228 integer
+# Connection Speed Limit
+ATTRIBUTE PPPD-Upstream-Speed-Limit 230 integer
+ATTRIBUTE PPPD-Downstream-Speed-Limit 231 integer
+ATTRIBUTE PPPD-Upstream-Speed-Limit-1 232 integer
+ATTRIBUTE PPPD-Downstream-Speed-Limit-1 233 integer
+ATTRIBUTE PPPD-Upstream-Speed-Limit-2 234 integer
+ATTRIBUTE PPPD-Downstream-Speed-Limit-2 235 integer
+ATTRIBUTE PPPD-Upstream-Speed-Limit-3 236 integer
+ATTRIBUTE PPPD-Downstream-Speed-Limit-3 237 integer
diff --git a/srcpkgs/accel-ppp/files/dictionary.accel_ipoe b/srcpkgs/accel-ppp/files/dictionary.accel_ipoe
new file mode 100644
index 000000000000..fbe6f0ce7b7d
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/dictionary.accel_ipoe
@@ -0,0 +1,6 @@
+ATTRIBUTE DHCP-Client-IP-Address 240 ipaddr
+ATTRIBUTE DHCP-Router-IP-Address 241 ipaddr
+ATTRIBUTE DHCP-Mask 242 integer
+ATTRIBUTE DHCP-Lease-Time 242 integer
+ATTRIBUTE L4-Redirect 242 integer
+
diff --git a/srcpkgs/accel-ppp/files/ipoe.dkms b/srcpkgs/accel-ppp/files/ipoe.dkms
new file mode 100644
index 000000000000..3ae9bca31287
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/ipoe.dkms
@@ -0,0 +1,5 @@
+PACKAGE_NAME=@PKGNAME@
+PACKAGE_VERSION=@PKGVER@
+BUILT_MODULE_NAME="ipoe"
+DEST_MODULE_LOCATION="/kernel/misc"
+
diff --git a/srcpkgs/accel-ppp/files/vlanmon.dkms b/srcpkgs/accel-ppp/files/vlanmon.dkms
new file mode 100644
index 000000000000..d363e98c6b13
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/vlanmon.dkms
@@ -0,0 +1,5 @@
+PACKAGE_NAME=@PKGNAME@
+PACKAGE_VERSION=@PKGVER@
+BUILT_MODULE_NAME="vlan_mon"
+DEST_MODULE_LOCATION="/kernel/misc"
+
diff --git a/srcpkgs/accel-ppp/template b/srcpkgs/accel-ppp/template
new file mode 100644
index 000000000000..5de51bfd2f1d
--- /dev/null
+++ b/srcpkgs/accel-ppp/template
@@ -0,0 +1,72 @@
+# Template file for 'accel-ppp'
+pkgname=accel-ppp
+version=20230127
+revision=1
+_commit=cc8f2bada5635768d425e2fa2bafb095acda8ca9
+archs="i686 x86_64"
+build_style=cmake
+configure_args="-DCMAKE_SYSTEM_NAME=Linux
+ -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_BUILD_TYPE=Release
+ -DLOG_FILE=TRUE
+ -DLOG_PGSQL=FALSE
+ -DSHAPER=TRUE
+ -DRADIUS=TRUE
+ -DNETSNMP=FALSE
+ -DLUA=TRUE
+ -DLUA_INCLUDE_DIR="/usr/include/lua5.1""
+conf_files="/etc/accel-ppp.conf /etc/accel-ppp.lua"
+make_dirs="
+ /var/log/accel-ppp 0755 root root
+ /var/lib/accel-ppp 0755 root root"
+makedepends="libnl-devel lua51-devel openssl-devel pcre-devel"
+depends="openssl pcre libnl lua51"
+short_desc="High performance PPTP/L2TP/PPPoE/IPoE server"
+maintainer="le34 <4le34n at gmail dot com>"
+license="GPL-2.0-or-later"
+homepage="https://accel-ppp.org"
+distfiles="https://github.com/xebd/accel-ppp/archive/cc8f2bada5635768d425e2fa2bafb095acda8ca9.tar.gz"
+checksum=d0e6b858b56402b9478b9a40a4e2887ff5f53756211dde3fa49bfa5f63c31d3e
+
+do_patch() {
+ vsed -i 's@RUNTIME DESTINATION sbin@RUNTIME DESTINATION bin@' \
+ "${wrksrc}/accel-pppd/CMakeLists.txt"
+}
+post_install() {
+ vdoc README
+ vlicense COPYING
+ vsv accel-pppd
+ vconf "${wrksrc}/accel-pppd/accel-ppp.conf"
+ vsconf "${wrksrc}/accel-pppd/accel-ppp.conf"
+ vconf ${FILESDIR}/accel-ppp.lua
+ vinstall ${FILESDIR}/accel-ppp.logrotate 644 etc/logrotate.d accel-ppp
+ vinstall ${FILESDIR}/dictionary.accel_ipoe 644 usr/share/accel-ppp/radius
+ vinstall ${FILESDIR}/dictionary.abills 644 usr/share/accel-ppp/radius
+ vinstall ${wrksrc}/accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt 644 usr/share/snmp/mibs
+}
+accel-ppp-ipoe-dkms_package() {
+ short_desc+=" - kernel module sources for dkms"
+ dkms_modules="accel-ppp-ipoe ${version}"
+ depends="dkms lua51-devel"
+
+ pkg_install() {
+ vmkdir usr/src/accel-ppp-ipoe-${version}
+ vcopy "drivers/ipoe/*" usr/src/accel-ppp-ipoe-${version}
+ vinstall "${FILESDIR}/ipoe.dkms" 0644 usr/src/accel-ppp-ipoe-${version} dkms.conf
+ sed -e "s/@PKGNAME@/${pkgname}/" \
+ -e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-ipoe-${version}/dkms.conf
+ }
+}
+accel-ppp-vlanmon-dkms_package() {
+ short_desc+=" - kernel module sources for dkms"
+ dkms_modules="accel-ppp-vlanmon ${version}"
+ depends="dkms"
+
+ pkg_install() {
+ vmkdir usr/src/accel-ppp-vlanmon-${version}
+ vcopy "drivers/vlan_mon/*" usr/src/accel-ppp-vlanmon-${version}
+ vinstall "${FILESDIR}/vlanmon.dkms" 0644 usr/src/accel-ppp-vlanmon-${version} dkms.conf
+ sed -e "s/@PKGNAME@/${pkgname}/" \
+ -e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-vlanmon-${version}/dkms.conf
+ }
+}
From 0b6f707962ca10c79cbb7113ac06c2c3ab5579ab Mon Sep 17 00:00:00 2001
From: Alexandr <joe.satriani@le34.ru>
Date: Tue, 18 Apr 2023 18:46:15 +1100
Subject: [PATCH 2/3] Fix: Check build / Lint template Failing (maintainer)
---
srcpkgs/accel-ppp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/accel-ppp/template b/srcpkgs/accel-ppp/template
index 5de51bfd2f1d..57df48ebd1cc 100644
--- a/srcpkgs/accel-ppp/template
+++ b/srcpkgs/accel-ppp/template
@@ -22,7 +22,7 @@ make_dirs="
makedepends="libnl-devel lua51-devel openssl-devel pcre-devel"
depends="openssl pcre libnl lua51"
short_desc="High performance PPTP/L2TP/PPPoE/IPoE server"
-maintainer="le34 <4le34n at gmail dot com>"
+maintainer="Alexandr <joe.satriani@le34.ru>"
license="GPL-2.0-or-later"
homepage="https://accel-ppp.org"
distfiles="https://github.com/xebd/accel-ppp/archive/cc8f2bada5635768d425e2fa2bafb095acda8ca9.tar.gz"
From e7a5962d426b0f0990f8f8ac66e7c237add7b506 Mon Sep 17 00:00:00 2001
From: Alexandr <joe.satriani@le34.ru>
Date: Tue, 18 Apr 2023 19:01:43 +1100
Subject: [PATCH 3/3] Fix: Check build / Lint template Failing (indent with
tabs)
---
srcpkgs/accel-ppp/template | 62 +++++++++++++++++++-------------------
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/srcpkgs/accel-ppp/template b/srcpkgs/accel-ppp/template
index 57df48ebd1cc..1ce00d4cbb11 100644
--- a/srcpkgs/accel-ppp/template
+++ b/srcpkgs/accel-ppp/template
@@ -29,44 +29,44 @@ distfiles="https://github.com/xebd/accel-ppp/archive/cc8f2bada5635768d425e2fa2ba
checksum=d0e6b858b56402b9478b9a40a4e2887ff5f53756211dde3fa49bfa5f63c31d3e
do_patch() {
- vsed -i 's@RUNTIME DESTINATION sbin@RUNTIME DESTINATION bin@' \
- "${wrksrc}/accel-pppd/CMakeLists.txt"
+ vsed -i 's@RUNTIME DESTINATION sbin@RUNTIME DESTINATION bin@' \
+ "${wrksrc}/accel-pppd/CMakeLists.txt"
}
post_install() {
- vdoc README
- vlicense COPYING
- vsv accel-pppd
- vconf "${wrksrc}/accel-pppd/accel-ppp.conf"
- vsconf "${wrksrc}/accel-pppd/accel-ppp.conf"
- vconf ${FILESDIR}/accel-ppp.lua
- vinstall ${FILESDIR}/accel-ppp.logrotate 644 etc/logrotate.d accel-ppp
- vinstall ${FILESDIR}/dictionary.accel_ipoe 644 usr/share/accel-ppp/radius
- vinstall ${FILESDIR}/dictionary.abills 644 usr/share/accel-ppp/radius
- vinstall ${wrksrc}/accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt 644 usr/share/snmp/mibs
+ vdoc README
+ vlicense COPYING
+ vsv accel-pppd
+ vconf "${wrksrc}/accel-pppd/accel-ppp.conf"
+ vsconf "${wrksrc}/accel-pppd/accel-ppp.conf"
+ vconf ${FILESDIR}/accel-ppp.lua
+ vinstall ${FILESDIR}/accel-ppp.logrotate 644 etc/logrotate.d accel-ppp
+ vinstall ${FILESDIR}/dictionary.accel_ipoe 644 usr/share/accel-ppp/radius
+ vinstall ${FILESDIR}/dictionary.abills 644 usr/share/accel-ppp/radius
+ vinstall ${wrksrc}/accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt 644 usr/share/snmp/mibs
}
accel-ppp-ipoe-dkms_package() {
- short_desc+=" - kernel module sources for dkms"
- dkms_modules="accel-ppp-ipoe ${version}"
- depends="dkms lua51-devel"
+ short_desc+=" - kernel module sources for dkms"
+ dkms_modules="accel-ppp-ipoe ${version}"
+ depends="dkms lua51-devel"
- pkg_install() {
- vmkdir usr/src/accel-ppp-ipoe-${version}
- vcopy "drivers/ipoe/*" usr/src/accel-ppp-ipoe-${version}
- vinstall "${FILESDIR}/ipoe.dkms" 0644 usr/src/accel-ppp-ipoe-${version} dkms.conf
- sed -e "s/@PKGNAME@/${pkgname}/" \
- -e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-ipoe-${version}/dkms.conf
- }
+ pkg_install() {
+ vmkdir usr/src/accel-ppp-ipoe-${version}
+ vcopy "drivers/ipoe/*" usr/src/accel-ppp-ipoe-${version}
+ vinstall "${FILESDIR}/ipoe.dkms" 0644 usr/src/accel-ppp-ipoe-${version} dkms.conf
+ sed -e "s/@PKGNAME@/${pkgname}/" \
+ -e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-ipoe-${version}/dkms.conf
+ }
}
accel-ppp-vlanmon-dkms_package() {
- short_desc+=" - kernel module sources for dkms"
- dkms_modules="accel-ppp-vlanmon ${version}"
- depends="dkms"
+ short_desc+=" - kernel module sources for dkms"
+ dkms_modules="accel-ppp-vlanmon ${version}"
+ depends="dkms"
- pkg_install() {
- vmkdir usr/src/accel-ppp-vlanmon-${version}
- vcopy "drivers/vlan_mon/*" usr/src/accel-ppp-vlanmon-${version}
+ pkg_install() {
+ vmkdir usr/src/accel-ppp-vlanmon-${version}
+ vcopy "drivers/vlan_mon/*" usr/src/accel-ppp-vlanmon-${version}
vinstall "${FILESDIR}/vlanmon.dkms" 0644 usr/src/accel-ppp-vlanmon-${version} dkms.conf
- sed -e "s/@PKGNAME@/${pkgname}/" \
- -e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-vlanmon-${version}/dkms.conf
- }
+ sed -e "s/@PKGNAME@/${pkgname}/" \
+ -e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-vlanmon-${version}/dkms.conf
+ }
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] New package: accel-ppp-20230127
2023-04-18 6:32 [PR PATCH] New package: accel-ppp-20230127 le34-void
2023-04-18 7:48 ` [PR PATCH] [Updated] " le34-void
2023-04-18 8:02 ` le34-void
@ 2023-04-18 8:08 ` le34-void
2023-04-18 8:15 ` le34-void
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: le34-void @ 2023-04-18 8:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 603 bytes --]
There is an updated pull request by le34-void against master on the void-packages repository
https://github.com/le34-void/void-packages mystuff
https://github.com/void-linux/void-packages/pull/43505
New package: accel-ppp-20230127
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/43505.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mystuff-43505.patch --]
[-- Type: text/x-diff, Size: 14410 bytes --]
From b1dc66645aa956945db7b3dfc38265649b720667 Mon Sep 17 00:00:00 2001
From: Alexandr <joe.satriani@le34.ru>
Date: Tue, 18 Apr 2023 17:00:42 +1100
Subject: [PATCH 1/4] New package: accel-ppp-20230127
---
srcpkgs/accel-ppp-ipoe-dkms | 1 +
srcpkgs/accel-ppp-vlanmon-dkms | 1 +
srcpkgs/accel-ppp/files/accel-ppp.logrotate | 7 ++
srcpkgs/accel-ppp/files/accel-ppp.lua | 31 ++++++++
srcpkgs/accel-ppp/files/accel-pppd/run | 6 ++
srcpkgs/accel-ppp/files/dictionary.abills | 13 ++++
srcpkgs/accel-ppp/files/dictionary.accel_ipoe | 6 ++
srcpkgs/accel-ppp/files/ipoe.dkms | 5 ++
srcpkgs/accel-ppp/files/vlanmon.dkms | 5 ++
srcpkgs/accel-ppp/template | 72 +++++++++++++++++++
10 files changed, 147 insertions(+)
create mode 120000 srcpkgs/accel-ppp-ipoe-dkms
create mode 120000 srcpkgs/accel-ppp-vlanmon-dkms
create mode 100644 srcpkgs/accel-ppp/files/accel-ppp.logrotate
create mode 100644 srcpkgs/accel-ppp/files/accel-ppp.lua
create mode 100644 srcpkgs/accel-ppp/files/accel-pppd/run
create mode 100644 srcpkgs/accel-ppp/files/dictionary.abills
create mode 100644 srcpkgs/accel-ppp/files/dictionary.accel_ipoe
create mode 100644 srcpkgs/accel-ppp/files/ipoe.dkms
create mode 100644 srcpkgs/accel-ppp/files/vlanmon.dkms
create mode 100644 srcpkgs/accel-ppp/template
diff --git a/srcpkgs/accel-ppp-ipoe-dkms b/srcpkgs/accel-ppp-ipoe-dkms
new file mode 120000
index 000000000000..17460e43b1cb
--- /dev/null
+++ b/srcpkgs/accel-ppp-ipoe-dkms
@@ -0,0 +1 @@
+accel-ppp
\ No newline at end of file
diff --git a/srcpkgs/accel-ppp-vlanmon-dkms b/srcpkgs/accel-ppp-vlanmon-dkms
new file mode 120000
index 000000000000..17460e43b1cb
--- /dev/null
+++ b/srcpkgs/accel-ppp-vlanmon-dkms
@@ -0,0 +1 @@
+accel-ppp
\ No newline at end of file
diff --git a/srcpkgs/accel-ppp/files/accel-ppp.logrotate b/srcpkgs/accel-ppp/files/accel-ppp.logrotate
new file mode 100644
index 000000000000..3c4e32b8f12f
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/accel-ppp.logrotate
@@ -0,0 +1,7 @@
+/var/log/accel-ppp/*.log {
+ missingok
+ sharedscripts
+ postrotate
+ test -r /run/accel-pppd.pid && kill -HUP `cat /run/accel-pppd.pid`
+ endscript
+}
diff --git a/srcpkgs/accel-ppp/files/accel-ppp.lua b/srcpkgs/accel-ppp/files/accel-ppp.lua
new file mode 100644
index 000000000000..5156270dd098
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/accel-ppp.lua
@@ -0,0 +1,31 @@
+function opt82_dlink(pkt)
+ v,b1,b2,b3,b4=string.unpack(pkt:agent_remote_id():sub(-4),'bbbb')
+ ip=b1..'.'..b2..'.'..b3..'.'..b4
+ v,port=string.unpack(string.sub(pkt:agent_circuit_id(),'-1'),'b')
+ local opt82=ip..'-'..port
+-- print(opt82)
+ return opt82
+end
+function example(ses)
+-- print('xid='..ses:hdr('xid'))
+-- print('ciaddr='..ses:hdr('ciaddr'))
+-- print('giaddr='..ses:hdr('giaddr'))
+-- print('chaddr='..ses:hdr('chaddr'))
+-- print('ifname='..ses:ifname())
+-- options=ses:options()
+-- for k,opt in ipairs(options) do print(opt) end
+ return '1234'
+end
+function ifname(pkt)
+ local ifname=pkt:ifname()
+ return ifname
+end
+function mac(pkt)
+ local mac=pkt:hdr("chaddr")
+ return mac
+end
+function qinq(pkt)
+ local qinq = string.sub(pkt:ifname(), string.find(pkt:ifname(), ".", 1, true)+1, 32)
+ return qinq
+end
+
diff --git a/srcpkgs/accel-ppp/files/accel-pppd/run b/srcpkgs/accel-ppp/files/accel-pppd/run
new file mode 100644
index 000000000000..f803d33d63fc
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/accel-pppd/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+exec 2>&1
+
+exec accel-pppd -p /run/accel-pppd.pid -c /etc/accel-ppp.conf
+
diff --git a/srcpkgs/accel-ppp/files/dictionary.abills b/srcpkgs/accel-ppp/files/dictionary.abills
new file mode 100644
index 000000000000..d1dea6a0d14f
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/dictionary.abills
@@ -0,0 +1,13 @@
+# Limit session traffic
+ATTRIBUTE Session-Octets-Limit 227 integer
+# What to assume as limit - 0 in+out, 1 in, 2 out, 3 max(in,out)
+ATTRIBUTE Octets-Direction 228 integer
+# Connection Speed Limit
+ATTRIBUTE PPPD-Upstream-Speed-Limit 230 integer
+ATTRIBUTE PPPD-Downstream-Speed-Limit 231 integer
+ATTRIBUTE PPPD-Upstream-Speed-Limit-1 232 integer
+ATTRIBUTE PPPD-Downstream-Speed-Limit-1 233 integer
+ATTRIBUTE PPPD-Upstream-Speed-Limit-2 234 integer
+ATTRIBUTE PPPD-Downstream-Speed-Limit-2 235 integer
+ATTRIBUTE PPPD-Upstream-Speed-Limit-3 236 integer
+ATTRIBUTE PPPD-Downstream-Speed-Limit-3 237 integer
diff --git a/srcpkgs/accel-ppp/files/dictionary.accel_ipoe b/srcpkgs/accel-ppp/files/dictionary.accel_ipoe
new file mode 100644
index 000000000000..fbe6f0ce7b7d
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/dictionary.accel_ipoe
@@ -0,0 +1,6 @@
+ATTRIBUTE DHCP-Client-IP-Address 240 ipaddr
+ATTRIBUTE DHCP-Router-IP-Address 241 ipaddr
+ATTRIBUTE DHCP-Mask 242 integer
+ATTRIBUTE DHCP-Lease-Time 242 integer
+ATTRIBUTE L4-Redirect 242 integer
+
diff --git a/srcpkgs/accel-ppp/files/ipoe.dkms b/srcpkgs/accel-ppp/files/ipoe.dkms
new file mode 100644
index 000000000000..3ae9bca31287
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/ipoe.dkms
@@ -0,0 +1,5 @@
+PACKAGE_NAME=@PKGNAME@
+PACKAGE_VERSION=@PKGVER@
+BUILT_MODULE_NAME="ipoe"
+DEST_MODULE_LOCATION="/kernel/misc"
+
diff --git a/srcpkgs/accel-ppp/files/vlanmon.dkms b/srcpkgs/accel-ppp/files/vlanmon.dkms
new file mode 100644
index 000000000000..d363e98c6b13
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/vlanmon.dkms
@@ -0,0 +1,5 @@
+PACKAGE_NAME=@PKGNAME@
+PACKAGE_VERSION=@PKGVER@
+BUILT_MODULE_NAME="vlan_mon"
+DEST_MODULE_LOCATION="/kernel/misc"
+
diff --git a/srcpkgs/accel-ppp/template b/srcpkgs/accel-ppp/template
new file mode 100644
index 000000000000..5de51bfd2f1d
--- /dev/null
+++ b/srcpkgs/accel-ppp/template
@@ -0,0 +1,72 @@
+# Template file for 'accel-ppp'
+pkgname=accel-ppp
+version=20230127
+revision=1
+_commit=cc8f2bada5635768d425e2fa2bafb095acda8ca9
+archs="i686 x86_64"
+build_style=cmake
+configure_args="-DCMAKE_SYSTEM_NAME=Linux
+ -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_BUILD_TYPE=Release
+ -DLOG_FILE=TRUE
+ -DLOG_PGSQL=FALSE
+ -DSHAPER=TRUE
+ -DRADIUS=TRUE
+ -DNETSNMP=FALSE
+ -DLUA=TRUE
+ -DLUA_INCLUDE_DIR="/usr/include/lua5.1""
+conf_files="/etc/accel-ppp.conf /etc/accel-ppp.lua"
+make_dirs="
+ /var/log/accel-ppp 0755 root root
+ /var/lib/accel-ppp 0755 root root"
+makedepends="libnl-devel lua51-devel openssl-devel pcre-devel"
+depends="openssl pcre libnl lua51"
+short_desc="High performance PPTP/L2TP/PPPoE/IPoE server"
+maintainer="le34 <4le34n at gmail dot com>"
+license="GPL-2.0-or-later"
+homepage="https://accel-ppp.org"
+distfiles="https://github.com/xebd/accel-ppp/archive/cc8f2bada5635768d425e2fa2bafb095acda8ca9.tar.gz"
+checksum=d0e6b858b56402b9478b9a40a4e2887ff5f53756211dde3fa49bfa5f63c31d3e
+
+do_patch() {
+ vsed -i 's@RUNTIME DESTINATION sbin@RUNTIME DESTINATION bin@' \
+ "${wrksrc}/accel-pppd/CMakeLists.txt"
+}
+post_install() {
+ vdoc README
+ vlicense COPYING
+ vsv accel-pppd
+ vconf "${wrksrc}/accel-pppd/accel-ppp.conf"
+ vsconf "${wrksrc}/accel-pppd/accel-ppp.conf"
+ vconf ${FILESDIR}/accel-ppp.lua
+ vinstall ${FILESDIR}/accel-ppp.logrotate 644 etc/logrotate.d accel-ppp
+ vinstall ${FILESDIR}/dictionary.accel_ipoe 644 usr/share/accel-ppp/radius
+ vinstall ${FILESDIR}/dictionary.abills 644 usr/share/accel-ppp/radius
+ vinstall ${wrksrc}/accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt 644 usr/share/snmp/mibs
+}
+accel-ppp-ipoe-dkms_package() {
+ short_desc+=" - kernel module sources for dkms"
+ dkms_modules="accel-ppp-ipoe ${version}"
+ depends="dkms lua51-devel"
+
+ pkg_install() {
+ vmkdir usr/src/accel-ppp-ipoe-${version}
+ vcopy "drivers/ipoe/*" usr/src/accel-ppp-ipoe-${version}
+ vinstall "${FILESDIR}/ipoe.dkms" 0644 usr/src/accel-ppp-ipoe-${version} dkms.conf
+ sed -e "s/@PKGNAME@/${pkgname}/" \
+ -e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-ipoe-${version}/dkms.conf
+ }
+}
+accel-ppp-vlanmon-dkms_package() {
+ short_desc+=" - kernel module sources for dkms"
+ dkms_modules="accel-ppp-vlanmon ${version}"
+ depends="dkms"
+
+ pkg_install() {
+ vmkdir usr/src/accel-ppp-vlanmon-${version}
+ vcopy "drivers/vlan_mon/*" usr/src/accel-ppp-vlanmon-${version}
+ vinstall "${FILESDIR}/vlanmon.dkms" 0644 usr/src/accel-ppp-vlanmon-${version} dkms.conf
+ sed -e "s/@PKGNAME@/${pkgname}/" \
+ -e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-vlanmon-${version}/dkms.conf
+ }
+}
From 0b6f707962ca10c79cbb7113ac06c2c3ab5579ab Mon Sep 17 00:00:00 2001
From: Alexandr <joe.satriani@le34.ru>
Date: Tue, 18 Apr 2023 18:46:15 +1100
Subject: [PATCH 2/4] Fix: Check build / Lint template Failing (maintainer)
---
srcpkgs/accel-ppp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/accel-ppp/template b/srcpkgs/accel-ppp/template
index 5de51bfd2f1d..57df48ebd1cc 100644
--- a/srcpkgs/accel-ppp/template
+++ b/srcpkgs/accel-ppp/template
@@ -22,7 +22,7 @@ make_dirs="
makedepends="libnl-devel lua51-devel openssl-devel pcre-devel"
depends="openssl pcre libnl lua51"
short_desc="High performance PPTP/L2TP/PPPoE/IPoE server"
-maintainer="le34 <4le34n at gmail dot com>"
+maintainer="Alexandr <joe.satriani@le34.ru>"
license="GPL-2.0-or-later"
homepage="https://accel-ppp.org"
distfiles="https://github.com/xebd/accel-ppp/archive/cc8f2bada5635768d425e2fa2bafb095acda8ca9.tar.gz"
From e7a5962d426b0f0990f8f8ac66e7c237add7b506 Mon Sep 17 00:00:00 2001
From: Alexandr <joe.satriani@le34.ru>
Date: Tue, 18 Apr 2023 19:01:43 +1100
Subject: [PATCH 3/4] Fix: Check build / Lint template Failing (indent with
tabs)
---
srcpkgs/accel-ppp/template | 62 +++++++++++++++++++-------------------
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/srcpkgs/accel-ppp/template b/srcpkgs/accel-ppp/template
index 57df48ebd1cc..1ce00d4cbb11 100644
--- a/srcpkgs/accel-ppp/template
+++ b/srcpkgs/accel-ppp/template
@@ -29,44 +29,44 @@ distfiles="https://github.com/xebd/accel-ppp/archive/cc8f2bada5635768d425e2fa2ba
checksum=d0e6b858b56402b9478b9a40a4e2887ff5f53756211dde3fa49bfa5f63c31d3e
do_patch() {
- vsed -i 's@RUNTIME DESTINATION sbin@RUNTIME DESTINATION bin@' \
- "${wrksrc}/accel-pppd/CMakeLists.txt"
+ vsed -i 's@RUNTIME DESTINATION sbin@RUNTIME DESTINATION bin@' \
+ "${wrksrc}/accel-pppd/CMakeLists.txt"
}
post_install() {
- vdoc README
- vlicense COPYING
- vsv accel-pppd
- vconf "${wrksrc}/accel-pppd/accel-ppp.conf"
- vsconf "${wrksrc}/accel-pppd/accel-ppp.conf"
- vconf ${FILESDIR}/accel-ppp.lua
- vinstall ${FILESDIR}/accel-ppp.logrotate 644 etc/logrotate.d accel-ppp
- vinstall ${FILESDIR}/dictionary.accel_ipoe 644 usr/share/accel-ppp/radius
- vinstall ${FILESDIR}/dictionary.abills 644 usr/share/accel-ppp/radius
- vinstall ${wrksrc}/accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt 644 usr/share/snmp/mibs
+ vdoc README
+ vlicense COPYING
+ vsv accel-pppd
+ vconf "${wrksrc}/accel-pppd/accel-ppp.conf"
+ vsconf "${wrksrc}/accel-pppd/accel-ppp.conf"
+ vconf ${FILESDIR}/accel-ppp.lua
+ vinstall ${FILESDIR}/accel-ppp.logrotate 644 etc/logrotate.d accel-ppp
+ vinstall ${FILESDIR}/dictionary.accel_ipoe 644 usr/share/accel-ppp/radius
+ vinstall ${FILESDIR}/dictionary.abills 644 usr/share/accel-ppp/radius
+ vinstall ${wrksrc}/accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt 644 usr/share/snmp/mibs
}
accel-ppp-ipoe-dkms_package() {
- short_desc+=" - kernel module sources for dkms"
- dkms_modules="accel-ppp-ipoe ${version}"
- depends="dkms lua51-devel"
+ short_desc+=" - kernel module sources for dkms"
+ dkms_modules="accel-ppp-ipoe ${version}"
+ depends="dkms lua51-devel"
- pkg_install() {
- vmkdir usr/src/accel-ppp-ipoe-${version}
- vcopy "drivers/ipoe/*" usr/src/accel-ppp-ipoe-${version}
- vinstall "${FILESDIR}/ipoe.dkms" 0644 usr/src/accel-ppp-ipoe-${version} dkms.conf
- sed -e "s/@PKGNAME@/${pkgname}/" \
- -e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-ipoe-${version}/dkms.conf
- }
+ pkg_install() {
+ vmkdir usr/src/accel-ppp-ipoe-${version}
+ vcopy "drivers/ipoe/*" usr/src/accel-ppp-ipoe-${version}
+ vinstall "${FILESDIR}/ipoe.dkms" 0644 usr/src/accel-ppp-ipoe-${version} dkms.conf
+ sed -e "s/@PKGNAME@/${pkgname}/" \
+ -e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-ipoe-${version}/dkms.conf
+ }
}
accel-ppp-vlanmon-dkms_package() {
- short_desc+=" - kernel module sources for dkms"
- dkms_modules="accel-ppp-vlanmon ${version}"
- depends="dkms"
+ short_desc+=" - kernel module sources for dkms"
+ dkms_modules="accel-ppp-vlanmon ${version}"
+ depends="dkms"
- pkg_install() {
- vmkdir usr/src/accel-ppp-vlanmon-${version}
- vcopy "drivers/vlan_mon/*" usr/src/accel-ppp-vlanmon-${version}
+ pkg_install() {
+ vmkdir usr/src/accel-ppp-vlanmon-${version}
+ vcopy "drivers/vlan_mon/*" usr/src/accel-ppp-vlanmon-${version}
vinstall "${FILESDIR}/vlanmon.dkms" 0644 usr/src/accel-ppp-vlanmon-${version} dkms.conf
- sed -e "s/@PKGNAME@/${pkgname}/" \
- -e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-vlanmon-${version}/dkms.conf
- }
+ sed -e "s/@PKGNAME@/${pkgname}/" \
+ -e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-vlanmon-${version}/dkms.conf
+ }
}
From ee1f96e5e3c6d556aa00278bdbb735ca98ebf3ac Mon Sep 17 00:00:00 2001
From: Alexandr <joe.satriani@le34.ru>
Date: Tue, 18 Apr 2023 19:07:48 +1100
Subject: [PATCH 4/4] Fix: Check build / Lint template Failing (indent with
tabs)
---
srcpkgs/accel-ppp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/accel-ppp/template b/srcpkgs/accel-ppp/template
index 1ce00d4cbb11..3337b710e753 100644
--- a/srcpkgs/accel-ppp/template
+++ b/srcpkgs/accel-ppp/template
@@ -65,7 +65,7 @@ accel-ppp-vlanmon-dkms_package() {
pkg_install() {
vmkdir usr/src/accel-ppp-vlanmon-${version}
vcopy "drivers/vlan_mon/*" usr/src/accel-ppp-vlanmon-${version}
- vinstall "${FILESDIR}/vlanmon.dkms" 0644 usr/src/accel-ppp-vlanmon-${version} dkms.conf
+ vinstall "${FILESDIR}/vlanmon.dkms" 0644 usr/src/accel-ppp-vlanmon-${version} dkms.conf
sed -e "s/@PKGNAME@/${pkgname}/" \
-e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-vlanmon-${version}/dkms.conf
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] New package: accel-ppp-20230127
2023-04-18 6:32 [PR PATCH] New package: accel-ppp-20230127 le34-void
` (2 preceding siblings ...)
2023-04-18 8:08 ` le34-void
@ 2023-04-18 8:15 ` le34-void
2023-05-01 10:21 ` le34-void
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: le34-void @ 2023-04-18 8:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 603 bytes --]
There is an updated pull request by le34-void against master on the void-packages repository
https://github.com/le34-void/void-packages mystuff
https://github.com/void-linux/void-packages/pull/43505
New package: accel-ppp-20230127
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/43505.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mystuff-43505.patch --]
[-- Type: text/x-diff, Size: 15093 bytes --]
From b1dc66645aa956945db7b3dfc38265649b720667 Mon Sep 17 00:00:00 2001
From: Alexandr <joe.satriani@le34.ru>
Date: Tue, 18 Apr 2023 17:00:42 +1100
Subject: [PATCH 1/5] New package: accel-ppp-20230127
---
srcpkgs/accel-ppp-ipoe-dkms | 1 +
srcpkgs/accel-ppp-vlanmon-dkms | 1 +
srcpkgs/accel-ppp/files/accel-ppp.logrotate | 7 ++
srcpkgs/accel-ppp/files/accel-ppp.lua | 31 ++++++++
srcpkgs/accel-ppp/files/accel-pppd/run | 6 ++
srcpkgs/accel-ppp/files/dictionary.abills | 13 ++++
srcpkgs/accel-ppp/files/dictionary.accel_ipoe | 6 ++
srcpkgs/accel-ppp/files/ipoe.dkms | 5 ++
srcpkgs/accel-ppp/files/vlanmon.dkms | 5 ++
srcpkgs/accel-ppp/template | 72 +++++++++++++++++++
10 files changed, 147 insertions(+)
create mode 120000 srcpkgs/accel-ppp-ipoe-dkms
create mode 120000 srcpkgs/accel-ppp-vlanmon-dkms
create mode 100644 srcpkgs/accel-ppp/files/accel-ppp.logrotate
create mode 100644 srcpkgs/accel-ppp/files/accel-ppp.lua
create mode 100644 srcpkgs/accel-ppp/files/accel-pppd/run
create mode 100644 srcpkgs/accel-ppp/files/dictionary.abills
create mode 100644 srcpkgs/accel-ppp/files/dictionary.accel_ipoe
create mode 100644 srcpkgs/accel-ppp/files/ipoe.dkms
create mode 100644 srcpkgs/accel-ppp/files/vlanmon.dkms
create mode 100644 srcpkgs/accel-ppp/template
diff --git a/srcpkgs/accel-ppp-ipoe-dkms b/srcpkgs/accel-ppp-ipoe-dkms
new file mode 120000
index 000000000000..17460e43b1cb
--- /dev/null
+++ b/srcpkgs/accel-ppp-ipoe-dkms
@@ -0,0 +1 @@
+accel-ppp
\ No newline at end of file
diff --git a/srcpkgs/accel-ppp-vlanmon-dkms b/srcpkgs/accel-ppp-vlanmon-dkms
new file mode 120000
index 000000000000..17460e43b1cb
--- /dev/null
+++ b/srcpkgs/accel-ppp-vlanmon-dkms
@@ -0,0 +1 @@
+accel-ppp
\ No newline at end of file
diff --git a/srcpkgs/accel-ppp/files/accel-ppp.logrotate b/srcpkgs/accel-ppp/files/accel-ppp.logrotate
new file mode 100644
index 000000000000..3c4e32b8f12f
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/accel-ppp.logrotate
@@ -0,0 +1,7 @@
+/var/log/accel-ppp/*.log {
+ missingok
+ sharedscripts
+ postrotate
+ test -r /run/accel-pppd.pid && kill -HUP `cat /run/accel-pppd.pid`
+ endscript
+}
diff --git a/srcpkgs/accel-ppp/files/accel-ppp.lua b/srcpkgs/accel-ppp/files/accel-ppp.lua
new file mode 100644
index 000000000000..5156270dd098
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/accel-ppp.lua
@@ -0,0 +1,31 @@
+function opt82_dlink(pkt)
+ v,b1,b2,b3,b4=string.unpack(pkt:agent_remote_id():sub(-4),'bbbb')
+ ip=b1..'.'..b2..'.'..b3..'.'..b4
+ v,port=string.unpack(string.sub(pkt:agent_circuit_id(),'-1'),'b')
+ local opt82=ip..'-'..port
+-- print(opt82)
+ return opt82
+end
+function example(ses)
+-- print('xid='..ses:hdr('xid'))
+-- print('ciaddr='..ses:hdr('ciaddr'))
+-- print('giaddr='..ses:hdr('giaddr'))
+-- print('chaddr='..ses:hdr('chaddr'))
+-- print('ifname='..ses:ifname())
+-- options=ses:options()
+-- for k,opt in ipairs(options) do print(opt) end
+ return '1234'
+end
+function ifname(pkt)
+ local ifname=pkt:ifname()
+ return ifname
+end
+function mac(pkt)
+ local mac=pkt:hdr("chaddr")
+ return mac
+end
+function qinq(pkt)
+ local qinq = string.sub(pkt:ifname(), string.find(pkt:ifname(), ".", 1, true)+1, 32)
+ return qinq
+end
+
diff --git a/srcpkgs/accel-ppp/files/accel-pppd/run b/srcpkgs/accel-ppp/files/accel-pppd/run
new file mode 100644
index 000000000000..f803d33d63fc
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/accel-pppd/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+exec 2>&1
+
+exec accel-pppd -p /run/accel-pppd.pid -c /etc/accel-ppp.conf
+
diff --git a/srcpkgs/accel-ppp/files/dictionary.abills b/srcpkgs/accel-ppp/files/dictionary.abills
new file mode 100644
index 000000000000..d1dea6a0d14f
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/dictionary.abills
@@ -0,0 +1,13 @@
+# Limit session traffic
+ATTRIBUTE Session-Octets-Limit 227 integer
+# What to assume as limit - 0 in+out, 1 in, 2 out, 3 max(in,out)
+ATTRIBUTE Octets-Direction 228 integer
+# Connection Speed Limit
+ATTRIBUTE PPPD-Upstream-Speed-Limit 230 integer
+ATTRIBUTE PPPD-Downstream-Speed-Limit 231 integer
+ATTRIBUTE PPPD-Upstream-Speed-Limit-1 232 integer
+ATTRIBUTE PPPD-Downstream-Speed-Limit-1 233 integer
+ATTRIBUTE PPPD-Upstream-Speed-Limit-2 234 integer
+ATTRIBUTE PPPD-Downstream-Speed-Limit-2 235 integer
+ATTRIBUTE PPPD-Upstream-Speed-Limit-3 236 integer
+ATTRIBUTE PPPD-Downstream-Speed-Limit-3 237 integer
diff --git a/srcpkgs/accel-ppp/files/dictionary.accel_ipoe b/srcpkgs/accel-ppp/files/dictionary.accel_ipoe
new file mode 100644
index 000000000000..fbe6f0ce7b7d
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/dictionary.accel_ipoe
@@ -0,0 +1,6 @@
+ATTRIBUTE DHCP-Client-IP-Address 240 ipaddr
+ATTRIBUTE DHCP-Router-IP-Address 241 ipaddr
+ATTRIBUTE DHCP-Mask 242 integer
+ATTRIBUTE DHCP-Lease-Time 242 integer
+ATTRIBUTE L4-Redirect 242 integer
+
diff --git a/srcpkgs/accel-ppp/files/ipoe.dkms b/srcpkgs/accel-ppp/files/ipoe.dkms
new file mode 100644
index 000000000000..3ae9bca31287
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/ipoe.dkms
@@ -0,0 +1,5 @@
+PACKAGE_NAME=@PKGNAME@
+PACKAGE_VERSION=@PKGVER@
+BUILT_MODULE_NAME="ipoe"
+DEST_MODULE_LOCATION="/kernel/misc"
+
diff --git a/srcpkgs/accel-ppp/files/vlanmon.dkms b/srcpkgs/accel-ppp/files/vlanmon.dkms
new file mode 100644
index 000000000000..d363e98c6b13
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/vlanmon.dkms
@@ -0,0 +1,5 @@
+PACKAGE_NAME=@PKGNAME@
+PACKAGE_VERSION=@PKGVER@
+BUILT_MODULE_NAME="vlan_mon"
+DEST_MODULE_LOCATION="/kernel/misc"
+
diff --git a/srcpkgs/accel-ppp/template b/srcpkgs/accel-ppp/template
new file mode 100644
index 000000000000..5de51bfd2f1d
--- /dev/null
+++ b/srcpkgs/accel-ppp/template
@@ -0,0 +1,72 @@
+# Template file for 'accel-ppp'
+pkgname=accel-ppp
+version=20230127
+revision=1
+_commit=cc8f2bada5635768d425e2fa2bafb095acda8ca9
+archs="i686 x86_64"
+build_style=cmake
+configure_args="-DCMAKE_SYSTEM_NAME=Linux
+ -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_BUILD_TYPE=Release
+ -DLOG_FILE=TRUE
+ -DLOG_PGSQL=FALSE
+ -DSHAPER=TRUE
+ -DRADIUS=TRUE
+ -DNETSNMP=FALSE
+ -DLUA=TRUE
+ -DLUA_INCLUDE_DIR="/usr/include/lua5.1""
+conf_files="/etc/accel-ppp.conf /etc/accel-ppp.lua"
+make_dirs="
+ /var/log/accel-ppp 0755 root root
+ /var/lib/accel-ppp 0755 root root"
+makedepends="libnl-devel lua51-devel openssl-devel pcre-devel"
+depends="openssl pcre libnl lua51"
+short_desc="High performance PPTP/L2TP/PPPoE/IPoE server"
+maintainer="le34 <4le34n at gmail dot com>"
+license="GPL-2.0-or-later"
+homepage="https://accel-ppp.org"
+distfiles="https://github.com/xebd/accel-ppp/archive/cc8f2bada5635768d425e2fa2bafb095acda8ca9.tar.gz"
+checksum=d0e6b858b56402b9478b9a40a4e2887ff5f53756211dde3fa49bfa5f63c31d3e
+
+do_patch() {
+ vsed -i 's@RUNTIME DESTINATION sbin@RUNTIME DESTINATION bin@' \
+ "${wrksrc}/accel-pppd/CMakeLists.txt"
+}
+post_install() {
+ vdoc README
+ vlicense COPYING
+ vsv accel-pppd
+ vconf "${wrksrc}/accel-pppd/accel-ppp.conf"
+ vsconf "${wrksrc}/accel-pppd/accel-ppp.conf"
+ vconf ${FILESDIR}/accel-ppp.lua
+ vinstall ${FILESDIR}/accel-ppp.logrotate 644 etc/logrotate.d accel-ppp
+ vinstall ${FILESDIR}/dictionary.accel_ipoe 644 usr/share/accel-ppp/radius
+ vinstall ${FILESDIR}/dictionary.abills 644 usr/share/accel-ppp/radius
+ vinstall ${wrksrc}/accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt 644 usr/share/snmp/mibs
+}
+accel-ppp-ipoe-dkms_package() {
+ short_desc+=" - kernel module sources for dkms"
+ dkms_modules="accel-ppp-ipoe ${version}"
+ depends="dkms lua51-devel"
+
+ pkg_install() {
+ vmkdir usr/src/accel-ppp-ipoe-${version}
+ vcopy "drivers/ipoe/*" usr/src/accel-ppp-ipoe-${version}
+ vinstall "${FILESDIR}/ipoe.dkms" 0644 usr/src/accel-ppp-ipoe-${version} dkms.conf
+ sed -e "s/@PKGNAME@/${pkgname}/" \
+ -e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-ipoe-${version}/dkms.conf
+ }
+}
+accel-ppp-vlanmon-dkms_package() {
+ short_desc+=" - kernel module sources for dkms"
+ dkms_modules="accel-ppp-vlanmon ${version}"
+ depends="dkms"
+
+ pkg_install() {
+ vmkdir usr/src/accel-ppp-vlanmon-${version}
+ vcopy "drivers/vlan_mon/*" usr/src/accel-ppp-vlanmon-${version}
+ vinstall "${FILESDIR}/vlanmon.dkms" 0644 usr/src/accel-ppp-vlanmon-${version} dkms.conf
+ sed -e "s/@PKGNAME@/${pkgname}/" \
+ -e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-vlanmon-${version}/dkms.conf
+ }
+}
From 0b6f707962ca10c79cbb7113ac06c2c3ab5579ab Mon Sep 17 00:00:00 2001
From: Alexandr <joe.satriani@le34.ru>
Date: Tue, 18 Apr 2023 18:46:15 +1100
Subject: [PATCH 2/5] Fix: Check build / Lint template Failing (maintainer)
---
srcpkgs/accel-ppp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/accel-ppp/template b/srcpkgs/accel-ppp/template
index 5de51bfd2f1d..57df48ebd1cc 100644
--- a/srcpkgs/accel-ppp/template
+++ b/srcpkgs/accel-ppp/template
@@ -22,7 +22,7 @@ make_dirs="
makedepends="libnl-devel lua51-devel openssl-devel pcre-devel"
depends="openssl pcre libnl lua51"
short_desc="High performance PPTP/L2TP/PPPoE/IPoE server"
-maintainer="le34 <4le34n at gmail dot com>"
+maintainer="Alexandr <joe.satriani@le34.ru>"
license="GPL-2.0-or-later"
homepage="https://accel-ppp.org"
distfiles="https://github.com/xebd/accel-ppp/archive/cc8f2bada5635768d425e2fa2bafb095acda8ca9.tar.gz"
From e7a5962d426b0f0990f8f8ac66e7c237add7b506 Mon Sep 17 00:00:00 2001
From: Alexandr <joe.satriani@le34.ru>
Date: Tue, 18 Apr 2023 19:01:43 +1100
Subject: [PATCH 3/5] Fix: Check build / Lint template Failing (indent with
tabs)
---
srcpkgs/accel-ppp/template | 62 +++++++++++++++++++-------------------
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/srcpkgs/accel-ppp/template b/srcpkgs/accel-ppp/template
index 57df48ebd1cc..1ce00d4cbb11 100644
--- a/srcpkgs/accel-ppp/template
+++ b/srcpkgs/accel-ppp/template
@@ -29,44 +29,44 @@ distfiles="https://github.com/xebd/accel-ppp/archive/cc8f2bada5635768d425e2fa2ba
checksum=d0e6b858b56402b9478b9a40a4e2887ff5f53756211dde3fa49bfa5f63c31d3e
do_patch() {
- vsed -i 's@RUNTIME DESTINATION sbin@RUNTIME DESTINATION bin@' \
- "${wrksrc}/accel-pppd/CMakeLists.txt"
+ vsed -i 's@RUNTIME DESTINATION sbin@RUNTIME DESTINATION bin@' \
+ "${wrksrc}/accel-pppd/CMakeLists.txt"
}
post_install() {
- vdoc README
- vlicense COPYING
- vsv accel-pppd
- vconf "${wrksrc}/accel-pppd/accel-ppp.conf"
- vsconf "${wrksrc}/accel-pppd/accel-ppp.conf"
- vconf ${FILESDIR}/accel-ppp.lua
- vinstall ${FILESDIR}/accel-ppp.logrotate 644 etc/logrotate.d accel-ppp
- vinstall ${FILESDIR}/dictionary.accel_ipoe 644 usr/share/accel-ppp/radius
- vinstall ${FILESDIR}/dictionary.abills 644 usr/share/accel-ppp/radius
- vinstall ${wrksrc}/accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt 644 usr/share/snmp/mibs
+ vdoc README
+ vlicense COPYING
+ vsv accel-pppd
+ vconf "${wrksrc}/accel-pppd/accel-ppp.conf"
+ vsconf "${wrksrc}/accel-pppd/accel-ppp.conf"
+ vconf ${FILESDIR}/accel-ppp.lua
+ vinstall ${FILESDIR}/accel-ppp.logrotate 644 etc/logrotate.d accel-ppp
+ vinstall ${FILESDIR}/dictionary.accel_ipoe 644 usr/share/accel-ppp/radius
+ vinstall ${FILESDIR}/dictionary.abills 644 usr/share/accel-ppp/radius
+ vinstall ${wrksrc}/accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt 644 usr/share/snmp/mibs
}
accel-ppp-ipoe-dkms_package() {
- short_desc+=" - kernel module sources for dkms"
- dkms_modules="accel-ppp-ipoe ${version}"
- depends="dkms lua51-devel"
+ short_desc+=" - kernel module sources for dkms"
+ dkms_modules="accel-ppp-ipoe ${version}"
+ depends="dkms lua51-devel"
- pkg_install() {
- vmkdir usr/src/accel-ppp-ipoe-${version}
- vcopy "drivers/ipoe/*" usr/src/accel-ppp-ipoe-${version}
- vinstall "${FILESDIR}/ipoe.dkms" 0644 usr/src/accel-ppp-ipoe-${version} dkms.conf
- sed -e "s/@PKGNAME@/${pkgname}/" \
- -e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-ipoe-${version}/dkms.conf
- }
+ pkg_install() {
+ vmkdir usr/src/accel-ppp-ipoe-${version}
+ vcopy "drivers/ipoe/*" usr/src/accel-ppp-ipoe-${version}
+ vinstall "${FILESDIR}/ipoe.dkms" 0644 usr/src/accel-ppp-ipoe-${version} dkms.conf
+ sed -e "s/@PKGNAME@/${pkgname}/" \
+ -e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-ipoe-${version}/dkms.conf
+ }
}
accel-ppp-vlanmon-dkms_package() {
- short_desc+=" - kernel module sources for dkms"
- dkms_modules="accel-ppp-vlanmon ${version}"
- depends="dkms"
+ short_desc+=" - kernel module sources for dkms"
+ dkms_modules="accel-ppp-vlanmon ${version}"
+ depends="dkms"
- pkg_install() {
- vmkdir usr/src/accel-ppp-vlanmon-${version}
- vcopy "drivers/vlan_mon/*" usr/src/accel-ppp-vlanmon-${version}
+ pkg_install() {
+ vmkdir usr/src/accel-ppp-vlanmon-${version}
+ vcopy "drivers/vlan_mon/*" usr/src/accel-ppp-vlanmon-${version}
vinstall "${FILESDIR}/vlanmon.dkms" 0644 usr/src/accel-ppp-vlanmon-${version} dkms.conf
- sed -e "s/@PKGNAME@/${pkgname}/" \
- -e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-vlanmon-${version}/dkms.conf
- }
+ sed -e "s/@PKGNAME@/${pkgname}/" \
+ -e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-vlanmon-${version}/dkms.conf
+ }
}
From ee1f96e5e3c6d556aa00278bdbb735ca98ebf3ac Mon Sep 17 00:00:00 2001
From: Alexandr <joe.satriani@le34.ru>
Date: Tue, 18 Apr 2023 19:07:48 +1100
Subject: [PATCH 4/5] Fix: Check build / Lint template Failing (indent with
tabs)
---
srcpkgs/accel-ppp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/accel-ppp/template b/srcpkgs/accel-ppp/template
index 1ce00d4cbb11..3337b710e753 100644
--- a/srcpkgs/accel-ppp/template
+++ b/srcpkgs/accel-ppp/template
@@ -65,7 +65,7 @@ accel-ppp-vlanmon-dkms_package() {
pkg_install() {
vmkdir usr/src/accel-ppp-vlanmon-${version}
vcopy "drivers/vlan_mon/*" usr/src/accel-ppp-vlanmon-${version}
- vinstall "${FILESDIR}/vlanmon.dkms" 0644 usr/src/accel-ppp-vlanmon-${version} dkms.conf
+ vinstall "${FILESDIR}/vlanmon.dkms" 0644 usr/src/accel-ppp-vlanmon-${version} dkms.conf
sed -e "s/@PKGNAME@/${pkgname}/" \
-e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-vlanmon-${version}/dkms.conf
}
From 16bd70537766c7070c2c0bc9428272062c2a5c83 Mon Sep 17 00:00:00 2001
From: Alexandr <joe.satriani@le34.ru>
Date: Tue, 18 Apr 2023 19:15:05 +1100
Subject: [PATCH 5/5] template: remove archs array (archs=...)
---
srcpkgs/accel-ppp/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/accel-ppp/template b/srcpkgs/accel-ppp/template
index 3337b710e753..751bb760514d 100644
--- a/srcpkgs/accel-ppp/template
+++ b/srcpkgs/accel-ppp/template
@@ -3,7 +3,6 @@ pkgname=accel-ppp
version=20230127
revision=1
_commit=cc8f2bada5635768d425e2fa2bafb095acda8ca9
-archs="i686 x86_64"
build_style=cmake
configure_args="-DCMAKE_SYSTEM_NAME=Linux
-DCMAKE_INSTALL_PREFIX=/usr
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] New package: accel-ppp-20230127
2023-04-18 6:32 [PR PATCH] New package: accel-ppp-20230127 le34-void
` (3 preceding siblings ...)
2023-04-18 8:15 ` le34-void
@ 2023-05-01 10:21 ` le34-void
2023-05-03 13:57 ` le34-void
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: le34-void @ 2023-05-01 10:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 603 bytes --]
There is an updated pull request by le34-void against master on the void-packages repository
https://github.com/le34-void/void-packages mystuff
https://github.com/void-linux/void-packages/pull/43505
New package: accel-ppp-20230127
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/43505.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mystuff-43505.patch --]
[-- Type: text/x-diff, Size: 21187 bytes --]
From b1dc66645aa956945db7b3dfc38265649b720667 Mon Sep 17 00:00:00 2001
From: Alexandr <joe.satriani@le34.ru>
Date: Tue, 18 Apr 2023 17:00:42 +1100
Subject: [PATCH 1/6] New package: accel-ppp-20230127
---
srcpkgs/accel-ppp-ipoe-dkms | 1 +
srcpkgs/accel-ppp-vlanmon-dkms | 1 +
srcpkgs/accel-ppp/files/accel-ppp.logrotate | 7 ++
srcpkgs/accel-ppp/files/accel-ppp.lua | 31 ++++++++
srcpkgs/accel-ppp/files/accel-pppd/run | 6 ++
srcpkgs/accel-ppp/files/dictionary.abills | 13 ++++
srcpkgs/accel-ppp/files/dictionary.accel_ipoe | 6 ++
srcpkgs/accel-ppp/files/ipoe.dkms | 5 ++
srcpkgs/accel-ppp/files/vlanmon.dkms | 5 ++
srcpkgs/accel-ppp/template | 72 +++++++++++++++++++
10 files changed, 147 insertions(+)
create mode 120000 srcpkgs/accel-ppp-ipoe-dkms
create mode 120000 srcpkgs/accel-ppp-vlanmon-dkms
create mode 100644 srcpkgs/accel-ppp/files/accel-ppp.logrotate
create mode 100644 srcpkgs/accel-ppp/files/accel-ppp.lua
create mode 100644 srcpkgs/accel-ppp/files/accel-pppd/run
create mode 100644 srcpkgs/accel-ppp/files/dictionary.abills
create mode 100644 srcpkgs/accel-ppp/files/dictionary.accel_ipoe
create mode 100644 srcpkgs/accel-ppp/files/ipoe.dkms
create mode 100644 srcpkgs/accel-ppp/files/vlanmon.dkms
create mode 100644 srcpkgs/accel-ppp/template
diff --git a/srcpkgs/accel-ppp-ipoe-dkms b/srcpkgs/accel-ppp-ipoe-dkms
new file mode 120000
index 000000000000..17460e43b1cb
--- /dev/null
+++ b/srcpkgs/accel-ppp-ipoe-dkms
@@ -0,0 +1 @@
+accel-ppp
\ No newline at end of file
diff --git a/srcpkgs/accel-ppp-vlanmon-dkms b/srcpkgs/accel-ppp-vlanmon-dkms
new file mode 120000
index 000000000000..17460e43b1cb
--- /dev/null
+++ b/srcpkgs/accel-ppp-vlanmon-dkms
@@ -0,0 +1 @@
+accel-ppp
\ No newline at end of file
diff --git a/srcpkgs/accel-ppp/files/accel-ppp.logrotate b/srcpkgs/accel-ppp/files/accel-ppp.logrotate
new file mode 100644
index 000000000000..3c4e32b8f12f
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/accel-ppp.logrotate
@@ -0,0 +1,7 @@
+/var/log/accel-ppp/*.log {
+ missingok
+ sharedscripts
+ postrotate
+ test -r /run/accel-pppd.pid && kill -HUP `cat /run/accel-pppd.pid`
+ endscript
+}
diff --git a/srcpkgs/accel-ppp/files/accel-ppp.lua b/srcpkgs/accel-ppp/files/accel-ppp.lua
new file mode 100644
index 000000000000..5156270dd098
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/accel-ppp.lua
@@ -0,0 +1,31 @@
+function opt82_dlink(pkt)
+ v,b1,b2,b3,b4=string.unpack(pkt:agent_remote_id():sub(-4),'bbbb')
+ ip=b1..'.'..b2..'.'..b3..'.'..b4
+ v,port=string.unpack(string.sub(pkt:agent_circuit_id(),'-1'),'b')
+ local opt82=ip..'-'..port
+-- print(opt82)
+ return opt82
+end
+function example(ses)
+-- print('xid='..ses:hdr('xid'))
+-- print('ciaddr='..ses:hdr('ciaddr'))
+-- print('giaddr='..ses:hdr('giaddr'))
+-- print('chaddr='..ses:hdr('chaddr'))
+-- print('ifname='..ses:ifname())
+-- options=ses:options()
+-- for k,opt in ipairs(options) do print(opt) end
+ return '1234'
+end
+function ifname(pkt)
+ local ifname=pkt:ifname()
+ return ifname
+end
+function mac(pkt)
+ local mac=pkt:hdr("chaddr")
+ return mac
+end
+function qinq(pkt)
+ local qinq = string.sub(pkt:ifname(), string.find(pkt:ifname(), ".", 1, true)+1, 32)
+ return qinq
+end
+
diff --git a/srcpkgs/accel-ppp/files/accel-pppd/run b/srcpkgs/accel-ppp/files/accel-pppd/run
new file mode 100644
index 000000000000..f803d33d63fc
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/accel-pppd/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+exec 2>&1
+
+exec accel-pppd -p /run/accel-pppd.pid -c /etc/accel-ppp.conf
+
diff --git a/srcpkgs/accel-ppp/files/dictionary.abills b/srcpkgs/accel-ppp/files/dictionary.abills
new file mode 100644
index 000000000000..d1dea6a0d14f
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/dictionary.abills
@@ -0,0 +1,13 @@
+# Limit session traffic
+ATTRIBUTE Session-Octets-Limit 227 integer
+# What to assume as limit - 0 in+out, 1 in, 2 out, 3 max(in,out)
+ATTRIBUTE Octets-Direction 228 integer
+# Connection Speed Limit
+ATTRIBUTE PPPD-Upstream-Speed-Limit 230 integer
+ATTRIBUTE PPPD-Downstream-Speed-Limit 231 integer
+ATTRIBUTE PPPD-Upstream-Speed-Limit-1 232 integer
+ATTRIBUTE PPPD-Downstream-Speed-Limit-1 233 integer
+ATTRIBUTE PPPD-Upstream-Speed-Limit-2 234 integer
+ATTRIBUTE PPPD-Downstream-Speed-Limit-2 235 integer
+ATTRIBUTE PPPD-Upstream-Speed-Limit-3 236 integer
+ATTRIBUTE PPPD-Downstream-Speed-Limit-3 237 integer
diff --git a/srcpkgs/accel-ppp/files/dictionary.accel_ipoe b/srcpkgs/accel-ppp/files/dictionary.accel_ipoe
new file mode 100644
index 000000000000..fbe6f0ce7b7d
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/dictionary.accel_ipoe
@@ -0,0 +1,6 @@
+ATTRIBUTE DHCP-Client-IP-Address 240 ipaddr
+ATTRIBUTE DHCP-Router-IP-Address 241 ipaddr
+ATTRIBUTE DHCP-Mask 242 integer
+ATTRIBUTE DHCP-Lease-Time 242 integer
+ATTRIBUTE L4-Redirect 242 integer
+
diff --git a/srcpkgs/accel-ppp/files/ipoe.dkms b/srcpkgs/accel-ppp/files/ipoe.dkms
new file mode 100644
index 000000000000..3ae9bca31287
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/ipoe.dkms
@@ -0,0 +1,5 @@
+PACKAGE_NAME=@PKGNAME@
+PACKAGE_VERSION=@PKGVER@
+BUILT_MODULE_NAME="ipoe"
+DEST_MODULE_LOCATION="/kernel/misc"
+
diff --git a/srcpkgs/accel-ppp/files/vlanmon.dkms b/srcpkgs/accel-ppp/files/vlanmon.dkms
new file mode 100644
index 000000000000..d363e98c6b13
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/vlanmon.dkms
@@ -0,0 +1,5 @@
+PACKAGE_NAME=@PKGNAME@
+PACKAGE_VERSION=@PKGVER@
+BUILT_MODULE_NAME="vlan_mon"
+DEST_MODULE_LOCATION="/kernel/misc"
+
diff --git a/srcpkgs/accel-ppp/template b/srcpkgs/accel-ppp/template
new file mode 100644
index 000000000000..5de51bfd2f1d
--- /dev/null
+++ b/srcpkgs/accel-ppp/template
@@ -0,0 +1,72 @@
+# Template file for 'accel-ppp'
+pkgname=accel-ppp
+version=20230127
+revision=1
+_commit=cc8f2bada5635768d425e2fa2bafb095acda8ca9
+archs="i686 x86_64"
+build_style=cmake
+configure_args="-DCMAKE_SYSTEM_NAME=Linux
+ -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_BUILD_TYPE=Release
+ -DLOG_FILE=TRUE
+ -DLOG_PGSQL=FALSE
+ -DSHAPER=TRUE
+ -DRADIUS=TRUE
+ -DNETSNMP=FALSE
+ -DLUA=TRUE
+ -DLUA_INCLUDE_DIR="/usr/include/lua5.1""
+conf_files="/etc/accel-ppp.conf /etc/accel-ppp.lua"
+make_dirs="
+ /var/log/accel-ppp 0755 root root
+ /var/lib/accel-ppp 0755 root root"
+makedepends="libnl-devel lua51-devel openssl-devel pcre-devel"
+depends="openssl pcre libnl lua51"
+short_desc="High performance PPTP/L2TP/PPPoE/IPoE server"
+maintainer="le34 <4le34n at gmail dot com>"
+license="GPL-2.0-or-later"
+homepage="https://accel-ppp.org"
+distfiles="https://github.com/xebd/accel-ppp/archive/cc8f2bada5635768d425e2fa2bafb095acda8ca9.tar.gz"
+checksum=d0e6b858b56402b9478b9a40a4e2887ff5f53756211dde3fa49bfa5f63c31d3e
+
+do_patch() {
+ vsed -i 's@RUNTIME DESTINATION sbin@RUNTIME DESTINATION bin@' \
+ "${wrksrc}/accel-pppd/CMakeLists.txt"
+}
+post_install() {
+ vdoc README
+ vlicense COPYING
+ vsv accel-pppd
+ vconf "${wrksrc}/accel-pppd/accel-ppp.conf"
+ vsconf "${wrksrc}/accel-pppd/accel-ppp.conf"
+ vconf ${FILESDIR}/accel-ppp.lua
+ vinstall ${FILESDIR}/accel-ppp.logrotate 644 etc/logrotate.d accel-ppp
+ vinstall ${FILESDIR}/dictionary.accel_ipoe 644 usr/share/accel-ppp/radius
+ vinstall ${FILESDIR}/dictionary.abills 644 usr/share/accel-ppp/radius
+ vinstall ${wrksrc}/accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt 644 usr/share/snmp/mibs
+}
+accel-ppp-ipoe-dkms_package() {
+ short_desc+=" - kernel module sources for dkms"
+ dkms_modules="accel-ppp-ipoe ${version}"
+ depends="dkms lua51-devel"
+
+ pkg_install() {
+ vmkdir usr/src/accel-ppp-ipoe-${version}
+ vcopy "drivers/ipoe/*" usr/src/accel-ppp-ipoe-${version}
+ vinstall "${FILESDIR}/ipoe.dkms" 0644 usr/src/accel-ppp-ipoe-${version} dkms.conf
+ sed -e "s/@PKGNAME@/${pkgname}/" \
+ -e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-ipoe-${version}/dkms.conf
+ }
+}
+accel-ppp-vlanmon-dkms_package() {
+ short_desc+=" - kernel module sources for dkms"
+ dkms_modules="accel-ppp-vlanmon ${version}"
+ depends="dkms"
+
+ pkg_install() {
+ vmkdir usr/src/accel-ppp-vlanmon-${version}
+ vcopy "drivers/vlan_mon/*" usr/src/accel-ppp-vlanmon-${version}
+ vinstall "${FILESDIR}/vlanmon.dkms" 0644 usr/src/accel-ppp-vlanmon-${version} dkms.conf
+ sed -e "s/@PKGNAME@/${pkgname}/" \
+ -e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-vlanmon-${version}/dkms.conf
+ }
+}
From 0b6f707962ca10c79cbb7113ac06c2c3ab5579ab Mon Sep 17 00:00:00 2001
From: Alexandr <joe.satriani@le34.ru>
Date: Tue, 18 Apr 2023 18:46:15 +1100
Subject: [PATCH 2/6] Fix: Check build / Lint template Failing (maintainer)
---
srcpkgs/accel-ppp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/accel-ppp/template b/srcpkgs/accel-ppp/template
index 5de51bfd2f1d..57df48ebd1cc 100644
--- a/srcpkgs/accel-ppp/template
+++ b/srcpkgs/accel-ppp/template
@@ -22,7 +22,7 @@ make_dirs="
makedepends="libnl-devel lua51-devel openssl-devel pcre-devel"
depends="openssl pcre libnl lua51"
short_desc="High performance PPTP/L2TP/PPPoE/IPoE server"
-maintainer="le34 <4le34n at gmail dot com>"
+maintainer="Alexandr <joe.satriani@le34.ru>"
license="GPL-2.0-or-later"
homepage="https://accel-ppp.org"
distfiles="https://github.com/xebd/accel-ppp/archive/cc8f2bada5635768d425e2fa2bafb095acda8ca9.tar.gz"
From e7a5962d426b0f0990f8f8ac66e7c237add7b506 Mon Sep 17 00:00:00 2001
From: Alexandr <joe.satriani@le34.ru>
Date: Tue, 18 Apr 2023 19:01:43 +1100
Subject: [PATCH 3/6] Fix: Check build / Lint template Failing (indent with
tabs)
---
srcpkgs/accel-ppp/template | 62 +++++++++++++++++++-------------------
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/srcpkgs/accel-ppp/template b/srcpkgs/accel-ppp/template
index 57df48ebd1cc..1ce00d4cbb11 100644
--- a/srcpkgs/accel-ppp/template
+++ b/srcpkgs/accel-ppp/template
@@ -29,44 +29,44 @@ distfiles="https://github.com/xebd/accel-ppp/archive/cc8f2bada5635768d425e2fa2ba
checksum=d0e6b858b56402b9478b9a40a4e2887ff5f53756211dde3fa49bfa5f63c31d3e
do_patch() {
- vsed -i 's@RUNTIME DESTINATION sbin@RUNTIME DESTINATION bin@' \
- "${wrksrc}/accel-pppd/CMakeLists.txt"
+ vsed -i 's@RUNTIME DESTINATION sbin@RUNTIME DESTINATION bin@' \
+ "${wrksrc}/accel-pppd/CMakeLists.txt"
}
post_install() {
- vdoc README
- vlicense COPYING
- vsv accel-pppd
- vconf "${wrksrc}/accel-pppd/accel-ppp.conf"
- vsconf "${wrksrc}/accel-pppd/accel-ppp.conf"
- vconf ${FILESDIR}/accel-ppp.lua
- vinstall ${FILESDIR}/accel-ppp.logrotate 644 etc/logrotate.d accel-ppp
- vinstall ${FILESDIR}/dictionary.accel_ipoe 644 usr/share/accel-ppp/radius
- vinstall ${FILESDIR}/dictionary.abills 644 usr/share/accel-ppp/radius
- vinstall ${wrksrc}/accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt 644 usr/share/snmp/mibs
+ vdoc README
+ vlicense COPYING
+ vsv accel-pppd
+ vconf "${wrksrc}/accel-pppd/accel-ppp.conf"
+ vsconf "${wrksrc}/accel-pppd/accel-ppp.conf"
+ vconf ${FILESDIR}/accel-ppp.lua
+ vinstall ${FILESDIR}/accel-ppp.logrotate 644 etc/logrotate.d accel-ppp
+ vinstall ${FILESDIR}/dictionary.accel_ipoe 644 usr/share/accel-ppp/radius
+ vinstall ${FILESDIR}/dictionary.abills 644 usr/share/accel-ppp/radius
+ vinstall ${wrksrc}/accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt 644 usr/share/snmp/mibs
}
accel-ppp-ipoe-dkms_package() {
- short_desc+=" - kernel module sources for dkms"
- dkms_modules="accel-ppp-ipoe ${version}"
- depends="dkms lua51-devel"
+ short_desc+=" - kernel module sources for dkms"
+ dkms_modules="accel-ppp-ipoe ${version}"
+ depends="dkms lua51-devel"
- pkg_install() {
- vmkdir usr/src/accel-ppp-ipoe-${version}
- vcopy "drivers/ipoe/*" usr/src/accel-ppp-ipoe-${version}
- vinstall "${FILESDIR}/ipoe.dkms" 0644 usr/src/accel-ppp-ipoe-${version} dkms.conf
- sed -e "s/@PKGNAME@/${pkgname}/" \
- -e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-ipoe-${version}/dkms.conf
- }
+ pkg_install() {
+ vmkdir usr/src/accel-ppp-ipoe-${version}
+ vcopy "drivers/ipoe/*" usr/src/accel-ppp-ipoe-${version}
+ vinstall "${FILESDIR}/ipoe.dkms" 0644 usr/src/accel-ppp-ipoe-${version} dkms.conf
+ sed -e "s/@PKGNAME@/${pkgname}/" \
+ -e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-ipoe-${version}/dkms.conf
+ }
}
accel-ppp-vlanmon-dkms_package() {
- short_desc+=" - kernel module sources for dkms"
- dkms_modules="accel-ppp-vlanmon ${version}"
- depends="dkms"
+ short_desc+=" - kernel module sources for dkms"
+ dkms_modules="accel-ppp-vlanmon ${version}"
+ depends="dkms"
- pkg_install() {
- vmkdir usr/src/accel-ppp-vlanmon-${version}
- vcopy "drivers/vlan_mon/*" usr/src/accel-ppp-vlanmon-${version}
+ pkg_install() {
+ vmkdir usr/src/accel-ppp-vlanmon-${version}
+ vcopy "drivers/vlan_mon/*" usr/src/accel-ppp-vlanmon-${version}
vinstall "${FILESDIR}/vlanmon.dkms" 0644 usr/src/accel-ppp-vlanmon-${version} dkms.conf
- sed -e "s/@PKGNAME@/${pkgname}/" \
- -e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-vlanmon-${version}/dkms.conf
- }
+ sed -e "s/@PKGNAME@/${pkgname}/" \
+ -e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-vlanmon-${version}/dkms.conf
+ }
}
From ee1f96e5e3c6d556aa00278bdbb735ca98ebf3ac Mon Sep 17 00:00:00 2001
From: Alexandr <joe.satriani@le34.ru>
Date: Tue, 18 Apr 2023 19:07:48 +1100
Subject: [PATCH 4/6] Fix: Check build / Lint template Failing (indent with
tabs)
---
srcpkgs/accel-ppp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/accel-ppp/template b/srcpkgs/accel-ppp/template
index 1ce00d4cbb11..3337b710e753 100644
--- a/srcpkgs/accel-ppp/template
+++ b/srcpkgs/accel-ppp/template
@@ -65,7 +65,7 @@ accel-ppp-vlanmon-dkms_package() {
pkg_install() {
vmkdir usr/src/accel-ppp-vlanmon-${version}
vcopy "drivers/vlan_mon/*" usr/src/accel-ppp-vlanmon-${version}
- vinstall "${FILESDIR}/vlanmon.dkms" 0644 usr/src/accel-ppp-vlanmon-${version} dkms.conf
+ vinstall "${FILESDIR}/vlanmon.dkms" 0644 usr/src/accel-ppp-vlanmon-${version} dkms.conf
sed -e "s/@PKGNAME@/${pkgname}/" \
-e "s/@PKGVER@/${version}/" -i ${PKGDESTDIR}/usr/src/accel-ppp-vlanmon-${version}/dkms.conf
}
From 16bd70537766c7070c2c0bc9428272062c2a5c83 Mon Sep 17 00:00:00 2001
From: Alexandr <joe.satriani@le34.ru>
Date: Tue, 18 Apr 2023 19:15:05 +1100
Subject: [PATCH 5/6] template: remove archs array (archs=...)
---
srcpkgs/accel-ppp/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/accel-ppp/template b/srcpkgs/accel-ppp/template
index 3337b710e753..751bb760514d 100644
--- a/srcpkgs/accel-ppp/template
+++ b/srcpkgs/accel-ppp/template
@@ -3,7 +3,6 @@ pkgname=accel-ppp
version=20230127
revision=1
_commit=cc8f2bada5635768d425e2fa2bafb095acda8ca9
-archs="i686 x86_64"
build_style=cmake
configure_args="-DCMAKE_SYSTEM_NAME=Linux
-DCMAKE_INSTALL_PREFIX=/usr
From 94c1c03903a80850985f17ea69f0f91b1a6d58eb Mon Sep 17 00:00:00 2001
From: Alexandr <joe.satriani@le34.ru>
Date: Mon, 1 May 2023 21:21:30 +1100
Subject: [PATCH 6/6] fix musl builds
---
srcpkgs/accel-ppp/files/accel-pppd/funish | 3 +++
.../files/musl-patches/0001-ucontext.patch | 11 ++++++++++
.../files/musl-patches/0002-printf.patch | 10 +++++++++
.../files/musl-patches/0003-tsearch.patch | 11 ++++++++++
.../files/musl-patches/0004-if_arp.patch | 20 +++++++++++++++++
srcpkgs/accel-ppp/patches/0005-bin.patch | 11 ++++++++++
srcpkgs/accel-ppp/template | 22 ++++++++++++++-----
7 files changed, 82 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/accel-ppp/files/accel-pppd/funish
create mode 100644 srcpkgs/accel-ppp/files/musl-patches/0001-ucontext.patch
create mode 100644 srcpkgs/accel-ppp/files/musl-patches/0002-printf.patch
create mode 100644 srcpkgs/accel-ppp/files/musl-patches/0003-tsearch.patch
create mode 100644 srcpkgs/accel-ppp/files/musl-patches/0004-if_arp.patch
create mode 100644 srcpkgs/accel-ppp/patches/0005-bin.patch
diff --git a/srcpkgs/accel-ppp/files/accel-pppd/funish b/srcpkgs/accel-ppp/files/accel-pppd/funish
new file mode 100644
index 000000000000..b66bf1618f95
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/accel-pppd/funish
@@ -0,0 +1,3 @@
+#!/bin/sh
+accel-cmd shutdown hard
+
diff --git a/srcpkgs/accel-ppp/files/musl-patches/0001-ucontext.patch b/srcpkgs/accel-ppp/files/musl-patches/0001-ucontext.patch
new file mode 100644
index 000000000000..85ee584b7ded
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/musl-patches/0001-ucontext.patch
@@ -0,0 +1,11 @@
+--- a/accel-pppd/CMakeLists.txt
++++ b/accel-pppd/CMakeLists.txt
+@@ -113,7 +113,7 @@
+ main.c
+ )
+
+-TARGET_LINK_LIBRARIES(accel-pppd triton rt pthread ${crypto_lib} pcre)
++TARGET_LINK_LIBRARIES(accel-pppd triton rt pthread ${crypto_lib} pcre ucontext)
+ set_property(TARGET accel-pppd PROPERTY CMAKE_SKIP_BUILD_RPATH FALSE)
+ set_property(TARGET accel-pppd PROPERTY CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+ set_property(TARGET accel-pppd PROPERTY INSTALL_RPATH_USE_LINK_PATH FALSE)
diff --git a/srcpkgs/accel-ppp/files/musl-patches/0002-printf.patch b/srcpkgs/accel-ppp/files/musl-patches/0002-printf.patch
new file mode 100644
index 000000000000..ec04d7911104
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/musl-patches/0002-printf.patch
@@ -0,0 +1,10 @@
+--- a/accel-pppd/ctrl/pppoe/pppoe.c
++++ b/accel-pppd/ctrl/pppoe/pppoe.c
+@@ -11,7 +11,6 @@
+ #include <net/ethernet.h>
+ #include <netpacket/packet.h>
+ #include <arpa/inet.h>
+-#include <printf.h>
+
+ #include "crypto.h"
+
diff --git a/srcpkgs/accel-ppp/files/musl-patches/0003-tsearch.patch b/srcpkgs/accel-ppp/files/musl-patches/0003-tsearch.patch
new file mode 100644
index 000000000000..c669ab39c69d
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/musl-patches/0003-tsearch.patch
@@ -0,0 +1,11 @@
+--- a/accel-pppd/ctrl/l2tp/l2tp.c
++++ b/accel-pppd/ctrl/l2tp/l2tp.c
+@@ -852,7 +852,7 @@
+ void *sessions = conn->sessions;
+
+ conn->sessions = NULL;
+- tdestroy(sessions, (__free_fn_t)l2tp_session_free);
++ tdestroy(sessions, l2tp_session_free);
+ /* Let l2tp_session_free() handle the session counter and
+ * the reference held by the tunnel.
+ */
diff --git a/srcpkgs/accel-ppp/files/musl-patches/0004-if_arp.patch b/srcpkgs/accel-ppp/files/musl-patches/0004-if_arp.patch
new file mode 100644
index 000000000000..8509e74983af
--- /dev/null
+++ b/srcpkgs/accel-ppp/files/musl-patches/0004-if_arp.patch
@@ -0,0 +1,20 @@
+--- a/accel-pppd/ctrl/ipoe/arp.c
++++ b/accel-pppd/ctrl/ipoe/arp.c
+@@ -13,7 +13,6 @@
+ #include <netinet/ip.h>
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+-#include <linux/if_arp.h>
+ #include <linux/if_packet.h>
+
+ #include "list.h"
+--- a/accel-pppd/ctrl/ipoe/ipoe.c.orig
++++ b/accel-pppd/ctrl/ipoe/ipoe.c
+@@ -15,7 +15,6 @@
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #include <linux/if.h>
+-#include <linux/if_arp.h>
+ #include <linux/route.h>
+
+ #include <pcre.h>
diff --git a/srcpkgs/accel-ppp/patches/0005-bin.patch b/srcpkgs/accel-ppp/patches/0005-bin.patch
new file mode 100644
index 000000000000..bfc817fb835d
--- /dev/null
+++ b/srcpkgs/accel-ppp/patches/0005-bin.patch
@@ -0,0 +1,11 @@
+--- a/accel-pppd/CMakeLists.txt 2023-05-01 16:13:43.302315843 +1100
++++ b/accel-pppd/CMakeLists.txt 2023-05-01 16:14:13.826317298 +1100
+@@ -130,7 +130,7 @@
+ set_property(TARGET accel-pppd PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/accel-ppp)
+
+ INSTALL(TARGETS accel-pppd
+- RUNTIME DESTINATION sbin
++ RUNTIME DESTINATION bin
+ )
+
+ INSTALL(FILES accel-ppp.conf.5 DESTINATION share/man/man5)
diff --git a/srcpkgs/accel-ppp/template b/srcpkgs/accel-ppp/template
index 751bb760514d..c3360cd845cf 100644
--- a/srcpkgs/accel-ppp/template
+++ b/srcpkgs/accel-ppp/template
@@ -1,7 +1,7 @@
# Template file for 'accel-ppp'
pkgname=accel-ppp
version=20230127
-revision=1
+revision=2
_commit=cc8f2bada5635768d425e2fa2bafb095acda8ca9
build_style=cmake
configure_args="-DCMAKE_SYSTEM_NAME=Linux
@@ -24,16 +24,26 @@ short_desc="High performance PPTP/L2TP/PPPoE/IPoE server"
maintainer="Alexandr <joe.satriani@le34.ru>"
license="GPL-2.0-or-later"
homepage="https://accel-ppp.org"
-distfiles="https://github.com/xebd/accel-ppp/archive/cc8f2bada5635768d425e2fa2bafb095acda8ca9.tar.gz"
+distfiles="https://github.com/xebd/${pkgname}/archive/${_commit}.tar.gz"
checksum=d0e6b858b56402b9478b9a40a4e2887ff5f53756211dde3fa49bfa5f63c31d3e
-do_patch() {
- vsed -i 's@RUNTIME DESTINATION sbin@RUNTIME DESTINATION bin@' \
- "${wrksrc}/accel-pppd/CMakeLists.txt"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libucontext-devel"
+esac
+
+pre_configure() {
+ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+ touch /tmp/musl
+ for f in "${FILESDIR}"/musl-patches/*.patch
+ do
+ patch -p1 < $f
+ done
+ fi
}
post_install() {
vdoc README
- vlicense COPYING
+ #vlicense COPYING
vsv accel-pppd
vconf "${wrksrc}/accel-pppd/accel-ppp.conf"
vsconf "${wrksrc}/accel-pppd/accel-ppp.conf"
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: New package: accel-ppp-20230127
2023-04-18 6:32 [PR PATCH] New package: accel-ppp-20230127 le34-void
` (4 preceding siblings ...)
2023-05-01 10:21 ` le34-void
@ 2023-05-03 13:57 ` le34-void
2023-05-03 13:57 ` le34-void
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: le34-void @ 2023-05-03 13:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 161 bytes --]
New comment by le34-void on void-packages repository
https://github.com/void-linux/void-packages/pull/43505#issuecomment-1533077451
Comment:
fix musl builds
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: New package: accel-ppp-20230127
2023-04-18 6:32 [PR PATCH] New package: accel-ppp-20230127 le34-void
` (5 preceding siblings ...)
2023-05-03 13:57 ` le34-void
@ 2023-05-03 13:57 ` le34-void
2023-05-03 13:58 ` le34-void
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: le34-void @ 2023-05-03 13:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 159 bytes --]
New comment by le34-void on void-packages repository
https://github.com/void-linux/void-packages/pull/43505#issuecomment-1533078164
Comment:
fix musl builds
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: New package: accel-ppp-20230127
2023-04-18 6:32 [PR PATCH] New package: accel-ppp-20230127 le34-void
` (6 preceding siblings ...)
2023-05-03 13:57 ` le34-void
@ 2023-05-03 13:58 ` le34-void
2023-08-02 1:47 ` github-actions
2023-08-17 1:44 ` [PR PATCH] [Closed]: " github-actions
9 siblings, 0 replies; 11+ messages in thread
From: le34-void @ 2023-05-03 13:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 159 bytes --]
New comment by le34-void on void-packages repository
https://github.com/void-linux/void-packages/pull/43505#issuecomment-1533078164
Comment:
fix musl builds
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: New package: accel-ppp-20230127
2023-04-18 6:32 [PR PATCH] New package: accel-ppp-20230127 le34-void
` (7 preceding siblings ...)
2023-05-03 13:58 ` le34-void
@ 2023-08-02 1:47 ` github-actions
2023-08-17 1:44 ` [PR PATCH] [Closed]: " github-actions
9 siblings, 0 replies; 11+ messages in thread
From: github-actions @ 2023-08-02 1:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/43505#issuecomment-1661361573
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Closed]: New package: accel-ppp-20230127
2023-04-18 6:32 [PR PATCH] New package: accel-ppp-20230127 le34-void
` (8 preceding siblings ...)
2023-08-02 1:47 ` github-actions
@ 2023-08-17 1:44 ` github-actions
9 siblings, 0 replies; 11+ messages in thread
From: github-actions @ 2023-08-17 1:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 443 bytes --]
There's a closed pull request on the void-packages repository
New package: accel-ppp-20230127
https://github.com/void-linux/void-packages/pull/43505
Description:
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-08-17 1:44 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-18 6:32 [PR PATCH] New package: accel-ppp-20230127 le34-void
2023-04-18 7:48 ` [PR PATCH] [Updated] " le34-void
2023-04-18 8:02 ` le34-void
2023-04-18 8:08 ` le34-void
2023-04-18 8:15 ` le34-void
2023-05-01 10:21 ` le34-void
2023-05-03 13:57 ` le34-void
2023-05-03 13:57 ` le34-void
2023-05-03 13:58 ` le34-void
2023-08-02 1:47 ` github-actions
2023-08-17 1:44 ` [PR PATCH] [Closed]: " github-actions
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).