20:22 Tijl Coosemans (tijl) 

Mk/Scripts/do-depends.sh: Avoid make -D flag

Both FreeBSD make and GNU make pass command line flags to sub-makes
through the MAKEFLAGS environment variable, but the flags aren't
compatible and GNU make 4.4 exits with an error when it encounters
flags it doesn't understand, e.g. -D.

Avoid using the flag for now until ports run gmake with SETENVI.

This fixes the case where a port is built using make directly and it
recurses to build a dependency that uses gmake.  Poudriere does not
use this feature of the ports tree to build dependencies so it's not
affected.

PR:		272216, 277492

    830ec37

21:58 Luca Pizzamiglio (pizzamig) 

component: add SUBPACKAGES

This commit add SUBPACKAGES support to the framework.

Fix users of _LICENSE_DIR
Fix multi/dual license
Add annotation to packages about being a subpkg
Make do-depends aware of the subpackages
Add PKGBASE.subpkg variable
Fix actual-package-depends target
Fix dependencies in sub-packages
Implement LICENSE support
Fix PLIST_FILES.subpkg
Make DESCR.subpkg warning message shorter
Add SUBPACKES to the list of OPTIONS_HELPERS
Fix _strip_perms
Simplify METADIR as in the original patch
Fix _PLIST
Fix the case when there are no subpackages
Fix typo
Fix _PKGDIR initialization
Fix PLIST
Fix typo in RE
Fix METADIR
Fix type in PKGFILE
Fix [build|run]-depends-list targets
Initial import of the subpackage framework
This import is based on https://reviews.freebsd.org/D16457

PR:		275735
Differential Revision:	https://reviews.freebsd.org/D40549

    4756476

14:27 Mathieu Arnold (mat) 

framework: Remove $FreeBSD$

Where appropriate fiddle with a few other things.

    5d33e04

13:29 mat 

Add set pipefail in most framework scripts.

set pipefail changes the pipeline return status from being the return
status of the last command to the last non 0 exit status of any command
in the pipeline.  This is needed to make sure all the commands in a
pipeline did actually return a non 0 status and not only the last one.

PR:		250723
Exp-run by:	antoine
Reviewed by:	bapt
Approved by:	bapt
Differential Revision:	https://reviews.freebsd.org/D27007

 

16:51 mat 

Backout r554139.

 

16:42 mat 

Add set pipefail in most framework scripts.

set pipefail changes the pipeline return status from being the return
status of the last command to the last non 0 exit status of any command
in the pipeline.  This is needed to make sure all the commands in a
pipeline did actually return a non 0 status and not only the last one.

 

11:10 mat 

Fix overlays when using flavors.

Move FLAVOR processing before the overlays processing so that flavors
can be used with overlays.

PR:		247741
Submitted by:	mikael

 

23:28 bdrewery 

Don't show private variable name in user message.

 

14:36 bapt 

Add support for overlays

overlays are a way to help users to integrate their own ports tree
with the official ports tree without having to maintain clone of the
official tree and remerge on regular basis.

The ports tree will lookup in the overlays (in the order the are listed in
OVERLAY variable) for the dependencies and the USES. It will use the first
found.

in order to use it the user have to declare his overlays that way in their
make.conf:
OVERLAYS= overlay1 overlay2 overlay3

Reviewed by:	manu
Approved by:	swills
Differential Revision:	https://reviews.freebsd.org/D21468

 

10:31 mat 

Force ports depending on a fetch target to actually run checksum.

This prevents an improbable MITM attack on dependencies where the target
is "fetch" and the port is built manuallt.  (Which means a port depends
on a dependency being fetched, but not built or anything else.)  In this
case, as the target is only "fetch", the distribution files of the
dependency are not checked against the dependency's distinfo file.  One
could, in theory, impersonate the dependency's master site and provide a
malicious distribution file.

The ports that could in theory be affected are russian/gd, ukrainian/gd,
and ukrainian/webalizer.  They are only affected when building manually,
as when building with poudriere, the *-depends target do not have
network access, and the build would fail if the distribution files are
not already present.  (From the dependencies being built normally, where
checksum would have ran.)

The detail is described here:
https://www.reddit.com/r/BSD/comments/br62hm/freebsd_cryptographic_bypass_and_mitmbased/

Reported by:	emaste (on IRC)
Reviewed by:	swills emaste antoine
MFH:		2019Q3
Differential Revision:	https://reviews.freebsd.org/D21230

 

01:51 bdrewery 

Fix 'make -j'.

