diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | fortify.patch | 28 |
3 files changed, 25 insertions, 11 deletions
@@ -1,7 +1,7 @@ pkgbase = yass-proxy pkgdesc = lightweight http/socks proxy pkgver = 1.8.1 - pkgrel = 2 + pkgrel = 3 url = https://github.com/Chilledheart/yass arch = x86_64 license = GPL-2.0-only @@ -30,6 +30,6 @@ pkgbase = yass-proxy source = https://github.com/Chilledheart/yass/releases/download/1.8.1/yass-1.8.1.tar.bz2 source = fortify.patch sha256sums = b6be8f8b6351505df64f1ed1ad6d25c28abeb67ea87d4727c92cc0369d992c1f - sha256sums = 790762651ae1cbbf739fa68ba0c1076d4dc885212a83bd2e914e2217d0e10117 + sha256sums = cc1b6e0a879c2f24b794ac70e049fab212c734778ba5ecdd03262279f1947549 pkgname = yass-proxy @@ -3,7 +3,7 @@ pkgname=yass-proxy pkgver=1.8.1 -pkgrel=2 +pkgrel=3 _pkgver=1.8.1 _pkgrel=1 pkgdesc="lightweight http/socks proxy" @@ -20,7 +20,7 @@ source=("https://github.com/Chilledheart/yass/releases/download/${_pkgver}/yass- "fortify.patch" ) sha256sums=('b6be8f8b6351505df64f1ed1ad6d25c28abeb67ea87d4727c92cc0369d992c1f' - '790762651ae1cbbf739fa68ba0c1076d4dc885212a83bd2e914e2217d0e10117' + 'cc1b6e0a879c2f24b794ac70e049fab212c734778ba5ecdd03262279f1947549' ) prepare() { diff --git a/fortify.patch b/fortify.patch index 147f74664019..4fe6095bf39c 100644 --- a/fortify.patch +++ b/fortify.patch @@ -1,24 +1,38 @@ -From 1e8ae9809d7c8f6be0c5c87e539853221aa50290 Mon Sep 17 00:00:00 2001 +From 813a6edbf076317a4a9d3fcc80f2787f3e5d5151 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 +Subject: [PATCH] build: fix some missing flags in minsizerel build +fortify: use level 3 for release build --- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + CMakeLists.txt | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3fdaac77..6410c328 100644 +index 3fdaac77..60046e83 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2101,8 +2101,8 @@ if (NOT MSVC) +@@ -2095,14 +2095,20 @@ 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) +- 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") ++ ++ string(REGEX MATCH "-D_FORTIFY_SOURCE=.*" HAS_FORTIFY_MACRO "${CMAKE_CXX_FLAGS}") ++ if (NOT WIN32 AND NOT APPLE AND NOT HAS_FORTIFY_MACRO) + 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_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -D_FORTIFY_SOURCE=2") ++ set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -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") endif() |