summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO7
-rw-r--r--.gitignore2
-rw-r--r--PKGBUILD13
-rw-r--r--sysusers.conf1
4 files changed, 16 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dfdd00c7f7d4..a4f542fbf247 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = zapret-git
pkgdesc = Bypass deep packet inspection.
pkgver = r85.50a0668
- pkgrel = 4
+ pkgrel = 5
url = https://github.com/bol-van/zapret
arch = x86_64
license = GPL
@@ -12,8 +12,9 @@ pkgbase = zapret-git
conflicts = zapret
backup = opt/zapret/config
source = git+https://github.com/bol-van/zapret.git
- validpgpkeys = 916961EE198832DD70B628B356DB0538F60D951C
- md5sums = SKIP
+ source = sysusers.conf
+ sha256sums = SKIP
+ sha256sums = 25c309e2ec545c9ee53759e23961c8a3f02708a7ba8dcbabab6eb681a36c03c0
pkgname = zapret-nfqws-git
diff --git a/.gitignore b/.gitignore
index f71c635dafda..d1ae4535ee08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
!.gitignore
!PKGBUILD
!.SRCINFO
+!/*.conf
+!/*.install
diff --git a/PKGBUILD b/PKGBUILD
index becffa9fd2cd..b8c39a94f716 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=(
)
pkgbase=zapret-git
pkgver=r85.50a0668
-pkgrel=4
+pkgrel=5
pkgdesc="Bypass deep packet inspection."
arch=('x86_64')
url="https://github.com/bol-van/zapret"
@@ -15,9 +15,12 @@ depends=('systemd' 'ipset' 'curl')
backup=('opt/zapret/config')
provides=('zapret')
conflicts=('zapret')
-source=("git+https://github.com/bol-van/zapret.git")
-validpgpkeys=('916961EE198832DD70B628B356DB0538F60D951C')
-md5sums=('SKIP')
+source=(
+ "git+https://github.com/bol-van/zapret.git"
+ "sysusers.conf"
+)
+sha256sums=('SKIP'
+ '25c309e2ec545c9ee53759e23961c8a3f02708a7ba8dcbabab6eb681a36c03c0')
pkgver()
{
cd "$srcdir/${pkgbase%-git}"
@@ -41,6 +44,8 @@ _package_common()
install -Dm644 init.d/systemd/* -t "$pkgdir/usr/lib/systemd/system"
install -Dm755 init.d/sysv/* -t "$pkgdir/opt/zapret/init.d/sysv"
install -Dm644 config "$pkgdir/opt/zapret/config"
+ install -Dm644 "$srcdir/sysusers.conf" "$pkgdir/usr/lib/sysusers.d/zapret.conf"
+ sed -ri 's/^#?WS_USER=.*$/WS_USER=zapret/' "$pkgdir/opt/zapret/init.d/sysv/functions"
}
package_zapret-nfqws-git() {
cd "$srcdir/${pkgbase%-git}"
diff --git a/sysusers.conf b/sysusers.conf
new file mode 100644
index 000000000000..7feb7fffa571
--- /dev/null
+++ b/sysusers.conf
@@ -0,0 +1 @@
+u zapret - "zapret dpi bypasser"