Navigation Bar Top Applications Support Documentation Vendors Search Index Top Top

CVS log for src/usr.sbin/mergemaster/mergemaster.sh

[BACK] Up to [freebsd] / src / usr.sbin / mergemaster

Request diff between arbitrary revisions

Default branch: MAIN

Revision 1.72.2.1.2.1 / (download) - annotate - [select for diffs], Sun Oct 25 01:10:29 2009 UTC (4 weeks, 2 days ago) by kensmith
Branch: RELENG_8_0
CVS Tags: RELENG_8_0_0_RELEASE
Changes since 1.72.2.1: +0 -0 lines
Diff to previous 1.72.2.1 (colored) 

SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)

Revision 1.72.2.1 / (download) - annotate - [select for diffs], Mon Aug 3 08:13:06 2009 UTC (3 months, 3 weeks ago) by kensmith
Branch: RELENG_8
CVS Tags: RELENG_8_0_BP
Branch point for: RELENG_8_0
Changes since 1.72: +0 -0 lines
Diff to previous 1.72 (colored) 

SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)

Revision 1.51.8.10 / (download) - annotate - [select for diffs], Sat Jul 11 08:25:43 2009 UTC (4 months, 2 weeks ago) by dougb
Branch: RELENG_6
Changes since 1.51.8.9: +7 -7 lines
Diff to previous 1.51.8.9 (colored) to branchpoint 1.51 (colored) next main 1.52 (colored) 

SVN rev 195616 on 2009-07-11 08:25:43Z by dougb

MFC r193853, update -U message when there is no mtree db, dramatically
reduce the size of the saved mtree db, streamline find command for the
main loop, and remove a spurious comment.

Revision 1.54.2.6 / (download) - annotate - [select for diffs], Sat Jul 11 08:24:51 2009 UTC (4 months, 2 weeks ago) by dougb
Branch: RELENG_7
Changes since 1.54.2.5: +7 -7 lines
Diff to previous 1.54.2.5 (colored) to branchpoint 1.54 (colored) next main 1.55 (colored) 

SVN rev 195615 on 2009-07-11 08:24:51Z by dougb

MFC r193853, update -U message when there is no mtree db, dramatically
reduce the size of the saved mtree db, streamline find command for the
main loop, and remove a spurious comment.

Revision 1.72 / (download) - annotate - [select for diffs], Tue Jun 9 20:20:08 2009 UTC (5 months, 2 weeks ago) by dougb
Branch: MAIN
CVS Tags: RELENG_8_BP, HEAD
Branch point for: RELENG_8
Changes since 1.71: +7 -7 lines
Diff to previous 1.71 (colored) 

SVN rev 193853 on 2009-06-09 20:20:08Z by dougb

1. Update the message that prints out for -U when the mtree database does
not exist to let the user know that it will be created for the next run.

2. Delete more stuff we're not going to use from the temproot prior to
creating the mtree database to dramatically reduce its size (162K -> 37K).

3. We've been deleting the zero-size files from temproot for a long time
now, so remove the spurious "-size +0" from the find command in the
comparison loop, and remove what is now a really stale comment.

Revision 1.51.8.9 / (download) - annotate - [select for diffs], Mon May 25 04:13:06 2009 UTC (6 months ago) by dougb
Branch: RELENG_6
Changes since 1.51.8.8: +14 -10 lines
Diff to previous 1.51.8.8 (colored) to branchpoint 1.51 (colored) 

SVN rev 192722 on 2009-05-25 04:13:06Z by dougb

MFC 192219:
Add -L to the mtree invocation to chase symbolic links that are present
in "Service jails."

MFC 192230:
Enhance the safety and efficiency of the -U option,
fix indentation on one line.

Revision 1.54.2.5 / (download) - annotate - [select for diffs], Mon May 25 04:11:30 2009 UTC (6 months ago) by dougb
Branch: RELENG_7
Changes since 1.54.2.4: +14 -10 lines
Diff to previous 1.54.2.4 (colored) to branchpoint 1.54 (colored) 

SVN rev 192721 on 2009-05-25 04:11:30Z by dougb

MFC 192219:
Add -L to the mtree invocation to chase symbolic links that are present
in "Service jails."

MFC 192230:
Enhance the safety and efficiency of the -U option,
fix indentation on one line.

Revision 1.71 / (download) - annotate - [select for diffs], Sat May 16 22:22:31 2009 UTC (6 months, 1 week ago) by dougb
Branch: MAIN
Changes since 1.70: +13 -9 lines
Diff to previous 1.70 (colored) 

SVN rev 192230 on 2009-05-16 22:22:31Z by dougb

Enhance the safety of the -U option:
1. In several places make sure that the mtree database is not empty using
the -s argument to test instead of -f. (I thought I'd already changed this,
but obviously not.)
2. When deriving the list of changed files use a colon-delimited list.
3. If the list of changed files is empty, unset the variable, and test
for a non-empty CHANGED in diff_loop() before entering that routine.

Enhance the speed of the -U option by using an internal case statement
instead of echoing the variable to an external grep for every file.

Fix indentation on one line.

Revision 1.70 / (download) - annotate - [select for diffs], Sat May 16 21:32:09 2009 UTC (6 months, 1 week ago) by dougb
Branch: MAIN
Changes since 1.69: +1 -1 lines
Diff to previous 1.69 (colored) 

SVN rev 192219 on 2009-05-16 21:32:09Z by dougb

Add -L to the mtree invocation to chase symbolic links that are present
in "Service jails."

Submitted by:	Jeremie Le Hen <jeremie@le-hen.org>

Revision 1.54.2.4.2.1 / (download) - annotate - [select for diffs], Wed Apr 15 03:14:26 2009 UTC (7 months, 1 week ago) by kensmith
Branch: RELENG_7_2
CVS Tags: RELENG_7_2_0_RELEASE
Changes since 1.54.2.4: +0 -0 lines
Diff to previous 1.54.2.4 (colored) next main 1.54.2.5 (colored) 

SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)

Revision 1.51.8.8 / (download) - annotate - [select for diffs], Mon Mar 23 14:54:01 2009 UTC (8 months ago) by dougb
Branch: RELENG_6
Changes since 1.51.8.7: +1 -1 lines
Diff to previous 1.51.8.7 (colored) to branchpoint 1.51 (colored) 

SVN rev 190322 on 2009-03-23 14:54:01Z by dougb

MFC 190320, don't expand example $FreeBSD strings

Revision 1.54.2.4 / (download) - annotate - [select for diffs], Mon Mar 23 14:53:21 2009 UTC (8 months ago) by dougb
Branch: RELENG_7
CVS Tags: RELENG_7_2_BP
Branch point for: RELENG_7_2
Changes since 1.54.2.3: +1 -1 lines
Diff to previous 1.54.2.3 (colored) to branchpoint 1.54 (colored) 

SVN rev 190321 on 2009-03-23 14:53:21Z by dougb

MFC 190320, don't expand example $FreeBSD strings

Revision 1.69 / (download) - annotate - [select for diffs], Mon Mar 23 14:42:41 2009 UTC (8 months ago) by dougb
Branch: MAIN
Changes since 1.68: +1 -1 lines
Diff to previous 1.68 (colored) 

SVN rev 190320 on 2009-03-23 14:42:41Z by dougb

Don't tempt svn to expand the example $FreeBSD strings

Revision 1.51.8.7 / (download) - annotate - [select for diffs], Sat Mar 21 22:35:44 2009 UTC (8 months ago) by dougb
Branch: RELENG_6
Changes since 1.51.8.6: +27 -9 lines
Diff to previous 1.51.8.6 (colored) to branchpoint 1.51 (colored) 

SVN rev 190224 on 2009-03-21 22:35:44Z by dougb

MFC r189761, r189763, r189992, r189994:
1. Fix creation and saving of the new mtree file with the -D option
2. Clean up usage() and man page so the options are all listed consistently
3. Add -F option
4. More man page cleanups for CVS -> VCS, punctuation, etc.

