Add gnutls package

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1253 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 92 insertions, 0 deletions

diff --git a/package/gnutls/patches/500-cross-compile.patch b/package/gnutls/patches/500-cross-compile.patch
new file mode 100644
index 000000000..5694bb25f
--- /dev/null
+++ b/package/gnutls/patches/500-cross-compile.patch
@@ -0,0 +1,68 @@
+diff -ruN gnutls-1.0.24-orig/configure gnutls-1.0.24-1/configure
+--- gnutls-1.0.24-orig/configure	2005-01-18 19:31:03.000000000 +0100
++++ gnutls-1.0.24-1/configure	2005-03-15 23:23:12.000000000 +0100
+@@ -3633,7 +3633,7 @@
+ 	if test x$opt_developer_mode = xyes; then
+ 	  CFLAGS="${CFLAGS} -g -Wno-format-y2k -Wall -Wcast-align -W -Wpointer-arith -Wchar-subscripts -Wformat-security -Wmissing-braces -Winline -Wstrict-prototypes"
+ 	else
+-	  CFLAGS="${CFLAGS} -O2 -finline-functions"
++	  CFLAGS="${CFLAGS} -finline-functions"
+ 	fi
+ 
+ 	if test x$opt_dmalloc_mode = xyes; then
+@@ -25004,8 +25004,8 @@
+ 
+ 
+ 
+-LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBTASN1_LIBS $LIBGCRYPT_LIBS $LIBS"
+-LIBGNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS $LIBTASN1_CFLAGS -I${includedir}"
++LIBGNUTLS_LIBS="-lgnutls $LIBTASN1_LIBS $LIBGCRYPT_LIBS $LIBS"
++LIBGNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS $LIBTASN1_CFLAGS"
+ 
+ CFLAGS="${CFLAGS} ${LIBGCRYPT_CFLAGS}"
+ 
+@@ -25015,8 +25015,8 @@
+ SERV_LIBS="$LIBS $SERV_LIBS"
+ 
+ 
+-LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LIBOPENCDK_LIBS $LZO_LIBS $LIBGNUTLS_LIBS"
+-LIBGNUTLS_EXTRA_CFLAGS="$LIBOPENCDK_CFLAGS -I${includedir}"
++LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LIBOPENCDK_LIBS $LZO_LIBS $LIBGNUTLS_LIBS"
++LIBGNUTLS_EXTRA_CFLAGS="$LIBOPENCDK_CFLAGS $LIBGNUTLS_CFLAGS"
+ 
+ 
+ 
+diff -ruN gnutls-1.0.24-orig/configure.in gnutls-1.0.24-1/configure.in
+--- gnutls-1.0.24-orig/configure.in	2004-11-14 00:06:57.000000000 +0100
++++ gnutls-1.0.24-1/configure.in	2005-03-15 23:24:35.000000000 +0100
+@@ -137,7 +137,7 @@
+ 	if test x$opt_developer_mode = xyes; then
+ 	  CFLAGS="${CFLAGS} -g -Wno-format-y2k -Wall -Wcast-align -W -Wpointer-arith -Wchar-subscripts -Wformat-security -Wmissing-braces -Winline -Wstrict-prototypes"
+ 	else
+-	  CFLAGS="${CFLAGS} -O2 -finline-functions"
++	  CFLAGS="${CFLAGS} -finline-functions"
+ 	fi
+ 
+ 	if test x$opt_dmalloc_mode = xyes; then
+@@ -489,8 +489,8 @@
+ ])
+ AM_PROG_LIBTOOL
+ 
+-LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBTASN1_LIBS $LIBGCRYPT_LIBS $LIBS"
+-LIBGNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS $LIBTASN1_CFLAGS -I${includedir}"
++LIBGNUTLS_LIBS="-lgnutls $LIBTASN1_LIBS $LIBGCRYPT_LIBS $LIBS"
++LIBGNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS $LIBTASN1_CFLAGS"
+ 
+ CFLAGS="${CFLAGS} ${LIBGCRYPT_CFLAGS}"
+ 
+@@ -500,8 +500,8 @@
+ SERV_LIBS="$LIBS $SERV_LIBS"
+ AC_SUBST(SERV_LIBS)
+ 
+-LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LIBOPENCDK_LIBS $LZO_LIBS $LIBGNUTLS_LIBS"
+-LIBGNUTLS_EXTRA_CFLAGS="$LIBOPENCDK_CFLAGS -I${includedir}"
++LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LIBOPENCDK_LIBS $LZO_LIBS $LIBGNUTLS_LIBS"
++LIBGNUTLS_EXTRA_CFLAGS="$LIBOPENCDK_CFLAGS $LIBGNUTLS_CFLAGS"
+ 
+ AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
+ AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
diff --git a/package/gnutls/patches/501-certtool-libs.patch b/package/gnutls/patches/501-certtool-libs.patch
new file mode 100644
index 000000000..db39f88a9
--- /dev/null
+++ b/package/gnutls/patches/501-certtool-libs.patch
@@ -0,0 +1,24 @@
+diff -ruN gnutls-1.0.24-orig/src/Makefile.am gnutls-1.0.24-1/src/Makefile.am
+--- gnutls-1.0.24-orig/src/Makefile.am	2004-09-17 11:08:24.000000000 +0200
++++ gnutls-1.0.24-1/src/Makefile.am	2005-03-15 23:28:19.000000000 +0100
+@@ -31,7 +31,7 @@
+ 	cfg/cfg+.c cfg/cfgfile.c cfg/cmdline.c cfg/parse.c cfg/props.c \
+ 	cfg/shared.c cfg/platon/str/dynfgets.c cfg/platon/str/strctype.c \
+ 	cfg/platon/str/strdyn.c cfg/platon/str/strplus.c
+-certtool_LDADD = ../lib/libgnutls.la $(LIBGCRYPT_LIBS)
++certtool_LDADD = ../lib/libgnutls.la $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS)
+ endif
+ 
+ 
+diff -ruN gnutls-1.0.24-orig/src/Makefile.in gnutls-1.0.24-1/src/Makefile.in
+--- gnutls-1.0.24-orig/src/Makefile.in	2005-01-18 19:31:14.000000000 +0100
++++ gnutls-1.0.24-1/src/Makefile.in	2005-03-15 23:28:41.000000000 +0100
+@@ -308,7 +308,7 @@
+ @HAVE_LIBCFG_FALSE@	cfg/platon/str/strdyn.c cfg/platon/str/strplus.c
+ 
+ @HAVE_LIBCFG_TRUE@certtool_SOURCES = certtool-gaa.c certtool.c prime.c getpass.c certtool-cfg.c
+-@HAVE_LIBCFG_FALSE@certtool_LDADD = ../lib/libgnutls.la $(LIBGCRYPT_LIBS)
++@HAVE_LIBCFG_FALSE@certtool_LDADD = ../lib/libgnutls.la $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS)
+ @HAVE_LIBCFG_TRUE@certtool_LDADD = ../lib/libgnutls.la $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) -lcfg+
+ all: all-recursive
+