Skip to content

Commit 538fd07

Browse files
authored
Merge pull request #2814 from flatcar/krnowak/move-stuff-over
Move some packages from overlay to portage-stable
2 parents 3a887eb + 7abbe36 commit 538fd07

File tree

332 files changed

+12674
-3509
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

332 files changed

+12674
-3509
lines changed

.github/workflows/portage-stable-packages-list

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ acct-user/systemd-timesync
6666
acct-user/tss
6767

6868
app-admin/eselect
69+
app-admin/logrotate
6970
app-admin/perl-cleaner
7071
app-admin/sudo
7172

@@ -117,6 +118,7 @@ app-containers/docker-cli
117118
app-containers/netavark
118119
app-containers/podman
119120
app-containers/runc
121+
app-containers/syft
120122

121123
app-crypt/adcli
122124
app-crypt/argon2
@@ -129,8 +131,10 @@ app-crypt/mit-krb5
129131
app-crypt/p11-kit
130132
app-crypt/pinentry
131133
app-crypt/rhash
134+
app-crypt/sbsigntools
132135
app-crypt/tpm2-tools
133136
app-crypt/tpm2-tss
137+
app-crypt/trousers
134138

135139
app-doc/eclass-manpages
136140

@@ -222,6 +226,7 @@ dev-lang/yasm
222226

223227
dev-libs/cJSON
224228
dev-libs/cyrus-sasl
229+
dev-libs/dbus-glib
225230
dev-libs/ding-libs
226231
dev-libs/elfutils
227232
dev-libs/expat
@@ -352,6 +357,7 @@ dev-python/urllib3
352357
dev-python/wheel
353358

354359
dev-util/bpftool
360+
dev-util/bsdiff
355361
dev-util/catalyst
356362
dev-util/gdbus-codegen
357363
dev-util/glib-utils
@@ -498,9 +504,14 @@ net-dns/dnsmasq
498504
net-dns/libidn2
499505

500506
net-firewall/conntrack-tools
507+
net-firewall/ebtables
501508
net-firewall/ipset
509+
net-firewall/iptables
510+
net-firewall/nftables
502511

503512
net-fs/cifs-utils
513+
net-fs/nfs-utils
514+
net-fs/samba
504515

505516
net-libs/gnutls
506517
net-libs/libmicrohttpd
@@ -515,6 +526,7 @@ net-libs/libnsl
515526
net-libs/libpcap
516527
net-libs/libpsl
517528
net-libs/libslirp
529+
net-libs/libtirpc
518530
net-libs/nghttp2
519531
net-libs/rpcsvc-proto
520532

@@ -558,6 +570,7 @@ sys-apps/bubblewrap
558570
sys-apps/checkpolicy
559571
sys-apps/config-site
560572
sys-apps/coreutils
573+
sys-apps/dbus
561574
sys-apps/debianutils
562575
sys-apps/diffutils
563576
sys-apps/dtc
@@ -576,6 +589,7 @@ sys-apps/iproute2
576589
sys-apps/iucode_tool
577590
sys-apps/kbd
578591
sys-apps/kexec-tools
592+
sys-apps/keyutils
579593
sys-apps/kmod
580594
sys-apps/less
581595
sys-apps/locale-gen
@@ -594,13 +608,15 @@ sys-apps/pv
594608
sys-apps/sandbox
595609
sys-apps/sed
596610
sys-apps/semodule-utils
611+
sys-apps/shadow
597612
sys-apps/smartmontools
598613
sys-apps/texinfo
599614
sys-apps/usbutils
600615
sys-apps/util-linux
601616
sys-apps/which
602617
sys-apps/zram-generator
603618

619+
sys-auth/polkit
604620
sys-auth/sssd
605621

606622
sys-block/open-iscsi
@@ -640,6 +656,8 @@ sys-fs/fuse
640656
sys-fs/fuse-common
641657
sys-fs/fuse-overlayfs
642658
sys-fs/lsscsi
659+
sys-fs/lvm2
660+
sys-fs/mdadm
643661
sys-fs/mtools
644662
sys-fs/multipath-tools
645663
sys-fs/quota
@@ -672,6 +690,7 @@ sys-libs/readline
672690
sys-libs/talloc
673691
sys-libs/tdb
674692
sys-libs/tevent
693+
sys-libs/timezone-data
675694
sys-libs/zlib
676695

