rpms
/
rust-nix
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 0.13.0

Browse Source 
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
epel9
Igor Gnatenko 6 years ago
parent 2772ade3a8
commit 344525d97e
No known key found for this signature in database
GPG Key ID: 695714BD1BBC5F4C
6 changed files with 26 additions and 371 deletions
Show Stats Download Patch File Download Diff File

1
.gitignore vendored
Unescape View File

@ -1,3 +1,4 @@
/nix-0.9.0.crate /nix-0.9.0.crate
/nix-0.10.0.crate /nix-0.10.0.crate
/nix-0.11.0.crate /nix-0.11.0.crate
/nix-0.13.0.crate

340
0001-deps-update-tempfile-to-3.patch
Unescape View File

@ -1,340 +0,0 @@
From 9e1caa42e455e7d21e489a8099f37e690c260080 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Date: Thu, 10 May 2018 11:45:33 +0200
Subject: [PATCH] deps: update tempfile to 3
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
---
src/unistd.rs | 12 ++++++------
test/sys/test_socket.rs | 8 ++++----
test/sys/test_uio.rs | 9 ++++-----
test/test.rs | 1 -
test/test_fcntl.rs | 6 ++----
test/test_mount.rs | 19 +++++++------------
test/test_stat.rs | 12 ++++++------
test/test_unistd.rs | 11 ++++-------
8 files changed, 33 insertions(+), 45 deletions(-)
diff --git a/src/unistd.rs b/src/unistd.rs
index 8022aa0..756a4d6 100644
--- a/src/unistd.rs
+++ b/src/unistd.rs
@@ -421,15 +421,15 @@ pub fn fchdir(dirfd: RawFd) -> Result<()> {
/// # Example
///
/// ```rust
-/// extern crate tempdir;
+/// extern crate tempfile;
/// extern crate nix;
///
/// use nix::unistd;
/// use nix::sys::stat;
-/// use tempdir::TempDir;
+/// use tempfile::TempDir;
///
/// fn main() {
-/// let tmp_dir1 = TempDir::new("test_mkdir").unwrap();
+/// let tmp_dir1 = TempDir::new().unwrap();
/// let tmp_dir2 = tmp_dir1.path().join("new_dir");
///
/// // create new directory and give read, write and execute rights to the owner
@@ -464,15 +464,15 @@ pub fn mkdir<P: ?Sized + NixPath>(path: &P, mode: Mode) -> Result<()> {
/// # Example
///
/// ```rust
-/// extern crate tempdir;
+/// extern crate tempfile;
/// extern crate nix;
///
/// use nix::unistd;
/// use nix::sys::stat;
-/// use tempdir::TempDir;
+/// use tempfile::TempDir;
///
/// fn main() {
-/// let tmp_dir = TempDir::new("test_fifo").unwrap();
+/// let tmp_dir = TempDir::new().unwrap();
/// let fifo_path = tmp_dir.path().join("foo.pipe");
///
/// // create new fifo and give read, write and execute rights to the owner
diff --git a/test/sys/test_socket.rs b/test/sys/test_socket.rs
index 35e3bf9..d2a5268 100644
--- a/test/sys/test_socket.rs
+++ b/test/sys/test_socket.rs
@@ -90,9 +90,9 @@ pub fn test_abstract_uds_addr() {
pub fn test_getsockname() {
use nix::sys::socket::{socket, AddressFamily, SockType, SockFlag};
use nix::sys::socket::{bind, SockAddr};
- use tempdir::TempDir;
+ use tempfile;
- let tempdir = TempDir::new("test_getsockname").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let sockname = tempdir.path().join("sock");
let sock = socket(AddressFamily::Unix, SockType::Stream, SockFlag::empty(), None)
.expect("socket failed");
@@ -254,9 +254,9 @@ pub fn test_unixdomain() {
use nix::sys::socket::{bind, socket, connect, listen, accept, SockAddr};
use nix::unistd::{read, write, close};
use std::thread;
- use tempdir::TempDir;
+ use tempfile;
- let tempdir = TempDir::new("test_unixdomain").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let sockname = tempdir.path().join("sock");
let s1 = socket(AddressFamily::Unix, SockType::Stream,
SockFlag::empty(), None).expect("socket failed");
diff --git a/test/sys/test_uio.rs b/test/sys/test_uio.rs
index 9f56c81..cefc8bb 100644
--- a/test/sys/test_uio.rs
+++ b/test/sys/test_uio.rs
@@ -5,8 +5,7 @@ use std::{cmp, iter};
use std::fs::{OpenOptions};
use std::os::unix::io::AsRawFd;
-use tempdir::TempDir;
-use tempfile::tempfile;
+use tempfile::{self, tempfile};
#[test]
fn test_writev() {
@@ -114,7 +113,7 @@ fn test_pwrite() {
fn test_pread() {
use std::io::Write;
- let tempdir = TempDir::new("nix-test_pread").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let path = tempdir.path().join("pread_test_file");
let mut file = OpenOptions::new().write(true).read(true).create(true)
@@ -142,7 +141,7 @@ fn test_pwritev() {
IoVec::from_slice(&to_write[64..128]),
];
- let tempdir = TempDir::new("nix-test_pwritev").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
// pwritev them into a temporary file
let path = tempdir.path().join("pwritev_test_file");
@@ -166,7 +165,7 @@ fn test_preadv() {
let to_write: Vec<u8> = (0..200).collect();
let expected: Vec<u8> = (100..200).collect();
- let tempdir = TempDir::new("nix-test_preadv").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let path = tempdir.path().join("preadv_test_file");
diff --git a/test/test.rs b/test/test.rs
index 8083b8f..da55235 100644
--- a/test/test.rs
+++ b/test/test.rs
@@ -7,7 +7,6 @@ extern crate nix;
extern crate lazy_static;
extern crate libc;
extern crate rand;
-extern crate tempdir;
extern crate tempfile;
mod sys;
diff --git a/test/test_fcntl.rs b/test/test_fcntl.rs
index 57b3583..bcc523b 100644
--- a/test/test_fcntl.rs
+++ b/test/test_fcntl.rs
@@ -1,8 +1,7 @@
use nix::fcntl::{openat, open, OFlag, readlink, readlinkat};
use nix::sys::stat::Mode;
use nix::unistd::{close, read};
-use tempdir::TempDir;
-use tempfile::NamedTempFile;
+use tempfile::{self, NamedTempFile};
use std::io::prelude::*;
use std::os::unix::fs;
@@ -30,8 +29,7 @@ fn test_openat() {
#[test]
fn test_readlink() {
- let tempdir = TempDir::new("nix-test_readdir")
- .unwrap_or_else(|e| panic!("tempdir failed: {}", e));
+ let tempdir = tempfile::tempdir().unwrap();
let src = tempdir.path().join("a");
let dst = tempdir.path().join("b");
println!("a: {:?}, b: {:?}", &src, &dst);
diff --git a/test/test_mount.rs b/test/test_mount.rs
index 89416a4..2e4f19c 100644
--- a/test/test_mount.rs
+++ b/test/test_mount.rs
@@ -5,7 +5,7 @@
extern crate libc;
extern crate nix;
-extern crate tempdir;
+extern crate tempfile;
#[cfg(target_os = "linux")]
mod test_mount {
@@ -23,7 +23,7 @@ mod test_mount {
use nix::sys::stat::{self, Mode};
use nix::unistd::getuid;
- use tempdir::TempDir;
+ use tempfile;
static SCRIPT_CONTENTS: &'static [u8] = b"#!/bin/sh
exit 23";
@@ -32,8 +32,7 @@ exit 23";
const NONE: Option<&'static [u8]> = None;
pub fn test_mount_tmpfs_without_flags_allows_rwx() {
- let tempdir = TempDir::new("nix-test_mount")
- .unwrap_or_else(|e| panic!("tempdir failed: {}", e));
+ let tempdir = tempfile::tempdir().unwrap();
mount(NONE,
tempdir.path(),
@@ -89,8 +88,7 @@ exit 23";
}
pub fn test_mount_rdonly_disallows_write() {
- let tempdir = TempDir::new("nix-test_mount")
- .unwrap_or_else(|e| panic!("tempdir failed: {}", e));
+ let tempdir = tempfile::tempdir().unwrap();
mount(NONE,
tempdir.path(),
@@ -107,8 +105,7 @@ exit 23";
}
pub fn test_mount_noexec_disallows_exec() {
- let tempdir = TempDir::new("nix-test_mount")
- .unwrap_or_else(|e| panic!("tempdir failed: {}", e));
+ let tempdir = tempfile::tempdir().unwrap();
mount(NONE,
tempdir.path(),
@@ -146,13 +143,11 @@ exit 23";
}
pub fn test_mount_bind() {
- let tempdir = TempDir::new("nix-test_mount")
- .unwrap_or_else(|e| panic!("tempdir failed: {}", e));
+ let tempdir = tempfile::tempdir().unwrap();
let file_name = "test";
{
- let mount_point = TempDir::new("nix-test_mount")
- .unwrap_or_else(|e| panic!("tempdir failed: {}", e));
+ let mount_point = tempfile::tempdir().unwrap();
mount(Some(tempdir.path()),
mount_point.path(),
diff --git a/test/test_stat.rs b/test/test_stat.rs
index c042ce1..4135052 100644
--- a/test/test_stat.rs
+++ b/test/test_stat.rs
@@ -9,7 +9,7 @@ use nix::sys::stat::{self, fchmod, fchmodat, fstat, lstat, stat};
use nix::sys::stat::{FileStat, Mode, FchmodatFlags};
use nix::unistd::chdir;
use nix::Result;
-use tempdir::TempDir;
+use tempfile;
#[allow(unused_comparisons)]
// uid and gid are signed on Windows, but not on other platforms. This function
@@ -56,7 +56,7 @@ fn assert_lstat_results(stat_result: Result<FileStat>) {
#[test]
fn test_stat_and_fstat() {
- let tempdir = TempDir::new("nix-test_stat_and_fstat").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let filename = tempdir.path().join("foo.txt");
let file = File::create(&filename).unwrap();
@@ -69,7 +69,7 @@ fn test_stat_and_fstat() {
#[test]
fn test_fstatat() {
- let tempdir = TempDir::new("nix-test_fstatat").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let filename = tempdir.path().join("foo.txt");
File::create(&filename).unwrap();
let dirfd = fcntl::open(tempdir.path(),
@@ -84,7 +84,7 @@ fn test_fstatat() {
#[test]
fn test_stat_fstat_lstat() {
- let tempdir = TempDir::new("nix-test_stat_fstat_lstat").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let filename = tempdir.path().join("bar.txt");
let linkname = tempdir.path().join("barlink");
@@ -106,7 +106,7 @@ fn test_stat_fstat_lstat() {
#[test]
fn test_fchmod() {
- let tempdir = TempDir::new("nix-test_fchmod").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let filename = tempdir.path().join("foo.txt");
let file = File::create(&filename).unwrap();
@@ -128,7 +128,7 @@ fn test_fchmod() {
#[test]
fn test_fchmodat() {
- let tempdir = TempDir::new("nix-test_fchmodat").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let filename = "foo.txt";
let fullpath = tempdir.path().join(filename);
File::create(&fullpath).unwrap();
diff --git a/test/test_unistd.rs b/test/test_unistd.rs
index fe33b1d..d36a3d3 100644
--- a/test/test_unistd.rs
+++ b/test/test_unistd.rs
@@ -1,5 +1,3 @@
-extern crate tempdir;
-
use nix::fcntl::{fcntl, FcntlArg, FdFlag, OFlag};
use nix::unistd::*;
use nix::unistd::ForkResult::*;
@@ -11,8 +9,7 @@ use std::ffi::CString;
use std::fs::File;
use std::io::Write;
use std::os::unix::prelude::*;
-use tempfile::tempfile;
-use tempdir::TempDir;
+use tempfile::{self, tempfile};
use libc::{self, _exit, off_t};
#[test]
@@ -84,7 +81,7 @@ fn test_mkstemp_directory() {
#[test]
fn test_mkfifo() {
- let tempdir = TempDir::new("nix-test_mkfifo").unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
let mkfifo_fifo = tempdir.path().join("mkfifo_fifo");
mkfifo(&mkfifo_fifo, Mode::S_IRUSR).unwrap();
@@ -286,7 +283,7 @@ fn test_fchdir() {
#[allow(unused_variables)]
let m = ::CWD_MTX.lock().expect("Mutex got poisoned by another test");
- let tmpdir = TempDir::new("test_fchdir").unwrap();
+ let tmpdir = tempfile::tempdir().unwrap();
let tmpdir_path = tmpdir.path().canonicalize().unwrap();
let tmpdir_fd = File::open(&tmpdir_path).unwrap().into_raw_fd();
@@ -302,7 +299,7 @@ fn test_getcwd() {
#[allow(unused_variables)]
let m = ::CWD_MTX.lock().expect("Mutex got poisoned by another test");
- let tmpdir = TempDir::new("test_getcwd").unwrap();
+ let tmpdir = tempfile::tempdir().unwrap();
let tmpdir_path = tmpdir.path().canonicalize().unwrap();
assert!(chdir(&tmpdir_path).is_ok());
assert_eq!(getcwd().unwrap(), tmpdir_path);
--
2.18.0

23
nix-fix-metadata.diff
Unescape View File

@ -1,25 +1,10 @@
--- nix-0.11.0/Cargo.toml 1970-01-01T01:00:00+01:00 --- nix-0.13.0/Cargo.toml 1970-01-01T01:00:00+01:00
+++ nix-0.11.0/Cargo.toml 2018-11-02T19:58:10.895037+01:00 +++ nix-0.13.0/Cargo.toml 2019-02-04T09:59:32.626418+01:00
@@ -14,7 +14,7 @@ @@ -62,7 +62,3 @@
name = "nix"
version = "0.11.0"
authors = ["The nix-rust Project Developers"]
-exclude = [".gitignore", ".travis.yml"]
+exclude = ["/.gitignore", "/.travis.yml", "/ci/*", "/Cross.toml", "/RELEASE_PROCEDURE.md", "/bors.toml"]
description = "Rust friendly bindings to *nix APIs"
categories = ["os::unix-apis"]
license = "MIT"
@@ -60,12 +60,5 @@
[dev-dependencies.rand]
version = "0.4"
-[dev-dependencies.tempdir]
-version = "0.3"
-
[dev-dependencies.tempfile] [dev-dependencies.tempfile]
-version = "2" version = "3"
-[target."cfg(target_os = \"dragonfly\")".build-dependencies.cc] -[target."cfg(target_os = \"dragonfly\")".build-dependencies.cc]
-version = "1" -version = "1"
-[target."cfg(target_os = \"freebsd\")".dev-dependencies.sysctl] -[target."cfg(target_os = \"freebsd\")".dev-dependencies.sysctl]
-version = "0.1" -version = "0.1"
+version = "3"

18
rust-nix.spec
Unescape View File

@ -5,32 +5,28 @@
%global crate nix %global crate nix
Name: rust-%{crate} Name: rust-%{crate}
Version: 0.11.0 Version: 0.13.0
Release: 5%{?dist} Release: 1%{?dist}
Summary: Rust friendly bindings to *nix APIs Summary: Rust friendly bindings to *nix APIs
License: MIT License: MIT
URL: https://crates.io/crates/nix URL: https://crates.io/crates/nix
Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate Source: %{crates_source}
# Initial patched metadata # Initial patched metadata
# * No dragonfly/freebsd # * No dragonfly/freebsd
# * Bump tempfile to 3, https://github.com/nix-rust/nix/pull/900
# * Exclude CI files, https://github.com/nix-rust/nix/pull/962
Patch0: nix-fix-metadata.diff Patch0: nix-fix-metadata.diff
# Make it work with new tempdir
Patch0001: 0001-deps-update-tempfile-to-3.patch
ExclusiveArch: %{rust_arches} ExclusiveArch: %{rust_arches}
BuildRequires: rust-packaging BuildRequires: rust-packaging
BuildRequires: (crate(bitflags/default) >= 1.0.0 with crate(bitflags/default) < 2.0.0) BuildRequires: (crate(bitflags/default) >= 1.0.0 with crate(bitflags/default) < 2.0.0)
BuildRequires: (crate(cfg-if/default) >= 0.1.0 with crate(cfg-if/default) < 0.2.0) BuildRequires: (crate(cfg-if/default) >= 0.1.0 with crate(cfg-if/default) < 0.2.0)
BuildRequires: (crate(libc/default) >= 0.2.42 with crate(libc/default) < 0.3.0) BuildRequires: (crate(libc/default) >= 0.2.47 with crate(libc/default) < 0.3.0)
BuildRequires: (crate(void/default) >= 1.0.2 with crate(void/default) < 2.0.0) BuildRequires: (crate(void/default) >= 1.0.2 with crate(void/default) < 2.0.0)
%if %{with check} %if %{with check}
BuildRequires: (crate(bytes/default) >= 0.4.8 with crate(bytes/default) < 0.5.0) BuildRequires: (crate(bytes/default) >= 0.4.8 with crate(bytes/default) < 0.5.0)
BuildRequires: (crate(lazy_static/default) >= 1.0.0 with crate(lazy_static/default) < 2.0.0) BuildRequires: (crate(lazy_static/default) >= 1.2.0 with crate(lazy_static/default) < 2.0.0)
BuildRequires: (crate(rand/default) >= 0.4.0 with crate(rand/default) < 0.5.0) BuildRequires: (crate(rand/default) >= 0.5.0 with crate(rand/default) < 0.6.0)
BuildRequires: (crate(tempfile/default) >= 3.0.0 with crate(tempfile/default) < 4.0.0) BuildRequires: (crate(tempfile/default) >= 3.0.0 with crate(tempfile/default) < 4.0.0)
%endif %endif
@ -66,7 +62,7 @@ which use "default" feature of "%{crate}" crate.
%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
%prep %prep
%autosetup -n %{crate}-%{version} -p1 %autosetup -n %{crate}-%{version_no_tilde} -p1
%cargo_prep %cargo_prep
%build %build

2
sources
Unescape View File

@ -1 +1 @@
SHA512 (nix-0.11.0.crate) = bb3ffc5ae6a8de37a96e9951e182c2916016678265a3c4efdee2ca4d26bc5f4192f4facabeac2978788143d2707094dc0517c13b08833cc1ddcdb6fc1125c874 SHA512 (nix-0.13.0.crate) = 6345871b599ea0c4482248d0ff98953e4976d5af85d596d8a1ef739c661e54734f1379f3a6c41162a9e2b8eff1d9dd9a9e3fdef6928ba21eb855bd369a278752

13
tests/tests.yml
Unescape View File

@ -0,0 +1,13 @@
---
- hosts: localhost
roles:
- role: standard-test-basic
tags:
- classic
repositories:
- repo: "https://src.fedoraproject.org/tests/rust.git"
dest: rust
tests:
- rust/cargo-test
environment:
pkg: rust-nix
Write Preview
Loading…
Cancel
Save