Make catchup- a little bit more flexible with tag names

We support tag names like
${package}-${version}
${package}-v${version}
${version}
v${version}

Now add support for things like
${package}-foo-bar-${version}
foo-bar-${version}

for example:
vulkan-sdk-1.3.275.0 for SPIRV-Headers

Makefile.common

@@ -582,6 +582,78 @@ cloc: $(SRPMFILE)
 	@$(MOCK) --clean --scrub=chroot --uniqueext=$(PKG_NAME)
 	cat results/cloc.txt
 
+#help catchup: Backport the commits from the current version to the upstream HEAD (not release).
+#help Only works if giturl is defined and the current package version can be mapped to a git tag.
+catchup:
+	$(MAKE) catchup-HEAD
+
+#help catchup-<commit|tag>: Backport the commits from the current version to the specified commit or tag.
+#help Only works if giturl is defined and the current package version can be mapped to a git tag.
+catchup-%:
+	@target=$*; \
+	giturl=$$(grep -E '^giturl\s*=\s*\S+' options.conf | sed 's/giturl\s*=\s*//' 2>/dev/null); \
+	if [[ -z "$${giturl}" ]]; then \
+		echo "Error: giturl not defined in options.conf"; \
+		exit 1; \
+	fi; \
+	mkdir -p results; \
+	if [[ -d results/$(PKG_NAME) ]]; then \
+		echo "Reusing existing repository..."; \
+		git -C results/$(PKG_NAME) fetch origin; \
+	else \
+		echo "Cloning upstream repository..."; \
+		git -C results clone "$${giturl}" $(PKG_NAME); \
+	fi; \
+	if ! git -C results/$(PKG_NAME) rev-parse --verify --quiet "$${target}" >/dev/null; then \
+		echo "Error: Target commit/tag $${target} not found"; \
+		exit 1; \
+	fi; \
+	version=$$(rpm -q --qf '%{VERSION}\n' --specfile $(SPECFILE) | head -1); \
+	echo "Version: $${version}"; \
+	current_tag=$$(git -C results/$(PKG_NAME) tag --list | grep -E "^($(PKG_NAME)-)?(.+-|v)?$${version}$$") || { \
+		echo "Error: No tag found for current package version"; \
+		exit 1; \
+	}; \
+	echo "Catching up from $${current_tag} to $${target}"; \
+	for commit in $$(git -C results/$(PKG_NAME) log --reverse --pretty=oneline $${current_tag}..$${target} | cut -d' ' -f1); do \
+		$(MAKE) backport-$${commit}; \
+	done;
+
+
+#help backport-<commit>: Retrieve a commit from the upstream git repository and save it as a backport patch.
+#help The giturl is read from options.conf.
+backport-%:
+	@commit=$*; \
+	echo "Backporting commit: $${commit}"; \
+	giturl=$$(grep -E '^giturl\s*=\s*\S+' options.conf | sed 's/giturl\s*=\s*//' 2>/dev/null); \
+	if [[ -z "$${giturl}" ]]; then \
+		echo "Error: giturl not defined in options.conf"; \
+		exit 1; \
+	fi; \
+	mkdir -p results; \
+	if [[ -d results/$(PKG_NAME) ]]; then \
+		echo "Reusing existing repository..."; \
+		git -C results/$(PKG_NAME) fetch origin; \
+	else \
+		echo "Cloning upstream repository..."; \
+		git -C results clone "$${giturl}" $(PKG_NAME); \
+	fi; \
+	full_commit=$$(git -C results/$(PKG_NAME) show --pretty=oneline $${commit} 2>/dev/null | head -1 | cut -d' ' -f 1); \
+	if [[ -z "$${full_commit}" ]]; then \
+		echo "Error: Commit for $${commit} not found"; \
+		exit 1; \
+	fi; \
+	patch=backport-$${full_commit}.patch; \
+	git -C results/$(PKG_NAME) format-patch -1 --stdout $${full_commit} > $${patch}; \
+	if [[ -s $${patch} ]]; then \
+		echo "$${patch} created"; \
+		grep -qE "^$${patch}$$" series 2>/dev/null || echo "$${patch}" >> series; \
+	else \
+		rm -f $${patch}; \
+		echo "Error: Failed to create backport patch"; \
+		exit 1; \
+	fi \
+
 .PHONY: whatrequires
 #help whatrequires: Output a list of packages that directly depend on this one,
 #help showing the subpackage-level breakdown. Each line of output has the format

