diff options
| author | stas <stas@FreeBSD.org> | 2009-02-13 07:36:01 +0800 |
|---|---|---|
| committer | stas <stas@FreeBSD.org> | 2009-02-13 07:36:01 +0800 |
| commit | de046d55d8ddd20fbd980e51fdf1d54124a18895 (patch) | |
| tree | ec34578675d68806c03ae2ee1e1e2aa196295470 /sysutils/fuser | |
| parent | 312eda32f80ac88c501fc33441030986ccddd553 (diff) | |
| download | freebsd-ports-gnome-de046d55d8ddd20fbd980e51fdf1d54124a18895.tar.gz freebsd-ports-gnome-de046d55d8ddd20fbd980e51fdf1d54124a18895.tar.zst freebsd-ports-gnome-de046d55d8ddd20fbd980e51fdf1d54124a18895.zip | |
- Really fix on current.
Diffstat (limited to 'sysutils/fuser')
| -rw-r--r-- | sysutils/fuser/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/fuser/files/extra::patch-fuser.c | 25 | ||||
| -rw-r--r-- | sysutils/fuser/files/extra::patch-fuser.h | 11 |
3 files changed, 33 insertions, 7 deletions
diff --git a/sysutils/fuser/Makefile b/sysutils/fuser/Makefile index 1d27fae59118..24302731188e 100644 --- a/sysutils/fuser/Makefile +++ b/sysutils/fuser/Makefile @@ -7,6 +7,7 @@ PORTNAME= fuser PORTVERSION= 1142334561 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://mbsd.msk.ru/dist/ @@ -24,7 +25,8 @@ PLIST_FILES= bin/fuser .include <bsd.port.pre.mk> .if (${OSVERSION} > 800000) -EXTRA_PATCHES+= ${FILESDIR}/extra::patch-fuser.c +EXTRA_PATCHES+= ${FILESDIR}/extra::patch-fuser.c \ + ${FILESDIR}/extra::patch-fuser.h .endif do-install: diff --git a/sysutils/fuser/files/extra::patch-fuser.c b/sysutils/fuser/files/extra::patch-fuser.c index 116d45a105b5..5ada9fcd0379 100644 --- a/sysutils/fuser/files/extra::patch-fuser.c +++ b/sysutils/fuser/files/extra::patch-fuser.c @@ -1,5 +1,5 @@ ---- fuser.c.orig 2009-02-13 02:11:34.000000000 +0300 -+++ fuser.c 2009-02-13 02:19:21.000000000 +0300 +--- fuser.c.orig 2006-03-14 14:07:08.000000000 +0300 ++++ fuser.c 2009-02-13 02:33:58.000000000 +0300 @@ -65,6 +65,7 @@ */ @@ -21,12 +21,25 @@ #include <fs/devfs/devfs.h> #include <fs/devfs/devfs_int.h> #undef _KERNEL -@@ -729,7 +731,7 @@ - return -1; - } +@@ -717,19 +719,12 @@ + */ + dev_t + dev2udev(dev) +- const struct cdev *dev; ++ struct cdev *dev; + { +- struct cdev dv; + struct cdev_priv priv; + int ret; +- ret = KVM_READ(kd, dev, &dv, sizeof(struct cdev)); +- if (ret != sizeof(struct cdev)) { +- warnx("can't read cdev at %p\n", dev); +- return -1; +- } +- - ret = KVM_READ(kd, dv.si_priv, &priv, sizeof(priv)); -+ ret = KVM_READ(kd, cdev2priv(&dv), &priv, sizeof(priv)); ++ ret = KVM_READ(kd, cdev2priv(dev), &priv, sizeof(priv)); if (ret != sizeof(priv)) { warnx("can't read priv at %p\n", dev); return -1; diff --git a/sysutils/fuser/files/extra::patch-fuser.h b/sysutils/fuser/files/extra::patch-fuser.h new file mode 100644 index 000000000000..a823ffa2ab60 --- /dev/null +++ b/sysutils/fuser/files/extra::patch-fuser.h @@ -0,0 +1,11 @@ +--- fuser.h.orig 2009-02-13 02:34:32.000000000 +0300 ++++ fuser.h 2009-02-13 02:34:43.000000000 +0300 +@@ -54,7 +54,7 @@ + #endif + + /* Prototypes */ +-dev_t dev2udev __P((const struct cdev *dev)); ++dev_t dev2udev __P((struct cdev *dev)); + int isofs_filestat __P((const vnode_t *vp, finfo_t *fsp)); + int msdosfs_filestat __P((const vnode_t *vp, finfo_t *fsp)); + int ufs_filestat __P((const vnode_t *vp, finfo_t *fsp)); |