Attachment #118955 for bug #161405

View | Details | Raw Unified | Return to bug 161405
Collapse All | Expand All

Lines 8-13 Link Here

(-)openafs.submit/Makefile (+1 lines)
8		8
9	PORTNAME= openafs	9	PORTNAME= openafs
10	DISTVERSION= ${AFS_DISTVERSION}.${DBVERSION:S/-//g}	10	DISTVERSION= ${AFS_DISTVERSION}.${DBVERSION:S/-//g}
		11	PORTREVISION= 1
11	CATEGORIES= net kld	12	CATEGORIES= net kld
12	MASTER_SITES= http://dl.central.org/dl/openafs/${AFS_DISTVERSION}/:openafs \	13	MASTER_SITES= http://dl.central.org/dl/openafs/${AFS_DISTVERSION}/:openafs \
13	http://dl.openafs.org/dl/openafs/${AFS_DISTVERSION}/:openafs \	14	http://dl.openafs.org/dl/openafs/${AFS_DISTVERSION}/:openafs \




diff --git a/src/afs/FBSD/osi_groups.c b/src/afs/FBSD/osi_groups.c
index ef62478..e897f46 100644
--- a/src/afs/FBSD/osi_groups.c
+++ b/src/afs/FBSD/osi_groups.c
@@ -48,9 +48,17 @@ Afs_xsetgroups(struct thread *td, struct setgroups_args *uap)
     AFS_GUNLOCK();
     crfree(cr);
     if (code)
+#if (__FreeBSD_version >= 900044)
+	return sys_setgroups(td, uap);	/* afs has shut down */
+#else
 	return setgroups(td, uap);	/* afs has shut down */
+#endif
 
+#if (__FreeBSD_version >= 900044)
+    code = sys_setgroups(td, uap);
+#else
     code = setgroups(td, uap);
+#endif
     /* Note that if there is a pag already in the new groups we don't
      * overwrite it with the old pag.
      */




diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c
index cf432d6..2589b79 100644
--- a/src/afs/afs_pioctl.c
+++ b/src/afs/afs_pioctl.c
@@ -874,7 +874,11 @@ afs_xioctl(afs_proc_t *p, const struct ioctl_args *uap, register_t *retval)
 
     if (!ioctlDone) {
 # if defined(AFS_FBSD_ENV)
+#  if (__FreeBSD_version >= 900044)
+	return sys_ioctl(td, uap);
+#  else
 	return ioctl(td, uap);
+#  endif
 # elif defined(AFS_OBSD_ENV)
 	code = sys_ioctl(p, uap, retval);
 # elif defined(AFS_NBSD_ENV)




diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h
index 04f13ad..4135ebb 100644
--- a/src/afs/afs_prototypes.h
+++ b/src/afs/afs_prototypes.h
@@ -935,8 +935,9 @@ extern int copyin_afs_ioctl(caddr_t cmarg, struct afs_ioctl *dst);
 #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
 #ifdef AFS_DARWIN100_ENV
 extern int afs3_syscall(afs_proc_t *p, void *args, unsigned int *retval);
-#elif defined(AFS_FBSD90_ENV) || defined(AFS_FBSD82_ENV)
-/* afs3_syscall prototype is in sys/sysproto.h */
+#elif (defined(AFS_FBSD90_ENV) || defined(AFS_FBSD82_ENV)) && (__FreeBSD_version < 900044)
+/* afs3_syscall prototype is in sys/sysproto.h
+   Yes, they put it in, then took it out again (renamed with a sys_ prefix) */
 #elif defined(AFS_FBSD_ENV)
 extern int afs3_syscall(struct thread *p, void *args);
 #elif defined(AFS_NBSD50_ENV)




diff --git a/src/rx/FBSD/rx_knet.c b/src/rx/FBSD/rx_knet.c
index c6d2d84..ded3f7c 100644
--- a/src/rx/FBSD/rx_knet.c
+++ b/src/rx/FBSD/rx_knet.c
@@ -92,7 +92,11 @@ osi_StopListener(void)
     p = pfind(rxk_ListenerPid);
     if (p) {
 	afs_warn("osi_StopListener: rxk_ListenerPid %u\n", rxk_ListenerPid);
+#if (__FreeBSD_version >= 90004)
+	kern_psignal(p, SIGUSR1);
+#else
 	psignal(p, SIGUSR1);
+#endif
 	PROC_UNLOCK(p);
     } else
 	afs_warn("osi_StopListener: rxk_Listener not found (pid %u)\n",

Return to bug 161405

Line 0 Link Here

(-)openafs.submit/files/patch-src__afs__FBSD__osi_groups.c (+22 lines)
	1	diff --git a/src/afs/FBSD/osi_groups.c b/src/afs/FBSD/osi_groups.c
	2	index ef62478..e897f46 100644
	3	--- a/src/afs/FBSD/osi_groups.c
	4	+++ b/src/afs/FBSD/osi_groups.c
	5	@@ -48,9 +48,17 @@ Afs_xsetgroups(struct thread td, struct setgroups_args uap)
	6	AFS_GUNLOCK();
	7	crfree(cr);
	8	if (code)
	9	+#if (__FreeBSD_version >= 900044)
	10	+ return sys_setgroups(td, uap); /* afs has shut down */
	11	+#else
	12	return setgroups(td, uap); /* afs has shut down */
	13	+#endif
	14
	15	+#if (__FreeBSD_version >= 900044)
	16	+ code = sys_setgroups(td, uap);
	17	+#else
	18	code = setgroups(td, uap);
	19	+#endif
	20	/* Note that if there is a pag already in the new groups we don't
	21	* overwrite it with the old pag.
	22	*/

Line 0 Link Here

(-)openafs.submit/files/patch-src__afs__afs_pioctl.c (+16 lines)
	1	diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c
	2	index cf432d6..2589b79 100644
	3	--- a/src/afs/afs_pioctl.c
	4	+++ b/src/afs/afs_pioctl.c
	5	@@ -874,7 +874,11 @@ afs_xioctl(afs_proc_t p, const struct ioctl_args uap, register_t *retval)
	6
	7	if (!ioctlDone) {
	8	# if defined(AFS_FBSD_ENV)
	9	+# if (__FreeBSD_version >= 900044)
	10	+ return sys_ioctl(td, uap);
	11	+# else
	12	return ioctl(td, uap);
	13	+# endif
	14	# elif defined(AFS_OBSD_ENV)
	15	code = sys_ioctl(p, uap, retval);
	16	# elif defined(AFS_NBSD_ENV)

Line 0 Link Here

(-)openafs.submit/files/patch-src__afs__afs_prototypes.h (+16 lines)
	1	diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h
	2	index 04f13ad..4135ebb 100644
	3	--- a/src/afs/afs_prototypes.h
	4	+++ b/src/afs/afs_prototypes.h
	5	@@ -935,8 +935,9 @@ extern int copyin_afs_ioctl(caddr_t cmarg, struct afs_ioctl *dst);
	6	#if defined(AFS_DARWIN_ENV) \|\| defined(AFS_XBSD_ENV)
	7	#ifdef AFS_DARWIN100_ENV
	8	extern int afs3_syscall(afs_proc_t p, void args, unsigned int *retval);
	9	-#elif defined(AFS_FBSD90_ENV) \|\| defined(AFS_FBSD82_ENV)
	10	-/* afs3_syscall prototype is in sys/sysproto.h */
	11	+#elif (defined(AFS_FBSD90_ENV) \|\| defined(AFS_FBSD82_ENV)) && (__FreeBSD_version < 900044)
	12	+/* afs3_syscall prototype is in sys/sysproto.h
	13	+ Yes, they put it in, then took it out again (renamed with a sys_ prefix) */
	14	#elif defined(AFS_FBSD_ENV)
	15	extern int afs3_syscall(struct thread p, void args);
	16	#elif defined(AFS_NBSD50_ENV)

Line 0 Link Here

(-)openafs.submit/files/patch-src__rx__FBSD__rx_knet.c (+16 lines)
	1	diff --git a/src/rx/FBSD/rx_knet.c b/src/rx/FBSD/rx_knet.c
	2	index c6d2d84..ded3f7c 100644
	3	--- a/src/rx/FBSD/rx_knet.c
	4	+++ b/src/rx/FBSD/rx_knet.c
	5	@@ -92,7 +92,11 @@ osi_StopListener(void)
	6	p = pfind(rxk_ListenerPid);
	7	if (p) {
	8	afs_warn("osi_StopListener: rxk_ListenerPid %u\n", rxk_ListenerPid);
	9	+#if (__FreeBSD_version >= 90004)
	10	+ kern_psignal(p, SIGUSR1);
	11	+#else
	12	psignal(p, SIGUSR1);
	13	+#endif
	14	PROC_UNLOCK(p);
	15	} else
	16	afs_warn("osi_StopListener: rxk_Listener not found (pid %u)\n",