[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, systemd, updated. clfs-2.0.0-941-g3fe0516
git
git at cross-lfs.org
Thu Feb 27 10:03:50 PST 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, systemd has been updated
via 3fe0516c1327a8fbbd5db2f5312427ed81fb83ed (commit)
via c1ce18b776a250f2f65f05a7b98e09fadcd812cc (commit)
via 7ac1d918ac15dd51ddc015aba92abd2e6a95cf09 (commit)
via bc3953c39ac0a1cfc0a65b715e947ccdfe4950f6 (commit)
via e689226abbebb0f941853e1fef9aab56122b7617 (commit)
from a0e79c4c8fc44cf0894b069357cda60f004257f4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3fe0516c1327a8fbbd5db2f5312427ed81fb83ed
Author: William Harrington <kb0iic at berzerkula.org>
Date: Thu Feb 27 12:03:45 2014 -0600
Remove readline 6.2 branch update patch.
diff --git a/patches/readline-6.2-branch_update-3.patch b/patches/readline-6.2-branch_update-3.patch
deleted file mode 100644
index 343d89e..0000000
--- a/patches/readline-6.2-branch_update-3.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-Submitted By: William Harrington (kb0iic at cross-lfs dot org)
-Date: 2012-11-01
-Initial Package Version: 6.2
-Origin: Upstream
-Upstream Status: Applied
-Description: Contains all upstream patches up to 6.2-004
-
-diff -Naur readline-6.2.orig/callback.c readline-6.2/callback.c
---- readline-6.2.orig/callback.c 2010-06-06 16:18:58.000000000 +0000
-+++ readline-6.2/callback.c 2012-11-01 20:14:01.000000000 +0000
-@@ -148,6 +148,9 @@
- eof = _rl_vi_domove_callback (_rl_vimvcxt);
- /* Should handle everything, including cleanup, numeric arguments,
- and turning off RL_STATE_VIMOTION */
-+ if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0)
-+ _rl_internal_char_cleanup ();
-+
- return;
- }
- #endif
-diff -Naur readline-6.2.orig/input.c readline-6.2/input.c
---- readline-6.2.orig/input.c 2010-05-30 22:33:01.000000000 +0000
-+++ readline-6.2/input.c 2012-11-01 20:14:01.000000000 +0000
-@@ -409,7 +409,7 @@
- int
- rl_read_key ()
- {
-- int c;
-+ int c, r;
-
- rl_key_sequence_length++;
-
-@@ -429,14 +429,18 @@
- {
- while (rl_event_hook)
- {
-- if (rl_gather_tyi () < 0) /* XXX - EIO */
-+ if (rl_get_char (&c) != 0)
-+ break;
-+
-+ if ((r = rl_gather_tyi ()) < 0) /* XXX - EIO */
- {
- rl_done = 1;
- return ('\n');
- }
-+ else if (r == 1) /* read something */
-+ continue;
-+
- RL_CHECK_SIGNALS ();
-- if (rl_get_char (&c) != 0)
-- break;
- if (rl_done) /* XXX - experimental */
- return ('\n');
- (*rl_event_hook) ();
-diff -Naur readline-6.2.orig/patchlevel readline-6.2/patchlevel
---- readline-6.2.orig/patchlevel 2010-01-14 15:15:52.000000000 +0000
-+++ readline-6.2/patchlevel 2012-11-01 20:14:01.000000000 +0000
-@@ -1,3 +1,3 @@
- # Do not edit -- exists only for use by patch
-
--1
-+4
-diff -Naur readline-6.2.orig/support/shobj-conf readline-6.2/support/shobj-conf
---- readline-6.2.orig/support/shobj-conf 2009-10-28 13:20:21.000000000 +0000
-+++ readline-6.2/support/shobj-conf 2012-11-01 20:14:01.000000000 +0000
-@@ -157,7 +157,7 @@
- ;;
-
- # Darwin/MacOS X
--darwin[89]*|darwin10*)
-+darwin[89]*|darwin1[012]*)
- SHOBJ_STATUS=supported
- SHLIB_STATUS=supported
-
-@@ -186,7 +186,7 @@
- SHLIB_LIBSUFF='dylib'
-
- case "${host_os}" in
-- darwin[789]*|darwin10*) SHOBJ_LDFLAGS=''
-+ darwin[789]*|darwin1[012]*) SHOBJ_LDFLAGS=''
- SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
- ;;
- *) SHOBJ_LDFLAGS='-dynamic'
-diff -Naur readline-6.2.orig/vi_mode.c readline-6.2/vi_mode.c
---- readline-6.2.orig/vi_mode.c 2010-11-21 00:51:39.000000000 +0000
-+++ readline-6.2/vi_mode.c 2012-11-01 20:14:01.000000000 +0000
-@@ -1114,7 +1114,7 @@
- rl_beg_of_line (1, c);
- _rl_vi_last_motion = c;
- RL_UNSETSTATE (RL_STATE_VIMOTION);
-- return (0);
-+ return (vidomove_dispatch (m));
- }
- #if defined (READLINE_CALLBACKS)
- /* XXX - these need to handle rl_universal_argument bindings */
-@@ -1234,11 +1234,19 @@
- _rl_vimvcxt->motion = '$';
- r = rl_domove_motion_callback (_rl_vimvcxt);
- }
-- else if (vi_redoing)
-+ else if (vi_redoing && _rl_vi_last_motion != 'd') /* `dd' is special */
- {
- _rl_vimvcxt->motion = _rl_vi_last_motion;
- r = rl_domove_motion_callback (_rl_vimvcxt);
- }
-+ else if (vi_redoing) /* handle redoing `dd' here */
-+ {
-+ _rl_vimvcxt->motion = _rl_vi_last_motion;
-+ rl_mark = rl_end;
-+ rl_beg_of_line (1, key);
-+ RL_UNSETSTATE (RL_STATE_VIMOTION);
-+ r = vidomove_dispatch (_rl_vimvcxt);
-+ }
- #if defined (READLINE_CALLBACKS)
- else if (RL_ISSTATE (RL_STATE_CALLBACK))
- {
-@@ -1316,11 +1324,19 @@
- _rl_vimvcxt->motion = '$';
- r = rl_domove_motion_callback (_rl_vimvcxt);
- }
-- else if (vi_redoing)
-+ else if (vi_redoing && _rl_vi_last_motion != 'c') /* `cc' is special */
- {
- _rl_vimvcxt->motion = _rl_vi_last_motion;
- r = rl_domove_motion_callback (_rl_vimvcxt);
- }
-+ else if (vi_redoing) /* handle redoing `cc' here */
-+ {
-+ _rl_vimvcxt->motion = _rl_vi_last_motion;
-+ rl_mark = rl_end;
-+ rl_beg_of_line (1, key);
-+ RL_UNSETSTATE (RL_STATE_VIMOTION);
-+ r = vidomove_dispatch (_rl_vimvcxt);
-+ }
- #if defined (READLINE_CALLBACKS)
- else if (RL_ISSTATE (RL_STATE_CALLBACK))
- {
-@@ -1377,6 +1393,19 @@
- _rl_vimvcxt->motion = '$';
- r = rl_domove_motion_callback (_rl_vimvcxt);
- }
-+ else if (vi_redoing && _rl_vi_last_motion != 'y') /* `yy' is special */
-+ {
-+ _rl_vimvcxt->motion = _rl_vi_last_motion;
-+ r = rl_domove_motion_callback (_rl_vimvcxt);
-+ }
-+ else if (vi_redoing) /* handle redoing `yy' here */
-+ {
-+ _rl_vimvcxt->motion = _rl_vi_last_motion;
-+ rl_mark = rl_end;
-+ rl_beg_of_line (1, key);
-+ RL_UNSETSTATE (RL_STATE_VIMOTION);
-+ r = vidomove_dispatch (_rl_vimvcxt);
-+ }
- #if defined (READLINE_CALLBACKS)
- else if (RL_ISSTATE (RL_STATE_CALLBACK))
- {
commit c1ce18b776a250f2f65f05a7b98e09fadcd812cc
Author: William Harrington <kb0iic at berzerkula.org>
Date: Thu Feb 27 12:03:32 2014 -0600
Commont out Readline patch area p1 and p2 for future use.
diff --git a/BOOK/final-system/multilib/readline-64bit.xml b/BOOK/final-system/multilib/readline-64bit.xml
index bcf9577..a43c60d 100644
--- a/BOOK/final-system/multilib/readline-64bit.xml
+++ b/BOOK/final-system/multilib/readline-64bit.xml
@@ -21,6 +21,7 @@
<sect2 role="installation">
<title>Installation of Readline</title>
+<!-- Readline branch update area
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="readline.xml"
xpointer="xpointer(//*[@os='p1'])"/>
@@ -28,6 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="readline.xml"
xpointer="xpointer(//*[@os='p2'])"/>
+-->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="readline.xml"
diff --git a/BOOK/final-system/multilib/readline-n32.xml b/BOOK/final-system/multilib/readline-n32.xml
index 313fc08..2c75760 100644
--- a/BOOK/final-system/multilib/readline-n32.xml
+++ b/BOOK/final-system/multilib/readline-n32.xml
@@ -22,6 +22,7 @@
<sect2 role="installation">
<title>Installation of Readline</title>
+<!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="readline.xml"
xpointer="xpointer(//*[@os='p1'])"/>
@@ -29,6 +30,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="readline.xml"
xpointer="xpointer(//*[@os='p2'])"/>
+-->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="readline.xml"
diff --git a/BOOK/final-system/multilib/readline.xml b/BOOK/final-system/multilib/readline.xml
index ab81506..6282257 100644
--- a/BOOK/final-system/multilib/readline.xml
+++ b/BOOK/final-system/multilib/readline.xml
@@ -22,6 +22,7 @@
<sect2 role="installation">
<title>Installation of Readline</title>
+<!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/readline.xml"
xpointer="xpointer(//*[@os='p1'])"/>
@@ -29,6 +30,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/readline.xml"
xpointer="xpointer(//*[@os='p2'])"/>
+-->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/readline.xml"
commit 7ac1d918ac15dd51ddc015aba92abd2e6a95cf09
Author: William Harrington <kb0iic at berzerkula.org>
Date: Thu Feb 27 12:03:16 2014 -0600
Comment out Readline branch update area for future use.
diff --git a/BOOK/final-system/common/readline.xml b/BOOK/final-system/common/readline.xml
index 87279ff..c3ae1e5 100644
--- a/BOOK/final-system/common/readline.xml
+++ b/BOOK/final-system/common/readline.xml
@@ -25,10 +25,12 @@
<sect2 role="installation">
<title>Installation of Readline</title>
+<!-- Readline branch update patch area
<para os="p1">The following patch contains updates from the maintainer. The
maintainer of Readline only releases these patches to fix serious issues:</para>
<screen os="p2"><userinput>patch -Np1 -i ../&readline-branch_update-patch;</userinput></screen>
+-->
<para os="a">Prepare Readline for compilation:</para>
commit bc3953c39ac0a1cfc0a65b715e947ccdfe4950f6
Author: William Harrington <kb0iic at berzerkula.org>
Date: Thu Feb 27 12:03:00 2014 -0600
Comment out Readline branch update area for future use.
diff --git a/BOOK/materials/common/patches.xml b/BOOK/materials/common/patches.xml
index f79aa1b..11affa7 100644
--- a/BOOK/materials/common/patches.xml
+++ b/BOOK/materials/common/patches.xml
@@ -130,6 +130,7 @@
</listitem>
</varlistentry>
+<!-- Readline branc update area
<varlistentry>
<term>Readline Branch Update - <token>&readline-branch_update-patch-size;</token>:</term>
<listitem>
@@ -138,6 +139,7 @@
<para>MD5 sum: <literal>&readline-branch_update-patch-md5;</literal></para>
</listitem>
</varlistentry>
+-->
<varlistentry>
<term>Tar Man Page Patch - <token>&tar-man-patch-size;</token>:</term>
commit e689226abbebb0f941853e1fef9aab56122b7617
Author: William Harrington <kb0iic at berzerkula.org>
Date: Thu Feb 27 12:02:10 2014 -0600
Comment out readline branch update area for future use.
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 88c56c5..d5acc5f 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -62,9 +62,11 @@
<!ENTITY perl-libc-patch-md5 "0959d8c1d370ce152b0d2a6df5ccfd7e">
<!ENTITY perl-libc-patch-size "1.657 KB">
+<!-- Readline branch update area
<!ENTITY readline-branch_update-patch "readline-&readline-version;-branch_update-3.patch">
<!ENTITY readline-branch_update-patch-md5 "af788f5b1cfc5db9efc9e0fa0268a574">
<!ENTITY readline-branch_update-patch-size "4.9 KB">
+-->
<!ENTITY tar-man-patch "tar-&tar-version;-manpage-1.patch">
<!ENTITY tar-man-patch-md5 "68c86c67e67a5c074872a293818f361d">
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/common/readline.xml | 2 +
BOOK/final-system/multilib/readline-64bit.xml | 2 +
BOOK/final-system/multilib/readline-n32.xml | 2 +
BOOK/final-system/multilib/readline.xml | 2 +
BOOK/materials/common/patches.xml | 2 +
BOOK/patches.ent | 2 +
patches/readline-6.2-branch_update-3.patch | 157 -------------------------
7 files changed, 12 insertions(+), 157 deletions(-)
delete mode 100644 patches/readline-6.2-branch_update-3.patch
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list