677696
sys-power/acpid

build_library/build_image_util.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ write_packages() {
277277
# Generate an SPDX SBOM using syft
278278
write_sbom() {
279279
info "Writing ${2##*/}"
280-
sudo syft packages "${1}" -o spdx-json="$2"
280+
sudo syft scan "${1}" -o spdx-json="$2"
281281
}
282282

283283
# Get metadata $key for package $pkg installed under $prefix
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
- base, dev: logrotate ([3.22.0](https://github.com/logrotate/logrotate/releases/tag/3.22.0) (includes [3.21.0](https://github.com/logrotate/logrotate/releases/tag/3.21.0)))
2+
- base, dev: trousers ([0.3.15](https://sourceforge.net/p/trousers/trousers/ci/TROUSERS_0_3_15/tree/ChangeLog))
3+
- base, dev: iptables ([1.8.11](https://netfilter.org/projects/iptables/files/changes-iptables-1.8.11.txt) (includes [1.8.10](https://netfilter.org/projects/iptables/files/changes-iptables-1.8.10.txt), [1.8.9](https://netfilter.org/projects/iptables/files/changes-iptables-1.8.9.txt)))
4+
- base, dev: nftables ([1.1.1](https://netfilter.org/projects/nftables/files/changes-nftables-1.1.1.txt) (includes [1.1.0](https://netfilter.org/projects/nftables/files/changes-nftables-1.1.0.txt), [1.0.9](https://netfilter.org/projects/nftables/files/changes-nftables-1.0.9.txt), [1.0.8](https://netfilter.org/projects/nftables/files/changes-nftables-1.0.8.txt), [1.0.7](https://netfilter.org/projects/nftables/files/changes-nftables-1.0.7.txt), [1.0.6](https://netfilter.org/projects/nftables/files/changes-nftables-1.0.6.txt), [1.0.5](https://netfilter.org/projects/nftables/files/changes-nftables-1.0.5.txt), [1.0.4](https://netfilter.org/projects/nftables/files/changes-nftables-1.0.4.txt), [1.0.3](https://netfilter.org/projects/nftables/files/changes-nftables-1.0.3.txt), [1.0.2](https://netfilter.org/projects/nftables/files/changes-nftables-1.0.2.txt), [1.0.1](https://netfilter.org/projects/nftables/files/changes-nftables-1.0.1.txt), [1.0.0](https://netfilter.org/projects/nftables/files/changes-nftables-1.0.0.txt)))
5+
- base, dev: nfs-utils ([2.7.1](https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=log;h=refs/tags/nfs-utils-2-7-1) (includes [2.6.4](https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=log;h=refs/tags/nfs-utils-2-6-4), [2.6.3](https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=log;h=refs/tags/nfs-utils-2-6-3), [2.6.2](https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=log;h=refs/tags/nfs-utils-2-6-2), [2.6.1](https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=log;h=refs/tags/nfs-utils-2-6-1)))
6+
- base, dev: libtirpc ([1.3.6](https://git.linux-nfs.org/?p=steved/libtirpc.git;a=log;h=refs/tags/libtirpc-1-3-6) (includes [1.3.5](https://git.linux-nfs.org/?p=steved/libtirpc.git;a=log;h=refs/tags/libtirpc-1-3-5)))
7+
- base, dev: dbus ([1.16.2](https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-1.16.2/NEWS) (includes [1.16.0](https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-1.16.0/NEWS), [1.14.8](https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-1.14.8/NEWS), [1.14.6](https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-1.14.6/NEWS)))
8+
- base, dev: shadow ([4.14.8](https://github.com/shadow-maint/shadow/releases/tag/4.14.8) (includes [4.14.7](https://github.com/shadow-maint/shadow/releases/tag/4.14.7), [4.14.6](https://github.com/shadow-maint/shadow/releases/tag/4.14.6), [4.14.5](https://github.com/shadow-maint/shadow/releases/tag/4.14.5), [4.14.4](https://github.com/shadow-maint/shadow/releases/tag/4.14.4), [4.14.3](https://github.com/shadow-maint/shadow/releases/tag/4.14.3), [4.14.2](https://github.com/shadow-maint/shadow/releases/tag/4.14.2), [4.14.1](https://github.com/shadow-maint/shadow/releases/tag/4.14.1), [4.14.0](https://github.com/shadow-maint/shadow/releases/tag/4.14.0)))
9+
- base, dev: polkit ([125](https://github.com/polkit-org/polkit/blob/125/NEWS.md) (includes [124](https://github.com/polkit-org/polkit/blob/124/NEWS.md), [123](https://github.com/polkit-org/polkit/blob/123/NEWS.md), [122](https://github.com/polkit-org/polkit/blob/122/NEWS.md)))
10+
- base, dev: lvm2 ([2.03.22] (includes [2.03.21](https://gitlab.com/lvmteam/lvm2/-/tags/v2_03_21), [2.03.20](https://gitlab.com/lvmteam/lvm2/-/tags/v2_03_20), [2.03.19](https://gitlab.com/lvmteam/lvm2/-/tags/v2_03_19), [2.03.18](https://gitlab.com/lvmteam/lvm2/-/tags/v2_03_18), [2.03.17](https://gitlab.com/lvmteam/lvm2/-/tags/v2_03_17), [2.03.16](https://gitlab.com/lvmteam/lvm2/-/tags/v2_03_16), [2.03.15](https://gitlab.com/lvmteam/lvm2/-/tags/v2_03_15), [2.03.14](https://gitlab.com/lvmteam/lvm2/-/tags/v2_03_14), [2.03.13](https://gitlab.com/lvmteam/lvm2/-/tags/v2_03_13), [2.03.12](https://gitlab.com/lvmteam/lvm2/-/tags/v2_03_12), [2.03.11](https://gitlab.com/lvmteam/lvm2/-/tags/v2_03_11), [2.03.10](https://gitlab.com/lvmteam/lvm2/-/tags/v2_03_10), [2.03.09](https://gitlab.com/lvmteam/lvm2/-/tags/v2_03_09), [2.03.08](https://gitlab.com/lvmteam/lvm2/-/tags/v2_03_08), [2.03.07](https://gitlab.com/lvmteam/lvm2/-/tags/v2_03_07), [2.03.06](https://gitlab.com/lvmteam/lvm2/-/tags/v2_03_06), [2.03.05](https://gitlab.com/lvmteam/lvm2/-/tags/v2_03_05), [2.03.04](https://gitlab.com/lvmteam/lvm2/-/tags/v2_03_04), [2.03.03](https://gitlab.com/lvmteam/lvm2/-/tags/v2_03_03), [2.03.02](https://gitlab.com/lvmteam/lvm2/-/tags/v2_03_02), [2.03.01](https://gitlab.com/lvmteam/lvm2/-/tags/v2_03_01), [2.03.00](https://gitlab.com/lvmteam/lvm2/-/tags/v2_03_00)))
11+
- base, dev: mdadm ([4.4](https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/tree/CHANGELOG.md?h=mdadm-4.4) (includes [4.3](https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/tree/CHANGELOG.md?h=mdadm-4.4#n36)))
12+
- base, dev: timezone-data ([2025a](https://lists.iana.org/hyperkitty/list/[email protected]/thread/MWII7R3HMCEDNUCIYQKSSTYYR7UWK4OQ/) (includes [2024b](https://lists.iana.org/hyperkitty/list/[email protected]/thread/IZ7AO6WRE3W3TWBL5IR6PMQUL433BQIE/), [2024a](https://lists.iana.org/hyperkitty/list/[email protected]/thread/UXFL4DEZCXJVZW6E24Y2HLSXVB2ILFVE/), [2023d](https://lists.iana.org/hyperkitty/list/[email protected]/thread/WSF4TA5RFP7ECRKUKQFRHYN724HDMRTO/), [2023c](https://lists.iana.org/hyperkitty/list/[email protected]/thread/NPQOFZRXK5QKUW7F4CC24W52OTZ7YOOT/), [2023b](https://lists.iana.org/hyperkitty/list/[email protected]/thread/YXCVU55LIUZTZREUUH4VPMC75GYKKPE7/), [2023a](https://lists.iana.org/hyperkitty/list/[email protected]/thread/HLUTNGHZ5QPNOPZTZFS6F2QVMGQWEDMC/), [2022g](https://lists.iana.org/hyperkitty/list/[email protected]/thread/XIK47NMDAHCVOWE4MZIB7F44HFU3J2OB/), [2022f](https://lists.iana.org/hyperkitty/list/[email protected]/thread/65JMZVURDDM3XOABROYJX5ZN4N6TATZ5/), [2022e](https://lists.iana.org/hyperkitty/list/[email protected]/thread/CTWT3RFQXZHROH4VJKXAVQ77FYMF7BHY/), [2022d](https://lists.iana.org/hyperkitty/list/[email protected]/thread/TCLVCAIDB64WNEVHJV2ITDHFRUHVB7BN/), [2022c](https://lists.iana.org/hyperkitty/list/[email protected]/thread/GFXHZWBRVLDVX5QQUI4UCY5B4O2FRV5Z/), [2022b](https://lists.iana.org/hyperkitty/list/[email protected]/thread/IB5UMSJYN42GOMKHHWU5UCHD3WYRCVQ4/), [2022a](https://lists.iana.org/hyperkitty/list/[email protected]/thread/CU52CSKQNZRRZPRBDY4GKCCFWKZD4HAJ/), [2021e](https://lists.iana.org/hyperkitty/list/[email protected]/thread/ANTPUKJNFDF6ZA3NSIJEOZGDHUNJ4HL2/), [2021d](https://lists.iana.org/hyperkitty/list/[email protected]/thread/YPPIPGO3PLSMDNSVX6VOMASHRDL4GQWB/), [2021c](https://lists.iana.org/hyperkitty/list/[email protected]/thread/MFS2QPRANAWSPV2DKU46NQKDDPLMXH2H/), [2021b](https://lists.iana.org/hyperkitty/list/[email protected]/thread/422GNGI6F26NIV2JNHI726UO2TDTO2MD/)))

sdk_container/src/third_party/coreos-overlay/app-admin/logrotate/Manifest

Lines changed: 0 additions & 2 deletions
This file was deleted.

sdk_container/src/third_party/coreos-overlay/app-admin/logrotate/files/logrotate-3.20.1-log-changes.patch

Lines changed: 0 additions & 147 deletions
This file was deleted.

sdk_container/src/third_party/coreos-overlay/app-admin/logrotate/files/logrotate.service

Lines changed: 0 additions & 5 deletions
This file was deleted.

sdk_container/src/third_party/coreos-overlay/app-admin/logrotate/files/logrotate.tmpfiles

Lines changed: 0 additions & 2 deletions
This file was deleted.

sdk_container/src/third_party/coreos-overlay/app-containers/syft/Manifest

Lines changed: 0 additions & 2 deletions
This file was deleted.

sdk_container/src/third_party/coreos-overlay/app-containers/syft/metadata.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.

sdk_container/src/third_party/coreos-overlay/app-containers/syft/syft-0.51.0.ebuild

Lines changed: 0 additions & 24 deletions
This file was deleted.

sdk_container/src/third_party/coreos-overlay/app-crypt/sbsigntools/files/openssl-3-compat.patch

Lines changed: 0 additions & 15 deletions
This file was deleted.

sdk_container/src/third_party/coreos-overlay/app-crypt/trousers/Manifest

Lines changed: 0 additions & 1 deletion
This file was deleted.

sdk_container/src/third_party/coreos-overlay/app-crypt/trousers/files/system.data

Lines changed: 0 additions & 1 deletion
This file was deleted.

sdk_container/src/third_party/coreos-overlay/app-crypt/trousers/files/tcsd.confd

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)