From babe1201519d7cadf33706a7acfbcfcdf2be608b Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Thu, 17 Feb 2011 06:44:41 -0700 Subject: [PATCH] fix for LSB compliance --- debian/changelog | 7 +++++-- tar.c | 9 +++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 849abae..0a00ed4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ -pax (1:20090728-2) UNRELEASED; urgency=low +pax (1:20090728-2) unstable; urgency=low + * update CFLAGS to prevent pax displaying file sizes 4*2^30 too large, + closes: #595482 + * fix for tar.c to always add devmajor and devminor, closes: #609825 * add Vcs entries to the control file - -- Bdale Garbee Fri, 12 Nov 2010 01:20:12 -0700 + -- Bdale Garbee Thu, 17 Feb 2011 06:39:27 -0700 pax (1:20090728-1) unstable; urgency=low diff --git a/tar.c b/tar.c index 9763934..2acc32f 100644 --- a/tar.c +++ b/tar.c @@ -1079,6 +1079,15 @@ ustar_wr(ARCHD *arcn) strncpy(hd->uname, name_uid(arcn->sb.st_uid, 0), sizeof(hd->uname)); strncpy(hd->gname, name_gid(arcn->sb.st_gid, 0), sizeof(hd->gname)); + /* + * Always add devmajor and devminor + */ + if (ul_oct ((u_long) MAJOR (arcn->sb.st_rdev), hd->devmajor, + sizeof (hd->devmajor), 3) || + ul_oct ((u_long) MINOR (arcn->sb.st_rdev), hd->devminor, + sizeof (hd->devminor), 3)) + goto out; + /* * calculate and store the checksum write the header to the archive * return 0 tells the caller to now write the file data, 1 says no data -- 2.30.2