diff options
| author | Stefan Walter <stefan@FreeBSD.org> | 2007-09-24 17:18:06 +0000 |
|---|---|---|
| committer | Stefan Walter <stefan@FreeBSD.org> | 2007-09-24 17:18:06 +0000 |
| commit | fb94e060a609dd896d2d6f4f8184a58e426526c0 (patch) | |
| tree | 784394e4432154a57b354c6fdff6cfa5dd981ae4 /sysutils/cramfs | |
| parent | da6770029267bc0b4cf454bb0bb65da6709ecf98 (diff) | |
| download | ports-fb94e060a609dd896d2d6f4f8184a58e426526c0.tar.gz ports-fb94e060a609dd896d2d6f4f8184a58e426526c0.zip | |
- Fix failing mmap calls in mkcramfs by correctly defining a constant.
- Call mkfifo instead of mknod for creating FIFOs to fix cramfsck.
PR: 116292
Submitted by: Christopher Hall <freebsd@generalresources.com>
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=200055
Diffstat (limited to 'sysutils/cramfs')
| -rw-r--r-- | sysutils/cramfs/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/cramfs/files/patch-cramfsck.c | 20 | ||||
| -rw-r--r-- | sysutils/cramfs/files/patch-mkcramfs.c | 2 |
3 files changed, 22 insertions, 1 deletions
diff --git a/sysutils/cramfs/Makefile b/sysutils/cramfs/Makefile index 5c4646583248..e550f5243f39 100644 --- a/sysutils/cramfs/Makefile +++ b/sysutils/cramfs/Makefile @@ -7,6 +7,7 @@ PORTNAME= cramfs PORTVERSION= 1.1 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= SOURCEFORGE MASTER_SITE_SUBDIR= cramfs diff --git a/sysutils/cramfs/files/patch-cramfsck.c b/sysutils/cramfs/files/patch-cramfsck.c index cfd6aca01c5f..9a685b5565dc 100644 --- a/sysutils/cramfs/files/patch-cramfsck.c +++ b/sysutils/cramfs/files/patch-cramfsck.c @@ -17,3 +17,23 @@ /* Exit codes used by fsck-type programs */ #define FSCK_OK 0 /* No errors */ +@@ -603,8 +603,17 @@ + } + + if (opt_extract) { +- if (mknod(path, i->mode, devtype) < 0) { +- die(FSCK_ERROR, 1, "mknod failed: %s", path); ++ switch(type) { ++ default: ++ if (mknod(path, i->mode, devtype) < 0) { ++ die(FSCK_ERROR, 1, "mknod failed: %s", path); ++ } ++ break; ++ case 'p': ++ if (mkfifo(path, i->mode) < 0) { ++ die(FSCK_ERROR, 1, "mkfifo failed: %s", path); ++ } ++ break; + } + change_file_status(path, i); + } diff --git a/sysutils/cramfs/files/patch-mkcramfs.c b/sysutils/cramfs/files/patch-mkcramfs.c index faf00df0d7df..5e4f1328f7a5 100644 --- a/sysutils/cramfs/files/patch-mkcramfs.c +++ b/sysutils/cramfs/files/patch-mkcramfs.c @@ -4,7 +4,7 @@ #include <linux/cramfs_fs.h> #include <zlib.h> -+#define MAP_ANONYMOUS 0x20 ++#define MAP_ANONYMOUS MAP_ANON +typedef long long loff_t; + /* Exit codes used by mkfs-type programs */ |