Sync strace.spec and debian/ with packages
* debian/changelog: Sync with 4.8-1.1.
* debian/control: Likewise.
* debian/rules: Likewise.
* strace.spec: Sync with 4.8-5.
diff --git a/debian/changelog b/debian/changelog
index 39bb56f..1b489b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+strace (4.8-1.1) unstable; urgency=low
+
+ * NMU
+ * Uploading 4.8 to unstable to fix long-standing bugs that have been
+ fixed for ages in experimental only.
+ * enable arm64 build, Closes: #749956
+ * enable x32 build, Closes: #727018
+ * lintian-inspired fixes:
+ + add build-arch and build-indep targets in debian/rules
+ + update standards-version to 3.9.5
+ + remove ancient changelog entries causing syntax checker errors
+ + add hardening using buildflags.mk
+ + trivial changes to Description: fields
+
+ -- Steve McIntyre <93sam@debian.org> Thu, 10 Jul 2014 14:22:18 +0000
+
strace (4.8-1) experimental; urgency=low
* New upstream version.
@@ -528,7 +544,7 @@
-- Wichert Akkerman <wakkerma@debian.org> Thu, 27 Jan 2000 03:22:55 +0100
-strace (4.2-1) frozen unstable; urgency=low
+strace (4.2-1) frozen unstable; urgency=low
* New upstream version:
+ Builds correctly on glibc2.0 again, Closes: Bug# 51648
@@ -713,14 +729,14 @@
-- Wichert Akkerman <wakkerma@debian.org> Mon, 6 Oct 1997 15:42:25 +0200
-strace (3.1-11) unstable; urgency=LOW
+strace (3.1-11) unstable; urgency=low
* Ported to libc6 / glibc2 (Bug# 11729)
* Compress manpage
-- Wichert Akkerman <wakkerma@wi.leidenuniv.nl> Fri, 1 Aug 1997 00:13:38 +02
-strace (3.1-10) unstable; urgency=LOW
+strace (3.1-10) unstable; urgency=low
* Install upstream changelog
* Added dependencies to control file for libc
@@ -728,7 +744,7 @@
-- Wichert Akkerman <wakkerma@debian.org> Fri, 11 Jul 1997 12:26:12 +0200
-strace (3.1-9) stable; urgency=LOW
+strace (3.1-9) stable; urgency=low
* Fixed bug with hanging children. Patch by Matthias Urlichs
* Added some more constants to net.c.
@@ -736,25 +752,26 @@
-- Wichert Akkerman <wakkerma@debian.org> Mon, 21 Apr 1997 11:59:45 +0200
-strace (3.1-8) frozen unstable; urgency=LOW
+strace (3.1-8) frozen unstable; urgency=low
* Added detection of ROSE networking
-- Wichert Akkerman <wakkerma@wi.leidenuniv.nl> Tue, 12 Nov 1996 22:21:22 +0100
-strace (3.1-7) stable; urgency=LOW
+strace (3.1-7) stable; urgency=low
* Install manpage with correct mode (0644) (Bug#4813)
* Renamed debian changelog to changelog.Debian
-- Wichert Akkerman <wakkerma@wi.leidenuniv.nl> Sat, 26 Oct 1996 18:15:41 +0200
-strace (3.1-6) stable; urgency=LOW
+strace (3.1-6) stable; urgency=low
* Small patch for compilation on kernels 2.1.0 and later (see signal.c)
-- Wichert Akkerman <wakkerma@wi.leidenuniv.nl> Fri, 18 Oct 1996 00:28:47 +0200
-strace (3.1-5) stable unstable; urgency=LOW
+
+strace (3.1-5) stable unstable; urgency=low
* Moved to new packagingformat
* Fixed umoven bug (Bug# 4523)
@@ -762,21 +779,20 @@
-- Wichert Akkerman <wakkerma@wi.leidenuniv.nl> Sat, 23 Sep 1996 23:33:58 +0200
-strace (3.1-4) unstable; urgency=LOW
+strace (3.1-4) unstable; urgency=low
* Fixed changestemplate
-- Wichert Akkerman <wakkerma@wi.leidenuniv.nl>, Thu Sep 12 14:59:44 MET DST 1996
-
-strace (3.1-3) unstable; priority=LOW
+strace (3.1-3) unstable; urgency=low
* Revamped debian files
-- Wichert Akkerman <wakkerma@wi.leidenuniv.nl>, Thu Jul 11 20:19:11 MET DST 1996
-strace (3.1-2) unstable; priority=LOW
+strace (3.1-2) unstable; urgency=low
* Added some #ifdef's around IPX stuff to make it compilable on non-Linux
systems.
* changed debian.control and debian.rules to conform to new debian naming
@@ -785,8 +801,7 @@
-- Wichert Akkerman <wakkerma@wi.leidenuniv.nl>
-
-strace (3.1-1) unstable; priority=LOW
+strace (3.1-1) unstable; urgency=low
* Moved to new upstream version
* added more protocol families to domains
diff --git a/debian/control b/debian/control
index a7e36b1..3673d2e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,13 @@
Section: utils
Priority: optional
Build-Depends: libc6-dev (>= 2.2.2) [!alpha !ia64], libc6.1-dev (>= 2.2.2) [alpha ia64], gcc-multilib [i386 powerpc s390 sparc], debhelper (>= 7.0.0)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.5
Homepage: http://sourceforge.net/projects/strace/
Package: strace
Architecture: alpha amd64 arm64 armeb armel armhf hppa i386 ia64 m68k mips mipsel or1k powerpc powerpcspe ppc64 s390 s390x sh4 sparc sparc64 x32
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: A system call tracer
+Description: System call tracer
strace is a system call tracer, i.e. a debugging tool which prints out
a trace of all the system calls made by a another process/program.
The program to be traced need not be recompiled for this, so you can
@@ -23,7 +23,7 @@
Architecture: i386 powerpc s390 sparc
Priority: extra
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: A system call tracer for 64bit binaries
+Description: System call tracer for 64bit binaries
strace is a system call tracer, i.e. a debugging tool which prints out
a trace of all the system calls made by a another process/program.
The program to be traced need not be recompiled for this, so you can
@@ -42,7 +42,7 @@
Priority: extra
Architecture: alpha amd64 arm64 armeb armel armhf hppa i386 ia64 m68k mips mipsel or1k powerpc powerpcspe ppc64 s390 sh4 sparc sparc64 x32
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: A system call tracer
+Description: System call tracer
strace is a system call tracer, i.e. a debugging tool which prints out
a trace of all the system calls made by a another process/program.
The program to be traced need not be recompiled for this, so you can
diff --git a/debian/rules b/debian/rules
index 52220fa..912b410 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,12 @@
CONFIG_OPTS = --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
endif
-all build: build-stamp $(extra_build_targets)
+all: build
+
+build: build-arch build-indep
+
+build-arch: build-stamp $(extra_build_targets)
+build-indep: build-stamp $(extra_build_targets)
%-stamp: %/Makefile
$(MAKE) -C $*
diff --git a/strace.spec b/strace.spec
index 817f1ae..643b4c1 100644
--- a/strace.spec
+++ b/strace.spec
@@ -1,12 +1,16 @@
Summary: Tracks and displays system calls associated with a running process
Name: strace
Version: 4.8
-Release: 1%{?dist}
+Release: 5%{?dist}
License: BSD
Group: Development/Debuggers
+
URL: http://sourceforge.net/projects/strace/
Source: http://downloads.sourceforge.net/strace/%{name}-%{version}.tar.xz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: strace-fix-ftbfs.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1122323
+# http://sourceforge.net/p/strace/code/ci/9afc2ee682d2f9fd3ad938756c841d7f0eed5f21/
+Patch1: strace-4.8-ppc64.patch
BuildRequires: libacl-devel, libaio-devel, time
@@ -43,13 +47,14 @@
%prep
%setup -q
+%patch0 -p1 -b .ftbfs
+%patch1 -p1 -b .ppc64
%build
%configure
make %{?_smp_mflags}
%install
-rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
# remove unpackaged files from the buildroot
@@ -69,11 +74,7 @@
%check
make check
-%clean
-rm -rf %{buildroot}
-
%files
-%defattr(-,root,root)
%doc CREDITS ChangeLog ChangeLog-CVS COPYING NEWS README
%{_bindir}/strace
%{_bindir}/strace-log-merge
@@ -81,11 +82,22 @@
%ifarch %{strace64_arches}
%files -n strace64
-%defattr(-,root,root)
%{_bindir}/strace64
%endif
%changelog
+* Fri Jul 25 2014 Dan Horák <dan[at]danny.cz> - 4.8-5
+- update for ppc64
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Fri Dec 6 2013 Peter Robinson <pbrobinson@fedoraproject.org> 4.8-3
+- Fix FTBFS
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
* Mon Jun 03 2013 Dmitry V. Levin <ldv@altlinux.org> - 4.8-1
- New upstream release:
+ fixed ERESTARTNOINTR leaking to userspace on ancient kernels (#659382);