From 15a0e2260ea581a6b0fdc68ba8c84ede53d53489 Mon Sep 17 00:00:00 2001 From: Leonid Plyushch Date: Wed, 18 Sep 2019 16:26:16 +0300 Subject: [PATCH] libelf: update to 0.177 --- packages/libelf/build.sh | 5 ++--- packages/libelf/elf_getaroff.c.patch | 12 ------------ packages/libelf/lib-color.c.patch | 8 ++++---- packages/libelf/libelf-elf_getbase.c.patch | 12 ------------ packages/libelf/libelf-elf_getdata_rawchunk.c.patch | 12 ------------ 5 files changed, 6 insertions(+), 43 deletions(-) delete mode 100644 packages/libelf/elf_getaroff.c.patch delete mode 100644 packages/libelf/libelf-elf_getbase.c.patch delete mode 100644 packages/libelf/libelf-elf_getdata_rawchunk.c.patch diff --git a/packages/libelf/build.sh b/packages/libelf/build.sh index 65819f867..7725bf99e 100644 --- a/packages/libelf/build.sh +++ b/packages/libelf/build.sh @@ -3,9 +3,8 @@ TERMUX_PKG_DESCRIPTION="ELF object file access library" TERMUX_PKG_LICENSE="GPL-2.0" # NOTE: We only build the libelf part of elfutils for now, # as other parts are not clang compatible. -TERMUX_PKG_VERSION=0.176 -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SHA256=eb5747c371b0af0f71e86215a5ebb88728533c3a104a43d4231963f308cd1023 +TERMUX_PKG_VERSION=0.177 +TERMUX_PKG_SHA256=fa489deccbcae7d8c920f60d85906124c1989c591196d90e0fd668e3dc05042e TERMUX_PKG_SRCURL=ftp://sourceware.org/pub/elfutils/${TERMUX_PKG_VERSION}/elfutils-${TERMUX_PKG_VERSION}.tar.bz2 # libandroid-support for langinfo. TERMUX_PKG_DEPENDS="libandroid-support, zlib" diff --git a/packages/libelf/elf_getaroff.c.patch b/packages/libelf/elf_getaroff.c.patch deleted file mode 100644 index 3fc56a5ff..000000000 --- a/packages/libelf/elf_getaroff.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r ../elfutils-0.166/libelf/elf_getaroff.c ./libelf/elf_getaroff.c ---- ../elfutils-0.166/libelf/elf_getaroff.c 2015-11-27 08:36:29.000000000 -0500 -+++ ./libelf/elf_getaroff.c 2016-05-04 13:07:06.547288608 -0400 -@@ -38,7 +38,7 @@ - #include "libelfP.h" - - --off_t -+loff_t - elf_getaroff (Elf *elf) - { - /* Be gratious, the specs demand it. */ diff --git a/packages/libelf/lib-color.c.patch b/packages/libelf/lib-color.c.patch index aa04f64bc..ce587a8de 100644 --- a/packages/libelf/lib-color.c.patch +++ b/packages/libelf/lib-color.c.patch @@ -1,6 +1,6 @@ -diff -u -r ../elfutils-0.174/lib/color.c ./lib/color.c ---- ../elfutils-0.174/lib/color.c 2018-09-14 10:23:36.000000000 +0000 -+++ ./lib/color.c 2018-09-22 01:15:01.382883214 +0000 +diff -uNr elfutils-0.177/lib/color.c elfutils-0.177.mod/lib/color.c +--- elfutils-0.177/lib/color.c 2019-08-14 13:12:33.000000000 +0300 ++++ elfutils-0.177.mod/lib/color.c 2019-09-18 16:23:09.802519067 +0300 @@ -40,6 +40,8 @@ #include "libeu.h" #include "color.h" @@ -17,7 +17,7 @@ diff -u -r ../elfutils-0.174/lib/color.c ./lib/color.c - program_invocation_short_name, arg); + __progname, arg); argp_help (&color_argp, stderr, ARGP_HELP_SEE, -- program_invocation_short_name); +- (char *) program_invocation_short_name); + __progname); exit (EXIT_FAILURE); } diff --git a/packages/libelf/libelf-elf_getbase.c.patch b/packages/libelf/libelf-elf_getbase.c.patch deleted file mode 100644 index f4e038926..000000000 --- a/packages/libelf/libelf-elf_getbase.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r ../elfutils-0.166/libelf/elf_getbase.c ./libelf/elf_getbase.c ---- ../elfutils-0.166/libelf/elf_getbase.c 2015-11-27 08:36:29.000000000 -0500 -+++ ./libelf/elf_getbase.c 2016-05-04 13:01:52.776589425 -0400 -@@ -37,7 +37,7 @@ - #include "libelfP.h" - - --off_t -+loff_t - elf_getbase (Elf *elf) - { - return elf == NULL ? (off_t) -1 : elf->start_offset; diff --git a/packages/libelf/libelf-elf_getdata_rawchunk.c.patch b/packages/libelf/libelf-elf_getdata_rawchunk.c.patch deleted file mode 100644 index 00a64bca6..000000000 --- a/packages/libelf/libelf-elf_getdata_rawchunk.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r ../elfutils-0.166/libelf/elf_getdata_rawchunk.c ./libelf/elf_getdata_rawchunk.c ---- ../elfutils-0.166/libelf/elf_getdata_rawchunk.c 2015-11-27 08:36:29.000000000 -0500 -+++ ./libelf/elf_getdata_rawchunk.c 2016-05-04 13:03:35.578844420 -0400 -@@ -41,7 +41,7 @@ - #include "common.h" - - Elf_Data * --elf_getdata_rawchunk (Elf *elf, off_t offset, size_t size, Elf_Type type) -+elf_getdata_rawchunk (Elf *elf, loff_t offset, size_t size, Elf_Type type) - { - if (unlikely (elf == NULL)) - return NULL;