packages

@@ -9,6 +9,7 @@ CopyQ
 DML
 Endeavour
 F-Engrave
+FreeCAD
 FreeRDP
 FreeRDP2
 GConf
@@ -49,6 +50,7 @@ PySocks
 PyYAML
 QAT-ZSTD-Plugin
 QAT_engine
+QGIS
 QR-Code-generator
 QXlsx
 R
@@ -180,6 +182,7 @@ R-Ryacas
 R-SGP
 R-SGPdata
 R-SQUAREM
+R-SimDesign
 R-Sleuth2
 R-SnowballC
 R-SparseM
@@ -232,6 +235,7 @@ R-bayesplot
 R-bazar
 R-bbmle
 R-bdsmatrix
+R-beepr
 R-beeswarm
 R-bench
 R-benchr
@@ -584,6 +588,7 @@ R-linprog
 R-lintr
 R-listenv
 R-listviewer
+R-litedown
 R-lle
 R-lme4
 R-lmerTest
@@ -809,6 +814,7 @@ R-readr
 R-readstata13
 R-readxl
 R-recipes
+R-reformulas
 R-registry
 R-relimp
 R-rematch
@@ -824,7 +830,6 @@ R-reshape
 R-reshape2
 R-reticulate
 R-rex
-R-rgdal
 R-rgenoud
 R-rgeos
 R-rgl
@@ -871,6 +876,7 @@ R-rsvg
 R-runjags
 R-rversions
 R-rvest
+R-rworldmap
 R-s2
 R-sampling
 R-sandwich
@@ -916,6 +922,7 @@ R-sp
 R-spData
 R-spam
 R-sparkline
+R-sparsevctrs
 R-spatstat
 R-spatstat.core
 R-spatstat.data
@@ -1056,6 +1063,7 @@ SDL2_image
 SDL2_mixer
 SDL2_net
 SDL2_ttf
+SDL3
 SDL_gfx
 SDL_image
 SDL_mixer
@@ -1093,6 +1101,7 @@ accountsservice
 acl
 acpica-unix2
 ade
+adwaita-fonts
 adwaita-icon-theme
 akonadi
 akonadi-calendar
@@ -1123,6 +1132,7 @@ appstream-glib
 apr
 apr-util
 arandr
+ardopcf
 argon2
 aria2
 ark
@@ -1204,10 +1214,10 @@ boost
 borgbackup
 boto3
 botocore
+bottom
 bovo
 box2d
 bpftool
-bpftrace
 breeze
 breeze-gtk
 breeze-icons
@@ -1234,10 +1244,12 @@ buildreq-qmake
 buildreq-qt6
 buildreq-scons
 buildx
+bwidget
 byobu
 bz2file
 bzip2
 c-ares
+c-blosc
 c-blosc2
 cJSON
 c_rehash
@@ -1339,6 +1351,7 @@ compat-cairomm-soname10
 compat-codec2-soname1
 compat-enchant-soname1
 compat-ffmpeg-4.4
+compat-ffmpeg-6
 compat-fuse-soname2
 compat-gcc-10
 compat-gcr-soname1
@@ -1357,15 +1370,19 @@ compat-libsoup-soname-24
 compat-libva-soname1
 compat-libvpx-soname7
 compat-libvpx-soname8
+compat-libvpx-soname9
+compat-libxml2-soname2
 compat-pangomm-soname14
 compat-protobuf-soname29
 compat-protobuf-soname32
+compat-python3-rolling
 compat-re2-soname10
 compat-readline-soname5
 compat-taglib-soname1
 compat-tbb-soname2
 compat-tiff-soname5
 compat-wlroots-soname11
+compat-yaml-cpp-soname6
 component
 compose
 configobj
@@ -1381,6 +1398,7 @@ coreutils
 corosync
 coturn
 cov-core
+cpdb-libs
 cpio
 cppcheck
 cppunit
@@ -1401,6 +1419,7 @@ cups-filters
 cups-pk-helper
 curl
 cycler
