diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-07 21:28:33 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-07 21:28:33 +0200 |
| commit | 916793cf130a8269bbda881e9081370d74595538 (patch) | |
| tree | 11c9e5d14f3178c6daf5a9c0a85f8a9e469ac356 /pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch | |
| parent | 026c31dd9d6570fc6d7475c0102745cbfb0d6972 (diff) | |
| parent | 86eaeb4c0a31e623c01f0d39fd5b3e64ce5f80b5 (diff) | |
| download | nixlib-916793cf130a8269bbda881e9081370d74595538.tar nixlib-916793cf130a8269bbda881e9081370d74595538.tar.gz nixlib-916793cf130a8269bbda881e9081370d74595538.tar.bz2 nixlib-916793cf130a8269bbda881e9081370d74595538.tar.lz nixlib-916793cf130a8269bbda881e9081370d74595538.tar.xz nixlib-916793cf130a8269bbda881e9081370d74595538.tar.zst nixlib-916793cf130a8269bbda881e9081370d74595538.zip | |
Merge branch 'master' into systemd-219
Conflicts: nixos/modules/system/boot/systemd.nix pkgs/applications/networking/p2p/transmission/default.nix pkgs/development/libraries/libseccomp/default.nix pkgs/os-specific/linux/systemd/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch')
| -rw-r--r-- | pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch b/pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch new file mode 100644 index 000000000000..6ab2d6dccc73 --- /dev/null +++ b/pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch @@ -0,0 +1,12 @@ +diff -Nru policycoreutils-2.4/setfiles/restore.c policycoreutils-2.4.new/setfiles/restore.c +--- policycoreutils-2.4/setfiles/restore.c 2015-02-02 09:38:10.000000000 -0500 ++++ policycoreutils-2.4.new/setfiles/restore.c 2015-08-29 20:44:13.693023222 -0400 +@@ -118,7 +118,7 @@ + r_opts->count++; + if (r_opts->count % STAR_COUNT == 0) { + if (r_opts->progress == 1) { +- fprintf(stdout, "\r%luk", (size_t) r_opts->count / STAR_COUNT ); ++ fprintf(stdout, "\r%zuk", (size_t) r_opts->count / STAR_COUNT ); + } else { + if (r_opts->nfile > 0) { + progress = (r_opts->count < r_opts->nfile) ? (100.0 * r_opts->count / r_opts->nfile) : 100; |