Revision 1.54.2.3 / (download) - annotate - [select for diffs], Sat Mar 21 22:32:53 2009 UTC (8 months ago) by dougb
Branch: RELENG_7
Changes since 1.54.2.2: +27 -9 lines
Diff to previous 1.54.2.2 (colored) to branchpoint 1.54 (colored) 

SVN rev 190223 on 2009-03-21 22:32:53Z by dougb

MFC r189761, r189763, r189992, r189994:
1. Fix creation and saving of the new mtree file with the -D option
2. Clean up usage() and man page so the options are all listed consistently
3. Add -F option
4. More man page cleanups for CVS -> VCS, punctuation, etc.

Revision 1.68 / (download) - annotate - [select for diffs], Wed Mar 18 21:51:11 2009 UTC (8 months, 1 week ago) by dougb
Branch: MAIN
Changes since 1.67: +19 -2 lines
Diff to previous 1.67 (colored) 

SVN rev 189992 on 2009-03-18 21:51:11Z by dougb

Add a new -F option to automatically install files that differ
only by version control Id strings

Revision 1.67 / (download) - annotate - [select for diffs], Fri Mar 13 08:48:33 2009 UTC (8 months, 1 week ago) by dougb
Branch: MAIN
Changes since 1.66: +5 -4 lines
Diff to previous 1.66 (colored) 

SVN rev 189763 on 2009-03-13 08:48:33Z by dougb

1. Clean up usage() output a bit by grouping options that take an argument
2. Fix a comment to refer to the right loop

Revision 1.66 / (download) - annotate - [select for diffs], Fri Mar 13 07:34:05 2009 UTC (8 months, 1 week ago) by dougb
Branch: MAIN
Changes since 1.65: +4 -4 lines
Diff to previous 1.65 (colored) 

SVN rev 189761 on 2009-03-13 07:34:05Z by dougb

When using the -D option:
1. The new mtree file should be created in the "host" system /tmp
2. The existing mtree file in the "host" system should not be deleted

Submitted by:	scf

Revision 1.51.8.6 / (download) - annotate - [select for diffs], Fri Jan 9 11:21:25 2009 UTC (10 months, 2 weeks ago) by dougb
Branch: RELENG_6
Changes since 1.51.8.5: +88 -71 lines
Diff to previous 1.51.8.5 (colored) to branchpoint 1.51 (colored) 

SVN rev 186938 on 2009-01-09 11:21:25Z by dougb

MFC the changes from r179725, documentation of the AUTO_UPGRADE knob,
and 186677:186749:

o Removal of 184781, 184804, and 184832 (automatic installation of files
that differ only by VCS Id)
o Fix cross-platform builds
o Various improvements to the mtree (-U) feature
o Remove the last of the MAKEDEV stuff
o Switch to using the top level (e.g., /usr/src) Makefile, and specify
that we should use the *.mk files from the source directory instead of
the installed versions.
o Check for the deprecated 'nodev' option in /etc/fstab
o Add support for the IGNORE_FILES variable
o Before installing a file check to make sure that the target does not
already exist as a directory
o Check to be sure that the file installed and error out if not
o We only need to check for the presence of the target of $PAGER
if that variable is actually set

Revision 1.54.2.2 / (download) - annotate - [select for diffs], Fri Jan 9 11:20:51 2009 UTC (10 months, 2 weeks ago) by dougb
Branch: RELENG_7
Changes since 1.54.2.1: +94 -52 lines
Diff to previous 1.54.2.1 (colored) to branchpoint 1.54 (colored) 

SVN rev 186937 on 2009-01-09 11:20:51Z by dougb

MFC the changes from r179725, documentation of the AUTO_UPGRADE knob,
and 186677:186749:

o Removal of 184781, 184804, and 184832 (automatic installation of files
that differ only by VCS Id)
o Fix cross-platform builds
o Various improvements to the mtree (-U) feature
o Remove the last of the MAKEDEV stuff
o Switch to using the top level (e.g., /usr/src) Makefile, and specify
that we should use the *.mk files from the source directory instead of
the installed versions.
o Check for the deprecated 'nodev' option in /etc/fstab
o Add support for the IGNORE_FILES variable
o Before installing a file check to make sure that the target does not
already exist as a directory
o Check to be sure that the file installed and error out if not
o We only need to check for the presence of the target of $PAGER
if that variable is actually set

Revision 1.65 / (download) - annotate - [select for diffs], Sun Jan 4 20:59:23 2009 UTC (10 months, 2 weeks ago) by dougb
Branch: MAIN
Changes since 1.64: +4 -3 lines
Diff to previous 1.64 (colored) 

SVN rev 186749 on 2009-01-04 20:59:23Z by dougb

Instead of using obj and all targets which are not cross-build aware,
use _obj and everything which are.

Submitted by:	ru

Revision 1.64 / (download) - annotate - [select for diffs], Fri Jan 2 07:25:30 2009 UTC (10 months, 3 weeks ago) by dougb
Branch: MAIN
Changes since 1.63: +12 -8 lines
Diff to previous 1.63 (colored) 

SVN rev 186695 on 2009-01-02 07:25:30Z by dougb

Simplify the code a little by moving the working part of
ARCHSTRING into the new MM_MAKE variable.

We only need to check for the presence of the target of $PAGER
if that variable is actually set. [1]

Pointed out by:	Steve Kargl <sgk@troutmask.apl.washington.edu> [1]

Revision 1.63 / (download) - annotate - [select for diffs], Fri Jan 2 00:37:59 2009 UTC (10 months, 3 weeks ago) by dougb
Branch: MAIN
Changes since 1.62: +10 -8 lines
Diff to previous 1.62 (colored) 

SVN rev 186689 on 2009-01-02 00:37:59Z by dougb

Only check for 'nodev' in fstab if that file exists

Submitted by:	sam

Revision 1.62 / (download) - annotate - [select for diffs], Fri Jan 2 00:02:14 2009 UTC (10 months, 3 weeks ago) by dougb
Branch: MAIN
Changes since 1.61: +1 -1 lines
Diff to previous 1.61 (colored) 

SVN rev 186688 on 2009-01-02 00:02:14Z by dougb

For IGNORE_FILES delete the version in the TEMPROOT, not the base.

Submitted by:	clemens fischer <ino-news@spotteswoode.dnsalias.org>

Revision 1.61 / (download) - annotate - [select for diffs], Thu Jan 1 11:41:13 2009 UTC (10 months, 3 weeks ago) by dougb
Branch: MAIN
Changes since 1.60: +85 -50 lines
Diff to previous 1.60 (colored) 

SVN rev 186678 on 2009-01-01 11:41:13Z by dougb

Maintenance and updates
=======================
1. Various improvements to the mtree (-U) feature:
a. Seperate the notion of directory and file (user can override db path)
b. Only check for the existence of the mtree file if -U is set
c. Use mktemp to create the new version of the file
d. More safely install the new file
e. Standardize error messages a bit
2. Remove the last of the MAKEDEV stuff (RIP)

New Features
============
1. Switch to using the top level (e.g., /usr/src) Makefile, and specify
that we should use the *.mk files from the source directory instead of
the installed versions. [1][2] This allows easier cross builds and
simplifies (or in some cases permits) upgrading.
2. Check for the deprecated 'nodev' option in /etc/fstab [3]
3. Add support for the IGNORE_FILES variable [4] and deprecate IGNORE_MOTD
accordingly.
4. Before installing a file check to make sure that the target does not
already exist as a directory [5]
5. Check to be sure that the file installed and error out if not

PR:		bin/96528 [1]
Submitted by:	ru [1]
PR:		bin/129639 [2]
Submitted by:	sam [2]
PR:		bin/122282 [3]
Submitted by:	Eygene Ryabinkin <rea-fbsd@codelabs.ru> [3]
PR:		bin/106642 [4]
Submitted by:	Henrik Brix Andersen <henrik@brixandersen.dk> [4]
PR:		bin/108183 [5]
Submitted by:	Riccardo Torrini <riccardo@torrini.org> [5]