+cyme
 cyrus-sasl
 dapl
 darktable
@@ -1522,6 +1541,7 @@ fakeroot
 falcosecurity-libs
 fann
 farstream
+fast_float
 fastfetch
 faultstat
 fcgi
@@ -1579,6 +1599,7 @@ fsearch
 fuse
 fwupd
 fwupd-efi
+game-music-emu
 garcon
 gawk
 gbinder-python
@@ -1617,6 +1638,7 @@ gi-docgen
 giflib
 gifsicle
 gimp
+gimp-xsanecli
 girara
 git
 git-gui
@@ -1745,6 +1767,7 @@ gstreamer-vaapi
 gtk+
 gtk-doc
 gtk-frdp
+gtk-layer-shell
 gtk-vnc
 gtk-xfce-engine
 gtk3
@@ -1838,6 +1861,7 @@ ipe
 iperf
 ipmitool
 ipp-crypto
+ipp-usb
 iproute2
 ipset
 iptables
@@ -1850,6 +1874,7 @@ irrlicht
 irrlichtmt
 irssi
 isa-l
+isl
 iso-codes
 isodate
 isomd5sum
@@ -2256,6 +2281,7 @@ libmbim
 libmediaart
 libmemcached
 libmicrohttpd
+libmikmod
 libmnl
 libmodbus
 libmodplug
@@ -2292,6 +2318,7 @@ libopenzwave
 libopusenc
 liborcus
 libosinfo
+libp11
 libpagemaker
 libpanel
 libpcap
@@ -2376,6 +2403,7 @@ libva
 libva-intel-driver
 libva-utils
 libvdpau
+libversion
 libvirt
 libvirt-dbus
 libvirt-glib
@@ -2429,6 +2457,7 @@ linux-ltscurrent
 linux-ltsprev
 linux-preempt-rt
 linux-tools
+linuxcnc
 linuxptp
 lksctp-tools
 lldpd
@@ -2438,6 +2467,7 @@ llvm15
 llvm16
 llvm17
 llvm18
+llvm19
 lm-sensors
 lmdb
 logrotate
@@ -2493,10 +2523,10 @@ memtier_benchmark
 menu-cache
 mercurial
 mesa
+mesa-clc
 mesa-demos
 meson
 messagelib
-meta-c-basic
 meta-desktop-gnome
 meta-os-core
 meta-os-core-plus
@@ -2519,6 +2549,7 @@ mingw-crt
 mingw-gcc
 minicom
 minimodem
+minizip-ng
 minuet
 mixer-tools
 mkfontdir
@@ -2622,6 +2653,7 @@ nload
 nlohmann_json
 nlopt
 nmap
+nng
 node-addon-api
 nodejs
 nose-parameterized
@@ -2644,6 +2676,7 @@ numactl
 numatop
 numlockx
 numpy-stl
+nushell
 nut
 nv-codec-headers
 nvme-cli
@@ -2708,6 +2741,7 @@ paho.mqtt.c
 paho.mqtt.cpp
 palapeli
 pam-python
+pam_u2f
 pam_wrapper
 pandas
 pandoc
@@ -3582,7 +3616,6 @@ perl-prefork
 perl-strictures
 pesign
 phonon
-phonon-vlc
 phoronix-test-suite
 php
 php-APCu
@@ -3642,7 +3675,6 @@ php-zmq
 picmi
 picocom
 pidgin
-pidgin-sipe
 pigeonhole
 pigz
 pim-data-exporter
@@ -3730,6 +3762,7 @@ pynvim
 pyotherside
 pyotp
 pyparted
+pypi-Yapps
 pypi-absl_py
 pypi-abydos
 pypi-accelerate
@@ -3747,7 +3780,6 @@ pypi-alabaster
 pypi-altair
 pypi-altgraph
 pypi-amqp
-pypi-aniso8601
 pypi-annotated_types
 pypi-ansi2html
 pypi-ansible_builder
@@ -3783,7 +3815,6 @@ pypi-atpublic
 pypi-attr
 pypi-attrdict
 pypi-attrs
-pypi-autocommand
 pypi-automat
 pypi-awesomeversion
 pypi-awscrt
