Commit Graph

243 Commits

Author SHA1 Message Date
christos 45ee307f3b no more magic.mime 2008-08-30 12:25:41 +00:00
tls 4147a3c54a Add new Makefile knob, USE_FORT, which extends USE_SSP by turning on the
FORTIFY_SOURCE feature of libssp, thus checking the size of arguments to
various string and memory copy and set functions (as well as a few system
calls and other miscellany) where known at function entry.  RedHat has
evidently built all "core system packages" with this option for some time.

This option should be used at the top of Makefiles (or Makefile.inc where
this is used for subdirectories) but after any setting of LIB.

This is only useful for userland code, and cannot be used in libc or in
any code which includes the libc internals, because it overrides certain
libc functions with macros.  Some effort has been made to make USE_FORT=yes
work correctly for a full-system build by having the bsd.sys.mk logic
disable the feature where it should not be used (libc, libssp iteself,
the kernel) but no attempt has been made to build the entire system with
USE_FORT and doing so will doubtless expose numerous bugs and misfeatures.

Adjust the system build so that all programs and libraries that are setuid,
directly handle network data (including serial comm data), perform
authentication, or appear likely to have (or have a history of having)
data-driven bugs (e.g. file(1)) are built with USE_FORT=yes by default,
with the exception of libc, which cannot use USE_FORT and thus uses
only USE_SSP by default.  Tested on i386 with no ill results; USE_FORT=no
per-directory or in a system build will disable if desired.
2007-05-28 12:06:17 +00:00
christos f0762ecc01 Include bsd.sys.mk so that HOST_SH is defined. (Hi apb) 2006-10-22 22:22:39 +00:00
peter e263dfd62f WFORMAT is no more... 2006-10-08 17:52:28 +00:00
apb 9eda896a8f Use ${HOST_SH}, not just sh, in the shell command to set MAGDIRF. 2006-09-29 20:20:47 +00:00
jmc 55082c81c2 Force LANG=C before doing the shell glob to avoid collation issues on hosts
(otherwise it might pick up CVS for instance)
2004-06-16 01:33:35 +00:00
lukem 130ab7336b Rework how MAKEVERBOSE operates:
*	Don't bother prefixing commands with a line of  ${_MKCMD}\
	and instead rely upon "make -s".  This is less intrusive on
	all the Makefiles than the former.  Idea from David Laight.

    *	Rename the variables use to print messages.  The scheme now is:
	    _MKMSG_FOO		Run  _MKMSG 'foo'
	    _MKTARGET_FOO	Run  _MKMSG_FOO ${.TARGET}
	From discussion with Alistair Crooks.
2003-10-21 10:01:19 +00:00
lukem c545cc169d support MAKEVERBOSE 2003-10-19 04:30:30 +00:00
itojun 8acd0a2534 have DPADD 2003-09-17 00:41:17 +00:00
lukem 001c68bd94 Rename a large chunk of the make(1) variables which refer to a
program/tool from "FOO" to "TOOL_FOO".  The new variables are:
	TOOL_ASN1_COMPILE  TOOL_CAP_MKDB  TOOL_CAT  TOOL_CKSUM  TOOL_COMPILE_ET
	TOOL_CONFIG  TOOL_CRUNCHGEN  TOOL_CTAGS  TOOL_DB  TOOL_EQN  TOOL_FGEN
	TOOL_GENCAT  TOOL_GROFF  TOOL_HEXDUMP  TOOL_INDXBIB  TOOL_INSTALLBOOT
	TOOL_INSTALL_INFO  TOOL_M4  TOOL_MAKEFS  TOOL_MAKEINFO  TOOL_MAKEWHATIS
	TOOL_MDSETIMAGE  TOOL_MENUC  TOOL_MKCSMAPPER  TOOL_MKESDB
	TOOL_MKLOCALE  TOOL_MKMAGIC  TOOL_MKTEMP  TOOL_MSGC  TOOL_MTREE
	TOOL_PAX  TOOL_PIC  TOOL_PREPMKBOOTIMAGE  TOOL_PWD_MKDB  TOOL_REFER
	TOOL_ROFF_ASCII  TOOL_ROFF_DVI  TOOL_ROFF_HTML  TOOL_ROFF_PS
	TOOL_ROFF_RAW  TOOL_RPCGEN  TOOL_SOELIM  TOOL_SUNLABEL  TOOL_TBL
	TOOL_UUDECODE  TOOL_VGRIND  TOOL_ZIC

For each, provide default in <bsd.sys.mk> of the form:
	TOOL_FOO?=	foo
and for the ${USETOOLS}=="yes" case in <bsd.own.mk>, provide override:
	TOOL_FOO=	${TOOLDIR}/bin/${_TOOL_PREFIX}foo

Document all of these in bsd.README.

