Attachment 316869 Details for Bug 461541 – proposed patch

[patch] proposed patch

cdrtools-2.01-10.7.el5.patch (text/plain), 2.79 KB, created by Harald Hoyer on 2008-09-16 17:56:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Harald Hoyer

Created: 2008-09-16 17:56:14 UTC

Size: 2.79 KB

patch

obsolete

>Index: cdrtools-rootstat.patch
>===================================================================
>RCS file: /cvs/dist/rpms/cdrtools/RHEL-5/cdrtools-rootstat.patch,v
>retrieving revision 1.2
>diff -u -r1.2 cdrtools-rootstat.patch
>--- cdrtools-rootstat.patch	7 Aug 2008 12:10:56 -0000	1.2
>+++ cdrtools-rootstat.patch	16 Sep 2008 17:53:26 -0000
>@@ -1,16 +1,35 @@
> diff -up cdrtools-2.01/mkisofs/tree.c.rootstat cdrtools-2.01/mkisofs/tree.c
> --- cdrtools-2.01/mkisofs/tree.c.rootstat	2004-06-12 15:16:37.000000000 +0200
>-+++ cdrtools-2.01/mkisofs/tree.c	2008-08-07 13:52:50.000000000 +0200
>-@@ -1443,6 +1443,8 @@ insert_file_entry(this_dir, whole_path, 
>++++ cdrtools-2.01/mkisofs/tree.c	2008-09-16 17:10:40.000000000 +0200
>+@@ -39,6 +39,7 @@ static	char sccsid[] =
>+ #include <fctldefs.h>
>+ #include <device.h>
>+ #include <schily.h>
>++#include <libgen.h>
>+ 
>+ #ifdef UDF
>+ #include "udf.h"
>+@@ -1439,12 +1440,16 @@ insert_file_entry(this_dir, whole_path, 
>+ 		return (0);
>+ 	}
>+ 	if (this_dir == root && strcmp(short_name, ".") == 0)
>+-		root_statbuf = statbuf;	/* Save this for later on */
>++		memcpy(&root_statbuf, &statbuf, sizeof(root_statbuf));	/* Save this for later on */
>  
>  	/* We do this to make sure that the root entries are consistent */
>  	if (this_dir == root && strcmp(short_name, "..") == 0) {
>+-		statbuf = root_statbuf;
>+-		lstatbuf = root_statbuf;
> +	        /* for the case .. comes before . */
>-+	        stat_filter(root, &root_statbuf);
>- 		statbuf = root_statbuf;
>- 		lstatbuf = root_statbuf;
>++		if (!root_statbuf.st_ctime) {
>++			stat_filter(dirname(whole_path), &root_statbuf);
>++		}
>++		memcpy(&statbuf, &root_statbuf, sizeof(statbuf));
>++		memcpy(&lstatbuf, &root_statbuf, sizeof(lstatbuf));
>  	}
>-@@ -1625,10 +1627,12 @@ insert_file_entry(this_dir, whole_path, 
>+ 	if (S_ISLNK(lstatbuf.st_mode)) {
>+ 
>+@@ -1625,10 +1630,12 @@ insert_file_entry(this_dir, whole_path, 
>  		!S_ISFIFO(lstatbuf.st_mode) && !S_ISSOCK(lstatbuf.st_mode) &&
>  		!S_ISLNK(lstatbuf.st_mode) && !S_ISREG(lstatbuf.st_mode) &&
>  		!S_ISDIR(lstatbuf.st_mode)) {
>Index: cdrtools.spec
>===================================================================
>RCS file: /cvs/dist/rpms/cdrtools/RHEL-5/cdrtools.spec,v
>retrieving revision 1.61
>diff -u -r1.61 cdrtools.spec
>--- cdrtools.spec	8 Aug 2008 10:59:52 -0000	1.61
>+++ cdrtools.spec	16 Sep 2008 17:53:26 -0000
>@@ -1,7 +1,7 @@
> Summary: A collection of CD/DVD utilities.
> Name: cdrtools
> Version: 2.01
>-Release: 10.6%{?dist}
>+Release: 10.7%{?dist}
> %define tarversion 2.01
> License: GPL
> Group: Applications/System
>@@ -243,6 +243,10 @@
> %{_mandir}/man1/cdda2wav.1*
> 
> %changelog
>+* Tue Sep 16 2008 Harald Hoyer <harald@redhat.com> 2.01-10.7
>+- fixed rootstat patch (#461541)
>+- Resolves: rhbz#461541
>+
> * Fri Aug 08 2008 Harald Hoyer <harald@redhat.com> 2.01-10.6
> - removed e_malloc patch
> - Resolves: rhbz#221169

Actions: View | Diff

Attachments on bug 461541: 316869