diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | fortify.patch | 47 |
3 files changed, 8 insertions, 60 deletions
@@ -1,7 +1,7 @@ pkgbase = yass-proxy pkgdesc = lightweight http/socks proxy - pkgver = 1.8.1 - pkgrel = 4 + pkgver = 1.8.2 + pkgrel = 1 url = https://github.com/Chilledheart/yass arch = x86_64 license = GPL-2.0-only @@ -27,9 +27,7 @@ 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.bz2 - source = fortify.patch - sha256sums = b6be8f8b6351505df64f1ed1ad6d25c28abeb67ea87d4727c92cc0369d992c1f - sha256sums = 63f3c95ad39bf178d92b26458c30baf15b513a8c3be7e00200985e0721e2ea41 + source = https://github.com/Chilledheart/yass/releases/download/1.8.2/yass-1.8.2.tar.bz2 + sha256sums = 003f1ae8a399166f3d99d11c20a62fd1e05201965cf521c9830a55bc8acc099a pkgname = yass-proxy @@ -2,9 +2,9 @@ # Contributor: Chilledheart <hukeyue@hotmail.com> pkgname=yass-proxy -pkgver=1.8.1 -pkgrel=4 -_pkgver=1.8.1 +pkgver=1.8.2 +pkgrel=1 +_pkgver=1.8.2 _pkgrel=1 pkgdesc="lightweight http/socks proxy" arch=(x86_64) @@ -17,16 +17,13 @@ checkdepends=(curl) provides=(yass-proxy) conflicts=(yass-proxy-git) source=("https://github.com/Chilledheart/yass/releases/download/${_pkgver}/yass-${_pkgver}.tar.bz2" - "fortify.patch" ) -sha256sums=('b6be8f8b6351505df64f1ed1ad6d25c28abeb67ea87d4727c92cc0369d992c1f' - '63f3c95ad39bf178d92b26458c30baf15b513a8c3be7e00200985e0721e2ea41' +sha256sums=('003f1ae8a399166f3d99d11c20a62fd1e05201965cf521c9830a55bc8acc099a' ) prepare() { SRC_DIR="${srcdir}/yass-${_pkgver}" pushd $SRC_DIR - patch --forward --strip=1 --input=../fortify.patch cd tools go build cd .. diff --git a/fortify.patch b/fortify.patch deleted file mode 100644 index 1ead65fddae5..000000000000 --- a/fortify.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 21d129b1f54681ba86216f40843d5614fc632fbd Mon Sep 17 00:00:00 2001 -From: Keeyou <keeyou-cn@outlook.com> -Date: Wed, 3 Apr 2024 13:07:45 +0800 -Subject: [PATCH] build: fix some missing flags in minsizerel build - -fortify: use level 3 for release build ---- - CMakeLists.txt | 18 +++++++++++++----- - 1 file changed, 13 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3fdaac77..eb28c63e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2095,16 +2095,24 @@ if (NOT MSVC) - ## not omit stack frame pointer for release - set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-omit-frame-pointer") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-omit-frame-pointer") -+ set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -fno-omit-frame-pointer") -+ set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -fno-omit-frame-pointer") - set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -fno-omit-frame-pointer") - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fno-omit-frame-pointer") - - ## 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_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -D_FORTIFY_SOURCE=2") -- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -D_FORTIFY_SOURCE=2") -+ -+ string(REGEX MATCH "-D_FORTIFY_SOURCE=.*" HAS_FORTIFY_MACRO "${CMAKE_CXX_FLAGS}") -+ if (NOT WIN32 AND NOT APPLE AND NOT HAS_FORTIFY_MACRO) -+ # some gcc builds (depends on the distro) set _FORTIFY_SOURCE internally -+ # echo | gcc -O2 -E -dM -|grep _FORTIFY_SOURCE -+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3") -+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3") -+ set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2") -+ set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2") -+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2") -+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2") - endif() - - ## set rpath origin --- -2.44.0 - |