diff options
| -rw-r--r-- | .SRCINFO | 24 | ||||
| -rw-r--r-- | PKGBUILD | 39 | ||||
| -rw-r--r-- | frpc.service | 15 | ||||
| -rw-r--r-- | frpc@.service | 15 | ||||
| -rw-r--r-- | frps.service | 14 | ||||
| -rw-r--r-- | frps@.service | 14 |
6 files changed, 98 insertions, 23 deletions
@@ -1,6 +1,6 @@ pkgbase = frp pkgdesc = A fast reverse proxy to help you expose a local server behind a NAT or firewall to the internet. - pkgver = 0.41.0 + pkgver = 0.58.0 pkgrel = 1 url = https://github.com/fatedier/frp arch = x86_64 @@ -9,18 +9,26 @@ pkgbase = frp arch = armv6h arch = armv7h arch = aarch64 - license = Apache + license = Apache-2.0 makedepends = go depends = glibc - source = frp-0.41.0.tar.gz::https://github.com/fatedier/frp/archive/v0.41.0.tar.gz - sha256sums = 2655557d00a3d1bf7b8906586f4020db6cc7561faa8618a47640d8c67bac0c9e + source = frp-0.58.0.tar.gz::https://github.com/fatedier/frp/archive/v0.58.0.tar.gz + source = frpc.service + source = frpc@.service + source = frps.service + source = frps@.service + sha512sums = 7b9309268f04da30b4c7f594dfb582a0ad08afc25fcc99b733bc9fc91ef90cbb35c985e3e13dcd0765dff1154ce12b3487742553f6a9982d27c261c29b744ccb + sha512sums = c9d7c4b24faf7c086a6fd1ca96e345c43fece1dbebe33c8c1bcd8fb12d11c57274d33ad0d197ff874498605ab23d46453890054a643cfa9fec8d8b19e5b0121c + sha512sums = b90edfeeed262472a09fb39beb9c51894ab4b7d61979e878607b201f8ee9463c5ce656e62713cf2108a1bd1d9cf12146d26e1f97760b3d8a07c5be8bed7e693a + sha512sums = 90d326d7103301c518f84673ea80650adeb18a154c64bc8daf487bdfa6936525fc42fcc8e0db70cc50df9bae6d3dfdeebec79333bf62e3d079aa8453483db395 + sha512sums = b8f9c75893bede053d9d6b1e9e9c596168006d4c92edffa7b2824e7c865e508705c66e879984375e59348b7c83e8438aedff4fab624e06c4e3b25e7ebc5add52 pkgname = frpc conflicts = frp - backup = etc/frp/.ini - backup = etc/frp/_full.ini + backup = etc/frp/.toml + backup = etc/frp/_full_example.toml pkgname = frps conflicts = frp - backup = etc/frp/.ini - backup = etc/frp/_full.ini + backup = etc/frp/.toml + backup = etc/frp/_full_example.toml @@ -3,18 +3,28 @@ pkgbase='frp' pkgname=('frpc' 'frps') -pkgver=0.41.0 +pkgver=0.58.0 pkgrel=1 pkgdesc="A fast reverse proxy to help you expose a local server behind a NAT or firewall to the internet." arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') -license=('Apache') +license=('Apache-2.0') url="https://github.com/fatedier/frp" depends=('glibc') makedepends=('go') -source=("${pkgbase}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz") +source=( + "${pkgbase}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz" + "frpc.service" + "frpc@.service" + "frps.service" + "frps@.service" +) -sha256sums=('2655557d00a3d1bf7b8906586f4020db6cc7561faa8618a47640d8c67bac0c9e') +sha512sums=('7b9309268f04da30b4c7f594dfb582a0ad08afc25fcc99b733bc9fc91ef90cbb35c985e3e13dcd0765dff1154ce12b3487742553f6a9982d27c261c29b744ccb' + 'c9d7c4b24faf7c086a6fd1ca96e345c43fece1dbebe33c8c1bcd8fb12d11c57274d33ad0d197ff874498605ab23d46453890054a643cfa9fec8d8b19e5b0121c' + 'b90edfeeed262472a09fb39beb9c51894ab4b7d61979e878607b201f8ee9463c5ce656e62713cf2108a1bd1d9cf12146d26e1f97760b3d8a07c5be8bed7e693a' + '90d326d7103301c518f84673ea80650adeb18a154c64bc8daf487bdfa6936525fc42fcc8e0db70cc50df9bae6d3dfdeebec79333bf62e3d079aa8453483db395' + 'b8f9c75893bede053d9d6b1e9e9c596168006d4c92edffa7b2824e7c865e508705c66e879984375e59348b7c83e8438aedff4fab624e06c4e3b25e7ebc5add52') build() { cd "${pkgbase}-${pkgver}" @@ -26,29 +36,28 @@ check() { make test } -packaging() { - install -Dm755 ${srcdir}/${pkgbase}-${pkgver}/bin/${1} ${pkgdir}/usr/bin/${1} +_packaging() { + install -Dm755 ${srcdir}/${pkgbase}-${pkgver}/bin/${1} ${pkgdir}/usr/bin/${1} - install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/conf/${1}.ini ${pkgdir}/etc/frp/${1}.ini - install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/conf/${1}_full.ini ${pkgdir}/etc/frp/${1}_full.ini + install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/conf/${1}.toml ${pkgdir}/etc/frp/${1}.toml + install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/conf/${1}_full_example.toml ${pkgdir}/etc/frp/${1}_full_example.toml - install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/conf/systemd/${1}.service ${pkgdir}/usr/lib/systemd/system/${1}.service - install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/conf/systemd/${1}@.service ${pkgdir}/usr/lib/systemd/system/${1}@.service + install -Dm644 ${srcdir}/${1}.service ${pkgdir}/usr/lib/systemd/system/${1}.service + install -Dm644 ${srcdir}/${1}@.service ${pkgdir}/usr/lib/systemd/system/${1}@.service } package_frpc() { _name=`echo ${FUNCNAME} | cut -d _ -f 2` conflicts=('frp') - backup=("etc/frp/${_name}.ini" "etc/frp/${_name}_full.ini") + backup=("etc/frp/${_name}.toml" "etc/frp/${_name}_full_example.toml") - packaging ${_name} + _packaging ${_name} } package_frps() { _name=`echo ${FUNCNAME} | cut -d _ -f 2` conflicts=('frp') - backup=("etc/frp/${_name}.ini" "etc/frp/${_name}_full.ini") + backup=("etc/frp/${_name}.toml" "etc/frp/${_name}_full_example.toml") - packaging ${_name} + _packaging ${_name} } - diff --git a/frpc.service b/frpc.service new file mode 100644 index 000000000000..17f2b019cf3c --- /dev/null +++ b/frpc.service @@ -0,0 +1,15 @@ +[Unit] +Description=Frp Client Service +After=network-online.target +Wants=network-online.target + +[Service] +Type=simple +User=nobody +Restart=on-failure +RestartSec=5s +ExecStart=/usr/bin/frpc -c /etc/frp/frpc.toml +ExecReload=/usr/bin/frpc reload -c /etc/frp/frpc.toml + +[Install] +WantedBy=multi-user.target diff --git a/frpc@.service b/frpc@.service new file mode 100644 index 000000000000..a546b854cd7d --- /dev/null +++ b/frpc@.service @@ -0,0 +1,15 @@ +[Unit] +Description=Frp Client Service +After=network-online.target +Wants=network-online.target + +[Service] +Type=simple +User=nobody +Restart=on-failure +RestartSec=5s +ExecStart=/usr/bin/frpc -c /etc/frp/%i.toml +ExecReload=/usr/bin/frpc reload -c /etc/frp/%i.toml + +[Install] +WantedBy=multi-user.target diff --git a/frps.service b/frps.service new file mode 100644 index 000000000000..ec941bffd568 --- /dev/null +++ b/frps.service @@ -0,0 +1,14 @@ +[Unit] +Description=Frp Server Service +After=network-online.target +Wants=network-online.target + +[Service] +Type=simple +User=nobody +Restart=on-failure +RestartSec=5s +ExecStart=/usr/bin/frps -c /etc/frp/frps.toml + +[Install] +WantedBy=multi-user.target diff --git a/frps@.service b/frps@.service new file mode 100644 index 000000000000..e0e405d5e3e5 --- /dev/null +++ b/frps@.service @@ -0,0 +1,14 @@ +[Unit] +Description=Frp Server Service +After=network-online.target +Wants=network-online.target + +[Service] +Type=simple +User=nobody +Restart=on-failure +RestartSec=5s +ExecStart=/usr/bin/frps -c /etc/frp/%i.toml + +[Install] +WantedBy=multi-user.target |