Browse Source

upgrading package: gnutls 0.9.98 -> 0.9.99

Ralf S. Engelschall 22 years ago
parent
commit
c623a2167a
2 changed files with 21 additions and 8 deletions
  1. 16 3
      gnutls/gnutls.patch
  2. 5 5
      gnutls/gnutls.spec

+ 16 - 3
gnutls/gnutls.patch

@@ -1,7 +1,7 @@
 Index: lib/defines.h
---- 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 @@
+--- 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 @@
  
  #ifdef STDC_HEADERS
  # include <string.h>
@@ -9,3 +9,16 @@ Index: lib/defines.h
  # include <stdlib.h>
  # include <stdio.h>
  # include <ctype.h>
+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;

+ 5 - 5
gnutls/gnutls.spec

@@ -32,8 +32,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [EVAL]
 Group:        Cryptography
 License:      GPL
-Version:      0.9.98
-Release:      20031116
+Version:      0.9.99
+Release:      20031129
 
 #   list of sources
 Source0:      ftp://gnutls.hellug.gr/pub/gnutls/gnutls-%{version}.tar.gz
@@ -44,8 +44,8 @@ Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20030909
 PreReq:       OpenPKG, openpkg >= 20030909
-BuildPreReq:  gcrypt >= 1.1.44, libtasn1, lzo, getopt
-PreReq:       gcrypt >= 1.1.44, libtasn1, lzo, getopt
+BuildPreReq:  gcrypt >= 1.1.44, opencdk >= 0.5.2, libtasn1, lzo, getopt
+PreReq:       gcrypt >= 1.1.44, opencdk >= 0.5.2, libtasn1, lzo, getopt
 AutoReq:      no
 AutoReqProv:  no
 
@@ -70,11 +70,11 @@ AutoReqProv:  no
     CPPFLAGS="%{l_cppflags} %{l_cppflags lzo}" \
     LDFLAGS="%{l_ldflags}" \
     LIBS="$libs -lgetopt `%{l_prefix}/bin/gpg-error-config --libs`" \
-    LIBOPENCDK_CONFIG=no \
     ./configure \
         --cache-file=config.cache \
         --prefix=%{l_prefix} \
         --with-libgcrypt-prefix=%{l_prefix} \
+        --with-libopencdk-prefix=%{l_prefix} \
         --disable-shared
     %{l_make} %{l_mflags -O}