parent
0df9819126
commit
7587d11ec9
@ -1,28 +0,0 @@
|
|||||||
package=native_cdrkit
|
|
||||||
$(package)_version=1.1.11
|
|
||||||
$(package)_download_path=https://distro.ibiblio.org/fatdog/source/600/c
|
|
||||||
$(package)_file_name=cdrkit-$($(package)_version).tar.bz2
|
|
||||||
$(package)_sha256_hash=b50d64c214a65b1a79afe3a964c691931a4233e2ba605d793eb85d0ac3652564
|
|
||||||
$(package)_patches=cdrkit-deterministic.patch
|
|
||||||
|
|
||||||
define $(package)_preprocess_cmds
|
|
||||||
patch -p1 < $($(package)_patch_dir)/cdrkit-deterministic.patch
|
|
||||||
endef
|
|
||||||
|
|
||||||
# Starting with 10.1, GCC defaults to -fno-common, resulting in linking errors.
|
|
||||||
# Pass -fcommon to retain the legacy behaviour.
|
|
||||||
define $(package)_config_cmds
|
|
||||||
$($(package)_cmake) -DCMAKE_C_FLAGS="$$($(1)_cflags) -fcommon"
|
|
||||||
endef
|
|
||||||
|
|
||||||
define $(package)_build_cmds
|
|
||||||
$(MAKE) genisoimage
|
|
||||||
endef
|
|
||||||
|
|
||||||
define $(package)_stage_cmds
|
|
||||||
$(MAKE) DESTDIR=$($(package)_staging_dir) -C genisoimage install
|
|
||||||
endef
|
|
||||||
|
|
||||||
define $(package)_postprocess_cmds
|
|
||||||
rm bin/isovfy bin/isoinfo bin/isodump bin/isodebug bin/devdump
|
|
||||||
endef
|
|
@ -1,86 +0,0 @@
|
|||||||
--- cdrkit-1.1.11.old/genisoimage/tree.c 2008-10-21 19:57:47.000000000 -0400
|
|
||||||
+++ cdrkit-1.1.11/genisoimage/tree.c 2013-12-06 00:23:18.489622668 -0500
|
|
||||||
@@ -1139,8 +1139,9 @@
|
|
||||||
scan_directory_tree(struct directory *this_dir, char *path,
|
|
||||||
struct directory_entry *de)
|
|
||||||
{
|
|
||||||
- DIR *current_dir;
|
|
||||||
+ int current_file;
|
|
||||||
char whole_path[PATH_MAX];
|
|
||||||
+ struct dirent **d_list;
|
|
||||||
struct dirent *d_entry;
|
|
||||||
struct directory *parent;
|
|
||||||
int dflag;
|
|
||||||
@@ -1164,7 +1165,8 @@
|
|
||||||
this_dir->dir_flags |= DIR_WAS_SCANNED;
|
|
||||||
|
|
||||||
errno = 0; /* Paranoia */
|
|
||||||
- current_dir = opendir(path);
|
|
||||||
+ //current_dir = opendir(path);
|
|
||||||
+ current_file = scandir(path, &d_list, NULL, alphasort);
|
|
||||||
d_entry = NULL;
|
|
||||||
|
|
||||||
/*
|
|
||||||
@@ -1173,12 +1175,12 @@
|
|
||||||
*/
|
|
||||||
old_path = path;
|
|
||||||
|
|
||||||
- if (current_dir) {
|
|
||||||
+ if (current_file >= 0) {
|
|
||||||
errno = 0;
|
|
||||||
- d_entry = readdir(current_dir);
|
|
||||||
+ d_entry = d_list[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (!current_dir || !d_entry) {
|
|
||||||
+ if (current_file < 0 || !d_entry) {
|
|
||||||
int ret = 1;
|
|
||||||
|
|
||||||
#ifdef USE_LIBSCHILY
|
|
||||||
@@ -1191,8 +1193,8 @@
|
|
||||||
de->isorec.flags[0] &= ~ISO_DIRECTORY;
|
|
||||||
ret = 0;
|
|
||||||
}
|
|
||||||
- if (current_dir)
|
|
||||||
- closedir(current_dir);
|
|
||||||
+ if(d_list)
|
|
||||||
+ free(d_list);
|
|
||||||
return (ret);
|
|
||||||
}
|
|
||||||
#ifdef ABORT_DEEP_ISO_ONLY
|
|
||||||
@@ -1208,7 +1210,7 @@
|
|
||||||
errmsgno(EX_BAD, "use Rock Ridge extensions via -R or -r,\n");
|
|
||||||
errmsgno(EX_BAD, "or allow deep ISO9660 directory nesting via -D.\n");
|
|
||||||
}
|
|
||||||
- closedir(current_dir);
|
|
||||||
+ free(d_list);
|
|
||||||
return (1);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
@@ -1250,13 +1252,13 @@
|
|
||||||
* The first time through, skip this, since we already asked
|
|
||||||
* for the first entry when we opened the directory.
|
|
||||||
*/
|
|
||||||
- if (dflag)
|
|
||||||
- d_entry = readdir(current_dir);
|
|
||||||
+ if (dflag && current_file >= 0)
|
|
||||||
+ d_entry = d_list[current_file];
|
|
||||||
dflag++;
|
|
||||||
|
|
||||||
- if (!d_entry)
|
|
||||||
+ if (current_file < 0)
|
|
||||||
break;
|
|
||||||
-
|
|
||||||
+ current_file--;
|
|
||||||
/* OK, got a valid entry */
|
|
||||||
|
|
||||||
/* If we do not want all files, then pitch the backups. */
|
|
||||||
@@ -1348,7 +1350,7 @@
|
|
||||||
insert_file_entry(this_dir, whole_path, d_entry->d_name);
|
|
||||||
#endif /* APPLE_HYB */
|
|
||||||
}
|
|
||||||
- closedir(current_dir);
|
|
||||||
+ free(d_list);
|
|
||||||
|
|
||||||
#ifdef APPLE_HYB
|
|
||||||
/*
|
|
Loading…
Reference in new issue