From 882b087b3aa060f08de3244bc4828eb3f736789c Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Fri, 14 Jul 2023 10:14:00 -0400
Subject: [PATCH] Packit: remove pre-sync action

The pre-sync action constantly breaks and is currently not possible to
reliably test until the subsequent upstream release due to limitations
in packit.

The lines being added by the action script to the downstream Fedora spec
were only meant to keep Fedora happy. But given that they provide
no tangible benefit as github notifies us of security
issues in libraries mentioned in go.mod and go.sum, along with redhat
prodsec's own magic for creating security alerts, there's absolutely
no point to having the pre-sync action run and add a layer of uncertainty.

This commit removes the pre-sync action and
`rpm/update-spec-provides.sh`.

Ref: https://github.com/containers/podman/issues/19232

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
(cherry picked from commit a4aa15f4fa61e4918d1da50a1e9d89c22a321b94)
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 .packit.yaml                |  3 ---
 rpm/skopeo.spec             |  2 --
 rpm/update-spec-provides.sh | 34 ----------------------------------
 3 files changed, 39 deletions(-)
 delete mode 100644 rpm/update-spec-provides.sh

diff --git a/.packit.yaml b/.packit.yaml
index 9596ac9b..c4570b91 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -35,9 +35,6 @@ jobs:
     update_release: false
     dist_git_branches:
       - fedora-all
-    actions:
-        pre-sync:
-          - "bash rpm/update-spec-provides.sh"
 
   - job: koji_build
     trigger: commit
diff --git a/rpm/skopeo.spec b/rpm/skopeo.spec
index 2c277ef8..d53cf882 100644
--- a/rpm/skopeo.spec
+++ b/rpm/skopeo.spec
@@ -69,8 +69,6 @@ BuildRequires: glib2-devel
 BuildRequires: make
 BuildRequires: shadow-utils-subid-devel
 Requires: containers-common >= 4:1-21
-# DO NOT DELETE BELOW LINE - used for updating downstream goimports
-# vendored libraries
 
 %description
 Command line utility to inspect images and repositories directly on Docker
diff --git a/rpm/update-spec-provides.sh b/rpm/update-spec-provides.sh
deleted file mode 100644
index f68de29e..00000000
--- a/rpm/update-spec-provides.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-
-# This script will update the goimports in the rpm spec for downstream fedora
-# packaging, via the `propose-downstream` packit action.
-# The goimports don't need to be present upstream.
-
-set -eo pipefail
-set -x
-
-PACKAGE=skopeo
-# script is run from git root directory
-SPEC_FILE=rpm/$PACKAGE.spec
-
-# Needed for golist to work
-# This is run in the packit sandbox environment for downstream tasks and
-# doesn't affect upstream repo and CI.
-export GOPATH=~/go
-GOPATHDIR=$GOPATH/src/github.com/containers/
-mkdir -p $GOPATHDIR
-ln -sf $(pwd) $GOPATHDIR/.
-
-# Packit sandbox doesn't allow root
-# Install golist by downloading and extracting rpm
-# We could handle this in packit `sandcastle` upstream itself
-# but that depends on golist existing in epel
-# https://github.com/packit/sandcastle/pull/186
-dnf download golist
-rpm2cpio golist-*.rpm | cpio -idmv
-
-sed -i '/Provides: bundled(golang.*/d' $SPEC_FILE
-
-GO_IMPORTS=$(./usr/bin/golist --imported --package-path github.com/containers/$PACKAGE --skip-self | sort -u | xargs "-I{}" echo "Provides: bundled(golang({}))")
-
-awk -v r="$GO_IMPORTS" '/^# vendored libraries/ {print; print r; next} 1' $SPEC_FILE > temp && mv temp $SPEC_FILE