head	1.6;
access;
symbols
	RELEASE_6_1_0:1.5
	RELEASE_5_5_0:1.5
	RELEASE_6_0_0:1.5
	RELEASE_5_4_0:1.5
	RELEASE_4_11_0:1.5
	RELEASE_5_3_0:1.5
	RELEASE_4_10_0:1.5
	RELEASE_5_2_1:1.5
	RELEASE_5_2_0:1.5
	RELEASE_4_9_0:1.5
	RELEASE_5_1_0:1.5
	RELEASE_4_8_0:1.5
	RELEASE_5_0_0:1.5
	RELEASE_4_7_0:1.5
	RELEASE_4_6_2:1.5
	RELEASE_4_6_1:1.5
	RELEASE_4_6_0:1.5
	RELEASE_5_0_DP1:1.5
	RELEASE_4_5_0:1.5
	RELEASE_4_4_0:1.5
	RELEASE_4_3_0:1.5
	RELEASE_4_2_0:1.5
	RELEASE_4_1_1:1.5
	RELEASE_4_1_0:1.5
	RELEASE_3_5_0:1.5
	RELEASE_4_0_0:1.5
	RELEASE_3_4_0:1.4
	RELEASE_3_3_0:1.4
	RELEASE_3_2_0:1.4
	RELEASE_3_1_0:1.3
	RELEASE_2_2_8:1.3
	RELEASE_3_0_0:1.3
	RELEASE_2_2_7:1.3
	RELEASE_2_2_6:1.2
	ARCHIE_1:1.1.1.1
	WHISTLE_ARCHIE:1.1.1;
locks; strict;
comment	@# @;


1.6
date	2006.04.06.13.54.44;	author archie;	state dead;
branches;
next	1.5;

1.5
date	2000.01.26.01.55.12;	author archie;	state Exp;
branches;
next	1.4;

1.4
date	99.03.10.22.27.52;	author archie;	state Exp;
branches;
next	1.3;

1.3
date	98.04.13.00.17.44;	author julian;	state Exp;
branches;
next	1.2;

1.2
date	98.01.13.20.26.20;	author julian;	state Exp;
branches;
next	1.1;

1.1
date	98.01.09.23.23.49;	author julian;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	98.01.09.23.23.49;	author julian;	state Exp;
branches;
next	;


desc
@@


1.6
log
@Remove the skip port. Created before there was an IPSec implementation on
FreeBSD, it is now extremely obsolete. In any case it doesn't compile. Earlier
version of this port can still be used on older versions of FreeBSD of course.
@
text
@diff -ur --unidirectional-new-file skipsrc-1.0.orig/libdb/hash/ndbm.c work.new/libdb/hash/ndbm.c
--- skipsrc-1.0.orig/libdb/hash/ndbm.c	Fri Oct 25 13:12:22 1996
+++ work.new/libdb/hash/ndbm.c	Mon Jan 24 12:35:38 2000
@@@@ -180,7 +180,7 @@@@
 	HTAB *hp;
 
 	hp = (HTAB *)db->internal;
-	return (hp->errno);
+	return (hp->errnum);
 }
 
 extern int
@@@@ -190,7 +190,7 @@@@
 	HTAB *hp;
 
 	hp = (HTAB *)db->internal;
-	hp->errno = 0;
+	hp->errnum = 0;
 	return (0);
 }
 
@


1.5
log
@Bash this port until it compiles under -current again.
@
text
@@


