diff options
author | skrll <skrll> | 2000-06-12 13:36:08 +0000 |
---|---|---|
committer | skrll <skrll> | 2000-06-12 13:36:08 +0000 |
commit | 1fec98db2ae800fc3626f4598cf66252824f74bd (patch) | |
tree | 9b103a594aa31b025c5e28ebd866623461132466 /comms/plptools/patches | |
parent | 778615969c5b7d52ba4e837b8b7eb4a2c8b1e325 (diff) | |
download | pkgsrc-1fec98db2ae800fc3626f4598cf66252824f74bd.tar.gz |
Update plptools to version 0.6.
Sorry there doesn't seem to be a changelog.
Changes by me:
- Patch mp_mount.c so that it now works.
- Remove BROKEN
- Use LIBTOOL instead of PKGLIBTOOL.
Diffstat (limited to 'comms/plptools/patches')
-rw-r--r-- | comms/plptools/patches/patch-ab | 75 | ||||
-rw-r--r-- | comms/plptools/patches/patch-ac | 11 |
2 files changed, 70 insertions, 16 deletions
diff --git a/comms/plptools/patches/patch-ab b/comms/plptools/patches/patch-ab index 2fcd8539ccc..e4fc569eca9 100644 --- a/comms/plptools/patches/patch-ab +++ b/comms/plptools/patches/patch-ab @@ -1,8 +1,18 @@ -$NetBSD: patch-ab,v 1.1.1.1 1999/07/14 05:41:47 sakamoto Exp $ +$NetBSD: patch-ab,v 1.2 2000/06/12 13:36:13 skrll Exp $ ---- ./plpnfsd/mp_mount.c.orig Tue Jul 6 06:33:05 1999 -+++ ./plpnfsd/mp_mount.c Wed Jul 14 11:50:58 1999 -@@ -60,4 +60,14 @@ +--- plpnfsd/mp_mount.c.orig Mon Jan 17 11:49:41 2000 ++++ plpnfsd/mp_mount.c Sun Jun 11 17:03:47 2000 +@@ -16,7 +16,7 @@ + #define PORTMAP /* I need svcudp_create in rpc/svc_soc.h, sol 2.4 */ + #endif + +-#include <OSdefs.h> ++#include "OSdefs.h" + #include <stdio.h> + #include <signal.h> + #include <sys/stat.h> +@@ -59,6 +59,16 @@ + #endif #endif /* __FreeBSD__ */ +#ifdef __NetBSD__ @@ -17,10 +27,65 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/07/14 05:41:47 sakamoto Exp $ + #include <rpc/rpc.h> #include "nfs_prot.h" -@@ -418,5 +428,5 @@ + +@@ -147,7 +157,7 @@ + struct mntent *ent; + #endif + #endif +-#ifndef __FreeBSD__ ++#if !defined(__FreeBSD__) && !defined(__NetBSD__) + struct stat statb; + #endif + +@@ -229,7 +239,7 @@ + #else + struct nfs_args nfs_args; + #endif +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__NetBSD__) + int mount_flags; + #endif + +@@ -405,20 +415,23 @@ + #endif + + #ifdef __NetBSD__ ++ nfs_args.version = NFS_ARGSVERSION; + nfs_args.addrlen = sizeof(sain); + nfs_args.sotype = SOCK_DGRAM; + nfs_args.maxgrouplist = NGROUPS; + nfs_args.readahead = 1; + nfs_args.addr = (struct sockaddr *) &sain; + nfs_args.fh = (void *) root_fh; ++ nfs_args.fhsize = sizeof(*root_fh); + nfs_args.wsize = PBUFSIZE; + nfs_args.rsize = PBUFSIZE; + nfs_args.retrans = 10; + nfs_args.timeo = 600; nfs_args.hostname = PSIONHOSTNAME; nfs_args.flags = NFSMNT_INT | NFSMNT_RETRANS | NFSMNT_TIMEO - | NFSMNT_NOCONN | NFSMNT_DUMBTIMR | NFSMNT_MYWRITE + | NFSMNT_NOCONN | NFSMNT_DUMBTIMR | NFSMNT_WSIZE | NFSMNT_RSIZE; ++ mount_flags = MNT_NOSUID | MNT_NODEV | MNT_NOEXEC | MNT_NOATIME; #endif + + #if defined(_IBMR2) +@@ -448,7 +461,7 @@ + #if defined(__sgi) || (defined(sun) && defined(__SVR4)) + if (mount("", dir, MS_DATA, "nfs", &nfs_args, sizeof(nfs_args))) + #endif +-#if defined(__NetBSD__) || defined(__NeXT__) ++#if defined(__NeXT__) + if (mount(MOUNT_NFS, dir, 0, (caddr_t) & nfs_args)) + #endif + #ifdef hpux +@@ -464,7 +477,7 @@ + if (aix3_mount("psion:loc", dir, 0, MOUNT_TYPE_NFS, &nfs_args, "plpnfsd")) + #endif + +-#ifdef __FreeBSD__ ++#if defined(__NetBSD__) || defined(__FreeBSD__) + #if __FreeBSD_version >= 300001 + if (mount("nfs", dir, mount_flags, &nfs_args)) + #else diff --git a/comms/plptools/patches/patch-ac b/comms/plptools/patches/patch-ac deleted file mode 100644 index 5ddb0daac4f..00000000000 --- a/comms/plptools/patches/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 1999/07/14 05:41:47 sakamoto Exp $ - ---- ./configure.orig Tue Jul 6 07:13:07 1999 -+++ ./configure Wed Jul 14 11:51:59 1999 -@@ -1954,5 +1954,5 @@ - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL="$LIBTOOL" - - # Redirect the config.log output again, so that the ltconfig log is not |