MSVSphere debranding

SOURCES/002-rhel-shortnames-overrides.conf

@@ -1,10 +0,0 @@
-[aliases]
-"skopeo"  = "registry.access.redhat.com/ubi8/skopeo"
-"ubi8/skopeo" = "registry.access.redhat.com/ubi8/skopeo"
-"rhel9/skopeo" = "registry.redhat.io/rhel9/skopeo"
-"buildah" = "registry.access.redhat.com/ubi8/buildah"
-"ubi8/buildah" = "registry.access.redhat.com/ubi8/buildah"
-"rhel9/buildah" = "registry.redhat.io/rhel9/buildah"
-"podman" = "registry.access.redhat.com/ubi8/podman"
-"ubi8/podman" = "registry.access.redhat.com/ubi8/podman"
-"rhel9/podman" = "registry.redhat.io/rhel9/podman"

SOURCES/RPM-GPG-KEY-redhat-release

@@ -1,34 +0,0 @@
-pub   4096R/FD431D51 2009-10-22
-      Key fingerprint = 567E 347A D004 4ADE 55BA  8A5F 199E 2F91 FD43 1D51
-uid                  Red Hat, Inc. (release key 2) <security@redhat.com>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQINBErgSTsBEACh2A4b0O9t+vzC9VrVtL1AKvUWi9OPCjkvR7Xd8DtJxeeMZ5eF
-0HtzIG58qDRybwUe89FZprB1ffuUKzdE+HcL3FbNWSSOXVjZIersdXyH3NvnLLLF
-0DNRB2ix3bXG9Rh/RXpFsNxDp2CEMdUvbYCzE79K1EnUTVh1L0Of023FtPSZXX0c
-u7Pb5DI5lX5YeoXO6RoodrIGYJsVBQWnrWw4xNTconUfNPk0EGZtEnzvH2zyPoJh
-XGF+Ncu9XwbalnYde10OCvSWAZ5zTCpoLMTvQjWpbCdWXJzCm6G+/hx9upke546H
-5IjtYm4dTIVTnc3wvDiODgBKRzOl9rEOCIgOuGtDxRxcQkjrC+xvg5Vkqn7vBUyW
-9pHedOU+PoF3DGOM+dqv+eNKBvh9YF9ugFAQBkcG7viZgvGEMGGUpzNgN7XnS1gj
-/DPo9mZESOYnKceve2tIC87p2hqjrxOHuI7fkZYeNIcAoa83rBltFXaBDYhWAKS1
-PcXS1/7JzP0ky7d0L6Xbu/If5kqWQpKwUInXtySRkuraVfuK3Bpa+X1XecWi24JY
-HVtlNX025xx1ewVzGNCTlWn1skQN2OOoQTV4C8/qFpTW6DTWYurd4+fE0OJFJZQF
-buhfXYwmRlVOgN5i77NTIJZJQfYFj38c/Iv5vZBPokO6mffrOTv3MHWVgQARAQAB
-tDNSZWQgSGF0LCBJbmMuIChyZWxlYXNlIGtleSAyKSA8c2VjdXJpdHlAcmVkaGF0
-LmNvbT6JAjYEEwECACAFAkrgSTsCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK
-CRAZni+R/UMdUWzpD/9s5SFR/ZF3yjY5VLUFLMXIKUztNN3oc45fyLdTI3+UClKC
-2tEruzYjqNHhqAEXa2sN1fMrsuKec61Ll2NfvJjkLKDvgVIh7kM7aslNYVOP6BTf
-C/JJ7/ufz3UZmyViH/WDl+AYdgk3JqCIO5w5ryrC9IyBzYv2m0HqYbWfphY3uHw5
-un3ndLJcu8+BGP5F+ONQEGl+DRH58Il9Jp3HwbRa7dvkPgEhfFR+1hI+Btta2C7E
-0/2NKzCxZw7Lx3PBRcU92YKyaEihfy/aQKZCAuyfKiMvsmzs+4poIX7I9NQCJpyE
-IGfINoZ7VxqHwRn/d5mw2MZTJjbzSf+Um9YJyA0iEEyD6qjriWQRbuxpQXmlAJbh
-8okZ4gbVFv1F8MzK+4R8VvWJ0XxgtikSo72fHjwha7MAjqFnOq6eo6fEC/75g3NL
-Ght5VdpGuHk0vbdENHMC8wS99e5qXGNDued3hlTavDMlEAHl34q2H9nakTGRF5Ki
-JUfNh3DVRGhg8cMIti21njiRh7gyFI2OccATY7bBSr79JhuNwelHuxLrCFpY7V25
-OFktl15jZJaMxuQBqYdBgSay2G0U6D1+7VsWufpzd/Abx1/c3oi9ZaJvW22kAggq
-dzdA27UUYjWvx42w9menJwh/0jeQcTecIUd0d0rFcw/c1pvgMMl/Q73yzKgKYw==
-=zbHE
------END PGP PUBLIC KEY BLOCK-----
-