1.4
log
@Build SKIP port as a KLD instead of an LKM.
@
text
@d1 20
a20 48
diff -ur --unidirectional-new-file skipsrc-1.0.orig/skip/freebsd/Makefile work.new/skip/freebsd/Makefile
--- skipsrc-1.0.orig/skip/freebsd/Makefile	Fri Oct 25 13:12:41 1996
+++ work.new/skip/freebsd/Makefile	Tue Mar  9 19:07:45 1999
@@@@ -1,105 +1,3 @@@@
-# SKIP Source Code License Statement:
-# ------------------------------------------------------------------
-#   Copyright
-#   Sun Microsystems, Inc.
-# 
-# 
-#   Copyright (C) 1994, 1995, 1996 Sun Microsystems, Inc.  All Rights
-#   Reserved.
-# 
-#   Permission is hereby granted, free of charge, to any person
-#   obtaining a copy of this software and associated documentation
-#   files (the "Software"), to deal in the Software without
-#   restriction, including without limitation the rights to use,
-#   copy, modify, merge, publish, distribute, sublicense, and/or sell
-#   copies of the Software or derivatives of the Software, and to 
-#   permit persons to whom the Software or its derivatives is furnished 
-#   to do so, subject to the following conditions:
-# 
-#   The above copyright notice and this permission notice shall be
-#   included in all copies or substantial portions of the Software.
-# 
-#   The Software must not be transferred to persons who are not US
-#   citizens or permanent residents of the US or exported outside
-#   the US (except Canada) in any form (including by electronic
-#   transmission) without prior written approval from the US
-#   Government. Non-compliance with these restrictions constitutes
-#   a violation of the U.S. Export Control Laws.
-# 
-#   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-#   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-#   OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-#   NONINFRINGEMENT.  IN NO EVENT SHALL SUN MICROSYSTEMS, INC., BE LIABLE
-#   FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-#   OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-#   CONNECTION WITH THE SOFTWARE OR DERIVATES OF THIS SOFTWARE OR 
-#   THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# 
-#   Except as contained in this notice, the name of Sun Microsystems, Inc.
-#   shall not be used in advertising or otherwise to promote
-#   the sale, use or other dealings in this Software or its derivatives 
-#   without prior written authorization from Sun Microsystems, Inc.
-#pragma ident "@@(#)Makefile	1.20 96/02/05 Sun Microsystems"
+all depend install clean:
+	MAKEFLAGS= MFLAGS= MAKELEVEL= /usr/bin/make -f Makefile.bmake $@@
a21 62
-include ../../Makefile.defs
-
-CPPOPTS	=	-DINET $(K_FLAGS) -D$(K_ARCH) -D__$(K_ARCH)__ \
-		-I$(COMM_INC) -I. 
-COPTS	=	${CPPOPTS} -c 
-CFLAGS	=	${COPTS} $(K_DEBUG)
-
-CFILES	=	skip_wrapper.c skip_es.c 
-
-
-ES_OBJS =	$(CFILES:%.c=$(K_DIR)/%.o)
-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
-
-all:	$(K_DIR) $(K_DIR)/skip.o
-
-$(K_DIR)/skip_wrapper.o: skip_wrapper.c
-	$(CC) $(CFLAGS) -o $@@  $<
-
-$(K_DIR)/skip_es.o: skip_es.c
-	$(CC) $(CFLAGS) -o $@@  $<
-
-
-$(K_DIR):
-	@@[ -d $(K_DIR) ] || mkdir -p $(K_DIR)
-
-$(K_DIR)/skip.o: $(OBJS)
-	$(LD) -r -o $(K_DIR)/skip.o $(OBJS)
-	@@ /usr/bin/modstat
-
-clean:
-	@@$(RM) -r $(K_DIR) *.pp *.L 
-	@@-$(SCCSCLEAN)
-
-cleanall:
-	@@$(RM) -rf *bin.*
-	@@-$(SCCSCLEAN)
-	
@


1.3
log
@Submitted by:	archie Cobbs (archie@@whistle.com)
updates to make skip port work better, from the original porter.
@
text
@d1 48
a48 14
diff -ur --unidirectional-new-file skipsrc-1.0.orig/skip/freebsd/skip_os.h skipsrc-1.0/skip/freebsd/skip_os.h
--- skipsrc-1.0.orig/skip/freebsd/skip_os.h	Fri Oct 25 13:12:43 1996
+++ skipsrc-1.0/skip/freebsd/skip_os.h	Sun Apr 12 15:52:01 1998
@@@@ -54,7 +54,6 @@@@
 #ifndef KERNEL
 #include <stdio.h>
 #include <string.h>