Revision 1.60 / (download) - annotate - [select for diffs], Thu Jan 1 10:55:26 2009 UTC (10 months, 3 weeks ago) by dougb
Branch: MAIN
Changes since 1.59: +0 -19 lines
Diff to previous 1.59 (colored) 

SVN rev 186677 on 2009-01-01 10:55:26Z by dougb

Revert 184781, 184804, and 184832 (automatic installation of files
that differ only by VCS Id) for the following reasons:
1. It was added without my consent, review, or even a heads up
2. It is something that I've repeatedly said I do not want, and certainly
do not want as the default
3. It is poorly implemented (much too complex, produces false positives
e.g., /etc/mail/helpfile)

Given that this is a situation that comes up very infrequently (usually
only for a major version upgrade) and can usually be handled simply
enough on a one-off basis, I will once again point out that I think
this is a Bad Idea. I would be willing to consider a better implementation
as an option that is off by default.

Revision 1.51.8.5 / (download) - annotate - [select for diffs], Wed Dec 10 11:09:31 2008 UTC (11 months, 2 weeks ago) by sobomax
Branch: RELENG_6
Changes since 1.51.8.4: +19 -0 lines
Diff to previous 1.51.8.4 (colored) to branchpoint 1.51 (colored) 

SVN rev 185856 on 2008-12-10 11:09:31Z by sobomax

MFC: automatically upgrade files that only differ in CVS Id tag.

Revision 1.54.2.1.2.1 / (download) - annotate - [select for diffs], Tue Nov 25 02:59:29 2008 UTC (11 months, 4 weeks ago) by kensmith
Branch: RELENG_7_1
CVS Tags: RELENG_7_1_0_RELEASE
Changes since 1.54.2.1: +0 -0 lines
Diff to previous 1.54.2.1 (colored) next main 1.54.2.2 (colored) 

SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)

Revision 1.59 / (download) - annotate - [select for diffs], Tue Nov 11 02:13:21 2008 UTC (12 months, 1 week ago) by sobomax
Branch: MAIN
Changes since 1.58: +0 -1 lines
Diff to previous 1.58 (colored) 

SVN rev 184832 on 2008-11-11 02:13:21Z by sobomax

No need to run rm ${COMPFILE} after mm_install() - mm_install()
does it for us.

Revision 1.58 / (download) - annotate - [select for diffs], Sun Nov 9 23:44:32 2008 UTC (12 months, 2 weeks ago) by sobomax
Branch: MAIN
Changes since 1.57: +8 -2 lines
Diff to previous 1.57 (colored) 

SVN rev 184804 on 2008-11-09 23:44:32Z by sobomax

Improve on 184781 - instead of ignoring the file when the only difference
is CVS Id, replace the old one with the new one automatically. While I
don't see much difference, some people think it's somehow better that way.

Revision 1.57 / (download) - annotate - [select for diffs], Sun Nov 9 07:58:23 2008 UTC (12 months, 2 weeks ago) by sobomax
Branch: MAIN
Changes since 1.56: +14 -0 lines
Diff to previous 1.56 (colored) 

SVN rev 184781 on 2008-11-09 07:58:23Z by sobomax

Ignore files that only differ in CVS Id tag.

MFC after:	2 weeks

Revision 1.51.8.4.2.1 / (download) - annotate - [select for diffs], Thu Oct 2 02:57:24 2008 UTC (13 months, 3 weeks ago) by kensmith
Branch: RELENG_6_4
CVS Tags: RELENG_6_4_0_RELEASE
Changes since 1.51.8.4: +0 -0 lines
Diff to previous 1.51.8.4 (colored) next main 1.51.8.5 (colored) 

SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)

Revision 1.56 / (download) - annotate - [select for diffs], Mon May 26 10:40:09 2008 UTC (17 months, 4 weeks ago) by bz
Branch: MAIN
Changes since 1.55: +2 -2 lines
Diff to previous 1.55 (colored) 

Remove ISDN4BSD (I4B) from HEAD as it is not MPSAFE and
parts relied on the now removed NET_NEEDS_GIANT.
Most of I4B has been disconnected from the build
since July 2007 in HEAD/RELENG_7.

This is what was removed:
- configuration in /etc/isdn
- examples
- man pages
- kernel configuration
- sys/i4b (drivers, layers, include files)
- user space tools
- i4b support from ppp
- further documentation

Discussed with: rwatson, re

Revision 1.54.4.1 / (download) - annotate - [select for diffs], Mon Dec 24 06:33:22 2007 UTC (23 months ago) by dougb
Branch: RELENG_7_0
CVS Tags: RELENG_7_0_0_RELEASE
Changes since 1.54: +7 -0 lines
Diff to previous 1.54 (colored) next main 1.55 (colored) 

MFC version 1.55, safety belt for the (unlikely) disappearance of
the temproot before a -r run.

Approved by:	re (kensmith)

Revision 1.51.8.3.4.1 / (download) - annotate - [select for diffs], Mon Dec 24 05:51:45 2007 UTC (23 months ago) by dougb
Branch: RELENG_6_3
CVS Tags: RELENG_6_3_0_RELEASE
Changes since 1.51.8.3: +7 -0 lines
Diff to previous 1.51.8.3 (colored) next main 1.51.8.4 (colored) 

MFC version 1.55, safety belt for the (unlikely) disappearance of
the temproot before a -r run.

Approved by:	re (kensmith)

Revision 1.51.8.4 / (download) - annotate - [select for diffs], Mon Dec 24 05:50:46 2007 UTC (23 months ago) by dougb
Branch: RELENG_6
CVS Tags: RELENG_6_4_BP
Branch point for: RELENG_6_4
Changes since 1.51.8.3: +7 -0 lines
Diff to previous 1.51.8.3 (colored) to branchpoint 1.51 (colored) 

MFC version 1.55, safety belt for the (unlikely) disappearance of
the temproot before a -r run.

Revision 1.54.2.1 / (download) - annotate - [select for diffs], Mon Dec 24 05:48:38 2007 UTC (23 months ago) by dougb
Branch: RELENG_7
CVS Tags: RELENG_7_1_BP
Branch point for: RELENG_7_1
Changes since 1.54: +7 -0 lines
Diff to previous 1.54 (colored) 

MFC version 1.55, safety belt for the (unlikely) disappearance of
the temproot before a -r run.

Approved by:	re (kensmith)

Revision 1.55 / (download) - annotate - [select for diffs], Fri Dec 21 19:34:26 2007 UTC (23 months ago) by dougb
Branch: MAIN
Changes since 1.54: +7 -0 lines
Diff to previous 1.54 (colored) 

In the following scenario:
1. Start mergemaster
2. Interrupt it
3. < Somehow the temproot directory disappears >
4. mergemaster -r
Many bad things can happen, especially if the -i option is in use.

Therefore, add a check to make sure it still exists before we start
comparing files.

Brought to my attention by:
PR:		bin/40538
Submitted by:	Cyrille Lefevre <cyrille.lefevre@laposte.net>

Revision 1.51.8.3 / (download) - annotate - [select for diffs], Sat Jun 10 21:42:49 2006 UTC (3 years, 5 months ago) by gordon
Branch: RELENG_6
CVS Tags: RELENG_6_3_BP, RELENG_6_2_BP, RELENG_6_2_0_RELEASE, RELENG_6_2
Branch point for: RELENG_6_3
Changes since 1.51.8.2: +86 -1 lines
Diff to previous 1.51.8.2 (colored) to branchpoint 1.51 (colored) 

MFC auto updating of files not modified by the user.

Revision 1.54 / (download) - annotate - [select for diffs], Sat Apr 29 18:21:43 2006 UTC (3 years, 6 months ago) by gordon
Branch: MAIN
CVS Tags: RELENG_7_BP, RELENG_7_0_BP
Branch point for: RELENG_7_0, RELENG_7
Changes since 1.53: +86 -1 lines
Diff to previous 1.53 (colored) 

Add auto upgrade capability to mergemaster.

An mtree description of all non-zero files that make
distribution installs (only size and md5) is built from the
temproot.  When the user completes a mergemaster run, the
mtree description file gets installed into /var/db for
safe-keeping.

