Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Revert "grep: Update to 3.6"

Browse Source 
This reverts commit 990d969e1e35f260fc77afc92f6671199fd2f7c6.
This commit is contained in:
Alexey 2021-10-17 10:11:49 +03:00
parent 00491512f5
commit 57d0858a76
2 changed files with 90 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
grep/PKGBUILD
View File

@ -1,8 +1,8 @@
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
pkgname=grep
pkgver=3.6
pkgrel=1
pkgver=3.0
pkgrel=2
pkgdesc="A string search utility"
arch=('i686' 'x86_64')
license=('GPL3')
@ -14,9 +14,9 @@ install=${pkgname}.install
source=(https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
grep-2.23-msys2.patch
grep-3.0-2.src.patch)
sha256sums=('667e15e8afe189e93f9f21a7cd3a7b3f776202f417330b248c2ad4f997d9373e'
sha256sums=('e2c81db5056e3e8c5995f0bb5d0d0e1cad1f6f45c3b2fc77b6e81435aed48ab5'
'SKIP'
'2a4b61a5240e839b4a3b83eb9c4a7c73d384085366405ddef371dfcc30381aa3'
'9b9b87f5aa12c49e4e4403d27b85fef3f1de252dfe4eed1a7a4f982ef515a95a'
'0b2e7e54eb4d5b13257c1b4b43bcb234be02ded8fd04dfbbb73a92346e8b2db2')
validpgpkeys=('155D3FC500C834486D1EEA677FD9FCCB000BEEEE') # Jim Meyering

149
grep/grep-2.23-msys2.patch
View File

@ -43,15 +43,15 @@ diff -Naur grep-2.23-orig/build-aux/compile grep-2.23/build-aux/compile
diff -Naur grep-2.23-orig/build-aux/config.guess grep-2.23/build-aux/config.guess
--- grep-2.23-orig/build-aux/config.guess 2016-02-03 08:46:26.000000000 +0300
+++ grep-2.23/build-aux/config.guess 2016-03-30 08:53:21.207519200 +0300
@@ -903,6 +903,9 @@
@@ -884,6 +884,9 @@
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
echo x86_64-pc-cygwin
echo x86_64-unknown-cygwin
exit ;;
+ amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
+ echo x86_64-unknown-msys
+ exit ;;
prep*:SunOS:5.*:*)
echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
exit ;;
diff -Naur grep-2.23-orig/build-aux/config.rpath grep-2.23/build-aux/config.rpath
--- grep-2.23-orig/build-aux/config.rpath 2016-02-03 08:46:26.000000000 +0300
@ -101,6 +101,30 @@ diff -Naur grep-2.23-orig/build-aux/config.rpath grep-2.23/build-aux/config.rpat
shrext=.dll
library_names_spec='$libname.dll.a $libname.lib'
;;
diff -Naur grep-2.23-orig/lib/gnulib.mk grep-2.23/lib/gnulib.mk
--- grep-2.23-orig/lib/gnulib.mk 2016-01-28 11:00:43.000000000 +0300
+++ grep-2.23/lib/gnulib.mk 2016-03-30 08:53:21.281511800 +0300
@@ -970,7 +970,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 grep-2.23-orig/lib/Makefile.in grep-2.23/lib/Makefile.in
--- grep-2.23-orig/lib/Makefile.in 2016-02-04 23:08:58.000000000 +0300
+++ grep-2.23/lib/Makefile.in 2016-03-30 08:53:21.309509000 +0300
@@ -2501,7 +2501,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 grep-2.23-orig/m4/btowc.m4 grep-2.23/m4/btowc.m4
--- grep-2.23-orig/m4/btowc.m4 2016-02-03 08:46:26.000000000 +0300
+++ grep-2.23/m4/btowc.m4 2016-03-30 08:53:21.347505200 +0300
@ -110,9 +134,9 @@ diff -Naur grep-2.23-orig/m4/btowc.m4 grep-2.23/m4/btowc.m4
# Guess no on Cygwin.
- cygwin*) gl_cv_func_btowc_nul="guessing no" ;;
+ cygwin* | msys*) gl_cv_func_btowc_nul="guessing no" ;;
# Guess yes on native Windows.
mingw*) gl_cv_func_btowc_nul="guessing yes" ;;
# Guess yes otherwise.
*) gl_cv_func_btowc_nul="guessing yes" ;;
esac
diff -Naur grep-2.23-orig/m4/double-slash-root.m4 grep-2.23/m4/double-slash-root.m4
--- grep-2.23-orig/m4/double-slash-root.m4 2016-02-03 08:46:26.000000000 +0300
+++ grep-2.23/m4/double-slash-root.m4 2016-03-30 08:53:21.376502300 +0300
@ -128,19 +152,19 @@ diff -Naur grep-2.23-orig/m4/double-slash-root.m4 grep-2.23/m4/double-slash-root
diff -Naur grep-2.23-orig/m4/dup2.m4 grep-2.23/m4/dup2.m4
--- grep-2.23-orig/m4/dup2.m4 2016-02-03 08:46:26.000000000 +0300
+++ grep-2.23/m4/dup2.m4 2016-03-30 08:53:21.403499600 +0300
@@ -69,7 +69,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" ;;
aix* | freebsd*)
# on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE,
@@ -78,7 +78,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" ;;
aix* | freebsd*)
# on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE,
diff -Naur grep-2.23-orig/m4/fcntl.m4 grep-2.23/m4/fcntl.m4
--- grep-2.23-orig/m4/fcntl.m4 2016-02-03 08:46:26.000000000 +0300
+++ grep-2.23/m4/fcntl.m4 2016-03-30 08:54:28.942745000 +0300
@@ -70,7 +70,7 @@
@@ -69,7 +69,7 @@
[gl_cv_func_fcntl_f_dupfd_works=yes],
[gl_cv_func_fcntl_f_dupfd_works=no],
[case $host_os in
@ -152,61 +176,61 @@ diff -Naur grep-2.23-orig/m4/fcntl.m4 grep-2.23/m4/fcntl.m4
diff -Naur grep-2.23-orig/m4/getcwd.m4 grep-2.23/m4/getcwd.m4
--- grep-2.23-orig/m4/getcwd.m4 2016-02-03 08:46:26.000000000 +0300
+++ grep-2.23/m4/getcwd.m4 2016-03-30 08:53:21.438496100 +0300
@@ -54,7 +54,7 @@
# 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";;
@@ -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, obey --enable-cross-guesses.
*) gl_cv_func_getcwd_null="$gl_cross_guess_normal";;
# If we don't know, assume the worst.
*) gl_cv_func_getcwd_null="guessing no";;
esac
diff -Naur grep-2.23-orig/m4/getdtablesize.m4 grep-2.23/m4/getdtablesize.m4
--- grep-2.23-orig/m4/getdtablesize.m4 2016-02-03 08:46:26.000000000 +0300
+++ grep-2.23/m4/getdtablesize.m4 2016-03-30 08:53:21.460493900 +0300
@@ -42,7 +42,7 @@
[gl_cv_func_getdtablesize_works=yes],
[gl_cv_func_getdtablesize_works=no],
[case "$host_os" in
- cygwin*) # on cygwin 1.5.25, getdtablesize() automatically grows
+ cygwin* | msys*) # on cygwin 1.5.25, getdtablesize() automatically grows
gl_cv_func_getdtablesize_works="guessing no" ;;
*) gl_cv_func_getdtablesize_works="guessing yes" ;;
esac
@@ -28,7 +28,7 @@
[gl_cv_func_getdtablesize_works=yes],
[gl_cv_func_getdtablesize_works=no],
[case "$host_os" in
- cygwin*) # on cygwin 1.5.25, getdtablesize() automatically grows
+ cygwin* | msys*) # on cygwin 1.5.25, getdtablesize() automatically grows
gl_cv_func_getdtablesize_works="guessing no" ;;
*) gl_cv_func_getdtablesize_works="guessing yes" ;;
esac])
diff -Naur grep-2.23-orig/m4/malloc.m4 grep-2.23/m4/malloc.m4
--- grep-2.23-orig/m4/malloc.m4 2016-02-03 08:46:26.000000000 +0300
+++ grep-2.23/m4/malloc.m4 2016-03-30 08:53:21.500489900 +0300
@@ -25,7 +25,7 @@
@@ -30,7 +30,7 @@
[case "$host_os" in
# Guess yes on platforms where we know the result.
*-gnu* | gnu* | *-musl* | freebsd* | netbsd* | openbsd* \
*-gnu* | freebsd* | netbsd* | openbsd* \
- | hpux* | solaris* | cygwin* | mingw*)
+ | hpux* | solaris* | cygwin* | msys* | mingw*)
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" ;;
ac_cv_func_malloc_0_nonnull=yes ;;
# If we don't know, assume the worst.
*) ac_cv_func_malloc_0_nonnull=no ;;
diff -Naur grep-2.23-orig/m4/printf.m4 grep-2.23/m4/printf.m4
--- grep-2.23-orig/m4/printf.m4 2016-02-03 08:46:26.000000000 +0300
+++ grep-2.23/m4/printf.m4 2016-03-30 08:53:21.528487100 +0300
@@ -818,7 +818,7 @@
openbsd*) gl_cv_func_printf_directive_ls="guessing yes";;
@@ -720,7 +720,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";;
# Guess no on Android.
linux*-android*) gl_cv_func_printf_directive_ls="guessing no";;
@@ -902,7 +902,7 @@
*) gl_cv_func_printf_directive_ls="guessing yes";;
esac
@@ -797,7 +797,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";;
# Guess no on Android.
linux*-android*) gl_cv_func_printf_flag_grouping="guessing no";;
@@ -1611,7 +1611,7 @@
- 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";;
@@ -1449,7 +1449,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.
@ -218,34 +242,34 @@ diff -Naur grep-2.23-orig/m4/printf.m4 grep-2.23/m4/printf.m4
diff -Naur grep-2.23-orig/m4/realloc.m4 grep-2.23/m4/realloc.m4
--- grep-2.23-orig/m4/realloc.m4 2016-02-03 08:46:26.000000000 +0300
+++ grep-2.23/m4/realloc.m4 2016-03-30 08:53:21.560483900 +0300
@@ -25,7 +25,7 @@
@@ -30,7 +30,7 @@
[case "$host_os" in
# Guess yes on platforms where we know the result.
*-gnu* | gnu* | *-musl* | freebsd* | netbsd* | openbsd* \
*-gnu* | freebsd* | netbsd* | openbsd* \
- | hpux* | solaris* | cygwin* | mingw*)
+ | hpux* | solaris* | cygwin* | msys* | mingw*)
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" ;;
ac_cv_func_realloc_0_nonnull=yes ;;
# If we don't know, assume the worst.
*) ac_cv_func_realloc_0_nonnull=no ;;
diff -Naur grep-2.23-orig/m4/setlocale.m4 grep-2.23/m4/setlocale.m4
--- grep-2.23-orig/m4/setlocale.m4 2016-02-03 08:46:26.000000000 +0300
+++ grep-2.23/m4/setlocale.m4 2016-03-30 08:53:21.578482100 +0300
@@ -18,7 +18,7 @@
mingw*) NEED_SETLOCALE_IMPROVED=1 ;;
@@ -14,7 +14,7 @@
mingw*) REPLACE_SETLOCALE=1 ;;
dnl On Cygwin 1.5.x, setlocale always succeeds but setlocale(LC_CTYPE,NULL)
dnl is then still "C".
- cygwin*)
+ cygwin* | msys*)
case `uname -r` in
1.5.*) NEED_SETLOCALE_IMPROVED=1 ;;
1.5.*) REPLACE_SETLOCALE=1 ;;
esac
diff -Naur grep-2.23-orig/m4/threadlib.m4 grep-2.23/m4/threadlib.m4
--- grep-2.23-orig/m4/threadlib.m4 2016-02-03 08:46:26.000000000 +0300
+++ grep-2.23/m4/threadlib.m4 2016-03-30 08:53:21.606479300 +0300
@@ -413,7 +413,7 @@
dnl Disable multithreading by default on Cygwin 1.5.x, because it has
@@ -68,7 +68,7 @@
dnl bugs that lead to endless loops or crashes. See
dnl <https://cygwin.com/ml/cygwin/2009-08/msg00283.html>.
dnl <http://cygwin.com/ml/cygwin/2009-08/msg00283.html>.
osf*) gl_use_threads=no ;;
- cygwin*)
+ cygwin* | msys*)
case `uname -r` in
@ -254,16 +278,15 @@ diff -Naur grep-2.23-orig/m4/threadlib.m4 grep-2.23/m4/threadlib.m4
diff -Naur grep-2.23-orig/m4/wctob.m4 grep-2.23/m4/wctob.m4
--- grep-2.23-orig/m4/wctob.m4 2016-02-03 08:46:26.000000000 +0300
+++ grep-2.23/m4/wctob.m4 2016-03-30 08:53:21.651474800 +0300
@@ -29,7 +29,7 @@
@@ -29,14 +29,14 @@
changequote(,)dnl
case "$host_os" in
# Guess no on Solaris <= 9 and Cygwin.
- solaris2.[1-9] | solaris2.[1-9].* | cygwin*)
+ solaris2.[1-9] | solaris2.[1-9].* | cygwin* | msys*)
gl_cv_func_wctob_works="guessing no" ;;
# Guess no on native Windows.
mingw*)
@@ -39,7 +39,7 @@
# Guess yes otherwise.
*) gl_cv_func_wctob_works="guessing yes" ;;
esac
changequote([,])dnl
case "$host_os" in