bump to 91.0.4472.77-1

16 files changed, 57 insertions, 638 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 92120658572e..42b53728313f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,9 @@
 pkgbase = naiveproxy
 	pkgdesc = Make a fortune quietly
-	pkgver = 83.0.4103.61
-	pkgrel = 2
+	pkgver = 91.0.4472.77
+	pkgrel = 1
 	url = https://github.com/klzgrad/naiveproxy
 	arch = x86_64
-	arch = amd64
-	arch = i386
-	arch = i686
-	arch = pentium4
-	arch = arm
-	arch = armv6h
-	arch = armv7h
-	arch = aarch64
 	license = BSD
 	makedepends = clang
 	makedepends = lld
@@ -27,10 +19,11 @@ pkgbase = naiveproxy
 	conflicts = naiveproxy-git
 	conflicts = naiveproxy-bin
 	backup = etc/naiveproxy/config.json
-	source = build.sh
-	source = naiveproxy-83.0.4103.61-2.tar.gz::https://github.com/klzgrad/naiveproxy/archive/v83.0.4103.61-2.tar.gz
-	md5sums = 3aa2fe322a99a603b4afb27980a77472
-	md5sums = 45c2a33e747b179a49e8a085a77b2dcf
+	source = naiveproxy-91.0.4472.77-1.tar.gz::https://github.com/klzgrad/naiveproxy/archive/refs/tags/v91.0.4472.77-1.tar.gz
+	source = naiveproxy.service
+	source = naiveproxy@.service
+	sha256sums = 01c660efd162859a2cabdf336cf889c191449fbd63883fc5a7b1be1348005fe1
+	sha256sums = ec7e686edd39068acd3122bbae4f4e83ba8540ffdb9fe30790679e72c7318d33
+	sha256sums = 723979ea8245a297fac101ff71e1e9f97f138e0bfb0e84176ef5ca70cc96bf8e
 
 pkgname = naiveproxy
-
diff --git a/.gitignore b/.gitignore
index a7304d847271..d4374b7fcf6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 /pkg/
 /src/
-/naiveproxy*
+/naiveproxy-*
diff --git a/PKGBUILD b/PKGBUILD
index 12c678ebe9eb..a05b4de919b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,43 @@
-# Maintainer: navigaid <navigaid@gmail.com>
+# Maintainer: bgme <i@bgme.me>
+# Contributor: navigaid <navigaid@gmail.com>
 
 pkgname=naiveproxy
 pkgdesc='Make a fortune quietly'
-pkgver=83.0.4103.61
-pkgrel=2
-arch=('x86_64' 'amd64' 'i386' 'i686' 'pentium4' 'arm' 'armv6h' 'armv7h' 'aarch64')
+pkgver=91.0.4472.77
+pkgrel=1
+arch=('x86_64')
 url='https://github.com/klzgrad/naiveproxy'
 license=('BSD')
 depends=('nspr' 'nss')
 makedepends=("clang" "lld" "ninja" "gn" "python2" "gcc" "llvm")
 source=(
-  "build.sh"
-  "${pkgname}-${pkgver}-${pkgrel}.tar.gz::https://github.com/klzgrad/naiveproxy/archive/v${pkgver}-${pkgrel}.tar.gz"
+  "${pkgname}-${pkgver}-${pkgrel}.tar.gz::https://github.com/klzgrad/naiveproxy/archive/refs/tags/v${pkgver}-${pkgrel}.tar.gz"
+  "naiveproxy.service"
+  "naiveproxy@.service"
 )
 optdepends=("ccache: Speed up compilation")
 backup=(etc/naiveproxy/config.json)
