From be03f1035337e6a43c6fa8527ed342f7f614174c Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 22 Jul 2020 20:46:13 +0200 Subject: [PATCH] libloc: use regular stack-protector on i586 Signed-off-by: Arne Fitzenreiter --- lfs/libloc | 7 ++++--- ...tch => libloc-0.9.3-perl-regular-stack-protector.patch} | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) rename src/patches/{libloc-0.9.3-perl-no-stack-protector.patch => libloc-0.9.3-perl-regular-stack-protector.patch} (89%) diff --git a/lfs/libloc b/lfs/libloc index 4f392baca6..df86ff19d0 100644 --- a/lfs/libloc +++ b/lfs/libloc @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team # +# Copyright (C) 2007-2020 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -81,8 +81,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Apply upstream patches cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libloc-0.9.3-country-terminate-buffer-when-reading-from-database.patch - # Add patch for i585 to disable the stack protector. - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libloc-0.9.3-perl-no-stack-protector.patch + # Add patch for i586 to disable strong stack protector. + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libloc-0.9.3-perl-regular-stack-protector.patch cd $(DIR_APP) && ./autogen.sh cd $(DIR_APP) && ./configure \ @@ -97,6 +97,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && cp -avf $(DIR_DL)/location-$(DB_DATE).db.xz /var/lib/location/database.db.xz # Uncompress database. + cd $(DIR_APP) && rm -f /var/lib/location/database.db cd $(DIR_APP) && xz -d /var/lib/location/database.db.xz # Launch location util and export all locations in xt_geoip format. diff --git a/src/patches/libloc-0.9.3-perl-no-stack-protector.patch b/src/patches/libloc-0.9.3-perl-regular-stack-protector.patch similarity index 89% rename from src/patches/libloc-0.9.3-perl-no-stack-protector.patch rename to src/patches/libloc-0.9.3-perl-regular-stack-protector.patch index b615ed902a..2ee807a50c 100644 --- a/src/patches/libloc-0.9.3-perl-no-stack-protector.patch +++ b/src/patches/libloc-0.9.3-perl-regular-stack-protector.patch @@ -6,7 +6,7 @@ index 38d5390..62016ca 100644 LIBS => ['-lloc'], DEFINE => '', # e.g., '-DHAVE_SOMETHING' INC => '-I. -I../../', -+ CCFLAGS => '-fno-stack-protector', ++ CCFLAGS => '-fstack-protector', # Un-comment this if you add C files to link with later: # OBJECT => '$(O_FILES)', # link all the C files too ); -- 2.39.2