Commit 8d7250af744a63b11ddd388b1e638cb124acebd5 - rust-libslirp

ttrpc - apply patch to support nix 0.26 Peter Michael Green 1 year, 4 months ago

6 changed file(s) with 68 addition(s) and 28 deletion(s). Raw diff Collapse all Expand all

-0

src/ttrpc/debian/changelog less more

	0	rust-ttrpc (0.5.2-3) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
	1
	2	* Team upload.
	3	* Package ttrpc 0.5.2 from crates.io using debcargo 2.6.0
	4	* Apply upstream patch to support nix 0.26, and adjust depdencies accordingly.
	5
	6	-- Peter Michael Green <plugwash@debian.org> Sat, 10 Dec 2022 13:56:51 +0000
	7
0	8	rust-ttrpc (0.5.2-2) unstable; urgency=medium
1	9
2	10	* Package ttrpc 0.5.2 from crates.io using debcargo 2.5.0

-1

src/ttrpc/debian/copyright less more

8	8
9	9	Files: debian/*
10	10	Copyright:
11		2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
	11	2021-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
12	12	2021 Shengjing Zhu <zhsj@debian.org>
13	13	License: Apache-2.0
14	14

+18

-18

src/ttrpc/debian/copyright.debcargo.hint less more

11	11	be correct information so you should review and fix this before uploading to
12	12	the archive.
13	13
14		Files: ./src/asynchronous/client.rs
	14	Files: src/asynchronous/client.rs
15	15	Copyright: 2020 Ant Financial
16	16	License: UNKNOWN-LICENSE; FIXME (overlay)
17	17	Comment:
18	18	FIXME (overlay): These notices are extracted from files. Please review them
19	19	before uploading to the archive.
20	20
21		Files: ./src/asynchronous/mod.rs
	21	Files: src/asynchronous/mod.rs
22	22	Copyright: 2020 Ant Financial
23	23	License: UNKNOWN-LICENSE; FIXME (overlay)
24	24	Comment:
25	25	FIXME (overlay): These notices are extracted from files. Please review them
26	26	before uploading to the archive.
27	27
28		Files: ./src/asynchronous/server.rs
	28	Files: src/asynchronous/server.rs
29	29	Copyright: 2020 Ant Financial
30	30	License: UNKNOWN-LICENSE; FIXME (overlay)
31	31	Comment:
32	32	FIXME (overlay): These notices are extracted from files. Please review them
33	33	before uploading to the archive.
34	34
35		Files: ./src/asynchronous/stream.rs
	35	Files: src/asynchronous/stream.rs
36	36	Copyright: 2020 Ant Financial
37	37	License: UNKNOWN-LICENSE; FIXME (overlay)
38	38	Comment:
39	39	FIXME (overlay): These notices are extracted from files. Please review them
40	40	before uploading to the archive.
41	41
42		Files: ./src/asynchronous/unix_incoming.rs
	42	Files: src/asynchronous/unix_incoming.rs
43	43	Copyright: 2021 Ant Group
44	44	License: UNKNOWN-LICENSE; FIXME (overlay)
45	45	Comment:
46	46	FIXME (overlay): These notices are extracted from files. Please review them
47	47	before uploading to the archive.
48	48
49		Files: ./src/asynchronous/utils.rs
	49	Files: src/asynchronous/utils.rs
50	50	Copyright: 2020 Ant Financial
51	51	License: UNKNOWN-LICENSE; FIXME (overlay)
52	52	Comment:
53	53	FIXME (overlay): These notices are extracted from files. Please review them
54	54	before uploading to the archive.
55	55
56		Files: ./src/common.rs
	56	Files: src/common.rs
57	57	Copyright: 2020 Ant Financial
58	58	License: UNKNOWN-LICENSE; FIXME (overlay)
59	59	Comment:
60	60	FIXME (overlay): These notices are extracted from files. Please review them
61	61	before uploading to the archive.
62	62
63		Files: ./src/context.rs
	63	Files: src/context.rs
64	64	Copyright: 2021 Ant group
65	65	License: UNKNOWN-LICENSE; FIXME (overlay)
66	66	Comment:
67	67	FIXME (overlay): These notices are extracted from files. Please review them
68	68	before uploading to the archive.
69	69
70		Files: ./src/error.rs
	70	Files: src/error.rs
71	71	Copyright: 2019 Ant Financial
72	72	License: UNKNOWN-LICENSE; FIXME (overlay)
73	73	Comment:
74	74	FIXME (overlay): These notices are extracted from files. Please review them
75	75	before uploading to the archive.
76	76
77		Files: ./src/lib.rs
	77	Files: src/lib.rs
78	78	Copyright: 2019 Ant Financial
79	79	License: UNKNOWN-LICENSE; FIXME (overlay)
80	80	Comment:
81	81	FIXME (overlay): These notices are extracted from files. Please review them
82	82	before uploading to the archive.
83	83
84		Files: ./src/sync/channel.rs
	84	Files: src/sync/channel.rs
85	85	Copyright: 2019 Ant Financial
86	86	License: UNKNOWN-LICENSE; FIXME (overlay)
87	87	Comment:
88	88	FIXME (overlay): These notices are extracted from files. Please review them
89	89	before uploading to the archive.
90	90
91		Files: ./src/sync/client.rs
	91	Files: src/sync/client.rs
92	92	Copyright: 2019 Ant Financial
93	93	License: UNKNOWN-LICENSE; FIXME (overlay)
94	94	Comment:
95	95	FIXME (overlay): These notices are extracted from files. Please review them
96	96	before uploading to the archive.
97	97
98		Files: ./src/sync/mod.rs
	98	Files: src/sync/mod.rs
99	99	Copyright: 2020 Ant Financial
100	100	License: UNKNOWN-LICENSE; FIXME (overlay)
101	101	Comment:
102	102	FIXME (overlay): These notices are extracted from files. Please review them
103	103	before uploading to the archive.
104	104
105		Files: ./src/sync/server.rs
	105	Files: src/sync/server.rs
106	106	Copyright: 2019 Ant Financial
107	107	License: UNKNOWN-LICENSE; FIXME (overlay)
108	108	Comment:
109	109	FIXME (overlay): These notices are extracted from files. Please review them
110	110	before uploading to the archive.
111	111
112		Files: ./src/sync/utils.rs
	112	Files: src/sync/utils.rs
113	113	Copyright: 2020 Ant Financial
114	114	License: UNKNOWN-LICENSE; FIXME (overlay)
115	115	Comment:
116	116	FIXME (overlay): These notices are extracted from files. Please review them
117	117	before uploading to the archive.
118	118
119		Files: ./src/ttrpc.proto
	119	Files: src/ttrpc.proto
120	120	Copyright: 2019 Ant Financial
121	121	License: UNKNOWN-LICENSE; FIXME (overlay)
122	122	Comment:

125	125
126	126	Files: debian/*
127	127	Copyright:
128		2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
129		2021 Shengjing Zhu <zhsj@debian.org>
	128	2021-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
	129	2021-2022 Shengjing Zhu <zhsj@debian.org>
130	130	License: Apache-2.0
131	131
132	132	License: Apache-2.0

+40

-0

src/ttrpc/debian/patches/nix.diff less more

	0	Nix 0.22 merged the "Error" and "Errno" types and deprecated the conversion
	1	operations between them. Nix 0.26 removed the deprecated stuff. The code
	2	changes to deal with this were taken from the upstream commit described below,
	3	the precise dependency changes are local to Debian.
	4
	5	commit 0e6b1a8651e7ff6a3c709b35587b7020b21c9f54
	6	Author: James O. D. Hunt <james.o.hunt@intel.com>
	7	Date: Thu Nov 25 14:20:46 2021 +0000
	8
	9	cargo: Update nix crate
	10
	11	Updated the `nix` crate to the latest version as this allows `errno`
	12	handling to be simplified.
	13
	14	Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
	15
	16	--- a/Cargo.toml
	17	+++ b/Cargo.toml
	18	@@ -44,7 +44,7 @@
	19	version = "0.4"
	20
	21	[dependencies.nix]
	22	-version = "0.20.2"
	23	+version = ">= 0.22, < 1.0"
	24
	25	[dependencies.protobuf]
	26	version = "2.0"
	27	--- a/src/sync/channel.rs
	28	+++ b/src/sync/channel.rs
	29	@@ -22,8 +22,8 @@ use crate::ttrpc::Code;
	30	use crate::MessageHeader;
	31
	32	fn retryable(e: nix::Error) -> bool {
	33	- use ::nix::{errno::Errno, Error};
	34	- e == Error::from_errno(Errno::EINTR) \|\| e == Error::from_errno(Errno::EAGAIN)
	35	+ use ::nix::Error;
	36	+ e == Error::EINTR \|\| e == Error::EAGAIN
	37	}
	38
	39	fn read_count(fd: RawFd, count: usize) -> Result<Vec<u8>> {

-9

src/ttrpc/debian/patches/relax-dep.diff less more

15	15
16	16	[dependencies.futures]
17	17	version = "0.3"
18		@@ -44,7 +44,7 @@
19		version = "0.4"
20
21		[dependencies.nix]
22		-version = "0.20.2"
23		+version = ">=0.20.2"
24
25		[dependencies.protobuf]
26		version = "2.0"
27	18	@@ -56,7 +56,7 @@
28	19	version = "1"
29	20	features = ["rt", "sync", "io-util", "macros", "time"]

-0

src/ttrpc/debian/patches/series less more

0	0	reduce-features.diff
1	1	relax-dep.diff
	2	nix.diff