bonsai/repo
4
0
Fork 0
forked from kiss-community/repo
Code Issues 28 Pull Requests 2 Projects Releases Activity

kiss: Remove sharutils, provided by busybox.

Browse Source
This commit is contained in:
Dylan Araps 2019-06-18 11:59:38 +03:00
parent 99868dd7fd
commit b5d9c3e073
8 changed files with 0 additions and 287 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
repo/sharutils/build
View File

@ -1,10 +0,0 @@
#!/bin/sh -e
patch -p1 -i CVE-2018-1000097.patch
patch -p1 -i fix-glibc-2.27.patch
./configure \
--prefix=/usr
make
make DESTDIR="$1" install

3
repo/sharutils/checksums
View File

@ -1,3 +0,0 @@
2b05cff7de5d7b646dc1669bc36c35fdac02ac6ae4b6c19cb3340d87ec553a9a sharutils-4.15.2.tar.xz
bd2fbd5bb30a02a7d5c41c61e1e4282284910029bfc5d25e912a9d8758d7e0a5 CVE-2018-1000097.patch
89f3ba7b30c4228a2c5b29985e2c1f55bdb657377dd5aa199a040965772fce0c fix-glibc-2.27.patch

1
repo/sharutils/depends
View File

@ -1 +0,0 @@
perl make

117
repo/sharutils/manifest
View File

@ -1,117 +0,0 @@
/var/db/puke/sharutils/version
/var/db/puke/sharutils/sources
/var/db/puke/sharutils/checksums
/var/db/puke/sharutils/build
/var/db/puke/sharutils/manifest
/var/db/puke/sharutils/depends
/var/db/puke/sharutils/patches/CVE-2018-1000097.patch
/var/db/puke/sharutils/patches/fix-glibc-2.27.patch
/var/db/puke/sharutils/patches
/var/db/puke/sharutils
/var/db/puke
/var/db
/var
/usr/bin/uuencode
/usr/bin/uudecode
/usr/bin/unshar
/usr/bin/shar
/usr/bin
/usr/share/locale/uk/LC_MESSAGES/sharutils.mo
/usr/share/locale/uk/LC_MESSAGES
/usr/share/locale/uk
/usr/share/locale/ru/LC_MESSAGES/sharutils.mo
/usr/share/locale/ru/LC_MESSAGES
/usr/share/locale/ru
/usr/share/locale/zh_TW/LC_MESSAGES/sharutils.mo
/usr/share/locale/zh_TW/LC_MESSAGES
/usr/share/locale/zh_TW
/usr/share/locale/vi/LC_MESSAGES/sharutils.mo
/usr/share/locale/vi/LC_MESSAGES
/usr/share/locale/vi
/usr/share/locale/fi/LC_MESSAGES/sharutils.mo
/usr/share/locale/fi/LC_MESSAGES
/usr/share/locale/fi
/usr/share/locale/sr/LC_MESSAGES/sharutils.mo
/usr/share/locale/sr/LC_MESSAGES
/usr/share/locale/sr
/usr/share/locale/et/LC_MESSAGES/sharutils.mo
/usr/share/locale/et/LC_MESSAGES
/usr/share/locale/et
/usr/share/locale/sv/LC_MESSAGES/sharutils.mo
/usr/share/locale/sv/LC_MESSAGES
/usr/share/locale/sv
/usr/share/locale/ja/LC_MESSAGES/sharutils.mo
/usr/share/locale/ja/LC_MESSAGES
/usr/share/locale/ja
/usr/share/locale/hu/LC_MESSAGES/sharutils.mo
/usr/share/locale/hu/LC_MESSAGES
/usr/share/locale/hu
/usr/share/locale/cs/LC_MESSAGES/sharutils.mo
/usr/share/locale/cs/LC_MESSAGES
/usr/share/locale/cs
/usr/share/locale/id/LC_MESSAGES/sharutils.mo
/usr/share/locale/id/LC_MESSAGES
/usr/share/locale/id
/usr/share/locale/gl/LC_MESSAGES/sharutils.mo
/usr/share/locale/gl/LC_MESSAGES
/usr/share/locale/gl
/usr/share/locale/pt_BR/LC_MESSAGES/sharutils.mo
/usr/share/locale/pt_BR/LC_MESSAGES
/usr/share/locale/pt_BR
/usr/share/locale/eo/LC_MESSAGES/sharutils.mo
/usr/share/locale/eo/LC_MESSAGES
/usr/share/locale/eo
/usr/share/locale/it/LC_MESSAGES/sharutils.mo
/usr/share/locale/it/LC_MESSAGES
/usr/share/locale/it
/usr/share/locale/fr/LC_MESSAGES/sharutils.mo
/usr/share/locale/fr/LC_MESSAGES
/usr/share/locale/fr
/usr/share/locale/nl/LC_MESSAGES/sharutils.mo
/usr/share/locale/nl/LC_MESSAGES
/usr/share/locale/nl
/usr/share/locale/zh_CN/LC_MESSAGES/sharutils.mo
/usr/share/locale/zh_CN/LC_MESSAGES
/usr/share/locale/zh_CN
/usr/share/locale/da/LC_MESSAGES/sharutils.mo
/usr/share/locale/da/LC_MESSAGES
/usr/share/locale/da
/usr/share/locale/ga/LC_MESSAGES/sharutils.mo
/usr/share/locale/ga/LC_MESSAGES
/usr/share/locale/ga
/usr/share/locale/pl/LC_MESSAGES/sharutils.mo
/usr/share/locale/pl/LC_MESSAGES
/usr/share/locale/pl
/usr/share/locale/de/LC_MESSAGES/sharutils.mo
/usr/share/locale/de/LC_MESSAGES
/usr/share/locale/de
/usr/share/locale/es/LC_MESSAGES/sharutils.mo
/usr/share/locale/es/LC_MESSAGES
/usr/share/locale/es
/usr/share/locale/tr/LC_MESSAGES/sharutils.mo
/usr/share/locale/tr/LC_MESSAGES
/usr/share/locale/tr
/usr/share/locale/bg/LC_MESSAGES/sharutils.mo
/usr/share/locale/bg/LC_MESSAGES
/usr/share/locale/bg
/usr/share/locale/el/LC_MESSAGES/sharutils.mo
/usr/share/locale/el/LC_MESSAGES
/usr/share/locale/el
/usr/share/locale/ca/LC_MESSAGES/sharutils.mo
/usr/share/locale/ca/LC_MESSAGES
/usr/share/locale/ca
/usr/share/locale
/usr/share/man/man5/uuencode.5
/usr/share/man/man5
/usr/share/man/man1/uudecode.1
/usr/share/man/man1/unshar.1
/usr/share/man/man1/uuencode.1
/usr/share/man/man1/shar.1
/usr/share/man/man1
/usr/share/man
/usr/share/info/sharutils.info
/usr/share/info
/usr/share
/usr/lib/charset.alias
/usr/lib
/usr

