From 56bcda8335ab990836ab1a679b1adac25578d17799e712d64c4afa7de11f7068 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 18 Jul 2008 19:51:19 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cpio?expand=0&rev=13 --- cpio-2.9-dev_number.patch | 22 ++++++++++++++++++++++ cpio.changes | 6 ++++++ cpio.spec | 9 ++++++++- 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 cpio-2.9-dev_number.patch diff --git a/cpio-2.9-dev_number.patch b/cpio-2.9-dev_number.patch new file mode 100644 index 0000000..620181e --- /dev/null +++ b/cpio-2.9-dev_number.patch @@ -0,0 +1,22 @@ +--- src/copyin.c 2008-07-11 13:20:27.000000000 +0200 ++++ src/copyin.c 2008-07-18 10:55:58.000000000 +0200 +@@ -1269,15 +1269,15 @@ + swab_array ((char *) short_hdr, 13); + } + +- file_hdr->c_dev_maj = major (short_hdr->c_dev); +- file_hdr->c_dev_min = minor (short_hdr->c_dev); ++ file_hdr->c_dev_maj = major ((unsigned short)short_hdr->c_dev); ++ file_hdr->c_dev_min = minor ((unsigned short)short_hdr->c_dev); + file_hdr->c_ino = short_hdr->c_ino; + file_hdr->c_mode = short_hdr->c_mode; + file_hdr->c_uid = short_hdr->c_uid; + file_hdr->c_gid = short_hdr->c_gid; + file_hdr->c_nlink = short_hdr->c_nlink; +- file_hdr->c_rdev_maj = major (short_hdr->c_rdev); +- file_hdr->c_rdev_min = minor (short_hdr->c_rdev); ++ file_hdr->c_rdev_maj = major ((unsigned short)short_hdr->c_rdev); ++ file_hdr->c_rdev_min = minor ((unsigned short)short_hdr->c_rdev); + file_hdr->c_mtime = (unsigned long) short_hdr->c_mtimes[0] << 16 + | short_hdr->c_mtimes[1]; + diff --git a/cpio.changes b/cpio.changes index 9c0f5dc..5256001 100644 --- a/cpio.changes +++ b/cpio.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 18 13:52:50 CEST 2008 - lmichnovic@suse.cz + +- make possible device nodes with major number > 127 [rhb#450109] + (*dev_number.patch) + ------------------------------------------------------------------- Fri Jun 27 16:28:34 CEST 2008 - schwab@suse.de diff --git a/cpio.spec b/cpio.spec index 306fe12..11aa259 100644 --- a/cpio.spec +++ b/cpio.spec @@ -16,7 +16,7 @@ License: GPL v3 only Group: Productivity/Archiving/Compression AutoReqProv: on Version: 2.9 -Release: 63 +Release: 66 Summary: A Backup and Archiving Utility Source: cpio-2.9.tar.bz2 Patch1: cpio-2.9-no_rmt.patch @@ -36,6 +36,9 @@ Patch13: cpio-2.9-m4_macro.patch Patch14: cpio-2.9-dir_perm.patch Patch15: cpio-2.9-eof_tape_handling.patch Patch16: cpio-2.9-gnulib.patch +# make posibble to have device nodes with major number > 127 +# Red Hat Bugzilla #450109 +Patch17: cpio-2.9-dev_number.patch PreReq: %install_info_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} @@ -78,6 +81,7 @@ Authors: %patch14 -p1 %patch15 %patch16 +%patch17 chmod 755 . chmod u+w * chmod a+r * @@ -119,6 +123,9 @@ ln -sf ../../bin/cpio $RPM_BUILD_ROOT/usr/bin/cpio %files lang -f %{name}.lang %changelog +* Fri Jul 18 2008 lmichnovic@suse.cz +- make possible device nodes with major number > 127 [rhb#450109] + (*dev_number.patch) * Fri Jun 27 2008 schwab@suse.de - Fix gnulib macro. * Fri Apr 11 2008 lmichnovic@suse.cz