From 74b1e7482542afe61ae85448a66ce658f0ff0329 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sat, 4 Jul 2020 10:42:04 +0200 Subject: [PATCH] libpopt: update to 1.18 --- packages/libpopt/build.sh | 4 ++-- packages/libpopt/fix-hardcoded-paths.patch | 27 ---------------------- 2 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 packages/libpopt/fix-hardcoded-paths.patch diff --git a/packages/libpopt/build.sh b/packages/libpopt/build.sh index e29e35525..a028827dc 100644 --- a/packages/libpopt/build.sh +++ b/packages/libpopt/build.sh @@ -1,9 +1,9 @@ TERMUX_PKG_HOMEPAGE=http://www.linuxfromscratch.org/blfs/view/svn/general/popt.html TERMUX_PKG_DESCRIPTION="Library for parsing cmdline parameters" TERMUX_PKG_LICENSE="BSD" -TERMUX_PKG_VERSION=1.16 +TERMUX_PKG_VERSION=1.18 TERMUX_PKG_SRCURL=https://deb.debian.org/debian/pool/main/p/popt/popt_${TERMUX_PKG_VERSION}.orig.tar.gz -TERMUX_PKG_SHA256=e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8 +TERMUX_PKG_SHA256=5159bc03a20b28ce363aa96765f37df99ea4d8850b1ece17d1e6ad5c24fdc5d1 TERMUX_PKG_DEPENDS="libandroid-glob" TERMUX_PKG_BREAKS="libpopt-dev" TERMUX_PKG_REPLACES="libpopt-dev" diff --git a/packages/libpopt/fix-hardcoded-paths.patch b/packages/libpopt/fix-hardcoded-paths.patch deleted file mode 100644 index 881a3900d..000000000 --- a/packages/libpopt/fix-hardcoded-paths.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -uNr popt-1.16/poptconfig.c popt-1.16.mod/poptconfig.c ---- popt-1.16/poptconfig.c 2009-05-20 16:18:07.000000000 +0300 -+++ popt-1.16.mod/poptconfig.c 2017-09-12 12:08:55.442990190 +0300 -@@ -499,7 +499,7 @@ - int poptReadDefaultConfig(poptContext con, /*@unused@*/ UNUSED(int useEnv)) - { - static const char _popt_sysconfdir[] = POPT_SYSCONFDIR "/popt"; -- static const char _popt_etc[] = "/etc/popt"; -+ static const char _popt_etc[] = "@TERMUX_PREFIX@/etc/popt"; - char * home; - struct stat sb; - int rc = 0; /* assume success */ -@@ -515,12 +515,12 @@ - if (rc) goto exit; - - #if defined(HAVE_GLOB_H) -- if (!stat("/etc/popt.d", &sb) && S_ISDIR(sb.st_mode)) { -+ if (!stat("@TERMUX_PREFIX@/etc/popt.d", &sb) && S_ISDIR(sb.st_mode)) { - const char ** av = NULL; - int ac = 0; - int i; - -- if ((rc = poptGlob(con, "/etc/popt.d/*", &ac, &av)) == 0) { -+ if ((rc = poptGlob(con, "@TERMUX_PREFIX@/etc/popt.d/*", &ac, &av)) == 0) { - for (i = 0; rc == 0 && i < ac; i++) { - const char * fn = av[i]; - if (fn == NULL || strstr(fn, ".rpmnew") || strstr(fn, ".rpmsave"))