rpms/ltrace/devel ltrace-opt_x.patch, NONE, 1.1 ltrace-testsuite.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 ltrace.spec, 1.25, 1.26 sources, 1.6, 1.7 ltrace-fixes.patch, 1.1, NONE ltrace-ia64.patch, 1.1, NONE ltrace-ppc64-2.patch, 1.1, NONE ltrace-ppc64.patch, 1.1, NONE ltrace-s390x.patch, 1.1, NONE ltrace-syscallent-update.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Apr 7 12:47:48 UTC 2006


Author: pmachata

Update of /cvs/dist/rpms/ltrace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30636

Modified Files:
	.cvsignore ltrace.spec sources 
Added Files:
	ltrace-opt_x.patch ltrace-testsuite.patch 
Removed Files:
	ltrace-fixes.patch ltrace-ia64.patch ltrace-ppc64-2.patch 
	ltrace-ppc64.patch ltrace-s390x.patch 
	ltrace-syscallent-update.patch 
Log Message:
- Upstream 0.4
- svn updates:
  - opt_x patch: New structure for opt_x list elements, now with
    'found'.  Using it in options.c, elf.c.
  - testsuite patch: Automated testsuite for ltrace.
- removing old patches from cvs


ltrace-opt_x.patch:
 ChangeLog |    6 ++++++
 elf.c     |   29 ++++++++++++++++-------------
 options.c |    7 ++++---
 options.h |    8 +++++++-
 4 files changed, 33 insertions(+), 17 deletions(-)

--- NEW FILE ltrace-opt_x.patch ---
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33)
+++ ChangeLog	(revision 34)
@@ -1,3 +1,9 @@
+2006-03-13  Paul Gilliam <pgilliam at us.ibm.com>
+
+	* options.h: New structure for opt_x list elements, now with 'found'.
+	* options.c: Use new opt_x_t structure, initializing 'found' to 0.
+	* elf.c: Use new 'found' field for better error checking.
+
 2006-03-06  Ian Wienand  <ianw at ieee.org>
 
 	* Makefile.in: remove unneeded dirs from make dist; use rm
Index: options.h
===================================================================
--- options.h	(revision 32)
+++ options.h	(revision 33)
@@ -31,11 +31,17 @@ struct opt_e_t {
 	struct opt_e_t *next;
 };
 
+struct opt_x_t {
+	char *name;
+	int found;
+	struct opt_x_t *next;
+};
+
 extern struct opt_p_t *opt_p;	/* attach to process with a given pid */
 
 extern struct opt_e_t *opt_e;	/* list of function names to display */
 extern int opt_e_enable;	/* 0 if '!' is used, 1 otherwise */
 
-extern struct opt_e_t *opt_x;	/* list of functions to break at */
+extern struct opt_x_t *opt_x;	/* list of functions to break at */
 
 extern char **process_options(int argc, char **argv);
Index: elf.c
===================================================================
--- elf.c	(revision 32)
+++ elf.c	(revision 33)
@@ -351,9 +351,10 @@ struct library_symbol *read_elf(struct p
 	struct library_symbol *library_symbols = NULL;
 	struct ltelf lte[MAX_LIBRARY + 1];
 	size_t i;
-	struct opt_e_t *xptr;
+	struct opt_x_t *xptr;
 	struct library_symbol **lib_tail = NULL;
-	struct opt_e_t *main_cheat;
+	struct opt_x_t *main_cheat;
+	int exit_out = 0;
 
 	elf_version(EV_CURRENT);
 
@@ -440,22 +441,24 @@ struct library_symbol *read_elf(struct p
 				add_library_symbol(elf_plt2addr
 						   (lte, (void *)addr), name,
 						   lib_tail, 1, 0);
+				xptr->found = 1;
 				break;
 			}
 	}
 	for (xptr = opt_x; xptr; xptr = xptr->next)
