Commit Graph

50 Commits

Author SHA1 Message Date
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
13eb765f2d Convert sbin/ to LIBADD
Reduce overlinking
2014-11-25 11:23:12 +00:00
Simon J. Gerraty
9268022b74 Merge from head@274682 2014-11-19 01:07:58 +00:00
Bryan Drewery
5608fd23c2 Revert r267233 for now. PIE support needs to be reworked.
1. 50+% of NO_PIE use is fixed by adding -fPIC to INTERNALLIB and other
   build-only utility libraries.
2. Another 40% is fixed by generating _pic.a variants of various libraries.
3. Some of the NO_PIE use is a bit absurd as it is disabling PIE (and ASLR)
   where it never would work anyhow, such as csu or loader. This suggests
   there may be better ways of adding support to the tree. Many of these
   cases can be fixed such that -fPIE will work but there is really no
   reason to have it in those cases.
4. Some of the uses are working around hacks done to some Makefiles that are
   really building libraries but have been using bsd.prog.mk because the code
   is cleaner. Had they been using bsd.lib.mk then NO_PIE would not have
   been needed.

We likely do want to enable PIE by default (opt-out) for non-tree consumers
(such as ports). For in-tree though we probably want to only enable PIE
(opt-in) for common attack targets such as remote service daemons and setuid
utilities. This is also a great performance compromise since ASLR is expected
to reduce performance. As such it does not make sense to enable it in all
utilities such as ls(1) that have little benefit to having it enabled.

Reported by:	kib
2014-08-19 15:04:32 +00:00
Simon J. Gerraty
ee7b0571c2 Merge head from 7/28 2014-08-19 06:50:54 +00:00
Cy Schubert
e722d6f29a Honour WITH and WITHOUT_INET6_SUPPORT.
Approved by:	glebius (mentor)
MFC after:	3 days
2014-08-05 13:01:21 +00:00
Bryan Drewery
864c53ead8 In preparation for ASLR [1] support add WITH_PIE to support building with -fPIE.
This is currently an opt-in build flag. Once ASLR support is ready and stable
it should changed to opt-out and be enabled by default along with ASLR.

Each application Makefile uses opt-out to ensure that ASLR will be enabled by
default in new directories when the system is compiled with PIE/ASLR. [2]

Mark known build failures as NO_PIE for now.

The only known runtime failure was rtld.

[1] http://www.bsdcan.org/2014/schedule/events/452.en.html
Submitted by:		Shawn Webb <lattera@gmail.com>
Discussed between:	des@ and Shawn Webb [2]
2014-06-08 17:29:31 +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
d466a5b069 Merge head 2013-09-11 18:16:18 +00:00
Cy Schubert
bfc88dcbf7 Update ipfilter 4.1.28 --> 5.1.2.
Approved by:		glebius (mentor)
BSD Licensed by:	Darren Reed <darrenr@reed.wattle.id.au> (author)
2013-09-06 23:11:19 +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
Simon J. Gerraty
23090366f7 Sync from head 2012-11-04 02:52:03 +00:00
Isabell Long
2368efbed4 Link ipfilter(4) and ipfilter(5) to the build to stop the wrong man page
displaying for 'man 4 ipfilter'.

PR:		docs/118020
Approved by:	gjb (mentor)
MFC after:	5 days
2012-08-28 12:33: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
Dimitry Andric
650fd1e4e4 Use both NO_WFORMAT and NO_WARRAY_BOUNDS for sbin/ipf, it would be too
disruptive to actually fix all the warnings, and the code hasn't been
maintained for several years.

MFC after:	1 week
2011-12-17 00:54:09 +00:00
Ulrich Spörlein
47e1a877c5 Always assign WARNS using ?=
- fix some nearby style bugs
- include Makefile.inc where it makes sense and reduces duplication

Approved by:	ed (co-mentor)
2010-03-02 16:58:04 +00:00
Ruslan Ermilov
106d839190 Switch the default WARNS level for sbin/ to 6.
Submitted by:	Ulrich Spörlein
2009-10-19 16:00:24 +00:00
John Birrell
eea2dc61a9 This makefile builds contrib code, so I won't try to fix all the
casts from pointer to int here.
2007-11-18 03:29:10 +00:00
Olivier Houchard
083524da25 Exclude inet_addr.c from the build.
It only provides inet_aton(), which is already provided by the libc. This
causes multiple symbol definitions when linking statically.

