diff options
| author | Craig Rodrigues <rodrigc@FreeBSD.org> | 2007-07-18 02:24:39 +0000 |
|---|---|---|
| committer | Craig Rodrigues <rodrigc@FreeBSD.org> | 2007-07-18 02:24:39 +0000 |
| commit | 7336031b41ceb680b01e05006022fa6af0353f00 (patch) | |
| tree | 2fc5ef4631d6b36ec527fce4a6cffd2ddb74daee /net/coda6_server/files | |
| parent | - Update to 0.10.5 (diff) | |
Update to version 6.9.1
PR: 114594
Diffstat (limited to 'net/coda6_server/files')
| -rw-r--r-- | net/coda6_server/files/patch-coda-src_scripts_Makefile.in | 16 | ||||
| -rw-r--r-- | net/coda6_server/files/patch-coda-src_venus_fso1.cc | 11 | ||||
| -rw-r--r-- | net/coda6_server/files/patch-pioctl.h | 11 |
3 files changed, 5 insertions, 33 deletions
diff --git a/net/coda6_server/files/patch-coda-src_scripts_Makefile.in b/net/coda6_server/files/patch-coda-src_scripts_Makefile.in index 5584c0f82a8e..2392719a9ac7 100644 --- a/net/coda6_server/files/patch-coda-src_scripts_Makefile.in +++ b/net/coda6_server/files/patch-coda-src_scripts_Makefile.in @@ -1,17 +1,11 @@ - -coda-setup-ports is useless with a recent /etc/services and it is the only -file installed by both server and client thus remove it to avoid conflicting -plists - ---- coda-src/scripts/Makefile.in.orig Wed Apr 27 03:12:50 2005 -+++ coda-src/scripts/Makefile.in Thu Oct 5 19:36:14 2006 -@@ -25,14 +25,14 @@ +--- coda-src/scripts/Makefile.in.orig 2006-11-02 14:46:29.000000000 -0500 ++++ coda-src/scripts/Makefile.in 2007-07-14 23:33:28.000000000 -0400 +@@ -25,13 +25,13 @@ # Need to conditionalize this include $(TOPDIR)/Makeconf --VENUS-SCRIPTS = vutil volmunge venus-setup coda-setup-ports \ -+VENUS-SCRIPTS = vutil volmunge venus-setup \ - coda-client-logrotate +-VENUS-SCRIPTS = volmunge venus-setup coda-setup-ports ++VENUS-SCRIPTS = volmunge venus-setup VOL-SCRIPTS = createvol_rep purgevol_rep bldvldb.sh VICE-SCRIPTS = startserver codastart coda-server-logrotate diff --git a/net/coda6_server/files/patch-coda-src_venus_fso1.cc b/net/coda6_server/files/patch-coda-src_venus_fso1.cc deleted file mode 100644 index e7be0d222e86..000000000000 --- a/net/coda6_server/files/patch-coda-src_venus_fso1.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- coda-src/venus/fso1.cc.orig Thu Oct 5 16:11:23 2006 -+++ coda-src/venus/fso1.cc Thu Oct 5 16:18:40 2006 -@@ -2895,7 +2895,7 @@ - char confstr[4]; - - close(pfd[1]); -- if(setpgrp() < 0) { perror("setpgrp"); exit(EXIT_FAILURE); } -+ if(setpgid(0, 0) < 0) { perror("setpgid"); exit(EXIT_FAILURE); } - - sprintf(confstr, "%d", conflict_type); - diff --git a/net/coda6_server/files/patch-pioctl.h b/net/coda6_server/files/patch-pioctl.h deleted file mode 100644 index 2bdeff78574a..000000000000 --- a/net/coda6_server/files/patch-pioctl.h +++ /dev/null @@ -1,11 +0,0 @@ ---- coda-src/kerndep/pioctl.h.orig Thu Oct 5 11:54:04 2006 -+++ coda-src/kerndep/pioctl.h Thu Oct 5 11:54:20 2006 -@@ -81,7 +81,7 @@ - /* unpacking macros */ - #ifndef _IOC_NR - --#if defined(__NetBSD__) -+#if defined(__NetBSD__) || defined(__FreeBSD__) - #define _IOC_TYPEMASK 0xff - #define _IOC_TYPESHIFT 8 - #define _IOC_NRMASK 0xff |