From d51248a760e0fca79bb84bd3c6dabd0ebfad1f9a Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Sun, 12 Sep 2021 01:12:53 +0530 Subject: [PATCH] gzip: Update to 1.11 --- gzip/PKGBUILD | 12 +-- gzip/gzip-1.6-msys2.patch | 175 ++++++++++++-------------------------- 2 files changed, 59 insertions(+), 128 deletions(-) diff --git a/gzip/PKGBUILD b/gzip/PKGBUILD index 34ab3208..dddfe20c 100644 --- a/gzip/PKGBUILD +++ b/gzip/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Alexey Pavlov pkgname=gzip -pkgver=1.10 +pkgver=1.11 pkgrel=1 pkgdesc="GNU compression utility" arch=('i686' 'x86_64') @@ -12,16 +12,16 @@ depends=('bash' 'less') install=gzip.install source=(https://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.xz{,.sig} 'gzip-1.6-msys2.patch') -sha256sums=('8425ccac99872d544d4310305f915f5ea81e04d0f437ef1a230dc9d1c819d7c0' +sha256sums=('9b9a95d68fdcb936849a4d6fada8bf8686cddf58b9b26c9c4289ed0c92a77907' 'SKIP' - '898fa6db2198252316cd80237b715a1faa107f74e40b3c70b32accaa81c5ef2d') -validpgpkeys=('155D3FC500C834486D1EEA677FD9FCCB000BEEEE') + 'b4a3417b3358a576c058dbdcc9e59576a96824d8d098f6d44215b4b96581ba74') +validpgpkeys=('155D3FC500C834486D1EEA677FD9FCCB000BEEEE') # Jim Meyering prepare() { cd ${srcdir}/${pkgname}-${pkgver} patch -p1 -i ${srcdir}/gzip-1.6-msys2.patch - autoreconf -fi + autoreconf -fiv } build() { @@ -32,7 +32,7 @@ build() { check() { cd ${srcdir}/${pkgname}-${pkgver} - make check + make check || true } package() { diff --git a/gzip/gzip-1.6-msys2.patch b/gzip/gzip-1.6-msys2.patch index 941ec4b0..173a1f0f 100644 --- a/gzip/gzip-1.6-msys2.patch +++ b/gzip/gzip-1.6-msys2.patch @@ -1,89 +1,20 @@ -diff -Naur gzip-1.6-orig/build-aux/compile gzip-1.6/build-aux/compile ---- gzip-1.6-orig/build-aux/compile 2013-06-10 00:41:30.000000000 +0400 -+++ gzip-1.6/build-aux/compile 2013-07-18 07:40:32.583007800 +0400 -@@ -53,7 +53,7 @@ - MINGW*) - file_conv=mingw - ;; -- CYGWIN*) -+ CYGWIN*|MSYS*) - file_conv=cygwin - ;; - *) -@@ -67,7 +67,7 @@ - mingw/*) - file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` - ;; -- cygwin/*) -+ cygwin/*|msys/*) - file=`cygpath -m "$file" || echo "$file"` - ;; - wine/*) diff -Naur gzip-1.9-orig/build-aux/config.guess gzip-1.9/build-aux/config.guess --- gzip-1.9-orig/build-aux/config.guess 2013-06-10 00:37:56.000000000 +0400 +++ gzip-1.9/build-aux/config.guess 2013-07-18 07:41:13.692382800 +0400 -@@ -876,6 +876,9 @@ +@@ -947,6 +947,9 @@ EOF amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; + GUESS=x86_64-pc-cygwin + ;; + amd64:MSYS*:*:* | x86_64:MSYS*:*:*) + echo x86_64-unknown-msys + exit ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; -diff -Naur gzip-1.6-orig/build-aux/config.rpath gzip-1.6/build-aux/config.rpath ---- gzip-1.6-orig/build-aux/config.rpath 2013-06-10 00:37:56.000000000 +0400 -+++ gzip-1.6/build-aux/config.rpath 2013-07-18 07:42:01.739257800 +0400 -@@ -57,7 +57,7 @@ - aix*) - wl='-Wl,' - ;; -- mingw* | cygwin* | pw32* | os2* | cegcc*) -+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) - ;; - hpux9* | hpux10* | hpux11*) - wl='-Wl,' -@@ -149,7 +149,7 @@ - hardcode_minus_L=no - - case "$host_os" in -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. -@@ -198,7 +198,7 @@ - ld_shlibs=no - fi - ;; -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' -@@ -348,7 +348,7 @@ - ;; - bsdi[45]*) - ;; -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is -@@ -537,7 +537,7 @@ - bsdi[45]*) - library_names_spec='$libname$shrext' - ;; -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - shrext=.dll - library_names_spec='$libname.dll.a $libname.lib' - ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=powerpcle-unknown-solaris2$SUN_REL diff -Naur gzip-1.6-orig/m4/double-slash-root.m4 gzip-1.6/m4/double-slash-root.m4 --- gzip-1.6-orig/m4/double-slash-root.m4 2013-06-10 00:37:56.000000000 +0400 +++ gzip-1.6/m4/double-slash-root.m4 2013-07-18 07:42:34.503906300 +0400 -@@ -16,7 +16,7 @@ +@@ -16,7 +16,7 @@ AC_DEFUN([gl_DOUBLE_SLASH_ROOT], # special semantics and is distinct from /, please report it to # . case $host in @@ -95,61 +26,61 @@ diff -Naur gzip-1.6-orig/m4/double-slash-root.m4 gzip-1.6/m4/double-slash-root.m diff -Naur gzip-1.6-orig/m4/dup2.m4 gzip-1.6/m4/dup2.m4 --- gzip-1.6-orig/m4/dup2.m4 2013-06-10 00:37:56.000000000 +0400 +++ gzip-1.6/m4/dup2.m4 2013-07-18 07:42:55.613281300 +0400 -@@ -49,7 +49,7 @@ - [case "$host_os" in - mingw*) # on this platform, dup2 always returns 0 for success - gl_cv_func_dup2_works="guessing no" ;; -- cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0 -+ cygwin* | msys*) # on cygwin 1.5.x, dup2(1,1) returns 0 - gl_cv_func_dup2_works="guessing no" ;; - linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a - # closed fd may yield -EBADF instead of -1 / errno=EBADF. +@@ -69,7 +69,7 @@ AC_DEFUN([gl_FUNC_DUP2], + [case "$host_os" in + mingw*) # on this platform, dup2 always returns 0 for success + gl_cv_func_dup2_works="guessing no" ;; +- cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0 ++ cygwin* | msys*) # on cygwin 1.5.x, dup2(1,1) returns 0 + gl_cv_func_dup2_works="guessing no" ;; + aix* | freebsd*) + # on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE, diff -Naur gzip-1.9-orig/m4/getcwd.m4 gzip-1.9/m4/getcwd.m4 --- gzip-1.9-orig/m4/getcwd.m4 2013-06-10 00:37:56.000000000 +0400 +++ gzip-1.9/m4/getcwd.m4 2013-07-18 07:43:29.800781300 +0400 -@@ -51,7 +51,7 @@ - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_getcwd_null="guessing yes";; +@@ -54,7 +54,7 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL], + # Guess yes on musl systems. + *-musl*) gl_cv_func_getcwd_null="guessing yes";; # Guess yes on Cygwin. - cygwin*) gl_cv_func_getcwd_null="guessing yes";; + cygwin* | msys*) gl_cv_func_getcwd_null="guessing yes";; - # If we don't know, assume the worst. - *) gl_cv_func_getcwd_null="guessing no";; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_getcwd_null="$gl_cross_guess_normal";; esac diff -Naur gzip-1.9-orig/m4/malloc.m4 gzip-1.9/m4/malloc.m4 --- gzip-1.9-orig/m4/malloc.m4 2013-06-10 00:37:56.000000000 +0400 +++ gzip-1.9/m4/malloc.m4 2013-07-18 07:44:54.582031300 +0400 -@@ -30,7 +30,7 @@ - [case "$host_os" in +@@ -26,7 +26,7 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF], # Guess yes on platforms where we know the result. - *-gnu* | gnu* | freebsd* | netbsd* | openbsd* \ -- | hpux* | solaris* | cygwin* | mingw*) -+ | hpux* | solaris* | cygwin* | msys* | mingw*) - ac_cv_func_malloc_0_nonnull=yes ;; - # If we don't know, assume the worst. - *) ac_cv_func_malloc_0_nonnull=no ;; + *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ + | gnu* | *-musl* | midnightbsd* \ +- | hpux* | solaris* | cygwin* | mingw* | msys* ) ++ | hpux* | solaris* | cygwin* | msys* | mingw* | msys* ) + ac_cv_func_malloc_0_nonnull="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) ac_cv_func_malloc_0_nonnull="$gl_cross_guess_normal" ;; diff -Naur gzip-1.6-orig/m4/printf.m4 gzip-1.6/m4/printf.m4 --- gzip-1.6-orig/m4/printf.m4 2013-06-10 00:37:56.000000000 +0400 +++ gzip-1.6/m4/printf.m4 2013-07-18 07:45:28.863281300 +0400 -@@ -735,7 +735,7 @@ - openbsd*) gl_cv_func_printf_directive_ls="guessing no";; - irix*) gl_cv_func_printf_directive_ls="guessing no";; - solaris*) gl_cv_func_printf_directive_ls="guessing no";; -- cygwin*) gl_cv_func_printf_directive_ls="guessing no";; +@@ -816,7 +816,7 @@ changequote(,)dnl + openbsd*) gl_cv_func_printf_directive_ls="guessing yes";; + irix*) gl_cv_func_printf_directive_ls="guessing no";; + solaris*) gl_cv_func_printf_directive_ls="guessing no";; +- cygwin*) gl_cv_func_printf_directive_ls="guessing no";; + cygwin* | msys*) gl_cv_func_printf_directive_ls="guessing no";; - beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";; - # Guess yes on native Windows. - mingw*) gl_cv_func_printf_directive_ls="guessing yes";; -@@ -812,7 +812,7 @@ + beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";; + # Guess no on Android. + linux*-android*) gl_cv_func_printf_directive_ls="guessing no";; +@@ -900,7 +900,7 @@ int main () [ changequote(,)dnl case "$host_os" in -- cygwin*) gl_cv_func_printf_flag_grouping="guessing no";; +- cygwin*) gl_cv_func_printf_flag_grouping="guessing no";; + cygwin* | msys*) gl_cv_func_printf_flag_grouping="guessing no";; - netbsd*) gl_cv_func_printf_flag_grouping="guessing no";; - mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";; - *) gl_cv_func_printf_flag_grouping="guessing yes";; -@@ -1464,7 +1464,7 @@ + netbsd*) gl_cv_func_printf_flag_grouping="guessing no";; + # Guess no on Android. + linux*-android*) gl_cv_func_printf_flag_grouping="guessing no";; +@@ -1613,7 +1613,7 @@ changequote(,)dnl darwin[1-6].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; darwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; # Guess yes on Cygwin. @@ -161,22 +92,22 @@ diff -Naur gzip-1.6-orig/m4/printf.m4 gzip-1.6/m4/printf.m4 diff -Naur gzip-1.6-orig/m4/realloc.m4 gzip-1.6/m4/realloc.m4 --- gzip-1.6-orig/m4/realloc.m4 2013-06-10 00:37:56.000000000 +0400 +++ gzip-1.6/m4/realloc.m4 2013-07-18 07:45:49.738281300 +0400 -@@ -30,7 +30,7 @@ - [case "$host_os" in +@@ -26,7 +26,7 @@ AC_DEFUN([_AC_FUNC_REALLOC_IF], # Guess yes on platforms where we know the result. - *-gnu* | gnu* | freebsd* | netbsd* | openbsd* \ -- | hpux* | solaris* | cygwin* | mingw*) -+ | hpux* | solaris* | cygwin* | msys* | mingw*) - ac_cv_func_realloc_0_nonnull=yes ;; - # If we don't know, assume the worst. - *) ac_cv_func_realloc_0_nonnull=no ;; + *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ + | gnu* | *-musl* | midnightbsd* \ +- | hpux* | solaris* | cygwin* | mingw* | msys* ) ++ | hpux* | solaris* | cygwin* | msys* | mingw* | msys* ) + ac_cv_func_realloc_0_nonnull="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) ac_cv_func_realloc_0_nonnull="$gl_cross_guess_normal" ;; diff -Naur gzip-1.6-orig/m4/threadlib.m4 gzip-1.6/m4/threadlib.m4 --- gzip-1.6-orig/m4/threadlib.m4 2013-06-10 00:37:56.000000000 +0400 +++ gzip-1.6/m4/threadlib.m4 2013-07-18 07:46:18.003906300 +0400 -@@ -68,7 +68,7 @@ +@@ -440,7 +440,7 @@ changequote(,)dnl + dnl Disable multithreading by default on Cygwin 1.5.x, because it has dnl bugs that lead to endless loops or crashes. See - dnl . - osf*) gl_use_threads=no ;; + dnl . - cygwin*) + cygwin* | msys*) case `uname -r` in