mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-11-29 08:08:37 +00:00
Code Issues Releases Activity
287,770 Commits 336 Branches 3,541 Tags 2 GiB
5e3934b15a
Commit Graph

146 Commits

Author SHA1 Message Date
Xin LI
8f75390c66 file: Support testing multiple magic files. 
This is based on upstream b74150490be904801378b2712fe0d532e1700124
but adapted to ATF.

Reviewed by: jlduran@gmail.com, markj, vangyzen
Differential Revision: https://reviews.freebsd.org/D42129
 2023-10-09 10:44:42 -07:00
Jose Luis Duran
0d3a87569f file_test: Fix file test 
Trimming of the line feed is no longer necessary after
d993c6b0db

Currently the tests:

  - bcachefs2
  - gpkg-1-zst
  - multiple

are failing, but a fix will be committed upstream.

This also reverts c5e957ad4 "file: fix test case for gpkg by removing the extra \n."

MFC after:	3 days
 2023-10-08 21:44:14 -07:00
Warner Losh
d0b2dbfa0e Remove $FreeBSD$: one-line sh pattern 
Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/
 2023-08-16 11:55:03 -06:00
Simon J. Gerraty
d9a4274795 Update/fix Makefile.depend for userland 2023-04-18 17:14:23 -07:00
Eric van Gyzen
1581ec9a45 Integrate contrib/file/tests with kyua/atf 
This could be done better by making each test a separate ATF test case.
This exercise is left for the reader.

Reviewed by:	delphij (earlier version)
MFC after:	1 week
Sponsored by:	Dell EMC Isilon
Differential Revision:	https://reviews.freebsd.org/D34303
 2022-02-16 13:02:45 -06:00
Bryan Drewery
ea825d0274 DIRDEPS_BUILD: Update dependencies. 
Sponsored by:	Dell EMC Isilon
 2017-10-31 00:07:04 +00:00
Warner Losh
a35f04fba2 Adopt SRCTOP in usr.bin 
Prefer ${SRCTOP}/foo over ${.CURDIR}/../../foo and ${SRCTOP}/usr.bin/foo
over ${.CURDIR}/../foo for paths in Makefiles.

Differential Revision:	https://reviews.freebsd.org/D9932
Sponsored by:		Netflix
Silence on:		arch@ (twice)
 2017-03-12 18:58:44 +00:00
Simon J. Gerraty
ccfb965433 Add META_MODE support. 
Off by default, build behaves normally.
WITH_META_MODE we get auto objdir creation, the ability to
start build from anywhere in the tree.

Still need to add real targets under targets/ to build packages.

Differential Revision:       D2796
Reviewed by: brooks imp
 2015-06-13 19:20:56 +00:00
Simon J. Gerraty
44d314f704 dirdeps.mk now sets DEP_RELDIR 2015-06-08 23:35:17 +00:00
Simon J. Gerraty
98e0ffaefb Merge sync of head 2015-05-27 01:19:58 +00:00
Baptiste Daroussin
3e11bd9e2a Convert to usr.bin/ to LIBADD 
Reduce overlinking
 2014-11-25 14:29:10 +00:00
Simon J. Gerraty
ee7b0571c2 Merge head from 7/28 2014-08-19 06:50:54 +00:00
Xin LI
b6cee71de3 MFV r267843: update file/libmagic to 5.19. 
MFC after:	2 weeks
 2014-06-26 06:03:39 +00:00
Simon J. Gerraty
fae50821ae Updated dependencies 2014-05-16 14:09:51 +00:00
Simon J. Gerraty
76b28ad6ab Updated dependencies 2014-05-10 05:16:28 +00:00
Simon J. Gerraty
7cf3a1c6b2 Updated dependencies 2013-03-11 17:21:52 +00:00
Simon J. Gerraty
f5f7c05209 Updated dependencies 2013-02-16 01:23:54 +00:00
Marcel Moolenaar
7750ad47a9 Sync FreeBSD's bmake branch with Juniper's internal bmake branch. 
Requested by: Simon Gerraty <sjg@juniper.net>
 2012-08-22 19:25:57 +00:00
David E. O'Brien
80c86c3659 Update file(1) to version 5.11. 2012-04-19 03:20:13 +00:00
David E. O'Brien
7dbb948b5f Merge vendor/file/dist@191739, bringing FILE 5.00 to 8-CURRENT. 2009-05-04 00:37:44 +00:00
Konstantin Belousov
20e76cb365 Add strndup(3) prototype to string.h. 
This change was erronously ommitted from the r185690, and attempt
to simply add the prototype to string.h has revealed that several
contributed programs defined local prototypes for strndup(), controlled
by autoconfed config.h. So, manually change #undef HAVE_STRNDUP to
#define HAVE_STRNDUP 1. Next import of the corresponding program would
regenerate config.h, overriding the changes in this commit.

