Build SKIP port as a KLD instead of an LKM.

1 files changed, 41 insertions, 83 deletions

diff --git a/security/skip/files/patch-bh b/security/skip/files/patch-bh
index b528ca23c257..4ef3dc458d4f 100644
--- a/security/skip/files/patch-bh
+++ b/security/skip/files/patch-bh
@@ -1,89 +1,47 @@
-diff -ur --unidirectional-new-file skipsrc-1.0.orig/skip/freebsd/skip_wrapper.c skipsrc-1.0/skip/freebsd/skip_wrapper.c
---- skipsrc-1.0.orig/skip/freebsd/skip_wrapper.c	Fri Oct 25 13:12:43 1996
-+++ skipsrc-1.0/skip/freebsd/skip_wrapper.c	Mon Dec 22 12:48:43 1997
-@@ -66,18 +66,7 @@
- #include <skip_es.h>
- #include <skip_if.h>
- 
--
--/*
-- * SunOS 4.1.x loadable driver wrapper for the SKIP module
-- */
--extern char		skip_module_name[];
--
--/*
-- * Module linkage information for the kernel.
-- */
--extern int		nulldev();
--
--struct cfdriver skipcd=
-+struct cfdriver skipcd =
-         { NULL, "skip", NULL, NULL, DV_DULL, 0 };
- 
- struct cdevsw skipdevsw = {
-@@ -85,36 +74,55 @@
- 	NULL, NULL, NULL, skip_ifselect, NULL, NULL 
- };
- 
--MOD_DEV("skipmod", LM_DT_CHAR, -1, (void *)&skipdevsw)
-+/* The following is necessary to work around a bug in versions
-+   of FreeBSD's lkm.h up to and including 2.2.5 */
+diff -ur --unidirectional-new-file skipsrc-1.0.orig/skip/freebsd/Makefile.bmake work.new/skip/freebsd/Makefile.bmake
+--- skipsrc-1.0.orig/skip/freebsd/Makefile.bmake	Wed Dec 31 16:00:00 1969
++++ work.new/skip/freebsd/Makefile.bmake	Tue Mar  9 20:44:40 1999
+@@ -0,0 +1,43 @@
 +
-+#if __FreeBSD__ >= 2
-+#include <osreldate.h>
-+#if __FreeBSD_version <= 225000
-+#define skip_module _module
-+#endif
-+#endif
++.include "../../Makefile.defs"
 +
-+MOD_DEV(skip, LM_DT_CHAR, -1, (void *)&skipdevsw);
- 
- extern int		skip_init(), skip_uninit();
- 
- /*ARGSUSED*/
--int
--skipmod_load(struct lkm_table *lkmtp, int cmd)
-+static int
-+skip_load(struct lkm_table *lkmtp, int cmd)
- {
--
- 	int rc;
++CPPOPTS	=	-DINET $(K_FLAGS) -D$(K_ARCH) -D__$(K_ARCH)__ \
++		-I$(COMM_INC) -I. 
++COPTS	=	${CPPOPTS} -c 
++CFLAGS	=	${COPTS} $(K_DEBUG)
 +
- 	rc = skip_init();
- 	if (rc != 0) {
- 		return (rc);
- 	}
--	uprintf("skip: driver loaded\n");
-+	log(LOG_INFO, "skip: driver loaded\n");
- 	return (0);
- }
- 
--skipmod_unload(struct lkm_table *lkmtp, int cmd)
-+static int
-+skip_unload(struct lkm_table *lkmtp, int cmd)
- {
--	
- 	int rc;
++CFILES	=	skip_wrapper.c skip_es.c 
 +
- 	rc = skip_uninit();
- 	if (rc == 0) {
--		uprintf("skip: driver unloaded\n");
-+		log(LOG_INFO, "skip: driver unloaded\n");
- 	}
- 	return (rc);
- }
- 
--xxxinit(struct lkm_table *lkmtp, int cmd, int ver)
-+static int
-+skip_stat(struct lkm_table *lkmtp, int cmd)
-+{
-+	return(ENOSYS);
-+}
++ES_OBJS =	skip_wrapper.o skip_es.o
 +
-+int
-+skip(struct lkm_table *lkmtp, int cmd, int ver)
- {
--	DISPATCH(lkmtp, cmd, ver, skipmod_load, skipmod_unload, nosys);
-+	MOD_DISPATCH(skip, lkmtp, cmd, ver, skip_load, skip_unload, skip_stat);
- }
++CRYPTS	=	../bdcmod/simplecrypt/$(K_DIR)/simplecrypt.o \
++		../bdcmod/fast_des_cbc/$(K_DIR)/descbc.o  \
++		../bdcmod/fast_des_cbc/$(K_DIR)/des.o  \
++		../bdcmod/fast_des_cbc/$(K_DIR)/dessp.o  \
++		../bdcmod/des_ede_cbc/$(K_DIR)/des_ede_cbc.o \
++		../bdcmod/des_ede_cbc/$(K_DIR)/des_ede_ecb.o \
++		../bdcmod/safer/$(K_DIR)/skip_safercbc.o \
++		../bdcmod/safer/$(K_DIR)/safer.o 
 +
++COMDIR	=	../common/$(K_DIR)
++
++COMOBJS	=	$(COMDIR)/skip_hdr.o $(COMDIR)/skip_es_bypass.o \
++		$(COMDIR)/skip_crypt.o $(COMDIR)/skip_ioctl.o \
++		$(COMDIR)/skip_keystore.o $(COMDIR)/skip_keymgrmsgs.o \
++		$(COMDIR)/skip_ipsp.o $(COMDIR)/skip_nsid.o \
++		$(COMDIR)/skip_ah.o  $(COMDIR)/skip_md5.o $(COMDIR)/skip_acl.o
++
++MDV_OBJ	=	$(COMDIR)/md5.o
++
++OBJS	=	$(ES_OBJS) $(COMOBJS) $(CRYPTS) $($(AHOBJS))
++
++HDRS	=	$(COMM_INC)/skip_keymgrmsgs.h $(COMM_INC)/skip_ioctl.h \
++		$(COMM_INC)/skip_key.h $(COMM_INC)/skip_crypt.h \
++		$(COMM_INC)/skip_types.h $(COMM_INC)/skip_es.h \
++		$(COMM_INC)/skip_sunos.h $(COMM_INC)/skip_proto.h \
++		skip_if.h $(COMM_INC)/skip_acl.h
++
++KMOD	=	skip
++KLDMOD	=	yes
++
++.include <bsd.kmod.mk>