head 1.14; access; symbols OPENPKG_E1_MP_HEAD:1.14 OPENPKG_E1_MP:1.14 OPENPKG_E1_MP_2_STABLE:1.14 OPENPKG_E1_FP:1.14 OPENPKG_2_STABLE_MP:1.14 OPENPKG_2_STABLE_20061018:1.14 OPENPKG_2_STABLE_20060622:1.14 OPENPKG_2_STABLE:1.14.0.4 OPENPKG_2_STABLE_BP:1.14 OPENPKG_2_5_RELEASE:1.14 OPENPKG_2_5_SOLID:1.14.0.2 OPENPKG_2_5_SOLID_BP:1.14 OPENPKG_2_4_RELEASE:1.10 OPENPKG_2_4_SOLID:1.10.0.6 OPENPKG_2_4_SOLID_BP:1.10 OPENPKG_CW_FP:1.10 OPENPKG_2_3_RELEASE:1.10 OPENPKG_2_3_SOLID:1.10.0.4 OPENPKG_2_3_SOLID_BP:1.10 OPENPKG_2_2_RELEASE:1.10 OPENPKG_2_2_SOLID:1.10.0.2 OPENPKG_2_2_SOLID_BP:1.10 OPENPKG_2_1_RELEASE:1.9 OPENPKG_2_1_SOLID:1.9.0.2 OPENPKG_2_1_SOLID_BP:1.9 OPENPKG_2_0_RELEASE:1.7 OPENPKG_2_0_SOLID:1.7.0.2 OPENPKG_2_0_SOLID_BP:1.7 OPENPKG_1_STABLE_MP:1.3; locks; strict; comment @# @; 1.14 date 2005.10.08.07.31.40; author rse; state Exp; branches; next 1.13; 1.13 date 2005.09.25.17.53.14; author steve; state Exp; branches; next 1.12; 1.12 date 2005.07.25.19.42.59; author rse; state Exp; branches; next 1.11; 1.11 date 2005.07.07.09.16.41; author rse; state Exp; branches; next 1.10; 1.10 date 2004.08.02.17.29.47; author ms; state Exp; branches; next 1.9; 1.9 date 2004.04.30.06.18.19; author rse; state Exp; branches; next 1.8; 1.8 date 2004.04.26.10.49.05; author rse; state Exp; branches; next 1.7; 1.7 date 2003.12.04.19.09.38; author rse; state Exp; branches; next 1.6; 1.6 date 2003.11.29.11.51.03; author rse; state Exp; branches; next 1.5; 1.5 date 2003.11.11.19.02.51; author rse; state Exp; branches; next 1.4; 1.4 date 2003.10.31.07.49.36; author rse; state Exp; branches; next 1.3; 1.3 date 2003.07.10.13.21.36; author mlelstv; state Exp; branches; next 1.2; 1.2 date 2003.01.23.08.37.35; author ps; state dead; branches; next 1.1; 1.1 date 2003.01.22.12.50.05; author ps; state Exp; branches; next ; desc @@ 1.14 log @upgrading package: gnutls 1.2.7 -> 1.2.8 @ text @Index: src/Makefile.in --- src/Makefile.in.orig 2005-10-07 13:26:34 +0200 +++ src/Makefile.in 2005-10-08 09:19:49 +0200 @@@@ -188,7 +188,7 @@@@ CCDEPMODE = @@CCDEPMODE@@ CFLAGS = @@CFLAGS@@ CPP = @@CPP@@ -CPPFLAGS = @@CPPFLAGS@@ +CPPFLAGS = -Icfg @@CPPFLAGS@@ CXX = @@CXX@@ CXXCPP = @@CXXCPP@@ CXXDEPMODE = @@CXXDEPMODE@@ @ 1.13 log @Removed a link time Error @ text @a0 13 Index: lib/gnutls_global.c --- lib/gnutls_global.c.orig 2005-08-30 16:14:24 +0200 +++ lib/gnutls_global.c 2005-09-25 19:40:30 +0200 @@@@ -39,9 +39,6 @@@@ ASN1_TYPE _gnutls_pkix1_asn; ASN1_TYPE _gnutls_gnutls_asn; -/* To shut up missing symbols from error module. */ -char *program_name = "gnutls"; - /** * gnutls_global_set_log_function - This function sets the logging function * @@log_func: it's a log function d2 3 a4 3 --- src/Makefile.in.orig 2005-09-08 15:41:09 +0200 +++ src/Makefile.in 2005-09-25 19:31:43 +0200 @@@@ -186,7 +186,7 @@@@ @ 1.12 log @fix tracking and upgrade @ text @d1 6 a6 4 Index: lib/defines.h --- lib/defines.h.orig 2005-05-26 17:21:37 +0200 +++ lib/defines.h 2005-07-25 21:39:32 +0200 @@@@ -29,6 +29,7 @@@@ d8 6 a13 6 #ifdef STDC_HEADERS # include +# include # include # include # include d15 3 a17 3 --- src/Makefile.in.orig 2005-07-16 14:49:09 +0200 +++ src/Makefile.in 2005-07-25 21:39:32 +0200 @@@@ -183,7 +183,7 @@@@ @ 1.11 log @add zlib support and fix zlib/lzo build-time @ text @d2 3 a4 3 --- lib/defines.h.orig 2003-11-17 09:41:25.000000000 +0100 +++ lib/defines.h 2003-11-29 12:42:38.000000000 +0100 @@@@ -25,6 +25,7 @@@@ d13 3 a15 3 --- src/Makefile.in.orig 2004-04-23 08:16:24.000000000 +0200 +++ src/Makefile.in 2004-04-26 12:44:03.000000000 +0200 @@@@ -166,7 +166,7 @@@@ a23 29 Index: configure --- configure.orig 2005-04-04 17:37:00 +0200 +++ configure 2005-07-07 10:47:55 +0200 @@@@ -12196,7 +12196,7 @@@@ # Check whether --with-lzo or --without-lzo was given. if test "${with_lzo+set}" = set; then withval="$with_lzo" - use_lzo=no + use_lzo=$withval else use_lzo=yes fi; Index: libextra/lzoconf.h --- libextra/lzoconf.h.orig 2005-01-27 14:16:12 +0100 +++ libextra/lzoconf.h 2005-07-07 11:11:30 +0200 @@@@ -408,11 +408,11 @@@@ * lzo_init() is a macro to allow checking that the library and the * compiler's view of various types are consistent. */ -#define lzo_init() __lzo_init2(LZO_VERSION,(int)sizeof(short),(int)sizeof(int),\ +#define lzo_init() __lzo_init_v2(LZO_VERSION,(int)sizeof(short),(int)sizeof(int),\ (int)sizeof(long),(int)sizeof(lzo_uint32),(int)sizeof(lzo_uint),\ (int)lzo_sizeof_dict_t,(int)sizeof(char *),(int)sizeof(lzo_voidp),\ (int)sizeof(lzo_compress_t)) - LZO_EXTERN(int) __lzo_init2(unsigned, int, int, int, int, int, int, + LZO_EXTERN(int) __lzo_init_v2(unsigned, int, int, int, int, int, int, int, int, int); /* version functions (useful for shared libraries) */ @ 1.10 log @upgrading package: gnutls 1.0.16 -> 1.0.17 @ text @d24 29 @ 1.9 log @upgrading package: gnutls 1.0.12 -> 1.0.13 @ text @d15 1 a15 1 @@@@ -50,7 +50,7 @@@@ @ 1.8 log @upgrading package: gnutls 1.0.11 -> 1.0.12 @ text @a23 21 Index: lib/Makefile.in --- lib/Makefile.in.orig 2004-04-23 08:16:23.000000000 +0200 +++ lib/Makefile.in 2004-04-26 12:41:48.000000000 +0200 @@@@ -228,7 +228,7 @@@@ x509/x509.lo x509/extensions.lo x509/compat.lo x509/verify.lo \ x509/mpi.lo x509/privkey.lo x509/pkcs7.lo x509/crq.lo x509/xml.lo x509/sign.lo \ x509/pkcs5.lo x509/privkey_pkcs8.lo x509/pkcs12.lo x509/pkcs12_bag.lo \ - x509/pkcs12_encr.lo x509/rfc2818_hostname.lo x509/rc2.lo x509/x509_write.lo \ + x509/pkcs12_encr.lo x509/rfc2818_hostname.lo x509/x509_write.lo \ x509/crl_write.lo x509/dsa.lo @@@@ -248,7 +248,7 @@@@ x509/mpi.lo x509/privkey.lo x509/pkcs7.lo x509/crq.lo \ x509/xml.lo x509/sign.lo x509/pkcs5.lo x509/privkey_pkcs8.lo \ x509/pkcs12.lo x509/pkcs12_bag.lo x509/pkcs12_encr.lo \ - x509/rfc2818_hostname.lo x509/rc2.lo x509/x509_write.lo \ + x509/rfc2818_hostname.lo x509/x509_write.lo \ x509/crl_write.lo x509/dsa.lo am__objects_1 = gnutls_record.lo gnutls_compress.lo debug.lo \ gnutls_cipher.lo gnutls_buffers.lo gnutls_handshake.lo \ @ 1.7 log @upgrading package: gnutls 0.9.99 -> 1.0.0 @ text @d12 33 @ 1.6 log @upgrading package: gnutls 0.9.98 -> 0.9.99 @ text @a11 13 Index: src/common.c --- src/common.c.orig 2003-11-22 17:27:07.000000000 +0100 +++ src/common.c 2003-11-29 12:46:16.000000000 +0100 @@@@ -548,9 +548,6 @@@@ if (strncasecmp(ciphers[i], "AES", 3) == 0) cipher_priority[j++] = GNUTLS_CIPHER_AES_128_CBC; - if (strncasecmp(ciphers[i], "TWO", 3) == 0) - cipher_priority[j++] = - GNUTLS_CIPHER_TWOFISH_128_CBC; if (strncasecmp(ciphers[i], "3DE", 3) == 0) cipher_priority[j++] = GNUTLS_CIPHER_3DES_CBC; @ 1.5 log @upgrading package: gnutls 0.9.96 -> 0.9.97 @ text @d2 3 a4 3 --- lib/defines.h.orig 2003-08-13 12:24:26.000000000 +0200 +++ lib/defines.h 2003-10-31 08:43:23.000000000 +0100 @@@@ -35,6 +35,7 @@@@ d12 13 @ 1.4 log @upgrading package: gnutls 0.9.93 -> 0.9.94 @ text @a11 11 Index: configure --- configure.orig 2003-10-30 08:49:55.000000000 +0100 +++ configure 2003-10-31 08:45:37.000000000 +0100 @@@@ -7318,7 +7318,6 @@@@ libgcrypt_config_prefix="" fi; if test x$libgcrypt_config_prefix != x ; then - libgcrypt_config_args="$libgcrypt_config_args --prefix=$libgcrypt_config_prefix" if test x${LIBGCRYPT_CONFIG+set} != xset ; then LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config fi @ 1.3 log @add missing standard C header @ text @d1 4 a4 3 --- lib/defines.h.dist 2003-07-10 15:16:39.000000000 +0200 +++ lib/defines.h 2003-07-10 15:16:49.000000000 +0200 @@@@ -40,6 +40,7 @@@@ d12 11 @ 1.2 log @Removing gnutls.patch @ text @d1 10 a10 52 --- gnutls-0.8.0/configure.orig Wed Jan 22 13:16:28 2003 +++ gnutls-0.8.0/configure Wed Jan 22 13:17:22 2003 @@@@ -12615,7 +12615,7 @@@@ ac_config_commands="$ac_config_commands includes/gnutls/gnutls.h" - ac_config_files="$ac_config_files Makefile src/Makefile libextra/Makefile lib/Makefile lib/libgnutls-config libextra/libgnutls-extra-config doc/Makefile src/x509/Makefile src/srp/Makefile src/openpgp/Makefile doc/tex/Makefile doc/tex/cover.tex doc/scripts/Makefile doc/examples/Makefile lib/minitasn1/Makefile includes/Makefile includes/gnutls/Makefile" + ac_config_files="$ac_config_files Makefile src/Makefile libextra/Makefile lib/Makefile lib/libgnutls-config libextra/libgnutls-extra-config doc/Makefile src/x509/Makefile src/srp/Makefile src/openpgp/Makefile doc/tex/Makefile doc/tex/cover.tex doc/examples/Makefile lib/minitasn1/Makefile includes/Makefile includes/gnutls/Makefile" cat >confcache <<\_ACEOF --- gnutls-0.8.0/lib/gnutls_mpi.h.orig Wed Jan 22 13:28:37 2003 +++ gnutls-0.8.0/lib/gnutls_mpi.h Wed Jan 22 13:29:06 2003 @@@@ -2,7 +2,7 @@@@ # define GNUTLS_MPI_H # include -# include +# include #define GNUTLS_MPI GCRY_MPI --- gnutls-0.8.0/lib/gnutls_cert.h.orig Wed Jan 22 13:33:47 2003 +++ gnutls-0.8.0/lib/gnutls_cert.h Wed Jan 22 13:34:05 2003 @@@@ -2,7 +2,7 @@@@ # define GNUTLS_CERT_H #include -#include +#include #include #define MAX_PARAMS_SIZE 6 /* ok for RSA and DSA */ --- gnutls-0.8.0/lib/gnutls_global.h.orig Wed Jan 22 13:37:15 2003 +++ gnutls-0.8.0/lib/gnutls_global.h Wed Jan 22 13:37:32 2003 @@@@ -1,7 +1,7 @@@@ #ifndef GNUTLS_GLOBAL_H # define GNUTLS_GLOBAL_H -#include +#include int gnutls_global_init( void); int gnutls_is_secure_memory(const void* mem); --- gnutls-0.8.0/lib/gnutls_x509.h.orig Wed Jan 22 13:39:21 2003 +++ gnutls-0.8.0/lib/gnutls_x509.h Wed Jan 22 13:39:38 2003 @@@@ -1,4 +1,4 @@@@ -#include +#include int _gnutls_x509_cert_verify_peers(gnutls_session session); @ 1.1 log @upgrading package: gnutls 0.6.0 -> 0.8.0 @ text @@