commit 402e2395a6593158cdcf46d3977ac9bd1d63be42 Author: overweight <5324761+overweight@user.noreply.gitee.com> Date: Mon Sep 30 10:52:35 2019 -0400 Package init diff --git a/colorzgrep.csh b/colorzgrep.csh new file mode 100644 index 0000000..5547b7a --- /dev/null +++ b/colorzgrep.csh @@ -0,0 +1,9 @@ +test -f /usr/libexec/grepconf.sh +if ( $status == 1 ) exit + +/usr/libexec/grepconf.sh -c +if ( $status == 1 ) exit + +alias zgrep 'zgrep --color=auto' +alias zfgrep 'zfgrep --color=auto' +alias zegrep 'zegrep --color=auto' diff --git a/colorzgrep.sh b/colorzgrep.sh new file mode 100644 index 0000000..7764a07 --- /dev/null +++ b/colorzgrep.sh @@ -0,0 +1,6 @@ +[ -f /usr/libexec/grepconf.sh ] || return + +/usr/libexec/grepconf.sh -c || return +alias zgrep='zgrep --color=auto' 2>/dev/null +alias zfgrep='zfgrep --color=auto' 2>/dev/null +alias zegrep='zegrep --color=auto' 2>/dev/null diff --git a/fix-verbose-disable.patch b/fix-verbose-disable.patch new file mode 100644 index 0000000..21dc5f0 --- /dev/null +++ b/fix-verbose-disable.patch @@ -0,0 +1,28 @@ +From c220e0ceae7f8192ab94b4c9eb89e5384277e175 Mon Sep 17 00:00:00 2001 +From: pengyeqing +Date: Sat, 26 Jan 2019 03:24:48 +0800 +Subject: [PATCH] gzip: fix verbose disable + +reason:fix verbose disable + +Signed-off-by: pengyeqing +--- + zdiff.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/zdiff.in b/zdiff.in +index 960bf86..e337e35 100644 +--- a/zdiff.in ++++ b/zdiff.in +@@ -51,7 +51,7 @@ escape=' + while :; do + case $1 in + --h*) printf '%s\n' "$usage" || exit 2; exit;; +- --v*) printf '%s\n' "$version" || exit 2; exit;; ++ --version) printf '%s\n' "$version" || exit 2; exit;; + --) shift; break;; + -*\'*) cmp="$cmp '"`printf '%sX\n' "$1" | sed "$escape"`;; + -?*) cmp="$cmp '$1'";; +-- +1.8.3.1 + diff --git a/gnulib.patch b/gnulib.patch new file mode 100644 index 0000000..68e8d51 --- /dev/null +++ b/gnulib.patch @@ -0,0 +1,189 @@ +From 1831628c0630ae96a43586b2a25ca51cbdba3e53 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Mon, 5 Mar 2018 10:56:29 -0800 +Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Problem reported by Daniel P. Berrangé in: +https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html +* lib/fbufmode.c (fbufmode): +* lib/fflush.c (clear_ungetc_buffer_preserving_position) +(disable_seek_optimization, rpl_fflush): +* lib/fpending.c (__fpending): +* lib/fpurge.c (fpurge): +* lib/freadable.c (freadable): +* lib/freadahead.c (freadahead): +* lib/freading.c (freading): +* lib/freadptr.c (freadptr): +* lib/freadseek.c (freadptrinc): +* lib/fseeko.c (fseeko): +* lib/fseterr.c (fseterr): +* lib/fwritable.c (fwritable): +* lib/fwriting.c (fwriting): +Check _IO_EOF_SEEN instead of _IO_ftrylockfile. +* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: +Define if not already defined. +--- + ChangeLog | 23 +++++++++++++++++++++++ + lib/fbufmode.c | 2 +- + lib/fflush.c | 6 +++--- + lib/fpending.c | 2 +- + lib/fpurge.c | 2 +- + lib/freadable.c | 2 +- + lib/freadahead.c | 2 +- + lib/freading.c | 2 +- + lib/freadptr.c | 2 +- + lib/freadseek.c | 2 +- + lib/fseeko.c | 4 ++-- + lib/fseterr.c | 2 +- + lib/fwritable.c | 2 +- + lib/fwriting.c | 2 +- + lib/stdio-impl.h | 6 ++++++ + 15 files changed, 45 insertions(+), 16 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 667f91663..beb835670 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,26 @@ ++2018-03-05 Paul Eggert ++ ++ fflush: adjust to glibc 2.28 libio.h removal ++ Problem reported by Daniel P. Berrangé in: ++ https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html ++ * lib/fbufmode.c (fbufmode): ++ * lib/fflush.c (clear_ungetc_buffer_preserving_position) ++ (disable_seek_optimization, rpl_fflush): ++ * lib/fpending.c (__fpending): ++ * lib/fpurge.c (fpurge): ++ * lib/freadable.c (freadable): ++ * lib/freadahead.c (freadahead): ++ * lib/freading.c (freading): ++ * lib/freadptr.c (freadptr): ++ * lib/freadseek.c (freadptrinc): ++ * lib/fseeko.c (fseeko): ++ * lib/fseterr.c (fseterr): ++ * lib/fwritable.c (fwritable): ++ * lib/fwriting.c (fwriting): ++ Check _IO_EOF_SEEN instead of _IO_ftrylockfile. ++ * lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: ++ Define if not already defined. ++ + 2018-01-07 Jim Meyering + + version 1.9 + * NEWS: Record release date. +diff --git a/lib/fflush.c b/lib/fflush.c +index 983ade0ff..a6edfa105 100644 +--- a/lib/fflush.c ++++ b/lib/fflush.c +@@ -33,7 +33,7 @@ + #undef fflush + + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ + static void +@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) + + #endif + +-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) ++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) + + # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) + if (stream == NULL || ! freading (stream)) + return fflush (stream); + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + clear_ungetc_buffer_preserving_position (stream); + +diff --git a/lib/fpurge.c b/lib/fpurge.c +index b1d417c7a..3aedcc373 100644 +--- a/lib/fpurge.c ++++ b/lib/fpurge.c +@@ -62,7 +62,7 @@ fpurge (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_IO_read_end = fp->_IO_read_ptr; + fp->_IO_write_ptr = fp->_IO_write_base; + /* Avoid memory leak when there is an active ungetc buffer. */ +diff --git a/lib/freading.c b/lib/freading.c +index 73c28acdd..c24d0c88a 100644 +--- a/lib/freading.c ++++ b/lib/freading.c +@@ -31,7 +31,7 @@ freading (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + return ((fp->_flags & _IO_NO_WRITES) != 0 + || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 + && fp->_IO_read_base != NULL)); +diff --git a/lib/fseeko.c b/lib/fseeko.c +index 0101ab55f..193f4e8ce 100644 +--- a/lib/fseeko.c ++++ b/lib/fseeko.c +@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence) + #endif + + /* These tests are based on fpurge.c. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_read_end == fp->_IO_read_ptr + && fp->_IO_write_ptr == fp->_IO_write_base + && fp->_IO_save_base == NULL) +@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence) + return -1; + } + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags &= ~_IO_EOF_SEEN; + fp->_offset = pos; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ +diff --git a/lib/fseterr.c b/lib/fseterr.c +index 82649c3ac..adb637256 100644 +--- a/lib/fseterr.c ++++ b/lib/fseterr.c +@@ -29,7 +29,7 @@ fseterr (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags |= _IO_ERR_SEEN; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h +index 78d896e9f..05c5752a2 100644 +--- a/lib/stdio-impl.h ++++ b/lib/stdio-impl.h +@@ -18,6 +18,12 @@ + the same implementation of stdio extension API, except that some fields + have different naming conventions, or their access requires some casts. */ + ++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this ++ problem by defining it ourselves. FIXME: Do not rely on glibc ++ internals. */ ++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN ++# define _IO_IN_BACKUP 0x100 ++#endif + + /* BSD stdio derived implementations. */ + +-- +2.14.3 + diff --git a/gzexe.patch b/gzexe.patch new file mode 100644 index 0000000..2af78e9 --- /dev/null +++ b/gzexe.patch @@ -0,0 +1,38 @@ +From 21cd963565a43dabd59516bd4cca5c76a614f255 Mon Sep 17 00:00:00 2001 +From: Jakub Martisko +Date: Tue, 26 Mar 2019 12:29:30 +0100 +Subject: [PATCH] Fix: the value of the skip variable in the gzexe + +--- + gzexe.in | 4 ++-- + tests/Makefile.am | 1 + + tests/gzexe | 20 ++++++++++++++++++++ + 3 files changed, 23 insertions(+), 2 deletions(-) + create mode 100755 tests/gzexe + +diff --git a/gzexe.in b/gzexe.in +index 6c61183..cffa84e 100644 +--- a/gzexe.in ++++ b/gzexe.in +@@ -145,7 +145,7 @@ for i do + if test $decomp -eq 0; then + (cat <<'EOF' && + #!/bin/sh +-skip=44 ++skip=49 + + tab=' ' + nl=' +@@ -201,7 +201,7 @@ EOF + + else + # decompression +- skip=44 ++ skip=49 + skip_line=`sed -e 1d -e 2q "$file"` + case $skip_line in + skip=[0-9] | skip=[0-9][0-9] | skip=[0-9][0-9][0-9]) + +-- +2.21.0 + diff --git a/gzip-1.9.tar.xz b/gzip-1.9.tar.xz new file mode 100644 index 0000000..26b7f19 Binary files /dev/null and b/gzip-1.9.tar.xz differ diff --git a/gzip-fix-use-of-uninitialized-memory.patch b/gzip-fix-use-of-uninitialized-memory.patch new file mode 100644 index 0000000..b6b1734 --- /dev/null +++ b/gzip-fix-use-of-uninitialized-memory.patch @@ -0,0 +1,37 @@ +From 26c140cf5377585d38d2a13a949e109724d4d406 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Fri, 30 Nov 2018 13:00:42 -0800 +Subject: [PATCH 11/23] gzip: fix use of uninitialized memory +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Problem reported by Hanno Böck (Bug#33501). +* NEWS: Mention this. +* inflate.c (inflate_dynamic): Return if code is invalid. +Fix by Mark Adler. +* tests/hufts: Add test case for the bug. +--- + inflate.c | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletion(-) + +diff --git a/inflate.c b/inflate.c +index d372685..bcafcf1 100644 +--- a/inflate.c ++++ b/inflate.c +@@ -799,6 +799,12 @@ inflate_dynamic(void) + NEEDBITS((unsigned)bl) + j = (td = tl + ((unsigned)b & m))->b; + DUMPBITS(j) ++ if (td->e == 99) ++ { ++ /* Invalid code. */ ++ huft_free (tl); ++ return 2; ++ } + j = td->v.n; + if (j < 16) /* length of code in bits (0..15) */ + ll[i++] = l = j; /* save last length in l */ +-- +1.8.3.1 + diff --git a/gzip.spec b/gzip.spec new file mode 100644 index 0000000..0f1c54f --- /dev/null +++ b/gzip.spec @@ -0,0 +1,118 @@ +Name: gzip +Version: 1.9 +Release: 16 +Summary: A data compression utility + +License: GPLv3+ and GFDL +URL: https://www.gnu.org/software/gzip +Source0: https://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz +Source1: colorzgrep.csh +Source2: colorzgrep.sh + +Patch0: gnulib.patch +Patch1: gzip-fix-use-of-uninitialized-memory.patch +Patch2: gzexe.patch +Patch9000: fix-verbose-disable.patch + +BuildRequires: gcc texinfo +Requires: coreutils +Conflicts: filesystem < 3 +Provides: /bin/gunzip +Provides: /bin/gzip +Provides: /bin/zcat +Provides: bundled(gnulib) + +%description +gzip is a single-file/stream lossless data compression +utility, where the resulting compressed file generally +has the suffix .gz. + +%package_help + +%prep +%autosetup -n %{name}-%{version} -p1 + +%build +%configure +%make_build + +%install +rm -rf %RPM_BUILD_ROOT +%make_install +mkdir -p %{buildroot}%{_sysconfdir}/profile.d +install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d +install -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d +# ncompress provides uncompress, may cause conflict. +rm -f %{buildroot}%{_bindir}/uncompress + +%check +make check + +%files +%defattr(-,root,root) +%doc AUTHORS ChangeLog README +%license COPYING +%{_bindir}/* +%{_sysconfdir}/profile.d/* +%exclude %{_infodir}/dir + +%files help +%doc NEWS TODO THANKS +%{_infodir}/*info* +%{_mandir}/man1/* + +%changelog +* Mon Sep 30 2019 shenyangyang - 1.9-16 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:fix the conflict of infodir/dir with libtasn1 + +* Tue Sep 24 2019 shenyangyang - 1.9-15 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:revise help package + +* Fri Aug 16 2019 openEuler Builteam - 1.9-14 +- Rewrite spec file + +* Fri Aug 09 2019 fangyufa - 1.9-13 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: modify info of patch + +* Thu Aug 08 2019 fangyufa - 1.9-12 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: modify of patch + +* Wed Jul 31 2019 zhuguodong - 1.9-11 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: openEuler Debranding + +* Fri Jun 14 2019 cangyi - 1.9-10 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix gzexe unable to (auto)decompress + +* Fri Mar 15 2019 zhangyujing - 1.9-9 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:gzip fix use of uninitialized memory + +* Fri Jan 25 2019 Yeqing Peng - 1.9-8 +- Type:enhancement +- ID:NA +- SUG:restart +- DESC:fix verbose disable + +* Thu Jul 26 2018 zhuguodong - 1.9-7 +- package init +