When the user then decides to do a subsequent upgrade (with
the -U flag), the existing mtree description from /var/db
is called into service looking for files that are different in
DESTDIR. This is stashed away until a file that would normally
end up prompting the user to look at changes is encountered.
Since there are no user modified changes, the new file is
installed without bothering the user.

Looked at by:	dougb
MFC after:	6 weeks

Revision 1.51.8.2 / (download) - annotate - [select for diffs], Mon Feb 13 23:47:48 2006 UTC (3 years, 9 months ago) by rwatson
Branch: RELENG_6
CVS Tags: RELENG_6_1_BP, RELENG_6_1_0_RELEASE, RELENG_6_1
Changes since 1.51.8.1: +11 -7 lines
Diff to previous 1.51.8.1 (colored) to branchpoint 1.51 (colored) 

Merge mergemaster.8:1.34, mergemaster.sh:1.53 from HEAD to RELENG_6:

  Add a -A argument to mergemaster to allow explicitly specifying an
  architecture to pass through to the underlying makefiles.  This is
  quite useful when building on an i386 box to populate an amd64 NFS
  root.

  Head nod:       dougb

Approved by:	re (scottl)

Revision 1.53 / (download) - annotate - [select for diffs], Sat Feb 4 18:24:06 2006 UTC (3 years, 9 months ago) by rwatson
Branch: MAIN
Changes since 1.52: +11 -7 lines
Diff to previous 1.52 (colored) 

Add a -A argument to mergemaster to allow explicitly specifying an
architecture to pass through to the underlying makefiles.  This is
quite useful when building on an i386 box to populate an amd64 NFS
root.

Head nod:	dougb
MFC after:	1 week

Revision 1.51.2.1 / (download) - annotate - [select for diffs], Wed Dec 21 09:04:24 2005 UTC (3 years, 11 months ago) by dougb
Branch: RELENG_5
CVS Tags: RELENG_5_5_BP, RELENG_5_5_0_RELEASE, RELENG_5_5
Changes since 1.51: +5 -5 lines
Diff to previous 1.51 (colored) next main 1.52 (colored) 

MFC 1.52, do not delete stale /etc/rc.d files by default

Revision 1.51.8.1 / (download) - annotate - [select for diffs], Wed Dec 21 09:03:22 2005 UTC (3 years, 11 months ago) by dougb
Branch: RELENG_6
Changes since 1.51: +5 -5 lines
Diff to previous 1.51 (colored) 

MFC 1.52, do not delete stale /etc/rc.d files by default

Revision 1.52 / (download) - annotate - [select for diffs], Wed Dec 21 08:59:22 2005 UTC (3 years, 11 months ago) by dougb
Branch: MAIN
Changes since 1.51: +5 -5 lines
Diff to previous 1.51 (colored) 

Change the default for deleting stale files from yes (which violates
the general principle that mm should do nothing by default) to no.

PR:		bin/85449
Submitted by:	Kevin Oberman <oberman@es.net>

Revision 1.51 / (download) - annotate - [select for diffs], Sun Mar 7 10:10:19 2004 UTC (5 years, 8 months ago) by dougb
Branch: MAIN
CVS Tags: RELENG_6_BP, RELENG_6_0_BP, RELENG_6_0_0_RELEASE, RELENG_6_0, RELENG_5_BP, RELENG_5_4_BP, RELENG_5_4_0_RELEASE, RELENG_5_4, RELENG_5_3_BP, RELENG_5_3_0_RELEASE, RELENG_5_3
Branch point for: RELENG_6, RELENG_5
Changes since 1.50: +1 -1 lines
Diff to previous 1.50 (colored) 

In the case where /etc/rc.d/ is empty, do not bogusly ask the user if
they want to delete '*'. It turns out that there is one valid case where
this might happen, installing to an empty DESTDIR.

Patch submitted by:	schweikh

Revision 1.50 / (download) - annotate - [select for diffs], Sat Mar 6 15:03:21 2004 UTC (5 years, 8 months ago) by ru
Branch: MAIN
Changes since 1.49: +3 -3 lines
Diff to previous 1.49 (colored) 

Set MAKEOBJDIRPREFIX in the environment, like God intended.  This
only worked because src/Makefile.inc1 is wrapped by src/Makefile.

Silence from:	dougb

Revision 1.47.2.2 / (download) - annotate - [select for diffs], Tue Jan 6 18:06:38 2004 UTC (5 years, 10 months ago) by dougb
Branch: RELENG_5_2
CVS Tags: RELENG_5_2_1_RELEASE, RELENG_5_2_0_RELEASE
Changes since 1.47.2.1: +4 -5 lines
Diff to previous 1.47.2.1 (colored) to branchpoint 1.47 (colored) next main 1.48 (colored) 

Commit the fix from 1.49 which prevents false positives in the
-p (pre-world) case

Approved by:	re (scottl)

Revision 1.49 / (download) - annotate - [select for diffs], Sun Jan 4 22:02:04 2004 UTC (5 years, 10 months ago) by dougb
Branch: MAIN
Changes since 1.48: +4 -5 lines
Diff to previous 1.48 (colored) 

mergemaster -p (pre-world) doesn't populate /etc/rc.d, which led to a
false positive for every file according to the new stale rc.d checker.

Friendly reminder by:	dhw

Revision 1.47.2.1 / (download) - annotate - [select for diffs], Sat Jan 3 19:16:14 2004 UTC (5 years, 10 months ago) by dougb
Branch: RELENG_5_2
Changes since 1.47: +51 -2 lines
Diff to previous 1.47 (colored) 

MFC 1.48, which contains two small cleanups and the
"stale /etc/rc.d file" checker.

PR:		bin/60246
Approved by:	re (scottl)

Revision 1.48 / (download) - annotate - [select for diffs], Thu Jan 1 23:41:37 2004 UTC (5 years, 10 months ago) by dougb
Branch: MAIN
Changes since 1.47: +51 -2 lines
Diff to previous 1.47 (colored) 

* Update copyright
* Delete a trailing space
* Add a 'stale /etc/rc.d file checker', offer to delete any stale
files for the user.

Revision 1.6.2.18 / (download) - annotate - [select for diffs], Mon Aug 25 08:27:41 2003 UTC (6 years, 3 months ago) by dougb
Branch: RELENG_4
CVS Tags: RELENG_4_9_BP, RELENG_4_9_0_RELEASE, RELENG_4_9, RELENG_4_11_BP, RELENG_4_11_0_RELEASE, RELENG_4_11, RELENG_4_10_BP, RELENG_4_10_0_RELEASE, RELENG_4_10
Changes since 1.6.2.17: +23 -4 lines
Diff to previous 1.6.2.17 (colored) to branchpoint 1.6 (colored) next main 1.7 (colored) 

MFC most of 1.4[467], the preserve replaced files option,
and the fix for the build target

Revision 1.47 / (download) - annotate - [select for diffs], Mon Aug 4 10:23:45 2003 UTC (6 years, 3 months ago) by dougb
Branch: MAIN
CVS Tags: RELENG_5_2_BP
Branch point for: RELENG_5_2
Changes since 1.46: +1 -0 lines
Diff to previous 1.46 (colored) 

Use the actual build target (all), since relying on the build as a
side effect of the distribution target was apparently just good luck
all these years.

Submitted by:	ru

Revision 1.46 / (download) - annotate - [select for diffs], Sat May 3 06:35:19 2003 UTC (6 years, 6 months ago) by dougb
Branch: MAIN
CVS Tags: RELENG_5_1_BP, RELENG_5_1_0_RELEASE, RELENG_5_1
Changes since 1.45: +2 -2 lines
Diff to previous 1.45 (colored) 

Preserve directory structure in PRESERVED_FILES_DIR to avoid
filename collisions.

Submitted by:	des

Revision 1.45 / (download) - annotate - [select for diffs], Fri May 2 11:07:58 2003 UTC (6 years, 6 months ago) by dougb
Branch: MAIN
Changes since 1.44: +2 -2 lines
Diff to previous 1.44 (colored) 

