| 1 |
vapier 09/04/27 04:54:59 |
| 2 |
|
| 3 |
Modified: 0001-msg-style.patch 0003-KV.patch |
| 4 |
0002-useful-functions.patch |
| 5 |
Log: |
| 6 |
Update patches against latest svn #267540 by Vivien Moreau. |
| 7 |
(Portage version: 2.2_rc31/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 sys-apps/openrc/files/9999/0001-msg-style.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/9999/0001-msg-style.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/9999/0001-msg-style.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/9999/0001-msg-style.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: 0001-msg-style.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/files/9999/0001-msg-style.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- 0001-msg-style.patch 30 Mar 2008 17:42:11 -0000 1.1 |
| 23 |
+++ 0001-msg-style.patch 27 Apr 2009 04:54:59 -0000 1.2 |
| 24 |
@@ -11,8 +11,8 @@ |
| 25 |
index f8ddcb5..c46cacb 100644 |
| 26 |
--- a/src/libeinfo/libeinfo.c |
| 27 |
+++ b/src/libeinfo/libeinfo.c |
| 28 |
-@@ -787,7 +787,7 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color, |
| 29 |
- if (! msg) |
| 30 |
+@@ -817,7 +817,7 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color, |
| 31 |
+ if (!msg) |
| 32 |
return; |
| 33 |
|
| 34 |
- cols = get_term_columns(fp) - (strlen(msg) + 3); |
| 35 |
@@ -20,7 +20,7 @@ |
| 36 |
|
| 37 |
/* cons25 is special - we need to remove one char, otherwise things |
| 38 |
* do not align properly at all. */ |
| 39 |
-@@ -801,18 +801,15 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color, |
| 40 |
+@@ -831,18 +831,15 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color, |
| 41 |
if (term_is_cons25) |
| 42 |
cols--; |
| 43 |
|
| 44 |
@@ -30,8 +30,8 @@ |
| 45 |
if (cols > 0 && colour_terminal(fp)) { |
| 46 |
- fprintf(fp, "%s%s %s[%s%s%s]%s\n", up, tgoto(goto_column, 0, cols), |
| 47 |
+ fprintf(fp, "%s%s %s[%s %s %s]%s\n", up, tgoto(goto_column, 0, cols), |
| 48 |
- ecolor(ECOLOR_BRACKET), ecolor(color), msg, |
| 49 |
- ecolor(ECOLOR_BRACKET), ecolor(ECOLOR_NORMAL)); |
| 50 |
+ ecolor(ECOLOR_BRACKET), ecolor(color), msg, |
| 51 |
+ ecolor(ECOLOR_BRACKET), ecolor(ECOLOR_NORMAL)); |
| 52 |
} else { |
| 53 |
if (col > 0) |
| 54 |
for (i = 0; i < cols - col; i++) |
| 55 |
|
| 56 |
|
| 57 |
|
| 58 |
1.2 sys-apps/openrc/files/9999/0003-KV.patch |
| 59 |
|
| 60 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/9999/0003-KV.patch?rev=1.2&view=markup |
| 61 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/9999/0003-KV.patch?rev=1.2&content-type=text/plain |
| 62 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/9999/0003-KV.patch?r1=1.1&r2=1.2 |
| 63 |
|
| 64 |
Index: 0003-KV.patch |
| 65 |
=================================================================== |
| 66 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/files/9999/0003-KV.patch,v |
| 67 |
retrieving revision 1.1 |
| 68 |
retrieving revision 1.2 |
| 69 |
diff -u -r1.1 -r1.2 |
| 70 |
--- 0003-KV.patch 30 Mar 2008 17:42:11 -0000 1.1 |
| 71 |
+++ 0003-KV.patch 27 Apr 2009 04:54:59 -0000 1.2 |
| 72 |
@@ -59,8 +59,8 @@ |
| 73 |
--- a/sh/runtests.sh |
| 74 |
+++ b/sh/runtests.sh |
| 75 |
@@ -3,6 +3,19 @@ |
| 76 |
- top_srcdir=${top_srcdir:-..} |
| 77 |
- . ${top_srcdir}/test/setup_env.sh |
| 78 |
+ : ${top_srcdir:=..} |
| 79 |
+ . $top_srcdir/test/setup_env.sh |
| 80 |
|
| 81 |
+checkit() { |
| 82 |
+ local output=$($1 $3) |
| 83 |
@@ -79,8 +79,8 @@ |
| 84 |
|
| 85 |
tret=0 |
| 86 |
@@ -22,4 +35,36 @@ done |
| 87 |
- eend ${tret} |
| 88 |
- ((ret+=tret)) |
| 89 |
+ eend $tret |
| 90 |
+ ret=$(($ret + $tret)) |
| 91 |
|
| 92 |
+compare_int() { |
| 93 |
+ local got=$(KV_to_int $1) |
| 94 |
@@ -112,9 +112,9 @@ |
| 95 |
+ compare_int 1.2.3.4 -eq ${v} |
| 96 |
+done |
| 97 |
+eend ${tret} |
| 98 |
-+((ret+=tret)) |
| 99 |
++: $((ret+=tret)) |
| 100 |
+ |
| 101 |
- exit ${ret} |
| 102 |
+ exit $ret |
| 103 |
-- |
| 104 |
1.5.4.4 |
| 105 |
|
| 106 |
|
| 107 |
|
| 108 |
|
| 109 |
1.4 sys-apps/openrc/files/9999/0002-useful-functions.patch |
| 110 |
|
| 111 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/9999/0002-useful-functions.patch?rev=1.4&view=markup |
| 112 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/9999/0002-useful-functions.patch?rev=1.4&content-type=text/plain |
| 113 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/files/9999/0002-useful-functions.patch?r1=1.3&r2=1.4 |
| 114 |
|
| 115 |
Index: 0002-useful-functions.patch |
| 116 |
=================================================================== |
| 117 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/files/9999/0002-useful-functions.patch,v |
| 118 |
retrieving revision 1.3 |
| 119 |
retrieving revision 1.4 |
| 120 |
diff -u -r1.3 -r1.4 |
| 121 |
--- 0002-useful-functions.patch 6 Oct 2008 18:53:13 -0000 1.3 |
| 122 |
+++ 0002-useful-functions.patch 27 Apr 2009 04:54:59 -0000 1.4 |
| 123 |
@@ -9,26 +9,27 @@ |
| 124 |
2 files changed, 22 insertions(+), 23 deletions(-) |
| 125 |
|
| 126 |
diff --git a/sh/functions.sh.in b/sh/functions.sh.in |
| 127 |
-index 57917ed..680f534 100644 |
| 128 |
+index 3f41f8f..be5285c 100644 |
| 129 |
--- a/sh/functions.sh.in |
| 130 |
+++ b/sh/functions.sh.in |
| 131 |
-@@ -42,6 +42,28 @@ rc_runlevel() { |
| 132 |
+@@ -42,6 +42,29 @@ rc_runlevel() { |
| 133 |
rc-status --runlevel |
| 134 |
} |
| 135 |
|
| 136 |
+get_bootparam() |
| 137 |
+{ |
| 138 |
+ local match="$1" |
| 139 |
-+ [ -z "${match}" -o ! -r /proc/cmdline ] && return 1 |
| 140 |
++ [ -z "$match" -o ! -r /proc/cmdline ] && return 1 |
| 141 |
+ |
| 142 |
+ set -- $(cat /proc/cmdline) |
| 143 |
+ while [ -n "$1" ]; do |
| 144 |
++ [ "$1" = "$match" ] && return 0 |
| 145 |
+ case "$1" in |
| 146 |
+ gentoo=*) |
| 147 |
+ local params="${1##*=}" |
| 148 |
+ local IFS=, x= |
| 149 |
-+ for x in ${params}; do |
| 150 |
-+ [ "${x}" = "${match}" ] && return 0 |
| 151 |
++ for x in $params; do |
| 152 |
++ [ "$x" = "$match" ] && return 0 |
| 153 |
+ done |
| 154 |
+ ;; |
| 155 |
+ esac |
| 156 |
@@ -42,27 +43,27 @@ |
| 157 |
{ |
| 158 |
local IFS=":" p= path= |
| 159 |
diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in |
| 160 |
-index 751d47a..c713def 100644 |
| 161 |
+index ebdb768..68cd6e7 100644 |
| 162 |
--- a/sh/rc-functions.sh.in |
| 163 |
+++ b/sh/rc-functions.sh.in |
| 164 |
-@@ -51,29 +51,6 @@ is_union_fs() |
| 165 |
+@@ -61,29 +61,6 @@ is_union_fs() |
| 166 |
unionctl "$1" --list >/dev/null 2>&1 |
| 167 |
} |
| 168 |
|
| 169 |
-get_bootparam() |
| 170 |
-{ |
| 171 |
- local match="$1" |
| 172 |
-- [ -z "${match}" -o ! -r /proc/cmdline ] && return 1 |
| 173 |
+- [ -z "$match" -o ! -r /proc/cmdline ] && return 1 |
| 174 |
- |
| 175 |
- set -- $(cat /proc/cmdline) |
| 176 |
- while [ -n "$1" ]; do |
| 177 |
-- [ "$1" = "${match}" ] && return 0 |
| 178 |
+- [ "$1" = "$match" ] && return 0 |
| 179 |
- case "$1" in |
| 180 |
- gentoo=*) |
| 181 |
- local params="${1##*=}" |
| 182 |
- local IFS=, x= |
| 183 |
-- for x in ${params}; do |
| 184 |
-- [ "${x}" = "${match}" ] && return 0 |
| 185 |
+- for x in $params; do |
| 186 |
+- [ "$x" = "$match" ] && return 0 |
| 187 |
- done |
| 188 |
- ;; |
| 189 |
- esac |
| 190 |
@@ -73,8 +74,5 @@ |
| 191 |
-} |
| 192 |
- |
| 193 |
# Add our sbin to $PATH |
| 194 |
- case "${PATH}" in |
| 195 |
- "${RC_LIBDIR}"/sbin|"${RC_LIBDIR}"/sbin:*);; |
| 196 |
--- |
| 197 |
-1.6.0.2 |
| 198 |
- |
| 199 |
+ case "$PATH" in |
| 200 |
+ "$RC_LIBDIR"/sbin|"$RC_LIBDIR"/sbin:*);; |
Archives