From 4d23324fad516441d260958d619c32d5be88cc1f Mon Sep 17 00:00:00 2001 From: roland Date: Sun, 12 Nov 2006 03:15:47 +0000 Subject: [PATCH 01/22] New upstream version 0.31 --- .cvsignore | 2 +- monotone.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 064b2ba..dcd2556 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -monotone-0.30.tar.gz +monotone-0.31.tar.gz diff --git a/monotone.spec b/monotone.spec index 124fef5..0eb8c8e 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,5 +1,5 @@ Name: monotone -Version: 0.30 +Version: 0.31 Release: 1%{?dist} Summary: A free, distributed version control system @@ -164,6 +164,9 @@ fi %changelog +* Sat Nov 11 2006 Roland McGrath - 0.31-1 +- Updated for 0.31 release. + * Tue Oct 10 2006 Roland McGrath - 0.30-1 - Updated for 0.30 release. - Fix service script to work around buggy init.d/functions. (#198761) diff --git a/sources b/sources index 88f2945..33af319 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -94a1f8369162f7a7df8596b365a1d846 monotone-0.30.tar.gz +5a5feb8d053a5993ab516a1186bb5883 monotone-0.31.tar.gz From febca2a25769e26ada21589491555a89ab57a432 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 22 Dec 2006 05:26:18 +0000 Subject: [PATCH 02/22] Bump and rebuild to fix upgrade path --- monotone.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/monotone.spec b/monotone.spec index 0eb8c8e..c38a886 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,6 +1,6 @@ Name: monotone Version: 0.31 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A free, distributed version control system Group: Development/Tools @@ -164,6 +164,9 @@ fi %changelog +* Thu Dec 21 2006 Kevin Fenzi - 0.31-2 +- Bump and rebuild to fix upgrade path + * Sat Nov 11 2006 Roland McGrath - 0.31-1 - Updated for 0.31 release. From 7411863ae2733c7bd8eca43d9d48e415587d17c8 Mon Sep 17 00:00:00 2001 From: roland Date: Wed, 28 Feb 2007 21:37:00 +0000 Subject: [PATCH 03/22] Update to 0.32 --- .cvsignore | 2 +- monotone.init | 2 +- monotone.spec | 11 +++++++---- monotone.sysconfig | 2 +- sources | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index dcd2556..8d98952 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -monotone-0.31.tar.gz +monotone-0.32.tar.gz diff --git a/monotone.init b/monotone.init index b367162..9ddd4ab 100644 --- a/monotone.init +++ b/monotone.init @@ -154,7 +154,7 @@ EOF echo $"Checking database format in" "${MONOTONE_DBFILE}:" (umask 027 $MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS $MONOTONE_PPOPTS db migrate && - $MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS $MONOTONE_PPOPTS db regenerate_rosters && + $MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS $MONOTONE_PPOPTS db regenerate_caches && /bin/chgrp -R ${MONOTONE_GROUP:-monotone} $MONOTONE_KEYDIR) success $"database check" || failure $"database check" diff --git a/monotone.spec b/monotone.spec index c38a886..96d9fa3 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,13 +1,13 @@ Name: monotone -Version: 0.31 -Release: 2%{?dist} +Version: 0.32 +Release: 1%{?dist} Summary: A free, distributed version control system Group: Development/Tools License: GPL -URL: http://www.venge.net/monotone/ -Source0: http://www.venge.net/monotone/downloads/%{name}-%{version}.tar.gz +URL: http://monotone.ca/ +Source0: http://monotone.ca/downloads/%{version}/%{name}-%{version}.tar.gz Source1: monotone.init Source2: monotone.sysconfig Source3: README.monotone-server @@ -164,6 +164,9 @@ fi %changelog +* Wed Feb 28 2007 Roland McGrath - 0.32-1 +- Updated for 0.32 release. + * Thu Dec 21 2006 Kevin Fenzi - 0.31-2 - Bump and rebuild to fix upgrade path diff --git a/monotone.sysconfig b/monotone.sysconfig index a0a5c23..128c0f3 100644 --- a/monotone.sysconfig +++ b/monotone.sysconfig @@ -7,4 +7,4 @@ MONOTONE_RCOPTS="--confdir=$MONOTONE_CONFDIR" MONOTONE_DBOPTS="--db=$MONOTONE_DBFILE --keydir=$MONOTONE_KEYDIR" MONOTONE_PPOPTS="--rcfile=$MONOTONE_PPFILE" -MONOTONE_SERVE_OPTS="'*'" +MONOTONE_SERVE_OPTS="" diff --git a/sources b/sources index 33af319..8511572 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5a5feb8d053a5993ab516a1186bb5883 monotone-0.31.tar.gz +98b7ac7d680c0ba768bf74628fa74de9 monotone-0.32.tar.gz From f70aa1f2550fc1e0df7da927354094e400a3f6bc Mon Sep 17 00:00:00 2001 From: roland Date: Thu, 1 Mar 2007 22:13:41 +0000 Subject: [PATCH 04/22] Update to 0.33 --- .cvsignore | 2 +- monotone.spec | 19 ++++++++++++------- sources | 2 +- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8d98952..6184ddb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -monotone-0.32.tar.gz +monotone-0.33.tar.gz diff --git a/monotone.spec b/monotone.spec index 96d9fa3..5c0bfd2 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,5 +1,5 @@ Name: monotone -Version: 0.32 +Version: 0.33 Release: 1%{?dist} Summary: A free, distributed version control system @@ -75,18 +75,20 @@ rm -f %{buildroot}%{_datadir}/doc/monotone/monotone.html %find_lang %{name} +compldir=%{buildroot}%{_sysconfdir}/bash_completion.d +mkdir -p ${compldir} +%{__install} -c -m 0444 contrib/monotone.bash_completion ${compldir} + lispdir=%{buildroot}%{_datadir}/emacs/site-lisp mkdir -p ${lispdir} %{__install} -c -m 0444 contrib/monotone*.el ${lispdir} emacs -batch -f batch-byte-compile ${lispdir} mkdir -p %{buildroot}%{_sbindir} -mkdir -p %{buildroot}%{_sysconfdir}/init.d -mkdir -p %{buildroot}%{_sysconfdir}/sysconfig mkdir -p %{buildroot}%{_localstatedir}/db ln -snf ../bin/mtn %{buildroot}%{_sbindir}/monotone-server -%{__install} -c -m 0555 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/monotone -%{__install} -c -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/monotone +%{__install} -D -m 0555 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/monotone +%{__install} -D -m 0644 %{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}/db/monotone @@ -124,9 +126,8 @@ fi %{_bindir}/mtn %{_infodir}/monotone.info* -%{_mandir}/man1/mtn.1* %{_datadir}/emacs/site-lisp/monotone*.el* - +%{_sysconfdir}/bash_completion.d %files server %doc README.monotone-server @@ -164,6 +165,10 @@ fi %changelog +* Thu Mar 1 2007 Roland McGrath - 0.33-1 +- Updated for 0.33 release. +- Install monotone.bash_completion file. + * Wed Feb 28 2007 Roland McGrath - 0.32-1 - Updated for 0.32 release. diff --git a/sources b/sources index 8511572..3429cc7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -98b7ac7d680c0ba768bf74628fa74de9 monotone-0.32.tar.gz +bfbc7842c13e9be23299ca0348b2d0c2 monotone-0.33.tar.gz From 7e520fa20b50d286e58402894c5329a2376085ec Mon Sep 17 00:00:00 2001 From: roland Date: Thu, 5 Apr 2007 06:48:45 +0000 Subject: [PATCH 05/22] Updated for 0.34 release. --- .cvsignore | 2 +- monotone.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6184ddb..77d7e97 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -monotone-0.33.tar.gz +monotone-0.34.tar.gz diff --git a/monotone.spec b/monotone.spec index 5c0bfd2..a1507bd 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,5 +1,5 @@ Name: monotone -Version: 0.33 +Version: 0.34 Release: 1%{?dist} Summary: A free, distributed version control system @@ -165,6 +165,9 @@ fi %changelog +* Wed Apr 4 2007 Roland McGrath - 0.34-1 +- Updated for 0.34 release. + * Thu Mar 1 2007 Roland McGrath - 0.33-1 - Updated for 0.33 release. - Install monotone.bash_completion file. diff --git a/sources b/sources index 3429cc7..b3658d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bfbc7842c13e9be23299ca0348b2d0c2 monotone-0.33.tar.gz +b7a3cd2d4fcb17287641ee2e33f660fd monotone-0.34.tar.gz From 51bb053a7f040f5739de8a84e3ad3cdb945f4160 Mon Sep 17 00:00:00 2001 From: roland Date: Thu, 10 May 2007 01:39:44 +0000 Subject: [PATCH 06/22] Update to 0.35 --- .cvsignore | 2 +- monotone.init | 12 +++++++++++- monotone.spec | 8 ++++++-- sources | 2 +- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 77d7e97..d98fed1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -monotone-0.34.tar.gz +monotone-0.35.tar.gz diff --git a/monotone.init b/monotone.init index 9ddd4ab..60f1963 100644 --- a/monotone.init +++ b/monotone.init @@ -39,11 +39,21 @@ random_passphrase() umask 077 +check_db_version() +{ + db_version=`runuser -s /bin/bash - ${MONOTONE_USER:-monotone} \ + -c "$MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS \ + db version"` || exit 2 + set -- $db_version + [ "$5" == "(usable)" ] + return $? +} + # See how we were called. case "$1" in start) if [ -e $MONOTONE_DBFILE ]; then - $0 migrate + check_db_version || $0 migrate elif [ -e $MONOTONE_OLDDB ]; then echo -n $"Pre-0.26 monotone database must be migrated by hand: " failure diff --git a/monotone.spec b/monotone.spec index a1507bd..1304e5f 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,5 +1,5 @@ Name: monotone -Version: 0.34 +Version: 0.35 Release: 1%{?dist} Summary: A free, distributed version control system @@ -65,7 +65,7 @@ This package provides an easy-to-use standalone server setup for monotone. make %{?_smp_mflags} %check -make check || { cat tester_dir/tester.log; false; } +make %{?_smp_mflags} check || { cat tester_dir/tester.log; false; } %install rm -rf %{buildroot} @@ -165,6 +165,10 @@ fi %changelog +* Wed May 9 2007 Roland McGrath - 0.35-1 +- Updated for 0.35 release. +- Avoid unnecessary "db migrate" in monotone-server init script. (#213893) + * Wed Apr 4 2007 Roland McGrath - 0.34-1 - Updated for 0.34 release. diff --git a/sources b/sources index b3658d6..534277c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b7a3cd2d4fcb17287641ee2e33f660fd monotone-0.34.tar.gz +9b53046dda8ba7549fa5ce765e14fa65 monotone-0.35.tar.gz From 31b1f6260a2ba2bd9400632e8c178db246ea1647 Mon Sep 17 00:00:00 2001 From: roland Date: Tue, 15 May 2007 01:05:43 +0000 Subject: [PATCH 07/22] Patch from upstream to fix test suite failures from running in parallel with another instance. --- monotone-0.35-parallel-tests.patch | 90 ++++++++++++++++++++++++++++++ monotone.spec | 7 ++- 2 files changed, 95 insertions(+), 2 deletions(-) create mode 100644 monotone-0.35-parallel-tests.patch diff --git a/monotone-0.35-parallel-tests.patch b/monotone-0.35-parallel-tests.patch new file mode 100644 index 0000000..4c7c7b3 --- /dev/null +++ b/monotone-0.35-parallel-tests.patch @@ -0,0 +1,90 @@ +----------------------------------------------------------------- +Revision: 0b7ded5189d26b1c15b070fd801308f8ee791ab8 +Ancestor: 30a13ba4c31afddded095fbbcb7a4b874b544ee4 +Author: Matthew Gregan +Date: 2007-05-12T22:55:48 +Branch: net.venge.monotone +ChangeLog: + + Don't seed PRNG with a value that can be the same for parallel + invocations of the testsuite. Fixes bug#19517. + * luaext_platform.cc (LUAEXT(get_pid)): Expose portable way to get + process ID. + * tests/common/netsync.lua (netsync.setup): Use process ID as the + initial seed to the Lua PRNG. + +============================================================ +--- luaext_platform.cc 85950c0a7933f6df1c9261172a4df13a0b354255 ++++ luaext_platform.cc 2ce777d5ba2573e64f08e7d68ee8c24b2ddaa770 +@@ -162,8 +162,13 @@ LUAEXT(sleep, ) + return 1; + } + ++LUAEXT(get_pid, ) ++{ ++ pid_t pid = get_process_id(); ++ lua_pushnumber(L, pid); ++ return 1; ++} + +- + // Local Variables: + // mode: C++ + // fill-column: 76 +============================================================ +--- tests/common/netsync.lua 128824e21a9a92c02b9f21eecc0f1c73556c766e ++++ tests/common/netsync.lua 9e04e633e1a8abec93b4a71d704593fa064ed935 +@@ -16,7 +16,7 @@ function netsync.setup() + check(copy("test.db", "test3.db")) + check(copy("keys", "keys3")) + check(getstd("common/netsync-hooks.lua", "netsync.lua")) +- math.randomseed(os.time()) ++ math.randomseed(get_pid()) + end + + function netsync.setup_with_notes() +@@ -51,7 +51,7 @@ function netsync.start(opts, n, min) + end + local args = {} + local fn = mtn +- local addr = "localhost:" .. math.random(20000, 50000) ++ local addr = "localhost:" .. math.random(1024, 65535) + table.insert(args, "--dump=_MTN/server_dump") + table.insert(args, "--bind="..addr) + if min then +----------------------------------------------------------------- +Revision: 29c0149c0786b57a88c4b76e3cfad90571d7b053 +Ancestor: dc96217431b80ee988fccab0628d234687d3c4da +Author: Matthew Gregan +Date: 2007-05-13T00:19:13 +Branch: net.venge.monotone +ChangeLog: + + * tests/netsync,--set-default, tests/netsync_verifies_server_keys: + Use get_pid() rather than os.time() to seed PRNG. + +============================================================ +--- tests/netsync,--set-default/__driver__.lua f1b758e020bccd96da24fdf9015bb06d5c4e0725 ++++ tests/netsync,--set-default/__driver__.lua a57657e4a57c507335db1d41123a3f30641ffd97 +@@ -1,8 +1,8 @@ netsync.setup() + + include("common/netsync.lua") + mtn_setup() + netsync.setup() +-rseed = os.time() ++rseed = get_pid() + + addfile("testfile", "foo") + commit() +============================================================ +--- tests/netsync_verifies_server_keys/__driver__.lua 13305be95a16b088e491e320e7d6a53a5fe6aa4a ++++ tests/netsync_verifies_server_keys/__driver__.lua 1faebbe461222b8dcf29847c982088237c12cd17 +@@ -8,7 +8,7 @@ check(mtn("genkey", "foo@bar"), 0, false + -- Once to let the client note down the key... + -- We need to set the random seed, because each time a server is + -- started it picks a new random port. +-seed = os.time() ++seed = get_pid() + math.randomseed(seed) + netsync.pull("testbranch") + diff --git a/monotone.spec b/monotone.spec index 1304e5f..1eb9128 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,6 +1,6 @@ Name: monotone Version: 0.35 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A free, distributed version control system Group: Development/Tools @@ -12,6 +12,8 @@ Source1: monotone.init Source2: monotone.sysconfig Source3: README.monotone-server +Patch1: monotone-0.35-parallel-tests.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel @@ -58,6 +60,7 @@ This package provides an easy-to-use standalone server setup for monotone. %prep %setup -q +%patch1 -p0 %build %configure --with-bundled-lua=%{bundled_lua} \ @@ -165,7 +168,7 @@ fi %changelog -* Wed May 9 2007 Roland McGrath - 0.35-1 +* Wed May 9 2007 Roland McGrath - 0.35-2 - Updated for 0.35 release. - Avoid unnecessary "db migrate" in monotone-server init script. (#213893) From 80aa58c2607afd88e9b86a1173c415829e5737b1 Mon Sep 17 00:00:00 2001 From: roland Date: Thu, 17 May 2007 00:22:46 +0000 Subject: [PATCH 08/22] - Fix locale dependency in monotone-server init script. (#213893) --- monotone.init | 3 ++- monotone.spec | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/monotone.init b/monotone.init index 60f1963..922cbd6 100644 --- a/monotone.init +++ b/monotone.init @@ -42,7 +42,8 @@ umask 077 check_db_version() { db_version=`runuser -s /bin/bash - ${MONOTONE_USER:-monotone} \ - -c "$MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS \ + -c "LC_ALL=C \ + $MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS \ db version"` || exit 2 set -- $db_version [ "$5" == "(usable)" ] diff --git a/monotone.spec b/monotone.spec index 1eb9128..f313cfc 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,6 +1,6 @@ Name: monotone Version: 0.35 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A free, distributed version control system Group: Development/Tools @@ -168,6 +168,9 @@ fi %changelog +* Wed May 16 2007 Roland McGrath - 0.35-3 +- Fix locale dependency in monotone-server init script. (#213893) + * Wed May 9 2007 Roland McGrath - 0.35-2 - Updated for 0.35 release. - Avoid unnecessary "db migrate" in monotone-server init script. (#213893) From 07eab3520f5e8ef10f3d9e5c9484680a81d9ef72 Mon Sep 17 00:00:00 2001 From: roland Date: Fri, 3 Aug 2007 11:09:43 +0000 Subject: [PATCH 09/22] New upstream version 0.36 --- .cvsignore | 2 +- monotone-0.35-parallel-tests.patch | 90 ------------------------------ monotone.init | 3 +- monotone.spec | 20 ++++--- sources | 2 +- 5 files changed, 17 insertions(+), 100 deletions(-) delete mode 100644 monotone-0.35-parallel-tests.patch diff --git a/.cvsignore b/.cvsignore index d98fed1..fbfaa3e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -monotone-0.35.tar.gz +monotone-0.36.tar.gz diff --git a/monotone-0.35-parallel-tests.patch b/monotone-0.35-parallel-tests.patch deleted file mode 100644 index 4c7c7b3..0000000 --- a/monotone-0.35-parallel-tests.patch +++ /dev/null @@ -1,90 +0,0 @@ ------------------------------------------------------------------ -Revision: 0b7ded5189d26b1c15b070fd801308f8ee791ab8 -Ancestor: 30a13ba4c31afddded095fbbcb7a4b874b544ee4 -Author: Matthew Gregan -Date: 2007-05-12T22:55:48 -Branch: net.venge.monotone -ChangeLog: - - Don't seed PRNG with a value that can be the same for parallel - invocations of the testsuite. Fixes bug#19517. - * luaext_platform.cc (LUAEXT(get_pid)): Expose portable way to get - process ID. - * tests/common/netsync.lua (netsync.setup): Use process ID as the - initial seed to the Lua PRNG. - -============================================================ ---- luaext_platform.cc 85950c0a7933f6df1c9261172a4df13a0b354255 -+++ luaext_platform.cc 2ce777d5ba2573e64f08e7d68ee8c24b2ddaa770 -@@ -162,8 +162,13 @@ LUAEXT(sleep, ) - return 1; - } - -+LUAEXT(get_pid, ) -+{ -+ pid_t pid = get_process_id(); -+ lua_pushnumber(L, pid); -+ return 1; -+} - -- - // Local Variables: - // mode: C++ - // fill-column: 76 -============================================================ ---- tests/common/netsync.lua 128824e21a9a92c02b9f21eecc0f1c73556c766e -+++ tests/common/netsync.lua 9e04e633e1a8abec93b4a71d704593fa064ed935 -@@ -16,7 +16,7 @@ function netsync.setup() - check(copy("test.db", "test3.db")) - check(copy("keys", "keys3")) - check(getstd("common/netsync-hooks.lua", "netsync.lua")) -- math.randomseed(os.time()) -+ math.randomseed(get_pid()) - end - - function netsync.setup_with_notes() -@@ -51,7 +51,7 @@ function netsync.start(opts, n, min) - end - local args = {} - local fn = mtn -- local addr = "localhost:" .. math.random(20000, 50000) -+ local addr = "localhost:" .. math.random(1024, 65535) - table.insert(args, "--dump=_MTN/server_dump") - table.insert(args, "--bind="..addr) - if min then ------------------------------------------------------------------ -Revision: 29c0149c0786b57a88c4b76e3cfad90571d7b053 -Ancestor: dc96217431b80ee988fccab0628d234687d3c4da -Author: Matthew Gregan -Date: 2007-05-13T00:19:13 -Branch: net.venge.monotone -ChangeLog: - - * tests/netsync,--set-default, tests/netsync_verifies_server_keys: - Use get_pid() rather than os.time() to seed PRNG. - -============================================================ ---- tests/netsync,--set-default/__driver__.lua f1b758e020bccd96da24fdf9015bb06d5c4e0725 -+++ tests/netsync,--set-default/__driver__.lua a57657e4a57c507335db1d41123a3f30641ffd97 -@@ -1,8 +1,8 @@ netsync.setup() - - include("common/netsync.lua") - mtn_setup() - netsync.setup() --rseed = os.time() -+rseed = get_pid() - - addfile("testfile", "foo") - commit() -============================================================ ---- tests/netsync_verifies_server_keys/__driver__.lua 13305be95a16b088e491e320e7d6a53a5fe6aa4a -+++ tests/netsync_verifies_server_keys/__driver__.lua 1faebbe461222b8dcf29847c982088237c12cd17 -@@ -8,7 +8,7 @@ check(mtn("genkey", "foo@bar"), 0, false - -- Once to let the client note down the key... - -- We need to set the random seed, because each time a server is - -- started it picks a new random port. --seed = os.time() -+seed = get_pid() - math.randomseed(seed) - netsync.pull("testbranch") - diff --git a/monotone.init b/monotone.init index 922cbd6..9a225d0 100644 --- a/monotone.init +++ b/monotone.init @@ -99,7 +99,7 @@ case "$1" in $0 stop $0 start ;; - condrestart) + condrestart|try-restart) [ -e /var/lock/subsys/monotone ] && $0 restart ;; status) @@ -131,6 +131,7 @@ case "$1" in genkey $MONOTONE_KEYID > /dev/null 2>&1) && /bin/chgrp ${MONOTONE_GROUP:-monotone} \ "$MONOTONE_KEYDIR/$MONOTONE_KEYID" && + /bin/chmod 0640 "$MONOTONE_KEYDIR/$MONOTONE_KEYID" && cat > $tmp < /dev/null 2>&1 || : fi -%postun +%preun if [ $1 -eq 0 ] then /sbin/install-info --delete %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || : @@ -168,6 +168,12 @@ fi %changelog +* Fri Aug 3 2007 Roland McGrath - 0.36-1 +- Updated for 0.36 release. + +* Fri Jul 06 2007 Florian La Roche - 0.35-4 +- add more requires + * Wed May 16 2007 Roland McGrath - 0.35-3 - Fix locale dependency in monotone-server init script. (#213893) diff --git a/sources b/sources index 534277c..f5f0884 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9b53046dda8ba7549fa5ce765e14fa65 monotone-0.35.tar.gz +ba6733ebd9992c8c7b48b9e2226f9fb7 monotone-0.36.tar.gz From afd58a1441d12f7dbf7423044f32c4b452874fc0 Mon Sep 17 00:00:00 2001 From: roland Date: Tue, 28 Aug 2007 07:38:59 +0000 Subject: [PATCH 10/22] Exclude ppc for #259161 miscompilation issue. --- monotone.spec | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/monotone.spec b/monotone.spec index daaeaab..9fe963b 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,6 +1,10 @@ Name: monotone Version: 0.36 -Release: 1%{?dist} +Release: 2%{?dist} + +# XXX temporary pending bug fix for miscompilation(?) on ppc +# See https://bugzilla.redhat.com/show_bug.cgi?id=259161 +ExcludeArch: ppc ppc64 Summary: A free, distributed version control system Group: Development/Tools @@ -50,7 +54,7 @@ functions to client-side RSA certificates. %package server Summary: Standalone server setup for monotone Requires: monotone = %{version}-%{release} -Requires(pre): /usr/sbin/useradd +Requires(pre): shadow-utils Requires(post): /sbin/service, /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig Group: Development/Tools @@ -149,9 +153,12 @@ fi %attr(0660,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_localstatedir}/db/monotone/server.mtn %pre server -# Add the "monotone" user -/usr/sbin/useradd -c "Monotone Netsync Server" \ - -s /sbin/nologin -r -d %{_localstatedir}/db/monotone monotone 2> /dev/null || : +# Add "monotone" user per http://fedoraproject.org/wiki/Packaging/UsersAndGroups +getent group monotone > /dev/null || groupadd -r monotone +getent passwd monotone > /dev/null || +useradd -r -g monotone -r -d %{_localstatedir}/db/monotone -s /sbin/nologin \ + -c "Monotone Netsync Server" +exit 0 %post server # Register the monotone service @@ -168,6 +175,10 @@ fi %changelog +* Tue Aug 28 2007 Roland McGrath - 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 - 0.36-1 - Updated for 0.36 release. From 76bbddd1b8b3dec96e8b5c64879393919add0d45 Mon Sep 17 00:00:00 2001 From: roland Date: Sun, 28 Oct 2007 04:36:03 +0000 Subject: [PATCH 11/22] Update to 0.37 --- .cvsignore | 2 +- monotone.init | 22 +++++++++++++++++++++- monotone.spec | 11 ++++++----- sources | 2 +- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index fbfaa3e..79cff5d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -monotone-0.36.tar.gz +monotone-0.37.tar.gz diff --git a/monotone.init b/monotone.init index 9a225d0..9178650 100644 --- a/monotone.init +++ b/monotone.init @@ -8,6 +8,20 @@ # pidfile: /var/run/monotone/monotone-server.pid # config: /etc/sysconfig/monotone # config: /etc/monotone/monotonerc +# +### BEGIN INIT INFO +# Provides: monotone +# Required-Start: $local_fs $network $named $time +# Required-Stop: $local_fs $network +# Short-Description: start and stop Monotone netsync protocol server +# 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. +### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions @@ -95,7 +109,7 @@ case "$1" in [ $RETVAL = 0 ] && rm -f /var/lock/subsys/monotone echo ;; - restart) + restart|force-reload) $0 stop $0 start ;; @@ -122,6 +136,12 @@ case "$1" in genkey) MONOTONE_KEYID=${2:-${MONOTONE_KEYID:-`/bin/hostname -f`}} MONOTONE_PPFILE=${MONOTONE_PPFILE:-/var/db/monotone/passphrase.lua} + if [ -s "$MONOTONE_PPFILE" -a -s "$MONOTONE_DBFILE" ] + then + echo >&2 "$0:" $"Server key already installed" + echo >&2 "$0:" $"To lose old key remove file" "$MONOTONE_PPFILE" + exit 1 + fi echo -n $"Generating RSA key for server $MONOTONE_KEYID" tmp=/tmp/mtserver$$ if diff --git a/monotone.spec b/monotone.spec index 9fe963b..d671059 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,11 +1,7 @@ Name: monotone -Version: 0.36 +Version: 0.37 Release: 2%{?dist} -# XXX temporary pending bug fix for miscompilation(?) on ppc -# See https://bugzilla.redhat.com/show_bug.cgi?id=259161 -ExcludeArch: ppc ppc64 - Summary: A free, distributed version control system Group: Development/Tools License: GPL @@ -175,6 +171,11 @@ fi %changelog +* Sat Oct 27 2007 Roland McGrath - 0.37-2 +- 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 - 0.36-2 - Clean up %%pre script per packaging guidelines. - Disable ppc and ppc64 builds temporarily since make check fails. (#259161) diff --git a/sources b/sources index f5f0884..29b9c0b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ba6733ebd9992c8c7b48b9e2226f9fb7 monotone-0.36.tar.gz +d06193f2738626570692bed2173144c1 monotone-0.37.tar.gz From 6b3a50cfe298229dd2e301156067a5a07dad757f Mon Sep 17 00:00:00 2001 From: roland Date: Tue, 30 Oct 2007 07:48:36 +0000 Subject: [PATCH 12/22] rebuild --- monotone.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/monotone.spec b/monotone.spec index d671059..4894483 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,6 +1,6 @@ Name: monotone Version: 0.37 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A free, distributed version control system Group: Development/Tools @@ -68,7 +68,7 @@ This package provides an easy-to-use standalone server setup for monotone. make %{?_smp_mflags} %check -make %{?_smp_mflags} check || { cat tester_dir/tester.log; false; } +make %{?_smp_mflags} check || { cat tester_dir/*.log; false; } %install rm -rf %{buildroot} @@ -171,7 +171,7 @@ fi %changelog -* Sat Oct 27 2007 Roland McGrath - 0.37-2 +* Sat Oct 27 2007 Roland McGrath - 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. From 05961076e452b1733e74fafba06b748cfc7d14a7 Mon Sep 17 00:00:00 2001 From: roland Date: Sat, 22 Dec 2007 00:06:46 +0000 Subject: [PATCH 13/22] Updated for 0.38 release. --- .cvsignore | 2 +- monotone.init | 2 +- monotone.spec | 7 +++++-- sources | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 79cff5d..529fe03 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -monotone-0.37.tar.gz +monotone-0.38.tar.gz diff --git a/monotone.init b/monotone.init index 9178650..5c262c6 100644 --- a/monotone.init +++ b/monotone.init @@ -136,7 +136,7 @@ case "$1" in genkey) MONOTONE_KEYID=${2:-${MONOTONE_KEYID:-`/bin/hostname -f`}} MONOTONE_PPFILE=${MONOTONE_PPFILE:-/var/db/monotone/passphrase.lua} - if [ -s "$MONOTONE_PPFILE" -a -s "$MONOTONE_DBFILE" ] + if [ -s "$MONOTONE_PPFILE" -a -s "$MONOTONE_KEYDIR/$MONOTONE_KEYID" ] then echo >&2 "$0:" $"Server key already installed" echo >&2 "$0:" $"To lose old key remove file" "$MONOTONE_PPFILE" diff --git a/monotone.spec b/monotone.spec index 4894483..6853a79 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,6 +1,6 @@ Name: monotone -Version: 0.37 -Release: 3%{?dist} +Version: 0.38 +Release: 1%{?dist} Summary: A free, distributed version control system Group: Development/Tools @@ -171,6 +171,9 @@ fi %changelog +* Fri Dec 21 2007 Roland McGrath - 0.38-1 +- Updated for 0.38 release. + * Sat Oct 27 2007 Roland McGrath - 0.37-3 - Updated for 0.37 release. - Prevent destroying old passphrase file with 'service monotone genkey'. diff --git a/sources b/sources index 29b9c0b..930bdba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d06193f2738626570692bed2173144c1 monotone-0.37.tar.gz +c1a0d2619f451a664289b042c104860d monotone-0.38.tar.gz From 4a90566118ce8d091e08740be58a721708c47f06 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 22 Dec 2007 23:20:40 +0000 Subject: [PATCH 14/22] Initialize branch EL-5 for monotone --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 From dc95645d5d4de11e702cbac71fde32d81bbd029f Mon Sep 17 00:00:00 2001 From: roland Date: Sat, 22 Dec 2007 23:58:07 +0000 Subject: [PATCH 15/22] Fix some monotone-server packaging bugs. --- README.monotone-server | 2 +- monotone.init | 28 +++++++++++++++++++++------- monotone.spec | 33 +++++++++++++++++++++------------ monotone.sysconfig | 2 +- 4 files changed, 44 insertions(+), 21 deletions(-) diff --git a/README.monotone-server b/README.monotone-server index d5d2299..a2640d3 100644 --- a/README.monotone-server +++ b/README.monotone-server @@ -10,7 +10,7 @@ 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/db/monotone, +which the network server runs. The database lives in /var/lib/monotone, which the "monotone" user ID must write to. The init.d script will generate a private key for the server to use, if diff --git a/monotone.init b/monotone.init index 5c262c6..967ab15 100644 --- a/monotone.init +++ b/monotone.init @@ -43,6 +43,8 @@ MTSERVER=/usr/sbin/monotone-server MONOTONE_PIDFILE=/var/run/monotone/monotone-server.pid MONOTONE_LOGFILE=${MONOTONE_LOGFILE:-/var/log/monotone.log} MONOTONE_OLDDB=/var/db/monotone/server.db +MONOTONE_OLDDBFILE=/var/db/monotone/server.mtn +MONOTONE_OLDPPFILE=/var/db/monotone/passphrase.lua random_passphrase() { @@ -67,6 +69,18 @@ check_db_version() # See how we were called. case "$1" in start) + if [ -e $MONOTONE_OLDDBFILE -a ! -e $MONOTONE_DBFILE ]; then + echo -n $"Moving" "$MONOTONE_OLDDBFILE" $"to" "$MONOTONE_DBFILE" + if mv "$MONOTONE_OLDDBFILE" "$MONOTONE_DBFILE"; then + failure + echo + exit + else + success + echo + fi + rmdir 2> /dev/null /var/db/monotone + fi if [ -e $MONOTONE_DBFILE ]; then check_db_version || $0 migrate elif [ -e $MONOTONE_OLDDB ]; then @@ -122,10 +136,10 @@ case "$1" in ;; init) echo -n $"Initializing database" "${MONOTONE_DBFILE}: " - { [ -d /var/db/monotone ] || + { [ -d /var/lib/monotone ] || /usr/bin/install -o ${MONOTONE_USER:-monotone} \ -g ${MONOTONE_GROUP:-monotone} \ - -m 0770 -d /var/db/monotone; } && + -m 0770 -d /var/lib/monotone; } && runuser -s /bin/bash - ${MONOTONE_USER:-monotone} -c "umask 007; \ $MT $MONOTONE_RCOPTS $MONOTONE_DBOPTS db init" && success $"database initialization" || @@ -134,8 +148,8 @@ case "$1" in echo ;; genkey) - MONOTONE_KEYID=${2:-${MONOTONE_KEYID:-`/bin/hostname -f`}} - MONOTONE_PPFILE=${MONOTONE_PPFILE:-/var/db/monotone/passphrase.lua} + MONOTONE_KEYID=${2:-${MONOTONE_KEYID:-monotone@`/bin/hostname -f`}} + MONOTONE_PPFILE=${MONOTONE_PPFILE:-/etc/monotone/passphrase.lua} if [ -s "$MONOTONE_PPFILE" -a -s "$MONOTONE_KEYDIR/$MONOTONE_KEYID" ] then echo >&2 "$0:" $"Server key already installed" @@ -169,12 +183,12 @@ EOF echo ;; migrate) - oppfile=/var/db/monotone/passphrase.lua RETVAL=0 - if [ ! -e $MONOTONE_PPFILE ] && [ -e $oppfile ]; then + if [ ! -e $MONOTONE_PPFILE ] && [ -e $MONOTONE_OLDPPFILE ]; then echo -n $"Moving old server passphrase file to new location: " /usr/bin/install -o root -g ${MONOTONE_GROUP:-monotone} \ - -m 0440 $oppfile ${MONOTONE_PPFILE} && + -m 0440 \ + $MONOTONE_OLDPPFILE ${MONOTONE_PPFILE} && success $"move passphrase file" || failure $"move passphrase file" RETVAL=$? diff --git a/monotone.spec b/monotone.spec index 6853a79..0ba579c 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,6 +1,6 @@ Name: monotone Version: 0.38 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A free, distributed version control system Group: Development/Tools @@ -88,21 +88,25 @@ mkdir -p ${lispdir} emacs -batch -f batch-byte-compile ${lispdir} mkdir -p %{buildroot}%{_sbindir} -mkdir -p %{buildroot}%{_localstatedir}/db +mkdir -p %{buildroot}%{_localstatedir}/lib ln -snf ../bin/mtn %{buildroot}%{_sbindir}/monotone-server %{__install} -D -m 0555 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/monotone %{__install} -D -m 0644 %{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}/db/monotone +%{__install} -d -m 0770 %{buildroot}%{_localstatedir}/lib/monotone %{__install} -d -m 0755 %{buildroot}%{_localstatedir}/run/monotone # These do not actually wind up in the package, due to %%ghost. -%{__install} -c -m 0440 /dev/null %{buildroot}%{_sysconfdir}/monotone/passphrase.lua -%{__install} -c -m 0640 /dev/null %{buildroot}%{_sysconfdir}/monotone/read-permissions -%{__install} -c -m 0640 /dev/null %{buildroot}%{_sysconfdir}/monotone/write-permissions -%{__install} -c -m 0644 /dev/null %{buildroot}%{_sysconfdir}/monotone/monotonerc -touch %{buildroot}%{_localstatedir}/db/monotone/server.mtn +%{__install} -c -m 0440 /dev/null \ + %{buildroot}%{_sysconfdir}/monotone/passphrase.lua +%{__install} -c -m 0640 /dev/null \ + %{buildroot}%{_sysconfdir}/monotone/read-permissions +%{__install} -c -m 0640 /dev/null \ + %{buildroot}%{_sysconfdir}/monotone/write-permissions +%{__install} -c -m 0644 /dev/null \ + %{buildroot}%{_sysconfdir}/monotone/monotonerc +touch %{buildroot}%{_localstatedir}/lib/monotone/server.mtn cp %{SOURCE3} . @@ -145,15 +149,15 @@ fi %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}/db/monotone -%attr(0660,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_localstatedir}/db/monotone/server.mtn +%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 %pre server # Add "monotone" user per http://fedoraproject.org/wiki/Packaging/UsersAndGroups getent group monotone > /dev/null || groupadd -r monotone getent passwd monotone > /dev/null || -useradd -r -g monotone -r -d %{_localstatedir}/db/monotone -s /sbin/nologin \ - -c "Monotone Netsync Server" +useradd -r -g monotone -r -d %{_localstatedir}/lib/monotone -s /sbin/nologin \ + -c "Monotone Netsync Server" monotone exit 0 %post server @@ -171,6 +175,11 @@ fi %changelog +* Sat Dec 22 2007 Roland McGrath - 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 - 0.38-1 - Updated for 0.38 release. diff --git a/monotone.sysconfig b/monotone.sysconfig index 128c0f3..a61496a 100644 --- a/monotone.sysconfig +++ b/monotone.sysconfig @@ -1,6 +1,6 @@ MONOTONE_CONFDIR=/etc/monotone MONOTONE_KEYDIR=/etc/monotone/private-keys -MONOTONE_DBFILE=/var/db/monotone/server.mtn +MONOTONE_DBFILE=/var/lib/monotone/server.mtn MONOTONE_PPFILE=/etc/monotone/passphrase.lua MONOTONE_RCOPTS="--confdir=$MONOTONE_CONFDIR" From 70a9dae56a5339d1774090e393b1e5197310b923 Mon Sep 17 00:00:00 2001 From: roland Date: Tue, 26 Feb 2008 02:52:41 +0000 Subject: [PATCH 16/22] Updated for 0.39 release. --- .cvsignore | 2 +- monotone.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 529fe03..763e744 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -monotone-0.38.tar.gz +monotone-0.39.tar.gz diff --git a/monotone.spec b/monotone.spec index 0ba579c..ff2b07a 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,6 +1,6 @@ Name: monotone -Version: 0.38 -Release: 2%{?dist} +Version: 0.39 +Release: 1%{?dist} Summary: A free, distributed version control system Group: Development/Tools @@ -175,6 +175,9 @@ fi %changelog +* Mon Feb 25 2008 Roland McGrath - 0.39-1 +- Updated for 0.39 release. + * Sat Dec 22 2007 Roland McGrath - 0.38-2 - Fix monotone-server user creation. (#426607) - Moved monotone-server database to /var/lib. (#426608) diff --git a/sources b/sources index 930bdba..4abcb2e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c1a0d2619f451a664289b042c104860d monotone-0.38.tar.gz +522c90c99e18a35c31e3dfa5f8499034 monotone-0.39.tar.gz From 0f50c693740d3f50ebdd3de668d0426dc328032e Mon Sep 17 00:00:00 2001 From: roland Date: Mon, 14 Apr 2008 19:47:24 +0000 Subject: [PATCH 17/22] - Updated for 0.40 release. - Tweaked trivia for packaging guidelines nits. --- .cvsignore | 2 +- monotone.spec | 25 +++++++++++++++++-------- sources | 2 +- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index 763e744..ef8af55 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -monotone-0.39.tar.gz +monotone-0.40.tar.gz diff --git a/monotone.spec b/monotone.spec index ff2b07a..a2fd4db 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,5 +1,5 @@ Name: monotone -Version: 0.39 +Version: 0.40 Release: 1%{?dist} Summary: A free, distributed version control system @@ -51,8 +51,9 @@ functions to client-side RSA certificates. Summary: Standalone server setup for monotone Requires: monotone = %{version}-%{release} Requires(pre): shadow-utils -Requires(post): /sbin/service, /sbin/chkconfig -Requires(preun): /sbin/service, /sbin/chkconfig +Requires(post): chkconfig +Requires(preun): initscripts, chkconfig +Requires(postun): initscripts Group: Development/Tools %description server @@ -90,7 +91,8 @@ emacs -batch -f batch-byte-compile ${lispdir} mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_localstatedir}/lib ln -snf ../bin/mtn %{buildroot}%{_sbindir}/monotone-server -%{__install} -D -m 0555 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/monotone +%{__install} -D -m 0555 %{SOURCE1} \ + %{buildroot}%{_sysconfdir}/rc.d/init.d/monotone %{__install} -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/monotone %{__install} -d -m 0755 %{buildroot}%{_sysconfdir}/monotone %{__install} -d -m 0750 %{buildroot}%{_sysconfdir}/monotone/private-keys @@ -140,7 +142,7 @@ fi %doc README.monotone-server %defattr(-,root,root,-) %{_sbindir}/monotone-server -%{_sysconfdir}/init.d/monotone +%{_sysconfdir}/rc.d/init.d/monotone %dir %attr(0755,monotone,monotone) %{_localstatedir}/run/monotone %config %{_sysconfdir}/sysconfig/monotone %dir %attr(0755,root,monotone) %{_sysconfdir}/monotone @@ -164,17 +166,24 @@ exit 0 # Register the monotone service /sbin/chkconfig --add monotone -# Restart the running server, which will update its db format when needed. -/sbin/service monotone condrestart - %preun server if [ $1 = 0 ]; then /sbin/service monotone stop > /dev/null 2>&1 /sbin/chkconfig --del monotone fi +%postun +if [ $1 -gt 1 ]; then + # Restart the running server: updates its db format when needed. + /sbin/service monotone condrestart > /dev/null 2>&1 || : +fi + %changelog +* Mon Apr 14 2008 Roland McGrath - 0.40-1 +- Updated for 0.40 release. +- Tweaked trivia for packaging guidelines nits. + * Mon Feb 25 2008 Roland McGrath - 0.39-1 - Updated for 0.39 release. diff --git a/sources b/sources index 4abcb2e..fd688eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -522c90c99e18a35c31e3dfa5f8499034 monotone-0.39.tar.gz +4d90776beaff7445e7a2d8774378fbba monotone-0.40.tar.gz From dfc97cd2c27c36ad06764f1750937b9246779162 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sun, 14 Sep 2008 07:26:56 +0000 Subject: [PATCH 18/22] - Updated for 0.41 release. - Added mtnopt helper. --- .cvsignore | 2 +- monotone.spec | 14 +++++++++++--- sources | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index ef8af55..4cd35d1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -monotone-0.40.tar.gz +monotone-0.41.tar.gz diff --git a/monotone.spec b/monotone.spec index a2fd4db..00a9f0f 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,10 +1,10 @@ Name: monotone -Version: 0.40 +Version: 0.41 Release: 1%{?dist} Summary: A free, distributed version control system Group: Development/Tools -License: GPL +License: GPLv2+ URL: http://monotone.ca/ Source0: http://monotone.ca/downloads/%{version}/%{name}-%{version}.tar.gz @@ -134,13 +134,14 @@ fi %doc monotone.html %{_bindir}/mtn +%{_bindir}/mtnopt %{_infodir}/monotone.info* %{_datadir}/emacs/site-lisp/monotone*.el* %{_sysconfdir}/bash_completion.d %files server -%doc README.monotone-server %defattr(-,root,root,-) +%doc README.monotone-server %{_sbindir}/monotone-server %{_sysconfdir}/rc.d/init.d/monotone %dir %attr(0755,monotone,monotone) %{_localstatedir}/run/monotone @@ -180,6 +181,13 @@ fi %changelog +* Fri Sep 12 2008 Thomas Moschny - 0.41-1 +- Updated for 0.41 release. +- Added mtnopt helper. + +* Mon Aug 11 2008 Tom "spot" Callaway - 0.40-2 +- fix license tag + * Mon Apr 14 2008 Roland McGrath - 0.40-1 - Updated for 0.40 release. - Tweaked trivia for packaging guidelines nits. diff --git a/sources b/sources index fd688eb..662e6a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4d90776beaff7445e7a2d8774378fbba monotone-0.40.tar.gz +f4ee37fb6853719933561fef901e2a07 monotone-0.41.tar.gz From b41c8f482642732f58f760caec4438e95185d5b5 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 3 Jan 2009 12:19:43 +0000 Subject: [PATCH 19/22] Updated for 0.42. --- .cvsignore | 2 +- import.log | 1 + monotone.spec | 54 ++++++++++++++++++++++++++++++++++++--------------- sources | 2 +- 4 files changed, 41 insertions(+), 18 deletions(-) create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index 4cd35d1..61594c7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -monotone-0.41.tar.gz +monotone-0.42.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..0e1a8c5 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +monotone-0_42-2_fc10:EL-5:monotone-0.42-2.fc10.src.rpm:1230985114 diff --git a/monotone.spec b/monotone.spec index 00a9f0f..28fa362 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,6 +1,6 @@ Name: monotone -Version: 0.41 -Release: 1%{?dist} +Version: 0.42 +Release: 2%{?dist} Summary: A free, distributed version control system Group: Development/Tools @@ -59,13 +59,22 @@ Group: Development/Tools %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} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Group: Development/Tools + +%description -n perl-Monotone +This is a simple Perl module to start a monotone automate sub-process +and then pass commands to it. %prep %setup -q %build %configure --with-bundled-lua=%{bundled_lua} \ - --with-bundled-sqlite=%{bundled_sqlite} + --with-bundled-sqlite=%{bundled_sqlite} make %{?_smp_mflags} %check @@ -92,7 +101,7 @@ mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_localstatedir}/lib ln -snf ../bin/mtn %{buildroot}%{_sbindir}/monotone-server %{__install} -D -m 0555 %{SOURCE1} \ - %{buildroot}%{_sysconfdir}/rc.d/init.d/monotone + %{buildroot}%{_sysconfdir}/rc.d/init.d/monotone %{__install} -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/monotone %{__install} -d -m 0755 %{buildroot}%{_sysconfdir}/monotone %{__install} -d -m 0750 %{buildroot}%{_sysconfdir}/monotone/private-keys @@ -101,17 +110,20 @@ ln -snf ../bin/mtn %{buildroot}%{_sbindir}/monotone-server # These do not actually wind up in the package, due to %%ghost. %{__install} -c -m 0440 /dev/null \ - %{buildroot}%{_sysconfdir}/monotone/passphrase.lua + %{buildroot}%{_sysconfdir}/monotone/passphrase.lua %{__install} -c -m 0640 /dev/null \ - %{buildroot}%{_sysconfdir}/monotone/read-permissions + %{buildroot}%{_sysconfdir}/monotone/read-permissions %{__install} -c -m 0640 /dev/null \ - %{buildroot}%{_sysconfdir}/monotone/write-permissions + %{buildroot}%{_sysconfdir}/monotone/write-permissions %{__install} -c -m 0644 /dev/null \ - %{buildroot}%{_sysconfdir}/monotone/monotonerc + %{buildroot}%{_sysconfdir}/monotone/monotonerc touch %{buildroot}%{_localstatedir}/lib/monotone/server.mtn cp %{SOURCE3} . +%{__install} -D -m 0644 -p contrib/Monotone.pm \ + %{buildroot}%{perl_vendorlib}/Monotone.pm + %clean rm -f README.monotone-server rm -rf %{buildroot} @@ -119,13 +131,13 @@ rm -rf %{buildroot} %post if [ $1 -eq 1 ] then - /sbin/install-info %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || : + /sbin/install-info %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || : fi %preun if [ $1 -eq 0 ] then - /sbin/install-info --delete %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || : + /sbin/install-info --delete %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || : fi %files -f %{name}.lang @@ -139,13 +151,17 @@ fi %{_datadir}/emacs/site-lisp/monotone*.el* %{_sysconfdir}/bash_completion.d +%files -n perl-Monotone +%defattr(-,root,root,-) +%{perl_vendorlib}/Monotone.pm + %files server %defattr(-,root,root,-) %doc README.monotone-server %{_sbindir}/monotone-server %{_sysconfdir}/rc.d/init.d/monotone %dir %attr(0755,monotone,monotone) %{_localstatedir}/run/monotone -%config %{_sysconfdir}/sysconfig/monotone +%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 @@ -160,7 +176,7 @@ fi getent group monotone > /dev/null || groupadd -r monotone getent passwd monotone > /dev/null || useradd -r -g monotone -r -d %{_localstatedir}/lib/monotone -s /sbin/nologin \ - -c "Monotone Netsync Server" monotone + -c "Monotone Netsync Server" monotone exit 0 %post server @@ -169,18 +185,24 @@ exit 0 %preun server if [ $1 = 0 ]; then - /sbin/service monotone stop > /dev/null 2>&1 - /sbin/chkconfig --del monotone + /sbin/service monotone stop > /dev/null 2>&1 + /sbin/chkconfig --del monotone fi %postun if [ $1 -gt 1 ]; then - # Restart the running server: updates its db format when needed. - /sbin/service monotone condrestart > /dev/null 2>&1 || : + # Restart the running server: updates its db format when needed. + /sbin/service monotone condrestart > /dev/null 2>&1 || : fi %changelog +* Fri Jan 2 2009 Thomas Moschny - 0.42-2 +- Pack Monotone.pm (in a subpackage). (#450267) + +* Fri Jan 2 2009 Thomas Moschny - 0.42-1 +- Updated for 0.42 release. + * Fri Sep 12 2008 Thomas Moschny - 0.41-1 - Updated for 0.41 release. - Added mtnopt helper. diff --git a/sources b/sources index 662e6a3..ec72068 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f4ee37fb6853719933561fef901e2a07 monotone-0.41.tar.gz +c8e916d674b6608369d9f447700a8830 monotone-0.42.tar.gz From 5888b9681fc6a498b51baf7cfd7ef83c8b63e403 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Fri, 6 Mar 2009 23:50:57 +0000 Subject: [PATCH 20/22] Updating from devel. --- import.log | 1 + monotone-0.42-gcc44.patch | 90 +++++++++++++++++++++++++++++++ monotone-0.42-netsync.patch | 101 +++++++++++++++++++++++++++++++++++ monotone-0.42-netsync2.patch | 12 +++++ monotone.spec | 27 +++++++++- 5 files changed, 229 insertions(+), 2 deletions(-) create mode 100644 monotone-0.42-gcc44.patch create mode 100644 monotone-0.42-netsync.patch create mode 100644 monotone-0.42-netsync2.patch diff --git a/import.log b/import.log index 0e1a8c5..d03fd72 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ monotone-0_42-2_fc10:EL-5:monotone-0.42-2.fc10.src.rpm:1230985114 +monotone-0_42-5_fc11:EL-5:monotone-0.42-5.fc11.src.rpm:1236383395 diff --git a/monotone-0.42-gcc44.patch b/monotone-0.42-gcc44.patch new file mode 100644 index 0000000..6e46048 --- /dev/null +++ b/monotone-0.42-gcc44.patch @@ -0,0 +1,90 @@ +diff -up monotone-0.42/key_store.cc.orig monotone-0.42/key_store.cc +--- monotone-0.42/key_store.cc.orig 2008-12-14 00:02:12.000000000 +0100 ++++ monotone-0.42/key_store.cc 2009-02-07 17:23:27.000000000 +0100 +@@ -460,30 +460,30 @@ key_store::cache_decrypted_key(const rsa + + void + key_store::create_key_pair(database & db, +- rsa_keypair_id const & id, ++ rsa_keypair_id const & ident, + utf8 const * maybe_passphrase, + id * maybe_pubhash, + id * maybe_privhash) + { + conditional_transaction_guard guard(db); + +- bool exists = key_pair_exists(id); ++ bool exists = key_pair_exists(ident); + if (db.database_specified()) + { + guard.acquire(); +- exists = exists || db.public_key_exists(id); ++ exists = exists || db.public_key_exists(ident); + } +- N(!exists, F("key '%s' already exists") % id); ++ N(!exists, F("key '%s' already exists") % ident); + + utf8 prompted_passphrase; + if (!maybe_passphrase) + { +- get_passphrase(prompted_passphrase, id, true, true); ++ get_passphrase(prompted_passphrase, ident, true, true); + maybe_passphrase = &prompted_passphrase; + } + + // okay, now we can create the key +- P(F("generating key-pair '%s'") % id); ++ P(F("generating key-pair '%s'") % ident); + RSA_PrivateKey priv(*s->rng, static_cast(constants::keylen)); + + // serialize and maybe encrypt the private key +@@ -514,20 +514,20 @@ key_store::create_key_pair(database & db + % kp.priv().size()); + + // and save it. +- P(F("storing key-pair '%s' in %s/") % id % get_key_dir()); +- put_key_pair(id, kp); ++ P(F("storing key-pair '%s' in %s/") % ident % get_key_dir()); ++ put_key_pair(ident, kp); + + if (db.database_specified()) + { +- P(F("storing public key '%s' in %s") % id % db.get_filename()); +- db.put_key(id, kp.pub); ++ P(F("storing public key '%s' in %s") % ident % db.get_filename()); ++ db.put_key(ident, kp.pub); + guard.commit(); + } + + if (maybe_pubhash) +- key_hash_code(id, kp.pub, *maybe_pubhash); ++ key_hash_code(ident, kp.pub, *maybe_pubhash); + if (maybe_privhash) +- key_hash_code(id, kp.priv, *maybe_privhash); ++ key_hash_code(ident, kp.priv, *maybe_privhash); + } + + void +diff -up monotone-0.42/key_store.hh.orig monotone-0.42/key_store.hh +--- monotone-0.42/key_store.hh.orig 2008-10-03 15:30:21.000000000 +0200 ++++ monotone-0.42/key_store.hh 2009-02-07 17:21:54.000000000 +0100 +@@ -64,7 +64,7 @@ public: + + void cache_decrypted_key(rsa_keypair_id const & id); + +- void create_key_pair(database & db, rsa_keypair_id const & id, ++ void create_key_pair(database & db, rsa_keypair_id const & ident, + utf8 const * maybe_passphrase = NULL, + id * maybe_pubhash = NULL, + id * maybe_privhash = NULL); +diff -up monotone-0.42/sanity.hh.orig monotone-0.42/sanity.hh +--- monotone-0.42/sanity.hh.orig 2008-11-23 22:32:49.000000000 +0100 ++++ monotone-0.42/sanity.hh 2009-02-07 17:21:42.000000000 +0100 +@@ -12,6 +12,7 @@ + + #include + #include ++#include + + #include "boost/current_function.hpp" + diff --git a/monotone-0.42-netsync.patch b/monotone-0.42-netsync.patch new file mode 100644 index 0000000..49ebdb7 --- /dev/null +++ b/monotone-0.42-netsync.patch @@ -0,0 +1,101 @@ +diff -up monotone-0.42/netsync.cc.orig monotone-0.42/netsync.cc +--- monotone-0.42/netsync.cc.orig 2009-02-04 13:53:00.000000000 +0100 ++++ monotone-0.42/netsync.cc 2009-02-04 13:53:49.000000000 +0100 +@@ -353,7 +353,7 @@ unsigned int reactable::count = 0; + + class session_base : public reactable + { +- bool read_some(); ++ void read_some(bool & failed, bool & eof); + bool write_some(); + void mark_recent_io() + { +@@ -468,10 +468,12 @@ session_base::which_events() + return ret; + } + +-bool +-session_base::read_some() ++void ++session_base::read_some(bool & failed, bool & eof) + { + I(inbuf.size() < constants::netcmd_maxsz); ++ eof = false; ++ failed = false; + char tmp[constants::bufsz]; + Netxx::signed_size_type count = str->read(tmp, sizeof(tmp)); + if (count > 0) +@@ -479,17 +481,38 @@ session_base::read_some() + L(FL("read %d bytes from fd %d (peer %s)") + % count % str->get_socketfd() % peer_id); + if (encountered_error) +- { +- L(FL("in error unwind mode, so throwing them into the bit bucket")); +- return true; +- } ++ L(FL("in error unwind mode, so throwing them into the bit bucket")); ++ + inbuf.append(tmp,count); + mark_recent_io(); + note_bytes_in(count); +- return true; ++ } ++ else if (count == 0) ++ { ++ // Returning 0 bytes after select() marks the file descriptor as ++ // ready for reading signifies EOF. ++ ++ switch (protocol_state) ++ { ++ case working_state: ++ P(F("peer %s IO terminated connection in working state (error)") ++ % peer_id); ++ break; ++ ++ case shutdown_state: ++ P(F("peer %s IO terminated connection in shutdown state " ++ "(possibly client misreported error)") ++ % peer_id); ++ break; ++ ++ case confirmed_state: ++ break; ++ } ++ ++ eof = true; + } + else +- return false; ++ failed = true; + } + + bool +@@ -531,11 +554,14 @@ bool + session_base::do_io(Netxx::Probe::ready_type what) + { + bool ok = true; ++ bool eof = false; + try + { + if (what & Netxx::Probe::ready_read) + { +- if (!read_some()) ++ bool failed; ++ read_some(failed, eof); ++ if (failed) + ok = false; + } + if (what & Netxx::Probe::ready_write) +@@ -578,7 +604,11 @@ session_base::do_io(Netxx::Probe::ready_ + % peer_id); + ok = false; + } +- return ok; ++ ++ // Return false in case we reached EOF, so as to prevent further calls ++ // to select()s on this stream, as recommended by the select_tut man ++ // page. ++ return ok && !eof; + } + + //////////////////////////////////////////////////////////////////////// diff --git a/monotone-0.42-netsync2.patch b/monotone-0.42-netsync2.patch new file mode 100644 index 0000000..7dbeaa0 --- /dev/null +++ b/monotone-0.42-netsync2.patch @@ -0,0 +1,12 @@ +diff -up monotone-0.42/netsync.cc.orig monotone-0.42/netsync.cc +--- monotone-0.42/netsync.cc.orig 2008-12-14 00:02:12.000000000 +0100 ++++ monotone-0.42/netsync.cc 2009-02-27 19:19:37.000000000 +0100 +@@ -374,7 +374,7 @@ protected: + } + bool output_overfull() const + { +- return outbuf.size() > constants::bufsz * 10; ++ return outbuf_size > constants::bufsz * 10; + } + public: + string peer_id; diff --git a/monotone.spec b/monotone.spec index 28fa362..588e693 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,6 +1,6 @@ Name: monotone Version: 0.42 -Release: 2%{?dist} +Release: 5%{?dist} Summary: A free, distributed version control system Group: Development/Tools @@ -12,6 +12,13 @@ Source1: monotone.init Source2: monotone.sysconfig Source3: README.monotone-server +# rediffed changeset f18abebd.. from upstream +Patch0: monotone-0.42-netsync.patch +# rediffed changesets 33022690.. and 76e258cb.. from upstream +Patch1: monotone-0.42-gcc44.patch +# rediffed changeset 16184688.. from upstream +Patch2: monotone-0.42-netsync2.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel @@ -71,6 +78,9 @@ and then pass commands to it. %prep %setup -q +%patch0 -p1 -b .gcc44 +%patch1 -p1 -b .netsync +%patch2 -p1 -b .netsync2 %build %configure --with-bundled-lua=%{bundled_lua} \ @@ -78,7 +88,8 @@ and then pass commands to it. make %{?_smp_mflags} %check -make %{?_smp_mflags} check || { cat tester_dir/*.log; false; } +# disable parallel runs in the testsuite for now +make check || { cat tester_dir/*.log; false; } %install rm -rf %{buildroot} @@ -197,6 +208,18 @@ fi %changelog +* Fri Feb 27 2009 Thomas Moschny - 0.42-5 +- Add one more netsync related patch from trunk. + +* Wed Feb 25 2009 Fedora Release Engineering - 0.42-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 9 2009 Thomas Moschny - 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 - 0.42-2 - Pack Monotone.pm (in a subpackage). (#450267) From 90d6eddcc40c6cf09fceb0aa3a81806146f48060 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:39:51 +0000 Subject: [PATCH 21/22] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 659e999..6fced2f 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: monotone -# $Id$ +# $Id: Makefile,v 1.1 2005/07/18 23:50:55 roland Exp $ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 79a14131c205635d8927ac67c88050ce777c56c8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 03:40:08 +0000 Subject: [PATCH 22/22] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 2 -- 4 files changed, 24 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 6fced2f..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: monotone -# $Id: Makefile,v 1.1 2005/07/18 23:50:55 roland Exp $ -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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5 diff --git a/import.log b/import.log deleted file mode 100644 index d03fd72..0000000 --- a/import.log +++ /dev/null @@ -1,2 +0,0 @@ -monotone-0_42-2_fc10:EL-5:monotone-0.42-2.fc10.src.rpm:1230985114 -monotone-0_42-5_fc11:EL-5:monotone-0.42-5.fc11.src.rpm:1236383395