mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
refresh all package patches in the buildroot using quilt
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7490 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -1,7 +1,8 @@
|
||||
diff -urN isakmpd/GNUmakefile isakmpd.new/GNUmakefile
|
||||
--- isakmpd/GNUmakefile 2006-09-01 19:29:05.000000000 +0200
|
||||
+++ isakmpd.new/GNUmakefile 2006-09-01 19:29:28.000000000 +0200
|
||||
@@ -75,13 +75,14 @@
|
||||
Index: isakmpd-20041012.orig/GNUmakefile
|
||||
===================================================================
|
||||
--- isakmpd-20041012.orig.orig/GNUmakefile 2007-06-04 13:22:39.722816496 +0200
|
||||
+++ isakmpd-20041012.orig/GNUmakefile 2007-06-04 13:22:40.000774240 +0200
|
||||
@@ -76,13 +76,14 @@
|
||||
isakmp_fld.c isakmp_fld.h
|
||||
MAN= isakmpd.8 isakmpd.conf.5 isakmpd.policy.5
|
||||
|
||||
@@ -17,7 +18,7 @@ diff -urN isakmpd/GNUmakefile isakmpd.new/GNUmakefile
|
||||
|
||||
# Do execution time profiles
|
||||
#CFLAGS+= -pg
|
||||
@@ -172,6 +173,14 @@
|
||||
@@ -175,6 +176,14 @@
|
||||
CFLAGS+= -DUSE_RAWKEY
|
||||
endif
|
||||
|
||||
@@ -30,11 +31,12 @@ diff -urN isakmpd/GNUmakefile isakmpd.new/GNUmakefile
|
||||
+endif
|
||||
+
|
||||
SRCS+= ${IPSEC_SRCS} ${X509} ${POLICY} ${EC} ${AGGRESSIVE} ${DNSSEC} \
|
||||
$(ISAKMP_CFG)
|
||||
$(ISAKMP_CFG) ${DPD} ${NAT_TRAVERSAL}
|
||||
CFLAGS+= ${IPSEC_CFLAGS}
|
||||
diff -urN isakmpd/sysdep/common/libsysdep/GNUmakefile isakmpd.new/sysdep/common/libsysdep/GNUmakefile
|
||||
--- isakmpd/sysdep/common/libsysdep/GNUmakefile 2003-06-03 16:52:06.000000000 +0200
|
||||
+++ isakmpd.new/sysdep/common/libsysdep/GNUmakefile 2006-09-01 19:29:28.000000000 +0200
|
||||
Index: isakmpd-20041012.orig/sysdep/common/libsysdep/GNUmakefile
|
||||
===================================================================
|
||||
--- isakmpd-20041012.orig.orig/sysdep/common/libsysdep/GNUmakefile 2007-06-04 13:22:38.959932472 +0200
|
||||
+++ isakmpd-20041012.orig/sysdep/common/libsysdep/GNUmakefile 2007-06-04 13:22:40.000774240 +0200
|
||||
@@ -31,10 +31,18 @@
|
||||
.CURDIR:= $(shell pwd)
|
||||
|
||||
@@ -55,9 +57,10 @@ diff -urN isakmpd/sysdep/common/libsysdep/GNUmakefile isakmpd.new/sysdep/common/
|
||||
lib${LIB}.a: ${SRCS:%.c=%.o}
|
||||
ar cq $@ ${SRCS:%.c=%.o}
|
||||
|
||||
diff -urN isakmpd/sysdep/common/libsysdep/md5.c isakmpd.new/sysdep/common/libsysdep/md5.c
|
||||
--- isakmpd/sysdep/common/libsysdep/md5.c 2002-06-14 23:34:58.000000000 +0200
|
||||
+++ isakmpd.new/sysdep/common/libsysdep/md5.c 2006-09-01 19:29:28.000000000 +0200
|
||||
Index: isakmpd-20041012.orig/sysdep/common/libsysdep/md5.c
|
||||
===================================================================
|
||||
--- isakmpd-20041012.orig.orig/sysdep/common/libsysdep/md5.c 2007-06-04 13:22:38.964931712 +0200
|
||||
+++ isakmpd-20041012.orig/sysdep/common/libsysdep/md5.c 2007-06-04 13:22:40.000774240 +0200
|
||||
@@ -5,6 +5,8 @@
|
||||
* changes to accommodate it in the kernel by ji.
|
||||
*/
|
||||
@@ -72,9 +75,10 @@ diff -urN isakmpd/sysdep/common/libsysdep/md5.c isakmpd.new/sysdep/common/libsys
|
||||
#endif
|
||||
|
||||
+#endif /* USE_OPENSSL_MD5 */
|
||||
diff -urN isakmpd/sysdep/common/libsysdep/sha1.c isakmpd.new/sysdep/common/libsysdep/sha1.c
|
||||
--- isakmpd/sysdep/common/libsysdep/sha1.c 2001-01-28 23:38:48.000000000 +0100
|
||||
+++ isakmpd.new/sysdep/common/libsysdep/sha1.c 2006-09-01 19:29:28.000000000 +0200
|
||||
Index: isakmpd-20041012.orig/sysdep/common/libsysdep/sha1.c
|
||||
===================================================================
|
||||
--- isakmpd-20041012.orig.orig/sysdep/common/libsysdep/sha1.c 2007-06-04 13:22:38.970930800 +0200
|
||||
+++ isakmpd-20041012.orig/sysdep/common/libsysdep/sha1.c 2007-06-04 13:22:40.001774088 +0200
|
||||
@@ -1,5 +1,7 @@
|
||||
/* $OpenBSD: sha1.c,v 1.2 2001/01/28 22:38:48 niklas Exp $ */
|
||||
|
||||
@@ -89,9 +93,10 @@ diff -urN isakmpd/sysdep/common/libsysdep/sha1.c isakmpd.new/sysdep/common/libsy
|
||||
}
|
||||
+
|
||||
+#endif /* USE_OPENSSL_SHA1 */
|
||||
diff -urN isakmpd/sysdep/common/md5.h isakmpd.new/sysdep/common/md5.h
|
||||
--- isakmpd/sysdep/common/md5.h 2001-01-28 23:38:47.000000000 +0100
|
||||
+++ isakmpd.new/sysdep/common/md5.h 2006-09-01 19:29:28.000000000 +0200
|
||||
Index: isakmpd-20041012.orig/sysdep/common/md5.h
|
||||
===================================================================
|
||||
--- isakmpd-20041012.orig.orig/sysdep/common/md5.h 2007-06-04 13:22:38.976929888 +0200
|
||||
+++ isakmpd-20041012.orig/sysdep/common/md5.h 2007-06-04 13:22:40.001774088 +0200
|
||||
@@ -1,5 +1,15 @@
|
||||
/* $OpenBSD: md5.h,v 1.2 2001/01/28 22:38:47 niklas Exp $ */
|
||||
|
||||
@@ -114,9 +119,10 @@ diff -urN isakmpd/sysdep/common/md5.h isakmpd.new/sysdep/common/md5.h
|
||||
#define _MD5_H_
|
||||
+
|
||||
+#endif /* USE_OPENSSL_MD5 */
|
||||
diff -urN isakmpd/sysdep/common/sha1.h isakmpd.new/sysdep/common/sha1.h
|
||||
--- isakmpd/sysdep/common/sha1.h 2001-01-28 23:38:47.000000000 +0100
|
||||
+++ isakmpd.new/sysdep/common/sha1.h 2006-09-01 19:29:28.000000000 +0200
|
||||
Index: isakmpd-20041012.orig/sysdep/common/sha1.h
|
||||
===================================================================
|
||||
--- isakmpd-20041012.orig.orig/sysdep/common/sha1.h 2007-06-04 13:22:38.982928976 +0200
|
||||
+++ isakmpd-20041012.orig/sysdep/common/sha1.h 2007-06-04 13:22:40.001774088 +0200
|
||||
@@ -1,5 +1,16 @@
|
||||
/* $OpenBSD: sha1.h,v 1.2 2001/01/28 22:38:47 niklas Exp $ */
|
||||
|
||||
@@ -140,10 +146,11 @@ diff -urN isakmpd/sysdep/common/sha1.h isakmpd.new/sysdep/common/sha1.h
|
||||
void SHA1Final(unsigned char digest[20], SHA1_CTX* context);
|
||||
+
|
||||
+#endif /* USE_OPENSSL_SHA1 */
|
||||
diff -urN isakmpd/sysdep/linux/GNUmakefile.sysdep isakmpd.new/sysdep/linux/GNUmakefile.sysdep
|
||||
--- isakmpd/sysdep/linux/GNUmakefile.sysdep 2006-09-01 19:29:05.000000000 +0200
|
||||
+++ isakmpd.new/sysdep/linux/GNUmakefile.sysdep 2006-09-01 19:29:29.000000000 +0200
|
||||
@@ -48,6 +48,8 @@
|
||||
Index: isakmpd-20041012.orig/sysdep/linux/GNUmakefile.sysdep
|
||||
===================================================================
|
||||
--- isakmpd-20041012.orig.orig/sysdep/linux/GNUmakefile.sysdep 2007-06-04 13:22:39.722816496 +0200
|
||||
+++ isakmpd-20041012.orig/sysdep/linux/GNUmakefile.sysdep 2007-06-04 13:22:40.001774088 +0200
|
||||
@@ -47,6 +47,8 @@
|
||||
USE_LIBCRYPO= defined
|
||||
HAVE_DLOPEN= defined
|
||||
USE_KEYNOTE= defined
|
||||
|
||||
Reference in New Issue
Block a user