@@ -3801,7 +3832,6 @@ pypi-babel
 pypi-backcall
 pypi-backoff
 pypi-backports.ssl_match_hostname
-pypi-bash_kernel
 pypi-bashlex
 pypi-bcrypt
 pypi-beartype
@@ -3818,6 +3848,8 @@ pypi-blessed
 pypi-blinker
 pypi-blivet
 pypi-blockdiag
+pypi-blosc
+pypi-blosc2
 pypi-bokeh
 pypi-boolean.py
 pypi-booleanoperations
@@ -3838,14 +3870,12 @@ pypi-cachy
 pypi-cairocffi
 pypi-cairosvg
 pypi-calver
-pypi-capturer
 pypi-cattrs
 pypi-cerberus
 pypi-certbot
 pypi-certbot_dns_google
 pypi-certifi
 pypi-cffi
-pypi-cffsubr
 pypi-cfgv
 pypi-chai
 pypi-chaospy
@@ -3855,7 +3885,6 @@ pypi-check_jsonschema
 pypi-check_manifest
 pypi-cheetah3
 pypi-cheroot
-pypi-cherrypy
 pypi-cibuildwheel
 pypi-ciscoisesdk
 pypi-ciso8601
@@ -3867,11 +3896,11 @@ pypi-click_log
 pypi-clikit
 pypi-cloudevents
 pypi-cloudflare
+pypi-clr_artifact
 pypi-cmarkgfm
 pypi-cmd2
 pypi-codecov
 pypi-colorama
-pypi-coloredlogs
 pypi-colorlog
 pypi-columnize
 pypi-comm
@@ -3892,6 +3921,7 @@ pypi-coveralls
 pypi-cppy
 pypi-crashtest
 pypi-crcmod
+pypi-crypt_r
 pypi-cryptography
 pypi-cryptography_vectors
 pypi-cs
@@ -3914,6 +3944,7 @@ pypi-decorator
 pypi-deepmerge
 pypi-deepspeed
 pypi-dep_logic
+pypi-dependency_groups
 pypi-deprecated
 pypi-deprecation
 pypi-devpi_client
@@ -3976,6 +4007,7 @@ pypi-falcon
 pypi-fasteners
 pypi-fastimport
 pypi-fastjsonschema
+pypi-fido2
 pypi-filecache
 pypi-filelock
 pypi-findpython
@@ -4074,6 +4106,7 @@ pypi-hyperlink
 pypi-hypothesis
 pypi-icalendar
 pypi-icecream
+pypi-id
 pypi-identify
 pypi-idna
 pypi-idna_ssl
@@ -4098,8 +4131,8 @@ pypi-iocapture
 pypi-ipaddress
 pypi-ipdb
 pypi-ipykernel
-pypi-ipyparallel
 pypi-ipython
+pypi-ipython-pygments-lexers
 pypi-ipython_genutils
 pypi-ipython_sql
 pypi-ipywidgets
@@ -4108,10 +4141,8 @@ pypi-isort
 pypi-itsdangerous
 pypi-janus
 pypi-jaraco.classes
-pypi-jaraco.collections
 pypi-jaraco.context
 pypi-jaraco.functools
-pypi-jaraco.text
 pypi-jarn.viewdoc
 pypi-javaproperties
 pypi-jedi
@@ -4124,7 +4155,6 @@ pypi-jinxed
 pypi-jmespath
 pypi-joblib
 pypi-josepy
-pypi-jsmin
 pypi-json5
 pypi-jsondiff
 pypi-jsonlines
@@ -4154,7 +4184,6 @@ pypi-jupyterlab_server
 pypi-jupyterlab_widgets
 pypi-jupyterlite_core
 pypi-jupyterlite_pyodide_kernel
-pypi-jupyterlite_sphinx
 pypi-jxmlease
 pypi-kcc
 pypi-kerberos
@@ -4172,6 +4201,7 @@ pypi-lazy
 pypi-lazy_loader
 pypi-lazy_object_proxy
 pypi-ldap3
+pypi-legacy_cgi
 pypi-levenshtein
 pypi-libarchive_c
 pypi-libevdev
@@ -4246,12 +4276,14 @@ pypi-nbformat
 pypi-nbsphinx
 pypi-nbval
 pypi-ndg_httpsclient
