Commit Graph

4362 Commits

Author SHA1 Message Date
Sam Leffler
7e30ef1bec resolve merge conflicts
MFC after:	3 weeks
2008-03-24 19:57:51 +00:00
Sam Leffler
52cae81516 This commit was generated by cvs2svn to compensate for changes in r177568,
which included commits to RCS files with non-trunk default branches.
2008-03-24 19:46:53 +00:00
Sam Leffler
f2afa83e72 Import of WPA supplicant 0.5.10 2008-03-24 19:46:53 +00:00
Xin LI
577cb6d743 Resolve conflicts. 2008-03-20 02:56:24 +00:00
Xin LI
b74c250e77 Update upgrade instructions to reflect 1.0.5 import; add FREEBSD-vendor
metadata file.
2008-03-20 02:45:32 +00:00
Xin LI
4fd2d3b692 This commit was generated by cvs2svn to compensate for changes in r177420,
which included commits to RCS files with non-trunk default branches.
2008-03-20 02:16:44 +00:00
Xin LI
0c9ffc952b Virgin import (trimmed) of Bzip2 version 1.0.5. 2008-03-20 02:16:44 +00:00
David E. O'Brien
42bd166385 Remove FreeBSD ID's so these are exact copies of the vendor sources. 2008-03-19 15:15:26 +00:00
David E. O'Brien
8177af2087 We use the stock versions of these files. 2008-03-19 15:11:46 +00:00
David E. O'Brien
55c1a1a16b Merge rev 1.9 (new long flag to ignore the CVSROOT/passwd file)
rev 1.2 (local tag/$Id$ keyword support)  into version 1.11-20080310.
2008-03-19 15:08:01 +00:00
David E. O'Brien
95882ea60d Merge rev 1.9 (update "-T" Template support) and rev 1.2 (-D'date'
option with -r'branch' on update)  into version 1.11-20080310.
2008-03-19 15:07:28 +00:00
David E. O'Brien
ba972671ba Merge rev 1.28 (CAN-2005-0753 / FreeBSD-SA-05:05.cvs fixes),
rev 1.27 ("iso8601" option keyword) revs 1.12/1.10/1.5/1.4 ($CVSHeader$
support) rev 1.2 ($CVS_LOCAL_BRANCH_NUM support for local commit
feature of cvsup)  into version 1.11-20080310.
2008-03-19 15:06:50 +00:00
David E. O'Brien
1cc39002b8 Merge rev 1.2 (extensions to the $CVSROOT/config syntax) and
rev 1.4 (1.12 CVSROOT/config keyword expansion forward compatability)
into version 1.11-20080310.
Note the vendor has also added some forward compatability support.
We should determine if we can live with just the vendor's method.
2008-03-19 15:05:27 +00:00
David E. O'Brien
62641a635b Merge rev 1.25 ("iso8601" option keyword), rev 1.17 (environtmental var
"CVS_OPTIONS"), rev 1.14 ('-g' option to support shared-group access),
rev 1.7 ('-R' read-only repository mode), rev 1.6 (support for checking
out from a read-only repository), revs 1.4 & 1.5 ("tagexpand=")
into version 1.11-20080310.  Note the vendor accepted my "blame" alias.
2008-03-19 15:00:43 +00:00
David E. O'Brien
a9361e32aa Merge rev. 1.2 ("iso8601" option keyword) into version 1.11-20080310.
Note the vendor added our '-n' feature to the offical code base.
2008-03-19 14:56:41 +00:00
David E. O'Brien
1df5166048 Merge rev 1.3 (catch write-lock attempts immediately if running in
read-only mode) & rev 1.2 (check out from read-only repository support)
into version 1.11-20080310.
2008-03-19 14:55:59 +00:00
David E. O'Brien
3d1f13d8ce Merge rev 1.21: change default from "rsh" to "ssh", rev 1.14: comprehensive
-T CVS/Template support, rev 1.9: new long flag that causes cvs to ignore
the CVSROOT/passwd file, rev 1.3: support for checking out from a read-only
repository, rev. 1.2: support for local $Id$ keyword  into cvs 1.11-20080310.
2008-03-19 14:50:22 +00:00
David E. O'Brien
1aa5089a57 Merge rev 1.7: always upload new files, even if the timestamps match,
rev 1.2: fix a problem sometimes seen when doing checkouts from a local repo
and committing via remote cvs (a cvs -d override of the mismatched CVS/Root
files was missing)  into cvs 1.11-20080310.

Note that rev 1.4 (default CVS_RSH to "ssh") will not be handled thru the
vendor's config.h.
2008-03-19 14:49:14 +00:00
David E. O'Brien
5109f5b5c7 This commit was generated by cvs2svn to compensate for changes in r177391,
which included commits to RCS files with non-trunk default branches.
2008-03-19 14:46:59 +00:00
David E. O'Brien
76fd2245b5 Import of 1.11 branch snapshot - using the 10-March-2008 code base. 2008-03-19 14:46:59 +00:00
David E. O'Brien
9ffd882be2 egad! The cvs 1.11.22 distribution had a Linux binary in it. Yuck. 2008-03-17 07:57:38 +00:00
Xin LI
90eb3b443d This commit was generated by cvs2svn to compensate for changes in r177128,
which included commits to RCS files with non-trunk default branches.
2008-03-12 23:01:33 +00:00
Xin LI
9a5e637124 Reapply a bugfix that was done as sh.lex.c,v 1.1.1.8 2008-03-12 23:01:33 +00:00
Shteryana Shopova
02f27f1cfa This commit was generated by cvs2svn to compensate for changes in r176892,
which included commits to RCS files with non-trunk default branches.
2008-03-07 09:33:29 +00:00
Shteryana Shopova
691f8568ea Vendor patch: Prevent bsnmpd from dumping core when a module's init hook
returns an error.

