Compare commits
144 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2cc4cd8a8c | ||
|
|
9e3dc22dd8 | ||
|
|
0b22da6506 | ||
|
|
b62767eb94 | ||
|
|
cf5795268b | ||
|
|
3a511adf44 | ||
|
|
cff8a0c8df | ||
|
|
2113bfe62a | ||
|
|
d9caf4d74e | ||
|
|
10f4603d1a | ||
|
|
4b5250c284 | ||
|
|
0a9e571e25 | ||
|
|
d7f20cf9cc | ||
|
|
678adf0cf2 | ||
|
|
f0fcfb9758 | ||
|
|
29a6d5c12d | ||
|
|
f19bfbabd2 | ||
|
|
8c5082acbf | ||
|
|
b77d129bc2 | ||
|
|
35721b6e63 | ||
|
|
c3b3eab61d | ||
|
|
5634cdb3fe | ||
|
|
52b25d5c59 | ||
|
|
7d0e717329 | ||
|
|
2cc4b62aed | ||
|
|
cfaf00aa09 | ||
|
|
b14cb97c35 | ||
|
|
c645355ff9 | ||
|
|
ed2f1a5f76 |
||
|
|
ce01523b60 | ||
|
|
d68e01734a | ||
|
|
51b370a3da | ||
|
|
a4660e2572 | ||
|
|
a0a83818ee | ||
|
|
73e3ebf529 | ||
|
|
8363ada4f4 | ||
|
|
33a2030d7d | ||
|
|
51ddc5568e | ||
|
|
9fb90c2522 | ||
|
|
6e7c959bac | ||
|
|
dc0af99793 | ||
|
|
0803b3b464 | ||
|
|
3e275c8601 | ||
|
|
b56c6e0326 | ||
|
|
92fc046ae4 | ||
|
|
4de6adc760 | ||
|
|
023522457b | ||
|
|
2f157a2462 | ||
|
|
e1062ee926 | ||
|
|
98aee02684 | ||
|
|
62c5c40cd5 | ||
|
|
a7bf17ce9a | ||
|
|
d675113ba1 | ||
|
|
6b6518abd0 | ||
|
|
7734a55b14 | ||
|
|
08857a0e99 | ||
|
|
ad53c71ef0 | ||
|
|
3ab7c6cc77 | ||
|
|
5b1bded711 | ||
|
|
d55359f461 | ||
|
|
682939d04c | ||
|
|
f3ac909936 | ||
|
|
145a2d18ef | ||
|
|
5235e91957 | ||
|
|
540fbaad4a | ||
|
|
90794ef20c | ||
|
|
66a6f65f55 | ||
|
|
8a72001ce8 | ||
|
|
9cf08f27c4 | ||
|
|
0e2e8a1370 | ||
|
|
526f23c3d6 | ||
|
|
295457e2f0 | ||
|
|
7dac447013 | ||
|
|
0e74ded29d | ||
|
|
70a224e841 | ||
|
|
2e083aa8dc | ||
|
|
3f8bf5295f | ||
|
|
094c4fe324 | ||
|
|
8720a1b5b2 | ||
|
|
b5ccf08516 | ||
|
|
602161c5a6 | ||
|
|
a3a566156d | ||
|
|
f67cf279fe | ||
|
|
9589e206d0 | ||
|
|
6b2abff175 | ||
|
|
34b3172088 | ||
|
|
5f8c95b896 | ||
|
|
9f47264777 | ||
|
|
f4f5835727 | ||
|
|
8ddafc9bec | ||
|
|
60bf42a6b4 | ||
|
|
e064b06ff0 | ||
|
|
4a39fbd83e | ||
|
|
29f5551ead | ||
|
|
616bb1debd | ||
|
|
a69e04797f | ||
|
|
cfd6e7f04c | ||
|
|
f21cc78673 | ||
|
|
7cc7ab348e | ||
|
|
31f681fcc3 | ||
|
|
559d889700 | ||
|
|
301a3c3760 | ||
|
|
87280f93b5 | ||
|
|
cbb473d85a | ||
|
|
a64188c445 | ||
|
|
350fd2619c | ||
|
|
22c30226de | ||
|
|
2b04714bfd | ||
|
|
af90489c96 | ||
|
|
1baaf5e88a | ||
|
|
b5ae4591a7 | ||
|
|
885becd595 | ||
|
|
9ee5058876 | ||
|
|
46e6bb39c9 | ||
|
|
8197d81595 | ||
|
|
64b2d64a5e | ||
|
|
2719010fd7 | ||
|
|
8093092c01 | ||
|
|
a08584bd9a | ||
|
|
405d52c916 | ||
|
|
51046cfd1d | ||
|
|
2f99056d22 | ||
|
|
e65fa75621 | ||
|
|
ba5dccdf60 | ||
|
|
da39877c4b | ||
|
|
e7170ee424 | ||
|
|
15f456b30f | ||
|
|
0dc1ceb832 | ||
|
|
26043cbf24 | ||
|
|
0291f1f287 | ||
|
|
67f6966a34 | ||
|
|
211a81a4e2 | ||
|
|
6778404ac7 | ||
|
|
8e98bb9c18 | ||
|
|
a6d41da2a9 | ||
|
|
21ac64c6e8 | ||
|
|
f0b66f093f | ||
|
|
24a6ee3167 | ||
|
|
614ba346e2 | ||
|
|
63f67d8034 | ||
|
|
b39bb3c95a | ||
|
|
6d6e5786ae | ||
|
|
9189ede517 | ||
|
|
9a6f1fef72 |
23 changed files with 1819 additions and 21 deletions
6
.gitignore
vendored
Normal file
6
.gitignore
vendored
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
monotone-0.48.tar.gz
|
||||
/monotone-0.48.1.tar.gz
|
||||
/monotone-0.99.tar.gz
|
||||
/monotone-0.99.1.tar.gz
|
||||
/monotone-1.0.tar.bz2
|
||||
/monotone-1.1.tar.bz2
|
||||
21
Makefile
21
Makefile
|
|
@ -1,21 +0,0 @@
|
|||
# Makefile for source rpm: monotone
|
||||
# $Id$
|
||||
NAME := monotone
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attept a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
||||
38
README.monotone-server
Normal file
38
README.monotone-server
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
The Fedora build of monotone provides an extra RPM "monotone-server". This
|
||||
package is intended to make it easy to set up an unattended server
|
||||
installation for Monotone's Netsync protocol (i.e. "monotone serve").
|
||||
|
||||
The package contains a systemd service unit for running the server, installed
|
||||
as /usr/sbin/monotone-server. (This is just a symlink to monotone that the
|
||||
systemd runs instead. This enables matching "monotone-server" processes with
|
||||
ps to distinguish server instances from people using monotone.)
|
||||
|
||||
The /etc/monotone directory serves as ~/.monotone for the server. This
|
||||
directory and its contents are not writable by the "monotone" user ID under
|
||||
which the network server runs. The database lives in /var/lib/monotone, which
|
||||
the "monotone" user ID must write to.
|
||||
|
||||
On startup, the systemd service will generate a private key for the
|
||||
server to use, if none exists yet, using
|
||||
/usr/libexec/monotone-server-genkey. The key identification will
|
||||
contain the host's FQDN (from /bin/hostname -f).
|
||||
|
||||
Before starting the server, the script will migrate an old database
|
||||
format if you had a previous version of the monotone-server installation.
|
||||
|
||||
Access to the server is controlled by the /etc/monotone/read-permissions and
|
||||
/etc/monotone/write-permissions files, unless you write your own Lua hooks in
|
||||
/etc/monotone/monotonerc. These files are not created or edited by the RPM
|
||||
scripts, you must create them. These files refer to key identification
|
||||
strings for keys already the database. Anyone allowed write access by the
|
||||
network server can put new keys in the database with "monotone push" using the
|
||||
--key-to-push option. To bootstrap this, /etc/monotone/write-permission must
|
||||
allow some key and that key must be in the database already. You can put a
|
||||
key in the server's database easily with /usr/libexec/monotone-server-import,
|
||||
e.g. to import the public key for a private key in ~/.monotone/keys:
|
||||
|
||||
mtn pubkey me@my.com | sudo /usr/libexec/monotone-server-import
|
||||
|
||||
For problems with this package or its scripts, please file bugs at
|
||||
http://bugzilla.redhat.com/ for the "monotone" component in the "Fedora"
|
||||
product.
|
||||
63
monotone-1.0-stacktrace-on-crash.patch
Normal file
63
monotone-1.0-stacktrace-on-crash.patch
Normal file
|
|
@ -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);
|
||||
555
monotone-1.1-boost.patch
Normal file
555
monotone-1.1-boost.patch
Normal file
|
|
@ -0,0 +1,555 @@
|
|||
A function macro named E clashes with internal boost definitions. Rearrange
|
||||
the order of header inclusion so that affected boost headers are included
|
||||
before monotone defines the macro.
|
||||
|
||||
Also, stop bundling boost/circular_buffer, which is available in current
|
||||
versions of boost.
|
||||
|
||||
diff -up monotone-1.1/Makefile.in.orig monotone-1.1/Makefile.in
|
||||
--- monotone-1.1/Makefile.in.orig 2014-05-04 03:18:01.000000000 -0600
|
||||
+++ monotone-1.1/Makefile.in 2020-06-30 10:02:57.849746309 -0600
|
||||
@@ -156,10 +156,7 @@ am__v_AR_1 =
|
||||
src_lib3rdparty_a_AR = $(AR) $(ARFLAGS)
|
||||
src_lib3rdparty_a_LIBADD =
|
||||
am__src_lib3rdparty_a_SOURCES_DIST = \
|
||||
- src/boost/circular_buffer_adaptor.hpp \
|
||||
- src/boost/circular_buffer_base.hpp \
|
||||
- src/boost/circular_buffer_fwd.hpp \
|
||||
- src/boost/circular_buffer.hpp src/netxx/accept.cxx \
|
||||
+ src/netxx/accept.cxx \
|
||||
src/netxx/accept.h src/netxx/address.cxx src/netxx/common.h \
|
||||
src/netxx/compat.h src/netxx/datagram.cxx \
|
||||
src/netxx/datagramserver.cxx src/netxx/osutil.cxx \
|
||||
@@ -933,12 +930,6 @@ NETXX_SOURCES = \
|
||||
src/netxx/stream.h src/netxx/streambase.h \
|
||||
src/netxx/streamserver.h src/netxx/timeout.h src/netxx/types.h
|
||||
|
||||
-BOOST_SANDBOX_SOURCES = \
|
||||
- src/boost/circular_buffer_adaptor.hpp \
|
||||
- src/boost/circular_buffer_base.hpp \
|
||||
- src/boost/circular_buffer_fwd.hpp \
|
||||
- src/boost/circular_buffer.hpp
|
||||
-
|
||||
UNIX_PLATFORM_SOURCES = \
|
||||
src/unix/read_password.cc src/unix/get_system_flavour.cc \
|
||||
src/unix/process.cc src/unix/terminal.cc src/unix/inodeprint.cc \
|
||||
@@ -1026,7 +1017,7 @@ nodist_test_bin_tester_SOURCES = test/sr
|
||||
noinst_LIBRARIES = src/libplatform.a src/lib3rdparty.a
|
||||
src_libplatform_a_SOURCES = src/platform.hh $(am__append_1) \
|
||||
$(am__append_6)
|
||||
-src_lib3rdparty_a_SOURCES = $(BOOST_SANDBOX_SOURCES) $(NETXX_SOURCES) \
|
||||
+src_lib3rdparty_a_SOURCES = $(NETXX_SOURCES) \
|
||||
$(am__append_9) $(am__append_11) $(am__append_13) \
|
||||
$(am__append_14)
|
||||
bashcompdir = $(sysconfdir)/bash_completion.d
|
||||
diff -up monotone-1.1/src/ancestry.cc.orig monotone-1.1/src/ancestry.cc
|
||||
--- monotone-1.1/src/ancestry.cc.orig 2014-05-04 03:15:15.000000000 -0600
|
||||
+++ monotone-1.1/src/ancestry.cc 2020-06-30 11:34:52.796544704 -0600
|
||||
@@ -8,8 +8,8 @@
|
||||
// PURPOSE.
|
||||
|
||||
#include "base.hh"
|
||||
-#include "sanity.hh"
|
||||
#include "revision.hh"
|
||||
+#include "sanity.hh"
|
||||
#include "rev_height.hh"
|
||||
#include "roster.hh"
|
||||
|
||||
diff -up monotone-1.1/src/asciik.hh.orig monotone-1.1/src/asciik.hh
|
||||
--- monotone-1.1/src/asciik.hh.orig 2014-05-04 03:15:15.000000000 -0600
|
||||
+++ monotone-1.1/src/asciik.hh 2020-06-30 10:15:12.007654082 -0600
|
||||
@@ -11,8 +11,8 @@
|
||||
#define __ASCIIK_HH__
|
||||
|
||||
#include <set>
|
||||
-#include "vector.hh"
|
||||
#include "vocab.hh"
|
||||
+#include "vector.hh"
|
||||
|
||||
class asciik
|
||||
{
|
||||
diff -up monotone-1.1/src/automate.cc.orig monotone-1.1/src/automate.cc
|
||||
--- monotone-1.1/src/automate.cc.orig 2014-05-04 03:15:16.000000000 -0600
|
||||
+++ monotone-1.1/src/automate.cc 2020-06-30 11:38:43.421264711 -0600
|
||||
@@ -13,12 +13,12 @@
|
||||
#include <iterator>
|
||||
#include <sstream>
|
||||
#include <unistd.h>
|
||||
-#include "vector.hh"
|
||||
|
||||
#include <boost/bind.hpp>
|
||||
#include <boost/function.hpp>
|
||||
#include "lexical_cast.hh"
|
||||
#include <boost/tuple/tuple.hpp>
|
||||
+#include "vector.hh"
|
||||
|
||||
#include "app_state.hh"
|
||||
#include "automate_stdio_helpers.hh"
|
||||
diff -up monotone-1.1/src/basic_io.hh.orig monotone-1.1/src/basic_io.hh
|
||||
--- monotone-1.1/src/basic_io.hh.orig 2014-05-04 03:15:16.000000000 -0600
|
||||
+++ monotone-1.1/src/basic_io.hh 2020-06-30 09:47:13.560973524 -0600
|
||||
@@ -11,11 +11,11 @@
|
||||
#ifndef __BASIC_IO_HH__
|
||||
#define __BASIC_IO_HH__
|
||||
|
||||
-#include "vector.hh"
|
||||
#include <map>
|
||||
|
||||
#include "paths.hh"
|
||||
#include "sanity.hh"
|
||||
+#include "vector.hh"
|
||||
#include "vocab.hh"
|
||||
#include "numeric_vocab.hh"
|
||||
#include "char_classifiers.hh"
|
||||
diff -up monotone-1.1/src/charset.cc.orig monotone-1.1/src/charset.cc
|
||||
--- monotone-1.1/src/charset.cc.orig 2014-05-04 03:15:16.000000000 -0600
|
||||
+++ monotone-1.1/src/charset.cc 2020-06-30 09:37:09.073857197 -0600
|
||||
@@ -7,13 +7,13 @@
|
||||
// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
// PURPOSE.
|
||||
|
||||
-#include "base.hh"
|
||||
-#include "vector.hh"
|
||||
-
|
||||
#include <boost/tokenizer.hpp>
|
||||
#include <idna.h>
|
||||
#include <stringprep.h>
|
||||
|
||||
+#include "base.hh"
|
||||
+#include "vector.hh"
|
||||
+
|
||||
#include "charset.hh"
|
||||
#include "numeric_vocab.hh"
|
||||
#include "sanity.hh"
|
||||
diff -up monotone-1.1/src/cmd_list.cc.orig monotone-1.1/src/cmd_list.cc
|
||||
--- monotone-1.1/src/cmd_list.cc.orig 2014-05-04 03:15:16.000000000 -0600
|
||||
+++ monotone-1.1/src/cmd_list.cc 2020-06-30 10:12:30.695874287 -0600
|
||||
@@ -10,7 +10,6 @@
|
||||
|
||||
#include "base.hh"
|
||||
#include <algorithm>
|
||||
-#include "safe_map.hh"
|
||||
#include <utility>
|
||||
#include <iostream>
|
||||
#include <iterator>
|
||||
@@ -18,6 +17,7 @@
|
||||
#include <boost/tuple/tuple.hpp>
|
||||
|
||||
#include "basic_io.hh"
|
||||
+#include "safe_map.hh"
|
||||
#include "cert.hh"
|
||||
#include "charset.hh"
|
||||
#include "cmd.hh"
|
||||
diff -up monotone-1.1/src/commands.hh.orig monotone-1.1/src/commands.hh
|
||||
--- monotone-1.1/src/commands.hh.orig 2014-05-04 03:15:16.000000000 -0600
|
||||
+++ monotone-1.1/src/commands.hh 2020-06-30 10:09:04.000156549 -0600
|
||||
@@ -10,8 +10,8 @@
|
||||
#ifndef __COMMANDS_HH__
|
||||
#define __COMMANDS_HH__
|
||||
|
||||
-#include "vector.hh"
|
||||
#include "options.hh"
|
||||
+#include "vector.hh"
|
||||
class app_state;
|
||||
class utf8;
|
||||
|
||||
diff -up monotone-1.1/src/database.cc.orig monotone-1.1/src/database.cc
|
||||
--- monotone-1.1/src/database.cc.orig 2014-05-04 03:15:16.000000000 -0600
|
||||
+++ monotone-1.1/src/database.cc 2020-06-30 11:07:31.767911489 -0600
|
||||
@@ -17,13 +17,13 @@
|
||||
#include <numeric>
|
||||
#include <set>
|
||||
#include <sstream>
|
||||
-#include "vector.hh"
|
||||
|
||||
#include <string.h>
|
||||
#include <boost/bind.hpp>
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#include <boost/tuple/tuple.hpp>
|
||||
#include <boost/tuple/tuple_comparison.hpp>
|
||||
+#include "vector.hh"
|
||||
|
||||
#include <botan/botan.h>
|
||||
#include <botan/rsa.h>
|
||||
diff -up monotone-1.1/src/database.hh.orig monotone-1.1/src/database.hh
|
||||
--- monotone-1.1/src/database.hh.orig 2014-05-04 03:15:16.000000000 -0600
|
||||
+++ monotone-1.1/src/database.hh 2020-06-30 11:39:49.533184469 -0600
|
||||
@@ -11,10 +11,10 @@
|
||||
#ifndef __DATABASE_HH__
|
||||
#define __DATABASE_HH__
|
||||
|
||||
-#include "vector.hh"
|
||||
#include <set>
|
||||
#include <boost/function.hpp>
|
||||
#include <boost/shared_ptr.hpp>
|
||||
+#include "vector.hh"
|
||||
|
||||
#include "rev_types.hh"
|
||||
#include "cert.hh"
|
||||
diff -up monotone-1.1/src/enumerator.cc.orig monotone-1.1/src/enumerator.cc
|
||||
--- monotone-1.1/src/enumerator.cc.orig 2014-05-04 03:15:16.000000000 -0600
|
||||
+++ monotone-1.1/src/enumerator.cc 2020-06-30 11:17:48.813031155 -0600
|
||||
@@ -11,9 +11,9 @@
|
||||
#include <deque>
|
||||
#include <map>
|
||||
#include <set>
|
||||
-#include "vector.hh"
|
||||
|
||||
#include "cset.hh"
|
||||
+#include "vector.hh"
|
||||
#include "enumerator.hh"
|
||||
#include "revision.hh"
|
||||
#include "vocab.hh"
|
||||
diff -up monotone-1.1/src/file_io.cc.orig monotone-1.1/src/file_io.cc
|
||||
--- monotone-1.1/src/file_io.cc.orig 2014-05-04 03:15:16.000000000 -0600
|
||||
+++ monotone-1.1/src/file_io.cc 2020-06-30 09:50:13.560669858 -0600
|
||||
@@ -12,9 +12,9 @@
|
||||
#include <fstream>
|
||||
|
||||
#include <botan/botan.h>
|
||||
-#include "botan_pipe_cache.hh"
|
||||
|
||||
#include "file_io.hh"
|
||||
+#include "botan_pipe_cache.hh"
|
||||
#include "sanity.hh"
|
||||
#include "simplestring_xform.hh"
|
||||
#include "charset.hh"
|
||||
diff -up monotone-1.1/src/globish.cc.orig monotone-1.1/src/globish.cc
|
||||
--- monotone-1.1/src/globish.cc.orig 2014-05-04 03:15:16.000000000 -0600
|
||||
+++ monotone-1.1/src/globish.cc 2020-06-30 09:56:22.529324520 -0600
|
||||
@@ -9,9 +9,9 @@
|
||||
// PURPOSE.
|
||||
|
||||
#include "base.hh"
|
||||
+#include "option.hh" // for arg_type
|
||||
#include "sanity.hh"
|
||||
#include "globish.hh"
|
||||
-#include "option.hh" // for arg_type
|
||||
#include "numeric_vocab.hh"
|
||||
|
||||
#include <iterator>
|
||||
diff -up monotone-1.1/src/hmac.cc.orig monotone-1.1/src/hmac.cc
|
||||
--- monotone-1.1/src/hmac.cc.orig 2014-05-04 03:15:17.000000000 -0600
|
||||
+++ monotone-1.1/src/hmac.cc 2020-06-30 11:43:21.171953985 -0600
|
||||
@@ -10,9 +10,9 @@
|
||||
#include "base.hh"
|
||||
#include <botan/botan.h>
|
||||
|
||||
-#include "sanity.hh"
|
||||
#include "hmac.hh"
|
||||
#include "vocab.hh"
|
||||
+#include "sanity.hh"
|
||||
#include "constants.hh"
|
||||
|
||||
using std::string;
|
||||
diff -up monotone-1.1/src/key_store.hh.orig monotone-1.1/src/key_store.hh
|
||||
--- monotone-1.1/src/key_store.hh.orig 2014-05-04 03:15:17.000000000 -0600
|
||||
+++ monotone-1.1/src/key_store.hh 2020-06-30 11:06:22.925984151 -0600
|
||||
@@ -19,8 +19,8 @@
|
||||
#include <botan/libstate.h>
|
||||
#endif
|
||||
|
||||
-#include "vector.hh"
|
||||
#include "vocab.hh"
|
||||
+#include "vector.hh"
|
||||
#include "paths.hh"
|
||||
|
||||
class app_state;
|
||||
diff -up monotone-1.1/src/migrate_work.cc.orig monotone-1.1/src/migrate_work.cc
|
||||
--- monotone-1.1/src/migrate_work.cc.orig 2014-05-04 03:15:17.000000000 -0600
|
||||
+++ monotone-1.1/src/migrate_work.cc 2020-06-30 10:57:13.325615053 -0600
|
||||
@@ -8,8 +8,8 @@
|
||||
// PURPOSE.
|
||||
|
||||
#include "base.hh"
|
||||
-#include "sanity.hh"
|
||||
#include "cset.hh"
|
||||
+#include "sanity.hh"
|
||||
#include "simplestring_xform.hh"
|
||||
#include "revision.hh"
|
||||
#include "file_io.hh"
|
||||
diff -up monotone-1.1/src/netcmd.cc.orig monotone-1.1/src/netcmd.cc
|
||||
--- monotone-1.1/src/netcmd.cc.orig 2014-05-04 03:15:17.000000000 -0600
|
||||
+++ monotone-1.1/src/netcmd.cc 2020-06-30 11:29:04.877013138 -0600
|
||||
@@ -8,11 +8,11 @@
|
||||
// PURPOSE.
|
||||
|
||||
#include "base.hh"
|
||||
-#include "vector.hh"
|
||||
#include <utility>
|
||||
|
||||
#include "constants.hh"
|
||||
#include "netcmd.hh"
|
||||
+#include "vector.hh"
|
||||
#include "netio.hh"
|
||||
#include "numeric_vocab.hh"
|
||||
#include "sanity.hh"
|
||||
diff -up monotone-1.1/src/netcmd.hh.orig monotone-1.1/src/netcmd.hh
|
||||
--- monotone-1.1/src/netcmd.hh.orig 2014-05-04 03:15:17.000000000 -0600
|
||||
+++ monotone-1.1/src/netcmd.hh 2020-06-30 11:25:11.916333993 -0600
|
||||
@@ -10,13 +10,13 @@
|
||||
#ifndef __NETCMD_HH__
|
||||
#define __NETCMD_HH__
|
||||
|
||||
-#include "vector.hh"
|
||||
#include <list>
|
||||
#include <utility>
|
||||
#include <iostream>
|
||||
|
||||
-#include "globish.hh"
|
||||
#include "merkle_tree.hh"
|
||||
+#include "vector.hh"
|
||||
+#include "globish.hh"
|
||||
#include "numeric_vocab.hh"
|
||||
#include "uri.hh"
|
||||
#include "vocab.hh"
|
||||
diff -up monotone-1.1/src/network/listener_base.hh.orig monotone-1.1/src/network/listener_base.hh
|
||||
--- monotone-1.1/src/network/listener_base.hh.orig 2014-05-04 03:15:17.000000000 -0600
|
||||
+++ monotone-1.1/src/network/listener_base.hh 2020-06-30 11:19:34.500864837 -0600
|
||||
@@ -11,10 +11,10 @@
|
||||
#ifndef __LISTENER_BASE_HH__
|
||||
#define __LISTENER_BASE_HH__
|
||||
|
||||
-#include "reactable.hh"
|
||||
-
|
||||
#include <boost/shared_ptr.hpp>
|
||||
|
||||
+#include "reactable.hh"
|
||||
+
|
||||
// This is not currently needed because there's only one kind of listener.
|
||||
// But it's already here and not hurting anything, and might be useful if
|
||||
// we want to add another kind of listener later (something that accepts
|
||||
diff -up monotone-1.1/src/option.hh.orig monotone-1.1/src/option.hh
|
||||
--- monotone-1.1/src/option.hh.orig 2014-05-04 03:15:17.000000000 -0600
|
||||
+++ monotone-1.1/src/option.hh 2020-06-30 09:23:18.706152659 -0600
|
||||
@@ -22,9 +22,9 @@
|
||||
#include <stdexcept>
|
||||
#include <map>
|
||||
#include <set>
|
||||
-#include "vector.hh"
|
||||
-
|
||||
#include <boost/function.hpp>
|
||||
+
|
||||
+#include "vector.hh"
|
||||
#include "lexical_cast.hh"
|
||||
|
||||
#include "sanity.hh"
|
||||
diff -up monotone-1.1/src/project.cc.orig monotone-1.1/src/project.cc
|
||||
--- monotone-1.1/src/project.cc.orig 2014-05-04 03:15:17.000000000 -0600
|
||||
+++ monotone-1.1/src/project.cc 2020-06-30 10:58:34.582498413 -0600
|
||||
@@ -8,9 +8,9 @@
|
||||
// PURPOSE.
|
||||
|
||||
#include "base.hh"
|
||||
-#include "vector.hh"
|
||||
|
||||
#include "cert.hh"
|
||||
+#include "vector.hh"
|
||||
#include "database.hh"
|
||||
#include "date_format.hh"
|
||||
#include "project.hh"
|
||||
diff -up monotone-1.1/src/rcs_file.cc.orig monotone-1.1/src/rcs_file.cc
|
||||
--- monotone-1.1/src/rcs_file.cc.orig 2014-05-04 03:15:17.000000000 -0600
|
||||
+++ monotone-1.1/src/rcs_file.cc 2020-06-30 11:10:45.213647993 -0600
|
||||
@@ -10,7 +10,6 @@
|
||||
|
||||
#include "base.hh"
|
||||
#include <fstream>
|
||||
-#include "vector.hh"
|
||||
|
||||
#ifdef WIN32
|
||||
#include <windows.h>
|
||||
@@ -32,6 +31,7 @@
|
||||
#endif
|
||||
|
||||
#include "rcs_file.hh"
|
||||
+#include "vector.hh"
|
||||
#include "sanity.hh"
|
||||
#include "char_classifiers.hh"
|
||||
|
||||
diff -up monotone-1.1/src/rcs_file.hh.orig monotone-1.1/src/rcs_file.hh
|
||||
--- monotone-1.1/src/rcs_file.hh.orig 2014-05-04 03:15:17.000000000 -0600
|
||||
+++ monotone-1.1/src/rcs_file.hh 2020-06-30 11:14:24.238333814 -0600
|
||||
@@ -10,9 +10,9 @@
|
||||
#ifndef __RCS_FILE_HH__
|
||||
#define __RCS_FILE_HH__
|
||||
|
||||
-#include "vector.hh"
|
||||
#include <map>
|
||||
#include <boost/shared_ptr.hpp>
|
||||
+#include "vector.hh"
|
||||
|
||||
struct rcs_admin
|
||||
{
|
||||
diff -up monotone-1.1/src/rcs_import.cc.orig monotone-1.1/src/rcs_import.cc
|
||||
--- monotone-1.1/src/rcs_import.cc.orig 2014-05-04 03:15:17.000000000 -0600
|
||||
+++ monotone-1.1/src/rcs_import.cc 2020-06-30 11:29:44.579958676 -0600
|
||||
@@ -16,13 +16,13 @@
|
||||
#include <sstream>
|
||||
#include <stack>
|
||||
#include <stdexcept>
|
||||
-#include "vector.hh"
|
||||
#include <cstring> // memset
|
||||
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#include <boost/scoped_ptr.hpp>
|
||||
#include "lexical_cast.hh"
|
||||
#include <boost/tokenizer.hpp>
|
||||
+#include "vector.hh"
|
||||
|
||||
#include "cert.hh"
|
||||
#include "constants.hh"
|
||||
diff -up monotone-1.1/src/restrictions.cc.orig monotone-1.1/src/restrictions.cc
|
||||
--- monotone-1.1/src/restrictions.cc.orig 2014-05-04 03:15:17.000000000 -0600
|
||||
+++ monotone-1.1/src/restrictions.cc 2020-06-30 11:43:53.380932870 -0600
|
||||
@@ -8,9 +8,9 @@
|
||||
// PURPOSE.
|
||||
|
||||
#include "base.hh"
|
||||
+#include "restrictions.hh"
|
||||
#include "safe_map.hh"
|
||||
#include "vector.hh"
|
||||
-#include "restrictions.hh"
|
||||
#include "file_io.hh"
|
||||
#include "roster.hh"
|
||||
#include "database.hh" // for parent_roster
|
||||
diff -up monotone-1.1/src/revision.hh.orig monotone-1.1/src/revision.hh
|
||||
--- monotone-1.1/src/revision.hh.orig 2014-05-04 03:15:18.000000000 -0600
|
||||
+++ monotone-1.1/src/revision.hh 2020-06-30 11:18:10.388997198 -0600
|
||||
@@ -11,8 +11,8 @@
|
||||
#define __REVISION_HH__
|
||||
|
||||
#include <set>
|
||||
-#include "vector.hh"
|
||||
#include "rev_types.hh"
|
||||
+#include "vector.hh"
|
||||
|
||||
class key_store;
|
||||
class node_restriction;
|
||||
diff -up monotone-1.1/src/roster.cc.orig monotone-1.1/src/roster.cc
|
||||
--- monotone-1.1/src/roster.cc.orig 2014-05-04 03:15:18.000000000 -0600
|
||||
+++ monotone-1.1/src/roster.cc 2020-06-30 11:35:20.489511075 -0600
|
||||
@@ -11,10 +11,10 @@
|
||||
#include "base.hh"
|
||||
#include <algorithm>
|
||||
#include <set>
|
||||
-#include "vector.hh"
|
||||
#include <sstream>
|
||||
|
||||
#include "basic_io.hh"
|
||||
+#include "vector.hh"
|
||||
#include "cset.hh"
|
||||
#include "database.hh"
|
||||
#include "platform-wrapped.hh"
|
||||
diff -up monotone-1.1/src/sanity.cc.orig monotone-1.1/src/sanity.cc
|
||||
--- monotone-1.1/src/sanity.cc.orig 2014-05-04 03:15:18.000000000 -0600
|
||||
+++ monotone-1.1/src/sanity.cc 2020-06-30 09:32:43.994207307 -0600
|
||||
@@ -12,12 +12,11 @@
|
||||
#include <iterator>
|
||||
#include <fstream>
|
||||
#include <sstream>
|
||||
-#include "vector.hh"
|
||||
-
|
||||
#include <boost/format.hpp>
|
||||
|
||||
-// circular_buffer is not in Boost 1.34; it's in monotone/boost.
|
||||
-#include "boost/circular_buffer.hpp"
|
||||
+#include "vector.hh"
|
||||
+
|
||||
+#include <boost/circular_buffer.hpp>
|
||||
|
||||
#include "lexical_cast.hh"
|
||||
#include "constants.hh"
|
||||
diff -up monotone-1.1/src/sanity.hh.orig monotone-1.1/src/sanity.hh
|
||||
--- monotone-1.1/src/sanity.hh.orig 2014-05-04 03:15:18.000000000 -0600
|
||||
+++ monotone-1.1/src/sanity.hh 2020-06-30 09:31:59.698281778 -0600
|
||||
@@ -14,7 +14,7 @@
|
||||
#include <ostream>
|
||||
#include <cstdio>
|
||||
|
||||
-#include "boost/current_function.hpp"
|
||||
+#include <boost/current_function.hpp>
|
||||
|
||||
#include "numeric_vocab.hh"
|
||||
#include "origin_type.hh"
|
||||
diff -up monotone-1.1/src/sha1.cc.orig monotone-1.1/src/sha1.cc
|
||||
--- monotone-1.1/src/sha1.cc.orig 2014-05-04 03:15:18.000000000 -0600
|
||||
+++ monotone-1.1/src/sha1.cc 2020-06-30 11:51:10.427645711 -0600
|
||||
@@ -22,10 +22,10 @@
|
||||
#include <botan/benchmark.h>
|
||||
#endif
|
||||
|
||||
-#include "sanity.hh"
|
||||
-#include "ui.hh"
|
||||
#include "platform.hh"
|
||||
#include "cmd.hh"
|
||||
+#include "sanity.hh"
|
||||
+#include "ui.hh"
|
||||
#include "transforms.hh"
|
||||
|
||||
using std::string;
|
||||
diff -up monotone-1.1/src/transforms.cc.orig monotone-1.1/src/transforms.cc
|
||||
--- monotone-1.1/src/transforms.cc.orig 2014-05-04 03:15:18.000000000 -0600
|
||||
+++ monotone-1.1/src/transforms.cc 2020-06-30 10:19:25.976307371 -0600
|
||||
@@ -12,12 +12,12 @@
|
||||
#include <botan/botan.h>
|
||||
#include <botan/sha160.h>
|
||||
|
||||
-#include "botan_pipe_cache.hh"
|
||||
-#include "gzip.hh"
|
||||
-
|
||||
#include "transforms.hh"
|
||||
#include "char_classifiers.hh"
|
||||
|
||||
+#include "botan_pipe_cache.hh"
|
||||
+#include "gzip.hh"
|
||||
+
|
||||
using std::string;
|
||||
using Botan::Pipe;
|
||||
using Botan::Base64_Encoder;
|
||||
diff -up monotone-1.1/src/update.cc.orig monotone-1.1/src/update.cc
|
||||
--- monotone-1.1/src/update.cc.orig 2014-05-04 03:15:18.000000000 -0600
|
||||
+++ monotone-1.1/src/update.cc 2020-06-30 11:03:03.726194356 -0600
|
||||
@@ -9,9 +9,9 @@
|
||||
|
||||
#include "base.hh"
|
||||
#include <set>
|
||||
+#include "lexical_cast.hh"
|
||||
#include "safe_map.hh"
|
||||
#include "vector.hh"
|
||||
-#include "lexical_cast.hh"
|
||||
|
||||
#include "database.hh"
|
||||
#include "sanity.hh"
|
||||
diff -up monotone-1.1/src/vocab.cc.orig monotone-1.1/src/vocab.cc
|
||||
--- monotone-1.1/src/vocab.cc.orig 2014-05-04 03:15:18.000000000 -0600
|
||||
+++ monotone-1.1/src/vocab.cc 2020-06-30 09:36:18.769919254 -0600
|
||||
@@ -11,8 +11,8 @@
|
||||
#include "base.hh"
|
||||
#include "constants.hh"
|
||||
#include "hash_map.hh"
|
||||
-#include "sanity.hh"
|
||||
#include "vocab.hh"
|
||||
+#include "sanity.hh"
|
||||
#include "char_classifiers.hh"
|
||||
#include "transforms.hh"
|
||||
|
||||
diff -up monotone-1.1/src/xdelta.cc.orig monotone-1.1/src/xdelta.cc
|
||||
--- monotone-1.1/src/xdelta.cc.orig 2014-05-04 03:15:19.000000000 -0600
|
||||
+++ monotone-1.1/src/xdelta.cc 2020-06-30 11:13:38.014400075 -0600
|
||||
@@ -26,7 +26,6 @@
|
||||
|
||||
#include "base.hh"
|
||||
#include <algorithm>
|
||||
-#include "vector.hh"
|
||||
#include <set>
|
||||
#include <sstream>
|
||||
#include <cstring> // memcmp
|
||||
@@ -34,6 +33,7 @@
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#include <boost/version.hpp>
|
||||
|
||||
+#include "vector.hh"
|
||||
#include "adler32.hh"
|
||||
#include "hash_map.hh"
|
||||
#include "numeric_vocab.hh"
|
||||
111
monotone-1.1-catch.patch
Normal file
111
monotone-1.1-catch.patch
Normal file
|
|
@ -0,0 +1,111 @@
|
|||
Do not catch exceptions of polymorphic type by value, as that requires the
|
||||
compiler to slice the exceptions. Catching them by reference allows the
|
||||
compiler to emit more efficient code.
|
||||
|
||||
--- monotone-1.1/src/dates.cc.orig 2014-05-04 03:15:16.000000000 -0600
|
||||
+++ monotone-1.1/src/dates.cc 2020-06-30 12:15:35.765139561 -0600
|
||||
@@ -652,7 +652,7 @@ date_t::date_t(string const & s)
|
||||
|
||||
d = our_timegm(t);
|
||||
}
|
||||
- catch (std::out_of_range)
|
||||
+ catch (std::out_of_range &)
|
||||
{
|
||||
E(false, origin::user,
|
||||
F("unrecognized date (monotone only understands ISO 8601 format)"));
|
||||
--- monotone-1.1/src/key_packet.cc.orig 2014-05-04 03:15:17.000000000 -0600
|
||||
+++ monotone-1.1/src/key_packet.cc 2020-06-30 12:14:15.581206185 -0600
|
||||
@@ -139,7 +139,7 @@ namespace
|
||||
}
|
||||
// since we do not want to prompt for a password to decode it finally,
|
||||
// we ignore all other exceptions
|
||||
- catch (Botan::Invalid_Argument) {}
|
||||
+ catch (Botan::Invalid_Argument &) {}
|
||||
}
|
||||
void validate_no_more_args(istringstream & iss) const
|
||||
{
|
||||
--- monotone-1.1/src/key_store.cc.orig 2014-05-04 03:15:17.000000000 -0600
|
||||
+++ monotone-1.1/src/key_store.cc 2020-06-30 12:14:36.965188418 -0600
|
||||
@@ -622,7 +622,7 @@ key_store_state::decrypt_private_key(key
|
||||
break;
|
||||
}
|
||||
#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,9,4)
|
||||
- catch (Botan::Invalid_Argument)
|
||||
+ catch (Botan::Invalid_Argument &)
|
||||
#else
|
||||
catch (Botan::Exception & e)
|
||||
#endif
|
||||
--- monotone-1.1/src/network/session.cc.orig 2014-05-04 03:15:17.000000000 -0600
|
||||
+++ monotone-1.1/src/network/session.cc 2020-06-30 12:15:10.949160179 -0600
|
||||
@@ -362,7 +362,7 @@ bool session::do_work(transaction_guard
|
||||
% errmsg.substr(4));
|
||||
}
|
||||
}
|
||||
- catch (boost::bad_lexical_cast)
|
||||
+ catch (boost::bad_lexical_cast &)
|
||||
{ // ok, so it wasn't a number
|
||||
}
|
||||
}
|
||||
--- monotone-1.1/src/option.cc.orig 2014-05-04 03:15:17.000000000 -0600
|
||||
+++ monotone-1.1/src/option.cc 2020-06-30 12:12:46.420100297 -0600
|
||||
@@ -522,7 +522,7 @@ void concrete_option_set::from_command_l
|
||||
o.resetter();
|
||||
}
|
||||
}
|
||||
- catch (boost::bad_lexical_cast)
|
||||
+ catch (boost::bad_lexical_cast &)
|
||||
{
|
||||
throw bad_arg(o.longname, arg);
|
||||
}
|
||||
@@ -567,7 +567,7 @@ void concrete_option_set::from_key_value
|
||||
o.resetter();
|
||||
}
|
||||
}
|
||||
- catch (boost::bad_lexical_cast)
|
||||
+ catch (boost::bad_lexical_cast &)
|
||||
{
|
||||
throw bad_arg(o.longname, value);
|
||||
}
|
||||
--- monotone-1.1/src/packet.cc.orig 2014-05-04 03:15:17.000000000 -0600
|
||||
+++ monotone-1.1/src/packet.cc 2020-06-30 12:13:54.197195613 -0600
|
||||
@@ -192,9 +192,9 @@ namespace
|
||||
// since we do not want to prompt for a password to decode it finally,
|
||||
// we ignore all other exceptions
|
||||
#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,9,11)
|
||||
- catch (Passphrase_Required) {}
|
||||
+ catch (Passphrase_Required &) {}
|
||||
#else
|
||||
- catch (Botan::Invalid_Argument) {}
|
||||
+ catch (Botan::Invalid_Argument &) {}
|
||||
#endif
|
||||
}
|
||||
void validate_certname(string const & cn) const
|
||||
--- monotone-1.1/src/paths.hh.orig 2014-05-04 03:15:17.000000000 -0600
|
||||
+++ monotone-1.1/src/paths.hh 2020-06-30 12:12:29.845076986 -0600
|
||||
@@ -424,7 +424,7 @@ bool safe_compose(T const & p, char cons
|
||||
result = p / path_component(s);
|
||||
return true;
|
||||
}
|
||||
- catch (std::logic_error)
|
||||
+ catch (std::logic_error &)
|
||||
{
|
||||
report_failed_path_composition(p, s, isdir);
|
||||
return false;
|
||||
--- monotone-1.1/src/sanity.cc.orig 2020-06-30 09:32:43.994207307 -0600
|
||||
+++ monotone-1.1/src/sanity.cc 2020-06-30 12:13:32.165164632 -0600
|
||||
@@ -433,13 +433,13 @@ sanity::gasp()
|
||||
(*i)->gasp(tmp);
|
||||
out << tmp;
|
||||
}
|
||||
- catch (logic_error)
|
||||
+ catch (logic_error &)
|
||||
{
|
||||
out << tmp;
|
||||
out << "<caught logic_error>\n";
|
||||
L(FL("ignoring error trigged by saving work set to debug log"));
|
||||
}
|
||||
- catch (recoverable_failure)
|
||||
+ catch (recoverable_failure &)
|
||||
{
|
||||
out << tmp;
|
||||
out << "<caught informative_failure>\n";
|
||||
14
monotone-1.1-iostream.patch
Normal file
14
monotone-1.1-iostream.patch
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
diff -up monotone-1.1/test/unit/tests/merge_3way.cc\~ monotone-1.1/test/unit/tests/merge_3way.cc
|
||||
--- monotone-1.1/test/unit/tests/merge_3way.cc~ 2014-05-04 11:15:25.000000000 +0200
|
||||
+++ monotone-1.1/test/unit/tests/merge_3way.cc 2015-01-29 02:23:06.774241679 +0100
|
||||
@@ -17,6 +17,8 @@
|
||||
#include "../randomfile.hh"
|
||||
#include "../../../src/simplestring_xform.hh"
|
||||
|
||||
+#include <iostream>
|
||||
+
|
||||
using std::cerr;
|
||||
using std::cout;
|
||||
using std::stringstream;
|
||||
|
||||
Diff finished. Thu Jan 29 02:24:29 2015
|
||||
52
monotone-1.1-lua-integer.patch
Normal file
52
monotone-1.1-lua-integer.patch
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
diff -Naur monotone-1.1.orig/src/lua.cc monotone-1.1/src/lua.cc
|
||||
--- monotone-1.1.orig/src/lua.cc 2014-05-04 11:15:17.000000000 +0200
|
||||
+++ monotone-1.1/src/lua.cc 2015-06-21 16:47:12.753916549 +0200
|
||||
@@ -334,7 +334,7 @@
|
||||
{
|
||||
if (failed) return *this;
|
||||
if (!check_stack(1)) return *this;
|
||||
- lua_pushnumber(st, num);
|
||||
+ lua_pushinteger(st, num);
|
||||
return *this;
|
||||
}
|
||||
|
||||
diff -Naur monotone-1.1.orig/src/luaext_platform.cc monotone-1.1/src/luaext_platform.cc
|
||||
--- monotone-1.1.orig/src/luaext_platform.cc 2014-05-04 11:15:17.000000000 +0200
|
||||
+++ monotone-1.1/src/luaext_platform.cc 2015-06-21 15:16:42.455792643 +0200
|
||||
@@ -185,8 +185,8 @@
|
||||
int res;
|
||||
int ret;
|
||||
ret = process_wait(pid, &res);
|
||||
- lua_pushnumber(LS, res);
|
||||
- lua_pushnumber(LS, ret);
|
||||
+ lua_pushinteger(LS, res);
|
||||
+ lua_pushinteger(LS, ret);
|
||||
return 2;
|
||||
}
|
||||
|
||||
diff -Naur monotone-1.1.orig/test/src/tester.cc monotone-1.1/test/src/tester.cc
|
||||
--- monotone-1.1.orig/test/src/tester.cc 2014-05-04 11:15:25.000000000 +0200
|
||||
+++ monotone-1.1/test/src/tester.cc 2015-06-21 15:16:42.491792237 +0200
|
||||
@@ -418,8 +418,8 @@
|
||||
int res;
|
||||
int ret;
|
||||
ret = process_wait(pid, &res, time);
|
||||
- lua_pushnumber(LS, res);
|
||||
- lua_pushnumber(LS, ret);
|
||||
+ lua_pushinteger(LS, res);
|
||||
+ lua_pushinteger(LS, ret);
|
||||
return 2;
|
||||
}
|
||||
|
||||
diff -Naur monotone-1.1.orig/test/src/testlib.lua monotone-1.1/test/src/testlib.lua
|
||||
--- monotone-1.1.orig/test/src/testlib.lua 2014-05-04 11:15:25.000000000 +0200
|
||||
+++ monotone-1.1/test/src/testlib.lua 2015-06-21 16:11:08.180222890 +0200
|
||||
@@ -1070,7 +1071,7 @@
|
||||
counts.total = counts.total + 1
|
||||
local format_seconds = function (seconds)
|
||||
return string.format("%d:%02d",
|
||||
- seconds / 60,
|
||||
+ math.floor(seconds / 60),
|
||||
seconds % 60)
|
||||
end
|
||||
local times = ""
|
||||
15
monotone-1.1-lua-ql.patch
Normal file
15
monotone-1.1-lua-ql.patch
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
The LUA_QL macro was removed in lua 5.4.0. Make the same transformation
|
||||
as was made in the lua code itself.
|
||||
|
||||
diff -up monotone-1.1/src/lua_hooks.cc.orig monotone-1.1/src/lua_hooks.cc
|
||||
--- monotone-1.1/src/lua_hooks.cc.orig 2014-05-04 03:15:17.000000000 -0600
|
||||
+++ monotone-1.1/src/lua_hooks.cc 2020-06-30 10:22:58.480017092 -0600
|
||||
@@ -90,7 +90,7 @@ extern "C"
|
||||
s = lua_tostring(LS, -1);
|
||||
if (s == NULL)
|
||||
return luaL_error(
|
||||
- LS, LUA_QL("tostring") " must return a string to ", LUA_QL("print")
|
||||
+ LS, "'tostring' must return a string to 'print'"
|
||||
);
|
||||
|
||||
if (i > 1)
|
||||
66
monotone-1.1-pcre.patch
Normal file
66
monotone-1.1-pcre.patch
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
From 70f209ad582121750d54e3692b1e62c7f36af6f9 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||
Date: Mon, 7 May 2018 14:09:06 +0200
|
||||
Subject: [PATCH] Adapt to changes in pcre-8.42
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
pcre-8.42 replaced internal real_pcre with real_pcre8_or_16. This
|
||||
broke monotone that decided not to use the public "pcre" type.
|
||||
|
||||
This patch adapts monotone to the pcre >= 8.42.
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
src/pcrewrap.cc | 4 ++--
|
||||
src/pcrewrap.hh | 4 ++--
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/pcrewrap.cc b/src/pcrewrap.cc
|
||||
index 8c0c9d1..30bafff 100644
|
||||
--- a/src/pcrewrap.cc
|
||||
+++ b/src/pcrewrap.cc
|
||||
@@ -74,7 +74,7 @@ get_capturecount(void const * bd)
|
||||
namespace pcre
|
||||
{
|
||||
typedef map<char const *,
|
||||
- pair<struct real_pcre const *, struct pcre_extra const *> >
|
||||
+ pair<struct real_pcre8_or_16 const *, struct pcre_extra const *> >
|
||||
regex_cache;
|
||||
|
||||
class regex_cache_manager
|
||||
@@ -86,7 +86,7 @@ public:
|
||||
}
|
||||
|
||||
void store(char const * pattern,
|
||||
- pair<struct real_pcre const *, struct pcre_extra const *>
|
||||
+ pair<struct real_pcre8_or_16 const *, struct pcre_extra const *>
|
||||
data)
|
||||
{
|
||||
cache[pattern] = data;
|
||||
diff --git a/src/pcrewrap.hh b/src/pcrewrap.hh
|
||||
index 3359cdd..5008e88 100644
|
||||
--- a/src/pcrewrap.hh
|
||||
+++ b/src/pcrewrap.hh
|
||||
@@ -18,7 +18,7 @@
|
||||
// definitions and so we don't actually expose it here. Unfortunately, this
|
||||
// means we have to hope this pair of forward declarations will not change...
|
||||
|
||||
-struct real_pcre;
|
||||
+struct real_pcre8_or_16;
|
||||
struct pcre_extra;
|
||||
|
||||
namespace pcre
|
||||
@@ -61,7 +61,7 @@ namespace pcre
|
||||
regex & operator=(regex const &);
|
||||
|
||||
// data
|
||||
- struct real_pcre const * basedat;
|
||||
+ struct real_pcre8_or_16 const * basedat;
|
||||
struct pcre_extra const * extradat;
|
||||
|
||||
// used by constructors
|
||||
--
|
||||
2.14.3
|
||||
|
||||
23
monotone-1.1-py3.patch
Normal file
23
monotone-1.1-py3.patch
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
diff -up monotone-1.1/extra/mtn-hooks/monotone-ciabot.py.orig monotone-1.1/extra/mtn-hooks/monotone-ciabot.py
|
||||
--- monotone-1.1/extra/mtn-hooks/monotone-ciabot.py.orig 2019-08-10 09:00:03.203454091 +0200
|
||||
+++ monotone-1.1/extra/mtn-hooks/monotone-ciabot.py 2019-08-10 09:07:13.873700583 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/env python3
|
||||
#
|
||||
# Copyright (C) Nathaniel Smith <njs@pobox.com>
|
||||
# Timothy Brownawell <tbrownaw@gmail.com>
|
||||
@@ -192,10 +192,10 @@ def escape_for_xml(text, is_attrib=0):
|
||||
|
||||
def send_message(message, c):
|
||||
if c.delivery == "debug":
|
||||
- print message
|
||||
+ print(message)
|
||||
elif c.delivery == "xmlrpc":
|
||||
- import xmlrpclib
|
||||
- xmlrpclib.ServerProxy(c.xmlrpc_server).hub.deliver(message)
|
||||
+ import xmlrpc.client
|
||||
+ xmlrpc.client.ServerProxy(c.xmlrpc_server).hub.deliver(message)
|
||||
elif c.delivery == "email":
|
||||
import smtplib
|
||||
smtp = smtplib.SMTP(c.smtp_server)
|
||||
28
monotone-1.1-string-overflow.patch
Normal file
28
monotone-1.1-string-overflow.patch
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
Ensure that the string in SSH_AUTH_SOCK is not too large to fit in a Unix
|
||||
sockaddr, and only copy the bytes of the supplied string. The original code
|
||||
goes on to copy bytes beyond the end of the string.
|
||||
|
||||
--- monotone-1.1/src/unix/ssh_agent_platform.cc.orig 2014-05-04 03:15:18.000000000 -0600
|
||||
+++ monotone-1.1/src/unix/ssh_agent_platform.cc 2020-06-30 12:25:54.068518536 -0600
|
||||
@@ -35,8 +35,9 @@ static int
|
||||
connect_to_agent()
|
||||
{
|
||||
const char *authsocket = getenv("SSH_AUTH_SOCK");
|
||||
+ struct sockaddr_un addr;
|
||||
|
||||
- if (!authsocket || !*authsocket)
|
||||
+ if (!authsocket || !*authsocket || strlen(authsocket) >= sizeof(addr.sun_path))
|
||||
{
|
||||
L(FL("ssh_agent: no agent"));
|
||||
return -1;
|
||||
@@ -57,9 +58,8 @@ connect_to_agent()
|
||||
return -1;
|
||||
}
|
||||
|
||||
- struct sockaddr_un addr;
|
||||
addr.sun_family = AF_UNIX;
|
||||
- strncpy(addr.sun_path, authsocket, sizeof(addr.sun_path));
|
||||
+ strcpy(addr.sun_path, authsocket);
|
||||
|
||||
if (::connect(sock, (struct sockaddr *)&addr, sizeof addr))
|
||||
{
|
||||
62
monotone-server-genkey
Executable file
62
monotone-server-genkey
Executable file
|
|
@ -0,0 +1,62 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Generate a new private server key for the Monotone Server, if needed
|
||||
#
|
||||
# Author: Thomas Moschny <thomas.moschny@gmx.de>
|
||||
#
|
||||
set -eu
|
||||
|
||||
MONOTONE_CONFDIR="${MONOTONE_CONFDIR:-/etc/monotone}"
|
||||
MONOTONE_KEYDIR="${MONOTONE_KEYDIR:-/etc/monotone/private-keys}"
|
||||
MONOTONE_DBFILE="${MONOTONE_DBFILE:-/var/lib/monotone/server.mtn}"
|
||||
MONOTONE_PPFILE="${MONOTONE_PPFILE:-/etc/monotone/passphrase.lua}"
|
||||
|
||||
MONOTONE_KEYID="${MONOTONE_KEYID:-monotone@$(hostname -f)}"
|
||||
MONOTONE_HOME="${MONOTONE_HOME:-/var/lib/monotone}"
|
||||
|
||||
cd "${MONOTONE_HOME}"
|
||||
|
||||
# check for existing keys
|
||||
for key in "${MONOTONE_KEYDIR}/${MONOTONE_KEYID}"* ; do
|
||||
if [ -e "${key}" ] ; then
|
||||
echo $"Found private key $key"
|
||||
exit
|
||||
fi
|
||||
done
|
||||
|
||||
# check for existing rc file
|
||||
if [ -s "${MONOTONE_PPFILE}" ] ; then
|
||||
echo >&2 $"Not overwriting passphrase file ${MONOTONE_PPFILE}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# no key found, let's generate one
|
||||
echo $"Generating key for server ${MONOTONE_KEYID}"
|
||||
|
||||
# generate random passphrase
|
||||
passphrase="$(dd 2>/dev/null if=/dev/urandom bs=1 count=16 | hexdump -ve '/1 "%02x"')"
|
||||
|
||||
# generate keypair, needs to be run as root
|
||||
{ echo "${passphrase}"; echo "${passphrase}" ; } |
|
||||
mtn --confdir="${MONOTONE_CONFDIR}" --db="${MONOTONE_DBFILE}" \
|
||||
--keydir="${MONOTONE_KEYDIR}" --force-duplicate-key \
|
||||
genkey "${MONOTONE_KEYID}"
|
||||
|
||||
# fix permissions
|
||||
for key in "${MONOTONE_KEYDIR}/${MONOTONE_KEYID}"* ; do
|
||||
if [ -e "${key}" ] ; then
|
||||
chgrp monotone "${key}"
|
||||
chmod 0640 "${key}"
|
||||
break
|
||||
fi
|
||||
echo >&2 $"No key found, key generation failed?"
|
||||
exit 1
|
||||
done
|
||||
|
||||
# generate rc file
|
||||
install -o root -g monotone -m 0440 /dev/null "${MONOTONE_PPFILE}"
|
||||
cat > "${MONOTONE_PPFILE}" <<EOF
|
||||
function get_passphrase(keyid)
|
||||
return "${passphrase}"
|
||||
end
|
||||
EOF
|
||||
23
monotone-server-import
Executable file
23
monotone-server-import
Executable file
|
|
@ -0,0 +1,23 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Import packages into the Monotone Server database
|
||||
#
|
||||
# Author: Thomas Moschny <thomas.moschny@gmx.de>
|
||||
#
|
||||
set -eu
|
||||
|
||||
MONOTONE_CONFDIR="${MONOTONE_CONFDIR:-/etc/monotone}"
|
||||
MONOTONE_KEYDIR="${MONOTONE_KEYDIR:-/etc/monotone/private-keys}"
|
||||
MONOTONE_DBFILE="${MONOTONE_DBFILE:-/var/lib/monotone/server.mtn}"
|
||||
MONOTONE_PPFILE="${MONOTONE_PPFILE:-/etc/monotone/passphrase.lua}"
|
||||
|
||||
MONOTONE_KEYID="${MONOTONE_KEYID:-monotone@$(hostname -f)}"
|
||||
MONOTONE_HOME="${MONOTONE_HOME:-/var/lib/monotone}"
|
||||
|
||||
cd "${MONOTONE_HOME}"
|
||||
|
||||
echo $"Importing packets into ${MONOTONE_DBFILE}"
|
||||
|
||||
runuser -u monotone -- mtn --confdir="${MONOTONE_CONFDIR}" \
|
||||
--db="${MONOTONE_DBFILE}" --keydir="${MONOTONE_KEYDIR}" \
|
||||
read
|
||||
34
monotone-server-initdb
Executable file
34
monotone-server-initdb
Executable file
|
|
@ -0,0 +1,34 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Initialize a new database for the Monotone Server, if needed
|
||||
#
|
||||
# Author: Thomas Moschny <thomas.moschny@gmx.de>
|
||||
#
|
||||
set -eu
|
||||
|
||||
MONOTONE_CONFDIR="${MONOTONE_CONFDIR:-/etc/monotone}"
|
||||
MONOTONE_KEYDIR="${MONOTONE_KEYDIR:-/etc/monotone/private-keys}"
|
||||
MONOTONE_DBFILE="${MONOTONE_DBFILE:-/var/lib/monotone/server.mtn}"
|
||||
MONOTONE_PPFILE="${MONOTONE_PPFILE:-/etc/monotone/passphrase.lua}"
|
||||
|
||||
MONOTONE_KEYID="${MONOTONE_KEYID:-monotone@$(hostname -f)}"
|
||||
MONOTONE_HOME="${MONOTONE_HOME:-/var/lib/monotone}"
|
||||
|
||||
cd "${MONOTONE_HOME}"
|
||||
|
||||
# check for existing database
|
||||
if [ -s "${MONOTONE_DBFILE}" ] ; then
|
||||
echo $"Found database ${MONOTONE_DBFILE}"
|
||||
exit
|
||||
fi
|
||||
|
||||
# no db found
|
||||
echo $"Creating dababase ${MONOTONE_DBFILE}"
|
||||
|
||||
# create database
|
||||
runuser -u monotone -- mtn --confdir="${MONOTONE_CONFDIR}" \
|
||||
--db="${MONOTONE_DBFILE}" --keydir="${MONOTONE_KEYDIR}" \
|
||||
db init
|
||||
|
||||
# fix permissions
|
||||
chmod 0640 "${MONOTONE_DBFILE}"
|
||||
41
monotone-server-migratedb
Executable file
41
monotone-server-migratedb
Executable file
|
|
@ -0,0 +1,41 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Migrate the Monotone Server database, if needed
|
||||
#
|
||||
# Author: Thomas Moschny <thomas.moschny@gmx.de>
|
||||
#
|
||||
set -eu
|
||||
|
||||
MONOTONE_CONFDIR="${MONOTONE_CONFDIR:-/etc/monotone}"
|
||||
MONOTONE_KEYDIR="${MONOTONE_KEYDIR:-/etc/monotone/private-keys}"
|
||||
MONOTONE_DBFILE="${MONOTONE_DBFILE:-/var/lib/monotone/server.mtn}"
|
||||
MONOTONE_PPFILE="${MONOTONE_PPFILE:-/etc/monotone/passphrase.lua}"
|
||||
|
||||
MONOTONE_KEYID="${MONOTONE_KEYID:-monotone@$(hostname -f)}"
|
||||
MONOTONE_HOME="${MONOTONE_HOME:-/var/lib/monotone}"
|
||||
|
||||
cd "${MONOTONE_HOME}"
|
||||
|
||||
# check database
|
||||
version="$(LC_ALL=C runuser -u monotone -- mtn \
|
||||
--confdir="${MONOTONE_CONFDIR}" --db="${MONOTONE_DBFILE}" \
|
||||
--keydir="${MONOTONE_KEYDIR}" db version)"
|
||||
|
||||
case ${version} in
|
||||
*"("usable")"*)
|
||||
echo $"Database is usable"
|
||||
exit
|
||||
;;
|
||||
esac
|
||||
|
||||
# database needs migration
|
||||
echo $"Migrating dababase ${MONOTONE_DBFILE}"
|
||||
|
||||
# migrate database
|
||||
runuser -u monotone -- mtn --confdir="${MONOTONE_CONFDIR}" \
|
||||
--db="${MONOTONE_DBFILE}" --keydir="${MONOTONE_KEYDIR}" \
|
||||
db migrate
|
||||
|
||||
runuser -u monotone -- mtn --confdir="${MONOTONE_CONFDIR}" \
|
||||
--db="${MONOTONE_DBFILE}" --keydir="${MONOTONE_KEYDIR}" \
|
||||
db regenerate_caches
|
||||
2
monotone-server-sysusers.conf
Normal file
2
monotone-server-sysusers.conf
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
#Type Name ID GECOS Home directory Shell
|
||||
u monotone - "Monotone Netsync Server" /var/lib/monotone
|
||||
1
monotone-server-tmpfiles.conf
Normal file
1
monotone-server-tmpfiles.conf
Normal file
|
|
@ -0,0 +1 @@
|
|||
D /var/run/monotone 0755 monotone monotone -
|
||||
22
monotone.service
Normal file
22
monotone.service
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
[Unit]
|
||||
Description=Monotone DVCS Server
|
||||
After=local-fs.target
|
||||
After=network-online.target
|
||||
|
||||
[Service]
|
||||
User=monotone
|
||||
Group=monotone
|
||||
PermissionsStartOnly=yes
|
||||
Environment=MONOTONE_PPFILE=/etc/monotone/passphrase.lua
|
||||
Environment=MONOTONE_KEYDIR=/etc/monotone/private-keys
|
||||
Environment=MONOTONE_CONFDIR=/etc/monotone
|
||||
Environment=MONOTONE_DBFILE=/var/lib/monotone/server.mtn
|
||||
EnvironmentFile=-/etc/sysconfig/monotone
|
||||
ExecStartPre=/usr/libexec/monotone-server-initdb
|
||||
ExecStartPre=/usr/libexec/monotone-server-migratedb
|
||||
ExecStartPre=/usr/libexec/monotone-server-genkey
|
||||
PIDFile=/run/monotone/monotone-server.pid
|
||||
ExecStart=/usr/sbin/monotone-server --confdir=${MONOTONE_CONFDIR} --db=${MONOTONE_DBFILE} --keydir=${MONOTONE_KEYDIR} --rcfile=${MONOTONE_PPFILE} --pid-file=/run/monotone/monotone-server.pid serve
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
646
monotone.spec
Normal file
646
monotone.spec
Normal file
|
|
@ -0,0 +1,646 @@
|
|||
Name: monotone
|
||||
Version: 1.1
|
||||
Release: 53%{?dist}
|
||||
Summary: A free, distributed version control system
|
||||
# Automatically converted from old format: GPLv2+ - review is highly recommended.
|
||||
License: GPL-2.0-or-later
|
||||
URL: http://monotone.ca/
|
||||
Source0: http://monotone.ca/downloads/%{version}/%{name}-%{version}.tar.bz2
|
||||
Source1: monotone.service
|
||||
Source2: monotone.sysconfig
|
||||
Source3: README.monotone-server
|
||||
Source4: monotone-server-tmpfiles.conf
|
||||
Source5: monotone-server-initdb
|
||||
Source6: monotone-server-migratedb
|
||||
Source7: monotone-server-genkey
|
||||
Source8: monotone-server-import
|
||||
Source9: monotone-server-sysusers.conf
|
||||
Patch0: monotone-1.0-stacktrace-on-crash.patch
|
||||
Patch1: monotone-1.1-iostream.patch
|
||||
Patch2: monotone-1.1-lua-integer.patch
|
||||
Patch3: monotone-1.1-pcre.patch
|
||||
Patch4: monotone-1.1-py3.patch
|
||||
Patch5: monotone-1.1-lua-ql.patch
|
||||
Patch6: monotone-1.1-boost.patch
|
||||
Patch7: monotone-1.1-string-overflow.patch
|
||||
Patch8: monotone-1.1-catch.patch
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: make
|
||||
BuildRequires: perl-generators
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: boost-devel >= 1.33.1
|
||||
BuildRequires: botan-devel >= 1.6.3
|
||||
BuildRequires: pcre-devel >= 7.4
|
||||
BuildRequires: sqlite-devel >= 3.3.8
|
||||
BuildRequires: lua-devel >= 5.1
|
||||
BuildRequires: libidn-devel
|
||||
BuildRequires: systemd
|
||||
BuildRequires: systemd-rpm-macros
|
||||
%{?sysusers_requires_compat}
|
||||
|
||||
# Required by the test suite:
|
||||
BuildRequires: cvs
|
||||
BuildRequires: bash-completion
|
||||
BuildRequires: expect
|
||||
|
||||
|
||||
# Filter unwanted dependencies
|
||||
%{?perl_default_filter}
|
||||
|
||||
%description
|
||||
monotone is a free, distributed version control system.
|
||||
It provides fully disconnected operation, manages complete
|
||||
tree versions, keeps its state in a local transactional
|
||||
database, supports overlapping branches and extensible
|
||||
metadata, exchanges work over plain network protocols,
|
||||
performs history-sensitive merging, and delegates trust
|
||||
functions to client-side RSA certificates.
|
||||
|
||||
|
||||
%package server
|
||||
Summary: Standalone server setup for monotone
|
||||
Requires: monotone = %{version}-%{release}
|
||||
Requires(pre): shadow-utils
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
|
||||
|
||||
%description server
|
||||
This package provides an easy-to-use standalone server setup for monotone.
|
||||
|
||||
|
||||
%package -n perl-Monotone
|
||||
Summary: Perl Module for monotone
|
||||
Requires: monotone = %{version}-%{release}
|
||||
|
||||
|
||||
%description -n perl-Monotone
|
||||
This is a simple Perl module to start a monotone automate sub-process
|
||||
and then pass commands to it.
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
|
||||
|
||||
%build
|
||||
export LC_MESSAGES=en_US
|
||||
%configure
|
||||
%make_build
|
||||
|
||||
|
||||
%check
|
||||
#export LC_MESSAGES=en_US
|
||||
#export DISABLE_NETWORK_TESTS=1
|
||||
#export MTN_STACKTRACE_ON_CRASH=1
|
||||
#make check || { head -n-0 test/work/*.log; false; }
|
||||
|
||||
|
||||
%install
|
||||
export LC_MESSAGES=en_US
|
||||
%make_install
|
||||
rm -f %{buildroot}%{_infodir}/dir
|
||||
mv %{buildroot}%{_datadir}/doc/%{name} _doc
|
||||
|
||||
%find_lang %{name}
|
||||
|
||||
mkdir -p %{buildroot}%{_sbindir}
|
||||
mkdir -p %{buildroot}%{_localstatedir}/lib
|
||||
ln -snf ../bin/mtn %{buildroot}%{_sbindir}/monotone-server
|
||||
ln -snf mtn.1 %{buildroot}%{_mandir}/man1/monotone-server.1
|
||||
install -D -m 0644 -p %{SOURCE1} %{buildroot}%{_unitdir}/monotone.service
|
||||
|
||||
install -D -m 0644 -p %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/monotone
|
||||
install -d -m 0755 %{buildroot}%{_sysconfdir}/monotone
|
||||
install -d -m 0750 %{buildroot}%{_sysconfdir}/monotone/private-keys
|
||||
install -d -m 0770 %{buildroot}%{_localstatedir}/lib/monotone
|
||||
install -d -m 0755 %{buildroot}%{_localstatedir}/run/monotone
|
||||
install -D -m 0644 %{SOURCE4} \
|
||||
%{buildroot}%{_tmpfilesdir}/monotone.conf
|
||||
|
||||
install -D -m 0755 -p %{SOURCE5} %{buildroot}%{_libexecdir}/monotone-server-initdb
|
||||
install -D -m 0755 -p %{SOURCE6} %{buildroot}%{_libexecdir}/monotone-server-migratedb
|
||||
install -D -m 0755 -p %{SOURCE7} %{buildroot}%{_libexecdir}/monotone-server-genkey
|
||||
install -D -m 0755 -p %{SOURCE8} %{buildroot}%{_libexecdir}/monotone-server-import
|
||||
|
||||
# These do not actually wind up in the package, due to %%ghost.
|
||||
install -m 0440 /dev/null \
|
||||
%{buildroot}%{_sysconfdir}/monotone/passphrase.lua
|
||||
install -m 0640 /dev/null \
|
||||
%{buildroot}%{_sysconfdir}/monotone/read-permissions
|
||||
install -m 0640 /dev/null \
|
||||
%{buildroot}%{_sysconfdir}/monotone/write-permissions
|
||||
install -m 0644 /dev/null \
|
||||
%{buildroot}%{_sysconfdir}/monotone/monotonerc
|
||||
install -m 0640 /dev/null \
|
||||
%{buildroot}%{_localstatedir}/lib/monotone/server.mtn
|
||||
|
||||
install -m 0644 -p %{SOURCE3} .
|
||||
|
||||
install -D -m 0644 -p contrib/Monotone.pm \
|
||||
%{buildroot}%{perl_vendorlib}/Monotone.pm
|
||||
|
||||
mkdir -p %{buildroot}%{_datadir}/bash-completion/completions
|
||||
mv %{buildroot}%{_sysconfdir}/bash_completion.d/monotone.bash_completion \
|
||||
%{buildroot}%{_datadir}/bash-completion/completions/%{name}.bash_completion
|
||||
|
||||
install -p -D -m 0644 %{SOURCE9} %{buildroot}%{_sysusersdir}/monotone-server.conf
|
||||
|
||||
|
||||
%files -f %{name}.lang
|
||||
%doc AUTHORS NEWS README UPGRADE
|
||||
%doc _doc/*
|
||||
%license COPYING
|
||||
%{_bindir}/mtn
|
||||
%{_bindir}/mtnopt
|
||||
%{_bindir}/mtn-cleanup
|
||||
%{_infodir}/monotone.info*
|
||||
%dir %{_datadir}/bash-completion
|
||||
%dir %{_datadir}/bash-completion/completions
|
||||
%{_datadir}/bash-completion/completions/%{name}.bash_completion
|
||||
%{_mandir}/man1/mtn.1*
|
||||
%{_mandir}/man1/mtnopt.1*
|
||||
%{_mandir}/man1/mtn-cleanup.1*
|
||||
%{_datadir}/monotone
|
||||
|
||||
|
||||
%files -n perl-Monotone
|
||||
%{perl_vendorlib}/Monotone.pm
|
||||
|
||||
|
||||
%files server
|
||||
%doc README.monotone-server
|
||||
%{_sbindir}/monotone-server
|
||||
%{_mandir}/man1/monotone-server.1*
|
||||
%{_unitdir}/monotone.service
|
||||
%{_libexecdir}/monotone-server-initdb
|
||||
%{_libexecdir}/monotone-server-migratedb
|
||||
%{_libexecdir}/monotone-server-genkey
|
||||
%{_libexecdir}/monotone-server-import
|
||||
%dir %attr(0755,monotone,monotone) %{_localstatedir}/run/monotone
|
||||
%{_tmpfilesdir}/monotone.conf
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/monotone
|
||||
%dir %attr(0755,root,monotone) %{_sysconfdir}/monotone
|
||||
%dir %attr(0750,root,monotone) %{_sysconfdir}/monotone/private-keys
|
||||
%attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_sysconfdir}/monotone/monotonerc
|
||||
%attr(0440,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_sysconfdir}/monotone/passphrase.lua
|
||||
%attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_sysconfdir}/monotone/read-permissions
|
||||
%attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_sysconfdir}/monotone/write-permissions
|
||||
%dir %attr(0770,monotone,monotone) %{_localstatedir}/lib/monotone
|
||||
%attr(0660,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_localstatedir}/lib/monotone/server.mtn
|
||||
%{_sysusersdir}/monotone-server.conf
|
||||
|
||||
|
||||
%pre server
|
||||
%sysusers_create_compat %{SOURCE9}
|
||||
|
||||
|
||||
%post server
|
||||
%systemd_post monotone.service
|
||||
|
||||
|
||||
%preun server
|
||||
%systemd_preun monotone.service
|
||||
|
||||
|
||||
%postun server
|
||||
%systemd_postun monotone.service
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Aug 28 2025 Thomas Moschny <thomas.moschny@gmx.de> - 1.1-53
|
||||
- Update for current users and groups guidelines.
|
||||
|
||||
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-52
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-51
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 1.1-50
|
||||
- convert license to SPDX
|
||||
|
||||
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-49
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-48
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-47
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-46
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-45
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-44
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Mon May 30 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1.1-43
|
||||
- Perl 5.36 rebuild
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-42
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-41
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1.1-40
|
||||
- Perl 5.34 rebuild
|
||||
|
||||
* Mon Feb 8 2021 Thomas Moschny <thomas.moschny@gmx.de> - 1.1-39
|
||||
- Move bash completions to /usr/share/bash-completion/completions (bz#1855768).
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-38
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-37
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-36
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jun 30 2020 Jerry James <loganjerry@gmail.com> - 1.1-35
|
||||
- Add lua-ql patch due to removal of LUA_QL from lua
|
||||
- Add boost patch to fix single-letter macro name clash (bz 1851313)
|
||||
- Add string-overflow patch to fix a potential buffer overflow
|
||||
- Add catch patch to silence a large number of compiler warnings
|
||||
|
||||
* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.1-35
|
||||
- Perl 5.32 rebuild
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-34
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Sat Aug 10 2019 Thomas Moschny <thomas.moschny@gmx.de> - 1.1-33
|
||||
- Patch extra/mtn-hooks/monotone-ciabot.py to use Python3 (bz#1738073).
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-32
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.1-31
|
||||
- Perl 5.30 rebuild
|
||||
|
||||
* Sat Feb 9 2019 Thomas Moschny <thomas.moschny@gmx.de> - 1.1-30
|
||||
- Fix F30 FTBFS.
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-29
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-28
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Jun 27 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1.1-27
|
||||
- Perl 5.28 rebuild
|
||||
|
||||
* Tue May 22 2018 Thomas Moschny <thomas.moschny@gmx.de> - 1.1-26
|
||||
- Add patch for PCRE >= 8.42 (rhbz#1555231, thanks P. Pisar).
|
||||
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-25
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-24
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-23
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Sun Jun 04 2017 Jitka Plesnikova <jplesnik@redhat.com> - 1.1-22
|
||||
- Perl 5.26 rebuild
|
||||
|
||||
* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-20
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Fri Jan 27 2017 Jonathan Wakely <jwakely@redhat.com> - 1.1-19
|
||||
- Rebuilt for Boost 1.63
|
||||
|
||||
* Fri Jan 27 2017 Jonathan Wakely <jwakely@redhat.com> - 1.1-18
|
||||
- Rebuilt for Boost 1.63
|
||||
|
||||
* Sat Jan 14 2017 Ville Skyttä <ville.skytta@iki.fi> - 1.1-17
|
||||
- Move tmpfiles.d config to %%{_tmpfilesdir}
|
||||
|
||||
* Sun May 15 2016 Jitka Plesnikova <jplesnik@redhat.com> - 1.1-15
|
||||
- Perl 5.24 rebuild
|
||||
|
||||
* Sun Feb 14 2016 Thomas Moschny <thomas.moschny@gmx.de> - 1.1-14
|
||||
- Switch monotone-server to systemd (#789901).
|
||||
- Mark COPYING as %%license.
|
||||
- Do not own /etc/bash_completion.d.
|
||||
- Update README.monotone-server.
|
||||
|
||||
* Mon Feb 8 2016 Thomas Moschny <thomas.moschny@gmx.de> - 1.1-13
|
||||
- Rebuild for Botan 1.10.12.
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Fri Jan 15 2016 Jonathan Wakely <jwakely@redhat.com> - 1.1-11
|
||||
- Rebuilt for Boost 1.60
|
||||
|
||||
* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 1.1-10
|
||||
- Rebuilt for Boost 1.59
|
||||
|
||||
* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
|
||||
|
||||
* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 1.1-8
|
||||
- rebuild for Boost 1.58
|
||||
|
||||
* Mon Jun 22 2015 Thomas Moschny <thomas.moschny@gmx.de> - 1.1-7
|
||||
- Add patch to fix FTBFS with Lua 5.3 (rhbz#1185790).
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Sat Jun 06 2015 Jitka Plesnikova <jplesnik@redhat.com> - 1.1-5
|
||||
- Perl 5.22 rebuild
|
||||
|
||||
* Thu Jan 29 2015 Petr Machata <pmachata@redhat.com> - 1.1-4
|
||||
- Rebuild for boost 1.57.0
|
||||
- Include <iostream> in tests/merge_3way.cc
|
||||
(monotone-1.1-iostream.patch)
|
||||
|
||||
* Tue Aug 26 2014 Jitka Plesnikova <jplesnik@redhat.com> - 1.1-3
|
||||
- Perl 5.20 rebuild
|
||||
|
||||
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Fri Jul 18 2014 Thomas Moschny <thomas.moschny@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@lists.fedoraproject.org> - 1.0-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Fri May 23 2014 Petr Machata <pmachata@redhat.com> - 1.0-16
|
||||
- Rebuild for boost 1.55.0
|
||||
|
||||
* Tue Oct 8 2013 Thomas Moschny <thomas.moschny@gmx.de> - 1.0-15
|
||||
- Add patches for building with Botan 1.10, Lua 5.2,
|
||||
and Texinfo >= 5.0.
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Tue Jul 30 2013 Petr Machata <pmachata@redhat.com> - 1.0-13
|
||||
- Rebuild for boost 1.54.0
|
||||
|
||||
* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 1.0-12
|
||||
- Perl 5.18 rebuild
|
||||
|
||||
* Sat Mar 9 2013 Thomas Moschny <thomas.moschny@gmx.de> - 1.0-11
|
||||
- Fix building against Boost 1.53 (FTBFS bug rhbz#914191).
|
||||
- Fix failing bash completion test.
|
||||
- Add patch to temporarily disable a failing check in one test (rhbz#919827).
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Fri Jun 08 2012 Petr Pisar <ppisar@redhat.com> - 1.0-8
|
||||
- Perl 5.16 rebuild
|
||||
|
||||
* Thu Feb 16 2012 Thomas Moschny <thomas.moschny@gmx.de> - 1.0-7
|
||||
- Add patch to fix building with newer pcre.
|
||||
|
||||
* Fri Feb 10 2012 Petr Pisar <ppisar@redhat.com> - 1.0-6
|
||||
- Rebuild against PCRE 8.30
|
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Mon Sep 26 2011 Dan Horák <dan[at]danny.cz> - 1.0-4
|
||||
- fix FTBFS due a symbol conflict with boost
|
||||
|
||||
* Mon Jun 20 2011 Marcela Mašláňová <mmaslano@redhat.com> - 1.0-3
|
||||
- Perl mass rebuild
|
||||
|
||||
* Thu Jun 09 2011 Marcela Mašláňová <mmaslano@redhat.com> - 1.0-2
|
||||
- Perl 5.14 mass rebuild
|
||||
|
||||
* Sat May 14 2011 Thomas Moschny <thomas.moschny@gmx.de> - 1.0-1
|
||||
- Update to 1.0.
|
||||
- Upstream ships bzip2 archives now.
|
||||
- monotone.el is no longer shipped.
|
||||
- Bash completion is installed by 'make install'.
|
||||
- Add BR on bash-completion, needed for the testsuite.
|
||||
- Fix postun snippet for -server package.
|
||||
- On Fedora 15 and later, use the tmpfiles.d service to create the
|
||||
/var/run/monotone directory.
|
||||
- Add a patch to prevent a name clash with struct file_handle defined
|
||||
by fcntl.h in glibc 2.14.
|
||||
- Add a patch fixing broken helptexts and manpage.
|
||||
- Explicitly disable network access by the testsuite.
|
||||
- Fix some rpmlint warnings.
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.99.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Sun Oct 31 2010 Thomas Moschny <thomas.moschny@gmx.de> - 0.99.1-1
|
||||
- Update to 0.99.1.
|
||||
- Remove patch already applied upstream.
|
||||
|
||||
* Fri Oct 29 2010 Thomas Moschny <thomas.moschny@gmx.de> - 0.99-1
|
||||
- Update to 0.99.
|
||||
- Remove patch already applied upstream.
|
||||
- Add patch for monotone bug #100.
|
||||
- Include the monotone manpage in the package.
|
||||
- Specfile cleanups.
|
||||
|
||||
* Wed Oct 27 2010 Thomas Moschny <thomas.moschny@gmx.de> - 0.48.1-1
|
||||
- Update to 0.48.1.
|
||||
- Add patch from upstream to support newer sqlite.
|
||||
|
||||
* Mon Jun 14 2010 Thomas Moschny <thomas.moschny@gmx.de> - 0.48-1
|
||||
- Update to 0.48.
|
||||
|
||||
* Sat May 8 2010 Thomas Moschny <thomas.moschny@gmx.de> - 0.47-3
|
||||
- Add patch from upstream for a bug that prevents successful execution
|
||||
of push / pull / sync over pipes.
|
||||
|
||||
* Thu Apr 29 2010 Marcela Maslanova <mmaslano@redhat.com> - 0.47-2
|
||||
- Mass rebuild with perl-5.12.0
|
||||
|
||||
* Sun Apr 11 2010 Thomas Moschny <thomas.moschny@gmx.de> - 0.47-1
|
||||
- Update to 0.47.
|
||||
- Remove patch applied upstream.
|
||||
|
||||
* Sat Jan 23 2010 Thomas Moschny <thomas.moschny@gmx.de> - 0.46-1
|
||||
- Update to 0.46.
|
||||
- Remove patch applied upstream.
|
||||
- Add patch from trunk for failing test.
|
||||
- Fix installation of documentation: include figures in the package.
|
||||
- Let tests in the testsuite run in parallel.
|
||||
|
||||
* Mon Dec 7 2009 Stepan Kasal <skasal@redhat.com> - 0.45-2
|
||||
- rebuild against perl 5.10.1
|
||||
|
||||
* Sat Sep 12 2009 Thomas Moschny <thomas.moschny@gmx.de> - 0.45-1
|
||||
- Update to 0.45.
|
||||
|
||||
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.44-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Wed May 13 2009 Thomas Moschny <thomas.moschny@gmx.de> - 0.44-1
|
||||
- Update to 0.44.
|
||||
|
||||
* Sat Apr 25 2009 Thomas Moschny <thomas.moschny@gmx.de> - 0.43-2
|
||||
- Rebuilt for new botan version.
|
||||
|
||||
* Fri Mar 27 2009 Thomas Moschny <thomas.moschny@gmx.de> - 0.43-1
|
||||
- Update to 0.43.
|
||||
- Add BRs for libraries monotone doesn't bundle anylonger.
|
||||
- Drop patches applied upstream.
|
||||
|
||||
* Fri Feb 27 2009 Thomas Moschny <thomas.moschny@gmx.de> - 0.42-5
|
||||
- Add one more netsync related patch from trunk.
|
||||
|
||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.42-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Mon Feb 9 2009 Thomas Moschny <thomas.moschny@gmx.de> - 0.42-3
|
||||
- Disable %%{_smp_mflags} in the testsuite, causes strange errors.
|
||||
- Fix two issues with gcc44.
|
||||
- Add patch from upstream fixing netsync printing an error message of
|
||||
the form "peer [...] IO failed in confirmed state (success)".
|
||||
|
||||
* Fri Jan 2 2009 Thomas Moschny <thomas.moschny@gmx.de> - 0.42-2
|
||||
- Pack Monotone.pm (in a subpackage). (#450267)
|
||||
|
||||
* Fri Jan 2 2009 Thomas Moschny <thomas.moschny@gmx.de> - 0.42-1
|
||||
- Updated for 0.42 release.
|
||||
|
||||
* Fri Sep 12 2008 Thomas Moschny <thomas.moschny@gmx.de> - 0.41-1
|
||||
- Updated for 0.41 release.
|
||||
- Added mtnopt helper.
|
||||
|
||||
* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0.40-2
|
||||
- fix license tag
|
||||
|
||||
* Mon Apr 14 2008 Roland McGrath <roland@redhat.com> - 0.40-1
|
||||
- Updated for 0.40 release.
|
||||
- Tweaked trivia for packaging guidelines nits.
|
||||
|
||||
* Mon Feb 25 2008 Roland McGrath <roland@redhat.com> - 0.39-1
|
||||
- Updated for 0.39 release.
|
||||
|
||||
* Sat Dec 22 2007 Roland McGrath <roland@redhat.com> - 0.38-2
|
||||
- Fix monotone-server user creation. (#426607)
|
||||
- Moved monotone-server database to /var/lib. (#426608)
|
||||
- Use monotone@ in server key name. (#426609)
|
||||
|
||||
* Fri Dec 21 2007 Roland McGrath <roland@redhat.com> - 0.38-1
|
||||
- Updated for 0.38 release.
|
||||
|
||||
* Sat Oct 27 2007 Roland McGrath <roland@redhat.com> - 0.37-3
|
||||
- Updated for 0.37 release.
|
||||
- Prevent destroying old passphrase file with 'service monotone genkey'.
|
||||
- Put LSB standard comments in monotone.init for monotone-server subpackage.
|
||||
|
||||
* Tue Aug 28 2007 Roland McGrath <roland@redhat.com> - 0.36-2
|
||||
- Clean up %%pre script per packaging guidelines.
|
||||
- Disable ppc and ppc64 builds temporarily since make check fails. (#259161)
|
||||
|
||||
* Fri Aug 3 2007 Roland McGrath <roland@redhat.com> - 0.36-1
|
||||
- Updated for 0.36 release.
|
||||
|
||||
* Fri Jul 06 2007 Florian La Roche <laroche@redhat.com> - 0.35-4
|
||||
- add more requires
|
||||
|
||||
* Wed May 16 2007 Roland McGrath <roland@redhat.com> - 0.35-3
|
||||
- Fix locale dependency in monotone-server init script. (#213893)
|
||||
|
||||
* Wed May 9 2007 Roland McGrath <roland@redhat.com> - 0.35-2
|
||||
- Updated for 0.35 release.
|
||||
- Avoid unnecessary "db migrate" in monotone-server init script. (#213893)
|
||||
|
||||
* Wed Apr 4 2007 Roland McGrath <roland@redhat.com> - 0.34-1
|
||||
- Updated for 0.34 release.
|
||||
|
||||
* Thu Mar 1 2007 Roland McGrath <roland@redhat.com> - 0.33-1
|
||||
- Updated for 0.33 release.
|
||||
- Install monotone.bash_completion file.
|
||||
|
||||
* Wed Feb 28 2007 Roland McGrath <roland@redhat.com> - 0.32-1
|
||||
- Updated for 0.32 release.
|
||||
|
||||
* Thu Dec 21 2006 Kevin Fenzi <kevin@tummy.com> - 0.31-2
|
||||
- Bump and rebuild to fix upgrade path
|
||||
|
||||
* Sat Nov 11 2006 Roland McGrath <roland@redhat.com> - 0.31-1
|
||||
- Updated for 0.31 release.
|
||||
|
||||
* Tue Oct 10 2006 Roland McGrath <roland@redhat.com> - 0.30-1
|
||||
- Updated for 0.30 release.
|
||||
- Fix service script to work around buggy init.d/functions. (#198761)
|
||||
|
||||
* Thu Aug 3 2006 Roland McGrath <roland@redhat.com> - 0.28-2
|
||||
- Updated for 0.28 release. (#198652)
|
||||
- Move server PID file into /var/run/monotone subdirectory. (#198761)
|
||||
|
||||
* Tue Jul 11 2006 Roland McGrath <roland@redhat.com> - 0.27-1
|
||||
- Updated for 0.27 release.
|
||||
|
||||
* Mon May 8 2006 Roland McGrath <roland@redhat.com> - 0.26-2
|
||||
- Fix service script genkey subcommand.
|
||||
|
||||
* Mon Apr 10 2006 Roland McGrath <roland@redhat.com> - 0.26-1
|
||||
- Updated for 0.26 release.
|
||||
- Major changes; see UPGRADE doc file for details.
|
||||
|
||||
* Fri Jan 6 2006 Roland McGrath <roland@redhat.com> - 0.25-2
|
||||
- Restore testsuite fix for nonroot owner of / in build chroot.
|
||||
|
||||
* Thu Jan 5 2006 Roland McGrath <roland@redhat.com> - 0.25-1
|
||||
- Updated for 0.25 release.
|
||||
|
||||
* Sun Dec 11 2005 Roland McGrath <roland@redhat.com> - 0.24-1
|
||||
- Updated for 0.24 release.
|
||||
|
||||
* Mon Oct 3 2005 Roland McGrath <roland@redhat.com> - 0.23-1
|
||||
- Updated for 0.23 release.
|
||||
|
||||
* Mon Aug 22 2005 Roland McGrath <roland@redhat.com> - 0.22-4
|
||||
- Updated for 0.22 release.
|
||||
- Added monotone-server package.
|
||||
|
||||
* Sun Aug 7 2005 Roland McGrath <roland@redhat.com> - 0.21-3
|
||||
- Work around non-root build user owning / in mock chroot builds.
|
||||
|
||||
* Wed Jul 27 2005 Roland McGrath <roland@redhat.com> - 0.21-2
|
||||
- Include monotone-nav.el too.
|
||||
- Add BuildRequires on cvs so the test suite can run.
|
||||
|
||||
* Mon Jul 18 2005 Roland McGrath <roland@redhat.com> - 0.21-1
|
||||
- Updated for 0.21 release.
|
||||
- Install Emacs support.
|
||||
|
||||
* Thu Jul 7 2005 Roland McGrath <roland@redhat.com> - 0.20-0.1
|
||||
- Updated for 0.20 release.
|
||||
- Added %%check section.
|
||||
- Cannot use FC4 native sqlite3, need newer bundled one.
|
||||
|
||||
* Mon Apr 18 2005 Jeffrey C. Ollie <jcollie@lt16586.campus.dmacc.edu> - 0.18-0.4
|
||||
- Modified summary so that it doesn't contain the name
|
||||
|
||||
* Thu Apr 14 2005 Jeffrey C. Ollie <jcollie@lt16586.campus.dmacc.edu> - 0.18-0.3
|
||||
- Modified install-info commands to prevent errors in case of --excludedocs
|
||||
|
||||
* Wed Apr 13 2005 Jeffrey C. Ollie <jcollie@lt16586.campus.dmacc.edu> - 0.18-0.2
|
||||
- Added post and postun scripts to take care of .info file
|
||||
- Added parallel make flags
|
||||
|
||||
* Wed Apr 13 2005 Jeffrey C. Ollie <jcollie@lt16586.campus.dmacc.edu> - 0.18-0.1
|
||||
- First version.
|
||||
16
monotone.sysconfig
Normal file
16
monotone.sysconfig
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
# Options for the Monotone DVCS Server
|
||||
#
|
||||
# options can be changed here, or (better) within override files in
|
||||
# /etc/systemd/system/monotone.service.d
|
||||
|
||||
# --confdir: location of the configuration directory
|
||||
#MONOTONE_CONFDIR=/etc/monotone
|
||||
|
||||
# --keydir: location of the key store
|
||||
#MONOTONE_KEYDIR=/etc/monotone/private-keys
|
||||
|
||||
# --db: name of the database file
|
||||
#MONOTONE_DBFILE=/var/lib/monotone/server.mtn
|
||||
|
||||
# --rcfile: used to pass the passphrase of the server's private key
|
||||
#MONOTONE_PPFILE=/etc/monotone/passphrase.lua
|
||||
1
sources
1
sources
|
|
@ -0,0 +1 @@
|
|||
df3f40ca22120aa142ac9becba9e1bf7 monotone-1.1.tar.bz2
|
||||
Loading…
Add table
Add a link
Reference in a new issue