Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rpm-repos-openSUSE for openSUSE:Factory checked in at 2021-06-05 23:31:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpm-repos-openSUSE (Old) and /work/SRC/openSUSE:Factory/.rpm-repos-openSUSE.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpm-repos-openSUSE" Sat Jun 5 23:31:47 2021 rev:5 rq:897704 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/rpm-repos-openSUSE/rpm-repos-openSUSE.changes 2021-02-19 23:45:24.987372283 +0100 +++ /work/SRC/openSUSE:Factory/.rpm-repos-openSUSE.new.1898/rpm-repos-openSUSE.changes 2021-06-05 23:32:17.836517799 +0200 @@ -1,0 +2,7 @@ +Sat Jun 5 12:53:16 UTC 2021 - Neal Gompa <ngomp...@gmail.com> + +- Add missing GPG key references to Leap base repositories +- Add missing SLE and Backports repositories for Leap 15.3+ (boo#1186593) +- Rework GPG key file setup to use files from openSUSE-build-key + +------------------------------------------------------------------- Old: ---- RPM-GPG-KEY-openSUSE New: ---- create-rpmgpg-symlinks.sh opensuse-leap-sle-backports-update.repo opensuse-leap-sle-update.repo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm-repos-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.0zCzE5/_old 2021-06-05 23:32:18.440518850 +0200 +++ /var/tmp/diff_new_pack.0zCzE5/_new 2021-06-05 23:32:18.444518856 +0200 @@ -1,7 +1,7 @@ # # spec file for package rpm-repos-openSUSE # -# Copyright (c) 2020 Neal Gompa <ngomp...@gmail.com>. +# Copyright (c) 2021 Neal Gompa <ngomp...@gmail.com>. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -38,8 +38,8 @@ License: MIT URL: https://opensuse.org/ -# openSUSE GPG Key -Source0: RPM-GPG-KEY-openSUSE +# Script to generate symlinks for RPM GPG key files +Source0: create-rpmgpg-symlinks.sh # openSUSE Tumbleweed repo configs Source1: opensuse-tumbleweed-oss.repo @@ -52,6 +52,8 @@ Source11: opensuse-leap-oss.repo Source12: opensuse-leap-non-oss.repo Source13: opensuse-leap-oss-ports.repo.in +Source14: opensuse-leap-sle-update.repo +Source15: opensuse-leap-sle-backports-update.repo %description openSUSE package repository files for DNF and PackageKit with GPG public keys @@ -121,6 +123,9 @@ %package -n rpm-repo-keys-openSUSE Summary: openSUSE repository GPG keys +# The actual keys are stored in openSUSE-build-key +BuildRequires: openSUSE-build-key +Requires: openSUSE-build-key BuildArch: noarch @@ -144,9 +149,14 @@ %install -# Install the GPG key +# Install the GPG key symlinks mkdir -p %{buildroot}%{_sysconfdir}/pki/rpm-gpg -install %{S:0} -pm 0644 %{buildroot}%{_sysconfdir}/pki/rpm-gpg +bash %{S:0} %{buildroot} + +%if (0%{?sle_version} && 0%{?sle_version} < 150300) || "%{distname}" == "Tumbleweed" +rm %{buildroot}%{_sysconfdir}/pki/rpm-gpg/*SuSE* +rm %{buildroot}%{_sysconfdir}/pki/rpm-gpg/*Backports* +%endif # Install the repositories mkdir -p %{buildroot}%{_sysconfdir}/yum.repos.d @@ -192,6 +202,8 @@ #ifarch ix86 x86_64 aarch64 power64 s390x install %{S:11} -pm 0644 %{buildroot}%{_sysconfdir}/yum.repos.d install %{S:12} -pm 0644 %{buildroot}%{_sysconfdir}/yum.repos.d +install %{S:14} -pm 0644 %{buildroot}%{_sysconfdir}/yum.repos.d +install %{S:15} -pm 0644 %{buildroot}%{_sysconfdir}/yum.repos.d # TODO: Add "Step" repos for arm and riscv64 @@ -200,6 +212,11 @@ %ifarch %{ix86} x86_64 install %{S:11} -pm 0644 %{buildroot}%{_sysconfdir}/yum.repos.d install %{S:12} -pm 0644 %{buildroot}%{_sysconfdir}/yum.repos.d + +# Remove gpgkey lines that are not useful +sed -e "/*.RPM-GPG-KEY-SuSE*.$/d" \ + -e "/*.RPM-GPG-KEY-openSUSE-Backports*.$/d" \ + -i %{buildroot}%{_sysconfdir}/yum.repos.d/*.repo %endif # Setup for ports ++++++ create-rpmgpg-symlinks.sh ++++++ #!/bin/bash # This file contains a file list mapping of GPG key file paths to well-known names # It installs symlinks relative to a specific parent directory ROOTDIR="$1" if [ -z "$1" ]; then ROOTDIR="/" elif [ ! -d "$1" ]; then echo "Not a valid directory path" exit 1 fi RPMGPGKEYDIR="/etc/pki/rpm-gpg" BUILDKEYDIR="/usr/lib/rpm/gnupg/keys" declare -A RPMGPGKEYS # List of GPG keys and common names RPMGPGKEYS["openSUSE"]="gpg-pubkey-3dbdc284-53674dd4.asc" RPMGPGKEYS["openSUSE-Backports"]="gpg-pubkey-65176565-59787af5.asc" RPMGPGKEYS["SuSE-SLE-15"]="gpg-pubkey-39db7c82-5847eb1f.asc" RPMGPGKEYS["SuSE-SLE-15.3"]="gpg-pubkey-39db7c82-5847eb1f.asc" RPMGPGKEYS["SuSE-SLE-15.4"]="gpg-pubkey-39db7c82-5847eb1f.asc" # Create the target directories mkdir -p ${ROOTDIR}${RPMGPGKEYDIR} # Set up symlinks for GPG keys for RPMGPGKEY in "${!RPMGPGKEYS[@]}"; do ln -sfr "${ROOTDIR}${BUILDKEYDIR}/${RPMGPGKEYS[${RPMGPGKEY}]}" "${ROOTDIR}${RPMGPGKEYDIR}/RPM-GPG-KEY-${RPMGPGKEY}" done ++++++ opensuse-leap-oss.repo ++++++ --- /var/tmp/diff_new_pack.0zCzE5/_old 2021-06-05 23:32:18.524518995 +0200 +++ /var/tmp/diff_new_pack.0zCzE5/_new 2021-06-05 23:32:18.524518995 +0200 @@ -4,6 +4,8 @@ #metalink=http://download.opensuse.org/distribution/leap/$releasever/repo/oss/repodata/repomd.xml.metalink enabled=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openSUSE + file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openSUSE-Backports + file:///etc/pki/rpm-gpg/RPM-GPG-KEY-SuSE-SLE-$releasever gpgcheck=1 [opensuse-leap-oss-update] @@ -20,6 +22,8 @@ #metalink=http://download.opensuse.org/debug/distribution/leap/$releasever/repo/oss/repodata/repomd.xml.metalink enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openSUSE + file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openSUSE-Backports + file:///etc/pki/rpm-gpg/RPM-GPG-KEY-SuSE-SLE-$releasever gpgcheck=1 [opensuse-leap-oss-update-debuginfo] @@ -36,5 +40,7 @@ #metalink=http://download.opensuse.org/distribution/leap/$releasever/repo/src-oss/repodata/repomd.xml.metalink enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openSUSE + file:///etc/pki/rpm-gpg/RPM-GPG-KEY-openSUSE-Backports + file:///etc/pki/rpm-gpg/RPM-GPG-KEY-SuSE-SLE-$releasever gpgcheck=1 ++++++ opensuse-leap-sle-backports-update.repo ++++++ [opensuse-leap-sle-backports-update] name=openSUSE Leap $releasever - Updates from Backports for SUSE Linux Enterprise baseurl=http://download.opensuse.org/update/leap/$releasever/backports/ #metalink=http://download.opensuse.org/update/leap/$releasever/sle/repodata/repomd.xml.metalink enabled=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-SuSE-SLE-$releasever gpgcheck=1 [opensuse-leap-sle-backports-update-debuginfo] name=openSUSE Leap $releasever - Updates from Backports for SUSE Linux Enterprise - Debug baseurl=http://download.opensuse.org/debug/update/leap/$releasever/backports/ #metalink=http://download.opensuse.org/debug/update/leap/$releasever/backports/repodata/repomd.xml.metalink enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-SuSE-SLE-$releasever gpgcheck=1 ++++++ opensuse-leap-sle-update.repo ++++++ [opensuse-leap-sle-update] name=openSUSE Leap $releasever - Updates from SUSE Linux Enterprise baseurl=http://download.opensuse.org/update/leap/$releasever/sle/ #metalink=http://download.opensuse.org/update/leap/$releasever/sle/repodata/repomd.xml.metalink enabled=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-SuSE-SLE-$releasever gpgcheck=1 [opensuse-leap-sle-update-debuginfo] name=openSUSE Leap $releasever - OSS - Updates from SUSE Linux Enterprise - Debug baseurl=http://download.opensuse.org/debug/update/leap/$releasever/sle/ #metalink=http://download.opensuse.org/debug/update/leap/$releasever/sle/repodata/repomd.xml.metalink enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-SuSE-SLE-$releasever gpgcheck=1
