Mailinglist Archive: opensuse-commit (1262 mails)

[root@xxxxxxx (h_root)]

Hello community,

here is the log from the commit of package ltrace
checked in at Fri Sep 15 02:18:09 CEST 2006.

--------
--- ltrace/ltrace.changes	2006-09-14 14:21:17.000000000 +0200
+++ ltrace/ltrace.changes	2006-09-14 19:42:17.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Sep 14 19:41:39 CEST 2006 - olh@xxxxxxx
+
+- fix opd2addr to return the value at addr, not addr itself
+  revert a regex handling change in the testsuite to fix make check
+
+-------------------------------------------------------------------

New:
----
  ltrace.make-check-regex.patch
  ltrace.opd2addr.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ltrace.spec ++++++
--- /var/tmp/diff_new_pack.vth0UU/_old	2006-09-15 02:17:48.000000000 +0200
+++ /var/tmp/diff_new_pack.vth0UU/_new	2006-09-15 02:17:48.000000000 +0200
@@ -19,7 +19,7 @@
 Autoreqprov:    on
 Summary:        Trace the Library and System Calls a Program Makes
 Version:        0.4
-Release:        5
+Release:        6
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %ix86 sparc s390 s390x ppc ppc64 armv4l x86_64 alpha ia64
 Prefix:         /usr
@@ -68,6 +68,8 @@
 Patch203:       ltrace.ppc-sym2addr.patch
 Patch204:       ltrace.ia64-set_instruction_pointer.patch
 Patch205:       ltrace.make-check-info.patch
+Patch206:       ltrace.opd2addr.patch
+Patch207:       ltrace.make-check-regex.patch
 
 %description
 Ltrace is a program that runs the specified command until it exits. It
@@ -132,6 +134,8 @@
 %patch203 -p1
 %patch204 -p1
 %patch205 -p1
+%patch206 -p1
+%patch207 -p1
 
 %build
 autoreconf -fi
@@ -160,6 +164,9 @@
 
 %changelog -n ltrace
 * Thu Sep 14 2006 - olh@xxxxxxx
+- fix opd2addr to return the value at addr, not addr itself
+  revert a regex handling change in the testsuite to fix make check
+* Thu Sep 14 2006 - olh@xxxxxxx
 - run make check, do not abort the build if it fails
 * Thu Sep 14 2006 - olh@xxxxxxx
 - update to ltrace mainline r65


++++++ ltrace.make-check-regex.patch ++++++
Revert commit r54 'rejig testcase grepping'

---
 testsuite/lib/ltrace.exp                |    8 +++-----
 testsuite/ltrace.minor/count-record.exp |   26 +++++++++++++-------------
 2 files changed, 16 insertions(+), 18 deletions(-)

Index: ltrace-0.4/testsuite/lib/ltrace.exp
===================================================================
--- ltrace-0.4.orig/testsuite/lib/ltrace.exp
+++ ltrace-0.4/testsuite/lib/ltrace.exp
@@ -260,12 +260,10 @@ proc ltrace_saveoutput { args } {
 proc ltrace_verify_output { file_to_search pattern {instance_no 0}} {
 
 	# compute the number of PATTERN in FILE_TO_SEARCH by grep and wc.
-	catch "exec sh -c {grep \"$pattern\" $file_to_search | wc -l ;exit}" output
+	catch "exec sh -c {grep $pattern $file_to_search | wc -l ;exit}" output
 	verbose "output = $output"
-
-	if [ regexp "syntax error" $output ] then {
-		fail "Invalid regular expression $pattern"
-        } elseif { $instance_no == 0 } then {
+	
+	if { $instance_no == 0 } then {
 		if { $output == 0 } then {
 			fail "Fail to find $pattern in $file_to_search"
 		} else {
Index: ltrace-0.4/testsuite/ltrace.minor/count-record.exp
===================================================================
--- ltrace-0.4.orig/testsuite/ltrace.minor/count-record.exp
+++ ltrace-0.4/testsuite/ltrace.minor/count-record.exp
@@ -48,30 +48,30 @@ ltrace_saveoutput $exec_output $srcdir/$
 #   3.39    0.000268         268         1 fread
 #
 
-set pattern " 1 rmdir"
+set pattern "\'1 rmdir\'"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern
-set pattern " 1 fopen"
+set pattern "\'1 fopen\'"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern
-set pattern " 2 remove"
+set pattern "\'2 remove\'"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern
-set pattern " 1 mkdir"
+set pattern "\'1 mkdir\'"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern
-set pattern " 1 fseek"
+set pattern "\'1 fseek\'"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern
-set pattern " 1 fwrite"
+set pattern "\'1 fwrite\'"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern
-set pattern " 1 fclose"
+set pattern "\'1 fclose\'"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern
-set pattern " 1 rename"
+set pattern "\'1 rename\'"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern
-set pattern " 1 symlink"
+set pattern "\'1 symlink\'"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern
-set pattern " 1 chdir"
+set pattern "\'1 chdir\'"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern
-set pattern " 1 access"
+set pattern "\'1 access\'"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern
-set pattern " 1 getcwd"
+set pattern "\'1 getcwd\'"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern
-set pattern " 1 fread"
+set pattern "\'1 fread\'"
 ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern
 
++++++ ltrace.opd2addr.patch ++++++
Return the content at the address, not the address itself.

---
 elf.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: ltrace-0.4/elf.c
===================================================================
--- ltrace-0.4.orig/elf.c
+++ ltrace-0.4/elf.c
@@ -417,7 +417,7 @@ static GElf_Addr opd2addr(struct ltelf *
 	if (offset > lte->opd_size)
 		error(EXIT_FAILURE, 0, "static plt not in .opd");
 
-	return (GElf_Addr)(base + offset);
+	return *(GElf_Addr*)(base + offset);
 }
 
 struct library_symbol *read_elf(struct process *proc)

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx