vapier 14/10/19 20:31:56
Added: bash-2.05b-protos.patch bash-3.0-subshell.patch
bash-3.0-configs.patch bash-2.05b-rbash.patch
bash-3.0-jobs.patch bash-3.0-darwin-conn.patch
bash-3.0-strnlen.patch bash-3.0-manpage.patch
bash-3.0-afs.patch bash-3.0-crash.patch
bash-3.0-ulimit.patch
bash-2.05b-fix-job-warning.patch
bash-2.05b-jobs.patch
bash-3.0-volatile-command.patch
bash-2.05b-empty-herestring.patch
bash-3.0-locale.patch bash-3.0-pwd.patch
bash-3.0-read-builtin-pipe.patch
bash-3.0-pgrp-pipe-fix.patch
bash-2.05b-destdir.patch
bash-3.0-read-e-segfault.patch
bash-3.0-multibyteifs.patch bash-3.0-protos.patch
bash-3.0-histtimeformat.patch bash-3.0-rbash.patch
Log:
Restore SLOTed bash-2.05b and bash-3.0 for devs.
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, RepoMan options: --force,
signed Manifest commit with key D2E96200)
Revision Changes Path
1.1 app-shells/bash/files/bash-2.05b-protos.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-2.05b-protos.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-2.05b-protos.patch?rev=1.1&content-type=text/plain
Index: bash-2.05b-protos.patch
===================================================================
move prototypes around so they show up when needed
--- a/externs.h
+++ b/externs.h
@@ -327,6 +327,9 @@
#undef xstrchr
extern char *xstrchr __P((const char *, int));
+/* declarations for functions defined in lib/sh/zcatfd.c */
+extern int zcatfd __P((int, int, char *));
+
/* declarations for functions defined in lib/sh/zread.c */
extern ssize_t zread __P((int, char *, size_t));
extern ssize_t zreadintr __P((int, char *, size_t));
--- a/jobs.h
+++ b/jobs.h
@@ -175,6 +175,8 @@
extern void ignore_tty_job_signals __P((void));
extern void default_tty_job_signals __P((void));
+extern void close_pgrp_pipe __P((void));
+
#if defined (JOB_CONTROL)
extern int job_control;
#endif
1.3 app-shells/bash/files/bash-3.0-subshell.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-subshell.patch?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-subshell.patch?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-subshell.patch?r1=1.2&r2=1.3
1.3 app-shells/bash/files/bash-3.0-configs.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-configs.patch?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-configs.patch?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-configs.patch?r1=1.2&r2=1.3
1.3 app-shells/bash/files/bash-2.05b-rbash.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-2.05b-rbash.patch?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-2.05b-rbash.patch?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-2.05b-rbash.patch?r1=1.2&r2=1.3
1.5 app-shells/bash/files/bash-3.0-jobs.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-jobs.patch?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-jobs.patch?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-jobs.patch?r1=1.4&r2=1.5
1.5 app-shells/bash/files/bash-3.0-darwin-conn.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-darwin-conn.patch?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-darwin-conn.patch?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-darwin-conn.patch?r1=1.4&r2=1.5
1.3 app-shells/bash/files/bash-3.0-strnlen.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-strnlen.patch?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-strnlen.patch?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-strnlen.patch?r1=1.2&r2=1.3
1.4 app-shells/bash/files/bash-3.0-manpage.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-manpage.patch?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-manpage.patch?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-manpage.patch?r1=1.3&r2=1.4
1.4 app-shells/bash/files/bash-3.0-afs.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-afs.patch?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-afs.patch?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-afs.patch?r1=1.3&r2=1.4
1.3 app-shells/bash/files/bash-3.0-crash.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-crash.patch?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-crash.patch?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-crash.patch?r1=1.2&r2=1.3
1.4 app-shells/bash/files/bash-3.0-ulimit.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-ulimit.patch?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-ulimit.patch?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-ulimit.patch?r1=1.3&r2=1.4
1.1 app-shells/bash/files/bash-2.05b-fix-job-warning.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-2.05b-fix-job-warning.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-2.05b-fix-job-warning.patch?rev=1.1&content-type=text/plain
Index: bash-2.05b-fix-job-warning.patch
===================================================================
fix obvious error:
common.c:247:5: warning: format '%s' expects a matching 'char *' argument
[-Wformat=]
--- a/builtins/common.c
+++ b/builtins/common.c
@@ -244,7 +244,7 @@
char *s;
{
if (s)
- builtin_error ("%s: no job control");
+ builtin_error ("%s: no job control", s);
else
builtin_error ("no job control");
}
1.3 app-shells/bash/files/bash-2.05b-jobs.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-2.05b-jobs.patch?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-2.05b-jobs.patch?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-2.05b-jobs.patch?r1=1.2&r2=1.3
1.3 app-shells/bash/files/bash-3.0-volatile-command.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-volatile-command.patch?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-volatile-command.patch?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-volatile-command.patch?r1=1.2&r2=1.3
1.3 app-shells/bash/files/bash-2.05b-empty-herestring.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-2.05b-empty-herestring.patch?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-2.05b-empty-herestring.patch?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-2.05b-empty-herestring.patch?r1=1.2&r2=1.3
1.4 app-shells/bash/files/bash-3.0-locale.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-locale.patch?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-locale.patch?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-locale.patch?r1=1.3&r2=1.4
1.4 app-shells/bash/files/bash-3.0-pwd.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-pwd.patch?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-pwd.patch?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-pwd.patch?r1=1.3&r2=1.4
1.3 app-shells/bash/files/bash-3.0-read-builtin-pipe.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-read-builtin-pipe.patch?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-read-builtin-pipe.patch?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-read-builtin-pipe.patch?r1=1.2&r2=1.3
1.3 app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch?r1=1.2&r2=1.3
1.1 app-shells/bash/files/bash-2.05b-destdir.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-2.05b-destdir.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-2.05b-destdir.patch?rev=1.1&content-type=text/plain
Index: bash-2.05b-destdir.patch
===================================================================
support DESTDIR install
--- bash-2.05b/Makefile.in
+++ bash-2.05b/Makefile.in
@@ -20,16 +20,16 @@
all: .made
# Include some boilerplate Gnu makefile definitions.
-prefix = @prefix@
+prefix = $(DESTDIR)@prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-libdir = @libdir@
-infodir = @infodir@
-includedir = @includedir@
+exec_prefix = $(DESTDIR)@exec_prefix@
+bindir = $(DESTDIR)@bindir@
+libdir = $(DESTDIR)@libdir@
+infodir = $(DESTDIR)@infodir@
+includedir = $(DESTDIR)@includedir@
datadir = @datadir@
-mandir = @mandir@
+mandir = $(DESTDIR)@mandir@
manpfx = man
man1ext = .1
1.3 app-shells/bash/files/bash-3.0-read-e-segfault.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-read-e-segfault.patch?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-read-e-segfault.patch?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-read-e-segfault.patch?r1=1.2&r2=1.3
1.3 app-shells/bash/files/bash-3.0-multibyteifs.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-multibyteifs.patch?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-multibyteifs.patch?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-multibyteifs.patch?r1=1.2&r2=1.3
1.1 app-shells/bash/files/bash-3.0-protos.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-protos.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-protos.patch?rev=1.1&content-type=text/plain
Index: bash-3.0-protos.patch
===================================================================
move prototypes around so they show up when needed
--- a/externs.h
+++ b/externs.h
@@ -327,6 +327,9 @@
#undef xstrchr
extern char *xstrchr __P((const char *, int));
+/* declarations for functions defined in lib/sh/zcatfd.c */
+extern int zcatfd __P((int, int, char *));
+
/* declarations for functions defined in lib/sh/zread.c */
extern ssize_t zread __P((int, char *, size_t));
extern ssize_t zreadintr __P((int, char *, size_t));
--- a/jobs.h
+++ b/jobs.h
@@ -175,6 +175,8 @@
extern void ignore_tty_job_signals __P((void));
extern void default_tty_job_signals __P((void));
+extern void close_pgrp_pipe __P((void));
+
#if defined (JOB_CONTROL)
extern int job_control;
#endif
--- a/general.c
+++ b/general.c
@@ -39,6 +39,8 @@
#include "bashintl.h"
#include "shell.h"
+#include "test.h"
+
#include <tilde/tilde.h>
#if !defined (errno)
--- a/builtins/evalfile.c
+++ b/builtins/evalfile.c
@@ -39,6 +39,7 @@
#include "../flags.h"
#include "../input.h"
#include "../execute_cmd.h"
+#include "../trap.h"
#if defined (HISTORY)
# include "../bashhist.h"
--- a/lib/glob/strmatch.c
+++ b/lib/glob/strmatch.c
@@ -25,9 +25,6 @@
#include "strmatch.h"
extern int xstrmatch __P((char *, char *, int));
-#if defined (HAVE_MULTIBYTE)
-extern int internal_wstrmatch __P((wchar_t *, wchar_t *, int));
-#endif
int
strmatch (pattern, string, flags)
--- a/lib/glob/strmatch.h
+++ b/lib/glob/strmatch.h
@@ -57,6 +57,7 @@
#if HANDLE_MULTIBYTE
extern int wcsmatch __P((wchar_t *, wchar_t *, int));
+extern int internal_wstrmatch __P((wchar_t *, wchar_t *, int));
#endif
#endif /* _STRMATCH_H */
1.4 app-shells/bash/files/bash-3.0-histtimeformat.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-histtimeformat.patch?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-histtimeformat.patch?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-histtimeformat.patch?r1=1.3&r2=1.4
1.1 app-shells/bash/files/bash-3.0-rbash.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-rbash.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.0-rbash.patch?rev=1.1&content-type=text/plain
Index: bash-3.0-rbash.patch
===================================================================
Fix broken rbash functionality when used as a login shell via /etc/passwd
http://bugs.gentoo.org/26854
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=170298
Backported from bash-3.1
--- bash-3.0/shell.c
+++ bash-3.0/shell.c
@@ -1089,6 +1099,8 @@
if (restricted)
return 1;
temp = base_pathname (name);
+ if (*temp == '-')
+ temp++;
return (STREQ (temp, RESTRICTED_SHELL_NAME));
}