No objections from: kan
 2008-12-08 21:04:24 +00:00
Ruslan Ermilov
3aefeab5df Christos decided to keep the manpages in mdoc(7) format, 
so stop using our own versions of these.
 2008-01-30 12:56:59 +00:00
David E. O'Brien
ef19c627f8 Update for the 'file' 4.23 import. 2008-01-13 20:37:19 +00:00
Ruslan Ermilov
55e1a40108 Update for the 4.21 import (manuals didn't change). 2007-05-25 09:25:05 +00:00
David E. O'Brien
79f6e0e6b4 FreeBSD has <limits.h>. 2007-05-24 22:10:22 +00:00
David E. O'Brien
8cbe72bdb7 Update for the 'file' 4.21 import. 2007-05-24 22:02:49 +00:00
David E. O'Brien
a90b38c0b1 Update for the 'file' 4.19 import. 2007-05-24 16:14:38 +00:00
Ruslan Ermilov
cb29445a92 Markup fixes. 2006-09-29 15:20:48 +00:00
Ruslan Ermilov
b43d227cab Update manpages for FILE 4.17. 2006-09-17 18:42:35 +00:00
David E. O'Brien
b3f1b4a2c7 Update for the 'file' 4.17 import. 2006-06-19 08:10:23 +00:00
John-Mark Gurney
50866a5cf3 remove comment about systems, I got confused which arch one of my systems 
was...

Pointed out by:	ru
 2006-05-29 10:57:13 +00:00
John-Mark Gurney
2f25c9bd65 document that even if magic is newer than magic.mgc, it isn't used 
compiling mgc on a big endian system (specificly tested sparc64) breaks,
using one from a little endian system works
 2006-05-28 07:15:35 +00:00
Ruslan Ermilov
36a142c455 Expand contractions. 2005-02-13 23:45:54 +00:00
Ruslan Ermilov
0227791b40 Expand *n't contractions. 2005-02-13 22:25:33 +00:00
Ruslan Ermilov
dffc5d9a8e Update for FILE v4.12. 2004-12-28 12:29:06 +00:00
Ruslan Ermilov
8e0675e010 Update for FILE v4.12. 2004-12-28 12:17:56 +00:00
David E. O'Brien
efd3a489a7 Catch up with file 4.12 import. 2004-12-28 04:35:01 +00:00
David E. O'Brien
8e6acec2ef Install the header for libmagic. 
PR:		73647
Submitted by:	Uranus <uranus@it.muds.net>
 2004-11-19 04:04:14 +00:00
David E. O'Brien
7866c62aa6 Don't try to programatically support running file(1) w/in /usr/obj or other 
non-standard install path.

Agreed with:	ru
 2004-08-09 11:05:09 +00:00
David E. O'Brien
dbb4a9b4e5 Uncomment the real paths and remove the local debugging paths. 
Noticed by:	ru (who's faster than 'make world' on my stock src test machine)
 2004-08-09 10:47:50 +00:00
David E. O'Brien
c44c53612c The file consumer binary, which depends on the libmagic. 2004-08-09 08:49:49 +00:00
Ruslan Ermilov
6a3e8b0adc Mechanically kill hard sentence breaks. 2004-07-02 22:22:35 +00:00
Ruslan Ermilov
47d7e8a96f Fixed style of DPADD and LDADD assignments as per style.Makefile(5). 2004-02-05 22:44:25 +00:00
Ruslan Ermilov
fe08efe680 mdoc(7): Use the new feature of the .In macro. 2003-09-08 19:57:22 +00:00
Ruslan Ermilov
8abe8104f3 Update for FILE v3.41. 2003-03-12 14:37:01 +00:00
David E. O'Brien
583d15a47e Update for version 3.41. 2003-02-28 05:31:47 +00:00
David E. O'Brien
85d365a514 Update for version 3.40. 
* We have inttypes.h (yes, even in RELENG_4).
* We now have GNU getopt, so lets be the first thing in the tree to
  acutally use it...
 2003-02-15 19:05:10 +00:00
Ruslan Ermilov
8d5d039f80 Uniformly refer to a file system as "file system". 
Approved by:	re
 2002-12-12 17:26:04 +00:00
Ruslan Ermilov
f61bf05438 Update for FILE v3.39. 2002-09-19 13:53:17 +00:00
Ruslan Ermilov
751ec0537d Bootstrapping aid for systems without <stdint.h>. 
(Needed to build mkmagic in build-tools.)
 2002-09-19 12:30:34 +00:00