Reviewed by:    darrenr
2007-06-11 19:38:38 +00:00
Darren Reed
d7eeb25225 Merge IPFilter 4.1.23 back to HEAD
See src/contrib/ipfilter/HISTORY for details of changes since 4.1.13
2007-06-04 02:54:36 +00:00
David E. O'Brien
f8c9c51988 Fix the manual build. 2006-09-10 08:58:47 +00:00
Alexander Kabaev
5869a34acd Regularly scheduled patch to unbreak regularly scheduled post-ipfilter
buildworld breakage.

Exclude loglevel.c from the build. It does not appear to be used by
anything in the tree and buildworld succeeds just fine without it.
2006-08-17 03:19:38 +00:00
Guido van Rooij
4614227334 Adapt to ipf 4.1.13 2006-08-16 12:25:00 +00:00
David E. O'Brien
45e238e347 fix style nit 2006-05-07 00:40:00 +00:00
Ruslan Ermilov
e4a9274404 Add missing library dependencies. 2006-04-13 12:49:24 +00:00
Guido van Rooij
b9ee0a5a50 Add printproto.c to libipf 2005-12-30 11:56:57 +00:00
Ruslan Ermilov
95f55a632e Fix the contents of the underneath .depend files and "make checkdpadd". 2005-05-17 14:29:06 +00:00
Darren Reed
051adc35a2 Enable building /sbin/ipf (but not the rescue version) with the ability to
parse bpf strings for filter rules in ipf.conf
2005-05-16 16:22:55 +00:00
Darren Reed
cf4ee2c933 Patches from Ruslam Ermilov to remove NetBSD bits from Makefiles and cleanup
build problems with rescue.
2005-04-28 16:26:35 +00:00
Darren Reed
ab99011993 Not looking for ipfilter source files in the right place 2005-04-26 15:35:50 +00:00
Darren Reed
f81bd860b1 create a new build heirarchy for ipfilter tools 2005-04-25 18:55:52 +00:00
Guido van Rooij
74130150bd Link a couple of missing manpages
Submitted by:	Hideyuki KURASHINA <rushani@FreeBSD.org>
MFC after:	1 week
2005-01-07 09:22:02 +00:00
Johan Karlsson
604d24db95 style.Makefile(5):
Use WARNS?= instead of WARNS=.
2004-02-23 20:25:27 +00:00
Guido van Rooij
aff35e3a2b Move my maintainership of parts of ipfilter back to Darren Reed 2003-06-06 11:30:50 +00:00
Darren Reed
1bdb47d692 * add extra -I path to get the "matching" header files. 2002-03-20 09:02:48 +00:00
David E. O'Brien
2d68bf45bf Default to WARNS=2.
Binary builds that cannot handle this must explicitly set WARNS=0.

Reviewed by:	mike
2001-12-04 02:19:58 +00:00
Ruslan Ermilov
478e7bb603 Pick up the correct headers from sys/contrib/ipfilter/netinet. 2001-06-18 15:55:28 +00:00
Ruslan Ermilov
2107b6c68e Backout previous change (removal of -I${.CURDIR}/../../sys/netinet).
This is needed to pick up the right headers.  Wrong headers from
src/contrib/ipfilter are used otherwise.

The right fix would be to fix contrib/ipfilter C sources to pick up
headers from <sys/netinet>.

Noticed by:	peter
2001-06-11 17:41:58 +00:00
Ruslan Ermilov
3ab9a9d0e0 Removed -I${.CURDIR}/.../sys from CFLAGS. 2001-05-18 13:41:42 +00:00
Ruslan Ermilov
0a5779d45b - Backout botched attempt to introduce MANSECT feature.
- MAN[1-9] -> MAN.
2001-03-26 14:33:27 +00:00
Jacques Vidrine
9629a4e92d Build with -DUSE_INET6 so that we can actually use the IPv6 support in
IPFilter 3.4.x.

Approved by:	darrenr, guido
2000-10-31 22:29:27 +00:00
Darren Reed
d3215ca1c3 add common.c to SRCS to fix compile problems 2000-05-24 20:04:41 +00:00
Guido van Rooij
659c54f0bd Add MAINTAINER tag.
The Makefiles in sbin/{ipfstat,ipmon,ipnat} were repository copied
from the respective directories in usr.sbin
1999-12-15 19:48:02 +00:00
Guido van Rooij
ebcb6d9e5b Revive userland stuff for ipfilter.
Also fixes:
PR:		7791
1999-11-23 21:53:19 +00:00
Peter Wemm
bd3c4bb29f Nuke the old antique copy of ipfilter from the tree. This is old enough
to be dangerous.  It will better serve us as a port building a KLD,
ala SKIP.
1999-10-10 15:08:38 +00:00
Peter Wemm
5021f7402d Initial bmake scaffolding for ipfilter userland stuff.
Obtained from: large chunks stolen from OpenBSD and NetBSD
1998-03-21 13:53:18 +00:00