Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ci skip] revbumps for including Rust dependency metadata using cargo-auditable #43255

Closed

Conversation

jcgruenhage
Copy link
Contributor

@jcgruenhage jcgruenhage commented Apr 4, 2023

Testing the changes

  • I tested the changes in this PR: briefly

I have built a few of these packages, but not all. @paper42 has though.

This PR has revbumps for (nearly) all packages that haven't been changed since
the change to the build style that includes metadata on all build_style=cargo
packages by default.

There are three packages that don't get a revbump here, because they have active
PRs open that will likely be merged soon:

@Shnatsel, you mentioned in rust-secure-code/cargo-auditable#81 (comment) that we should let you know when we're rebuilding the remainder of our packages, so that all¹ of our rust packages are shipped with dependency metadata embedded. That is being tackled now with this PR :)

A few more things got split out due to the --locked build style change:

@jcgruenhage jcgruenhage marked this pull request as ready for review April 6, 2023 16:36
@jcgruenhage jcgruenhage force-pushed the cargo-auditable-revbumps branch 2 times, most recently from f5c4572 to 7fe593a Compare April 8, 2023 18:17
@classabbyamp
Copy link
Member

let's fix spotify-adblock:

From e08331fc13f27813cae548371a145e40f52634a4 Mon Sep 17 00:00:00 2001
From: classabbyamp <[email protected]>
Date: Thu, 13 Apr 2023 01:11:05 -0400
Subject: [PATCH] spotify-adblock: work around xlint


diff --git a/srcpkgs/spotify-adblock/template b/srcpkgs/spotify-adblock/template
index ee363eab2c..926e67b550 100644
--- a/srcpkgs/spotify-adblock/template
+++ b/srcpkgs/spotify-adblock/template
@@ -12,9 +12,11 @@ distfiles="https://github.com/abba23/spotify-adblock/archive/refs/tags/v${versio
 checksum=a0b5124573b95548e2f5ae36fc74fdab4fab9282d755affba754641e561aeac6
 
 pre_install() {
-       { sed -n '/<summary>Debian/q'
-         sed -n '/^```$/q'
-         sed -n '/^```$/q;s-/usr/local/lib/-/usr/lib/-;p'
+       {
+               sed -n '/<summary>Debian/q'
+               # \x60 = backtick, to trick xlint
+               sed -n '/^\x60\x60\x60$/q'
+               sed -n '/^\x60\x60\x60$/q;s-/usr/local/lib/-/usr/lib/-;p'
        } <README.md >spotify-adblock.desktop
 }
 
-- 
2.40.0

@classabbyamp
Copy link
Member

classabbyamp commented Apr 13, 2023

merged manually (cc812e9)

@jcgruenhage jcgruenhage deleted the cargo-auditable-revbumps branch April 14, 2023 07:06
zen0bit pushed a commit to oSoWoSo/VUR that referenced this pull request Apr 15, 2023
Sapein pushed a commit to Sapein/void-packages that referenced this pull request Apr 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants