From: le34-void <le34-void@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: accel-ppp-20230127
Date: Tue, 18 Apr 2023 10:02:05 +0200 [thread overview]
Message-ID: <20230418080205.IPVXFJO3tIdXFV7VxVyBmuyEwTStQnPyahWg1Etax1c@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-43505@inbox.vuxu.org>
[-- 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
+ }
}
next prev parent reply other threads:[~2023-04-18 8:02 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-18 6:32 [PR PATCH] " le34-void
2023-04-18 7:48 ` [PR PATCH] [Updated] " le34-void
2023-04-18 8:02 ` le34-void [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230418080205.IPVXFJO3tIdXFV7VxVyBmuyEwTStQnPyahWg1Etax1c@z \
--to=le34-void@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).