rc.sendmail should not have been removed yet.
Don't include it in the rcOG removal prompt.

Revision 1.44 / (download) - annotate - [select for diffs], Fri May 2 06:26:23 2003 UTC (6 years, 6 months ago) by dougb
Branch: MAIN
Changes since 1.43: +50 -20 lines
Diff to previous 1.43 (colored) 

* Add a -P (Preserve) option, which saves a copy of files that you replace.
The idea for this option came from Marc Schneiders <marc@schneiders.org>

* I've been meaning to remove the code that checked for the existence of
/etc/sysconfig for a while now, since that file was last seen in 2.2.2.

* Replace the above with a check for elements of the old rc system.
Offer to move these files out of DESTDIR/etc for the user's convenience.

Revision 1.6.2.17 / (download) - annotate - [select for diffs], Mon Mar 10 06:55:48 2003 UTC (6 years, 8 months ago) by dougb
Branch: RELENG_4
CVS Tags: RELENG_4_8_BP, RELENG_4_8_0_RELEASE, RELENG_4_8
Changes since 1.6.2.16: +4 -4 lines
Diff to previous 1.6.2.16 (colored) to branchpoint 1.6 (colored) 

MFC the latest fix which deals with the newly created login.conf.db,
and proactively with the *.db files to come. This is a slightly
improved version of the comment, which more clearly explains the
purpose of the update.

Approved by:	re (murray)

Revision 1.43 / (download) - annotate - [select for diffs], Wed Mar 5 12:42:08 2003 UTC (6 years, 8 months ago) by dougb
Branch: MAIN
Changes since 1.42: +1 -1 lines
Diff to previous 1.42 (colored) 

Put back the deletion of TEMPROOT/etc/passwd.

Noticed by: maxim

Revision 1.42 / (download) - annotate - [select for diffs], Wed Mar 5 08:20:55 2003 UTC (6 years, 8 months ago) by dougb
Branch: MAIN
Changes since 1.41: +4 -4 lines
Diff to previous 1.41 (colored) 

Better handle the recent (desirable) change to create login.conf.db at
install time, and make sure to catch any future .db files as well.

Revision 1.6.2.16 / (download) - annotate - [select for diffs], Sun Mar 2 02:46:53 2003 UTC (6 years, 8 months ago) by dougb
Branch: RELENG_4
Changes since 1.6.2.15: +6 -5 lines
Diff to previous 1.6.2.15 (colored) to branchpoint 1.6 (colored) 

MFC 1.41, including the new DIFF_OPTIONS variable, and misc. small improvements

Approved by:	re (murray)

Revision 1.41 / (download) - annotate - [select for diffs], Wed Feb 5 11:09:21 2003 UTC (6 years, 9 months ago) by dougb
Branch: MAIN
Changes since 1.40: +6 -5 lines
Diff to previous 1.40 (colored) 

* Update copyright year.
* Give back one line of ws when showing a diff.
  This was requested by several.
* Un-quote DIFF_FLAG, and add DIFF_OPTIONS. This will allow the user to
  do more creative things in a mergemaster rc file. Un-quoting is necessary
  in order to handle things like CVS Id tags that look like shell variables.
* Simplify terminal width determination.

Suggestions related to ignoring the CVS Id's were taken from several, with
dillon and gad providing particularly helpful feedback.

Revision 1.40 / (download) - annotate - [select for diffs], Tue Jan 28 18:44:40 2003 UTC (6 years, 9 months ago) by dillon
Branch: MAIN
Changes since 1.39: +11 -44 lines
Diff to previous 1.39 (colored) 

Backout last commit by request.

Revision 1.39 / (download) - annotate - [select for diffs], Sat Jan 25 19:12:06 2003 UTC (6 years, 10 months ago) by dillon
Branch: MAIN
Changes since 1.38: +44 -11 lines
Diff to previous 1.38 (colored) 

Commit simple mergemaster changes to make the UI more deterministic
(far easier to use) by limiting the initial display to the size of the
window.

Revision 1.6.2.15 / (download) - annotate - [select for diffs], Fri Oct 25 07:59:16 2002 UTC (7 years, 1 month ago) by dougb
Branch: RELENG_4
Changes since 1.6.2.14: +14 -9 lines
Diff to previous 1.6.2.14 (colored) to branchpoint 1.6 (colored) 

* Finally bring in the changes from 1.37 that quiet the spurious warnings
about deleting TEMPROOT.
* Bring in the DESTDIR related fixes from 1.36
* Turn the process of finding a file's modes (via perl) into a function
to reduce diffs to the code in RELENG_5.

Revision 1.38 / (download) - annotate - [select for diffs], Tue Oct 22 15:04:32 2002 UTC (7 years, 1 month ago) by phk
Branch: MAIN
CVS Tags: RELENG_5_0_BP, RELENG_5_0_0_RELEASE, RELENG_5_0
Changes since 1.37: +1 -1 lines
Diff to previous 1.37 (colored) 

Don't use NO_MAKEDEV* option, its the default now.

Revision 1.37 / (download) - annotate - [select for diffs], Mon Aug 5 08:47:52 2002 UTC (7 years, 3 months ago) by dougb
Branch: MAIN
Changes since 1.36: +3 -3 lines
Diff to previous 1.36 (colored) 

Suppress spurious warning messages about rm -rf TEMPROOT failing
before chflags, and exit non-zero if the old TEMPROOT dir
can't be deleted for whatever reason.

Revision 1.36 / (download) - annotate - [select for diffs], Mon Aug 5 01:03:12 2002 UTC (7 years, 3 months ago) by dougb
Branch: MAIN
Changes since 1.35: +2 -2 lines
Diff to previous 1.35 (colored) 

Fix a couple DESTDIR related problems. Credit for the "Only in" section
goes to James <James_Bond_79@yahoo.com>, and Cyrille Lefevre
<cyrille.lefevre@laposte.net>. The make variables problem was found
by jon.

Revision 1.6.2.13.2.1 / (download) - annotate - [select for diffs], Tue Jul 16 12:33:28 2002 UTC (7 years, 4 months ago) by des
Branch: RELENG_4_6
CVS Tags: RELENG_4_6_2_RELEASE, RELENG_4_6_1_RELEASE
Changes since 1.6.2.13: +17 -11 lines
Diff to previous 1.6.2.13 (colored) next main 1.6.2.14 (colored) 

Merge OpenSSH, OPIE, PAM and a number of dependencies from -STABLE.

Revision 1.6.2.14 / (download) - annotate - [select for diffs], Sun Jun 30 19:01:35 2002 UTC (7 years, 4 months ago) by dougb
Branch: RELENG_4
CVS Tags: RELENG_4_7_BP, RELENG_4_7_0_RELEASE, RELENG_4_7
Changes since 1.6.2.13: +18 -11 lines
Diff to previous 1.6.2.13 (colored) to branchpoint 1.6 (colored) 

MFC the "press enter to continue" bit from 1.32, and the handling of
chflags from 1.3[45]. At this time I don't plan to import stat(1)
into RELENG_4, so the perl -> stat bits are left out for now.

The somewhat rapid MFC of the chflags stuff is being done at the
request of des in order to facilitate the ssh upgrade in this branch.

Revision 1.35 / (download) - annotate - [select for diffs], Sun Jun 30 18:47:57 2002 UTC (7 years, 4 months ago) by dougb
Branch: MAIN
Changes since 1.34: +8 -3 lines
Diff to previous 1.34 (colored) 

* Handle all flags, not just schg
* Make chflags -R more efficient by deleting everything we can first

Revision 1.34 / (download) - annotate - [select for diffs], Wed Jun 26 14:14:07 2002 UTC (7 years, 5 months ago) by dougb
Branch: MAIN
Changes since 1.33: +2 -1 lines
Diff to previous 1.33 (colored) 

Add 'chflags -R noschg' to the deletion process for the TEMPROOT
directory so that /var/empty, and any other such items that are
added in the future can be deleted effectively.