SOURCES/default-policy.json

@@ -6,18 +6,9 @@
     ],
     "transports": {
         "docker": {
-	    "registry.access.redhat.com": [
-		{
-		    "type": "signedBy",
-		    "keyType": "GPGKeys",
-		    "keyPaths": ["/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release", "/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta"]
-		}
-	    ],
-	    "registry.redhat.io": [
+	    "": [
 		{
-		    "type": "signedBy",
-		    "keyType": "GPGKeys",
-		    "keyPaths": ["/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release", "/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta"]
+		    "type": "insecureAcceptAnything"
 		}
 	    ]
 	},

SOURCES/pyxis.sh

@@ -30,15 +30,7 @@ while [ $IDX -lt ${#lines[@]} ]; do
      [[ $REPOSITORY != *[* ]] &&
      [[ $REGISTRY == *.* ]] &&
      [ "$REGISTRY" != "non_registry" ]; then
-    if [[ $REGISTRY == *quay.io* ]] ||
-       [[ $REGISTRY == *redhat.com* ]]; then
-      if [ "$REQ_TERMS" == "true" ]; then
-        REGISTRY=registry.redhat.io
-      fi
-    fi
-    echo "\"$REPOSITORY\" = \"$REGISTRY/$REPOSITORY\""
     echo $PUBLISHED,$REQ_TERMS,$REPOSITORY,$REGISTRY,$RELEASE >> /tmp/pyx_debug
-    echo "\"$REPOSITORY\" = \"$REGISTRY/$REPOSITORY\"" >> /tmp/rhel-shortnames.conf
   fi
   IDX=$(($IDX+5))
 done

SOURCES/registries.conf

@@ -19,7 +19,7 @@
 #
 # # An array of host[:port] registries to try when pulling an unqualified image, in order.
 
-unqualified-search-registries = ["registry.access.redhat.com", "registry.redhat.io", "docker.io"]
+unqualified-search-registries = ["docker.io"]
 
 # [[registry]]
 # # The "prefix" field is used to choose the relevant [[registry]] TOML table;

SOURCES/registry.access.redhat.com.yaml

@@ -1,3 +0,0 @@
-docker:
-     registry.access.redhat.com:
-         sigstore: https://access.redhat.com/webassets/docker/content/sigstore

SOURCES/registry.redhat.io.yaml

@@ -1,3 +0,0 @@
-docker:
-     registry.redhat.io:
-         sigstore: https://registry.redhat.io/containers/sigstore

SOURCES/update.sh

@@ -33,7 +33,8 @@ ensure storage.conf    mountopt                      \"nodev,metacopy=on\"
 if pwd | grep rhel-8 > /dev/null
 then
 awk -i inplace '/#default_capabilities/,/#\]/{gsub("#","",$0)}1' containers.conf
-ensure registries.conf unqualified-search-registries [\"registry.access.redhat.com\",\ \"registry.redhat.io\",\ \"docker.io\"]
+ensure registries.conf unqualified-search-registries [\"docker.io\"]
+>>>>>>> 0b7bfc7 (MSVSphere debranding)
 ensure registries.conf short-name-mode               \"permissive\"
 ensure containers.conf runtime                       \"runc\"
 ensure containers.conf events_logger                 \"file\"
@@ -50,7 +51,7 @@ then
   "SYS_CHROOT",' containers.conf
 fi
 else
-ensure registries.conf unqualified-search-registries [\"registry.access.redhat.com\",\ \"registry.redhat.io\",\ \"docker.io\"]
+ensure registries.conf unqualified-search-registries [\"docker.io\"]
 ensure registries.conf short-name-mode               \"enforcing\"
 ensure containers.conf runtime                       \"crun\"
 fi

SPECS/containers-common.spec

@@ -12,7 +12,7 @@
 Epoch: 2
 Name: containers-common
 Version: 1
-Release: 55%{?dist}
+Release: 55%{?dist}.inferit
 Summary: Common configuration and documentation for containers
 License: ASL 2.0
 ExclusiveArch: %{go_arches}
@@ -49,11 +49,6 @@ Source14: https://raw.githubusercontent.com/containers/common/%{common_branch}/d
 Source15: https://raw.githubusercontent.com/containers/image/%{image_branch}/docs/containers-auth.json.5.md
 Source16: https://raw.githubusercontent.com/containers/image/%{image_branch}/docs/containers-registries.conf.d.5.md
 Source17: https://raw.githubusercontent.com/containers/shortnames/%{shortnames_branch}/shortnames.conf
-Source19: 001-rhel-shortnames-pyxis.conf
-Source20: 002-rhel-shortnames-overrides.conf
-Source21: RPM-GPG-KEY-redhat-release
-Source22: registry.access.redhat.com.yaml
-Source23: registry.redhat.io.yaml
 #Source24: https://raw.githubusercontent.com/containers/skopeo/%%{skopeo_branch}/default-policy.json
 Source24: default-policy.json
 Source25: https://raw.githubusercontent.com/containers/skopeo/%{skopeo_branch}/default.yaml
@@ -85,18 +80,12 @@ install -dp %{buildroot}%{_datadir}/containers/systemd
 install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/storage.conf
 install -m0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/containers/registries.conf
 install -m0644 %{SOURCE17} %{buildroot}%{_sysconfdir}/containers/registries.conf.d/000-shortnames.conf
-install -m0644 %{SOURCE19} %{buildroot}%{_sysconfdir}/containers/registries.conf.d/001-rhel-shortnames.conf
-install -m0644 %{SOURCE20} %{buildroot}%{_sysconfdir}/containers/registries.conf.d/002-rhel-shortnames-overrides.conf
 
 # for signature verification
 %if !0%{?rhel} || 0%{?centos}
 install -dp %{buildroot}%{_sysconfdir}/pki/rpm-gpg
-install -m0644 %{SOURCE21} %{buildroot}%{_sysconfdir}/pki/rpm-gpg
-install -m0644 %{SOURCE28} %{buildroot}%{_sysconfdir}/pki/rpm-gpg
 %endif
 install -dp %{buildroot}%{_sysconfdir}/containers/registries.d
-install -m0644 %{SOURCE22} %{buildroot}%{_sysconfdir}/containers/registries.d
-install -m0644 %{SOURCE23} %{buildroot}%{_sysconfdir}/containers/registries.d
 install -m0644 %{SOURCE24} %{buildroot}%{_sysconfdir}/containers/policy.json
 install -dp %{buildroot}%{_sharedstatedir}/containers/sigstore
 install -m0644 %{SOURCE25} %{buildroot}%{_sysconfdir}/containers/registries.d/default.yaml
@@ -129,19 +118,6 @@ ln -s %{_sysconfdir}/pki/entitlement %{buildroot}%{_datadir}/rhel/secrets/etc-pk
 ln -s %{_sysconfdir}/rhsm %{buildroot}%{_datadir}/rhel/secrets/rhsm
 ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secrets/redhat.repo
 
-# ship preconfigured /etc/containers/registries.d/ files with containers-common - #1903813
-cat <<EOF > %{buildroot}%{_sysconfdir}/containers/registries.d/registry.access.redhat.com.yaml
-docker:
-     registry.access.redhat.com:
-         sigstore: https://access.redhat.com/webassets/docker/content/sigstore
-EOF
-
-cat <<EOF > %{buildroot}%{_sysconfdir}/containers/registries.d/registry.redhat.io.yaml
-docker:
-     registry.redhat.io:
-         sigstore: https://registry.redhat.io/containers/sigstore
-EOF
-
 %files
 %dir %{_sysconfdir}/containers
 %dir %{_sysconfdir}/containers/certs.d
@@ -149,19 +125,11 @@ EOF
 %dir %{_sysconfdir}/containers/oci
 %dir %{_sysconfdir}/containers/oci/hooks.d
 %dir %{_sysconfdir}/containers/registries.conf.d
-%dir %{_sysconfdir}/containers/systemd
-%dir %{_datadir}/containers/systemd
-%if !0%{?rhel} || 0%{?centos}
-%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta
-%endif
 %config(noreplace) %{_sysconfdir}/containers/policy.json
 %config(noreplace) %{_sysconfdir}/containers/storage.conf
 %config(noreplace) %{_sysconfdir}/containers/registries.conf
 %config(noreplace) %{_sysconfdir}/containers/registries.conf.d/*.conf
 %config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml
-%config(noreplace) %{_sysconfdir}/containers/registries.d/registry.redhat.io.yaml
-%config(noreplace) %{_sysconfdir}/containers/registries.d/registry.access.redhat.com.yaml
 %ghost %{_sysconfdir}/containers/containers.conf
 %dir %{_sharedstatedir}/containers/sigstore
 %{_mandir}/man5/*
@@ -173,6 +141,10 @@ EOF
 %{_datadir}/rhel/secrets/*
 
 %changelog
+* Mon Oct 09 2023 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 2:1-55.inferit
+- MSVSphere debranding
+- Rebuilt for MSVSphere 9.3
+
 * Wed Jul 19 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-55
 - fix vendoring script
 - Related: #2176063