diff options
author | Tobias Kortkamp <tobik@FreeBSD.org> | 2017-04-03 15:37:21 +0000 |
---|---|---|
committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2017-04-03 15:37:21 +0000 |
commit | d67df387ee251245159bddfd4daa5db95e3299bf (patch) | |
tree | 569c0efc19430cb714587664377723159bea8c79 | |
parent | Update to latest snapshot and obey MESA_LLVM_VER if set (only 40 is valid) (diff) |
- Use posix_openpt(2) instead of opening /dev/ptmx which requires
loading an extra kernel module on FreeBSD 10.0+
- Add LICENSE_FILE
- Remove the unnecessary KMODDIR knob
PR: 217880
Approved by: mat (mentor), maintainer timeout (2 weeks+)
Differential Revision: https://reviews.freebsd.org/D10243
Notes
Notes:
svn path=/head/; revision=437664
-rw-r--r-- | sysutils/fusefs-sshfs/Makefile | 4 | ||||
-rw-r--r-- | sysutils/fusefs-sshfs/files/patch-sshfs.c | 11 | ||||
-rw-r--r-- | sysutils/fusefs-sshfs/pkg-message | 7 |
3 files changed, 13 insertions, 9 deletions
diff --git a/sysutils/fusefs-sshfs/Makefile b/sysutils/fusefs-sshfs/Makefile index e35cc00c514a..76266ddbb734 100644 --- a/sysutils/fusefs-sshfs/Makefile +++ b/sysutils/fusefs-sshfs/Makefile @@ -4,6 +4,7 @@ PORTNAME= sshfs PORTVERSION= 2.8 DISTVERSIONPREFIX= ${PORTNAME}_ +PORTREVISION= 1 CATEGORIES= sysutils PKGNAMEPREFIX= fusefs- @@ -11,8 +12,7 @@ MAINTAINER= bofh@FreeBSD.org COMMENT= Mount remote directories over ssh LICENSE= GPLv2 - -KMODDIR?= ${LOCALBASE}/modules +LICENSE_FILE= ${WRKSRC}/COPYING USE_GITHUB= yes GH_ACCOUNT= libfuse diff --git a/sysutils/fusefs-sshfs/files/patch-sshfs.c b/sysutils/fusefs-sshfs/files/patch-sshfs.c new file mode 100644 index 000000000000..d89f099f08b9 --- /dev/null +++ b/sysutils/fusefs-sshfs/files/patch-sshfs.c @@ -0,0 +1,11 @@ +--- sshfs.c.orig 2017-03-17 21:07:50 UTC ++++ sshfs.c +@@ -1027,7 +1027,7 @@ static int pty_master(char **name) + { + int mfd; + +- mfd = open("/dev/ptmx", O_RDWR | O_NOCTTY); ++ mfd = posix_openpt(O_RDWR | O_NOCTTY); + if (mfd == -1) { + perror("failed to open pty"); + return -1; diff --git a/sysutils/fusefs-sshfs/pkg-message b/sysutils/fusefs-sshfs/pkg-message index 3f52f637e55c..c5859c9bfd66 100644 --- a/sysutils/fusefs-sshfs/pkg-message +++ b/sysutils/fusefs-sshfs/pkg-message @@ -1,13 +1,6 @@ Basic Instructions: There are three ways to do this: -From version 2.7 it makes use of the legacy /dev/ptmx. For version 10.0+ -please load the kernel module pty: - -% kldload pty - -Daemon initiated - 1) % sshfs -o idmap=user username@example.org: /path/to/mount/point |