+pypi-ndindex
 pypi-neat_python
 pypi-nest_asyncio
 pypi-netapp_lib
 pypi-netdisco
 pypi-netifaces
 pypi-networkx
+pypi-nftables
 pypi-nh3
 pypi-nibabel
 pypi-nltk
@@ -4354,6 +4386,7 @@ pypi-progress
 pypi-progressbar
 pypi-prometheus_client
 pypi-prompt_toolkit
+pypi-propcache
 pypi-proto_plus
 pypi-protobuf
 pypi-psautohint
@@ -4369,7 +4402,6 @@ pypi-py3dns
 pypi-py3nvml
 pypi-py_cpuinfo
 pypi-pyaml
-pypi-pyarrow
 pypi-pyasn1
 pypi-pyasn1_modules
 pypi-pybind11
@@ -4409,7 +4441,6 @@ pypi-pylint
 pypi-pymdown_extensions
 pypi-pynacl
 pypi-pynetbox
-pypi-pynsist
 pypi-pynvml
 pypi-pyomo
 pypi-pyopengl
@@ -4444,6 +4475,7 @@ pypi-pyroute2.nftables
 pypi-pyroute2.nslink
 pypi-pyrsistent
 pypi-pysaml2
+pypi-pyscard
 pypi-pyscss
 pypi-pyserial
 pypi-pysnow
@@ -4499,6 +4531,7 @@ pypi-rapidfuzz
 pypi-rapidfuzz_capi
 pypi-rcssmin
 pypi-rdflib
+pypi-re2
 pypi-readme_renderer
 pypi-readtime
 pypi-recommonmark
@@ -4508,7 +4541,6 @@ pypi-regress
 pypi-reportlab
 pypi-repoze.lru
 pypi-requests
-pypi-requests_download
 pypi-requests_file
 pypi-requests_gssapi
 pypi-requests_kerberos
@@ -4520,11 +4552,9 @@ pypi-requirements_parser
 pypi-resolvelib
 pypi-responses
 pypi-restructuredtext_lint
-pypi-retrolab
 pypi-retry
 pypi-retry_decorator
 pypi-retryz
-pypi-retype
 pypi-rfc3339_validator
 pypi-rfc3986
 pypi-rfc3986_validator
@@ -4532,6 +4562,7 @@ pypi-rfc3987
 pypi-rich
 pypi-rjsmin
 pypi-rlpycairo
+pypi-roman_numerals_py
 pypi-rope
 pypi-routes
 pypi-rpds_py
@@ -4633,6 +4664,7 @@ pypi-subprocess_tee
 pypi-suds
 pypi-sure
 pypi-svg.path
+pypi-tables
 pypi-tabulate
 pypi-tap.py
 pypi-tblib
@@ -4667,7 +4699,6 @@ pypi-tornado_xstatic
 pypi-tox
 pypi-tqdm
 pypi-traitlets
-pypi-trampolim
 pypi-transformers
 pypi-translationstring
 pypi-trimesh
@@ -4677,7 +4708,6 @@ pypi-trove_classifiers
 pypi-truststore
 pypi-ttp
 pypi-twine
-pypi-typed_ast
 pypi-typeguard
 pypi-types_cffi
 pypi-types_colorama
@@ -4703,12 +4733,13 @@ pypi-types_toml
 pypi-types_typed_ast
 pypi-types_urllib3
 pypi-typing_extensions
+pypi-typing_inspection
 pypi-typogrify
 pypi-tzdata
 pypi-tzlocal
 pypi-ua_parser
+pypi-ua_parser_builtins
 pypi-uc_micro_py
-pypi-ufo2ft
 pypi-ufolib2
 pypi-uharfbuzz
 pypi-ujson
@@ -4728,6 +4759,7 @@ pypi-uvloop
 pypi-venusian
 pypi-verboselogs
 pypi-versioneer
+pypi-versioningit
 pypi-vine
 pypi-virtualenv
 pypi-volatile
@@ -4759,7 +4791,6 @@ pypi-wsproto
 pypi-wurlitzer
 pypi-wxPython
 pypi-xcffib
-pypi-xgboost
 pypi-xmldiff
 pypi-xmljson
 pypi-xmlschema
