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.3
	RELEASE_4_1_1:1.3
	RELEASE_4_1_0:1.3
	RELEASE_3_5_0:1.3
	RELEASE_4_0_0:1.3
	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.6
date	2006.04.06.13.54.44;	author archie;	state dead;
branches;
next	1.5;

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

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

1.3
date	2000.01.26.01.55.14;	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.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
@--- work/skip/freebsd/rc.orig	Wed Nov  1 20:12:36 2000
+++ work/skip/freebsd/rc	Wed Nov  1 20:17:37 2000
@@@@ -44,22 +44,30 @@@@
  
 #pragma ident "@@(#)rc	1.5 96/10/08 Sun Microsystems"
 #
-PATH=/bin:/usr/bin:/sbin:/usr/ucb:/usr/etc
-SKIP_PATH=${SKIP_PATH-/usr/skip}
-SKIPD=/usr/skip/bin/skipd
-SKIP_HOST=/usr/skip/bin/skiphost
-SKIP_VAR_CMD=/usr/skip/bin/skipvar
-SKIP_SECURE_HOSTS=/etc/skip/hosts
-SKIP_ETC=/etc/skip
-SKIP_VAR=/var/skip
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=@@@@PREFIX@@@@
+
+SKIP_BIN=${PREFIX}/bin
+SKIP_ETC=${PREFIX}/etc/skip
+SKIP_LKM=${PREFIX}/modules
+
+SKIPD=${SKIP_BIN}/skipd
+SKIP_HOST=${SKIP_BIN}/skiphost
+SKIP_MKDEV=${SKIP_ETC}/skip.mkdev
+SKIP_SECURE_HOSTS=${SKIP_ETC}/hosts
+
+SKIP_VAR=/var/tmp
 VAR_SIZE=830
-SKIP_REQ_FILES="$SKIP_PATH/drv/skip.o $SKIP_ETC/skip.mkdev"
-PSEUDO_DRVS="skip"
+
+SKIP_MOD="skip.ko"
+SKIP_REQ_FILES="${SKIP_LKM}/${SKIP_MOD} ${SKIP_ETC}/skip.mkdev"
 
 verify_owner()
 {
 	me=`whoami`
 	if [ $me != "root" ]; then
+		echo ""
 		echo "skip: this script must be run as root ... fatal error"
 		exit 1
 	fi
@@@@ -68,6 +76,7 @@@@
 pre_checks() {
 	for FILE in $SKIP_REQ_FILES; do
 	if [ ! -f $FILE ]; then
+		echo ""
 		echo "skip: installation problem detected"
 		echo "skip: $FILE not found"
 		echo "skip: please refer to installation guide"
@@@@ -76,6 +85,7 @@@@
 	done
 
 	if [ ! -w $SKIP_VAR ]; then
+		echo ""
 		echo "skip: can not write to $SKIP_VAR"
 		exit 1
 	fi
@@@@ -85,11 +95,12 @@@@
 
 	sync
 
-	DISK_AVAIL=`df $SKIP_VAR | awk 'NR==2 {x=$4}
+	DISK_AVAIL=`df -k $SKIP_VAR | awk 'NR==2 {x=$4}
 		NR==3 {x=$3}
 		END  {print x}'`
 
 	if [ $DISK_AVAIL -lt $VAR_SIZE ]; then
+		echo ""
 		echo "skip: not enough space available in $SKIP_VAR"
 		echo "skip: $VAR_SIZE kbytes will be required to run the product"
 	exit 1
@@@@ -98,48 +109,70 @@@@
 
 load_driver()
 {
-	modstat > $SKIP_VAR/modules
-
-	# load pseudo-drivers
-	for driver in $PSEUDO_DRVS; do
-
-		awk '{ print $8 }' $SKIP_VAR/modules | grep $driver > /dev/null 2>&1
+	kldstat | awk '{ print $5 }' | grep ${SKIP_MOD} > /dev/null 2>&1
 
-		if [ $? -eq 0 ]; then
-			echo "skip: driver already loaded"
-		else
-			echo "skip: loading driver"
-			modload -o $SKIP_VAR/$driver \
-				-p $SKIP_ETC/$driver.mkdev \
-				$SKIP_PATH/drv/$driver.o> /dev/null
+	if [ $? -ne 0 ]; then
 
+		# Load KLD
+		kldload ${SKIP_LKM}/${SKIP_MOD} > /dev/null
+		if [ $? -ne 0 ]; then
+			echo ""
+			echo "skip: failed to load driver"
+			exit 1
+		fi
 
-			if [ $? -ne 0 ]; then
-				echo "skip: failed to load driver"
-				echo "skip: perhaps too many drivers are loaded?"
+		# Absurd hack to find out device major number
+		# Check for devfs first
+		if [ -z "`mount | grep /dev | grep devfs`" ]; then
+			DEV_MAJOR=`/sbin/dmesg | grep 'skip: device major=' | tail -1 | sed 's/^.*=\([0-9]\{1,\}\),.*$/\1/g'`
+			if [ "${DEV_MAJOR}" = "" ]; then
+				echo ""
+				echo "skip: can't determine skip device major number"
 				exit 1
 			fi
 
+			# Create device nodes
+			${SKIP_MKDEV} ${DEV_MAJOR}
 		fi
-	done
+	fi
+
 }
 
 start_daemons() {
 	if [ -x $SKIPD ]; then
-		echo -n "starting skip key manager daemon"
-		$SKIPD > /var/log/skipd.log &
-		echo "."
+		$SKIPD
 	fi
 
 	if [ -x $SKIP_SECURE_HOSTS -a -x $SKIP_HOST ]; then
-		$SKIP_SECURE_HOSTS >> /var/log/skipd.log 2>&1 &
+		$SKIP_SECURE_HOSTS >> /var/log/skiphost.log 2>&1 &
 	fi
 }
 
 # main
-verify_owner
-pre_checks
-load_driver
-start_daemons
 
-exit 0
+if [ $? -ne 0 ]; then
+  cmd=start
+else
+  cmd=$1
+fi
+
+case "$1" in
+start)
+	# keep console output pretty
+        echo -n " skip"
+
+        verify_owner
+        pre_checks
+        load_driver
+        start_daemons
+        ;;
+
+stop)
+        ;;
+
+*)
+        echo "Usage: `basename $0` {start|stop}" >&2
+        ;;
+
+esac
+
@


