Date: Friday, August 9, 2019 @ 10:42:34 Author: felixonmars Revision: 359369
upgpkg: gettext 0.20.1-1 Modified: gettext/trunk/PKGBUILD Deleted: gettext/trunk/gettext-0.19.8-its-segfault.patch -----------------------------------+ PKGBUILD | 20 +++++----------- gettext-0.19.8-its-segfault.patch | 43 ------------------------------------ 2 files changed, 7 insertions(+), 56 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-08-09 09:36:22 UTC (rev 359368) +++ PKGBUILD 2019-08-09 10:42:34 UTC (rev 359369) @@ -1,8 +1,8 @@ # Maintainer: pkgname=gettext -pkgver=0.19.8.1 -pkgrel=3 +pkgver=0.20.1 +pkgrel=1 pkgdesc="GNU internationalization library" url="https://www.gnu.org/software/gettext/" arch=(x86_64) @@ -12,18 +12,12 @@ makedepends=(gettext emacs git) optdepends=('git: for autopoint infrastructure updates') options=(!docs) -source=(https://ftp.gnu.org/pub/gnu/gettext/$pkgname-$pkgver.tar.gz{,.sig} - gettext-0.19.8-its-segfault.patch) -sha256sums=('ff942af0e438ced4a8b0ea4b0b6e0d6d657157c5e2364de57baa279c1c125c43' - 'SKIP' - '0e3b19ea94e956a6a484ca4c4ecea32a01a83f10a413e586183de464c51f158d') -validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871') # Daiki Ueno +source=(https://ftp.gnu.org/pub/gnu/gettext/$pkgname-$pkgver.tar.gz{,.sig}) +sha256sums=('66415634c6e8c3fa8b71362879ec7575e27da43da562c798a8a2f223e6e47f5c' + 'SKIP') +validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871' # Daiki Ueno + '68D94D8AAEEAD48AE7DC5B904F494A942E4616C2') # Bruno Haible (Open Source Development) -prepare() { - cd $pkgname-$pkgver - patch -Np1 -i ../gettext-0.19.8-its-segfault.patch -} - build() { cd $pkgname-$pkgver ./configure \ Deleted: gettext-0.19.8-its-segfault.patch =================================================================== --- gettext-0.19.8-its-segfault.patch 2019-08-09 09:36:22 UTC (rev 359368) +++ gettext-0.19.8-its-segfault.patch 2019-08-09 10:42:34 UTC (rev 359369) @@ -1,43 +0,0 @@ -From a0cab23332a254e3500cac2a3a984472d02180e5 Mon Sep 17 00:00:00 2001 -From: Bruno Haible <br...@clisp.org> -Date: Fri, 9 Dec 2016 21:04:31 +0100 -Subject: [PATCH] Fix crash of xgettext with --its option. - -* gettext-tools/src/xgettext.c (main): Free contents of its_dirs only when it -was initialized. Fixes bug introduced on 2016-05-16. ---- - gettext-tools/src/xgettext.c | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c -index f848d76d1..a80ee51ac 100644 ---- a/gettext-tools/src/xgettext.c -+++ b/gettext-tools/src/xgettext.c -@@ -330,7 +330,7 @@ main (int argc, char *argv[]) - bool sort_by_msgid = false; - bool sort_by_filepos = false; - char **dirs; -- char **its_dirs; -+ char **its_dirs = NULL; - char *explicit_its_filename = NULL; - const char *file_name; - const char *files_from = NULL; -@@ -1016,9 +1016,12 @@ warning: file '%s' extension '%s' is unknown; will try C"), filename, extension) - if (its_locating_rules) - locating_rule_list_free (its_locating_rules); - -- for (i = 0; its_dirs[i] != NULL; i++) -- free (its_dirs[i]); -- free (its_dirs); -+ if (its_dirs != NULL) -+ { -+ for (i = 0; its_dirs[i] != NULL; i++) -+ free (its_dirs[i]); -+ free (its_dirs); -+ } - - exit (EXIT_SUCCESS); - } --- -2.14.3 -