Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cni for openSUSE:Factory checked in at 2026-09-09 16:34:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cni (Old) and /work/SRC/openSUSE:Factory/.cni.new.1265 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cni" Wed Sep 9 16:34:18 2026 rev:24 rq:1376626 version:1.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/cni/cni.changes 2026-09-08 17:01:56.757571397 +0200 +++ /work/SRC/openSUSE:Factory/.cni.new.1265/cni.changes 2026-09-09 16:34:20.694058733 +0200 @@ -1,0 +2,9 @@ +Tue Sep 8 09:14:17 UTC 2026 - Fabian Vogt <[email protected]> + +- Clean up spec file: + * Remove unnecessary shaodow, systemd and fillup dependencies + * Move sample config to %doc + * Move away from old way of building go packages + * Enable PIE + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cni.spec ++++++ --- /var/tmp/diff_new_pack.Ls0u1y/_old 2026-09-09 16:34:21.554094585 +0200 +++ /var/tmp/diff_new_pack.Ls0u1y/_new 2026-09-09 16:34:21.556094669 +0200 @@ -16,8 +16,6 @@ # -%global provider_prefix github.com/containernetworking/cni -%global import_path %{provider_prefix} %define cni_etc_dir %{_sysconfdir}/cni %define cni_bin_dir %{_libexecdir}/cni %define cni_doc_dir %{_docdir}/cni @@ -31,14 +29,9 @@ Source0: %{name}-%{version}.tar.zst Source1: 99-loopback.conf Source2: vendor.tar.gz -BuildRequires: golang-packaging -BuildRequires: shadow -BuildRequires: systemd-rpm-macros BuildRequires: zstd BuildRequires: golang(API) >= 1.21 -Requires(post): %fillup_prereq Recommends: cni-plugins -%{?systemd_requires} %description The CNI (Container Network Interface) project consists of a @@ -53,43 +46,31 @@ %autosetup -a2 %build -export GOFLAGS=-mod=vendor -%goprep %{import_path} -%gobuild libcni -%gobuild cnitool -for d in plugins/test/*; do - if [ -d $d ]; then - %gobuild $d - fi +for i in cnitool plugins/test/*/; do + pushd $i + go build -buildmode=pie + popd done %install +# create directories +install -m 755 -d "%{buildroot}%{cni_etc_dir}/net.d" "%{buildroot}%{cni_bin_dir}" "%{buildroot}%{cni_doc_dir}" + # install the plugins -install -m 755 -d %{buildroot}%{cni_bin_dir} -install -D %{_builddir}/go/bin/noop %{buildroot}%{cni_bin_dir}/ -install -D %{_builddir}/go/bin/sleep %{buildroot}%{cni_bin_dir}/ +install -D plugins/test/noop/noop %{buildroot}%{cni_bin_dir}/ +install -D plugins/test/sleep/sleep %{buildroot}%{cni_bin_dir}/ # undo a copy: cnitool must go to sbin/ -install -m 755 -d %{buildroot}%{_sbindir} -install -D %{_builddir}/go/bin/cnitool %{buildroot}%{_sbindir}/ - -# config -install -m 755 -d %{buildroot}%{cni_etc_dir} -install -m 755 -d %{buildroot}%{cni_etc_dir}/net.d -install -D -p -m 0644 %{SOURCE1} %{buildroot}%{cni_etc_dir}/net.d/99-loopback.conf.sample - -# documentation -install -m 755 -d "%{buildroot}%{cni_doc_dir}" +install -D cnitool/cnitool -t %{buildroot}%{_sbindir}/ -%post -%{fillup_only -n %{name}} +# sample config +cp %{SOURCE1} . %files -%doc README.md +%doc README.md 99-loopback.conf %license LICENSE %dir %{cni_etc_dir} %dir %{cni_etc_dir}/net.d -%config %{cni_etc_dir}/net.d/* %dir %{cni_bin_dir} %dir %{cni_doc_dir} %{cni_bin_dir}/{noop,sleep}
