[packages/ltrace] - updated to 0.7.3 - removed obsolete Makefile.in,debian,poor-mans-autoconf,ptrace-headers patches

qboosh qboosh at pld-linux.org
Sun Jan 26 21:42:47 CET 2014


commit ade75dc4702a486c4453a7fc3636ed8d4f9df1f3
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jan 26 21:44:10 2014 +0100

    - updated to 0.7.3
    - removed obsolete Makefile.in,debian,poor-mans-autoconf,ptrace-headers patches

 ltrace-Makefile.in.patch | 19 ----------
 ltrace-debian.patch      | 40 --------------------
 ltrace.spec              | 31 ++++++---------
 poor-mans-autoconf.patch | 98 ------------------------------------------------
 ptrace-headers.patch     | 36 ------------------
 5 files changed, 11 insertions(+), 213 deletions(-)
---
diff --git a/ltrace.spec b/ltrace.spec
index b46c2a4..3658bd6 100644
--- a/ltrace.spec
+++ b/ltrace.spec
@@ -5,23 +5,21 @@ Summary(pt_BR.UTF-8):	Mostra informações sobre as chamadas à funções de bib
 Summary(ru.UTF-8):	Выводит трассу библиотечных и системных вызовов программы
 Summary(uk.UTF-8):	Видає трасу бібліотечних та системних викликів програми
 Name:		ltrace
-Version:	0.5.3
+Version:	0.7.3
 Release:	1
 License:	GPL v2+
 Group:		Development/Debuggers
-Source0:	ftp://ftp.debian.org/debian/pool/main/l/ltrace/%{name}_%{version}.orig.tar.gz
-# Source0-md5:	3fa7fe715ab879db08bd06d1d59fd90f
-Patch0:		%{name}-Makefile.in.patch
-Patch1:		%{name}-debian.patch
-Patch2:		poor-mans-autoconf.patch
-Patch3:		ptrace-headers.patch
-Patch4:		%{name}-calls.patch
+Source0:	ftp://ftp.debian.org/debian/pool/main/l/ltrace/%{name}_%{version}.orig.tar.bz2
+# Source0-md5:	b3dd199af8f18637f7d4ef97fdfb9d14
+Patch0:		%{name}-calls.patch
 URL:		http://ltrace.alioth.debian.org/
 BuildRequires:	binutils-devel
 BuildRequires:	elfutils-devel
 # for libsupc++ (used for symbols demangling)
 BuildRequires:	gcc-c++
-ExclusiveArch:	alpha armv4b armv4l %{ix86} ia64 m68k ppc s390 sparc %{x8664}
+BuildRequires:	libselinux-devel
+BuildRequires:	libunwind-devel
+ExclusiveArch:	alpha armv4b armv4l %{ix86} ia64 m68k mips ppc ppc64 s390 s390x sparc sparcv9 sparc64 %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -73,17 +71,9 @@ Ltrace - це програма, яка запускає вказану прог
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
-CC="%{__cc}" \
-CFLAGS="%{rpmcflags}" \
-./configure \
-	--prefix=%{_prefix} \
-	--sysconfdir=%{_sysconfdir} \
+%configure
 
 %{__make}
 
@@ -98,7 +88,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc BUGS ChangeLog README TODO
+%doc CREDITS NEWS README TODO
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ltrace.conf
 %attr(755,root,root) %{_bindir}/ltrace
