webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

libloc: use regular stack-protector on i586

Browse Source 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2020-07-22 20:46:13 +02:00
parent d9c1908f64
commit be03f10353
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lfs/libloc
View File

@@ -1,7 +1,7 @@
############################################################################### ###############################################################################
# # # #
# IPFire.org - A linux based firewall # # IPFire.org - A linux based firewall #
# Copyright (C) 2007-2019 IPFire Team <info@ipfire.org> # # Copyright (C) 2007-2020 IPFire Team <info@ipfire.org> #
# # # #
# This program is free software: you can redistribute it and/or modify # # 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 # # 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 # 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 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. # Add patch for i586 to disable strong stack protector.
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libloc-0.9.3-perl-no-stack-protector.patch 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) && ./autogen.sh
cd $(DIR_APP) && ./configure \ 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 cd $(DIR_APP) && cp -avf $(DIR_DL)/location-$(DB_DATE).db.xz /var/lib/location/database.db.xz
# Uncompress database. # Uncompress database.
cd $(DIR_APP) && rm -f /var/lib/location/database.db
cd $(DIR_APP) && xz -d /var/lib/location/database.db.xz cd $(DIR_APP) && xz -d /var/lib/location/database.db.xz
# Launch location util and export all locations in xt_geoip format. # Launch location util and export all locations in xt_geoip format.

2
src/patches/libloc-0.9.3-perl-no-stack-protector.patch → src/patches/libloc-0.9.3-perl-regular-stack-protector.patch
View File

@@ -6,7 +6,7 @@ index 38d5390..62016ca 100644
LIBS => ['-lloc'], LIBS => ['-lloc'],
DEFINE => '', # e.g., '-DHAVE_SOMETHING' DEFINE => '', # e.g., '-DHAVE_SOMETHING'
INC => '-I. -I../../', INC => '-I. -I../../',
+ CCFLAGS => '-fno-stack-protector', + CCFLAGS => '-fstack-protector',
# Un-comment this if you add C files to link with later: # Un-comment this if you add C files to link with later:
# OBJECT => '$(O_FILES)', # link all the C files too # OBJECT => '$(O_FILES)', # link all the C files too
); );