Revision 1.33 / (download) - annotate - [select for diffs], Mon Jun 10 07:16:42 2002 UTC (7 years, 5 months ago) by dougb
Branch: MAIN
Changes since 1.32: +31 -23 lines
Diff to previous 1.32 (colored) 

Go back to taking the user's umask into account. Thanks to Alfred for
hatching the idea of using dc, and Giorgos (keramida) for incubating it.

This also reverses most of the previous commit which took out or
modified the text about umask stuff.

Revision 1.32 / (download) - annotate - [select for diffs], Thu Jun 6 20:38:22 2002 UTC (7 years, 5 months ago) by dougb
Branch: MAIN
Changes since 1.31: +33 -34 lines
Diff to previous 1.31 (colored) 

* Use the new stat(1) to get mode information from the files we
are installing.
* Since this means that for now we can't accomodate non-standard
umask's, warn the user accordingly.
* Convert the "press enter to continue" prompt into a function.

Revision 1.6.2.13 / (download) - annotate - [select for diffs], Tue May 28 07:32:01 2002 UTC (7 years, 6 months ago) by dougb
Branch: RELENG_4
CVS Tags: RELENG_4_6_BP, RELENG_4_6_0_RELEASE
Branch point for: RELENG_4_6
Changes since 1.6.2.12: +31 -5 lines
Diff to previous 1.6.2.12 (colored) to branchpoint 1.6 (colored) 

MFC 1.30-31. Small tune-ups to the pre-buildworld option,
and auto-screen-size-detection.

Approved by:	re

Revision 1.31 / (download) - annotate - [select for diffs], Tue May 28 07:25:44 2002 UTC (7 years, 6 months ago) by dougb
Branch: MAIN
Changes since 1.30: +3 -0 lines
Diff to previous 1.30 (colored) 

Actually accept the default argument to SCREEN_WIDTH.

Submitted by:	brian

Revision 1.30 / (download) - annotate - [select for diffs], Sat May 4 22:45:12 2002 UTC (7 years, 6 months ago) by dougb
Branch: MAIN
Changes since 1.29: +28 -5 lines
Diff to previous 1.29 (colored) 

* Add some niceties to make the -p option quieter, and better behaved
* Take a simple idea about setting the screen width using stty (for sdiff's
purposes) thoughtfully suggested by Joerg to an absurd conclusion.

Revision 1.6.2.12 / (download) - annotate - [select for diffs], Mon Apr 15 00:46:15 2002 UTC (7 years, 7 months ago) by dougb
Branch: RELENG_4
Changes since 1.6.2.11: +1 -1 lines
Diff to previous 1.6.2.11 (colored) to branchpoint 1.6 (colored) 

Take advantage of the NO_MAKEDEV_RUN MFC I just did

Revision 1.6.2.11 / (download) - annotate - [select for diffs], Mon Apr 8 10:35:15 2002 UTC (7 years, 7 months ago) by dougb
Branch: RELENG_4
Changes since 1.6.2.10: +92 -25 lines
Diff to previous 1.6.2.10 (colored) to branchpoint 1.6 (colored) 

MFC 1.27 - 1.29.

* Pre buildworld and post-mm file comparison modes
* Some small code improvements
* Delete files in ${TEMPROOT}/usr/obj to avoid comparing them

Revision 1.29 / (download) - annotate - [select for diffs], Mon Apr 8 10:30:44 2002 UTC (7 years, 7 months ago) by dougb
Branch: MAIN
Changes since 1.28: +3 -0 lines
Diff to previous 1.28 (colored) 

Solve the problem of spuriously comparing files that were created
in the ${TEMPROOT}/usr/obj directory by deleting them first.

Revision 1.28 / (download) - annotate - [select for diffs], Mon Feb 25 04:52:56 2002 UTC (7 years, 9 months ago) by dougb
Branch: MAIN
Changes since 1.27: +4 -4 lines
Diff to previous 1.27 (colored) 

Improve grep'ing for variables in make.conf and rc.conf*.
Thanks to cjc for the idea.

Revision 1.27 / (download) - annotate - [select for diffs], Sun Feb 24 10:22:14 2002 UTC (7 years, 9 months ago) by dougb
Branch: MAIN
Changes since 1.26: +90 -26 lines
Diff to previous 1.26 (colored) 

* Add a feature to do a "pre {build|install}world" check of (so far)
master.passwd, group, and make.conf
* Add a feature to check variables in rc.conf[.local] to their
counterparts in /etc/defaults/rc.conf after a run
* Twiddle whitespace a little
* Change some "[ -f file ] && rm file" to "rm -f file"

Revision 1.6.2.10 / (download) - annotate - [select for diffs], Sun Feb 24 07:42:00 2002 UTC (7 years, 9 months ago) by dougb
Branch: RELENG_4
Changes since 1.6.2.9: +5 -2 lines
Diff to previous 1.6.2.9 (colored) to branchpoint 1.6 (colored) 

MFC latest, including a small update to the man page, a line
seperator for small diffs, and a bug fix for files with no
cvs $Id's.

Revision 1.26 / (download) - annotate - [select for diffs], Tue Feb 12 09:54:56 2002 UTC (7 years, 9 months ago) by dougb
Branch: MAIN
Changes since 1.25: +6 -3 lines
Diff to previous 1.25 (colored) 

* Update (c)
* Fix a problem with files that have no CVS $Id's. Thanks to naddy for
spotting this one. It wasn't a _huge_ problem since almost all the files
we install (except motd) have one, but still, it's a bug.
* Add a divider between diff outputs, which is helpful both for logs,
and for giving a good visual clue for diffs that are smaller than
$LINES. Another helpful suggestion from Gary W. Swearingen, swear@blarg.net.

Revision 1.6.2.9 / (download) - annotate - [select for diffs], Sat Aug 11 20:27:52 2001 UTC (8 years, 3 months ago) by dougb
Branch: RELENG_4
CVS Tags: RELENG_4_5_BP, RELENG_4_5_0_RELEASE, RELENG_4_5, RELENG_4_4_BP, RELENG_4_4_0_RELEASE, RELENG_4_4
Changes since 1.6.2.8: +3 -1 lines
Diff to previous 1.6.2.8 (colored) to branchpoint 1.6 (colored) 

Hopefully put the problem of dealing with read-only source trees to bed for
good by building everything (which amounts to sendmail.cf atm) in TEMPROOT.

Tested in RELENG_4 by: George Cox <gjvc@sophos.com>
Approved by:	Murray

Revision 1.25 / (download) - annotate - [select for diffs], Tue Aug 7 06:22:12 2001 UTC (8 years, 3 months ago) by dougb
Branch: MAIN
Changes since 1.24: +4 -2 lines
Diff to previous 1.24 (colored) 

Hopefully squish the problem of mm creating sendmail files in
the source tree once and for all.

Pointed out by: A cast of thousands

Reviewed by:	asmodai

Revision 1.6.2.8 / (download) - annotate - [select for diffs], Mon Jul 16 04:02:38 2001 UTC (8 years, 4 months ago) by dougb
Branch: RELENG_4
Changes since 1.6.2.7: +14 -7 lines
Diff to previous 1.6.2.7 (colored) to branchpoint 1.6 (colored) 

Catch up to the latest fixes from -current

Revision 1.24 / (download) - annotate - [select for diffs], Wed Jun 20 07:15:38 2001 UTC (8 years, 5 months ago) by dougb
Branch: MAIN
Changes since 1.23: +14 -8 lines
Diff to previous 1.23 (colored) 

Work around the problem in RELENG_4 where the file doesn't actually
exist, and therefore mm_install is returning the "fail" value of
the test instead of the "success" value for install.

This change is a no-op on HEAD, but since the only harm on RELENG_4
ATM is a spurious warning it can follow the usual MFC practice.

Submitted by:	A cast of thousands :-/

Revision 1.6.2.7 / (download) - annotate - [select for diffs], Mon Jun 4 04:11:40 2001 UTC (8 years, 5 months ago) by dougb
Branch: RELENG_4
Changes since 1.6.2.6: +100 -47 lines
Diff to previous 1.6.2.6 (colored) to branchpoint 1.6 (colored) 

