Sync from SUSE:SLFO:1.1 cargo-c revision bc8763a912aa1202c4cde36d049d2c50

README.suse-maint

@@ -2,16 +2,24 @@
 
 ## Prerequisites:
 You need the download_files and cargo_vendor obs services installed:
-  zypper in obs-service-obs_scm obs-service-cargo_vendor
+  zypper in obs-service-download_files obs-service-cargo_vendor
 
 ## Updating to a new version from upstream
 
-Edit the _service file and update the revision parameter.
+Edit the spec file and update the version variable.
 
 Download the new source file by running:
-  osc service mr obs_scm
+  osc service ra download_files
+
+Uncompress the cargo-c-%{version}.tar.gz file:
+  tar xvfz cargo-c-%{version}.tar.gz
+
+This will create a cargo-c-%{version} directory
+
+Edit the _service file and set the srcdir param
+to the extracted directory.
 
 Run the cargo_vendor service with:
-  osc service mr cargo_vendor
+  osc service disabledrun
 
 Update the changelog file with the upstream release notes.

_service

@@ -3,14 +3,14 @@
     <param name="url">https://github.com/lu-zero/cargo-c.git</param>
     <param name="versionformat">@PARENT_TAG@~git@TAG_OFFSET@.%h</param>
     <param name="scm">git</param>
-    <param name="revision">v0.10.3</param>
+    <param name="revision">v0.9.27</param>
     <param name="match-tag">*</param>
     <param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param>
     <param name="versionrewrite-replacement">\1</param>
     <param name="changesgenerate">enable</param>
   </service>
-  <service mode="buildtime" name="tar" />
-  <service mode="buildtime" name="recompress">
+  <service mode="manual" name="tar" />
+  <service mode="manual" name="recompress">
     <param name="file">*.tar</param>
     <param name="compression">xz</param>
   </service>
@@ -20,4 +20,7 @@
      <param name="compression">xz</param>
      <param name="update">true</param>
   </service>
+  <service name="cargo_audit" mode="manual">
+     <param name="srcdir">cargo-c</param>
+  </service>
 </services>

_servicedata

@@ -1,4 +0,0 @@
-<servicedata>
-<service name="tar_scm">
-                <param name="url">https://github.com/lu-zero/cargo-c.git</param>
-              <param name="changesrevision">ee7d7ef74b9c1fa00c6780da41a838752c76b3eb</param></service></servicedata>

cargo-c.changes

@@ -1,38 +1,3 @@
--------------------------------------------------------------------
-Fri Sep 20 03:18:07 UTC 2024 - William Brown <william.brown@suse.com>
-
-- bsc#1230683 - CVE-2024-45405 - gix-path improper path resolution
-
--------------------------------------------------------------------
-Tue Aug 27 09:20:15 UTC 2024 - Enrico Belleri <kilgore.trout@idesmi.eu>
-
-- Update to version 0.10.3~git0.ee7d7ef:
-  * Wire in the heuristics 
-  * Implement heuristics for target-specific install paths
-  * Fix the generated header fingerprinting logic
-  * Make notice about missing windows debug files verbose-only
-  * Update dependencies
-  * Require cargo 0.80.0
-- Use macros from cargo-packaging
-- Remove cargo_config: contained in vendor.tar
-- Remove cargo_audit service: now part of cargo_vendor
-- Remove custom rustflags and let the macros set them instead
-
--------------------------------------------------------------------
-Tue Jun 04 19:59:22 UTC 2024 - david.mulder@suse.com
-
-- Update to version 0.9.32~git0.56dfe34:
-  * Prepare for release
-  * Bump cargo version
-  * Use clone_from/clone_into
-  * Do not install the versioned links and lib on Android
-  * docs: add rustls-ffi to README users list
-  * Bump the msrv again
-  * Bump msrv
-  * Bump cargo version
-  * Match the beaviour of meson regarding relative paths in the install directories
-  * Bump cargo version
-
 -------------------------------------------------------------------
 Tue Oct 17 10:43:31 UTC 2023 - bjorn.lie@gmail.com
 

cargo-c.obsinfo

@@ -1,4 +0,0 @@
-name: cargo-c
-version: 0.10.3~git0.ee7d7ef
-mtime: 1722315713
-commit: ee7d7ef74b9c1fa00c6780da41a838752c76b3eb

cargo-c.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package cargo-c
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 # Copyright (c) 2019 Andreas Schneider <asn@cryptomilk.org>.
 #
 # All modifications and additions to the file contributed by third parties
@@ -17,8 +17,10 @@
 #
 
 
+%global rustflags -Clink-arg=-Wl,-z,relro,-z,now -C debuginfo=2
+
 Name:           cargo-c
-Version:        0.10.3~git0.ee7d7ef
+Version:        0.9.27~git0.54774e0
 Release:        0
 Summary:        Helper to build and install c-like libraries from Rust
 License:        MIT
@@ -27,9 +29,10 @@ Group:          Development/Languages/Rust
 URL:            https://crates.io/crates/cargo-c
 Source0:        %{name}-%{version}.tar.xz
 Source1:        vendor.tar.xz
+Source2:        cargo_config
+
 Source1000:     README.suse-maint
-BuildRequires:  cargo >= 0.80.0
-BuildRequires:  cargo-packaging
+BuildRequires:  cargo
 BuildRequires:  pkgconfig(openssl)
 
 %description
@@ -43,14 +46,20 @@ software.
 %prep
 %autosetup -a1 -p1
 
+install -d -m 0755 .cargo
+cp %{SOURCE2} .cargo/config
+
 %build
-%{cargo_build}
+export RUSTFLAGS="%{rustflags}"
+cargo build --offline --release
 
 %install
-%{cargo_install}
+export RUSTFLAGS="%{rustflags}"
+cargo install --offline --root=%{buildroot}%{_prefix} --path .
 
 find %{buildroot} -name .crates2.json -delete
 rm -rf %{buildroot}%{_datadir}/cargo/registry
+rm %{buildroot}%{_prefix}/.crates.toml
 
 %files
 %license LICENSE

cargo_config

@@ -0,0 +1,5 @@
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "vendor"