Commit d720db1620851e1627cb7a0e50386d90d36cfd58 - rust-libslirp

+1

-0

TODO.rst less more

84	84	These packages (RFS) are prepared in the master branch and can be uploaded
85	85	because all required dependencies are available in main::
86	86
	87	yaml (rebuild, fix arch-dependent build failures)
87	88	sniffglue (update, bugfix - need better changelog)
88	89	encoding-rs (update)
89	90	cmake (update)

+6

-0

src/yaml/debian/changelog less more

	0	rust-yaml (0.3.0-2) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
	1
	2	* Package yaml 0.3.0 from crates.io using debcargo 2.2.9
	3
	4	-- Wolfgang Silbermayr <wolfgang@silbermayr.at> Sat, 8 Dec 2018 09:58:42 +0100
	5
0	6	rust-yaml (0.3.0-1) unstable; urgency=medium
1	7
2	8	* Package yaml 0.3.0 from crates.io using debcargo 2.2.6

+1

-0

src/yaml/debian/copyright less more

10	10	Copyright:
11	11	2018 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
12	12	2018 kpcyrd <git@rxv.cc>
	13	2018 Wolfgang Silbermayr <wolfgang@silbermayr.at>
13	14	License: MIT
14	15
15	16	License: MIT

+2

-1

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

21	21	Files: debian/*
22	22	Copyright:
23	23	2018 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
24		2018 FIXME (overlay) Your Name <Your Email>
	24	2018 kpcyrd <git@rxv.cc>
	25	2018 Wolfgang Silbermayr <wolfgang@silbermayr.at>
25	26	License: MIT
26	27
27	28	License: MIT

+4

-0

src/yaml/debian/debcargo.toml less more

0	0	overlay = "."
	1	uploaders = [
	2	"kpcyrd <git@rxv.cc>",
	3	"Wolfgang Silbermayr <wolfgang@silbermayr.at>",
	4	]
1	5
2	6	[packages.lib]
3	7	depends = ["libyaml-dev"]

+32

-0

src/yaml/debian/patches/0001-Allow-version-0.2.x-in-tests.patch less more

	0	From 7b49b600cb4b26169b0f95d28482e76e054eeb04 Mon Sep 17 00:00:00 2001
	1	From: Wolfgang Silbermayr <wolfgang@silbermayr.at>
	2	Date: Sat, 8 Dec 2018 09:37:08 +0100
	3	Subject: [PATCH 1/2] Allow version 0.2.x in tests
	4
	5	---
	6	src/lib.rs \| 4 ++--
	7	1 file changed, 2 insertions(+), 2 deletions(-)
	8
	9	diff --git a/src/lib.rs b/src/lib.rs
	10	index a166caf..2dc6df8 100644
	11	--- a/src/lib.rs
	12	+++ b/src/lib.rs
	13	@@ -81,13 +81,13 @@ mod test {
	14	#[test]
	15	fn test_version_string() {
	16	let vsn = super::version_string();
	17	- assert!("0.1.4".to_string() <= vsn && vsn < "0.2".to_string())
	18	+ assert!("0.1.4".to_string() <= vsn && vsn < "0.3".to_string())
	19	}
	20
	21	#[test]
	22	fn test_version() {
	23	let vsn = super::version();
	24	- assert!((0, 1, 4) <= vsn && vsn < (0, 2, 0))
	25	+ assert!((0, 1, 4) <= vsn && vsn < (0, 3, 0))
	26	}
	27
	28	#[test]
	29	--
	30	2.20.0.rc2
	31

+36

-0

src/yaml/debian/patches/0002-Use-c_char-instead-of-i8-for-ffi.patch less more

	0	From e5261398fcb4cd3406d727973486d0178130825a Mon Sep 17 00:00:00 2001
	1	From: Wolfgang Silbermayr <wolfgang@silbermayr.at>
	2	Date: Sat, 8 Dec 2018 09:39:56 +0100
	3	Subject: [PATCH 2/2] Use c_char instead of i8 for ffi
	4
	5	This allows the project to build on architectures which define c_char as u8.
	6	Fixes build problems in architectures provided by debian.
	7	---
	8	src/codecs.rs \| 5 +++--
	9	1 file changed, 3 insertions(+), 2 deletions(-)
	10
	11	diff --git a/src/codecs.rs b/src/codecs.rs
	12	index b28f835..749e7a2 100644
	13	--- a/src/codecs.rs
	14	+++ b/src/codecs.rs
	15	@@ -6,14 +6,15 @@ use std::slice;
	16	use std::str;
	17	use std::ptr;
	18	use std::ffi::CStr;
	19	+use std::os::raw::c_char;
	20
	21	pub fn decode_c_str(c_str: *const ffi::yaml_char_t) -> Option<String> {
	22	if c_str == ptr::null() {
	23	None
	24	} else {
	25	unsafe {
	26	- let i8_str = c_str as *const i8;
	27	- str::from_utf8(CStr::from_ptr(i8_str).to_bytes()).map(\|s\| s.to_string()).ok()
	28	+ let c_char_str = c_str as *const c_char;
	29	+ str::from_utf8(CStr::from_ptr(c_char_str).to_bytes()).map(\|s\| s.to_string()).ok()
	30	}
	31	}
	32	}
	33	--
	34	2.20.0.rc2
	35

+2

-0

src/yaml/debian/patches/series less more

	0	0001-Allow-version-0.2.x-in-tests.patch
	1	0002-Use-c_char-instead-of-i8-for-ffi.patch