MFC 1.19-23, cleanups and clarifications, along with some OpenBSD
compatibility changes. No new functionality.

Revision 1.23 / (download) - annotate - [select for diffs], Wed May 30 08:50:10 2001 UTC (8 years, 5 months ago) by dougb
Branch: MAIN
Changes since 1.22: +15 -10 lines
Diff to previous 1.22 (colored) 

Add the last of the compatibility mods from openbsd. Neatly, the
"install && rm" change fits in with the new FreeBSD default of
copy instead of move for install. Changing the order of the deletion
of the spurious password files doesn't affect FreeBSD functionality,
but it's done in such a way as not to matter.

Obtained from:	Christian Weisgerber <naddy@mips.inka.de>

Revision 1.22 / (download) - annotate - [select for diffs], Mon May 28 13:17:20 2001 UTC (8 years, 5 months ago) by dougb
Branch: MAIN
Changes since 1.21: +48 -19 lines
Diff to previous 1.21 (colored) 

Various fixes, including suggestions from some thoughtful folks, thanks.

* Minor umask portability change (Christian Weisgerber <naddy@mips.inka.de>)
* Clarify default value of the "run it now" option (bmah)
* Make "run it now" $DESTDIR safe (bsd)
* Handle installation of hard links for /.profile and /.cshrc properly
  when the auto-install option is selected
* Fix some more whitespace issues

Revision 1.21 / (download) - annotate - [select for diffs], Mon May 28 09:46:18 2001 UTC (8 years, 5 months ago) by dougb
Branch: MAIN
Changes since 1.20: +3 -3 lines
Diff to previous 1.20 (colored) 

Be more consistent with the terminology, referring to "temporary and
installed" instead of "old and new". Inspired by the somewhat
non-linear PR, which really didn't have a fix, per se.

PR:		conf/27235 Roelof Osinga <roelof@eboa.com>

Revision 1.20 / (download) - annotate - [select for diffs], Mon May 28 09:35:30 2001 UTC (8 years, 5 months ago) by dougb
Branch: MAIN
Changes since 1.19: +17 -2 lines
Diff to previous 1.19 (colored) 

Fix a problem when user selects -a (auto run) but we encounter a file
missing on the system. Instead of passing it by, mm was prompting...
bad mm, no cookie!

Brought to my attention by the PR, but the fix needed to be tweaked to
handle the auto-install option as well.

PR:		misc/25731 Gilbert Gong <ggong@cal.alumni.berkeley.edu>

Revision 1.19 / (download) - annotate - [select for diffs], Mon May 28 09:07:27 2001 UTC (8 years, 5 months ago) by dougb
Branch: MAIN
Changes since 1.18: +21 -16 lines
Diff to previous 1.18 (colored) 

Whitespace only changes to try and fit a little better into 80 columns.

Revision 1.18 / (download) - annotate - [select for diffs], Thu Mar 29 14:04:19 2001 UTC (8 years, 7 months ago) by asmodai
Branch: MAIN
Changes since 1.17: +2 -2 lines
Diff to previous 1.17 (colored) 

Change NO_MAKEDEV to a finer granularity method:
NO_MAKEDEV_INSTALL and NO_MAKEDEV_RUN.  The former implying the latter.
The names imply what they do.  The last commit by DES based on a PR defeated
the original idea behind NO_MAKEDEV, which was not to run MAKEDEV, but to do
the installation of MAKEDEV.  This should satisfy both parties on the MAKEDEV
challenge.
Reflect this in mergemaster, this might later on be decided to be set to
NO_MAKEDEV_INSTALL, for now I kept to the old behaviour.

Revision 1.6.2.6 / (download) - annotate - [select for diffs], Mon Mar 5 20:33:28 2001 UTC (8 years, 8 months ago) by dougb
Branch: RELENG_4
CVS Tags: RELENG_4_3_BP, RELENG_4_3_0_RELEASE, RELENG_4_3
Changes since 1.6.2.5: +59 -16 lines
Diff to previous 1.6.2.5 (colored) to branchpoint 1.6 (colored) 

MFC the return to grep instead of ident for CVS $Id tags, and the
requested features of source'ing /etc/mergemaster.rc and prompting
the user to run recommended commands like 'newaliases' as needed.

Revision 1.17 / (download) - annotate - [select for diffs], Mon Mar 5 10:13:21 2001 UTC (8 years, 8 months ago) by dougb
Branch: MAIN
Changes since 1.16: +59 -16 lines
Diff to previous 1.16 (colored) 

* Add two requested features, source'ing of /etc/mergemaster.rc, and
  asking the user to actually run the recommended commands related
  to installation of files such as aliases or login.conf.

* Return to using grep for CVS $Id comparison. Using ident caused too
  many problems for people with local CVS/RCS tags in their stuff.
  Attempt to make portability a little easier to maintain in spite of
  this change by defining the name of the tag to search for. This
  is a slightly different change that solves the problem in the PR.

PR:		bin/24564
Submitted by:	Tony Finch <dot@dotat.at>

Revision 1.6.2.5 / (download) - annotate - [select for diffs], Thu Nov 9 00:51:38 2000 UTC (9 years ago) by dougb
Branch: RELENG_4
CVS Tags: RELENG_4_2_0_RELEASE
Changes since 1.6.2.4: +8 -2 lines
Diff to previous 1.6.2.4 (colored) to branchpoint 1.6 (colored) 

MFC appropriate bits of 1.16

Approved by:	jkh

Revision 1.16 / (download) - annotate - [select for diffs], Thu Nov 9 00:19:21 2000 UTC (9 years ago) by dougb
Branch: MAIN
Changes since 1.15: +10 -4 lines
Diff to previous 1.15 (colored) 

* Reduce diffs to RELENG_4 by specifying a full path to sysctl
* Adjust a little whitespace
* Make the distrib-dirs/mtree on DESTDIR conditional on user
  actually specifying a DESTDIR. This seemed like a safe
  way to get the right directories and permissions in the
  installed tree since 'make installworld' does the same
  thing, but in practice too many people have custom hacks
  that we should leave unmolested. Still need to find a way
  to deal with 'install -d' and permissions on nonexistent
  directories in the middle of the path, but this is at
  least no worse that it was before.

PR:		bin/22661

Revision 1.6.2.4 / (download) - annotate - [select for diffs], Wed Nov 1 08:34:30 2000 UTC (9 years ago) by dougb
Branch: RELENG_4
Changes since 1.6.2.3: +329 -267 lines
Diff to previous 1.6.2.3 (colored) to branchpoint 1.6 (colored) 

* Adopt solo MAINTAINER here too
* MFC changes from 1.12 through 1.15

Revision 1.15 / (download) - annotate - [select for diffs], Wed Nov 1 07:21:56 2000 UTC (9 years ago) by dougb
Branch: MAIN
Changes since 1.14: +13 -13 lines
Diff to previous 1.14 (colored) 

Reorder one of the new features based on experience. Since the number
of files auto-installed during an upgrade from a really old system
can get quite long, and it's piped to the PAGER already, print
that first, then print any of the 4 two-line messages that might
apply.

Revision 1.14 / (download) - annotate - [select for diffs], Mon Oct 30 10:33:51 2000 UTC (9 years ago) by dougb
Branch: MAIN
Changes since 1.13: +137 -92 lines
Diff to previous 1.13 (colored) 

Add several new features, reorder some code, and continue with the
process of making the script more cross platform friendly.

* Add -i option to automatically install files that do not exist
  on the system already.
* Add the ability to specify DESTDIR.
* Allow the user to specify scripts to run right before the
  comparison starts, and when mm is done. This will
  allow the user to specify customized local behavior, and
  implement features such as automatically deleting files.
* Document the above changes in the man page.
* Switch to using 'ident' for the CVS Id comparison, which
  should help with portability, and makes it faster.
* Reorder, and in one case fix some code by doing things in
  ways that make more sense.
* Check to see if the file exists on the system before doing
  the comparisons. This saves CPU cycles, and streamlines
  the auto-install process.