-		if (xptr->name) {
-			if (strcmp(xptr->name, E_ENTRY_NAME) == 0)
-				add_library_symbol(elf_plt2addr
-						   (lte,
-						    (void *)lte->ehdr.e_entry),
-						   "_start", lib_tail, 1, 0);
-			else
-				fprintf(stderr,
-					"Warning: Couldn't get symbol \"%s\" "
-					"from \"%s\" or it's a duplicate",
-					xptr->name, proc->filename);
+		if ( ! xptr->found) {
+			char *badthing = "WARNING";
+			if (E_ENTRY_NAME && strcmp(xptr->name, E_ENTRY_NAME)) {
+				badthing = "ERROR";
+				exit_out = 1;
+			}
+			fprintf (stderr,
+				 "%s: Couldn't find symbol \"%s\" in file \"%s\"\n",
+			badthing, xptr->name, proc->filename);
 		}
+	if (exit_out) {
+		exit (1);
+	}
 
 	for (i = 0; i < library_num + 1; ++i)
 		do_close_elf(&lte[i]);
Index: options.c
===================================================================
--- options.c	(revision 32)
+++ options.c	(revision 33)
@@ -51,7 +51,7 @@ struct opt_e_t *opt_e = NULL;
 int opt_e_enable = 1;
 
 /* List of global function names given to -x: */
-struct opt_e_t *opt_x = NULL;
+struct opt_x_t *opt_x = NULL;
 
 /* Set a break on the routine named here in order to re-initialize breakpoints
    after all the PLTs have been initialzed */
@@ -323,7 +323,7 @@ char **process_options(int argc, char **
 
 		case 'x':
 			{
-				struct opt_e_t *p = opt_x;
+				struct opt_x_t *p = opt_x;
 
 				/* First, check for duplicate. */
 				while (p && strcmp(p->name, optarg)) {
@@ -334,12 +334,13 @@ char **process_options(int argc, char **
 				}
 
 				/* If not duplicate, add to list. */
-				p = malloc(sizeof(struct opt_e_t));
+				p = malloc(sizeof(struct opt_x_t));
 				if (!p) {
 					perror("ltrace: malloc");
 					exit(1);
 				}
 				p->name = optarg;
+				p->found = 0;
 				p->next = opt_x;
 				opt_x = p;
 				break;

ltrace-testsuite.patch:
 ChangeLog                                            |   58 +++
 Makefile.in                                          |   10 
 configure                                            |    2 
 configure.ac                                         |    5 
 testsuite/Makefile.in                                |   72 ++++
 testsuite/README                                     |  244 ++++++++++++++++
 testsuite/config/unix.exp                            |    1 
 testsuite/lib/compiler.c                             |   58 +++
 testsuite/lib/compiler.cc                            |   45 +++
 testsuite/lib/ltrace.exp                             |  277 +++++++++++++++++++
 testsuite/ltrace.main/Makefile.in                    |   34 ++
 testsuite/ltrace.main/main-internal-1.c              |    8 
 testsuite/ltrace.main/main-internal.c                |   19 +
 testsuite/ltrace.main/main-internal.exp              |   33 ++
 testsuite/ltrace.main/main-lib.c                     |    7 
 testsuite/ltrace.main/main.c                         |   21 +
 testsuite/ltrace.main/main.exp                       |   39 ++
 testsuite/ltrace.main/signals.c                      |   48 +++
 testsuite/ltrace.main/signals.exp                    |   39 ++
 testsuite/ltrace.main/system_calls.c                 |   68 ++++
 testsuite/ltrace.main/system_calls.exp               |   67 ++++
 testsuite/ltrace.minor/Makefile.in                   |   37 ++
 testsuite/ltrace.minor/attach-process.c              |   16 +
 testsuite/ltrace.minor/attach-process.exp            |   38 ++
 testsuite/ltrace.minor/count-record.c                |   51 +++
 testsuite/ltrace.minor/count-record.exp              |   77 +++++
 testsuite/ltrace.minor/demangle-lib.cpp              |   97 ++++++
 testsuite/ltrace.minor/demangle.cpp                  |  121 ++++++++
 testsuite/ltrace.minor/demangle.exp                  |   63 ++++
 testsuite/ltrace.minor/demangle.h                    |   36 ++
 testsuite/ltrace.minor/print-instruction-pointer.c   |   11 
 testsuite/ltrace.minor/print-instruction-pointer.exp |   42 ++
 testsuite/ltrace.minor/time-record-T.exp             |   84 +++++
 testsuite/ltrace.minor/time-record-tt.exp            |  107 +++++++
 testsuite/ltrace.minor/time-record-ttt.exp           |  112 +++++++
 testsuite/ltrace.minor/time-record.c                 |   23 +
 testsuite/ltrace.minor/trace-clone.c                 |   43 ++
 testsuite/ltrace.minor/trace-clone.exp               |   44 +++
 testsuite/ltrace.minor/trace-fork.c                  |   33 ++
 testsuite/ltrace.minor/trace-fork.exp                |   40 ++
 testsuite/ltrace.torture/Makefile.in                 |   34 ++
 testsuite/ltrace.torture/signals.c                   |   44 +++
 testsuite/ltrace.torture/signals.exp                 |   37 ++
 testsuite/run-my-tests.sh                            |   43 ++
 44 files changed, 2382 insertions(+), 6 deletions(-)

--- NEW FILE ltrace-testsuite.patch ---
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 34)
+++ Makefile.in	(revision 35)
@@ -40,7 +40,11 @@ ltrace:		sysdeps/sysdep.o $(OBJ)
 sysdeps/sysdep.o: dummy
 		$(MAKE) -C sysdeps/$(OS)
 
-clean:
+clean-deja:
+		$(RM) testrun.log testrun.sum
+		cd testsuite; make clean
+
+clean:		clean-deja
 		$(MAKE) -C sysdeps/$(OS) clean
 		rm -f ltrace $(OBJ)
 		rm -f *~ *.bak a.out core KK
@@ -48,6 +52,7 @@ clean:
 distclean:	clean
 		rm -f autogen.sh config.cache config.status config.log config.h Makefile configure.scan
 		rm -rf autom4te.cache
+		cd testsuite; make distclean
 
 realclean:	distclean
 		rm configure config.h.in
@@ -75,6 +80,9 @@ install:	ltrace
 		$(INSTALL_FILE) COPYING README TODO BUGS ChangeLog $(DESTDIR)$(docdir)
 		$(INSTALL_FILE) ltrace.1 $(DESTDIR)$(mandir)/man1
 
+check:
+		cd testsuite; $(MAKE) check
+
 dummy:
 
 .PHONY:		all clean distclean dist install dummy
Index: configure.ac
===================================================================
--- configure.ac	(revision 34)
+++ configure.ac	(revision 35)
@@ -84,4 +84,7 @@ dnl are built without LFS.  It is import
 dnl of libelf and ltrace matches.
 AC_SYS_LARGEFILE
 fi
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile testsuite/Makefile \
+	  testsuite/ltrace.main/Makefile testsuite/ltrace.minor/Makefile \
+	  testsuite/ltrace.torture/Makefile )
+
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34)
+++ ChangeLog	(revision 35)
@@ -1,3 +1,56 @@
+2006-03=13  Paul Gilliam <pgilliam at us.ibm.com>
+
+	* Makefile.in: Add targets to support testsuite, including 'check'.
+	* confiure.ac: Add testsuite Makefile's to AC_OUTPUT.
+	* testsuite: Add dejagnu base testsuite.
+	* testsuite/config/: Add
+	* testsuite/config/unix.exp: Add
+	* testsuite/lib/: Add
+	* testsuite/lib/compiler.c: Add
+	* testsuite/lib/compiler.cc: Add
+	* testsuite/lib/ltrace.exp: Add
+	* testsuite/ltrace.main/: Add
+	* testsuite/ltrace.main/main.c: Add
+	* testsuite/ltrace.main/main.exp: Add
+	* testsuite/ltrace.main/main-internal-1.c: Add
+	* testsuite/ltrace.main/main-internal.c: Add
+	* testsuite/ltrace.main/main-internal.exp: Add
+	* testsuite/ltrace.main/main-lib.c: Add
+	* testsuite/ltrace.main/Makefile.in: Add
+	* testsuite/ltrace.main/signals.c: Add
+	* testsuite/ltrace.main/signals.exp: Add
+	* testsuite/ltrace.main/system_calls.c: Add
+	* testsuite/ltrace.main/system_calls.exp: Add
+	* testsuite/ltrace.minor/: Add
+	* testsuite/ltrace.minor/attach-process.c: Add
+	* testsuite/ltrace.minor/attach-process.exp: Add
+	* testsuite/ltrace.minor/count-record.c: Add
+	* testsuite/ltrace.minor/count-record.exp: Add
+	* testsuite/ltrace.minor/demangle.cpp: Add
+	* testsuite/ltrace.minor/demangle.exp: Add
+	* testsuite/ltrace.minor/demangle.h: Add
+	* testsuite/ltrace.minor/demangle-lib.cpp: Add
+	* testsuite/ltrace.minor/Makefile.in: Add
+	* testsuite/ltrace.minor/print-instruction-pointer.c: Add
+	* testsuite/ltrace.minor/print-instruction-pointer.exp: Add
+	* testsuite/ltrace.minor/time-record.c: Add
+	* testsuite/ltrace.minor/time-record-T.exp: Add
+	* testsuite/ltrace.minor/time-record-tt.exp: Add
+	* testsuite/ltrace.minor/time-record-ttt.exp: Add
+	* testsuite/ltrace.minor/trace-clone.c: Add
+	* testsuite/ltrace.minor/trace-clone.exp: Add
+	* testsuite/ltrace.minor/trace-fork.c: Add
+	* testsuite/ltrace.minor/trace-fork.exp: Add
+	* testsuite/ltrace.torture/: Add
+	* testsuite/ltrace.torture/Makefile.in: Add
+	* testsuite/ltrace.torture/signals.c: Add
+	* testsuite/ltrace.torture/signals.exp: Add
+	* testsuite/Makefile.in: Add
+	* testsuite/README: Add
+	* testsuite/run-my-tests.sh: Add
+	* testsuite/so_test1/: Add
+	* testsuite/so_test2/: Add
+
 2006-03-13  Paul Gilliam <pgilliam at us.ibm.com>
 
 	* options.h: New structure for opt_x list elements, now with 'found'.
Index: testsuite/run-my-tests.sh
===================================================================
--- testsuite/run-my-tests.sh	(revision 0)
+++ testsuite/run-my-tests.sh	(revision 35)
@@ -0,0 +1,43 @@
+#! /bin/sh
+bitmode=""
+
+# This shell script is used to run the ltrace test suite.  It is possible to
+# run it via 'make check' using RUNTESTFLAGS.  This script just makes it easy.
+
+function usage
+{
+  echo usage: `basename $0` '-m32|-m64 [<tool> | ""] [<test.exp>]'
+}
+
+# The first argument is not optional: it must either be -m32 or -m64.  If the
+# second argument is used, it specifies the file name of the ltrace to be
+# tested.  The third argument specifies a particular test case to run.  If
+# the third argument is omitted, then all test cases are run.  If you wish to
+# use the third argument, but not the second, specify the second as "".
+
+# there is a secret argument: if the name of this script is 'test', then
+# the --verbose argument is added to RUNTESTFLAGS.
+
+if [ x"$1" == x -o x"$1" != x-m32 -a x"$1" != x-m64 ]; then
+  usage
+  exit 1
+fi
+
+flags=''
+
+if [ `basename $0` == test ]; then
+  flags="--verbose "
+fi
+
+if [ x"$2" != x ]; then
+  flags="${flags}--tool_exec=$2 "
+fi
+
+flags="${flags}CFLAGS_FOR_TARGET=$1"
+
+if [ x"$3" != x ]; then
+  flags="$flags $3"
+fi
+
+set -o xtrace
+make check RUNTESTFLAGS="$flags"

Property changes on: testsuite/run-my-tests.sh
___________________________________________________________________
Name: svn:executable
   + *

Index: testsuite/Makefile.in
===================================================================
--- testsuite/Makefile.in	(revision 0)
+++ testsuite/Makefile.in	(revision 35)
@@ -0,0 +1,72 @@
+# Copyright (C) 1992 - 2001 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 1, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+
+AUTOMAKE_OPTIONS = dejagnu
+EXPECT 	= 	expect
+RUNTEST = 	runtest
+CC	=	@CC@
+
+srcdir = 	.
+RUNTESTDEFAULTFLAGS = --srcdir $(srcdir)
+
+CLEANFILES = *.log *.sum site.bak setval.tmp site.exp
+
+SUBDIRS = ltrace.main ltrace.minor ltrace.torture
+
+#all: all-recursive
+
[...2267 lines suppressed...]
+  sleep(1);
+}
+
+int 
+main ()
+{
+  pid_t pid;
+  pid = fork ();
+  
+  if (pid == -1)
+    printf("fork failed!\n");
+  else if (pid == 0)
+    child();
+  else
+    {
+      printf("My child pid is %d\n",pid);
+      wait(); 
+    }
+  return 0;
+}
Index: testsuite/ltrace.torture/signals.c
===================================================================
--- testsuite/ltrace.torture/signals.c	(revision 0)
+++ testsuite/ltrace.torture/signals.c	(revision 35)
@@ -0,0 +1,44 @@
+/* Ltrace Test : signals.c.
+   Objectives  : Verify that ltrace can trace user defined signal.
+   This file was written by Yao Qi <qiyao at cn.ibm.com>. */
+
+#include<stdio.h>
+#include<signal.h>
+#include <sys/types.h>
+
+#define LOOP	20
+
+void 
+handler(int signum,siginfo_t *info,void *act)
+{
+}
+
+int 
+main ()
+{
+  struct sigaction act;	
+  union sigval mysigval;
+  int i;
+  int sig;
+  pid_t pid;
+  
+  mysigval.sival_int=0;
+  sig = 10;
+  pid=getpid();
+  
+  sigemptyset(&act.sa_mask);
+  act.sa_sigaction=handler;
+  act.sa_flags=SA_SIGINFO;
+  
+  if(sigaction(sig,&act,NULL) < 0)
+    {
+      printf("install sigal error\n");
+    }
+  
+  for(i=0; i< LOOP; i++)
+    {
+      usleep(100);
+      sigqueue(pid,sig,mysigval);
+    }
+  return 0;
+}
Index: testsuite/ltrace.torture/Makefile.in
===================================================================
--- testsuite/ltrace.torture/Makefile.in	(revision 0)
+++ testsuite/ltrace.torture/Makefile.in	(revision 35)
@@ -0,0 +1,34 @@
+# Copyright (C) 1992 - 2001 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 1, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+
+CLEANFILES = *.log *.sum site.bak setval.tmp site.exp
+
+.SUFFIXES:	
+clean:
+	-rm -f signals 
+	-rm -f *.o *.so 
+	-rm -f *.ltrace
+	-rm -f $(CLEANFILES)
+distclean: clean
+	-rm -f Makefile
+
+
+.PHONY: $(RECURSIVE_TARGETS) check  clean distclean realclean
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Index: testsuite/ltrace.torture/signals.exp
===================================================================
--- testsuite/ltrace.torture/signals.exp	(revision 0)
+++ testsuite/ltrace.torture/signals.exp	(revision 35)
@@ -0,0 +1,37 @@
+# This file was written by Yao Qi <qiyao at cn.ibm.com>.
+
+set testfile "signals"
+set srcfile ${testfile}.c
+set binfile ${testfile}
+
+
+verbose "compiling source file now....."
+# Build the shared libraries this test case needs.
+if  { [ ltrace_compile "${srcdir}/${subdir}/${testfile}.c" "${srcdir}/${subdir}/${binfile}" executable {debug} ] != "" } {
+     send_user "Testcase compile failed, so all tests in this file will automatically fail\n."
+}
+
+# Set options for ltrace.
+ltrace_options "-L"
+
+# Run PUT for ltarce.
+set exec_output [ltrace_runtest $srcdir/$subdir $srcdir/$subdir/$binfile]
+
+# Check the output of this program.
+verbose "ltrace runtest output: $exec_output\n"
+if [regexp {ELF from incompatible architecture} $exec_output] {
+	fail "32-bit ltrace can not perform on 64-bit PUTs and rebuild ltrace in 64 bit mode!"
+	return
+} elseif [ regexp {Couldn't get .hash data} $exec_output ] {
+	fail "Couldn't get .hash data!"
+	return
+}
+
+# Extract LOOP from source file.
+set fd [ open $srcdir/$subdir/$srcfile r]
+while { [gets $fd line] >= 0 } {
+         regexp {define LOOP.*([0-9]+)} $line match count
+}
+set pattern "SIGUSR1"
+ltrace_verify_output ${srcdir}/${subdir}/${testfile}.ltrace $pattern $count
+
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35)
+++ ChangeLog	(revision 36)
@@ -1,3 +1,8 @@
+2006-03-16  Ian Wienand  <ianw at gelato.unsw.edu.au>
+
+	* testsuite/ltrace.minor/trace-clone.c: use __clone2() for IA64
+	clone test
+
 2006-03=13  Paul Gilliam <pgilliam at us.ibm.com>
 
 	* Makefile.in: Add targets to support testsuite, including 'check'.