@@ -4787,6 +4818,7 @@ pypi-yarg
 pypi-yarl
 pypi-yattag
 pypi-ypy_websocket
+pypi-yubikey_manager
 pypi-zabbix_api
 pypi-zc.lockfile
 pypi-zeroconf
@@ -4808,6 +4840,7 @@ pypi-zope.security
 pypi-zope.testing
 pypi-zope.testrunner
 pypi-zopfli
+pystring
 python
 python-digitalocean
 python-distutils-extra
@@ -4932,6 +4965,7 @@ rage
 ragel
 rapidjson
 raptor2
+rasdaemon
 rasqal
 rclone
 rdfind
@@ -4944,6 +4978,7 @@ recode
 redis2-nginx-module
 redland
 redsocks
+redumper
 requests-ntlm
 rest
 restic
@@ -4977,6 +5012,7 @@ s3fs-fuse
 salt
 samba
 samtools
+sane-airscan
 sane-backends
 sassc
 sbc
@@ -4989,6 +5025,7 @@ scour
 scowl
 screen
 scummvm
+scx
 sddm
 sddm-kcm
 seahorse
@@ -5100,7 +5137,9 @@ tallow
 tar
 taskwarrior
 tbb
+tbtools
 tcl
+tclx
 tcpdump
 tdb
 tecla
@@ -5155,10 +5194,12 @@ udisks2
 udunits
 uget
 uhttpmock
+uhubctl
 umockdev
 unbundle
 unibilium
 unifdef
+unified-memory-framework
 unison
 unit
 unixODBC
@@ -5169,7 +5210,6 @@ usb-modeswitch-data
 usbredir
 usbutils
 userspace-rcu
-usrbinjava
 usrbinvi
 usrsctp
 utf8proc
@@ -5185,6 +5225,7 @@ valijson
 valkey
 vapoursynth
 vbox-integration
+vc-intrinsics
 vectorscan
 vid.stab
 vifm
@@ -5197,7 +5238,6 @@ virglrenderer
 virt-manager
 virt-viewer
 vkd3d
-vlc
 volk
 volume_key
 vpnc
@@ -5229,6 +5269,7 @@ wlroots
 wmctrl
 woff2
 wol
+wolfssl
 wpa_supplicant
 wsjtx
 wslu
@@ -5315,6 +5356,8 @@ xrandr
 xrdb
 xrdp
 xrestop
+xsane
+xscorch
 xscreensaver
 xsel
 xset
@@ -5341,6 +5384,7 @@ yelp-tools
 yelp-xsl
 yq
 ytnef
+yyjson
 zabbix
 zathura
 zathura-pdf-poppler
@@ -5348,6 +5392,7 @@ zenity
 zimg
 zip
 zlib
+zlib-ng
 znc
 zopfli
 zsh

vendor.py

@@ -50,16 +50,17 @@ def setup_content(url):
 
 
 def setup_cargo_vendor(path):
+    cargo_paths = []
     for dirpath, _, files in os.walk(path):
         for fname in files:
             if fname == "Cargo.toml":
-                return dirpath
-    return False
+                cargo_paths.append(os.path.join(dirpath, fname))
+    return cargo_paths
 
 
-def update_cargo_vendor(path, name, git):
+def update_cargo_vendor(tmpdir, cargo_paths, name, git):
     git_uri = os.path.join(git, name)
-    vendor_path = os.path.join(path, 'vendor')
+    vendor_path = os.path.join(tmpdir, 'vendor')
     subprocess.run(f"git clone {git_uri} {vendor_path}", shell=True, check=True,
                    stdout=subprocess.DEVNULL)
     vendor_git = os.path.join(vendor_path, '.git')
@@ -69,16 +70,18 @@ def update_cargo_vendor(path, name, git):
                        stdout=subprocess.DEVNULL)
         subprocess.run(f"git remote add origin {git_uri}", cwd=vendor_path,
                        shell=True, check=True, stdout=subprocess.DEVNULL)