-#include <strings.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
@@@@ -69,6 +68,12 @@@@
 #include <dirent.h>
 #endif
d50 49
a98 151
+#include <osreldate.h>
+
+#ifdef KERNEL
+#include <sys/cdefs.h>
+#endif
+
 #include <sys/types.h>
 #include <sys/errno.h>
 #include <sys/time.h>
@@@@ -77,16 +82,23 @@@@
 #include <sys/malloc.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
+#if __FreeBSD_version >= 300000
+#include <sys/socketvar.h> 
+#endif
 #include <sys/syslog.h>
 #include <sys/param.h>
 #include <sys/uio.h>
 #include <sys/file.h>
 #include <sys/sockio.h>
 #include <sys/wait.h>
+#include <sys/fcntl.h>
 
 #ifndef  __cplusplus
 #include <machine/cpu.h>
 #include <net/if.h>
+#if __FreeBSD_version >= 300000
+#include <net/if_var.h>
+#endif
 #include <netinet/in_systm.h>
 #endif
 #include <netinet/in.h>
@@@@ -94,8 +106,8 @@@@
 #include <netinet/ip.h>
 #include <netinet/udp.h>
 #include <netinet/in_var.h>
-#include <arpa/inet.h>
 #endif
+#include <arpa/inet.h>
 
 /* 
  * Basic required types and constants
@@@@ -116,6 +128,7 @@@@
 #include <sys/sysent.h>
 #include <sys/exec.h>
 #include <sys/lkm.h>
+#include <sys/sysproto.h>
 #include <sys/protosw.h>
 #include <net/route.h>
 #include <sys/kernel.h>
@@@@ -123,6 +136,7 @@@@
 #include <net/netisr.h>
 #include <sys/proc.h>
 #include <sys/device.h>
+#include <sys/libkern.h>
 
 #define	PANIC(s)		panic(s)
 
@@@@ -131,11 +145,17 @@@@
  */
 #define	SYSMEM_ALLOC(size)	malloc((u_long)size, M_PCB, M_NOWAIT) 
 #define	SYSMEM_FREE(m, n)	free(m, M_PCB)
-#define	BCOPY(s, d, n)		bcopy((caddr_t) s, (caddr_t) d, n)
-#define	BZERO(s, n)		bzero((caddr_t) s, n)
-#define	BCMP(s, d, n)		bcmp((caddr_t) s, (caddr_t) d, n)
 #define	STATIC			static
 
+/*
+ * The kernel doesn't have memcpy() or memcmp(), but gcc will inline them
+ */
+#ifdef KERNEL
+extern int	memcmp(const void *, const void *, size_t);
+#endif
+#define	BCOPY(s, d, n)		memcpy((caddr_t) (d), (caddr_t) (s), n)
+#define	BCMP(s, d, n)		memcmp((caddr_t) (d), (caddr_t) (s), n)
+#define	BZERO(s, n)		bzero((caddr_t) (s), n)
 
 #define ALIGNED(x)		(((unsigned int)(x)&(skip_alignment - 1)) == 0)
 
@@@@ -182,7 +202,11 @@@@
 /*
  * 4.x timing defines
  */
+#if __FreeBSD__ >= 3
+#define SKIP_ES_CURRENTTIME	((long)time_second)
+#else
 #define SKIP_ES_CURRENTTIME	(time.tv_sec)
+#endif
 #define SKIP_ES_DELTATIME(then)	(SKIP_ES_CURRENTTIME - then)
 
 /*
@@@@ -205,26 +229,21 @@@@
 }
 
 /*
+ * Whether to use old or new timeout()/untimeout() interface
+ */
+#if __FreeBSD_version >= 300001
+#define NEW_TIMEOUT_INTERFACE
+#endif
+
+/*
  * ANSI prototypes for system routines
  */
+#if __FreeBSD_version < 300000
 extern int			splimp();
 extern int			splnet();
