Skip to content

bird2, bird3: license identifier, bird3cl title and CPE ID - #1193

Merged
BKPepe merged 7 commits into
openwrt:masterfrom
BKPepe:bird-fixes
Aug 10, 2026
Merged

bird2, bird3: license identifier, bird3cl title and CPE ID#1193
BKPepe merged 7 commits into
openwrt:masterfrom
BKPepe:bird-fixes

Conversation

@BKPepe

@BKPepe BKPepe commented Aug 6, 2026

Copy link
Copy Markdown
Member

Small fixes towards moving the packages to openwrt/packages (#184):

  • bird2: replace the free-form license boilerplate with an SPDX license identifier.
  • bird3: fix the bird3cl title, which still said "(v2)" (copy-paste leftover from bird2), and add PKG_CPE_ID (same product identifier as bird2) so published CVEs can be matched against the package.

Maintainers: @tohojo, @PolynomialDivision

Replace the free-form license boilerplate with an SPDX license
identifier, in line with the other packages in this feed.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Copilot AI lite review requested due to automatic review settings August 6, 2026 07:54

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

The bird3cl package was titled as "(v2)" client although it is built
from BIRD 3. Fix the copy-paste leftover from the bird2 Makefile.

Also add PKG_CPE_ID, the same product identifier as used by bird2,
so published CVEs can be matched against this package.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@openwrt openwrt Bot added the not following guidelines Pull request does not follow formatting guidelines label Aug 6, 2026
BKPepe and others added 4 commits August 6, 2026 15:50
/etc/bird4.conf and /etc/bird6.conf are left over from the bird1
packages, which shipped a separate configuration file per address
family. bird2 is a single daemon handling both and installs
/etc/bird.conf only, so the two entries refer to files this package
never creates.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
/etc/bird4.conf and /etc/bird6.conf are left over from the bird1
packages, which shipped a separate configuration file per address
family. bird3 is a single daemon handling both and installs
/etc/bird.conf only, so the two entries refer to files this package
never creates.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
The script was a single bare command with no shebang and a trailing
space. Every other test-version.sh in the OpenWrt feeds starts with
#!/bin/sh and dispatches on $PKG_NAME, so that a sub-package added
later fails loudly instead of being probed with a command that
happens to work for a different package.

Also use grep -F, so the dots in the version are not treated as
regular expression wildcards, and record why the daemon is checked
rather than birdc/birdcl, which do not report a version of their
own.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
The script was a single bare command with no shebang and a trailing
space. Every other test-version.sh in the OpenWrt feeds starts with
#!/bin/sh and dispatches on $PKG_NAME, so that a sub-package added
later fails loudly instead of being probed with a command that
happens to work for a different package.

Also use grep -F, so the dots in the version are not treated as
regular expression wildcards, and record why the daemon is checked
rather than birdc/birdcl, which do not report a version of their
own.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@openwrt openwrt Bot removed the not following guidelines Pull request does not follow formatting guidelines label Aug 6, 2026
The patch carried only a subject line and a placeholder commit id, so
nothing recorded why marking struct top_hash_entry as PACKED fixes a
bus error, or whether it can be dropped.

Restore the description and the sign-off from the commit that
introduced it in this feed, keeping the original author's wording,
and record the upstream status. Verified that BIRD 2.19.2 still
declares the structure without any alignment attribute, so the patch
is still needed.

The header keeps the "---" separator the sibling patch uses, and
orders Signed-off-by last among the trailers.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@BKPepe

BKPepe commented Aug 10, 2026

Copy link
Copy Markdown
Member Author

Guys, kind reminder. Can I merge this? Can you check those conffiles entries on the router?
Maybe ping @pktpls ? :)

@pktpls

pktpls commented Aug 10, 2026

Copy link
Copy Markdown
Contributor

LGTM! :)

@BKPepe
BKPepe merged commit 6148a6a into openwrt:master Aug 10, 2026
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants