This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 99f8980deccb7491a75ec86036dbc32614c50b43 (commit) via cb4860794b9a5fcd92447414ea0b004ea9f0101f (commit) from bbaf9bdf21bff1a48eef82e6807a28d1e939783d (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 99f8980deccb7491a75ec86036dbc32614c50b43 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Jul 19 20:21:41 2020 +0200
libloc: Add upstream patch to fix a buffer issue.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit cb4860794b9a5fcd92447414ea0b004ea9f0101f Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Jul 19 11:22:52 2020 +0200
libloc: Apply patch to compile the perl module without stack protector.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: lfs/libloc | 6 ++++++ ...rminate-buffer-when-reading-from-database.patch | 24 ++++++++++++++++++++++ .../libloc-0.9.3-perl-no-stack-protector.patch | 12 +++++++++++ 3 files changed, 42 insertions(+) create mode 100644 src/patches/libloc-0.9.3-country-terminate-buffer-when-reading-from-database.patch create mode 100644 src/patches/libloc-0.9.3-perl-no-stack-protector.patch
Difference in files: diff --git a/lfs/libloc b/lfs/libloc index 43af26b45..4f392baca 100644 --- a/lfs/libloc +++ b/lfs/libloc @@ -78,6 +78,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xvf $(DIR_DL)/$(DL_FILE)
+ # 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 + cd $(DIR_APP) && ./autogen.sh cd $(DIR_APP) && ./configure \ --prefix=/usr \ diff --git a/src/patches/libloc-0.9.3-country-terminate-buffer-when-reading-from-database.patch b/src/patches/libloc-0.9.3-country-terminate-buffer-when-reading-from-database.patch new file mode 100644 index 000000000..0ad9229fd --- /dev/null +++ b/src/patches/libloc-0.9.3-country-terminate-buffer-when-reading-from-database.patch @@ -0,0 +1,24 @@ +commit 61d3516bbfce6b4e6393825329c07b1e2a88d47d +Author: Michael Tremer michael.tremer@ipfire.org +Date: Mon Jul 13 10:47:30 2020 +0000 + + country: Terminate buffer when reading from database + + Compilers on ARM do not seem to initialise the buffer. + + Signed-off-by: Michael Tremer michael.tremer@ipfire.org + +diff --git a/src/country.c b/src/country.c +index d6ddf50..2ba93e6 100644 +--- a/src/country.c ++++ b/src/country.c +@@ -125,6 +125,9 @@ int loc_country_new_from_database_v1(struct loc_ctx* ctx, struct loc_stringpool* + // Read country code + loc_country_code_copy(buffer, dbobj->code); + ++ // Terminate buffer ++ buffer[2] = '\0'; ++ + // Create a new country object + int r = loc_country_new(ctx, country, buffer); + if (r) diff --git a/src/patches/libloc-0.9.3-perl-no-stack-protector.patch b/src/patches/libloc-0.9.3-perl-no-stack-protector.patch new file mode 100644 index 000000000..b615ed902 --- /dev/null +++ b/src/patches/libloc-0.9.3-perl-no-stack-protector.patch @@ -0,0 +1,12 @@ +diff --git a/src/perl/Makefile.PL b/src/perl/Makefile.PL +index 38d5390..62016ca 100644 +--- a/src/perl/Makefile.PL ++++ b/src/perl/Makefile.PL +@@ -11,6 +11,7 @@ WriteMakefile( + LIBS => ['-lloc'], + DEFINE => '', # e.g., '-DHAVE_SOMETHING' + INC => '-I. -I../../', ++ CCFLAGS => '-fno-stack-protector', + # Un-comment this if you add C files to link with later: + # OBJECT => '$(O_FILES)', # link all the C files too + );
hooks/post-receive -- IPFire 2.x development tree