15
repo/sharutils/patches/CVE-2018-1000097.patch
View File

@ -1,15 +0,0 @@
From: Petr Pisar
Subject: Fix CVE-2018-1000097, heap buffer overflow in unshar
Bug-Debian: https://bugs.debian.org/893525
--- a/src/unshar.c
+++ b/src/unshar.c
@@ -240,7 +240,7 @@
off_t position = ftello (file);
/* Read next line, fail if no more and no previous process. */
- if (!fgets (rw_buffer, BUFSIZ, file))
+ if (!fgets (rw_buffer, rw_base_size, file))
{
if (!start)
error (0, 0, _("Found no shell commands in %s"), name);

137
repo/sharutils/patches/fix-glibc-2.27.patch
View File

@ -1,137 +0,0 @@
From 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
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/fpurge.c (fpurge):
* lib/freadable.c (freadable):
* 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.
[yann.morin.1998@free.fr: partially backport from upstream gnulib]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
lib/fflush.c | 6 +++---
lib/fpurge.c | 2 +-
lib/freading.c | 2 +-
lib/fseeko.c | 4 ++--
lib/stdio-impl.h | 6 ++++++
7 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/lib/fflush.c b/build-aux/gnulib/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/build-aux/gnulib/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
<stdio.h>, 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/build-aux/gnulib/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
<stdio.h>, 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/build-aux/gnulib/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/stdio-impl.h b/build-aux/gnulib/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.1

3
repo/sharutils/sources
View File

@ -1,3 +0,0 @@
ftp://ftp.gnu.org/gnu/sharutils/sharutils-4.15.2.tar.xz
patches/CVE-2018-1000097.patch
patches/fix-glibc-2.27.patch

1
repo/sharutils/version
View File

@ -1 +0,0 @@
4.15.2 1