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


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

1.6
date	2001.04.21.17.56.36;	author archie;	state Exp;
branches;
next	1.5;

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

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

1.3
date	2000.01.26.01.55.16;	author archie;	state Exp;
branches;
next	1.2;

1.2
date	99.03.10.22.27.53;	author archie;	state Exp;
branches;
next	1.1;

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

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


desc
@@


1.7
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/skip/freebsd/skip_os.h work.new/skip/freebsd/skip_os.h
--- skipsrc-1.0.orig/skip/freebsd/skip_os.h	Fri Oct 25 13:12:43 1996
+++ work.new/skip/freebsd/skip_os.h	Tue Feb  1 10:02:28 2000
@@@@ -51,10 +51,9 @@@@
 /*
  * FreeBSD
  */
-#ifndef KERNEL
+#if !defined(KERNEL) && !defined(_KERNEL)
 #include <stdio.h>
 #include <string.h>
-#include <strings.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
@@@@ -69,6 +68,11 @@@@
 #include <dirent.h>
 #endif
 
+#if defined(KERNEL) || defined(_KERNEL)
+#include <sys/cdefs.h>
+#endif
+
+#include <sys/param.h>
 #include <sys/types.h>
 #include <sys/errno.h>
 #include <sys/time.h>
@@@@ -78,15 +82,19 @@@@
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
-#include <sys/param.h>
+#if defined(KERNEL) || defined(_KERNEL) || __FreeBSD_version < 410000
+#include <sys/socketvar.h> 
+#endif
 #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>
+#include <net/if_var.h>
 #include <netinet/in_systm.h>
 #endif
 #include <netinet/in.h>
@@@@ -94,8 +102,9 @@@@
 #include <netinet/ip.h>
 #include <netinet/udp.h>
 #include <netinet/in_var.h>
-#include <arpa/inet.h>
+#include <netinet/ip_var.h>
 #endif
+#include <arpa/inet.h>
 
 /* 
  * Basic required types and constants
@@@@ -108,34 +117,54 @@@@
 #define B_FALSE         0
 #endif
 
-#ifdef KERNEL
+#if defined(KERNEL) || defined(_KERNEL)
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/syslog.h>
 #include <sys/conf.h>
 #include <sys/sysent.h>
 #include <sys/exec.h>
+#if __FreeBSD_version < 400004
 #include <sys/lkm.h>
+#endif
+#include <sys/sysproto.h>
 #include <sys/protosw.h>
 #include <net/route.h>
 #include <sys/kernel.h>
 #include <sys/domain.h>
 #include <net/netisr.h>
 #include <sys/proc.h>
+#if __FreeBSD_version < 400012
 #include <sys/device.h>
+#endif
+#include <sys/libkern.h>
+#include <sys/module.h>
+#include <sys/malloc.h>
+#include <sys/poll.h>
 
 #define	PANIC(s)		panic(s)
 
 /*
+ * SKIP malloc type
+ */
+MALLOC_DECLARE(M_SKIP);
+
+/*
  * 4.x memory management macros
  */
-#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	SYSMEM_ALLOC(size)	malloc((u_long)size, M_SKIP, M_NOWAIT) 
+#define	SYSMEM_FREE(m, n)	free(m, M_SKIP)
 #define	STATIC			static
 
+/*
+ * The kernel doesn't have memcpy() or memcmp(), but gcc will inline them
+ */
+#if defined(KERNEL) || defined(_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 +211,7 @@@@
 /*
  * 4.x timing defines
  */
-#define SKIP_ES_CURRENTTIME	(time.tv_sec)
+#define SKIP_ES_CURRENTTIME	((long)time_second)
 #define SKIP_ES_DELTATIME(then)	(SKIP_ES_CURRENTTIME - then)
 
 /*
@@@@ -204,28 +233,7 @@@@
 	len = IPHLEN(ip); \
 }
 
-/*
- * ANSI prototypes for system routines
- */
-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			printf(const char *, ...);
-#else /* KERNEL */
+#else /* KERNEL || _KERNEL */
 
 /*
  * User space buffer management macros
@@@@ -251,37 +259,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 *, ...);
-
 #endif /* KERNEL */
 
-/* XXX Bad IPPROTO_ENCAP define  ? */
-#ifdef IPPROTO_ENCAP
-#undef IPPROTO_ENCAP
-#endif
-#define IPPROTO_ENCAP		4
-
 /* 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 +289,6 @@@@
 /* General purpose */
 
 typedef unsigned char byte;
-
-#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.6
log
@Use <sys/param.h> instead of <osreldate.h> within the kernel.

PR:		26218
Submitted by:	markush@@acc.umu.se
@
text
@@


1.5
log
@Only #include <sys/socketvar.h> in kernel compilation.
@
text
@d16 1
a16 1
@@@@ -69,6 +68,12 @@@@
a19 2
+#include <osreldate.h>
+
d24 1
d28 1
a28 1
@@@@ -78,15 +82,20 @@@@
d32 1
a35 1
 #include <sys/param.h>
@


1.4
log
@Add -I/sys to the KLD compilation flags. This is a workaround,
but not a fix, for ports/16496.

PR:		ports/16496
Submitted by:	Matthew Reimer <mreimer@@vpop.net>
@
text
@d29 1
a29 2
@@@@ -77,16 +82,19 @@@@
 #include <sys/malloc.h>
d32 2
d35 1
a35 1
 #include <sys/syslog.h>
@


1.3
log
@Bash this port until it compiles under -current again.
@
text
@d3 1
a3 1
+++ work.new/skip/freebsd/skip_os.h	Mon Jan 24 16:14:32 2000
@


1.2
log
@Build SKIP port as a KLD instead of an LKM.
@
text
@d1 212
a212 11
diff -ur --unidirectional-new-file skipsrc-1.0.orig/skip/keymgrd/skip_keymgrsubr.C work.new/skip/keymgrd/skip_keymgrsubr.C
--- skipsrc-1.0.orig/skip/keymgrd/skip_keymgrsubr.C	Fri Oct 25 13:12:49 1996
+++ work.new/skip/keymgrd/skip_keymgrsubr.C	Mon Mar  8 21:33:38 1999
@@@@ -59,7 +59,6 @@@@
 #include "SkipCert.h"
 #include "X509skip.h"
 #include "HashCert.h"
-#include "malloc.h"
 #include "utils.h"
 #include "Sig.h"
 #include "skip_log.h"
@


1.1
log
@Initial revision
@
text
@d1 11
a11 14
diff -ur --unidirectional-new-file skipsrc-1.0.orig/skip/man/raw_keys.4 skipsrc-1.0/skip/man/raw_keys.4
--- skipsrc-1.0.orig/skip/man/raw_keys.4	Fri Oct 25 13:12:56 1996
+++ skipsrc-1.0/skip/man/raw_keys.4	Wed Nov 26 20:04:19 1997
@@@@ -42,9 +42,4 @@@@
 link.
 .SH FILES
 .P
-.SH Solaris 2.x systems:
-/etc/opt/SUNWicg/skip/raw_keys
-.P
-.SH Other systems:
-.P
-/etc/skip/raw_keys
+@@@@PREFIX@@@@/etc/skip/raw_keys
@


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