new packages file

autospec learned how to use 'cargo vendor' output as a drop in
configuration file so put the output of cargo vendor there.

Signed-off-by: William Douglas <william.douglas@intel.com>

packages

@@ -338,6 +338,7 @@ R-distr
 R-distrEx
 R-distributional
 R-dlm
+R-doBy
 R-doMC
 R-doMPI
 R-doParallel
@@ -1072,6 +1073,7 @@ WPEBackend-fdo
 WireGuard
 XStatic-term.js
 Z3
+aardvark-dns
 abireport
 abseil-cpp
 accel-config
@@ -1160,7 +1162,6 @@ bash-completion
 bashdb
 bats
 bc
-bcache-tools
 bcachefs-tools
 bcc
 bcftools
@@ -1221,6 +1222,7 @@ byobu
 bz2file
 bzip2
 c-ares
+c-blosc2
 cJSON
 c_rehash
 ca-certs
@@ -1246,6 +1248,7 @@ cereal
 cfitsio
 cgdb
 cgit
+chafa
 check
 cheese
 chirp
@@ -1392,6 +1395,7 @@ dbus-glib
 dbus-python
 dconf
 dconf-editor
+ddcutil
 ddd
 deap
 debugedit
@@ -1500,6 +1504,7 @@ fakeroot
 falcosecurity-libs
 fann
 farstream
+fastfetch
 faultstat
 fcgi
 fdk-aac
@@ -2503,6 +2508,7 @@ modsecurity
 modsecurity-nginx
 modules
 mokutil
+mold
 mono
 moreutils
 mosh
@@ -2552,6 +2558,7 @@ neovim
 net-snmp
 net-tools
 netaddr
+netavark
 netbase
 netcdf
 netcdf-fortran
@@ -2678,6 +2685,7 @@ parallel
 parley
 parted
 pass
+passt
 passwdqc
 patch
 patchelf

vendor.py

@@ -9,9 +9,8 @@ import subprocess
 import tempfile
 import time
 
-from git import Repo
-
 import requests
+from git import Repo
 
 
 def vendor_check():
@@ -74,13 +73,14 @@ def update_cargo_vendor(path, name, git):
     subprocess.run(f"cp -a {vendor_git} {backup_vendor_git}", cwd=path,
                    shell=True, check=True, stdout=subprocess.DEVNULL)
     shutil.rmtree(vendor_path)
-    subprocess.run('cargo vendor', cwd=path, shell=True, check=True,
-                   stdout=subprocess.DEVNULL)
+    cargo_vendors = subprocess.run('cargo vendor', cwd=path, shell=True,
+                                   check=True, stdout=subprocess.PIPE,
+                                   universal_newlines=True).stdout
     subprocess.run(f"cp -a {backup_vendor_git} {vendor_git}", cwd=path,
                    shell=True, check=True, stdout=subprocess.DEVNULL)
     repo = Repo(vendor_path)
     if not (len(repo.untracked_files) > 0 or repo.is_dirty()):
-        return False
+        return False, ""
     subprocess.run('git add .', cwd=vendor_path, shell=True, check=True,
                    stdout=subprocess.DEVNULL)
     subprocess.run('git commit -m "vendor update"', cwd=vendor_path,
@@ -92,10 +92,10 @@ def update_cargo_vendor(path, name, git):
     subprocess.run(f"git push origin main:main {tag}", cwd=vendor_path,
                    shell=True, check=True, stdout=subprocess.DEVNULL)
     time.sleep(30)
-    return tag
+    return tag, cargo_vendors
 
 
-def update_cargo_sources(name, tag):
+def update_cargo_sources(name, tag, cargo_vendors):
     makefile = []
     options = []
     archive_match = os.path.join(r'\$\(CGIT_BASE_URL\)', 'vendor', name,
@@ -132,6 +132,8 @@ def update_cargo_sources(name, tag):
                 options.append(line)
     with open('options.conf', 'w', encoding='utf8') as ofile:
         ofile.writelines(options)
+    with open('cargo_vendors', 'w', encoding='utf8') as cfile:
+        cfile.write(cargo_vendors)
 
 
 def main():
@@ -147,9 +149,9 @@ def main():
     if vtype == 'cargo':
         vdir = setup_cargo_vendor(tdir)
         if vdir:
-            tag = update_cargo_vendor(vdir, args.name, args.git)
+            tag, cargo_vendors = update_cargo_vendor(vdir, args.name, args.git)
             if tag:
-                update_cargo_sources(args.name, tag)
+                update_cargo_sources(args.name, tag, cargo_vendors)
                 updated = True
     if not updated:
         print(args.archives)