From d5d2476b71bb03b339a704a0e454d7096ebea9f6 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Tue, 16 May 2023 04:01:23 -0700
Subject: [PATCH] sync from upstream

---
 shared/additional_and_filter_packages.conf |  1 +
 sync-from-upstream                         | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100755 sync-from-upstream

diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index 783a47e..ace6590 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -80,6 +80,7 @@ additional_packages = [
             "ecj", #ENGCMP-2939
             "egl-utils",
             "frr-selinux",
+            "gcc-toolset-13-annobin",
             "inkscape1",
             "inkscape1-docs",
             "inkscape1-view",
diff --git a/sync-from-upstream b/sync-from-upstream
new file mode 100755
index 0000000..f12784d
--- /dev/null
+++ b/sync-from-upstream
@@ -0,0 +1,20 @@
+#!/bin/bash
+HOWMANY="-$1"
+if [ -z $1 ]; then
+  HOWMANY="-1"
+fi
+
+BRANCH=$(git branch --show-current)
+if [[ ! "${BRANCH}" =~ "r8s" ]]; then
+  echo "Not a lookahead branch."
+  exit 1
+fi
+
+echo "Fetching from upstream"
+git fetch https://gitlab.com/redhat/centos-stream/release-engineering/pungi-centos.git centos-8-stream
+echo "Formatting patch and applying..."
+git format-patch --stdout ${HOWMANY} FETCH_HEAD | sed -e 's|centos/|rocky/|' | git apply
+echo "!! DIFF OF CHANGES !!"
+git --no-pager diff HEAD
+
+echo "You may now commit and push."