summaryrefslogtreecommitdiff
path: root/security/skip/files/patch-bh
diff options
context:
space:
mode:
Diffstat (limited to 'security/skip/files/patch-bh')
-rw-r--r--security/skip/files/patch-bh107
1 files changed, 60 insertions, 47 deletions
diff --git a/security/skip/files/patch-bh b/security/skip/files/patch-bh
index 4ef3dc458d4f..b465af6889b9 100644
--- a/security/skip/files/patch-bh
+++ b/security/skip/files/patch-bh
@@ -1,47 +1,60 @@
-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 @@
-+
-+.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 = skip_wrapper.o skip_es.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
-+
-+KMOD = skip
-+KLDMOD = yes
-+
-+.include <bsd.kmod.mk>
+diff -ur --unidirectional-new-file skipsrc-1.0.orig/mkpkgs/freebsd/Makefile work.new/mkpkgs/freebsd/Makefile
+--- skipsrc-1.0.orig/mkpkgs/freebsd/Makefile Fri Oct 25 13:12:32 1996
++++ work.new/mkpkgs/freebsd/Makefile Mon Jan 24 12:35:38 2000
+@@ -64,6 +64,8 @@
+ $(BLD_DIR)/doc/SKIP_SOFTWARE_LICENSE \
+ $(BLD_DIR)/doc/BN_SOFTWARE_LICENSE \
+ $(BLD_DIR)/doc/README.PATENT \
++ $(BLD_DIR)/doc/README.FreeBSD \
++ $(BLD_DIR)/doc/README.FreeBSD+NAT \
+ $(BLD_DIR)/doc/00README \
+ $(BLD_DIR)/doc/INSTALL \
+ $(BLD_DIR)/doc/advanced.TOPICS \
+@@ -104,10 +106,10 @@
+ $(MKDIR) $(BSDPROTO)/bin
+ $(MKDIR) $(BSDPROTO)/doc
+
+- $(INSTALL) -m 0555 $(BLD_DIR)/skip/freebsd/install.skip \
+- $(BSDPROTO)/install.skip
+- $(INSTALL) -m 0555 $(BLD_DIR)/admin/remove.skip \
+- $(BSDPROTO)/remove.skip
++# $(INSTALL) -m 0555 $(BLD_DIR)/skip/freebsd/install.skip \
++# $(BSDPROTO)/install.skip
++# $(INSTALL) -m 0555 $(BLD_DIR)/admin/remove.skip \
++# $(BSDPROTO)/remove.skip
+
+ @echo "Initializing skip/etc directory"
+ $(INSTALL) -m 0444 $(BLD_DIR)/admin/SunICG_CA_selfcert \
+@@ -124,8 +126,8 @@
+ $(BSDPROTO)/etc/skipd.conf
+
+ @echo "Adding skip/drv to release"
+- $(INSTALL) -m 0755 $(BLD_DIR)/skip/freebsd/bin.x86/skip.o \
+- $(BSDPROTO)/drv/skip.o
++ $(INSTALL) -m 0755 $(BLD_DIR)/skip/freebsd/skip.ko \
++ $(BSDPROTO)/drv/skip.ko
+
+ @echo "Adding skip/bin to release"
+ $(INSTALL) -m 0755 $(BLD_DIR)/skip/tools/skiptool/none.ras \
+@@ -191,6 +193,10 @@
+ $(BSDPROTO)/doc/BN_SOFTWARE_LICENSE
+ $(INSTALL) -m 0644 $(BLD_DIR)/doc/README.PATENT \
+ $(BSDPROTO)/doc/README.PATENT
++ $(INSTALL) -m 0644 $(BLD_DIR)/doc/README.FreeBSD \
++ $(BSDPROTO)/doc/README.FreeBSD
++ $(INSTALL) -m 0644 $(BLD_DIR)/doc/README.FreeBSD+NAT \
++ $(BSDPROTO)/doc/README.FreeBSD+NAT
+ $(INSTALL) -m 0644 $(BLD_DIR)/doc/00README \
+ $(BSDPROTO)/doc/00README
+ $(INSTALL) -m 0644 $(BLD_DIR)/doc/INSTALL \
+@@ -239,8 +245,8 @@
+ $(BSDPROTO)/man/man4/raw_keys.4
+ $(INSTALL) -m 0644 $(BLD_DIR)/certs/man/print_cert.1m \
+ $(BSDPROTO)/man/man1/print_cert.1
+- (cd $(BSDBIN); tar cvf skip.tar skip)
+- (cd $(BSDBIN); compress skip.tar)
++# (cd $(BSDBIN); tar cvf skip.tar skip)
++# (cd $(BSDBIN); compress skip.tar)
+
+ clean:
+ @-$(RM) -rf $(BSDBIN)