I used bits and pieces of suggestions and patches from various
people, ultimately too numerous to name. Which is not to say
that they were not both appreciated, and helpful in achieving
the ultimate result.

Revision 1.13 / (download) - annotate - [select for diffs], Sun Oct 29 09:40:22 2000 UTC (9 years ago) by dougb
Branch: MAIN
Changes since 1.12: +77 -61 lines
Diff to previous 1.12 (colored) 

More changes that don't modify functionality.

* More whitespace
* Change read -p to echo -n/read to help support portability
* Genericize an informational message regarding /.cshrc and /.profile
  for the same reason

Revision 1.12 / (download) - annotate - [select for diffs], Sun Oct 29 07:47:51 2000 UTC (9 years ago) by dougb
Branch: MAIN
Changes since 1.11: +134 -133 lines
Diff to previous 1.11 (colored) 

Whitespace only. Make the style of the contributed sections consistent with
the rest of the file. (Read, put it back the way I like it.)

Revision 1.6.2.3 / (download) - annotate - [select for diffs], Sat Oct 7 11:20:01 2000 UTC (9 years, 1 month ago) by alfred
Branch: RELENG_4
Changes since 1.6.2.2: +157 -109 lines
Diff to previous 1.6.2.2 (colored) to branchpoint 1.6 (colored) 

Bring in my mergemaster mega-patch for better interaction with
users, also bring in several fixes that were done to my patch.
Version 1.10 was pre-MFC'd.

MFC: 1.7 (mega), 1.8 (fix), 1.9 (fix)

Revision 1.6.2.2 / (download) - annotate - [select for diffs], Sun Aug 27 17:31:45 2000 UTC (9 years, 2 months ago) by gshapiro
Branch: RELENG_4
CVS Tags: RELENG_4_1_1_RELEASE
Changes since 1.6.2.1: +2 -2 lines
Diff to previous 1.6.2.1 (colored) to branchpoint 1.6 (colored) 

MFC: Import of sendmail 8.11.0.
     Includes: moving /etc/aliases to /etc/mail/aliases, removing outdated
               documentation, and updating freebsd.mc for new syntax.

Revision 1.11 / (download) - annotate - [select for diffs], Sat Aug 26 12:15:24 2000 UTC (9 years, 3 months ago) by ben
Branch: MAIN
CVS Tags: PRE_SMPNG
Changes since 1.10: +7 -2 lines
Diff to previous 1.10 (colored) 

Make mergemaster ignore files in /dev if /dev is a devfs.

Approved by:	Doug Barton <Doug@gorean.org>

Revision 1.6.2.1 / (download) - annotate - [select for diffs], Wed Aug 16 14:02:29 2000 UTC (9 years, 3 months ago) by brian
Branch: RELENG_4
Changes since 1.6: +24 -12 lines
Diff to previous 1.6 (colored) 

MFC: Use /usr/bin/less rather than /usr/local/bin/less and make the
     PAGER tests and texts more sane.

Revision 1.10 / (download) - annotate - [select for diffs], Sun Aug 13 19:32:19 2000 UTC (9 years, 3 months ago) by gshapiro
Branch: MAIN
Changes since 1.9: +2 -2 lines
Diff to previous 1.9 (colored) 

Use new aliases path (/etc/mail/aliases)

Approved by:	Doug Barton <DougB@gorean.org>

Revision 1.9 / (download) - annotate - [select for diffs], Wed Aug 9 20:36:15 2000 UTC (9 years, 3 months ago) by brian
Branch: MAIN
Changes since 1.8: +15 -8 lines
Diff to previous 1.8 (colored) 

Be more careful about selecting a PAGER.
Improve the question asked when the PAGER is invalid.

Submitted by: Doug Barton <DougB@gorean.org>

Revision 1.8 / (download) - annotate - [select for diffs], Fri May 12 03:09:57 2000 UTC (9 years, 6 months ago) by bsd
Branch: MAIN
Changes since 1.7: +2 -2 lines
Diff to previous 1.7 (colored) 

Actually accept 'm' as a PAGER query response to mean 'more'.

Revision 1.7 / (download) - annotate - [select for diffs], Sun Apr 2 02:47:15 2000 UTC (9 years, 7 months ago) by alfred
Branch: MAIN
Changes since 1.6: +168 -115 lines
Diff to previous 1.6 (colored) 

Make mergemaster only take single letters for options as well as loop
asking a question again if given an invalid input instead of assuming
what the user wants.  /etc is not the place to make assumptions when
given invalid input.

Reformat some of the more convoluted code into seperate functions instead
of being inline using tabs instead of space indents.

Allow the user to view merged files they created with sdiff.

Allow the user to redisplay the diff between the installed file and
the new file again.

Time wasted waiting for review: 1 month 2 weeks

Revision 1.6 / (download) - annotate - [select for diffs], Sat Feb 12 22:14:02 2000 UTC (9 years, 9 months ago) by billf
Branch: MAIN
CVS Tags: RELENG_4_BP, RELENG_4_1_0_RELEASE, RELENG_4_0_0_RELEASE
Branch point for: RELENG_4
Changes since 1.5: +2 -2 lines
Diff to previous 1.5 (colored) 

Use the new (Hi rwatson!) NO_MAKEDEV when making our temproot.

Submitted by:	Doug Barton <Doug@gorean.org> (maintainer)
Approved by:	you-know-who.

Revision 1.5 / (download) - annotate - [select for diffs], Tue Feb 8 22:31:53 2000 UTC (9 years, 9 months ago) by billf
Branch: MAIN
Changes since 1.4: +2 -2 lines
Diff to previous 1.4 (colored) 

Allow $PAGER to have arguments.

Submitted by:	brian
Reviewed by:	Doug Barton <Doug@gorean.org>
Approved by:	jkh

Revision 1.4.2.1 / (download) - annotate - [select for diffs], Wed Nov 3 20:58:47 1999 UTC (10 years ago) by billf
Branch: RELENG_3
CVS Tags: RELENG_3_5_0_RELEASE, RELENG_3_4_0_RELEASE
Changes since 1.4: +1 -1 lines
Diff to previous 1.4 (colored) next main 1.5 (colored) 

MFC: bring mergemaster into RELENG_3

Revision 1.4 / (download) - annotate - [select for diffs], Tue Oct 26 19:06:31 1999 UTC (10 years, 1 month ago) by billf
Branch: MAIN
Branch point for: RELENG_3
Changes since 1.3: +9 -1 lines
Diff to previous 1.3 (colored) 

Add IGNORE_MOTD to allow the sysadmin to ignore (likely) differences in
the FreeBSD default motd and the system motd

Submitted by:	author

Revision 1.3 / (download) - annotate - [select for diffs], Tue Oct 26 19:05:04 1999 UTC (10 years, 1 month ago) by billf
Branch: MAIN
Changes since 1.2: +2 -4 lines
Diff to previous 1.2 (colored) 

Use $FreeBSD$ (instead of the author's $Revision$) to report the
version number now that we have it.

Reviewed by:	author

Revision 1.2 / (download) - annotate - [select for diffs], Mon Oct 25 21:51:04 1999 UTC (10 years, 1 month ago) by billf
Branch: MAIN
Changes since 1.1: +1 -0 lines
Diff to previous 1.1 (colored) 

Add $FreeBSD$

Revision 1.1.1.1 / (download) - annotate - [select for diffs] (vendor branch), Wed Oct 20 07:22:52 1999 UTC (10 years, 1 month ago) by billf
Branch: BARTON
CVS Tags: r0_36
Changes since 1.1: +0 -0 lines
Diff to previous 1.1 (colored) 

Import mergemaster into the tree, a product of freebsdcon.

Submitted by: 	Doug Barton <doug@gorean.org>

Revision 1.1 / (download) - annotate - [select for diffs], Wed Oct 20 07:22:52 1999 UTC (10 years, 1 month ago) by billf
Branch: MAIN 

Initial revision

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.


www@jp.FreeBSD.org
2002/09/30 21:02:05