OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 25-Jul-2005 21:42:59 Branch: HEAD Handle: 2005072520425900 Modified files: openpkg-src/gnutls gnutls.patch gnutls.spec Log: fix tracking and upgrade Summary: Revision Changes Path 1.12 +6 -35 openpkg-src/gnutls/gnutls.patch 1.65 +3 -3 openpkg-src/gnutls/gnutls.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/gnutls/gnutls.patch ============================================================================ $ cvs diff -u -r1.11 -r1.12 gnutls.patch --- openpkg-src/gnutls/gnutls.patch 7 Jul 2005 09:16:41 -0000 1.11 +++ openpkg-src/gnutls/gnutls.patch 25 Jul 2005 19:42:59 -0000 1.12 @@ -1,7 +1,7 @@ Index: lib/defines.h ---- 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 @@ +--- 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 @@ #ifdef STDC_HEADERS # include <string.h> @@ -10,9 +10,9 @@ # include <stdio.h> # include <ctype.h> Index: src/Makefile.in ---- 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 @@ +--- 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 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ @@ -21,32 +21,3 @@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ -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) */ @@ . patch -p0 <<'@@ .' Index: openpkg-src/gnutls/gnutls.spec ============================================================================ $ cvs diff -u -r1.64 -r1.65 gnutls.spec --- openpkg-src/gnutls/gnutls.spec 7 Jul 2005 09:16:43 -0000 1.64 +++ openpkg-src/gnutls/gnutls.spec 25 Jul 2005 19:42:59 -0000 1.65 @@ -32,8 +32,8 @@ Class: PLUS Group: Cryptography License: GPL -Version: 1.2.1 -Release: 20050707 +Version: 1.2.6 +Release: 20050725 # list of sources Source0: ftp://gnutls.hellug.gr/pub/gnutls/gnutls-%{version}.tar.bz2 @@ -59,7 +59,7 @@ prog gnutls = { version = %{version} url = ftp://gnutls.hellug.gr/pub/gnutls/ - regex = gnutls-(__VER__)\.tar\.gz + regex = gnutls-(__VER__)\.tar\.bz2 } %prep @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org