vapier 14/10/19 20:16:14
Modified: bash-3.2-protos.patch
Added: bash-2.05b-parallel-build.patch
bash-3.1-protos.patch
Removed: bash-3.1-gentoo.patch bash-3.2-parallel-build.patch
Log:
Update prototype headers, drop Mandrake/readline patches that are not needed,
and pull back in the old version.h parallel build fix.
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with
key D2E96200)
Revision Changes Path
1.2 app-shells/bash/files/bash-3.2-protos.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.2-protos.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.2-protos.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.2-protos.patch?r1=1.1&r2=1.2
Index: bash-3.2-protos.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-shells/bash/files/bash-3.2-protos.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash-3.2-protos.patch 9 Feb 2009 01:07:59 -0000 1.1
+++ bash-3.2-protos.patch 19 Oct 2014 20:16:14 -0000 1.2
@@ -43,3 +43,15 @@
/* Non-zero means SIGINT has already ocurred. */
extern volatile int interrupt_state;
extern volatile int terminating_signal;
+--- a/support/bashversion.c
++++ b/support/bashversion.c
+@@ -47,6 +47,9 @@
+ extern char *dist_version;
+ extern int patch_level;
+
++extern char *shell_version_string __P((void));
++extern void show_shell_version __P((int));
++
+ char *shell_name = "bash";
+ char *progname;
+
1.3 app-shells/bash/files/bash-2.05b-parallel-build.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-2.05b-parallel-build.patch?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-2.05b-parallel-build.patch?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-2.05b-parallel-build.patch?r1=1.2&r2=1.3
1.1 app-shells/bash/files/bash-3.1-protos.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.1-protos.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/files/bash-3.1-protos.patch?rev=1.1&content-type=text/plain
Index: bash-3.1-protos.patch
===================================================================
move prototypes around so they show up when needed
--- a/jobs.h
+++ b/jobs.h
@@ -182,6 +182,7 @@
extern int count_all_jobs __P((void));
+extern void close_pgrp_pipe __P((void));
extern void terminate_current_pipeline __P((void));
extern void terminate_stopped_jobs __P((void));
extern void hangup_all_jobs __P((void));
--- 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 */
--- a/builtins/echo.def
+++ b/builtins/echo.def
@@ -31,6 +31,8 @@
#include <stdio.h>
#include "../shell.h"
+#include "common.h"
+
$BUILTIN echo
$FUNCTION echo_builtin
$DEPENDS_ON V9_ECHO
--- a/lib/sh/winsize.c
+++ b/lib/sh/winsize.c
@@ -55,6 +55,7 @@
#if defined (READLINE)
extern void rl_set_screen_size __P((int, int));
#endif
+extern void sh_set_lines_and_columns __P((int, int));
void
get_new_window_size (from_sig, rp, cp)
--- a/support/bashversion.c
+++ b/support/bashversion.c
@@ -47,6 +47,9 @@
extern char *dist_version;
extern int patch_level;
+extern char *shell_version_string __P((void));
+extern void show_shell_version __P((int));
+
char *shell_name = "bash";
char *progname;