-extern void			splx(int);
-extern void			m_freem(struct mbuf *);
-extern void			panic(const char *, ...);
-extern int			tsleep(void *, int, char *, int);
-extern void			wakeup(void *);
-extern int			uiomove(caddr_t, int, struct uio *);
-extern int     			copyin(void *, void *, u_int );
-extern int			copyout(void *, void *, u_int);
-extern int			mclget(struct mbuf *);
-extern int			m_cpytoc(struct mbuf *, int, int, caddr_t);
-
-extern void 			log(int, const char *, ...);
-
-extern char			*strncpy(char *, const char *, size_t);
+extern void			splx(int s);
+#endif
 
-extern void			printf(const char *, ...);
 #else /* KERNEL */
 
 /*
@@@@ -251,37 +270,12 @@@@
 #endif
 #define	STATIC
 
-/*
- * ANSI prototypes for C library routines and syscalls
- */
-extern int			gethostname(char *, int);
-extern int			fprintf(FILE *, const char *, ...);
-extern int			fflush(FILE *);
-extern int			fgetc(FILE *);
-extern int			fseek(FILE *, long, int);
-extern size_t			fread(void *, size_t, size_t, FILE *);
-extern int			fclose(FILE *);
-extern int			socket(int, int, int);
-extern int			ioctl(int, int, ...);
-extern int			pclose(FILE *);
-/*extern int			getrlimit(int, struct rlimit *); */
-extern void			perror(const char *);
-extern time_t			time(time_t *);
-extern int			getopt(int, char * const *, const char *);
-extern int			sscanf(const char *, const char *, ...);
d100 3
a102 7
 #endif /* KERNEL */
 
-/* XXX Bad IPPROTO_ENCAP define  ? */
-#ifdef IPPROTO_ENCAP
-#undef IPPROTO_ENCAP
-#endif
-#define IPPROTO_ENCAP		4
d104 3
a106 13
 /* SKIP specific */
 
-#define SKIP_DIR		"/etc/skip/"
-#define SKIP_BIN		"/usr/skip/bin"
+#define SKIP_DIR		"@@@@PREFIX@@@@/etc/skip/"
+#define SKIP_BIN		"@@@@PREFIX@@@@/bin"
 #define KEYMGR			"/dev/skip_key"
 
 /*
@@@@ -306,12 +300,6 @@@@
 /* General purpose */
 
 typedef unsigned char byte;
d108 4
a111 8
-#if 0
-extern void			bcopy(void *, void *, int);
-extern void			bzero(void *, int);
-extern int			bcmp(void *, void *, int);
-#endif
 
 #define	SKIP_IFCMP(if1, if2)    strcmp(if1, if2)
 
@


1.2
log
@Submitted by:	archie@@whistle.com
make this compile under FreeBSD 3.x
@
text
@d3 1
a3 1
+++ skipsrc-1.0/skip/freebsd/skip_os.h	Tue Jan 13 11:19:16 1998
d96 13
a108 1
@@@@ -205,26 +225,21 @@@@
d145 1
a145 1
@@@@ -251,37 +266,12 @@@@
d185 1
a185 1
@@@@ -306,12 +296,6 @@@@
@


1.1
log
@Initial revision
@
text
@d3 1
a3 1
+++ skipsrc-1.0/skip/freebsd/skip_os.h	Mon Dec 15 17:44:31 1997
d25 10
a34 1
@@@@ -83,10 +88,14 @@@@
d49 1
a49 1
@@@@ -94,8 +103,8 @@@@
d59 1
a59 1
@@@@ -116,6 +125,7 @@@@
d67 1
a67 1
@@@@ -123,6 +133,7 @@@@
d75 1
a75 1
@@@@ -131,11 +142,17 @@@@
d96 1
a96 1
@@@@ -205,26 +222,21 @@@@
d133 1
a133 1
@@@@ -251,37 +263,12 @@@@
d173 1
a173 1
@@@@ -306,12 +293,6 @@@@
@


1.1.1.1
log
@Add a package for the SKIP package from Sun Microsystems,
for making secure pipes across the internet (etc.)
@
text
@@
