[monotone] Update to 1.1.
Thomas Moschny
thm at fedoraproject.org
Sat Jul 19 20:16:05 UTC 2014
commit 682939d04c113963dc6ed658520c7bf56f4001c7
Author: Thomas Moschny <thm at fedoraproject.org>
Date: Sat Jul 19 19:19:17 2014 +0200
Update to 1.1.
- Remove patches and fixes not needed anymore.
- Modernize spec file.
.gitignore | 1 +
monotone-1.0-botan-1.10.patch | 944 ---------------------------
monotone-1.0-disable-xdelta-test.patch | 41 --
monotone-1.0-file_handle.patch | 155 -----
monotone-1.0-fix-bash_completion-test.patch | 24 -
monotone-1.0-fix-diff_patch_drop-test.patch | 11 -
monotone-1.0-fix-help.patch | 21 -
monotone-1.0-fix-texinfo.patch | 623 ------------------
monotone-1.0-lua-5.2.patch | 752 ---------------------
monotone-1.0-pcre.patch | 11 -
monotone-1.0-stacktrace-on-crash.patch | 63 ++
monotone.spec | 57 +--
sources | 2 +-
13 files changed, 76 insertions(+), 2629 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 86e8bd6..8cc96f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ monotone-0.48.tar.gz
/monotone-0.99.tar.gz
/monotone-0.99.1.tar.gz
/monotone-1.0.tar.bz2
+/monotone-1.1.tar.bz2
diff --git a/monotone-1.0-stacktrace-on-crash.patch b/monotone-1.0-stacktrace-on-crash.patch
new file mode 100644
index 0000000..a8d773c
--- /dev/null
+++ b/monotone-1.0-stacktrace-on-crash.patch
@@ -0,0 +1,63 @@
+Add a hack to the fatal signal handlers to invoke gdb and get a full stack
+trace on crash. This won't fix anything, but by activating this mode
+in the testsuite, we can get more detail on the alpha and sparc FTBFSes.
+
+Index: monotone-1.0/src/unix/main.cc
+===================================================================
+--- monotone-1.0.orig/src/unix/main.cc 2009-04-12 13:39:49.000000000 -0700
++++ monotone-1.0/src/unix/main.cc 2009-04-12 13:42:56.000000000 -0700
+@@ -36,12 +36,21 @@
+
+ #include "../base.hh"
+ #include <signal.h>
+-#include <time.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <sys/resource.h>
+ #include <unistd.h>
++#include <time.h>
++
++#if __GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
++# define HAVE_BACKTRACE
++# include <execinfo.h>
++#endif
+
+ static char const * argv0;
++#ifdef HAVE_BACKTRACE
++static bool backtrace_on_crash = false;
++#endif
+
+ // a convenient wrapper
+ inline void
+@@ -75,6 +84,18 @@
+ write_str_to_stderr("do not send a core dump, but if you have one, "
+ "\nplease preserve it in case we ask you for "
+ "information from it.\n");
++#ifdef HAVE_BACKTRACE
++ if (backtrace_on_crash)
++ {
++ void *tracebuf[20];
++ int frames = backtrace(tracebuf, 20);
++ if (frames)
++ {
++ write_str_to_stderr("stack trace:\n");
++ backtrace_symbols_fd(tracebuf, frames, 2);
++ }
++ }
++#endif
+
+ raise(signo);
+ // The signal has been reset to the default handler by SA_RESETHAND
+@@ -129,6 +150,12 @@
+
+ argv0 = argv[0];
+
++#ifdef HAVE_BACKTRACE
++ char *ev = getenv("MTN_STACKTRACE_ON_CRASH");
++ if (ev && ev[0])
++ backtrace_on_crash = true;
++#endif
++
+ bug_signal_action.sa_flags = SA_RESETHAND;
+ bug_signal_action.sa_handler = &bug_signal;
+ sigemptyset(&bug_signal_action.sa_mask);
diff --git a/monotone.spec b/monotone.spec
index 6d1d354..00b582d 100644
--- a/monotone.spec
+++ b/monotone.spec
@@ -1,6 +1,6 @@
Name: monotone
-Version: 1.0
-Release: 17%{?dist}
+Version: 1.1
+Release: 1%{?dist}
Summary: A free, distributed version control system
Group: Development/Tools
License: GPLv2+
@@ -10,27 +10,7 @@ Source1: monotone.init
Source2: monotone.sysconfig
Source3: README.monotone-server
Source4: monotone-server-tmpfiles.conf
-# rev da62cad1 from upstream
-Patch0: monotone-1.0-file_handle.patch
-# rev a570769b from upstream
-Patch1: monotone-1.0-fix-help.patch
-# FTBFS (symbol conflict with boost)
-# https://code.monotone.ca/p/monotone/issues/191/
-Patch2: monotone-1.0-disable-xdelta-test.patch
-# Fix a failing test with pcre >= 8.21
-Patch3: monotone-1.0-pcre.patch
-# Fix failing bash completion test
-Patch4: monotone-1.0-fix-bash_completion-test.patch
-# See rhbz#919827
-Patch5: monotone-1.0-fix-diff_patch_drop-test.patch
-# Fix FTBFS for Botan 1.10.X
-# https://code.monotone.ca/p/monotone/issues/182/
-Patch6: monotone-1.0-botan-1.10.patch
-# Fix FTBFS for Lua 5.2
-Patch7: monotone-1.0-lua-5.2.patch
-# Fix texinfo errors with texinfo >= 5.0
-Patch8: monotone-1.0-fix-texinfo.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: monotone-1.0-stacktrace-on-crash.patch
BuildRequires: zlib-devel
BuildRequires: boost-devel >= 1.33.1
BuildRequires: botan-devel >= 1.6.3
@@ -86,19 +66,7 @@ and then pass commands to it.
%prep
%setup -q
-%patch0 -p0
-%patch1 -p0
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-
-# fix FTBFS rhbz#914191
-sed -e "s|shared_dynamic_cast|dynamic_pointer_cast|g" \
- -i src/key_store.cc src/ssh_agent.cc src/database.cc
+%patch0 -p1
%build
@@ -110,11 +78,11 @@ make %{?_smp_mflags}
%check
export LC_MESSAGES=en_US
export DISABLE_NETWORK_TESTS=1
-make %{?_smp_mflags} check || { head -n-0 test/work/*.log; false; }
+export MTN_STACKTRACE_ON_CRASH=1
+make check || { head -n-0 test/work/*.log; false; }
%install
-rm -rf %{buildroot}
export LC_MESSAGES=en_US
make install DESTDIR=%{buildroot}
rm -f %{buildroot}%{_infodir}/dir
@@ -156,11 +124,6 @@ install -D -m 0644 -p contrib/Monotone.pm \
%{buildroot}%{perl_vendorlib}/Monotone.pm
-%clean
-rm -f README.monotone-server
-rm -rf %{buildroot}
-
-
%post
if [ $1 -eq 1 ]
then
@@ -176,7 +139,6 @@ fi
%files -f %{name}.lang
-%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README UPGRADE
%doc _doc/*
%{_bindir}/mtn
@@ -191,12 +153,10 @@ fi
%files -n perl-Monotone
-%defattr(-,root,root,-)
%{perl_vendorlib}/Monotone.pm
%files server
-%defattr(-,root,root,-)
%doc README.monotone-server
%{_sbindir}/monotone-server
%{_mandir}/man1/monotone-server.1*
@@ -246,6 +206,11 @@ fi
%changelog
+* Fri Jul 18 2014 Thomas Moschny <thomas.moschny at gmx.de> - 1.1-1
+- Update to 1.1.
+- Remove patches and fixes not needed anymore.
+- Modernize spec file.
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index b9eb4ad..b46ef88 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a0b5d8560f08d76a950172f9ed0feff monotone-1.0.tar.bz2
+df3f40ca22120aa142ac9becba9e1bf7 monotone-1.1.tar.bz2
More information about the scm-commits
mailing list