rebasing package updates in a different commit

microsoft · Feb 12, 2025 · 611efe5 · 611efe5
1 parent 02603b4
commit 611efe5
Show file tree

Hide file tree

Showing 8 changed files with 537 additions and 25 deletions.
diff --git a/SPECS-EXTENDED/ripgrep/generate_source_tarball.sh b/SPECS-EXTENDED/ripgrep/generate_source_tarball.sh
@@ -0,0 +1,151 @@
+#!/bin/bash
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Quit on failure
+set -e
+
+PKG_VERSION=""
+SRC_TARBALL=""
+OUT_FOLDER="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+VENDOR_VERSION="1"
+
+# parameters:
+#
+# --srcTarball  : src tarball file
+#                 this file contains the 'initial' source code of the component
+#                 and should be replaced with the new/modified src code
+# --outFolder   : folder where to copy the new tarball(s)
+# --pkgVersion  : package version
+# --vendorVersion : vendor version
+
+PARAMS=""
+while (( "$#" )); do
+    case "$1" in
+        --srcTarball)
+        if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
+            SRC_TARBALL=$2
+            shift 2
+        else
+            echo "Error: Argument for $1 is missing" >&2
+            exit 1
+        fi
+        ;;
+        --outFolder)
+        if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
+            OUT_FOLDER=$2
+            shift 2
+        else
+            echo "Error: Argument for $1 is missing" >&2
+            exit 1
+        fi
+        ;;
+        --pkgVersion)
+        if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
+            PKG_VERSION=$2
+            shift 2
+        else
+            echo "Error: Argument for $1 is missing" >&2
+            exit 1
+        fi
+        ;;
+        --vendorVersion)
+        if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
+            VENDOR_VERSION=$2
+            shift 2
+        else
+            echo "Error: Argument for $1 is missing" >&2
+            exit 1
+        fi
+        ;;
+        -*|--*=) # unsupported flags
+        echo "Error: Unsupported flag $1" >&2
+        exit 1
+        ;;
+        *) # preserve positional arguments
+        PARAMS="$PARAMS $1"
+        shift
+        ;;
+  esac
+done
+
+echo "--srcTarball      -> $SRC_TARBALL"
+echo "--outFolder       -> $OUT_FOLDER"
+echo "--pkgVersion      -> $PKG_VERSION"
+echo "--vendorVersion   -> $VENDOR_VERSION"
+
+if [ -z "$PKG_VERSION" ]; then
+    echo "--pkgVersion parameter cannot be empty"
+    exit 1
+fi
+
+if [ -z "$VENDOR_VERSION" ]; then
+    echo "--vendorVersion parameter cannot be empty"
+    exit 1
+fi
+
+echo "-- create temp folder"
+TEMP_DIR=$(mktemp -d)
+function cleanup {
+    echo "+++ cleanup -> remove $TEMP_DIR"
+    rm -rf $TEMP_DIR
+}
+trap cleanup EXIT
+
+pushd $TEMP_DIR > /dev/null
+
+TARBALL_NAME=$(basename "$SRC_TARBALL")
+
+NAME_VER=${TARBALL_NAME%.*}
+if [[ "$NAME_VER" =~ \.tar$ ]]
+then
+    NAME_VER=${NAME_VER%.*}
+fi
+
+VENDOR_TARBALL="$NAME_VER-cargovendor-v$VENDOR_VERSION.tar.gz"
+
+if [[ -f "$TARBALL_NAME" ]]
+then
+    cp "$SRC_TARBALL" "$TEMP_DIR"
+else
+    echo "Tarball '$TARBALL_NAME' doesn't exist. Will attempt to download from blobstorage."
+    if ! wget -q "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/$TARBALL_NAME" -O "$TEMP_DIR/$TARBALL_NAME"
+    then
+        echo "ERROR: failed to download the source tarball."
+        exit 1
+    fi
+    echo "Download successful."
+fi
+
+echo "Unpacking source tarball..."
+tar -xf $SRC_TARBALL
+
+echo "Vendor cargo ..."
+DIRECTORY_NAME=($(ls -d */))
+
+# assume there is only one directory in the tarball
+DIRECTORY_NAME=${DIRECTORY_NAME[0]%//}
+
+pushd "$DIRECTORY_NAME" &> /dev/null
+echo "Fetching dependencies to a temporary cache in $DIRECTORY_NAME."
+
+#TODO: installing rust as auto-patcher does not have it installed by default. Possibly remove if auto-patcher will be changed to have rust included.
+sudo dnf install -y rust || sudo apt install -y rustc
+
+# assume there is only one Cargo.toml
+TOML_LOCATION=$(find . -maxdepth 2 -name "Cargo.toml" -exec dirname {} \;)
+pushd $TOML_LOCATION &> /dev/null
+cargo vendor > config.toml
+
+echo ""
+echo "========================="
+echo "Tar vendored tarball"
+tar  --sort=name \
+     --mtime="2021-04-26 00:00Z" \
+     --owner=0 --group=0 --numeric-owner \
+     --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \
+     -I pigz -cf "$VENDOR_TARBALL" vendor
+
+cp $VENDOR_TARBALL $OUT_FOLDER
+popd > /dev/null
+echo "$NAME_VER vendored modules are available at $VENDOR_TARBALL"
diff --git a/SPECS-EXTENDED/ripgrep/ripgrep.spec b/SPECS-EXTENDED/ripgrep/ripgrep.spec
@@ -28,7 +28,7 @@ Distribution:   Azure Linux
 Group:          Productivity/Text/Utilities
 URL:            https://github.com/BurntSushi/ripgrep
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-Source1:        %{name}-%{version}-vendor.tar.xz
+Source1:        %{name}-%{version}-cargovendor-v1.tar.gz
 Source2:        cargo_config
 BuildRequires:  cargo
 BuildRequires:  rust >= 1.31
@@ -104,6 +104,9 @@ install -Dm 644 complete/_rg %{buildroot}%{_datadir}/zsh/site-functions/_rg
 %{_datadir}/zsh
 
 %changelog
+* Tue Feb 11 2025 Osama Esmail <[email protected]> - 13.0.0-6
+- Adding the vendor script and tarball name
+
 * Thu Sep 07 2023 Daniel McIlvaney <[email protected]> - 13.0.0-5
 - Bump package to rebuild with rust 1.72.0
 

diff --git a/SPECS-EXTENDED/rust-cbindgen/generate_source_tarball.sh b/SPECS-EXTENDED/rust-cbindgen/generate_source_tarball.sh
@@ -0,0 +1,151 @@
+#!/bin/bash
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# Quit on failure
+set -e
+
+PKG_VERSION=""
+SRC_TARBALL=""
+OUT_FOLDER="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+VENDOR_VERSION="1"
+
+# parameters:
+#
+# --srcTarball  : src tarball file
+#                 this file contains the 'initial' source code of the component
+#                 and should be replaced with the new/modified src code
+# --outFolder   : folder where to copy the new tarball(s)
+# --pkgVersion  : package version
+# --vendorVersion : vendor version
+
+PARAMS=""
+while (( "$#" )); do
+    case "$1" in
+        --srcTarball)
+        if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
+            SRC_TARBALL=$2
+            shift 2
+        else
+            echo "Error: Argument for $1 is missing" >&2
+            exit 1
+        fi
+        ;;
+        --outFolder)
+        if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
+            OUT_FOLDER=$2
+            shift 2
+        else
+            echo "Error: Argument for $1 is missing" >&2
+            exit 1
+        fi
+        ;;
+        --pkgVersion)
+        if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
+            PKG_VERSION=$2
+            shift 2
+        else
+            echo "Error: Argument for $1 is missing" >&2
+            exit 1
+        fi
+        ;;
+        --vendorVersion)
+        if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
+            VENDOR_VERSION=$2
+            shift 2
+        else
+            echo "Error: Argument for $1 is missing" >&2
+            exit 1
+        fi
+        ;;
+        -*|--*=) # unsupported flags
+        echo "Error: Unsupported flag $1" >&2
+        exit 1
+        ;;
+        *) # preserve positional arguments
+        PARAMS="$PARAMS $1"
+        shift
+        ;;
+  esac
+done
+
+echo "--srcTarball      -> $SRC_TARBALL"
+echo "--outFolder       -> $OUT_FOLDER"
+echo "--pkgVersion      -> $PKG_VERSION"
+echo "--vendorVersion   -> $VENDOR_VERSION"
+
+if [ -z "$PKG_VERSION" ]; then
+    echo "--pkgVersion parameter cannot be empty"
+    exit 1
+fi
+
+if [ -z "$VENDOR_VERSION" ]; then
+    echo "--vendorVersion parameter cannot be empty"
+    exit 1
+fi
+
+echo "-- create temp folder"
+TEMP_DIR=$(mktemp -d)
+function cleanup {
+    echo "+++ cleanup -> remove $TEMP_DIR"
+    rm -rf $TEMP_DIR
+}
+trap cleanup EXIT
+
+pushd $TEMP_DIR > /dev/null
+
+TARBALL_NAME=$(basename "$SRC_TARBALL")
+
+NAME_VER=${TARBALL_NAME%.*}
+if [[ "$NAME_VER" =~ \.tar$ ]]
+then
+    NAME_VER=${NAME_VER%.*}
+fi
+
+VENDOR_TARBALL="$NAME_VER-cargovendor-v$VENDOR_VERSION.tar.gz"
+
+if [[ -f "$TARBALL_NAME" ]]
+then
+    cp "$SRC_TARBALL" "$TEMP_DIR"
+else
+    echo "Tarball '$TARBALL_NAME' doesn't exist. Will attempt to download from blobstorage."
+    if ! wget -q "https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/$TARBALL_NAME" -O "$TEMP_DIR/$TARBALL_NAME"
+    then
+        echo "ERROR: failed to download the source tarball."
+        exit 1
+    fi
+    echo "Download successful."
+fi
+
+echo "Unpacking source tarball..."
+tar -xf $SRC_TARBALL
+
+echo "Vendor cargo ..."
+DIRECTORY_NAME=($(ls -d */))
+
+# assume there is only one directory in the tarball
+DIRECTORY_NAME=${DIRECTORY_NAME[0]%//}
+
+pushd "$DIRECTORY_NAME" &> /dev/null
+echo "Fetching dependencies to a temporary cache in $DIRECTORY_NAME."
+
+#TODO: installing rust as auto-patcher does not have it installed by default. Possibly remove if auto-patcher will be changed to have rust included.
+sudo dnf install -y rust || sudo apt install -y rustc
+
+# assume there is only one Cargo.toml
+TOML_LOCATION=$(find . -maxdepth 2 -name "Cargo.toml" -exec dirname {} \;)
+pushd $TOML_LOCATION &> /dev/null
+cargo vendor > config.toml
+
+echo ""
+echo "========================="
+echo "Tar vendored tarball"
+tar  --sort=name \
+     --mtime="2021-04-26 00:00Z" \
+     --owner=0 --group=0 --numeric-owner \
+     --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \
+     -I pigz -cf "$VENDOR_TARBALL" vendor
+
+cp $VENDOR_TARBALL $OUT_FOLDER
+popd > /dev/null
+echo "$NAME_VER vendored modules are available at $VENDOR_TARBALL"
diff --git a/SPECS-EXTENDED/rust-cbindgen/rust-cbindgen.spec b/SPECS-EXTENDED/rust-cbindgen/rust-cbindgen.spec
@@ -2,7 +2,7 @@
 Summary:        Tool for generating C bindings to Rust code
 Name:           rust-cbindgen
 Version:        0.24.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -15,7 +15,7 @@ Source:         %{url}/archive/refs/tags/v0.24.3.tar.gz#/%{name}-%{version}.tar.
 #   cargo vendor > config.toml
 #   tar -czf %{name}-%{version}-cargo.tar.gz vendor/
 #
-Source1:        cbindgen-%{version}-cargo.tar.gz
+Source1:        %{name}-%{version}-cargovendor-v1.tar.gz
 Source2:        cargo_config
 %global rustflags '-Clink-arg=-Wl,-z,relro,-z,now'
 %global _description %{expand:
@@ -96,6 +96,9 @@ RUSTFLAGS=%{rustflags} cargo test --release
 %endif
 
 %changelog
+* Tue Feb 11 2025 Osama Esmail <[email protected]> - 0.24.3-2
+- Adding the vendor script and tarball name
+
 * Mon Sep 25 2023 Shweta Bindal <[email protected]> - 0.24.3-1
 - Initial CBL-Mariner import from Fedora 38 (license: MIT).
 - License verified

diff --git a/SPECS/flux/flux.spec b/SPECS/flux/flux.spec
@@ -22,7 +22,7 @@
 Summary:        Influx data language
 Name:           flux
 Version:        0.194.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -37,7 +37,7 @@ Source0:        %{url}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.
 #   cargo vendor > config.toml
 #   tar -czf %{name}-%{version}-cargo.tar.gz vendor/
 #
-Source1:        %{name}-%{version}-cargo.tar.gz
+Source1:        %{name}-%{version}-cargovendor-v1.tar.gz
 Source2:        cargo_config
 Patch1:         disable-static-library.patch
 Patch2:         0001-libflux-unblock-build-by-allowing-warnings.patch
@@ -139,6 +139,9 @@ RUSTFLAGS=%{rustflags} cargo test --release
 %{_includedir}/influxdata/flux.h
 
 %changelog
+* Tue Feb 11 2025 Osama Esmail <[email protected]> - 0.194.5-2
+- Updating the vendor script and tarball name
+
 * Thu Feb 01 2024 Mykhailo Bykhovtsev <[email protected]> - 0.194.5-1
 - Upgrade to version 0.194.5