cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unbreak openafs by not compiling the lkm; this is temporary

Browse Source 
use one param.i386_obsd.h file to support any release instead of
 adding/removing files each OSrev of OpenBSD
regen patches while here
bump PKGNAME
This commit is contained in:
todd 2007-09-24 19:36:49 +00:00
parent b0aba0361f
commit a54c908a97
9 changed files with 34 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
net/openafs/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.13 2007/09/15 22:36:56 merdely Exp $
# $OpenBSD: Makefile,v 1.14 2007/09/24 19:36:49 todd Exp $
BROKEN= does not build
ONLY_FOR_ARCHS= i386
COMMENT= Distributed filesystem OpenAFS
DISTNAME= openafs-1.4.0-src
PKGNAME= openafs-1.4.0p5
PKGNAME= openafs-1.4.0p6
CATEGORIES= net
HOMEPAGE= http://www.openafs.org
@ -30,22 +29,14 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--enable-namei-fileserver \
--enable-largefile-fileserver \
--enable-supergroups \
--with-afs-sysname=${ARCH}_obsd${OSrev}
--with-afs-sysname=${ARCH}_obsd${OSrev} \
--disable-kernel-module
WRKDIST= ${WRKDIR}/${DISTNAME:S/-src$//}
post-patch:
@cp ${FILESDIR}/param.i386_obsd40.h \
${WRKSRC}/src/config/param.${ARCH}_obsd${OSrev}.h
pre-configure:
@if [ ! -d /usr/src/sys ]; then \
echo ""; \
echo "*** Error: Building this package requires the"; \
echo "*** kernel sources to be available under /usr/src/sys"; \
echo ""; \
exit 1; \
fi
@sed 's/%OSrev%/'${OSrev}'/g' ${FILESDIR}/param.i386_obsd.h \
> ${WRKSRC}/src/config/param.${ARCH}_obsd${OSrev}.h
post-install:
@${INSTALL_DATA_DIR} ${PREFIX}/share/

6
net/openafs/files/param.i386_obsd40.h → net/openafs/files/param.i386_obsd.h
View File

@ -1,5 +1,5 @@
/*
* $OpenBSD: param.i386_obsd40.h,v 1.2 2007/02/19 21:09:10 bernd Exp $
* $OpenBSD: param.i386_obsd.h,v 1.1 2007/09/24 19:36:49 todd Exp $
* Jim Rees, University of Michigan CITI
*/
@ -10,8 +10,8 @@
#include <sys/param.h>
#endif
#define SYS_NAME "i386_obsd41"
#define SYS_NAME_ID SYS_NAME_ID_i386_obsd41
#define SYS_NAME "i386_obsd%OSrev%"
#define SYS_NAME_ID SYS_NAME_ID_i386_obsd%OSrev%
#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */
#define AFS_X86_XBSD_ENV 1

6
net/openafs/patches/patch-Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2006/01/31 02:49:24 marco Exp $
$OpenBSD: patch-Makefile_in,v 1.2 2007/09/24 19:36:49 todd Exp $
--- Makefile.in.orig Mon Jul 11 14:29:31 2005
+++ Makefile.in Thu Dec 15 15:30:45 2005
+++ Makefile.in Mon Sep 24 14:04:00 2007
@@ -221,7 +221,7 @@ viced: cmd comerr vlserver audit
tviced: cmd comerr viced vlserver libafsrpc libafsauthent
@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2006/01/31 02:49:24 marco Exp $
${COMPILE_PART1} tviced ${COMPILE_PART2} ;; \
*_darwin_[1-6][0-9]) \
echo Not building MT viced for ${SYS_NAME} ;; \
@@ -236,7 +236,7 @@ volser: cmd comerr tviced usd kauth audi
@@ -236,7 +236,7 @@ volser: cmd comerr tviced usd kauth audit
tvolser: project tviced usd libafsrpc libafsauthent
case ${SYS_NAME} in \

8
net/openafs/patches/patch-src_afsmonitor_afsmonitor_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_afsmonitor_afsmonitor_c,v 1.1.1.1 2006/01/31 02:49:24 marco Exp $
--- src/afsmonitor/afsmonitor.c.orig Thu Aug 11 23:34:05 2005
+++ src/afsmonitor/afsmonitor.c Thu Aug 11 23:34:33 2005
@@ -272,7 +272,7 @@ extern char *cm_categories[]; /* cache m
$OpenBSD: patch-src_afsmonitor_afsmonitor_c,v 1.2 2007/09/24 19:36:49 todd Exp $
--- src/afsmonitor/afsmonitor.c.orig Sun Apr 3 13:15:42 2005
+++ src/afsmonitor/afsmonitor.c Mon Sep 24 14:03:54 2007
@@ -272,7 +272,7 @@ extern char *cm_categories[]; /* cache manager data ca

8
net/openafs/patches/patch-src_bozo_bosserver_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_bozo_bosserver_c,v 1.1.1.1 2006/01/31 02:49:24 marco Exp $
--- src/bozo/bosserver.c.orig Tue Dec 27 01:48:57 2005
+++ src/bozo/bosserver.c Tue Dec 27 02:07:01 2005
@@ -1056,6 +1056,8 @@ bozo_Log(char *a, char *b, char *c, char
$OpenBSD: patch-src_bozo_bosserver_c,v 1.2 2007/09/24 19:36:49 todd Exp $
--- src/bozo/bosserver.c.orig Mon Jul 11 14:08:36 2005
+++ src/bozo/bosserver.c Mon Sep 24 14:03:54 2007
@@ -1056,6 +1056,8 @@ bozo_Log(char *a, char *b, char *c, char *d, char *e,
}
/* close so rm BosLog works */