1.5
log
@Put back together a line that somehow got split in two.
@
text
@@


1.4
log
@Follow new etc/rc.d start/stop convention.

Submitted by:	Daniel O'Connor <doconnor@@gsoft.com.au>
@
text
@d109 1
a109 2
+			DEV_MAJOR=`/sbin/dmesg | grep 'skip: device major=' | tail -1 | sed 's/^.*=\
([0-9]\{1,\}\),.*$/\1/g'`
@


1.3
log
@Bash this port until it compiles under -current again.
@
text
@d1 2
a2 3
diff -ur --unidirectional-new-file skipsrc-1.0.orig/skip/freebsd/rc work.new/skip/freebsd/rc
--- skipsrc-1.0.orig/skip/freebsd/rc	Fri Oct 25 13:13:19 1996
+++ work.new/skip/freebsd/rc	Mon Jan 24 12:35:39 2000
d74 1
a74 1
@@@@ -98,45 +109,47 @@@@
d82 2
a85 3
-		awk '{ print $8 }' $SKIP_VAR/modules | grep $driver > /dev/null 2>&1
+	if [ $? -ne 0 ]; then
 
d93 2
a94 7
-
-
-			if [ $? -ne 0 ]; then
-				echo "skip: failed to load driver"
-				echo "skip: perhaps too many drivers are loaded?"
-				exit 1
-			fi
d103 3
d107 12
a118 5
+		DEV_MAJOR=`/sbin/dmesg | grep 'skip: device major=' | tail -1 | sed 's/^.*=\([0-9]\{1,\}\),.*$/\1/g'`
+		if [ "${DEV_MAJOR}" = "" ]; then
+			echo ""
+			echo "skip: can't determine skip device major number"
+			exit 1
a120 3
+
+		# Create device nodes
+		${SKIP_MKDEV} ${DEV_MAJOR}
d140 29
d170 1
a170 2
+# keep console output pretty
+echo -n " skip"
a171 3
 verify_owner
 pre_checks
 load_driver
@


1.2
log
@Build SKIP port as a KLD instead of an LKM.
@
text
@d1 79
a79 38
diff -ur --unidirectional-new-file skipsrc-1.0.orig/skip/include/skip_key.h work.new/skip/include/skip_key.h
--- skipsrc-1.0.orig/skip/include/skip_key.h	Fri Oct 25 13:12:44 1996
+++ work.new/skip/include/skip_key.h	Tue Mar  9 20:24:01 1999
@@@@ -209,24 +209,22 @@@@
 				void *, skip_arg_t *)
 		);
 #endif
