FreeBSD/poudriere 61aba75src/share/poudriere common.sh jail.sh

Merge branch '3.4-1271' into release-3.4

PR #1271
Fixes #1238
Fixes #1227
DeltaFile
+48-11src/share/poudriere/common.sh
+20-4src/share/poudriere/jail.sh
+68-152 files

FreeBSD/poudriere 3345cbdsrc/share/poudriere common.sh jail.sh

Always set a higher priority for repo overrides

Two configuration files for the same repository, with the same priority
(default to 0) but with a different values for `enabled` result in the
actual value of `enabled` to be dependent of the order of evaluation of
the files.  This is likely to cause problem one day.  Make sure we set
an explicit priority when overriding repositories.

While here, use conistent syntax/style for the configuration files.

(cherry picked from commit e98aa071fa116c61ef3e7c072bb7f84db4426074)

Conflicts:
        src/share/poudriere/common.sh
DeltaFile
+44-14src/share/poudriere/common.sh
+20-5src/share/poudriere/jail.sh
+64-192 files

FreeBSD/poudriere 287318bsrc/share/poudriere common.sh

Remove useless environment variable

It seems that was used to tell pkg from which URL to download packages,
but it seems not to be working anymore and as we only have a single
enabled repository with the same URL, we can probably safely remove it.

(cherry picked from commit 30982dc44a3c86216d1abcad5c94b6be901912c5)
DeltaFile
+0-1src/share/poudriere/common.sh
+0-11 files

FreeBSD/poudriere 034f2f9src/share/poudriere common.sh

Fix typo

(cherry picked from commit 8175212dd50b39e160361c358441bd8a08828074)
DeltaFile
+1-1src/share/poudriere/common.sh
+1-11 files

FreeBSD/poudriere d20f4a9src/share/poudriere common.sh

Fix fetching packages on FreeBSD 15.0

Older versions of FreeBSD had a single package repository, named
"FreeBSD".  FreeBSD 14.3 introduced a second repository for kernel
modules, named "FreeBSD-kmods".  FreeBSD 15.0 add support for managing
the base system with packages (aka pkgbase), and to avoid confusion for
users and emphasis they are related to ports and not the base system,
the mentioned repositories were respectively renamed "FreeBSD-ports" and
"FreeBSD-ports-kmods".

