source: use bz2 format tarball

3 files changed, 41 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 57b29fa90d29..d2bdd6e2b1ef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = yass-proxy
 	pkgdesc = lightweight http/socks proxy
 	pkgver = 1.8.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Chilledheart/yass
 	arch = x86_64
 	license = GPL-2.0-only
@@ -27,7 +27,9 @@ pkgbase = yass-proxy
 	optdepends = gtk-update-icon-cache
 	provides = yass-proxy
 	conflicts = yass-proxy-git
-	source = https://github.com/Chilledheart/yass/releases/download/1.8.1/yass-1.8.1.tar.gz
-	sha256sums = 34e8c0df5be5155504cc09466dc8becd0cedd278675d5add8c4e403586c63935
+	source = https://github.com/Chilledheart/yass/releases/download/1.8.1/yass-1.8.1.tar.bz2
+	source = fortify.patch
+	sha256sums = b6be8f8b6351505df64f1ed1ad6d25c28abeb67ea87d4727c92cc0369d992c1f
+	sha256sums = 790762651ae1cbbf739fa68ba0c1076d4dc885212a83bd2e914e2217d0e10117
 
 pkgname = yass-proxy
diff --git a/PKGBUILD b/PKGBUILD
index 779ac91de6e9..8ac73128213d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=yass-proxy
 pkgver=1.8.1
-pkgrel=1
+pkgrel=2
 _pkgver=1.8.1
 _pkgrel=1
 pkgdesc="lightweight http/socks proxy"
@@ -16,12 +16,17 @@ makedepends=(git ninja perl pkg-config cmake gtk4 gettext curl go clang lld llvm
 checkdepends=(curl)
 provides=(yass-proxy)
 conflicts=(yass-proxy-git)
-source=("https://github.com/Chilledheart/yass/releases/download/${_pkgver}/yass-${_pkgver}.tar.gz")
-sha256sums=('34e8c0df5be5155504cc09466dc8becd0cedd278675d5add8c4e403586c63935')
+source=("https://github.com/Chilledheart/yass/releases/download/${_pkgver}/yass-${_pkgver}.tar.bz2"
+        "fortify.patch"
+       )
+sha256sums=('b6be8f8b6351505df64f1ed1ad6d25c28abeb67ea87d4727c92cc0369d992c1f'
+            '790762651ae1cbbf739fa68ba0c1076d4dc885212a83bd2e914e2217d0e10117'
+       )
 
 prepare() {
   SRC_DIR="${srcdir}/yass-${_pkgver}"
   pushd $SRC_DIR
+  patch --forward --strip=1 --input=../fortify.patch
   cd tools
   go build
   cd ..
@@ -33,6 +38,7 @@ build(){
   pushd $SRC_DIR
   export CC=clang
   export CXX=clang++
+  rm -rf build-linux-amd64
   mkdir build-linux-amd64
   cd build-linux-amd64
   cmake .. -DGUI=ON -DCMAKE_BUILD_TYPE=Release -G Ninja -DBUILD_TESTS=on \
diff --git a/fortify.patch b/fortify.patch
new file mode 100644
index 000000000000..147f74664019
--- /dev/null
+++ b/fortify.patch
@@ -0,0 +1,27 @@
+From 1e8ae9809d7c8f6be0c5c87e539853221aa50290 Mon Sep 17 00:00:00 2001
+From: Keeyou <keeyou-cn@outlook.com>
+Date: Wed, 3 Apr 2024 13:07:45 +0800
+Subject: [PATCH] fortify: use level 3
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3fdaac77..6410c328 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2101,8 +2101,8 @@ if (NOT MSVC)
+   ## fortify source code. Also, fortified build may fail when optimizations are
+   ## disabled, so only do that for Release build.
+   if (NOT WIN32 AND NOT APPLE)
+-    set(CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE} -D_FORTIFY_SOURCE=2")
+-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D_FORTIFY_SOURCE=2")
++    set(CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE} -D_FORTIFY_SOURCE=3")
++    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D_FORTIFY_SOURCE=3")
+     set(CMAKE_C_FLAGS_RELWITHDEBINFO   "${CMAKE_C_FLAGS_RELWITHDEBINFO} -D_FORTIFY_SOURCE=2")
+     set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -D_FORTIFY_SOURCE=2")
+   endif()
+-- 
+2.44.0
+