[lilac] updated to 0.44.0-3

6 files changed, 86 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 61a0c4c3e796..e44f72f77615 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = frp
 	pkgdesc = A fast reverse proxy to help you expose a local server behind a NAT or firewall to the internet.
-	pkgver = 0.42.0
-	pkgrel = 1
+	pkgver = 0.44.0
+	pkgrel = 3
 	url = https://github.com/fatedier/frp
 	arch = x86_64
 	arch = i686
@@ -12,8 +12,16 @@ pkgbase = frp
 	license = Apache
 	makedepends = go
 	depends = glibc
-	source = frp-0.42.0.tar.gz::https://github.com/fatedier/frp/archive/v0.42.0.tar.gz
-	sha256sums = 4bb815e9c9a4588fce20c6ef33168f0ceb1f420937c4dcf03ce085666328043a
+	source = frp-0.44.0.tar.gz::https://github.com/fatedier/frp/archive/v0.44.0.tar.gz
+	source = frpc.service
+	source = frpc@.service
+	source = frps.service
+	source = frps@.service
+	sha512sums = 6a5d0f4985075e260bc7970031391b457a3c7b8ea05628f17b551ea9afc0f2454db76caaad49250a2aecdd7ca26abc8ff74ee705a4c44319d33a92e5c055fd56
+	sha512sums = 2c96df7eeb6bd36163fb2b389a434f21db3f9c4baca36751e0979a74e8f456714259d4756d77f6733e5a6097f8d6b16d6fdacd94ea66135b05b5502c12a69902
+	sha512sums = 7ccfd7a67b62e76de099c8dd394e40566b67175b0d9b6195433ffc2051c89a83b91c108866b99c8b4266c6c39ff2b5be7e048ce4386aeb3f65568e22dfdd1073
+	sha512sums = af822dd76ddb5dd07af0947d90c2415788a229b923d444aa955100e593b654fe6b89c564afb001a3f52db888a1fbd68d5b3bffa805a39c7435634633b137115a
+	sha512sums = 9d26d00d3959bf509d691ecf7656f93cd154ea6990f4479e03067d0b4ccc42200fb17928e33cd27454d4e17b9ae3cac27bce0a13af244a420a8c1f1df01bf461
 
 pkgname = frpc
 	conflicts = frp
diff --git a/PKGBUILD b/PKGBUILD
index 5955f5bd25b7..38ba187eaf53 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgbase='frp'
 pkgname=('frpc' 'frps')
-pkgver=0.42.0
-pkgrel=1
+pkgver=0.44.0
+pkgrel=3
 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')
@@ -12,9 +12,19 @@ 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=('4bb815e9c9a4588fce20c6ef33168f0ceb1f420937c4dcf03ce085666328043a')
+sha512sums=('6a5d0f4985075e260bc7970031391b457a3c7b8ea05628f17b551ea9afc0f2454db76caaad49250a2aecdd7ca26abc8ff74ee705a4c44319d33a92e5c055fd56'
+            '2c96df7eeb6bd36163fb2b389a434f21db3f9c4baca36751e0979a74e8f456714259d4756d77f6733e5a6097f8d6b16d6fdacd94ea66135b05b5502c12a69902'
+            '7ccfd7a67b62e76de099c8dd394e40566b67175b0d9b6195433ffc2051c89a83b91c108866b99c8b4266c6c39ff2b5be7e048ce4386aeb3f65568e22dfdd1073'
+            'af822dd76ddb5dd07af0947d90c2415788a229b923d444aa955100e593b654fe6b89c564afb001a3f52db888a1fbd68d5b3bffa805a39c7435634633b137115a'
+            '9d26d00d3959bf509d691ecf7656f93cd154ea6990f4479e03067d0b4ccc42200fb17928e33cd27454d4e17b9ae3cac27bce0a13af244a420a8c1f1df01bf461')
 
 build() {
   cd "${pkgbase}-${pkgver}"
@@ -32,8 +42,8 @@ packaging() {
   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/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() {
diff --git a/frpc.service b/frpc.service
new file mode 100644
index 000000000000..42fb47c4ec63
--- /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.ini
+ExecReload=/usr/bin/frpc reload -c /etc/frp/frpc.ini
+
+[Install]
+WantedBy=multi-user.target
diff --git a/frpc@.service b/frpc@.service
new file mode 100644
index 000000000000..fa98ec4e9539
--- /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.ini
+ExecReload=/usr/bin/frpc reload -c /etc/frp/%i.ini
+
+[Install]
+WantedBy=multi-user.target
diff --git a/frps.service b/frps.service
new file mode 100644
index 000000000000..e09f3945c835
--- /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.ini
+
+[Install]
+WantedBy=multi-user.target
diff --git a/frps@.service b/frps@.service
new file mode 100644
index 000000000000..72de81cbe25d
--- /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.ini
+
+[Install]
+WantedBy=multi-user.target