Fix compile problems under 3.0; haven't tested it with a 3.0 kernel yet.

4 files changed, 103 insertions, 0 deletions

diff --git a/security/skip/files/patch-cm b/security/skip/files/patch-cm
new file mode 100644
index 000000000000..04a847bb6d01
--- /dev/null
+++ b/security/skip/files/patch-cm
@@ -0,0 +1,12 @@
+diff -ur --unidirectional-new-file skipsrc-1.0.orig/libdb/hash/hash.h skipsrc-1.0/libdb/hash/hash.h
+--- skipsrc-1.0.orig/libdb/hash/hash.h	Fri Oct 25 13:12:21 1996
++++ skipsrc-1.0/libdb/hash/hash.h	Sun Nov 22 21:20:56 1998
+@@ -103,7 +103,7 @@
+ 	BUFHEAD 	*cpage;		/* Current page */
+ 	int		cbucket;	/* Current bucket */
+ 	int		cndx;		/* Index of next item on cpage */
+-	int		errno;		/* Error Number -- for DBM 
++	int		errnum;		/* Error Number -- for DBM 
+ 					 * compatability */
+ 	int		new_file;	/* Indicates if fd is backing store 
+ 					 * or no */
diff --git a/security/skip/files/patch-cn b/security/skip/files/patch-cn
new file mode 100644
index 000000000000..3c62dd2b4560
--- /dev/null
+++ b/security/skip/files/patch-cn
@@ -0,0 +1,58 @@
+diff -ur --unidirectional-new-file skipsrc-1.0.orig/libdb/hash/hash.c skipsrc-1.0/libdb/hash/hash.c
+--- skipsrc-1.0.orig/libdb/hash/hash.c	Fri Oct 25 13:12:20 1996
++++ skipsrc-1.0/libdb/hash/hash.c	Sun Nov 22 21:21:29 1998
+@@ -505,7 +505,7 @@
+ 	else
+ 		if (wsize != sizeof(HASHHDR)) {
+ 			errno = EFTYPE;
+-			hashp->errno = errno;
++			hashp->errnum = errno;
+ 			return (-1);
+ 		}
+ 	for (i = 0; i < NCACHED; i++)
+@@ -536,7 +536,7 @@
+ 
+ 	hashp = (HTAB *)dbp->internal;
+ 	if (flag) {
+-		hashp->errno = errno = EINVAL;
++		hashp->errnum = errno = EINVAL;
+ 		return (ERROR);
+ 	}
+ 	return (hash_access(hashp, HASH_GET, (DBT *)key, data));
+@@ -553,11 +553,11 @@
+ 
+ 	hashp = (HTAB *)dbp->internal;
+ 	if (flag && flag != R_NOOVERWRITE) {
+-		hashp->errno = errno = EINVAL;
++		hashp->errnum = errno = EINVAL;
+ 		return (ERROR);
+ 	}
+ 	if ((hashp->flags & O_ACCMODE) == O_RDONLY) {
+-		hashp->errno = errno = EPERM;
++		hashp->errnum = errno = EPERM;
+ 		return (ERROR);
+ 	}
+ 	return (hash_access(hashp, flag == R_NOOVERWRITE ?
+@@ -574,11 +574,11 @@
+ 
+ 	hashp = (HTAB *)dbp->internal;
+ 	if (flag && flag != R_CURSOR) {
+-		hashp->errno = errno = EINVAL;
++		hashp->errnum = errno = EINVAL;
+ 		return (ERROR);
+ 	}
+ 	if ((hashp->flags & O_ACCMODE) == O_RDONLY) {
+-		hashp->errno = errno = EPERM;
++		hashp->errnum = errno = EPERM;
+ 		return (ERROR);
+ 	}
+ 	return (hash_access(hashp, HASH_DELETE, (DBT *)key, NULL));
+@@ -729,7 +729,7 @@
+ 
+ 	hashp = (HTAB *)dbp->internal;
+ 	if (flag && flag != R_FIRST && flag != R_NEXT) {
+-		hashp->errno = errno = EINVAL;
++		hashp->errnum = errno = EINVAL;
+ 		return (ERROR);
+ 	}
+ #ifdef HASH_STATISTICS
diff --git a/security/skip/files/patch-co b/security/skip/files/patch-co
new file mode 100644
index 000000000000..bd7e4fc81be0
--- /dev/null
+++ b/security/skip/files/patch-co
@@ -0,0 +1,21 @@
+diff -ur --unidirectional-new-file skipsrc-1.0.orig/libdb/hash/ndbm.c skipsrc-1.0/libdb/hash/ndbm.c
+--- skipsrc-1.0.orig/libdb/hash/ndbm.c	Fri Oct 25 13:12:22 1996
++++ skipsrc-1.0/libdb/hash/ndbm.c	Sun Nov 22 21:32:01 1998
+@@ -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);
+ }
+ 
diff --git a/security/skip/files/patch-cp b/security/skip/files/patch-cp
new file mode 100644
index 000000000000..2335399a19ad
--- /dev/null
+++ b/security/skip/files/patch-cp
@@ -0,0 +1,12 @@
+diff -ur --unidirectional-new-file skipsrc-1.0.orig/bnlib/Makefile.in skipsrc-1.0/bnlib/Makefile.in
+--- skipsrc-1.0.orig/bnlib/Makefile.in	Fri Oct 25 13:11:20 1996
++++ skipsrc-1.0/bnlib/Makefile.in	Sun Nov 22 21:46:35 1998
+@@ -61,7 +61,7 @@
+ # code compiled with another cc, which doesn't know about -lgcc.
+ 
+ lbn%.o: $(srcdir)/lbn%.c $(HDRS) config.h
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -I. -I$(srcdir) -o $@ @GCCMAGIC1@ $< @GCCMAGIC2@
++	$(CC) $(CPPFLAGS) $(CFLAGS) -I. -I$(srcdir) -o $@ -c $<
+ 
+ # Saying that every .o file depends on every header is overkill, but
+ # it will suffice.