OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 24-Jul-2003 11:22:11
Branch: HEAD Handle: 2003072410220901
Modified files:
openpkg-src/pgp pgp.patch pgp.spec
openpkg-web news.txt
Log:
don't assume that fpos_t is a scalar integer
Summary:
Revision Changes Path
1.2 +62 -1 openpkg-src/pgp/pgp.patch
1.32 +1 -1 openpkg-src/pgp/pgp.spec
1.5784 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pgp/pgp.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 pgp.patch
--- openpkg-src/pgp/pgp.patch 22 Jul 2003 13:33:04 -0000 1.1
+++ openpkg-src/pgp/pgp.patch 24 Jul 2003 09:22:10 -0000 1.2
@@ -464,7 +464,7 @@
--- libs/pgpcdk/unix/ui/PGPKeyServerDialogs.cpp.orig Tue Mar 9 18:52:17 1999
+++ libs/pgpcdk/unix/ui/PGPKeyServerDialogs.cpp Fri Sep 29 20:51:02 2000
@@ -5,6 +5,7 @@
- $Id: pgp.patch,v 1.1 2003/07/22 13:33:04 rse Exp $
+ $Id: pgp.patch,v 1.2 2003/07/24 09:22:10 mlelstv Exp $
____________________________________________________________________________*/
#include <string.h>
+#include <stdlib.h>
@@ -492,4 +492,65 @@
+LIBS=-lPGPui -lPGPsdkNetwork -lPGPsdk -lPGPui -lpfl @THREADLIB@ $(RSALIBS) @LIBS@
SHAREDOBJS=$(SHAREDDIR)/pgpDiskWiper.o $(SHAREDDIR)/pgpClientErrors.o
+
+--- libs/pfl/common/file/pgpStdFileIO.c.dist 2003-07-24 11:05:41.000000000 +0200
++++ libs/pfl/common/file/pgpStdFileIO.c 2003-07-24 11:13:16.000000000 +0200
+@@ -23,6 +23,9 @@
+ #define PGP_USE_FILE_SPEC_PRIV
+ #include "pgpFileSpecPriv.h"
+
++#ifdef PGP_UNIX
++#define PGP_HAVE_SEEKO
++#endif
+
+ #define GetParentVTBL() pgpFileIOGetClassVTBL()
+
+@@ -124,8 +127,12 @@
+
+ PGPValidatePtr( self->stdioFILE );
+
++#ifdef PGP_HAVE_SEEKO
++ result = fseeko( self->stdioFILE, (off_t) newPos, SEEK_SET );
++#else
+ tempPos = newPos;
+ result = fsetpos( self->stdioFILE, &tempPos );
++#endif
+ if ( result != 0 )
+ {
+ err = kPGPError_FileOpFailed;
+@@ -192,7 +199,11 @@
+ PGPStdFileIORef self = (PGPStdFileIORef)ref;
+ FILE * stdioFILE = self->stdioFILE;
+ fpos_t startPos;
++#ifdef PGP_HAVE_SEEKO
++ off_t eofOff;
++#else
+ fpos_t eofPos;
++#endif
+ int fResult;
+
+ *eof = 0;
+@@ -205,7 +216,11 @@
+ /* seek to the end of the file so we can get its length */
+ fResult = fseek( stdioFILE, 0, SEEK_END );
+ if ( fResult == 0 )
++#ifdef PGP_HAVE_SEEKO
++ eofOff = ftello( stdioFILE );
++#else
+ fResult = fgetpos( stdioFILE, &eofPos);
++#endif
+
+ if ( fResult != 0 )
+ err = kPGPError_FileOpFailed;
+@@ -221,7 +236,11 @@
+ }
+
+
++#ifdef PGP_HAVE_SEEKO
++ *eof = eofOff;
++#else
+ *eof = eofPos;
++#endif
+ return( err );
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pgp/pgp.spec
============================================================================
$ cvs diff -u -r1.31 -r1.32 pgp.spec
--- openpkg-src/pgp/pgp.spec 22 Jul 2003 13:33:04 -0000 1.31
+++ openpkg-src/pgp/pgp.spec 24 Jul 2003 09:22:10 -0000 1.32
@@ -38,7 +38,7 @@
Group: Cryptography
License: GPL
Version: %{V_long}
-Release: 20030722
+Release: 20030724
# list of sources
Source0:
ftp://ftp.pgpi.org/pub/pgp/%{V_short}/%{V_long}/pgpsrc%{V_strip}unix.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5783 -r1.5784 news.txt
--- openpkg-web/news.txt 24 Jul 2003 08:55:52 -0000 1.5783
+++ openpkg-web/news.txt 24 Jul 2003 09:22:09 -0000 1.5784
@@ -1,3 +1,4 @@
+24-Jul-2003: Upgraded package: P<pgp-6.5.8-20030724>
24-Jul-2003: Upgraded package: P<aspell-0.50.3-20030724>
24-Jul-2003: Upgraded package: P<portfwd-0.26rc6-20030724>
24-Jul-2003: Upgraded package: P<flex-2.5.4a-20030724>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