In order to fetch latest packages, poudriere tune the "FreeBSD" repo,
and attempts were made to ignore the "FreeBSD-kmods" repository
(#1218, #1228), unfortunately with the changes described above in
FreeBSD 15, it is broken again.

Since fa68587c67ffb59c1c240d53fb16e73788d06cd3, poudriere disable all
official repositories, but that was not done for fetching packages.

Fix this by disabling all known variations of the default FreeBSD

    [10 lines not shown]
DeltaFile
+11-4src/share/poudriere/common.sh
+11-41 files

FreeBSD/poudriere 67e62c6src/share/poudriere common.sh jail.sh

Disable the legacy FreeBSD-kmods repository

The commit fa68587c67ffb59c1c240d53fb16e73788d06cd3 says it disabled it
but it is missing from the changeset.

(cherry picked from commit 0f15e6365f0ef072234b82c259581803f31e2814)
DeltaFile
+1-0src/share/poudriere/common.sh
+1-0src/share/poudriere/jail.sh
+2-02 files

FreeBSD/poudriere 8ca813esrc/share/poudriere common.sh

download_from_repo: Detect errors fetching repository/packages

(cherry picked from commit 60e8393fc5d0f5358b6539fa32bc0761e82c67c4)

Conflicts:
        src/share/poudriere/common.sh

Issue #1238
DeltaFile
+13-2src/share/poudriere/common.sh
+13-21 files

FreeBSD/poudriere fcf8bfdsrc/share/poudriere common.sh jail.sh

Merge pull request #1271 from smortex/rework-repos-for-freebsd-15

Fix fetching packages on FreeBSD 15.0
DeltaFile
+45-8src/share/poudriere/common.sh
+20-4src/share/poudriere/jail.sh
+65-122 files

FreeBSD/poudriere e98aa07src/share/poudriere common.sh jail.sh

Always set a higher priority for repo overrides

Two configuration files for the same repository, with the same priority
(default to 0) but with a different values for `enabled` result in the
actual value of `enabled` to be dependent of the order of evaluation of
the files.  This is likely to cause problem one day.  Make sure we set
an explicit priority when overriding repositories.

While here, use conistent syntax/style for the configuration files.
DeltaFile
+42-12src/share/poudriere/common.sh
+20-5src/share/poudriere/jail.sh
+62-172 files

FreeBSD/poudriere 30982dcsrc/share/poudriere common.sh

Remove useless environment variable

It seems that was used to tell pkg from which URL to download packages,
but it seems not to be working anymore and as we only have a single
enabled repository with the same URL, we can probably safely remove it.
DeltaFile
+0-1src/share/poudriere/common.sh
+0-11 files

FreeBSD/poudriere 8175212src/share/poudriere common.sh

Fix typo
DeltaFile
+1-1src/share/poudriere/common.sh
+1-11 files

FreeBSD/poudriere c3c7e16src/share/poudriere common.sh

Fix fetching packages on FreeBSD 15.0

Older versions of FreeBSD had a single package repository, named
"FreeBSD".  FreeBSD 14.3 introduced a second repository for kernel
modules, named "FreeBSD-kmods".  FreeBSD 15.0 add support for managing
the base system with packages (aka pkgbase), and to avoid confusion for
users and emphasis they are related to ports and not the base system,
the mentioned repositories were respectively renamed "FreeBSD-ports" and
"FreeBSD-ports-kmods".

In order to fetch latest packages, poudriere tune the "FreeBSD" repo,
and attempts were made to ignore the "FreeBSD-kmods" repository
(#1218, #1228), unfortunately with the changes described above in
FreeBSD 15, it is broken again.

Since fa68587c67ffb59c1c240d53fb16e73788d06cd3, poudriere disable all
official repositories, but that was not done for fetching packages.

Fix this by disabling all known variations of the default FreeBSD

    [5 lines not shown]
DeltaFile
+9-2src/share/poudriere/common.sh
+9-21 files

FreeBSD/poudriere 0f15e63src/share/poudriere common.sh jail.sh

Disable the legacy FreeBSD-kmods repository

The commit fa68587c67ffb59c1c240d53fb16e73788d06cd3 says it disabled it
but it is missing from the changeset.
DeltaFile
+1-0src/share/poudriere/common.sh
+1-0src/share/poudriere/jail.sh
+2-02 files

FreeBSD/poudriere d507571src/share/poudriere common.sh

Revert "testport/bulk -t: Make stage-qa library dependencies check fatal."

This reverts commit 24aa0dda088c08aafd2f317c67dc4c271177157c.

The qa check needs more work. There are at least 2 cases:
1. A library happens to be installed by a dependency, _is needed_,
   and gets linked in without a `LIB_DEPENDS`.
2. A library happens to be installed by a dependency, _is not needed_,
   and is _overlinked_. The qa check suggests to add a `LIB_DEPENDS`
   which is not the right advice.

Update the shlib warnings to note the stage-qa failure is silent.
DeltaFile
+2-3src/share/poudriere/common.sh
+2-31 files

FreeBSD/poudriere 6089168src/share/poudriere jail.sh

jail -d: Don't try destroyfs if JAILMNT is not set
DeltaFile
+1-1src/share/poudriere/jail.sh
+1-11 files

FreeBSD/poudriere 44bba62src/share/poudriere/include pkgqueue.sh

Fix some utilities writing to stdout on SIGINFO where stdout is read.
DeltaFile
+3-3src/share/poudriere/include/pkgqueue.sh
+3-31 files

FreeBSD/poudriere efd3c8dsrc/share/poudriere common.sh, src/share/poudriere/include util.sh

siginfo_handler: Set +u as it may have been set before calling the trap.

Not everything is set -u safe; don't suddenly expose it in unexpected places.
DeltaFile
+3-2src/share/poudriere/common.sh
+1-1src/share/poudriere/include/util.sh
+4-32 files

FreeBSD/poudriere e4f2486src/share/poudriere jail.sh

jail -d: Don't try destroyfs if JAILMNT is not set

(cherry picked from commit d5e410697d0802f624e90267cec70c63613e9582)
DeltaFile
+1-1src/share/poudriere/jail.sh
+1-11 files

FreeBSD/poudriere 93a89c8src/share/poudriere testport.sh, test Makefile.in testport-build-custom-PREFIX.sh

testport: Fix testing of an IGNORE/BROKEN port.

- Also fixes old bulk bug with empty repo, on an IGNORED port, resulting in an
  error trying to build repo without pkg having been built yet.
- Also fixes old testport bug with -P leftover error of /prefix.
- Also fixes old testport bug of empty repo on BROKEN port not building pkg.
- Add several new tests covering these cases and more.
- testport on an IGNORED port no longer consider it as a "failure"
  for stats.

Fixes:  b95a9ee02 ("testport: Don't spin up a builder if not needed")
Fixes:  bac5acb8f ("build_port: Can fetch NEED_ROOT upfront.")
DeltaFile
+47-7test/Makefile.in
+46-0test/testport-build-custom-PREFIX.sh
+34-0test/bulk-build-broken.sh
+17-15test/common.bulk.sh
+28-0test/testport-build-ignored.sh
+24-4src/share/poudriere/testport.sh
+196-2611 files not shown
+285-4217 files

FreeBSD/poudriere cc10e39. Makefile.in Makefile.am

getpid: Don't build with --static

This isn't needed and breaks WITH_PIE in ports build.
DeltaFile
+7-26Makefile.in
+0-1Makefile.am
+7-272 files

FreeBSD/poudriere 1e1cd81src/share/poudriere/include asserts.sh

dev_assert: Fix alias for lines ending in \

`nop` is used rather than `:` so that `VAR=x dev_assert` keeps the
variable scope to that line only.
DeltaFile
+2-1src/share/poudriere/include/asserts.sh
+2-11 files

FreeBSD/poudriere d0e6e13src/share/poudriere jail.sh

jail -c -m pkgbase: Default URL has changed to pkg.freebsd.org

(cherry picked from commit 7849c70c61b1f302a1eb113aa3b86f21a7ec9e9e)
DeltaFile
+1-1src/share/poudriere/jail.sh
+1-11 files

FreeBSD/poudriere afeb06esrc/share/poudriere jail.sh

jail -c -m pkgbase: Default URL has changed to pkg.freebsd.org
DeltaFile
+1-1src/share/poudriere/jail.sh
+1-11 files

FreeBSD/poudriere befbb9csrc/share/poudriere common.sh

bulk/testport logger should be a protected job.
DeltaFile
+5-0src/share/poudriere/common.sh
+5-01 files

FreeBSD/poudriere 7816d1fsrc/share/poudriere/include hash.sh, test stack.sh

stack_size: Fix eargs error
DeltaFile
+13-0test/stack.sh
+1-1src/share/poudriere/include/hash.sh
+14-12 files

FreeBSD/poudriere e6e1891src/bin poudriere.in, test runtest.sh

poudriere / runtest: Allow MALLOC_CONF from environment
DeltaFile
+1-1src/bin/poudriere.in
+1-0test/runtest.sh
+2-12 files

FreeBSD/poudriere feec515src/share/poudriere/include parallel.sh

_spawn_wrapper: Add comment about async lists
DeltaFile
+2-0src/share/poudriere/include/parallel.sh
+2-01 files

FreeBSD/poudriere 08f3238src/share/poudriere/include parallel.sh

_kill_job: Add debug output for pwait return
DeltaFile
+2-0src/share/poudriere/include/parallel.sh
+2-01 files

FreeBSD/poudriere 59a4387external/sh miscbltin.c

sh: Don't assume EINTR means SIGALRM

Taken from FreeBSD https://reviews.freebsd.org/D53761
DeltaFile
+57-26external/sh/miscbltin.c
+57-261 files

FreeBSD/poudriere 562e9a5test jobs.sh

test jobs.sh SH=/bin/sh: Improve racy test

commit 3085e8acd748dd tweaked this check to deal with Running
or Done, but needs to deal with the %- job being different
as well.
DeltaFile
+3-3test/jobs.sh
+3-31 files