-%{_mandir}/man1/*
+%{_mandir}/man1/ltrace.1*
+%{_mandir}/man5/ltrace.conf.5*
diff --git a/ltrace-Makefile.in.patch b/ltrace-Makefile.in.patch
deleted file mode 100644
index 8693b3a..0000000
--- a/ltrace-Makefile.in.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ltrace/Makefile.in.orig	2009-05-26 09:18:33.370743514 +0200
-+++ ltrace/Makefile.in	2009-05-26 09:20:50.924001735 +0200
-@@ -9,7 +9,7 @@
- 
- prefix		= @prefix@
- sysconfdir	= @sysconfdir@
--bindir		= $(prefix)/bin
-+bindir		= @bindir@
- mandir		= @mandir@
- docdir		= $(prefix)/share/doc/ltrace
- 
-@@ -61,7 +61,6 @@
- 		$(INSTALL_DIR) $(DESTDIR)$(sysconfdir)
- 		$(INSTALL_PROGRAM) ltrace $(DESTDIR)$(bindir)
- 		$(INSTALL_FILE) etc/ltrace.conf $(DESTDIR)$(sysconfdir)
--		$(INSTALL_FILE) COPYING README TODO BUGS ChangeLog $(DESTDIR)$(docdir)
- 		$(INSTALL_FILE) ltrace.1 $(DESTDIR)$(mandir)/man1
- 
- check:
diff --git a/ltrace-debian.patch b/ltrace-debian.patch
deleted file mode 100644
index 8366508..0000000
--- a/ltrace-debian.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- ltrace-0.5.orig/options.h
-+++ ltrace-0.5/options.h
-@@ -20,6 +20,7 @@
- extern int opt_C;		/* Demanglelow-level symbol names into user-level names */
- extern int opt_n;		/* indent trace output according to program flow */
- extern int opt_T;		/* show the time spent inside each call */
-+extern int opt_o;		/* output to a specific file */
- 
- struct opt_p_t {
- 	pid_t pid;
---- ltrace-0.5.orig/options.c
-+++ ltrace-0.5/options.c
-@@ -42,6 +42,7 @@
- #endif
- int opt_n = 0;			/* indent trace output according to program flow */
- int opt_T = 0;			/* show the time spent inside each call */
-+int opt_o = 0;			/* output to a specific file */
- 
- /* List of pids given to option -p: */
- struct opt_p_t *opt_p = NULL;	/* attach to process with a given pid */
-@@ -274,6 +275,7 @@
- 			options.indent = atoi(optarg);
- 			break;
- 		case 'o':
-+			opt_o++;
- 			options.output = fopen(optarg, "w");
- 			if (!options.output) {
- 				fprintf(stderr,
---- ltrace-0.5.orig/libltrace.c
-+++ ltrace-0.5/libltrace.c
-@@ -54,6 +54,9 @@
- {
- 	exiting = 1;
- 	debug(1, "Received interrupt signal; exiting...");
-+	if (opt_o) {
-+		fclose(options.output);
-+	}
- 	signal(SIGINT, SIG_IGN);
- 	signal(SIGTERM, SIG_IGN);
- 	signal(SIGALRM, signal_alarm);
diff --git a/poor-mans-autoconf.patch b/poor-mans-autoconf.patch
deleted file mode 100644
index 8082993..0000000
--- a/poor-mans-autoconf.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-yay for Juan Cespedes for killing autoconf, making configure no longer portable
-
-http://git.debian.org/?p=collab-maint/ltrace.git;a=commitdiff;h=f670eea50e959eeb9da53d70cad8d43c19494ef0
-
---- ltrace-0.5.3/Makefile.in~	2009-09-29 18:22:49.000000000 +0300
-+++ ltrace-0.5.3/Makefile.in	2009-09-29 18:40:52.608084066 +0300
-@@ -15,7 +15,7 @@
- 
- CC		=	@CC@
- CFLAGS		=	-Wall @CFLAGS@
--CPPFLAGS	=	-iquote $(TOPDIR) -iquote $(TOPDIR)/sysdeps/$(OS) -DSYSCONFDIR=\"$(sysconfdir)\" @CPPFLAGS@
-+CPPFLAGS	=	@iquote@$(TOPDIR) @iquote@$(TOPDIR)/sysdeps/$(OS) @iquoteend@ -DSYSCONFDIR=\"$(sysconfdir)\" @CPPFLAGS@
- LDFLAGS		=	@LDFLAGS@
- LIBS		=	@LIBS@
- 
---- ltrace-0.5.3/configure	2009-09-29 18:49:16.363340062 +0300
-+++ ltrace-0.5.3/configure	2009-09-29 18:52:14.599921203 +0300
-@@ -6,6 +6,12 @@
-   exit 1
- fi
- 
-+CC=${CC:-gcc}
-+CPPFLAGS=' -I /usr/include/libelf'
-+CFLAGS=${CFLAGS:-'-g -O2'}
-+LIBS='-lelf -lsupc++ -liberty '
-+INSTALL='/usr/bin/install -c'
-+
- echo -n "checking package name... "
- PACKAGE_NAME='ltrace'
- echo $PACKAGE_NAME
-@@ -30,7 +36,7 @@
-   return cplus_demangle();
- }
- EOF
--if gcc conftest.c -liberty 2>/dev/null
-+if $CC $CFLAGS conftest.c -liberty 2>/dev/null
- then
-   HAVE_LIBIBERTY=1
-   echo "yes"
-@@ -48,7 +54,7 @@
-   return __cxa_demangle();
- }
- EOF
--if gcc conftest.c -lsupc++ 2>/dev/null
-+if $CC $CFLAGS conftest.c -lsupc++ 2>/dev/null
- then
-   HAVE_LIBSUPC__=1
-   echo "yes"
-@@ -67,7 +73,7 @@
-   return 0;
- }
- EOF
--if gcc conftest.c 2>/dev/null
-+if $CC $CFLAGS conftest.c 2>/dev/null
- then
-   HAVE_ELF_C_READ_MMAP=1
-   echo "yes"
-@@ -77,13 +83,24 @@
- fi
- rm -f conftest.c a.out
- 
--CC=gcc
--CPPFLAGS=' -I /usr/include/libelf'
--CFLAGS='-g -O2'
--LIBS='-lelf -lsupc++ -liberty '
--INSTALL='/usr/bin/install -c'
--iquote='-iquote '
--iquoteend=''
-+# -iquote
-+echo -n "checking whether compiler accepts -iquote dir... "
-+cat > conftest.c << EOF
-+int main () {
-+  return 0;
-+}
-+EOF
-+if $CC $CFLAGS -iquote . conftest.c 2>/dev/null
-+then
-+  iquote="-iquote "
-+  iquoteend=""
-+  echo "yes"
-+else
-+  iquote="-I "
-+  iquoteend="-I-"
-+  echo "no"
-+fi
-+rm -f conftest.c a.out
- 
- prefix=/usr/local
- sysconfdir='${prefix}/etc'
-@@ -113,7 +130,7 @@
- #
- # Makefile.in -> Makefile
- #
--x_subst_vars='PACKAGE_VERSION HOST_OS INSTALL CC CPPFLAGS CFLAGS LDFLAGS LIBS iquote iquoteend prefix sysconfdir mandir docdir'
-+x_subst_vars='PACKAGE_VERSION HOST_OS INSTALL CC CPPFLAGS CFLAGS LDFLAGS LIBS iquote iquoteend prefix sysconfdir bindir mandir docdir'
- 
- for i in $x_subst_vars
- do
diff --git a/ptrace-headers.patch b/ptrace-headers.patch
deleted file mode 100644
index 2c4be88..0000000
--- a/ptrace-headers.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- ltrace-0.5.3/sysdeps/linux-gnu/events.c~	2009-07-25 18:13:02.000000000 +0300
-+++ ltrace-0.5.3/sysdeps/linux-gnu/events.c	2009-09-29 19:06:47.179886244 +0300
-@@ -11,6 +11,33 @@
- 
- #include "common.h"
- 
-+/* If the system headers did not provide the constants, hard-code the normal
-+   values.  */
-+#ifndef PTRACE_EVENT_FORK
-+
-+#define PTRACE_OLDSETOPTIONS    21
-+#define PTRACE_SETOPTIONS       0x4200
-+#define PTRACE_GETEVENTMSG      0x4201
-+
-+/* options set using PTRACE_SETOPTIONS */
-+#define PTRACE_O_TRACESYSGOOD   0x00000001
-+#define PTRACE_O_TRACEFORK      0x00000002
-+#define PTRACE_O_TRACEVFORK     0x00000004
-+#define PTRACE_O_TRACECLONE     0x00000008
-+#define PTRACE_O_TRACEEXEC      0x00000010
-+#define PTRACE_O_TRACEVFORKDONE 0x00000020
-+#define PTRACE_O_TRACEEXIT      0x00000040
-+
-+/* Wait extended result codes for the above trace options.  */
-+#define PTRACE_EVENT_FORK       1
-+#define PTRACE_EVENT_VFORK      2
-+#define PTRACE_EVENT_CLONE      3
-+#define PTRACE_EVENT_EXEC       4
-+#define PTRACE_EVENT_VFORK_DONE 5
-+#define PTRACE_EVENT_EXIT       6
-+
-+#endif /* PTRACE_EVENT_FORK */
-+
- static Event event;
- 
- Event *
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ltrace.git/commitdiff/ade75dc4702a486c4453a7fc3636ed8d4f9df1f3



More information about the pld-cvs-commit mailing list