diff --git a/gzip/PKGBUILD b/gzip/PKGBUILD new file mode 100644 index 00000000..b4132a34 --- /dev/null +++ b/gzip/PKGBUILD @@ -0,0 +1,43 @@ +# Maintainer: Alexey Pavlov + +pkgname=gzip +pkgver=1.6 +pkgrel=1 +pkgdesc="GNU compression utility" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/gzip/" +license=('GPL3') +groups=('base' 'base-devel') +depends=('msys2-runtime' 'bash' 'less') +install=gzip.install +source=(ftp://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.xz{,.sig} + gzip-1.6-fpending.patch + gzip-1.6-msys2.patch) +md5sums=('da981f86677d58a106496e68de6f8995' + 'SKIP' + '6a6f05c2ccc52a3958130998465b2724' + 'a8b37bd18819566f61a60271ec3201cc') + +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + + patch -p1 -i ${srcdir}/gzip-1.6-fpending.patch + patch -p1 -i ${srcdir}/gzip-1.6-msys2.patch + autoreconf -fi +} + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --build=${CHOST} --prefix=/usr + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make prefix=${pkgdir} install +} diff --git a/gzip/gzip-1.6-fpending.patch b/gzip/gzip-1.6-fpending.patch new file mode 100644 index 00000000..1cf8be10 --- /dev/null +++ b/gzip/gzip-1.6-fpending.patch @@ -0,0 +1,87 @@ +diff -Naur gzip-1.6-fpending/lib/config.hin gzip-1.6/lib/config.hin +--- gzip-1.6-fpending/lib/config.hin 2013-10-20 10:11:10.369000000 +0400 ++++ gzip-1.6/lib/config.hin 2013-10-20 10:24:12.124800000 +0400 +@@ -411,10 +411,6 @@ + don't. */ + #undef HAVE_DECL__SNPRINTF + +-/* Define to 1 if you have the declaration of `__fpending', and to 0 if you +- don't. */ +-#undef HAVE_DECL___FPENDING +- + /* Define to 1 if you have the header file, and it defines `DIR'. + */ + #undef HAVE_DIRENT_H +@@ -778,9 +774,6 @@ + /* Define to 1 if you have the `_set_invalid_parameter_handler' function. */ + #undef HAVE__SET_INVALID_PARAMETER_HANDLER + +-/* Define to 1 if you have the `__fpending' function. */ +-#undef HAVE___FPENDING +- + /* Define to 1 if you have the `__fpurge' function. */ + #undef HAVE___FPURGE + +diff -Naur gzip-1.6-fpending/lib/fpending.h gzip-1.6/lib/fpending.h +--- gzip-1.6-fpending/lib/fpending.h 2013-09-22 19:25:57.000000000 +0400 ++++ gzip-1.6/lib/fpending.h 2013-10-20 10:26:22.710600000 +0400 +@@ -20,11 +20,10 @@ + + #include + #include ++#if HAVE_STDIO_EXT_H ++# include ++#endif + +-#if HAVE_DECL___FPENDING +-# if HAVE_STDIO_EXT_H +-# include +-# endif +-#else ++#ifndef __fpending + size_t __fpending (FILE *); + #endif +diff -Naur gzip-1.6-fpending/m4/fpending.m4 gzip-1.6/m4/fpending.m4 +--- gzip-1.6-fpending/m4/fpending.m4 2013-09-22 19:25:57.000000000 +0400 ++++ gzip-1.6/m4/fpending.m4 2013-10-20 10:27:26.603600000 +0400 +@@ -16,14 +16,19 @@ + AC_DEFUN([gl_FUNC_FPENDING], + [ + AC_CHECK_HEADERS_ONCE([stdio_ext.h]) +- AC_CHECK_FUNCS_ONCE([__fpending]) +- fp_headers=' +-# include +-# if HAVE_STDIO_EXT_H +-# include +-# endif +-' +- AC_CHECK_DECLS([__fpending], , , $fp_headers) ++ AC_CACHE_CHECK([for __fpending], [gl_cv_func___fpending], ++ [ ++ AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[#include ++ #if HAVE_STDIO_EXT_H ++ # include ++ #endif ++ ]], ++ [[return ! __fpending (stdin);]])], ++ [gl_cv_func___fpending=yes], ++ [gl_cv_func___fpending=no]) ++ ]) + ]) + + AC_DEFUN([gl_PREREQ_FPENDING], +diff -Naur gzip-1.6-fpending/m4/gnulib-comp.m4 gzip-1.6/m4/gnulib-comp.m4 +--- gzip-1.6-fpending/m4/gnulib-comp.m4 2013-09-22 19:29:16.000000000 +0400 ++++ gzip-1.6/m4/gnulib-comp.m4 2013-10-20 10:28:16.554800000 +0400 +@@ -333,7 +333,7 @@ + AC_LIBOBJ([itold]) + fi + gl_FUNC_FPENDING +- if test $ac_cv_func___fpending = no; then ++ if test $gl_cv_func___fpending = no; then + AC_LIBOBJ([fpending]) + gl_PREREQ_FPENDING + fi + diff --git a/gzip/gzip-1.6-msys2.patch b/gzip/gzip-1.6-msys2.patch new file mode 100644 index 00000000..0b180c7a --- /dev/null +++ b/gzip/gzip-1.6-msys2.patch @@ -0,0 +1,283 @@ +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.6-orig/build-aux/config.guess gzip-1.6/build-aux/config.guess +--- gzip-1.6-orig/build-aux/config.guess 2013-06-10 00:37:56.000000000 +0400 ++++ gzip-1.6/build-aux/config.guess 2013-07-18 07:41:13.692382800 +0400 +@@ -866,6 +866,9 @@ + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; ++ amd64:MSYS*:*:* | x86_64:MSYS*:*:*) ++ echo x86_64-unknown-msys ++ exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + 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' + ;; +diff -Naur gzip-1.6-orig/configure gzip-1.6/configure +--- gzip-1.6-orig/configure 2013-06-10 03:01:02.000000000 +0400 ++++ gzip-1.6/configure 2013-07-18 07:39:56.144531300 +0400 +@@ -7074,7 +7074,7 @@ + else + case "$host_os" in + osf*) gl_use_threads=no ;; +- cygwin*) ++ cygwin* | msys*) + case `uname -r` in + 1.[0-5].*) gl_use_threads=no ;; + *) gl_use_threads=yes ;; +@@ -7942,7 +7942,7 @@ + # special semantics and is distinct from /, please report it to + # . + case $host in +- *-cygwin | i370-ibm-openedition) ++ *-cygwin | *-msys | i370-ibm-openedition) + gl_cv_double_slash_root=yes ;; + *) + # Be optimistic and assume that / and // are the same when we +@@ -9961,7 +9961,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";; ++ cygwin* | msys*) gl_cv_func_printf_directive_ls="guessing no";; + beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";; + *) gl_cv_func_printf_directive_ls="guessing yes";; + esac +@@ -12286,7 +12286,7 @@ + # Guess yes on glibc systems. + *-gnu*) 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";; + esac +@@ -18290,7 +18290,7 @@ + # special semantics and is distinct from /, please report it to + # . + case $host in +- *-cygwin | i370-ibm-openedition) ++ *-cygwin | *-msys | i370-ibm-openedition) + gl_cv_double_slash_root=yes ;; + *) + # Be optimistic and assume that / and // are the same when we +@@ -18379,7 +18379,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. +@@ -22272,7 +22272,7 @@ + case "$host_os" in + # Guess yes on platforms where we know the result. + *-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 ;; +@@ -24400,7 +24400,7 @@ + case "$host_os" in + # Guess yes on platforms where we know the result. + *-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 ;; +diff -Naur gzip-1.6-orig/lib/gnulib.mk gzip-1.6/lib/gnulib.mk +--- gzip-1.6-orig/lib/gnulib.mk 2013-06-10 00:41:04.000000000 +0400 ++++ gzip-1.6/lib/gnulib.mk 2013-07-18 07:44:02.045898400 +0400 +@@ -826,7 +826,7 @@ + case '$(host_os)' in \ + darwin[56]*) \ + need_charset_alias=true ;; \ +- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ ++ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \ + need_charset_alias=false ;; \ + *) \ + need_charset_alias=true ;; \ +diff -Naur gzip-1.6-orig/lib/Makefile.in gzip-1.6/lib/Makefile.in +--- gzip-1.6-orig/lib/Makefile.in 2013-06-10 02:43:17.000000000 +0400 ++++ gzip-1.6/lib/Makefile.in 2013-07-18 07:44:26.217773400 +0400 +@@ -2057,7 +2057,7 @@ + case '$(host_os)' in \ + darwin[56]*) \ + need_charset_alias=true ;; \ +- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ ++ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \ + need_charset_alias=false ;; \ + *) \ + need_charset_alias=true ;; \ +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 @@ + # special semantics and is distinct from /, please report it to + # . + case $host in +- *-cygwin | i370-ibm-openedition) ++ *-cygwin | *-msys | i370-ibm-openedition) + gl_cv_double_slash_root=yes ;; + *) + # Be optimistic and assume that / and // are the same when we +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. +diff -Naur gzip-1.6-orig/m4/getcwd.m4 gzip-1.6/m4/getcwd.m4 +--- gzip-1.6-orig/m4/getcwd.m4 2013-06-10 00:37:56.000000000 +0400 ++++ gzip-1.6/m4/getcwd.m4 2013-07-18 07:43:29.800781300 +0400 +@@ -49,7 +49,7 @@ + # Guess yes on glibc systems. + *-gnu*) 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";; + esac +diff -Naur gzip-1.6-orig/m4/malloc.m4 gzip-1.6/m4/malloc.m4 +--- gzip-1.6-orig/m4/malloc.m4 2013-06-10 00:37:56.000000000 +0400 ++++ gzip-1.6/m4/malloc.m4 2013-07-18 07:44:54.582031300 +0400 +@@ -30,7 +30,7 @@ + [case "$host_os" in + # Guess yes on platforms where we know the result. + *-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 ;; +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";; ++ cygwin* | msys*) gl_cv_func_printf_directive_ls="guessing no";; + beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";; + *) gl_cv_func_printf_directive_ls="guessing yes";; + esac +@@ -812,7 +812,7 @@ + [ + changequote(,)dnl + case "$host_os" in +- 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 @@ + darwin[1-6].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; + darwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # Guess yes on Cygwin. +- cygwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; ++ cygwin* | msys*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # Guess yes on Solaris >= 2.6. + solaris2.[0-5] | solaris2.[0-5].*) + gl_cv_func_vsnprintf_zerosize_c99="guessing no";; +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 + # Guess yes on platforms where we know the result. + *-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 ;; +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 @@ + dnl bugs that lead to endless loops or crashes. See + dnl . + osf*) gl_use_threads=no ;; +- cygwin*) ++ cygwin* | msys*) + case `uname -r` in + 1.[0-5].*) gl_use_threads=no ;; + *) gl_use_threads=yes ;; diff --git a/gzip/gzip.install b/gzip/gzip.install new file mode 100644 index 00000000..43218d98 --- /dev/null +++ b/gzip/gzip.install @@ -0,0 +1,15 @@ +infodir=usr/share/info + +post_install() { + [ -x usr/bin/install-info ] || return 0 + usr/bin/install-info $infodir/gzip.info.gz $infodir/dir 2> /dev/null +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + usr/bin/install-info --delete $infodir/gzip.info.gz $infodir/dir 2> /dev/null +}