-    backup_vendor_git = os.path.join(path, 'clear-linux-vendor-git')
-    subprocess.run(f"cp -a {vendor_git} {backup_vendor_git}", cwd=path,
+    backup_vendor_git = os.path.join(tmpdir, 'clear-linux-vendor-git')
+    subprocess.run(f"cp -a {vendor_git} {backup_vendor_git}", cwd=tmpdir,
                    shell=True, check=True, stdout=subprocess.DEVNULL)
     shutil.rmtree(vendor_path)
-    cargo_vendors = subprocess.run('cargo vendor', cwd=path, shell=True,
+    vendor_cmd = 'cargo vendor ' + ' '.join([f"-s {x}" for x in cargo_paths[:-1]])
+    vendor_cmd += f" --manifest-path {cargo_paths[-1]}"
+    cargo_vendors = subprocess.run(vendor_cmd, cwd=tmpdir, shell=True,
                                    check=True, stdout=subprocess.PIPE,
                                    universal_newlines=True).stdout
     with open(os.path.join(vendor_path, ".gitattributes"), "w", encoding='utf8') as gafile:
         gafile.write("* text=false\n")
-    subprocess.run(f"cp -a {backup_vendor_git} {vendor_git}", cwd=path,
+    subprocess.run(f"cp -a {backup_vendor_git} {vendor_git}", cwd=tmpdir,
                    shell=True, check=True, stdout=subprocess.DEVNULL)
     repo = Repo(vendor_path)
     if not (len(repo.untracked_files) > 0 or repo.is_dirty()):
@@ -111,11 +114,11 @@ def update_cargo_sources(name, tag, cargo_vendors):
     with open('Makefile', encoding='utf8') as mfile:
         for line in mfile.readlines():
             if line.startswith('ARCHIVES'):
-                if re.search(archive_match + r'[a-zA-Z0-9_\-.]+\.tar\.xz', line):
-                    new_archives = re.sub(archive_match + r'[a-zA-Z0-9_\-.]+\.tar\.xz',
-                                          f"{archive_replace}-{tag}.tar.xz", line)
+                if re.search(archive_match + r'[a-zA-Z0-9_\-.]+\.tar\.gz', line):
+                    new_archives = re.sub(archive_match + r'[a-zA-Z0-9_\-.]+\.tar\.gz',
+                                          f"{archive_replace}-{tag}.tar.gz", line)
                 else:
-                    new_archives = f"{line[:-1]} {archive_replace}-{tag}.tar.xz ./vendor\n"
+                    new_archives = f"{line[:-1]} {archive_replace}-{tag}.tar.gz ./vendor\n"
                 print(new_archives.replace('ARCHIVES = ', '', 1))
                 makefile.append(new_archives)
             else:
@@ -128,11 +131,11 @@ def update_cargo_sources(name, tag, cargo_vendors):
     with open('options.conf', encoding='utf8') as ofile:
         for line in ofile.readlines():
             if line.startswith('archives'):
-                if re.search(archive_match + r'[a-zA-Z0-9_\-.]+\.tar\.xz', line):
-                    new_archives = re.sub(archive_match + r'[a-zA-Z0-9_\-.]+\.tar\.xz',
-                                          f"{archive_match}-{tag}.tar.xz", line)
+                if re.search(archive_match + r'[a-zA-Z0-9_\-.]+\.tar\.gz', line):
+                    new_archives = re.sub(archive_match + r'[a-zA-Z0-9_\-.]+\.tar\.gz',
+                                          f"{archive_match}-{tag}.tar.gz", line)
                 else:
-                    new_archives = f"{line[:-1]} {archive_match}-{tag}.tar.xz ./vendor\n"
+                    new_archives = f"{line[:-1]} {archive_match}-{tag}.tar.gz ./vendor\n"
                 options.append(new_archives)
             else:
                 options.append(line)
@@ -152,11 +155,11 @@ def main():
 
     tdir = setup_content(args.url)
     if vtype == 'cargo':
-        vdir = setup_cargo_vendor(tdir)
-        if not vdir:
+        cargo_paths = setup_cargo_vendor(tdir)
+        if len(cargo_paths) == 0:
             print(args.archives)
         else:
-            tag, cargo_vendors = update_cargo_vendor(vdir, args.name, args.git)
+            tag, cargo_vendors = update_cargo_vendor(tdir, cargo_paths, args.name, args.git)
             update_cargo_sources(args.name, tag, cargo_vendors)
     shutil.rmtree(tdir)