Approved by:	bz (mentor), harti
2008-03-07 09:33:29 +00:00
Sam Leffler
ba4e014b5c unbreak printing 802.11 tx/rx rates
MFC after:	3 days
2008-02-25 01:28:14 +00:00
Rui Paulo
8ea0d8cff1 Add AS lookup functionality. On each hop we query a whois server to
find the corresponding AS for that IP (-a switch).
We can also choose a different whois server with the -A switch. The
default is whois.radb.net.

Obtained from:	       NetBSD
Reviewed by:	       bms, njl (mentor)
Approved by:	       njl (mentor)
2008-02-20 23:29:53 +00:00
Remko Lodder
90b87073e6 MFOpenBSD rev 1.393 pf.conf.5
do not describe `/' as solidus; from Allen (freebsd pr120484);

PR:		120484
Submitted by:	Allen <alandsidel at 1001islington dot com>
MFC After:	3 days
2008-02-11 21:09:34 +00:00
Rong-En Fan
d52218b200 - Update instructions for snapshot import 2008-02-11 13:42:45 +00:00
Rong-En Fan
60aa916070 Per discussion on developers@, add vendor information for ncurses. 2008-02-11 13:40:20 +00:00
Rong-En Fan
ce14abc704 This commit was generated by cvs2svn to compensate for changes in r176187,
which included commits to RCS files with non-trunk default branches.
2008-02-11 13:37:14 +00:00
Rong-En Fan
d8977eaf36 Import ncurses 5.6-20080209 snapshot onto the vender branch 2008-02-11 13:37:14 +00:00
Dag-Erling Smørgrav
2f84291cac As per discussion, commit experimental metadata for my contrib packages.
The idea is to have a FREEBSD-vendor file for every third-party package
in the tree.
2008-02-06 23:06:24 +00:00
David E. O'Brien
129099554f This commit was generated by cvs2svn to compensate for changes in r175898,
which included commits to RCS files with non-trunk default branches.
2008-02-02 18:26:53 +00:00
David E. O'Brien
bbb6d1d6bc This commit was generated by cvs2svn to compensate for changes in r175882,
which included commits to RCS files with non-trunk default branches.
2008-02-02 07:19:01 +00:00
David E. O'Brien
c331df4f23 Fix nit in version 4.23 in which -p does not work (thus updating access
times when it shouldn't).  The PR's patch has been incorporated upstream
as magic.c rev 1.46.

PR:		107676
Submitted by:	Dr. Markus Waldeck <waldeck@gmx.de>
2008-02-02 07:19:01 +00:00
David E. O'Brien
da4c6b80d9 Update for the 4.23 import. 2008-01-30 02:48:24 +00:00
Dag-Erling Smørgrav
e5d28f17bd This commit was generated by cvs2svn to compensate for changes in r175801,
which included commits to RCS files with non-trunk default branches.
2008-01-29 20:22:00 +00:00
Dag-Erling Smørgrav
bb9740d80e Merge r412 from vendor, which reintroduces _OPENPAM. See comment in the
code for explanation.  Hopefully, this will forestall any reports of
breakage in OpenPAM-aware ports.

MFC after:	3 days
2008-01-29 20:22:00 +00:00
David E. O'Brien
e26c7abd15 \jedi-mind-trick{this is not the file you were looking for} 2008-01-29 16:17:42 +00:00
David E. O'Brien
fcc5f7da42 This commit was generated by cvs2svn to compensate for changes in r175790,
which included commits to RCS files with non-trunk default branches.
2008-01-29 16:12:06 +00:00
David E. O'Brien
ac1a00f2eb Bring in fix for Binutils PR other/16240: Check for a failure return from
cplus_demangle_type.  This is the rev 1.50-1.51 change.

Our addr2line, etc.. would crash if used on C++ code that contains
certain symbol types.  One example is
_ZN13PatternDriver23StringScalarDeleteValueC1ERKNS_25ConflateStringScalarValueERKNS_25AbstractStringScalarValueERKNS_12TemplateEnumINS_12pdcomplementELZNS_16complement_namesEELZNS_14COMPLEMENTENUMEEEE
2008-01-29 16:12:06 +00:00
Peter Wemm
031175705e Add a -P flag to display per-cpu cpu usage stats. 2008-01-18 01:43:14 +00:00
David E. O'Brien
974b70c47d Import file version 4.23 onto the vendor branch 2008-01-13 20:35:16 +00:00
David E. O'Brien
ffe9120d7b This commit was generated by cvs2svn to compensate for changes in r175296,
which included commits to RCS files with non-trunk default branches.
2008-01-13 20:35:16 +00:00
David E. O'Brien
78a97497cd Update for the 1.11.22 import.
Reviewed/begged-for by: peter
2008-01-13 06:35:22 +00:00
David E. O'Brien
274835303c 2004-09-25 Derek Price <derek@ximbiot.com>
* mkman.in: Move to...
	* mkman.pl: ...here.
2008-01-13 06:24:49 +00:00
David E. O'Brien
0419bd9502 This commit was generated by cvs2svn to compensate for changes in r175283,
which included commits to RCS files with non-trunk default branches.
2008-01-13 06:24:49 +00:00
David E. O'Brien
6a06c310cf We use the stock versions of these files.
Reviewed/begged-for by: peter
2008-01-13 06:20:11 +00:00
David E. O'Brien
45930893e8 Merge what 1.11.17 -> 1.11.22 ../doc/cvs.1 changes I could.
We never merged in the 1.11.15 -> 1.11.17 changes - due to the moving
of cvs.1 from man/ to doc/ and being auto generated.
2008-01-13 06:14:29 +00:00