[Pkg-rust-maintainers] Bug#1116057: rustup - update for new pulldown-cmark
Peter Green
plugwash at debian.org
Tue Sep 23 17:34:24 BST 2025
Package: rustup
I hope to update rust-pulldown-cmark soon. I have applied the upstream
commits upgrading pulldown-cmark to the version of rustup in Debian
and they build fine.
Debdiff is attatched, I intend to team upload this when I update
pulldown-cmark.
-------------- next part --------------
diff -Nru rustup-1.27.1/debian/changelog rustup-1.27.1/debian/changelog
--- rustup-1.27.1/debian/changelog 2025-08-11 03:16:33.000000000 +0000
+++ rustup-1.27.1/debian/changelog 2025-09-23 13:52:52.000000000 +0000
@@ -1,3 +1,10 @@
+rustup (1.27.1-5) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Add upstream patches for newer versions of pulldown-cmark.
+
+ -- Peter Michael Green <plugwash at debian.org> Tue, 23 Sep 2025 13:52:52 +0000
+
rustup (1.27.1-4) unstable; urgency=medium
* Team upload.
diff -Nru rustup-1.27.1/debian/control rustup-1.27.1/debian/control
--- rustup-1.27.1/debian/control 2025-08-11 03:16:16.000000000 +0000
+++ rustup-1.27.1/debian/control 2025-09-23 13:52:52.000000000 +0000
@@ -25,7 +25,7 @@
librust-libc-0.2+default-dev,
librust-once-cell-1+default-dev (>= 1.18.0-~~),
librust-opener-0.6+default-dev,
- librust-pulldown-cmark-0.10-dev,
+ librust-pulldown-cmark-0.13-dev,
librust-rand-0.8+default-dev,
librust-regex-1+default-dev,
librust-remove-dir-all-0.8+default-dev (>= 0.8.1-~~),
@@ -93,7 +93,7 @@
librust-opener-0.6+default-dev,
librust-openssl-0.10+default-dev,
librust-openssl-sys-0.9+default-dev,
- librust-pulldown-cmark-0.10-dev,
+ librust-pulldown-cmark-013--dev,
librust-rand-0.8+default-dev,
librust-regex-1+default-dev,
librust-remove-dir-all-0.8+default-dev (>= 0.8.1-~~),
diff -Nru rustup-1.27.1/debian/patches/0022-pulldown-cmark-0.11.patch rustup-1.27.1/debian/patches/0022-pulldown-cmark-0.11.patch
--- rustup-1.27.1/debian/patches/0022-pulldown-cmark-0.11.patch 1970-01-01 00:00:00.000000000 +0000
+++ rustup-1.27.1/debian/patches/0022-pulldown-cmark-0.11.patch 2025-09-23 13:52:52.000000000 +0000
@@ -0,0 +1,40 @@
+This patch is based on the upstream commit described below, adapted for use
+in the Debian package by Peter Michael Green.
+
+commit d84c9074d9e03e643e7617dab547527de2fb00fb
+Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
+Date: Thu May 16 13:20:30 2024 +0000
+
+ fix(deps): update rust crate pulldown-cmark to 0.11
+
+ Co-authored-by: rami3l <rami3l at outlook.com>
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 7875d195..d7a67bca 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -70,1 +70,1 @@
+-pulldown-cmark = { version = "0.10", default-features = false }
++pulldown-cmark = { version = "0.11", default-features = false }
+diff --git a/src/cli/markdown.rs b/src/cli/markdown.rs
+index 67a705c4..b9e3ec58 100644
+--- a/src/cli/markdown.rs
++++ b/src/cli/markdown.rs
+@@ -131,7 +131,7 @@ impl<'a> LineFormatter<'a> {
+ Tag::TableHead => {}
+ Tag::TableRow => {}
+ Tag::TableCell => {}
+- Tag::BlockQuote => {}
++ Tag::BlockQuote(_) => {}
+ Tag::CodeBlock(_) | Tag::HtmlBlock { .. } => {
+ self.wrapper.write_line();
+ self.wrapper.indent += 2;
+@@ -219,6 +219,8 @@ impl<'a> LineFormatter<'a> {
+ TaskListMarker(true) => {}
+ TaskListMarker(false) => {}
+ InlineHtml(_) => {}
++ InlineMath(_) => {}
++ DisplayMath(_) => {}
+ }
+ }
+ }
diff -Nru rustup-1.27.1/debian/patches/0023-pulldown-cmark-0.12.patch rustup-1.27.1/debian/patches/0023-pulldown-cmark-0.12.patch
--- rustup-1.27.1/debian/patches/0023-pulldown-cmark-0.12.patch 1970-01-01 00:00:00.000000000 +0000
+++ rustup-1.27.1/debian/patches/0023-pulldown-cmark-0.12.patch 2025-09-23 13:52:52.000000000 +0000
@@ -0,0 +1,46 @@
+This patch is based on the upstream commit described below, adapted for use in
+the Debian package by Peter Michael Green.
+
+commit d68bbc42d755597006a4faf3c4aca5d8788adc2f
+Author: Dirkjan Ochtman <dirkjan at ochtman.nl>
+Date: Mon Aug 19 17:31:09 2024 +0200
+
+ Upgrade pulldown-cmark to 0.12
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 44687063..973c7289 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -65,1 +65,1 @@
+-pulldown-cmark = { version = "0.11", default-features = false }
++pulldown-cmark = { version = "0.12", default-features = false }
+diff --git a/src/cli/markdown.rs b/src/cli/markdown.rs
+index cd2b8ee5..6f107c98 100644
+--- a/src/cli/markdown.rs
++++ b/src/cli/markdown.rs
+@@ -132,6 +132,11 @@ impl<'a> LineFormatter<'a> {
+ Tag::TableRow => {}
+ Tag::TableCell => {}
+ Tag::BlockQuote(_) => {}
++ Tag::DefinitionList => {
++ self.wrapper.write_line();
++ self.wrapper.indent += 2;
++ }
++ Tag::DefinitionListTitle | Tag::DefinitionListDefinition => {}
+ Tag::CodeBlock(_) | Tag::HtmlBlock { .. } => {
+ self.wrapper.write_line();
+ self.wrapper.indent += 2;
+@@ -168,7 +173,12 @@ impl<'a> LineFormatter<'a> {
+ TagEnd::TableHead => {}
+ TagEnd::TableRow => {}
+ TagEnd::TableCell => {}
+- TagEnd::BlockQuote => {}
++ TagEnd::BlockQuote(_) => {}
++ TagEnd::DefinitionList => {
++ self.wrapper.indent -= 2;
++ self.wrapper.write_line();
++ }
++ TagEnd::DefinitionListTitle | TagEnd::DefinitionListDefinition => {}
+ TagEnd::CodeBlock | TagEnd::HtmlBlock => {
+ self.is_code_block = false;
+ self.wrapper.indent -= 2;
diff -Nru rustup-1.27.1/debian/patches/0024-pulldown-cmark-0.13.patch rustup-1.27.1/debian/patches/0024-pulldown-cmark-0.13.patch
--- rustup-1.27.1/debian/patches/0024-pulldown-cmark-0.13.patch 1970-01-01 00:00:00.000000000 +0000
+++ rustup-1.27.1/debian/patches/0024-pulldown-cmark-0.13.patch 2025-09-23 13:52:52.000000000 +0000
@@ -0,0 +1,38 @@
+This patch is based on the upstream commit descibed below, adapted for use
+in the Debian package by Peter Michael Green.
+
+commit 0851758bb2e7134d48b54a52f658aaccadb59de1
+Author: rami3l <rami3l at outlook.com>
+Date: Mon Feb 17 10:11:08 2025 +0800
+
+ fix(deps): update rust crate pulldown-cmark to 0.13
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 93f5dbb8..6bdb354e 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -59,1 +59,1 @@
+-pulldown-cmark = { version = "0.12", default-features = false }
++pulldown-cmark = { version = "0.13", default-features = false }
+diff --git a/src/cli/markdown.rs b/src/cli/markdown.rs
+index 6f107c98..696cd708 100644
+--- a/src/cli/markdown.rs
++++ b/src/cli/markdown.rs
+@@ -157,6 +157,8 @@ impl<'a> LineFormatter<'a> {
+ Tag::Link { .. } => {}
+ Tag::Image { .. } => {}
+ Tag::FootnoteDefinition(_name) => {}
++ Tag::Superscript => {}
++ Tag::Subscript => {}
+ }
+ }
+
+@@ -197,6 +199,8 @@ impl<'a> LineFormatter<'a> {
+ TagEnd::Image { .. } => {} // shouldn't happen, handled in start
+ TagEnd::FootnoteDefinition => {}
+ TagEnd::MetadataBlock(_) => {}
++ TagEnd::Superscript => {}
++ TagEnd::Subscript => {}
+ }
+ }
+
diff -Nru rustup-1.27.1/debian/patches/series rustup-1.27.1/debian/patches/series
--- rustup-1.27.1/debian/patches/series 2025-08-11 03:15:42.000000000 +0000
+++ rustup-1.27.1/debian/patches/series 2025-09-23 13:52:52.000000000 +0000
@@ -9,3 +9,6 @@
0015-relax-openssl.patch
0020-disable-network-tests.patch
0021-add-ppc64el-and-s390x-to-tests.patch
+0022-pulldown-cmark-0.11.patch
+0023-pulldown-cmark-0.12.patch
+0024-pulldown-cmark-0.13.patch
More information about the Pkg-rust-maintainers
mailing list