This cleans up a chunk of potential (and actual) namespace collision
within our build infrastructure, as well as improves consistency in
the share/mk documentation and provision of appropriate defaults for
each of these variables.
2003-07-10 10:33:58 +00:00
pooka 241a9c6d03 Adapt to new magic compilation behaviour: copy magic.mime to objdir
before compiling it so that we get the output also in the objdir instead
of the distdir
2003-05-26 13:42:33 +00:00
tsutsui 04568b646b Link libz after libmagic otherwise it fails on NOPIC ports. 2003-04-12 02:15:22 +00:00
pooka b70c4e8541 use ${CAT} instead of cat 2003-04-05 12:30:51 +00:00
pooka 92cfb1b295 When not using TOOLS, compile magic using the newly-built binary
as suggested by Ken Wellsch in bin/20996
2003-04-05 11:33:16 +00:00
pooka 82e0198241 use file from dist 2003-03-26 00:05:02 +00:00
thorpej deff8aa15f __APPLE__ has <stdint.h>, too. 2003-03-14 04:34:27 +00:00
thorpej 3640957b38 If the NetBSD version note looks reasonable, parse it and display the
info.
2003-02-28 18:24:58 +00:00
christos 3a6ece1341 don't trust sizes comming in from the elf file. 2003-02-26 18:36:24 +00:00
christos e8ec3465f7 make this compile 2003-02-26 18:35:42 +00:00
christos d85507235b fix a memory allocation issue. 2003-02-26 18:31:21 +00:00
ross 7784308321 replace linux examples with netbsd examples 2003-02-10 21:44:41 +00:00
simonb d19c8682f2 Detect ns32k ELF files. 2003-01-20 01:16:01 +00:00
wiz 1035faff1d writable, not writeable. 2003-01-06 20:30:28 +00:00
is 8da084abaa Actually return a different code for big-endian UTF-16 in looks_unicode().
Fixes PR 19487.
2002-12-22 16:31:21 +00:00
thorpej 8d965a0542 Need <stdlib.h> for exit() prototype. 2002-12-06 02:54:19 +00:00
wiz 601c22ea2d interpret, not interpet. By Adrian Mrva. 2002-10-02 11:15:06 +00:00
grant be8ae688ae New sentence, new line. 2002-09-30 11:08:56 +00:00
dbj dcb93e552f recognize Apple UFS Volume labels 2002-09-28 01:22:25 +00:00
briggs 7873bb1aba Also HAVE_STDINT_H if defined(__linux__). 2002-09-16 14:12:04 +00:00
thorpej 22eefcb754 Don't include <sys/cdefs.h> directly. On a NetBSD system, it will be
pulled in by <sys/types.h>, and on a non-NetBSD system (host tool case),
it doesn't really matter (since it's just for the __RCSID macro).

There are larger problems with mkmagic's host tool-ness.  A PR has been
filed.
2002-09-15 00:50:18 +00:00
itojun dbf388bc4f calloc() arg mistake. it's (nelem, size). from openbsd 2002-08-12 02:40:20 +00:00
pooka cc3d906ee9 work around cross-compile problems on 1.5.x, don't try to include
<stdint.h> on that platform
2002-08-02 20:32:55 +00:00
grant f7ddfc3676 add additional StuffIt format. 2002-07-15 06:07:16 +00:00
pooka 8e3a8d0529 minor shuffles to make this more like the vendor version 2002-07-10 16:15:52 +00:00
pooka 040f1e000d Yamaha TX Wave
from Ben Collver <collver1@attbi.com> in misc/17487
2002-07-10 09:02:22 +00:00
pooka aa0d25517d add scream tracker sample magic
from Ben Collver <collver1@attbi.com> in misc/17486
2002-07-10 09:00:27 +00:00
pooka 1ca3a6d1ce move impulse tracker data files into audio 2002-07-10 08:58:38 +00:00
pooka 2af7f26ded change versions for file 3.39 2002-07-09 15:01:36 +00:00
pooka ce0a2bbbef end this destructive conflict 2002-07-09 14:59:52 +00:00
pooka 741f0f5afe file 3.39 2002-07-09 14:47:21 +00:00
wiz 239c204f66 Remove #if __STDC__, de-__P() and ANSIfy.
Okay'd by christos.
2002-06-14 19:05:18 +00:00
itojun 330a006cc4 use types defined in inttypes.h.
have attribute(packed) to struct magic to make it packed in the same way
across different archs.
2002-06-05 12:52:57 +00:00
thorpej d22677c6bc Don't use multi-line string literals. 2002-05-30 17:36:57 +00:00
christos 71fa9914d7 PR/16941: Antti Kantee: Clean up unused functions. 2002-05-21 12:51:27 +00:00
itohy dd60955377 file(1) magic for Human68k (X680x0 DOS) binary formats 2002-05-21 07:59:16 +00:00
pooka 89a790daf0 adapt to 3.38 2002-05-18 07:11:14 +00:00
pooka 99dec2cc40 fix botch 2002-05-18 07:05:00 +00:00
pooka fbf022381d add zlib 2002-05-18 07:04:38 +00:00
pooka 184b2ef7fa conflict therapy 2002-05-18 07:00:44 +00:00
pooka 4f62edefc0 file 3.38 2002-05-18 06:45:50 +00:00