From 6005118ac5bb03f63bd038e11233ae149091fea0 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 16:40:42 +0000 Subject: [PATCH 01/17] Initialize branch FC-6 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..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From a05622afba9a571017c068d06ff38aad8d7d6492 Mon Sep 17 00:00:00 2001 From: roland Date: Sun, 12 Nov 2006 03:15:47 +0000 Subject: [PATCH 02/17] 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 81f77606a25a9f35f926e48ba4620a81991ae353 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 22 Dec 2006 05:26:18 +0000 Subject: [PATCH 03/17] 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 48d734cfd70da140de739c27f154ac13253bacae Mon Sep 17 00:00:00 2001 From: roland Date: Wed, 28 Feb 2007 21:37:00 +0000 Subject: [PATCH 04/17] 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 a525ce0e932e2230a3500fdfa127af5f337d15d6 Mon Sep 17 00:00:00 2001 From: roland Date: Thu, 1 Mar 2007 22:13:41 +0000 Subject: [PATCH 05/17] 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 cc9b46f3056c41e7ff5dcc0c10096721e42b028f Mon Sep 17 00:00:00 2001 From: roland Date: Thu, 5 Apr 2007 06:48:45 +0000 Subject: [PATCH 06/17] 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 8d963ac1d7c8b6a3200dd35a86a4fde854cfcc33 Mon Sep 17 00:00:00 2001 From: roland Date: Thu, 10 May 2007 01:39:44 +0000 Subject: [PATCH 07/17] 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 cf74ad503a08ac3d7c39740ce9df5b4144fed60c Mon Sep 17 00:00:00 2001 From: roland Date: Tue, 15 May 2007 01:05:43 +0000 Subject: [PATCH 08/17] 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 f9d14269588535b1e2d077d216cbf56ec2538ff2 Mon Sep 17 00:00:00 2001 From: roland Date: Thu, 17 May 2007 00:22:46 +0000 Subject: [PATCH 09/17] - 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 5fbe95f777a8d00603a14a819911a0cfc83c5c24 Mon Sep 17 00:00:00 2001 From: roland Date: Fri, 3 Aug 2007 11:09:43 +0000 Subject: [PATCH 10/17] 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 9c0562a7e8c81a5c56b00bb7bc94e13a2f88b3ee Mon Sep 17 00:00:00 2001 From: roland Date: Tue, 28 Aug 2007 07:38:59 +0000 Subject: [PATCH 11/17] 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 0bdcd3c5557691036d4d144f1cc107202b4f0566 Mon Sep 17 00:00:00 2001 From: roland Date: Sun, 28 Oct 2007 04:36:03 +0000 Subject: [PATCH 12/17] 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 8e3dbbc6ddf2285ad5c79218f302c38ba65f4569 Mon Sep 17 00:00:00 2001 From: roland Date: Tue, 30 Oct 2007 07:48:36 +0000 Subject: [PATCH 13/17] 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 f3be0f48f0e76bac0896e7f3fa0b8264ea7321c3 Mon Sep 17 00:00:00 2001 From: roland Date: Sat, 22 Dec 2007 00:06:46 +0000 Subject: [PATCH 14/17] 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 438d5d36df62d2fd3be2a08b01225f5f86e44840 Mon Sep 17 00:00:00 2001 From: roland Date: Sat, 22 Dec 2007 23:55:28 +0000 Subject: [PATCH 15/17] 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 9b7c090be59e6755269a51116bfe2cf939fc226b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:39:53 +0000 Subject: [PATCH 16/17] 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 bbe9eefb00a3728e46df56ded62ee751a52800ee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 03:40:19 +0000 Subject: [PATCH 17/17] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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 d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6