- Pass MAKEFLAGS down into do-depends properly.
- Remove redundant dependencies, run-depends and lib-depends, from
  targets that already depend on earlier targets that depend on
  the needed targets.

Reported by:	emaste
With hat:	portmgr

 

14:14 mat 

Implement basic flavors.

**Do not start migrating any ports, a hook will prevent it**

This has been a long awaiting feature, most of the work has been done by
bapt, bdrewery and antoine, I am just the one actually doing the commit.

All this informations, and more to come are in the first link to our wiki
in the bottom block. A roadmap is in the second link.

To define a different flavors in a port, before any include, set:

FLAVORS=  flavor1 flavor2 [...]

The first flavor in the list will be the default.

You can then check for flavors after includ'ing bsd.port.options.mk with:

.if ${FLAVOR} == flavor2
[some stuff]
.endif

To build flavor2, simply run:

make FLAVOR=flavor2

To depend on a specific flavor, write @<flavor> at the end of the depend
string, like:

RUN_DEPENDS=	something:origin@foo

Submitted by:	bapt, bdrewery, antoine
Reviewed by:	portmgr
More infos:	https://wiki.freebsd.org/Ports/FlavorsMigration
Todo List:	https://wiki.freebsd.org/Ports/FlavorsAndSubPackages
With hat:	portmgr
Differential Revision: https://reviews.freebsd.org/D10327

 

20:54 bdrewery 

Don't truncate DEPENDS_ARGS here.

This code seems unused though since bsd.port.mk has its own handling
for clean-depends.

PR:		212273
With hat:	portmgr

 

05:04 bdrewery 

Fix package depends install not respecting DEPENDS_ARGS for the PKGFILE lookup.

This also optimizes the PKGBASE/PKGFILE lookup with the new port_var_fetch(),
which passes in the known DEPENDS_ARGS.

 

04:53 bdrewery 

Show proper variable in error.

With hat:	portmgr

 

19:01 mat 

Ease debugging of Mk/Scripts scripts.

Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D6474

 

22:18 bdrewery 

Use normal PORTSDIR rather than dp_PORTSDIR so it is passed around properly.

This fixes errors when PORTSDIR is not set and /usr/ports is not used.  The
/usr/share/bsd.port.mk logic will auto set PORTSDIR, but this was not being
passed into children in the dependency scripts.

With hat:	portmgr
Reported by:	bapt

 

18:00 bdrewery 

- Only consider missing dependency origins to be fatal if they were not
  satisfied and needed to be installed.  This restores older behavior of
  allowing a partial checkout where dependencies are already installed. [1]
- Delay fatal errors show that all can be shown at once.

With hat:	portmgr
Reported by:	lev [1]

 

21:23 bapt 

Fix error message when not finding a package

 

11:05 mat 

[Forced commit to explain the previous commit]

Before this, you could say:
BUILD_DEPENDS=	libfoo.so:some/foo
LIB_DEPENDS=	bar:some/bar

The package would build because the dependencies would be installed
correctly.  But, the dependencies would not be registered in the
package, and it would be non functionnal when installed.

Now, if you say the same thing, it will tell you that
1) it can't find exececutable libfoo.so
2) bar is not a valid pattern for LIB_DEPENDS

giving you a hint that you are doing something wrong.

Poked by:	myself, bapt

 

10:11 mat 

Split LIB_DEPENDS and the other _DEPENDS types.

Reviewed by:	bapt, pgolluci
Exp-run by:	mat
Approved by:	bapt
With hat:	portmgr
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D3150

 

20:08 bapt 

Factorize the function to validate env

Reviewed by:	antoine
Differential Revision:	https://reviews.freebsd.org/D2966

 

19:54 bapt 

Add PATH environment when trying to find libraries this fixes building under
qemu emulation

Reported by:	Sylvain Garrigues (via #poudriere)
Tested by:	Sylvain Garrigues (via #poudriere)

 

18:50 bapt 

Refactor dependency checks and installation

This is an important step to prepare the ports tree for VARIANTS(aka flavours)
and subpackage by making the dependency code easier to deal with.

Change:
- Externalize in a proper shell script the code that was an inlined shell script
- Add better validation on the syntaxe used
- test after the dependency has been installed that it actually really fulfill
  the pattern searched (improving QA)
- Unify lib-depends with other dependency checks
- Make ${PORTSDIR} not mandatory anymore in _DEPENDS lines:
  aka pattern:${PORTSDIR}/category/port can now be written pattern:category/port
  /!\ Please to not use this syntax yet! poudriere have received a fix to be
  able to handle this new syntax (but no new release of poudriere has it yet)

(Only the first 15 lines of the commit message are shown above )