ports/114536: ports/net/coda6_server and ports/net/coda6_client update to coda-6.9.1

[Jan Harkes]

>Number:         114536
>Category:       ports
>Synopsis:       ports/net/coda6_server and ports/net/coda6_client update to coda-6.9.1
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 12 19:20:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Jan Harkes
>Release:        FreeBSD-CURRENT (7.0)
>Organization:
>Environment:
>Description:
The Coda kernel module had been broken for a long period and was causing a kernel panic when the Coda client started. The required kernel patches to fix these issues were merged into FreeBSD-CURRENT as of 2007-07-11. However, the current Coda-6.1.2 release in ports is not yet using the new nmount syscall.

Attached is a patch for ports/net/coda6_client and ports/net/coda6_server to bring the user space up to coda-6.9.1 which is able to mount /coda.

(not sure how to set severity and priority values for this bug as the critical problem was in the kernel module and is fixed, but that change is not as useful without the corresponding user space update)
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urN /root/ports/coda6_server/Makefile /usr/ports/net/coda6_server/Makefile
--- /root/ports/coda6_server/Makefile	2007-07-12 01:50:20.000000000 -0400
+++ /usr/ports/net/coda6_server/Makefile	2007-07-12 02:16:23.000000000 -0400
@@ -5,10 +5,8 @@
 # $FreeBSD: ports/net/coda6_server/Makefile,v 1.11 2007/03/11 14:09:51 miwi Exp $
 
 PORTNAME=	coda
-PORTVERSION=	6.1.2
+PORTVERSION=	6.9.1
 CATEGORIES=	net
-# as of 5 Oct 2006 the archive is not present on ftp.wu-wien.ac.at
-# but maybe it'll appear there soon
 MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/coda/src/ \
 		ftp://ftp.planetmirror.com/pub/coda/src/ \
 		ftp://ftp.nctu.edu.tw/mirror/Coda/src/ \
@@ -57,8 +55,7 @@
 	updateclnt.8 \
 	updatesrv.8 \
 	vice-setup.8 \
-	volutil.8 \
-	vutil.8
+	volutil.8
 .else
 MAN1=	au.1 \
 	cfs.1 \
@@ -74,7 +71,8 @@
 	spy.1
 MAN8=	venus-setup.8 \
 	venus.8 \
-	volmunge.8
+	volmunge.8 \
+	vutil.8
 .endif
 
 .include <bsd.port.pre.mk>
@@ -83,17 +81,11 @@
 .if ${OSVERSION} < 501106
 IGNORE=	lacks kernel support on this version of FreeBSD
 .endif
-# this needs testing with the new version (6.1.1)
-#.if ${OSVERSION} >= 600000
-#IGNORE=	makes a kernel panic on this version of FreeBSD
-#.endif
-pre-everything::
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "WARNING:"
-	@${ECHO_CMD} "This version ${PORTVERSION} of the coda client has not been tested at all under FreeBSD."
-	@${ECHO_CMD} "Previous version 6.0.7 was known to cause a kernel panic."
-	@${ECHO_CMD} "If you make some tests, please send the results to ports at FreeBSD.org"
-	@${ECHO_CMD} ""
+# not sure when the kernel crashes were introduced, but fixes were merged
+# into FreeBSD-CURRENT CVS (7.0) on 2007-07-11.
+.if ${OSVERSION} >= 600000 && ${OSVERSION} <= 700052
+IGNORE=	makes a kernel panic on this version of FreeBSD
+.endif
 .endif
 
 .include <bsd.port.post.mk>
diff -urN /root/ports/coda6_server/distinfo /usr/ports/net/coda6_server/distinfo
--- /root/ports/coda6_server/distinfo	2007-07-12 01:50:20.000000000 -0400
+++ /usr/ports/net/coda6_server/distinfo	2007-07-12 01:52:44.000000000 -0400
@@ -1,3 +1,3 @@
-MD5 (coda-6.1.2.tar.gz) = d4c6f70e18de7e049376bb9d71499cbe
-SHA256 (coda-6.1.2.tar.gz) = 19c6a23ea6e7b4ca0501f49a9a742330e575e8a8afa86d9f45988bf4eb6f8c3f
-SIZE (coda-6.1.2.tar.gz) = 1571467
+MD5 (coda-6.9.1.tar.gz) = cafa37df22e7718ae8e67ff8583bd805
+SHA256 (coda-6.9.1.tar.gz) = f7a1dbce67f20e7c294087e33e9767a024f2a7d3fa6456d03004018073e118de
+SIZE (coda-6.9.1.tar.gz) = 1537910
diff -urN /root/ports/coda6_server/files/patch-coda-src_scripts_Makefile.in /usr/ports/net/coda6_server/files/patch-coda-src_scripts_Makefile.in
--- /root/ports/coda6_server/files/patch-coda-src_scripts_Makefile.in	2007-07-12 01:50:20.000000000 -0400
+++ /usr/ports/net/coda6_server/files/patch-coda-src_scripts_Makefile.in	2007-07-12 02:04:46.000000000 -0400
@@ -3,15 +3,14 @@
 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-12 02:04:32.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 -urN /root/ports/coda6_server/files/patch-coda-src_venus_fso1.cc /usr/ports/net/coda6_server/files/patch-coda-src_venus_fso1.cc
--- /root/ports/coda6_server/files/patch-coda-src_venus_fso1.cc	2007-07-12 01:50:20.000000000 -0400
+++ /usr/ports/net/coda6_server/files/patch-coda-src_venus_fso1.cc	1969-12-31 19:00:00.000000000 -0500
@@ -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 -urN /root/ports/coda6_server/files/patch-lib-src-base-coda_getaddrinfo.c /usr/ports/net/coda6_server/files/patch-lib-src-base-coda_getaddrinfo.c
--- /root/ports/coda6_server/files/patch-lib-src-base-coda_getaddrinfo.c	2007-07-12 01:50:20.000000000 -0400
+++ /usr/ports/net/coda6_server/files/patch-lib-src-base-coda_getaddrinfo.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
---- lib-src/base/coda_getaddrinfo.c.orig	Mon Aug 16 10:42:57 2004
-+++ lib-src/base/coda_getaddrinfo.c	Mon Aug 16 10:46:09 2004
-@@ -37,6 +37,10 @@
- #endif
- 
- #include <sys/types.h>
-+#include <sys/param.h>
-+#include <netinet/in.h>
-+#include <arpa/nameser.h>
-+#include <resolv.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
diff -urN /root/ports/coda6_server/files/patch-pioctl.h /usr/ports/net/coda6_server/files/patch-pioctl.h
--- /root/ports/coda6_server/files/patch-pioctl.h	2007-07-12 01:50:20.000000000 -0400
+++ /usr/ports/net/coda6_server/files/patch-pioctl.h	1969-12-31 19:00:00.000000000 -0500
@@ -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
diff -u /root/ports/coda6_client/pkg-plist /usr/ports/net/coda6_client/pkg-plist
--- /root/ports/coda6_client/pkg-plist	2007-07-12 02:13:16.000000000 -0400
+++ /usr/ports/net/coda6_client/pkg-plist	2007-07-12 02:13:29.000000000 -0400
@@ -19,12 +19,9 @@
 bin/xaskuser
 bin/xfrepair
 etc/coda/realms
-etc/coda/sidekick.intr.ex
 etc/coda/venus.conf.ex
 sbin/asrlauncher
-sbin/coda-client-logrotate
 sbin/codaconfedit
-sbin/sidekick
 sbin/venus
 sbin/venus-setup
 sbin/volmunge


>Release-Note:
>Audit-Trail:
>Unformatted: