v91.0.4472.77.1.r0.g724caf7f3

5 files changed, 35 insertions, 100 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 44c73464a92d..98760223f913 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = naiveproxy-git
 	pkgdesc = Make a fortune quietly
-	pkgver = 80.0.3987.87.r59.8ba5562f0
+	pkgver = v91.0.4472.77.1.r0.g724caf7f3
 	pkgrel = 1
 	url = https://github.com/klzgrad/naiveproxy
 	arch = x86_64
@@ -21,16 +21,15 @@ pkgbase = naiveproxy-git
 	makedepends = gcc
 	makedepends = llvm
 	depends = nspr
-	depends = nss
 	optdepends = ccache: Speed up compilation
 	provides = naiveproxy
 	conflicts = naiveproxy
 	conflicts = naiveproxy-bin
 	backup = etc/naiveproxy/config.json
 	source = git+https://github.com/klzgrad/naiveproxy.git
-	source = build.sh
+	source = naiveproxy.service
+	md5sums = SKIP
 	md5sums = SKIP
-	md5sums = 3aa2fe322a99a603b4afb27980a77472
 
 pkgname = naiveproxy-git
 
diff --git a/.gitignore b/.gitignore
index a7304d847271..69e052fcf94e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 /pkg/
 /src/
-/naiveproxy*
+/naiveproxy/*
diff --git a/PKGBUILD b/PKGBUILD
index bb9a2257caf6..240dd4a4c57d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,44 @@
 # Maintainer: navigaid <navigaid@gmail.com>
+# Maintainer: shi liang <shiliang2008@msn.com>
 
 pkgname=naiveproxy-git
 _pkgname=naiveproxy
-pkgdesc='Make a fortune quietly'
-pkgver=80.0.3987.87.r59.8ba5562f0
+pkgver=v91.0.4472.77.1.r0.g724caf7f3
 pkgrel=1
+pkgdesc='Make a fortune quietly'
 arch=('x86_64' 'amd64' 'i386' 'i686' 'pentium4' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url='https://github.com/klzgrad/naiveproxy'
 license=('BSD')
-depends=('nspr' 'nss')
-source=('git+https://github.com/klzgrad/naiveproxy.git'
-	'build.sh')
+depends=('nspr')
+source=('git+https://github.com/klzgrad/naiveproxy.git' 'naiveproxy.service')
 makedepends=("clang" "lld" "ninja" "gn" "python2" "gcc" "llvm")
 optdepends=("ccache: Speed up compilation")
 backup=(etc/naiveproxy/config.json)
-md5sums=('SKIP'
-         '3aa2fe322a99a603b4afb27980a77472')
+md5sums=('SKIP' 'SKIP')
 provides=('naiveproxy')
 conflicts=('naiveproxy' 'naiveproxy-bin')
 
-pkgver(){
+prepare() {
+  cd ${srcdir}/${_pkgname}/src
+  #sed -ri "s|./gn/out/||" build.sh
+  git checkout 90.0.4430.85
+  chmod a+x build.sh
+  ./get-clang.sh
+}
+
+pkgver() {
   cd ${srcdir}/${_pkgname}
-  printf "%s.r%s.%s" "$(cat CHROMIUM_VERSION)" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  git checkout 90.0.4430.85
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build(){
   cd ${srcdir}/${_pkgname}/src
-  ../../build.sh
+  ./build.sh
 }
 
 package(){
+  install -Dm 0644 -o root "naiveproxy.service" -t "${pkgdir}/usr/lib/systemd/system/"
   cd ${srcdir}/${_pkgname}
   install -Dm755 src/out/Release/naive ${pkgdir}/usr/bin/naiveproxy
   install -Dm644 src/config.json ${pkgdir}/etc/naiveproxy/config.json
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/naiveproxy.service b/naiveproxy.service
new file mode 100644
index 000000000000..9edce5152fc7
--- /dev/null
+++ b/naiveproxy.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=NaiveProxy Service
+After=network-online.target
+
+[Service]
+Type=simple
+User=nobody
+ExecStart=/usr/bin/naiveproxy /etc/naiveproxy/config.json
+
+[Install]
+WantedBy=multi-user.target
+