mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-02 06:03:50 +00:00
Code Issues Releases Activity

- Resolve build failures in 9.0-STABLE and 10-CURRENT

Browse Source 
PR:		ports/161405, ports/161366
Submitted by:	Ben Kaduk <kaduk@mit.edu> (maintainer)
This commit is contained in:
Ryan Steinmetz 2011-10-15 00:37:24 +00:00
parent 94f91e81f7
commit 7e4996eff4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=283548
5 changed files with 72 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/openafs/Makefile
View File

@ -8,6 +8,7 @@
PORTNAME= openafs
DISTVERSION= ${AFS_DISTVERSION}.${DBVERSION:S/-//g}
PORTREVISION= 1
CATEGORIES= net kld
MASTER_SITES= http://dl.central.org/dl/openafs/${AFS_DISTVERSION}/:openafs \
http://dl.openafs.org/dl/openafs/${AFS_DISTVERSION}/:openafs \
@ -37,6 +38,7 @@ PATCH_STRIP= -p1
USE_BZIP2= yes
HAS_CONFIGURE= yes
USE_RC_SUBR= afsd afsserver
MAKE_JOBS_UNSAFE= yes
ONLY_FOR_ARCHS= i386 amd64

22
net/openafs/files/patch-src__afs__FBSD__osi_groups.c Normal file
View File

@ -0,0 +1,22 @@
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.
*/

16
net/openafs/files/patch-src__afs__afs_pioctl.c Normal file
View File

@ -0,0 +1,16 @@
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)

16
net/openafs/files/patch-src__afs__afs_prototypes.h Normal file
View File

@ -0,0 +1,16 @@
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)

16
net/openafs/files/patch-src__rx__FBSD__rx_knet.c Normal file
View File

@ -0,0 +1,16 @@
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",