OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 03-Oct-2005 20:57:05
Branch: HEAD Handle: 2005100319570500
Modified files:
openpkg-src/pgp pgp.patch pgp.spec
Log:
gcc4 fix for pgp
Summary:
Revision Changes Path
1.9 +97 -0 openpkg-src/pgp/pgp.patch
1.45 +11 -8 openpkg-src/pgp/pgp.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pgp/pgp.patch
============================================================================
$ cvs diff -u -r1.8 -r1.9 pgp.patch
--- openpkg-src/pgp/pgp.patch 11 Jun 2005 11:25:12 -0000 1.8
+++ openpkg-src/pgp/pgp.patch 3 Oct 2005 18:57:05 -0000 1.9
@@ -597,3 +597,100 @@
-PLATFORMCFLAGS= -Dnetbsd
+PLATFORMCFLAGS= -Dnetbsd -DPGP_UNIX=1
+Index: libs/pfl/common/classes/StPGPRefs.h
+--- libs/pfl/common/classes/StPGPRefs.h.orig 1999-08-05 10:22:16 +0200
++++ libs/pfl/common/classes/StPGPRefs.h 2005-10-03 19:33:03 +0200
+@@ -64,27 +64,27 @@
+
+ #ifdef Included_pgpKeys_h
+ typedef StPGPRef<PGPKeySetRef> StPGPKeySetRef;
+- inline void StPGPKeySetRef::Dispose() { PGPFreeKeySet(mRef); }
++ template <> inline void StPGPKeySetRef::Dispose() {
PGPFreeKeySet(mRef); }
+
+ typedef StPGPRef<PGPKeyListRef> StPGPKeyListRef;
+- inline void StPGPKeyListRef::Dispose() { PGPFreeKeyList(mRef); }
++ template <> inline void StPGPKeyListRef::Dispose() {
PGPFreeKeyList(mRef); }
+
+ typedef StPGPRef<PGPKeyIterRef> StPGPKeyIterRef;
+- inline void StPGPKeyIterRef::Dispose() { PGPFreeKeyIter(mRef); }
++ template <> inline void StPGPKeyIterRef::Dispose() {
PGPFreeKeyIter(mRef); }
+ #endif
+
+ #ifdef Included_pgpHashing_h
+ typedef StPGPRef<PGPHashContextRef> StPGPHashContextRef;
+- inline void StPGPHashContextRef::Dispose() { PGPFreeHashContext(mRef); }
++ template <> inline void StPGPHashContextRef::Dispose() {
PGPFreeHashContext(mRef); }
+ #endif
+
+ #ifdef Included_PGPtls_h
+ typedef StPGPRef<PGPtlsSessionRef> StPGPtlsSessionRef;
+- inline void StPGPtlsSessionRef::Dispose() { PGPFreeTLSSession(mRef); }
++ template <> inline void StPGPtlsSessionRef::Dispose() {
PGPFreeTLSSession(mRef); }
+ #endif
+
+ #ifdef Included_pgpMemoryMgr_h
+- inline void StPGPRef<PGPByte *>::Dispose() { PGPFreeData(mRef); }
++ template <> inline void StPGPRef<PGPByte *>::Dispose() {
PGPFreeData(mRef); }
+ class StPGPDataRef : public StPGPRef<PGPByte *> {
+ public:
+ StPGPDataRef() { }
+@@ -104,22 +104,22 @@
+ };
+
+ typedef StPGPRef<PGPMemoryMgrRef> StPGPMemoryMgrRef;
+- inline void StPGPMemoryMgrRef::Dispose() { PGPFreeMemoryMgr(mRef); }
++ template <> inline void StPGPMemoryMgrRef::Dispose() {
PGPFreeMemoryMgr(mRef); }
+ #endif
+
+ #ifdef Included_pgpSockets_h
+ typedef StPGPRef<PGPSocketRef> StPGPSocketRef;
+- inline void StPGPSocketRef::Dispose() { PGPCloseSocket(mRef); }
++ template <> inline void StPGPSocketRef::Dispose() {
PGPCloseSocket(mRef); }
+ #endif
+
+ #ifdef Included_pflPrefs_h
+ typedef StPGPRef<PGPPrefRef> StPGPPrefRef;
+- inline void StPGPPrefRef::Dispose() { PGPClosePrefFile(mRef); }
++ template <> inline void StPGPPrefRef::Dispose() {
PGPClosePrefFile(mRef); }
+ #endif
+
+ #ifdef Included_pgpIO_h
+ typedef StPGPRef<PGPIORef> StPGPIORef;
+- inline void StPGPIORef::Dispose() { PGPFreeIO(mRef); }
++ template <> inline void StPGPIORef::Dispose() { PGPFreeIO(mRef); }
+ #endif
+
+ #undef STATIC_CAST
+Index: clients/pgp/cmdline/args.c
+--- clients/pgp/cmdline/args.c.orig 1999-10-04 23:49:07 +0200
++++ clients/pgp/cmdline/args.c 2005-10-03 20:07:25 +0200
+@@ -117,7 +117,7 @@
+ * interface to the old methods
+ */
+
+-static int maintUpdate(PGPFileSpecRef ringfilespec,
++int maintUpdate(PGPFileSpecRef ringfilespec,
+ struct newkey const *nkeys)
+ {
+ /*
+@@ -127,7 +127,7 @@
+ return 0;
+ }
+
+-static int cryptRandWriteFile(char const *name,
++int cryptRandWriteFile(char const *name,
+ struct IdeaCfbContext
*cfb,
+ unsigned bytes)
+ {
+Index: clients/pgp/cmdline/keymaint.c
+--- clients/pgp/cmdline/keymaint.c.orig 1999-05-12 23:01:04 +0200
++++ clients/pgp/cmdline/keymaint.c 2005-10-03 20:24:24 +0200
+@@ -264,7 +264,7 @@
+ pgpAssertNoErr(err);
+
+ if ( (PGPUInt32)traceValue == 0) {
+- (PGPUInt32)traceValue = depth;
++ traceValue = depth;
+
+ err = PGPSetKeyUserVal( key, traceValue);
+ pgpAssertNoErr(err);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pgp/pgp.spec
============================================================================
$ cvs diff -u -r1.44 -r1.45 pgp.spec
--- openpkg-src/pgp/pgp.spec 11 Jun 2005 11:25:12 -0000 1.44
+++ openpkg-src/pgp/pgp.spec 3 Oct 2005 18:57:05 -0000 1.45
@@ -38,7 +38,7 @@
Group: Cryptography
License: GPL
Version: %{V_long}
-Release: 20050611
+Release: 20051003
# list of sources
Source0:
ftp://ftp.pgpi.org/pub/pgp/%{V_short}/%{V_long}/pgpsrc%{V_strip}unix.tar.gz
@@ -70,29 +70,32 @@
%{l_gzip} -d -c pgpsrc%{V_strip}unix.tar.gz | %{l_tar} xf -
cd pgpsrc
%patch -p0
+ %{l_shtool} subst \
+ -e 's; -fwritable-strings;;' \
+ libs/network/ldaplib/Make-common libs/network/ldaplib/*/Makefile
%build
cd pgpsrc
( cd libs/pfl
CC="%{l_cc}" CFLAGS="%{l_cflags -O}" ./configure
- %{l_make} %{l_mflags} OPT="%{l_cflags -O}" DEBUG=0
+ %{l_make} %{l_mflags} OPT="$CFLAGS" DEBUG=0
) || exit $?
( cd libs/pgpcdk
- CC="%{l_cc}" CFLAGS="%{l_cflags -O}" ./configure
+ CC="%{l_cc}" CFLAGS="%{l_cflags -O} -trigraphs" ./configure
%{l_make} %{l_mflags} headers
- %{l_make} %{l_mflags} OPT="%{l_cflags -O}" DEBUG=0
+ %{l_make} %{l_mflags} OPT="$CFLAGS" DEBUG=0
) || exit $?
( cd clients/pgp/shared
- CC="%{l_cc}" CFLAGS="%{l_cflags -O}" ./configure
- %{l_make} %{l_mflags} OPT="%{l_cflags -O}" DEBUG=0
+ CC="%{l_cc}" CFLAGS="%{l_cflags -O} -trigraphs" ./configure
+ %{l_make} %{l_mflags} OPT="$CFLAGS" DEBUG=0
) || exit $?
( cd clients/pgp/cmdline
- CFLAGS="%{l_cflags -O}"
+ CFLAGS="%{l_cflags -O} -trigraphs"
case "%{l_platform -t}" in
*-freebsd* ) CFLAGS="$CFLAGS -pthread" ;;
esac
CC="%{l_cc}" CFLAGS="$CFLAGS" LIBS="$LIBS" ./configure
- %{l_make} %{l_mflags} OPT="%{l_cflags -O}" DEBUG=0
+ %{l_make} %{l_mflags} OPT="$CFLAGS" DEBUG=0
) || exit $?
%install
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
