deleted file mode 100644

@@ -1,17 +0,0 @@

-diff -rauN tcsh-6.19.00/tc.alloc.c tcsh-6.19.00-patch-calloc-gcc-5/tc.alloc.c

-+++ tcsh-6.19.00-patch-calloc-gcc-5/tc.alloc.c	2015-07-10 09:46:35.896959230 +0200

-@@ -348,10 +348,12 @@

- {

- #ifndef lint

-     char *cp;

-+    volatile size_t k;

- 

-     i *= j;

-     cp = xmalloc(i);

--    memset(cp, 0, i);

-+    k = i;

-+    memset(cp, 0, k);

- 

-     return ((memalign_t) cp);

- #else

new file mode 100644

@@ -0,0 +1,39 @@

+From 2ad4fc1705893207598ed5cd21713ddf3f17bba0 Mon Sep 17 00:00:00 2001

+From: zoulasc <christos@zoulas.com>

+Date: Thu, 23 Feb 2017 11:55:33 -0500

+Subject: [PATCH] 

+ https://github.com/tcsh-org/tcsh/pull/1#issuecomment-282035528

+

+---

+ tests/lexical.at | 6 +++---

+ 1 file changed, 3 insertions(+), 3 deletions(-)

+

+diff --git a/tests/lexical.at b/tests/lexical.at

+index 7b7da4e..3dc6024 100644

+--- a/tests/lexical.at

+@@ -567,10 +567,10 @@ run=3

+ ]])

+ AT_DATA([uniformity_test.csh],

+ [[

+-set SERVICE_NAME_LOG = `cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[:blank:]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g'  |  perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g'`

++set SERVICE_NAME_LOG = `cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[[:blank:]]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g'  |  perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g'`

+ echo -n "$SERVICE_NAME_LOG" > ./output1

+ 

+-cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[:blank:]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g'  |  perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g' > ./output2

++cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[[:blank:]]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g'  |  perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g' > ./output2

+ 

+ diff -uprN ./output1 ./output2 >& /dev/null

+ 

+@@ -587,7 +587,7 @@ AT_DATA([quoting_result_test.csh],

+ echo "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP\)(HOST=db\)(PORT=1521\)\)(CONNECT_DATA=(SERVER=DEDICATED\)(SERVICE_NAME=bns03\)\)\)" > ./expected_result

+ 

+ set string = "jdbc_url=jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=db)(PORT=1521))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=bns03)))"

+-set SERVICE_NAME_LOG  = `echo "$string" | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[:blank:]*\([^$]*\)$/\1/p' | perl -pe 's/\)/\\\)/g'`

++set SERVICE_NAME_LOG  = `echo "$string" | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[[:blank:]]*\([^$]*\)$/\1/p' | perl -pe 's/\)/\\\)/g'`

+ 

+ echo "$SERVICE_NAME_LOG" > ./actual_result

+ 

+-- 

+2.9.3

+

deleted file mode 100644

@@ -1,21 +0,0 @@

-Proposed patch from Debian bug tracker by Aurelien Jarno <aurel32@debian.org>

-

-diff --git a/sh.proc.c b/sh.proc.c

-index ad07250..5c68409 100644

-+++ b/sh.proc.c

-@@ -47,11 +47,11 @@ RCSID("$tcsh$")

- # define HZ 16

- #endif /* aiws */

- 

--#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)

--# if !defined(__ANDROID__)

-+#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GLIBC__)

-+# if !defined(__ANDROID__) && !defined(__GLIBC__)

- #  define BSDWAIT

- # endif

--#endif /* _BSD || (IRIS4D && __STDC__) || __lucid || glibc */

-+#endif /* _BSD || (IRIS4D && __STDC__) || __lucid || gnu-linux */

- #ifndef WTERMSIG

- # define WTERMSIG(w)	(((union wait *) &(w))->w_termsig)

- # ifndef BSDWAIT

@@ -2,13 +2,13 @@

 Summary:        An enhanced version of csh, the C shell

 Name:           tcsh

 Version:        6.20.00

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        BSD

 Group:          System Environment/Shells

 Source:         http://www.sfr-fresh.com/unix/misc/%{name}-%{version}.tar.xz

 %define sha1    tcsh=a52deb0181e32583dbe666474c9c2e784357feba

-Patch0:         tcsh-6.19.00-calloc-gcc-5.patch

-Patch1:         tcsh.glibc-2.24.patch

+# patch origin http://pkgs.fedoraproject.org/cgit/rpms/tcsh.git/

+Patch0:         tcsh-6.20.00-009-fix-regexp-for-backlash-quoting-tests.patch

 URL:            http://www.tcsh.org/

 Vendor:         VMware, Inc.

 Distribution:   Photon

@@ -29,6 +29,7 @@ like syntax.

 %prep

 %setup -q

+%patch0 -p1

 %build

 sed -i -e 's|\$\*|#&|' -e 's|fR/g|&m|' tcsh.man2html &&

@@ -66,7 +67,10 @@ uk ukrainian

 _EOF

 %check

-make check

+# tcsh expect nonroot user to run a tests

+chmod g+w . -R

+useradd test -G root -m

+sudo -u test make check && userdel test -r -f

 %clean

 rm -rf %{buildroot}

@@ -111,6 +115,8 @@ fi

 %{_mandir}/man1/*.1*

 %changelog

+*   Tue Jun 6 2017 Alexey Makhalov <amakhalov@vmware.com> 6.20.00-3

+-   Fix make check issues.

 *   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 6.20.00-2

 -   Ensure non empty debuginfo

 *   Tue Mar 28 2017 Xiaolin Li <xiaolinl@vmware.com> 6.20.00-1