]> git.proxmox.com Git - debcargo-conf.git/commitdiff
update sequoia-openpgp to version 1.17.0 and it's dependencies
authorAlexander Kjäll <alexander.kjall@gmail.com>
Sat, 11 Nov 2023 09:25:53 +0000 (10:25 +0100)
committerFabian Grünbichler <f.gruenbichler@proxmox.com>
Wed, 24 Jul 2024 13:52:38 +0000 (15:52 +0200)
(cherry picked from commit b9b07f74704faaf7353f7aa6cf3dc0d33117ab22)

src/sha1collisiondetection/debian/RFS [new file with mode: 0644]
src/sha1collisiondetection/debian/changelog
src/sha1collisiondetection/debian/copyright.debcargo.hint
src/sha1collisiondetection/debian/debcargo.toml
src/sha1collisiondetection/debian/patches/bump-hex-literal.patch [new file with mode: 0644]
src/sha1collisiondetection/debian/patches/drop-digest-trait.diff [deleted file]
src/sha1collisiondetection/debian/patches/relax-dep.diff [deleted file]
src/sha1collisiondetection/debian/patches/series

diff --git a/src/sha1collisiondetection/debian/RFS b/src/sha1collisiondetection/debian/RFS
new file mode 100644 (file)
index 0000000..e4ee9e7
--- /dev/null
@@ -0,0 +1 @@
+Can be uploaded after embedded-io clears new. Changeset/buildorder: capnp, capnp-futures, capnp-rpc, sha1collisiondetection, rpassword, sequoia-openpgp, sequoia-ipc
index 8be12cfe4b4639684237123f2086541f59076e08..753bbaf06df696fb8527095a54c54907eaef0a2e 100644 (file)
@@ -1,3 +1,10 @@
+rust-sha1collisiondetection (0.3.2-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package sha1collisiondetection 0.3.2 from crates.io using debcargo 2.6.0
+
+ -- Alexander Kjäll <alexander.kjall@gmail.com>  Fri, 10 Nov 2023 18:56:02 +0100
+
 rust-sha1collisiondetection (0.2.7-1) unstable; urgency=medium
 
   * Team upload.
index 7d7f8768c0f69c2c7faa471e0516494b8d545248..5cab06eca9c9d793753fff0e6c2d83d12ecd3818 100644 (file)
@@ -25,27 +25,6 @@ Comment:
  FIXME (overlay): These notices are extracted from files. Please review them
  before uploading to the archive.
 
-Files: Makefile
-Copyright: 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow (danshu@microsoft.com)
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: lib/sha1.c
-Copyright: 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow (danshu@microsoft.com)
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: lib/sha1.h
-Copyright: 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow <danshu@microsoft.com>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
 Files: lib/sha1.rs
 Copyright: 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow <danshu@microsoft.com>
 License: UNKNOWN-LICENSE; FIXME (overlay)
@@ -53,20 +32,6 @@ Comment:
  FIXME (overlay): These notices are extracted from files. Please review them
  before uploading to the archive.
 
-Files: lib/ubc_check.c
-Copyright: 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow <danshu@microsoft.com>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: lib/ubc_check.h
-Copyright: 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow <danshu@microsoft.com>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
 Files: lib/ubc_check.rs
 Copyright: 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow <danshu@microsoft.com>
 License: UNKNOWN-LICENSE; FIXME (overlay)
@@ -74,13 +39,6 @@ Comment:
  FIXME (overlay): These notices are extracted from files. Please review them
  before uploading to the archive.
 
-Files: src/main.c
-Copyright: 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow <danshu@microsoft.com>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
 Files: debian/*
 Copyright:
  2020-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
index 7d055c4fec486068e2a8b9580298d49193e77295..ef30e9b695a1218f7b96b3ef6aecca588332aac4 100644 (file)
@@ -6,6 +6,11 @@ uploaders = ["Daniel Kahn Gillmor <dkg@fifthhorseman.net>"]
 # the different source code files.
 whitelist = ["lib/sha1.c","lib/ubc_check.c", "src/main.c"]
 bin_name = "sha1cdsum"
+collapse_features = true
+
+[packages."lib+clap_mangen"]
+test_is_broken = true
+
 [packages.bin]
 section = "utils"
 summary = "Calculate SHA1 checksums with collision detection"
diff --git a/src/sha1collisiondetection/debian/patches/bump-hex-literal.patch b/src/sha1collisiondetection/debian/patches/bump-hex-literal.patch
new file mode 100644 (file)
index 0000000..bee98be
--- /dev/null
@@ -0,0 +1,15 @@
+As 0.4 is the version packaged in Debian
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 4050cf2..796e519 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -89,7 +89,7 @@ version = ">= 0.12, < 0.15"
+ version = "0.2"
+ [dev-dependencies.hex-literal]
+-version = "0.3"
++version = "0.4"
+ [dev-dependencies.sha1]
+ version = "0.10"
diff --git a/src/sha1collisiondetection/debian/patches/drop-digest-trait.diff b/src/sha1collisiondetection/debian/patches/drop-digest-trait.diff
deleted file mode 100644 (file)
index f5397c0..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-Avoid the optional digest feature for now.
-
-We just want to build the binary sha1cdsum and ship the standard
-sha1collisiondetection crate, and shipping the digest-trait feature
-would require an upgrade of a large number of rust-crypto packages.
-Once those updates are done, then we can add the digest-trait feature
-back.
-
-Also, the structopt "feature" is really just a build-dependency for
-the sha1cdsum binary, so we don't want it as an additional feature.
-
-debcargo doesn't seem to have a way to represent this cleanly
-(#977491) so we'll just treat it as non-optional for now.
-
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -29,22 +29,14 @@
- [[bin]]
- name = "sha1cdsum"
- path = "src/main.rs"
--required-features = ["std", "structopt"]
--[dependencies.digest]
--version = "0.9"
--optional = true
-+required-features = ["std"]
- [dependencies.generic-array]
- version = ">= 0.12, < 0.15"
--[dependencies.sha-1]
--version = "0.9"
--optional = true
--
- [dependencies.structopt]
- version = "0.3"
--optional = true
--default-features = false
-+
- [dev-dependencies.getrandom]
- version = "0.2"
-@@ -52,9 +44,9 @@
- version = "0.3"
- [features]
--default = ["std", "digest-trait", "structopt"]
--digest-trait = ["digest", "sha-1"]
--std = ["digest/std"]
-+default = ["std"]
-+std = []
-+
- [badges.gitlab]
- repository = "sequoia-pgp/sha1collisiondetection"
diff --git a/src/sha1collisiondetection/debian/patches/relax-dep.diff b/src/sha1collisiondetection/debian/patches/relax-dep.diff
deleted file mode 100644 (file)
index 1aeafa8..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: sha1collisiondetection/Cargo.toml
-===================================================================
---- sha1collisiondetection.orig/Cargo.toml
-+++ sha1collisiondetection/Cargo.toml
-@@ -41,7 +41,7 @@ version = "0.3"
- version = "0.2"
- [dev-dependencies.hex-literal]
--version = "0.3"
-+version = "0.4"
- [features]
- default = ["std"]
index 244b33cd9aee9f11a9c2fa0eca22acacda342391..48041a3d22975b2e896e07a5cfc35b38ea18f1c0 100644 (file)
@@ -1,2 +1 @@
-drop-digest-trait.diff
-relax-dep.diff
+bump-hex-literal.patch