diff options
| author | Oleksandr Natalenko | 2022-05-12 23:32:35 +0200 |
|---|---|---|
| committer | Oleksandr Natalenko | 2022-05-12 23:32:35 +0200 |
| commit | a2448debc4dacfbca95e38abe4dd74ae800347d5 (patch) | |
| tree | 2e528d3339afc9dd71ed030592fc2122a47f7009 | |
| parent | c72f3f3c719819288d3e29a4f72d57322986bf83 (diff) | |
| download | aur-a2448debc4dacfbca95e38abe4dd74ae800347d5.tar.gz | |
use -D_FORTIFY_SOURCE=2, use -z directly, remove -pie
Signed-off-by: Oleksandr Natalenko <oleksandr@natalenko.name>
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | 03-hardening.patch | 6 | ||||
| -rw-r--r-- | PKGBUILD | 4 |
3 files changed, 7 insertions, 7 deletions
@@ -1,7 +1,7 @@ pkgbase = 7-zip pkgdesc = File archiver with a high compression ratio pkgver = 21.07 - pkgrel = 3 + pkgrel = 4 url = https://www.7-zip.org arch = x86_64 license = LGPL @@ -13,6 +13,6 @@ pkgbase = 7-zip sha256sums = d1074d56f415aab99d99e597a7b66dc455dba6349ae8a4c89df76475b6a1284c sha256sums = 76cabefa3bdf9fa2b6a7af1fc549534684b17f6785a32b0e1bc1f459d401eb74 sha256sums = e4d34366e091b8404dd04f02bcad46518d2930ec0b4a420e1316db020234b085 - sha256sums = 0fd25bfb4f9f330573f94c61c9708dc15791bb51a5b294a5ab81b0463de08453 + sha256sums = 4be9968d05ab7163e7ded473202abcf465229d96b133c702091fc1b91dee0c06 pkgname = 7-zip diff --git a/03-hardening.patch b/03-hardening.patch index 4c646bcec786..593d461a8d48 100644 --- a/03-hardening.patch +++ b/03-hardening.patch @@ -5,7 +5,7 @@ -CFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(CC_SHARED) -o $@
-+CFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) -fstack-protector-strong $(CC_SHARED) -o $@
++CFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) -fstack-protector-strong -D_FORTIFY_SOURCE=2 $(CC_SHARED) -o $@
ifdef IS_MINGW
@@ -14,7 +14,7 @@ #-Wno-reorder
-CXXFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CXXFLAGS_BASE2) $(CFLAGS_BASE) $(CXXFLAGS_EXTRA) $(CC_SHARED) -o $@ $(CXX_WARN_FLAGS)
-+CXXFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CXXFLAGS_BASE2) $(CFLAGS_BASE) $(CXXFLAGS_EXTRA) -fstack-protector-strong $(CC_SHARED) -o $@ $(CXX_WARN_FLAGS)
++CXXFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CXXFLAGS_BASE2) $(CFLAGS_BASE) $(CXXFLAGS_EXTRA) -fstack-protector-strong -D_FORTIFY_SOURCE=2 $(CC_SHARED) -o $@ $(CXX_WARN_FLAGS)
STATIC_TARGET=
ifdef COMPL_STATIC
@@ -23,7 +23,7 @@ $(MY_MKDIR) $(O)
-LFLAGS_ALL = -s $(MY_ARCH_2) $(LDFLAGS) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
-+LFLAGS_ALL = -s $(MY_ARCH_2) $(LDFLAGS) -Wl,-pie,-z,now,-z,noexecstack $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
++LFLAGS_ALL = -s $(MY_ARCH_2) $(LDFLAGS) -z relro -z now -z noexecstack $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
$(PROGPATH): $(OBJS)
$(CXX) -o $(PROGPATH) $(LFLAGS_ALL)
@@ -2,7 +2,7 @@ pkgname=7-zip pkgver=21.07 -pkgrel=3 +pkgrel=4 pkgdesc="File archiver with a high compression ratio" url="https://www.7-zip.org" license=(LGPL) @@ -15,7 +15,7 @@ source=(https://7-zip.org/a/7z2107-src.7z sha256sums=('d1074d56f415aab99d99e597a7b66dc455dba6349ae8a4c89df76475b6a1284c' '76cabefa3bdf9fa2b6a7af1fc549534684b17f6785a32b0e1bc1f459d401eb74' 'e4d34366e091b8404dd04f02bcad46518d2930ec0b4a420e1316db020234b085' - '0fd25bfb4f9f330573f94c61c9708dc15791bb51a5b294a5ab81b0463de08453') + '4be9968d05ab7163e7ded473202abcf465229d96b133c702091fc1b91dee0c06') prepare() { patch -Np1 -i 01-uasm.patch |