9
net/openafs/patches/patch-src_config_afs_sysnames_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_config_afs_sysnames_h,v 1.3 2007/02/19 21:09:10 bernd Exp $
--- src/config/afs_sysnames.h.orig Mon May 23 23:17:41 2005
+++ src/config/afs_sysnames.h Mon Feb 19 11:37:01 2007
@@ -214,6 +214,10 @@
$OpenBSD: patch-src_config_afs_sysnames_h,v 1.4 2007/09/24 19:36:49 todd Exp $
--- src/config/afs_sysnames.h.orig Mon May 23 16:17:41 2005
+++ src/config/afs_sysnames.h Mon Sep 24 14:06:44 2007
@@ -214,6 +214,11 @@
#define SYS_NAME_ID_i386_obsd35 2604
#define SYS_NAME_ID_i386_obsd36 2605
#define SYS_NAME_ID_i386_obsd37 2606
@ -9,6 +9,7 @@ $OpenBSD: patch-src_config_afs_sysnames_h,v 1.3 2007/02/19 21:09:10 bernd Exp $
+#define SYS_NAME_ID_i386_obsd39 2608
+#define SYS_NAME_ID_i386_obsd40 2609
+#define SYS_NAME_ID_i386_obsd41 2610
+#define SYS_NAME_ID_i386_obsd42 2611
#define SYS_NAME_ID_amd64_linux2 2700
#define SYS_NAME_ID_amd64_linux22 2701

8
net/openafs/patches/patch-src_des_stats_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_des_stats_h,v 1.1.1.1 2006/01/31 02:49:24 marco Exp $
--- src/des/stats.h.orig Tue Dec 27 01:49:31 2005
+++ src/des/stats.h Tue Dec 27 01:49:56 2005
@@ -110,9 +110,6 @@ extern int rxkad_stats_agg(rxkad_stats_t
$OpenBSD: patch-src_des_stats_h,v 1.2 2007/09/24 19:36:49 todd Exp $
--- src/des/stats.h.orig Tue May 31 08:26:01 2005
+++ src/des/stats.h Mon Sep 24 14:03:54 2007
@@ -110,9 +110,6 @@ extern int rxkad_stats_agg(rxkad_stats_t *);
BEGIN \
rxkad_stats_t * rxkad_stats; \
rxkad_stats = ((rxkad_stats_t*)pthread_getspecific(rxkad_stats_key)); \

8
net/openafs/patches/patch-src_rxkad_domestic_crypt_conn_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_rxkad_domestic_crypt_conn_c,v 1.1.1.1 2006/01/31 02:49:24 marco Exp $
$OpenBSD: patch-src_rxkad_domestic_crypt_conn_c,v 1.2 2007/09/24 19:36:49 todd Exp $
--- src/rxkad/domestic/crypt_conn.c.orig Sun May 29 23:57:38 2005
+++ src/rxkad/domestic/crypt_conn.c Thu Dec 15 17:24:47 2005
@@ -62,7 +62,8 @@ rxkad_DecryptPacket(const struct rx_conn
+++ src/rxkad/domestic/crypt_conn.c Mon Sep 24 14:03:54 2007
@@ -62,7 +62,8 @@ rxkad_DecryptPacket(const struct rx_connection *conn,
obj = rx_SecurityObjectOf(conn);
tp = (struct rxkad_cprivate *)obj->privateData;
@ -11,7 +11,7 @@ $OpenBSD: patch-src_rxkad_domestic_crypt_conn_c,v 1.1.1.1 2006/01/31 02:49:24 ma
memcpy((void *)xor, (void *)ivec, sizeof(xor));
for (i = 0; len; i++) {
data = rx_data(packet, i, tlen);
@@ -96,7 +97,7 @@ rxkad_EncryptPacket(const struct rx_conn
@@ -96,7 +97,7 @@ rxkad_EncryptPacket(const struct rx_connection * conn,
obj = rx_SecurityObjectOf(conn);
tp = (struct rxkad_cprivate *)obj->privateData;

3
net/openafs/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2006/01/31 02:49:24 marco Exp $
@comment $OpenBSD: PLIST,v 1.2 2007/09/24 19:36:49 todd Exp $
bin/afsmonitor
bin/bos
bin/cmdebug
@ -201,7 +201,6 @@ lib/librxkad.a
lib/librxstat.a
lib/libubik.a
lib/openafs/
lib/openafs/libafs.o
libexec/openafs/
libexec/openafs/buserver
libexec/openafs/fileserver