-void		skip_close();
+void		skip_close(void *sd);
 int		skip_encrypt(void *, SKIP_BUF_T *, SKIP_BUF_T *,
 			skip_param_t *, void *);
 int		skip_decrypt(void *, SKIP_BUF_T *, SKIP_BUF_T *,
 			skip_hdr_t *hdr, int, void *);
 int		skip_key_check(skip_keycb_t *, void *);
-void		skip_key_iterate(int (*)(), void *);
+void		skip_key_iterate(int (*)(skip_keycb_t *, void *), void *);
 int		skip_hdr_encode(skip_hdr_t *, unsigned char *);
 int		skip_iv_encode(skip_hdr_t *, unsigned char *);
 void		skip_hdr_init(skip_keycb_t *);
 
-void		skip_key_tellkm(enum skip_msgs, skip_keycb_t *);
-void		skip_key_fromkm(union skip_messages *, unsigned int);
 void		skip_update_encrypt_key(struct Encrypted_key_rsp *);
 void		skip_update_decrypt_key(struct Decrypted_key_rsp *);
 
-void		skip_local_keyid_init();
-void		skip_local_keyid_uninit();
+void		skip_local_keyid_init(void);
+void		skip_local_keyid_uninit(void);
 void		skip_set_local_keyid(unsigned char , skip_key_var_t *);
 int		skip_check_keyid(unsigned char , skip_key_var_t *, boolean_t);
 int		skip_get_default_keyid(unsigned char, unsigned char *);
@@@@ -254,8 +252,8 @@@@
  * function prototypes
  */
 void		skip_key_fromkm(union skip_messages *, unsigned int);
+void		skip_key_tellkm(enum skip_msgs, skip_keycb_t *);
 #endif
d81 57
d139 8
a146 2
 /*
  * external variables
@


1.1
log
@Initial revision
@
text
@d1 34
a34 5
diff -ur --unidirectional-new-file skipsrc-1.0.orig/skip/keymgrd/skipd.C skipsrc-1.0/skip/keymgrd/skipd.C
--- skipsrc-1.0.orig/skip/keymgrd/skipd.C	Fri Oct 25 13:12:54 1996
+++ skipsrc-1.0/skip/keymgrd/skipd.C	Thu Dec  4 18:25:47 1997
@@@@ -48,6 +48,7 @@@@
  * System includes
d36 4
a39 2
 #include <skip_os.h>
+#include <err.h>
d42 1
a42 66
  * SKIP includes
@@@@ -84,8 +85,9 @@@@
 {
 	int c;
 	int errflag = 0;
+	int noFork = 0;
 
-	while ((c = getopt(argc, argv, "vV?")) != EOF) {
+	while ((c = getopt(argc, argv, "nvV?")) != EOF) {
 		switch(c) {
 		case 'v':
 			verbose = 1;
@@@@ -95,6 +97,9 @@@@
 			verbose = 2;
 			break;
 
+		case 'n':
+			noFork = 1;
+			break;
 		case '?':
 		default:
 			errflag++;
@@@@ -106,34 +111,18 @@@@
 		exit(1);
 	}
 
+	if (!noFork)
 	{
-		extern FILE *skip_log_fp;
-
-		skip_log_fp = fopen("/var/log/skipd.log", "w+");
+		extern int skip_log_syslog;
 
-		// if open fails, skip_log will default to stdout/stderr
+		/* output to syslog */
+		openlog("skipd", 0, LOG_DAEMON);
+		skip_log_syslog = 1;
+
+		/* become a background daemon */
+		if (daemon(0, 0))
+			err(1, "daemon");
 	}
-
-
-//  put ourselves into the background
-
-	switch (fork()) {
-	case -1:
-		skip_log(SKIP_ERROR, "fork failed");
-		exit(1);
-
-	case 0:
-		break;
-
-	default:
-		exit(0);
-	}
-
-	setsid();
-
-	freopen("/dev/null", "r", stdin);
-	freopen("/dev/null", "w", stdout);
-	freopen("/dev/null", "w", stderr);
 
 	skip_init();
 	skipd_loop();
@


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