Index: testsuite/ltrace.minor/trace-clone.c
===================================================================
--- testsuite/ltrace.minor/trace-clone.c	(revision 35)
+++ testsuite/ltrace.minor/trace-clone.c	(revision 36)
@@ -16,12 +16,18 @@ int child ()
 
 typedef int (* myfunc)();
 
+#define STACK_SIZE 1024
+
 int main ()
 {
   pid_t pid;
-  static char stack[1024];
-  
-  if ((pid = clone((myfunc)&child, stack,CLONE_FS, NULL )) < 0)
+  static char stack[STACK_SIZE];
+#ifdef __ia64__
+  pid = __clone2((myfunc)&child, stack, STACK_SIZE, CLONE_FS, NULL);
+#else
+  pid = clone((myfunc)&child, stack,CLONE_FS, NULL );
+#endif
+  if (pid < 0)
     {
       perror("clone called failed");
       exit (1);
--- configure	2006-04-07 14:20:01.000000000 +0200
+++ configure-pm	2006-04-07 14:19:53.000000000 +0200
@@ -4195,7 +4195,7 @@
 fi
 
 fi
-          ac_config_files="$ac_config_files Makefile"
+          ac_config_files="$ac_config_files Makefile testsuite/Makefile testsuite/ltrace.minor/Makefile testsuite/ltrace.torture/Makefile testsuite/ltrace.main/Makefile"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Nov 2004 23:20:08 -0000	1.6
+++ .cvsignore	7 Apr 2006 12:47:45 -0000	1.7
@@ -1 +1 @@
-ltrace_0.3.36.orig.tar.gz
+ltrace_0.4.orig.tar.gz


Index: ltrace.spec
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ltrace.spec	8 Mar 2006 14:36:35 -0000	1.25
+++ ltrace.spec	7 Apr 2006 12:47:45 -0000	1.26
@@ -1,20 +1,15 @@
 Summary: Tracks runtime library calls from dynamically linked executables.
 Name: ltrace
-Version: 0.3.36
-Release: 4.3
+Version: 0.4
+Release: 1
 Source: ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_%{version}.orig.tar.gz
-Patch1: ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.3.36-2.diff.gz
-Patch2: ltrace-ppc64.patch
-Patch3: ltrace-ppc64-2.patch
-Patch4: ltrace-s390x.patch
-Patch5: ltrace-syscallent-update.patch
-Patch6: ltrace-fixes.patch
-Patch7: ltrace-ia64.patch
+Patch0: ltrace-opt_x.patch
+Patch1: ltrace-testsuite.patch
 License: GPL
 Group: Development/Debuggers
 ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 s390 s390x alpha sparc
 Prefix: %{_prefix}
-BuildRoot: /var/tmp/%{name}-root
+Buildroot: %{_tmppath}/%{name}-root
 BuildRequires: elfutils-libelf-devel
 
 %description
@@ -29,13 +24,8 @@
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+%patch0 -p0
+%patch1 -p0
 sed -i -e 's/-o root -g root//' Makefile.in
 
 %build
@@ -44,9 +34,12 @@
 make
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
-rm -f ChangeLog; mv -f debian/changelog ChangeLog
-rm -rf $RPM_BUILD_ROOT/%{_prefix}/doc
+make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} docdir=%{_docdir}/ltrace-%{version}/ install
+
+%check
+echo ====================TESTING=========================
+make check
+echo ====================TESTING END=====================
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -59,6 +52,12 @@
 %config /etc/ltrace.conf
 
 %changelog
+* Fri Apr  7 2006 Petr Machata <pmachata at redhat.com> - 0.4-1
+- Upstream 0.4
+- opt_x patch: New structure for opt_x list elements, now with
+  'found'.  Using it in options.c, elf.c.
+- testsuite patch: Automated testsuite for ltrace.
+
 * Wed Mar  1 2006 Petr Machata  <pmachata at redhat.com> - 0.3.36-4.3
 - include %{ix86} to ExclusiveArch, instead of mere i386
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	17 Nov 2004 23:20:08 -0000	1.6
+++ sources	7 Apr 2006 12:47:45 -0000	1.7
@@ -1 +1 @@
-674c9a7ddbe2a4ec10564dbb09b2261a  ltrace_0.3.36.orig.tar.gz
+8dbadad76ee360c2ed2caa915f5b1c8e  ltrace_0.4.orig.tar.gz


--- ltrace-fixes.patch DELETED ---


--- ltrace-ia64.patch DELETED ---


--- ltrace-ppc64-2.patch DELETED ---


--- ltrace-ppc64.patch DELETED ---


--- ltrace-s390x.patch DELETED ---


--- ltrace-syscallent-update.patch DELETED ---




More information about the fedora-cvs-commits mailing list