-md5sums=('3aa2fe322a99a603b4afb27980a77472'
-         '45c2a33e747b179a49e8a085a77b2dcf')
+sha256sums=(
+  "01c660efd162859a2cabdf336cf889c191449fbd63883fc5a7b1be1348005fe1"
+  "ec7e686edd39068acd3122bbae4f4e83ba8540ffdb9fe30790679e72c7318d33"
+  "723979ea8245a297fac101ff71e1e9f97f138e0bfb0e84176ef5ca70cc96bf8e"
+)
 provides=('naiveproxy')
 conflicts=('naiveproxy-git' 'naiveproxy-bin')
 
 build(){
   pushd ${srcdir}/${pkgname}-${pkgver}-${pkgrel}/src
-  ../../build.sh
+  ./get-clang.sh
+  ./build.sh
   popd
 }
 
 package(){
+  pushd ${srcdir}
+  install -Dm644 naiveproxy.service ${pkgdir}/usr/lib/systemd/system/naiveproxy.service
+  install -Dm644 naiveproxy@.service ${pkgdir}/usr/lib/systemd/system/naiveproxy@.service
+  popd
+
   pushd ${srcdir}/${pkgname}-${pkgver}-${pkgrel}
   install -Dm755 src/out/Release/naive ${pkgdir}/usr/bin/naiveproxy
   install -Dm644 src/config.json ${pkgdir}/etc/naiveproxy/config.json
diff --git a/PKGBUILD.arm b/PKGBUILD.arm
deleted file mode 100644
index 62be8988037d..000000000000
--- a/PKGBUILD.arm
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: navigaid <navigaid@gmail.com>
-
-pkgname=naiveproxy
-pkgdesc='Make a fortune quietly'
-pkgver=76.0.3809.87
-pkgrel=2
-arch=('arm')
-url='https://github.com/klzgrad/naiveproxy'
-license=('BSD')
-depends=('nspr' 'nss')
-makedepends=('git' 'ninja' 'cmake' 'docker')
-source=("${pkgname}.tar.gz::https://github.com/btwiuse/naiveproxy/archive/v${pkgver}-${pkgrel}.tar.gz"
-        "build_arm.sh")
-md5sums=('f3b1ba2190b0564cc7e38aa6a2147676'
-         '3a277384b292a540c67ce22b4eaaae58')
-
-build(){
-  pushd ${srcdir}/${pkgname}-${pkgver}-${pkgrel}/src
-  ./get-clang.sh
-  ../../build_arm.sh || sudo docker run -it -v $PWD/out/Release:$PWD/out/Release -w $PWD/out/Release navigaid/naiveproxy-arch32-base:latest clang++ -Wl,--build-id=sha1 -fPIC -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,-z,defs -Wl,--as-needed -Wl,-O2 -Wl,--gc-sections -rdynamic -nostdlib++ -pie -Wl,--disable-new-dtags -o ./naive -Wl,--start-group @./naive.rsp -Wl,--end-group -ldl -lpthread -lrt -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 -lresolv -latomic
-  popd
-}
-
-package(){
-  pushd ${srcdir}/${pkgname}-${pkgver}-${pkgrel}
-  install -Dm755 src/out/Release/naive ${pkgdir}/usr/bin/naiveproxy
-  install -Dm644 src/config.json ${pkgdir}/etc/naiveproxy/config.json
-  install -Dm644 README.md ${pkgdir}/usr/share/doc/naiveproxy/README.md
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/naiveproxy/LICENSE
-  popd
-}
diff --git a/PKGBUILD.arm64 b/PKGBUILD.arm64
deleted file mode 100644
index 105f0294b708..000000000000
--- a/PKGBUILD.arm64
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: navigaid <navigaid@gmail.com>
-
-pkgname=naiveproxy
-pkgdesc='Make a fortune quietly'
-pkgver=76.0.3809.87
-pkgrel=2
-arch=('arm64')
-url='https://github.com/klzgrad/naiveproxy'
-license=('BSD')
-depends=('nspr' 'nss')
-makedepends=('git' 'ninja' 'cmake' 'docker')
-source=("${pkgname}.tar.gz::https://github.com/btwiuse/naiveproxy/archive/v${pkgver}-${pkgrel}.tar.gz"
-        "build_arm64.sh")
-md5sums=('f3b1ba2190b0564cc7e38aa6a2147676'
-         '3a277384b292a540c67ce22b4eaaae58')
-
-build(){
-  pushd ${srcdir}/${pkgname}-${pkgver}-${pkgrel}/src
-  ./get-clang.sh
-  ../../build_arm64.sh || sudo docker run -it -v $PWD/out/Release:$PWD/out/Release -w $PWD/out/Release navigaid/naiveproxy-arch32-base:latest clang++ -Wl,--build-id=sha1 -fPIC -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,-z,defs -Wl,--as-needed -Wl,-O2 -Wl,--gc-sections -rdynamic -nostdlib++ -pie -Wl,--disable-new-dtags -o ./naive -Wl,--start-group @./naive.rsp -Wl,--end-group -ldl -lpthread -lrt -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 -lresolv -latomic
-  popd
-}
-
-package(){
-  pushd ${srcdir}/${pkgname}-${pkgver}-${pkgrel}
-  install -Dm755 src/out/Release/naive ${pkgdir}/usr/bin/naiveproxy
-  install -Dm644 src/config.json ${pkgdir}/etc/naiveproxy/config.json
-  install -Dm644 README.md ${pkgdir}/usr/share/doc/naiveproxy/README.md
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/naiveproxy/LICENSE
-  popd
-}
diff --git a/PKGBUILD.armv7 b/PKGBUILD.armv7
deleted file mode 100644
index b64812ef2dea..000000000000
--- a/PKGBUILD.armv7
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: navigaid <navigaid@gmail.com>
-
-pkgname=naiveproxy
-pkgdesc='Make a fortune quietly'
-pkgver=76.0.3809.87
-pkgrel=2
-arch=('armv7')
-url='https://github.com/klzgrad/naiveproxy'
-license=('BSD')
-depends=('nspr' 'nss')
-makedepends=('git' 'ninja' 'cmake' 'docker')
-source=("${pkgname}.tar.gz::https://github.com/btwiuse/naiveproxy/archive/v${pkgver}-${pkgrel}.tar.gz"
-        "build_armv7.sh")
-md5sums=('f3b1ba2190b0564cc7e38aa6a2147676'
-         '3a277384b292a540c67ce22b4eaaae58')
-
-build(){
-  pushd ${srcdir}/${pkgname}-${pkgver}-${pkgrel}/src
-  ./get-clang.sh
-  ../../build_armv7.sh || sudo docker run -it -v $PWD/out/Release:$PWD/out/Release -w $PWD/out/Release navigaid/naiveproxy-arch32-base:latest clang++ -Wl,--build-id=sha1 -fPIC -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,-z,defs -Wl,--as-needed -Wl,-O2 -Wl,--gc-sections -rdynamic -nostdlib++ -pie -Wl,--disable-new-dtags -o ./naive -Wl,--start-group @./naive.rsp -Wl,--end-group -ldl -lpthread -lrt -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 -lresolv -latomic
-  popd
-}
-
-package(){
-  pushd ${srcdir}/${pkgname}-${pkgver}-${pkgrel}
-  install -Dm755 src/out/Release/naive ${pkgdir}/usr/bin/naiveproxy
-  install -Dm644 src/config.json ${pkgdir}/etc/naiveproxy/config.json
-  install -Dm644 README.md ${pkgdir}/usr/share/doc/naiveproxy/README.md
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/naiveproxy/LICENSE
-  popd
-}
diff --git a/PKGBUILD.x86 b/PKGBUILD.x86
deleted file mode 100644
index c7ca1bb552ff..000000000000
--- a/PKGBUILD.x86
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: navigaid <navigaid@gmail.com>
-
-pkgname=naiveproxy
-pkgdesc='Make a fortune quietly'
-pkgver=77.0.3865.90
-pkgrel=1
-arch=('pentium4' 'i386' 'i686')
-url='https://github.com/klzgrad/naiveproxy'
-license=('BSD')
-depends=('nspr' 'nss')
-makedepends=('git' 'ninja' 'cmake' 'docker')
-source=("${pkgname}-${pkgver}-${pkgrel}.tar.gz::https://github.com/klzgrad/naiveproxy/archive/v${pkgver}-${pkgrel}.tar.gz"
-        "build_x86.sh")
-md5sums=('SKIP'
-         '665ed2cf07bd64361865ceb71a3ba34e')
-
-build(){
-  pushd ${srcdir}/${pkgname}-${pkgver}-${pkgrel}/src
-  ./get-clang.sh
-  ../../build_x86.sh || sudo docker run -it -v $PWD/out/Release:$PWD/out/Release -w $PWD/out/Release navigaid/naiveproxy-arch32-base:latest clang++ -Wl,--build-id=sha1 -fPIC -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,-z,defs -Wl,--as-needed -m32 -Wl,-O2 -Wl,--gc-sections -rdynamic -nostdlib++ -pie -Wl,--disable-new-dtags -o ./naive -Wl,--start-group @./naive.rsp -Wl,--end-group -ldl -lpthread -lrt -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 -lresolv -latomic
-  popd
-}
-
-package(){
-  pushd ${srcdir}/${pkgname}-${pkgver}-${pkgrel}
-  install -Dm755 src/out/Release/naive ${pkgdir}/usr/bin/naiveproxy
-  install -Dm644 src/config.json ${pkgdir}/etc/naiveproxy/config.json
-  install -Dm644 README.md ${pkgdir}/usr/share/doc/naiveproxy/README.md
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/naiveproxy/LICENSE
-  popd
-}
diff --git a/README.md b/README.md
deleted file mode 100644
index 8c3f1344c3c7..000000000000
--- a/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-how to build 32-bit Linux executable manually
-
-```
-linux-x86_64 > src/naiveproxy-76.0.3809.87-2/src $ build_x86.sh
-linux-i{3,6}86 > src/naiveproxy-76.0.3809.87-2/src/out/Release $ clang++ -Wl,--build-id=sha1 -fPIC -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,-z,defs -Wl,--as-needed -m32 -Wl,-O2 -Wl,--gc-sections -rdynamic -nostdlib++ -pie -Wl,--disable-new-dtags -o ./naive -Wl,--start-group @./naive.rsp -Wl,--end-group -ldl -lpthread -lrt -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 -lresolv -latomic
-```
-
-how to create arch32 builder docker image
-```
-sudo pacstrap -c . base base-devel git ninja cmake nspr nss clang
-```
-
-makepkg
-```
-env CARCH=i686 makepkg -fp PKGBUILD.x86
-env CARCH=i386 makepkg -fp PKGBUILD.x86
-env CARCH=pentium4 makepkg -fp PKGBUILD.x86
-env CARCH=arm64 makepkg -sf --needed --noconfirm --skipinteg -p PKGBUILD.arm64
-```
diff --git a/build.sh b/build.sh
deleted file mode 100755
index a639bff8175e..000000000000
--- a/build.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-set -e
-
-export TMPDIR="$PWD/tmp"
-mkdir -p "$TMPDIR"
-
-if [ "$1" = debug ]; then
-  out=out/Debug
-  flags="$EXTRA_FLAGS
-    is_debug=true
-    is_component_build=true"
-else
-  out=out/Release
-  flags="$EXTRA_FLAGS
-    is_official_build=true
-    exclude_unwind_tables=true
-    enable_resource_whitelist_generation=false
-    symbol_level=0"
-fi
-
-if which ccache >/dev/null 2>&1; then
-  export CCACHE_SLOPPINESS=time_macros
-  export CCACHE_BASEDIR="$PWD"
-  export CCACHE_CPP2=yes
-  flags="$flags"'
-   cc_wrapper="ccache"'
-elif [ -f "$HOME"/.cargo/bin/sccache* ]; then
-  export PATH="$PATH:$HOME/.cargo/bin"
-  flags="$flags"'
-   cc_wrapper="sccache"'
-fi
-
-flags="$flags"'
-  is_clang=true
-  linux_use_bundled_binutils=false
-
-  fatal_linker_warnings=false
-  treat_warnings_as_errors=false
-  use_sysroot=false
-
-  fieldtrial_testing_like_official_build=true
-
-  use_cups=false
-  use_dbus=false
-  use_gio=false
-  use_platform_icu_alternatives=true
-  use_gtk=false
-
-  disable_file_support=true
-  enable_websockets=false
-  disable_ftp_support=true
-  use_kerberos=false
-  enable_mdns=false
-  enable_reporting=false
-  include_transport_security_state_preload_list=false
-'
-
-if [ "$(uname)" = Linux ]; then
-  flags="$flags"'
-    use_ozone=true
-    ozone_auto_platforms=false
-    ozone_platform="headless"
-    ozone_platform_headless=true'
-fi
-
-# use system clang
-# disable clang plugins
-# build without afdo.prof
-flags="$flags"'
-  clang_base_path=""
-  clang_use_chrome_plugins=false
-  clang_use_default_sample_profile=false'
-
-rm -rf "./$out"
-mkdir -p out
-
-python2=$(which python2 2>/dev/null || which python 2>/dev/null)
-export DEPOT_TOOLS_WIN_TOOLCHAIN=0
-
-gn gen "$out" --args="$flags" --script-executable=$python2
-
-cp -v /usr/lib/gcc/$(gcc -dumpmachine)/$(gcc -dumpversion)/crtbeginS.o "$out"
-cp -v /usr/lib/gcc/$(gcc -dumpmachine)/$(gcc -dumpversion)/crtendS.o "$out"
-
-ninja -C "$out" naive
diff --git a/build_arm.sh b/build_arm.sh
deleted file mode 100755
index f366bf6e8008..000000000000
--- a/build_arm.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-set -e
-
-export TMPDIR="$PWD/tmp"
-mkdir -p "$TMPDIR"
-
-if [ "$1" = debug ]; then
-  out=out/Debug
-  flags="$EXTRA_FLAGS
-    is_debug=true
-    is_component_build=true"
-else
-  out=out/Release
-  flags="$EXTRA_FLAGS
-    is_official_build=true
-    use_jumbo_build=true
-    exclude_unwind_tables=true
-    enable_resource_whitelist_generation=false
-    symbol_level=0"
-fi
-
-if which ccache >/dev/null 2>&1; then
-  export CCACHE_SLOPPINESS=time_macros
-  export CCACHE_BASEDIR="$PWD"
-  export CCACHE_CPP2=yes
-  flags="$flags"'
-   cc_wrapper="ccache"'
-elif [ -f "$HOME"/.cargo/bin/sccache* ]; then
-  export PATH="$PATH:$HOME/.cargo/bin"
-  flags="$flags"'
-   cc_wrapper="sccache"'
-fi
-
-flags="$flags"'
-  use_custom_libcxx=false
-  target_cpu="arm"
-  is_clang=true
-  linux_use_bundled_binutils=false
-
-  fatal_linker_warnings=false
-  treat_warnings_as_errors=false
-  use_sysroot=false
-
-  fieldtrial_testing_like_official_build=true
-
-  use_cups=false
-  use_dbus=false
-  use_gio=false
-  use_platform_icu_alternatives=true
-
-  disable_file_support=true
-  enable_websockets=false
-  disable_ftp_support=true
-  use_kerberos=false
-  disable_brotli_filter=true
-  enable_mdns=false
-  enable_reporting=false
-  include_transport_security_state_preload_list=false
-'
-
-if [ "$(uname)" = Linux ]; then
-  flags="$flags"'
-    use_ozone=true
-    ozone_auto_platforms=false
-    ozone_platform="headless"
-    ozone_platform_headless=true'
-fi
-
-rm -rf "./$out"
-mkdir -p out
-
-python2=$(which python2 2>/dev/null || which python 2>/dev/null)
-export DEPOT_TOOLS_WIN_TOOLCHAIN=0
-
-./gn/out/gn gen "$out" --args="$flags" --script-executable=$python2
-
-ninja -C "$out" naive
diff --git a/build_arm64.sh b/build_arm64.sh
deleted file mode 100755
index 04feb86724a8..000000000000
--- a/build_arm64.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-set -e
-
-export TMPDIR="$PWD/tmp"
-mkdir -p "$TMPDIR"
-
-if [ "$1" = debug ]; then
-  out=out/Debug
-  flags="$EXTRA_FLAGS
-    is_debug=true
-    is_component_build=true"
-else
-  out=out/Release
-  flags="$EXTRA_FLAGS
-    is_official_build=true
-    use_jumbo_build=true
-    exclude_unwind_tables=true
-    enable_resource_whitelist_generation=false
-    symbol_level=0"
-fi
-
-if which ccache >/dev/null 2>&1; then
-  export CCACHE_SLOPPINESS=time_macros
-  export CCACHE_BASEDIR="$PWD"
-  export CCACHE_CPP2=yes
-  flags="$flags"'
-   cc_wrapper="ccache"'
-elif [ -f "$HOME"/.cargo/bin/sccache* ]; then
-  export PATH="$PATH:$HOME/.cargo/bin"
-  flags="$flags"'
-   cc_wrapper="sccache"'
-fi
-
-flags="$flags"'
-  target_cpu="arm64"
-  is_clang=true
-  linux_use_bundled_binutils=false
-
-  fatal_linker_warnings=false
-  treat_warnings_as_errors=false
-  use_sysroot=false
-
-  fieldtrial_testing_like_official_build=true
-
-  use_cups=false
-  use_dbus=false
-  use_gio=false
-  use_platform_icu_alternatives=true
-
-  disable_file_support=true
-  enable_websockets=false
-  disable_ftp_support=true
-  use_kerberos=false
-  disable_brotli_filter=true
-  enable_mdns=false
-  enable_reporting=false
-  include_transport_security_state_preload_list=false
-'
-
-if [ "$(uname)" = Linux ]; then
-  flags="$flags"'
-    use_ozone=true
-    ozone_auto_platforms=false
-    ozone_platform="headless"
-    ozone_platform_headless=true'
-fi
-
-rm -rf "./$out"
-mkdir -p out
-
-python2=$(which python2 2>/dev/null || which python 2>/dev/null)
-export DEPOT_TOOLS_WIN_TOOLCHAIN=0
-
-./gn/out/gn gen "$out" --args="$flags" --script-executable=$python2
-
-ninja -C "$out" naive
diff --git a/build_armv6.sh b/build_armv6.sh
deleted file mode 100755
index 3d84e22877a7..000000000000
--- a/build_armv6.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-set -e
-
-export TMPDIR="$PWD/tmp"
-mkdir -p "$TMPDIR"
-
-if [ "$1" = debug ]; then
-  out=out/Debug
-  flags="$EXTRA_FLAGS
-    is_debug=true
-    is_component_build=true"
-else
-  out=out/Release
-  flags="$EXTRA_FLAGS
-    is_official_build=true
-    use_jumbo_build=true
-    exclude_unwind_tables=true
-    enable_resource_whitelist_generation=false
-    symbol_level=0"
-fi
-
-if which ccache >/dev/null 2>&1; then
-  export CCACHE_SLOPPINESS=time_macros
-  export CCACHE_BASEDIR="$PWD"
-  export CCACHE_CPP2=yes
-  flags="$flags"'
-   cc_wrapper="ccache"'
-elif [ -f "$HOME"/.cargo/bin/sccache* ]; then
-  export PATH="$PATH:$HOME/.cargo/bin"
-  flags="$flags"'
-   cc_wrapper="sccache"'
-fi
-
-flags="$flags"'
-  target_cpu="arm"
-  arm_arch="armv6"
-  is_clang=true
-  linux_use_bundled_binutils=false
-
-  fatal_linker_warnings=false
-  treat_warnings_as_errors=false
-  use_sysroot=false
-
-  fieldtrial_testing_like_official_build=true
-
-  use_cups=false
-  use_dbus=false
-  use_gio=false
-  use_platform_icu_alternatives=true
-
-  disable_file_support=true
-  enable_websockets=false
-  disable_ftp_support=true
-  use_kerberos=false
-  disable_brotli_filter=true
-  enable_mdns=false
-  enable_reporting=false
-  include_transport_security_state_preload_list=false
-'
-
-if [ "$(uname)" = Linux ]; then
-  flags="$flags"'
-    use_ozone=true
-    ozone_auto_platforms=false
-    ozone_platform="headless"
-    ozone_platform_headless=true'
-fi
-
-rm -rf "./$out"
-mkdir -p out
-
-python2=$(which python2 2>/dev/null || which python 2>/dev/null)
-export DEPOT_TOOLS_WIN_TOOLCHAIN=0
-
-./gn/out/gn gen "$out" --args="$flags" --script-executable=$python2
-
-ninja -C "$out" naive
diff --git a/build_armv7.sh b/build_armv7.sh
deleted file mode 100755
index 6f44c964ce99..000000000000
--- a/build_armv7.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-set -e
-
-export TMPDIR="$PWD/tmp"
-mkdir -p "$TMPDIR"
-
-if [ "$1" = debug ]; then
-  out=out/Debug
-  flags="$EXTRA_FLAGS
-    is_debug=true
-    is_component_build=true"
-else
-  out=out/Release
-  flags="$EXTRA_FLAGS
-    is_official_build=true
-    use_jumbo_build=true
-    exclude_unwind_tables=true
-    enable_resource_whitelist_generation=false
-    symbol_level=0"
-fi
-
-if which ccache >/dev/null 2>&1; then
-  export CCACHE_SLOPPINESS=time_macros
-  export CCACHE_BASEDIR="$PWD"
-  export CCACHE_CPP2=yes
-  flags="$flags"'
-   cc_wrapper="ccache"'
-elif [ -f "$HOME"/.cargo/bin/sccache* ]; then
-  export PATH="$PATH:$HOME/.cargo/bin"
-  flags="$flags"'
-   cc_wrapper="sccache"'
-fi
-
-flags="$flags"'
-  target_cpu="arm"
-  arm_arch="armv7-a"
-  arm_float_abi="hard"
-  arm_tune="generic-armv7-a"
-  is_clang=true
-  linux_use_bundled_binutils=false
-
-  fatal_linker_warnings=false
-  treat_warnings_as_errors=false
-  use_sysroot=false
-
-  fieldtrial_testing_like_official_build=true
-
-  use_cups=false
-  use_dbus=false
-  use_gio=false
-  use_platform_icu_alternatives=true
-
-  disable_file_support=true
-  enable_websockets=false
-  disable_ftp_support=true
-  use_kerberos=false
-  disable_brotli_filter=true
-  enable_mdns=false
-  enable_reporting=false
-  include_transport_security_state_preload_list=false
-'
-
-if [ "$(uname)" = Linux ]; then
-  flags="$flags"'
-    use_ozone=true
-    ozone_auto_platforms=false
-    ozone_platform="headless"
-    ozone_platform_headless=true'
-fi
-
-rm -rf "./$out"
-mkdir -p out
-
-python2=$(which python2 2>/dev/null || which python 2>/dev/null)
-export DEPOT_TOOLS_WIN_TOOLCHAIN=0
-
-./gn/out/gn gen "$out" --args="$flags" --script-executable=$python2
-
-ninja -C "$out" naive
diff --git a/build_x86.sh b/build_x86.sh
deleted file mode 100755
index ed506c555dc5..000000000000
--- a/build_x86.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-set -e
-
-export TMPDIR="$PWD/tmp"
-mkdir -p "$TMPDIR"
-
-if [ "$1" = debug ]; then
-  out=out/Debug
-  flags="$EXTRA_FLAGS
-    is_debug=true
-    is_component_build=true"
-else
-  out=out/Release
-  flags="$EXTRA_FLAGS
-    is_official_build=true
-    use_jumbo_build=true
-    exclude_unwind_tables=true
-    enable_resource_whitelist_generation=false
-    symbol_level=0"
-fi
-
-if which ccache >/dev/null 2>&1; then
-  export CCACHE_SLOPPINESS=time_macros
-  export CCACHE_BASEDIR="$PWD"
-  export CCACHE_CPP2=yes
-  flags="$flags"'
-   cc_wrapper="ccache"'
-elif [ -f "$HOME"/.cargo/bin/sccache* ]; then
-  export PATH="$PATH:$HOME/.cargo/bin"
-  flags="$flags"'
-   cc_wrapper="sccache"'
-fi
-
-flags="$flags"'
-  target_cpu="x86"
-  is_clang=true
-  linux_use_bundled_binutils=false
-
-  fatal_linker_warnings=false
-  treat_warnings_as_errors=false
-  use_sysroot=false
-
-  fieldtrial_testing_like_official_build=true
-
-  use_cups=false
-  use_dbus=false
-  use_gio=false
-  use_platform_icu_alternatives=true
-
-  disable_file_support=true
-  enable_websockets=false
-  disable_ftp_support=true
-  use_kerberos=false
-  disable_brotli_filter=true
-  enable_mdns=false
-  enable_reporting=false
-  include_transport_security_state_preload_list=false
-'
-
-if [ "$(uname)" = Linux ]; then
-  flags="$flags"'
-    use_ozone=true
-    ozone_auto_platforms=false
-    ozone_platform="headless"
-    ozone_platform_headless=true'
-fi
-
-rm -rf "./$out"
-mkdir -p out
-
-python2=$(which python2 2>/dev/null || which python 2>/dev/null)
-export DEPOT_TOOLS_WIN_TOOLCHAIN=0
-
-./gn/out/gn gen "$out" --args="$flags" --script-executable=$python2
-
-ninja -C "$out" naive
diff --git a/naiveproxy.service b/naiveproxy.service
new file mode 100644
index 000000000000..3766a5419efc
--- /dev/null
+++ b/naiveproxy.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=NaiveProxy Server Service
+After=network-online.target
+
+[Service]
+Type=simple
+User=nobody
+Restart=on-failure
+RestartSec=5s
+ExecStart=/usr/bin/naiveproxy /etc/naiveproxy/config.json
+
+[Install]
+WantedBy=default.target
+
diff --git a/naiveproxy@.service b/naiveproxy@.service
new file mode 100644
index 000000000000..963b0cd42582
--- /dev/null
+++ b/naiveproxy@.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=NaiveProxy Server Service
+After=network-online.target
+
+[Service]
+Type=simple
+User=nobody
+Restart=on-failure
+RestartSec=5s
+ExecStart=/usr/bin/naiveproxy /etc/naiveproxy/%i.json
+
+[Install]
+WantedBy=default.target
+