summaryrefslogtreecommitdiff
path: root/security/pgp6/files
diff options
context:
space:
mode:
Diffstat (limited to 'security/pgp6/files')
-rw-r--r--security/pgp6/files/build.Makefile16
-rw-r--r--security/pgp6/files/patch-Make-platform10
-rw-r--r--security/pgp6/files/patch-StPGPRefs.h63
-rw-r--r--security/pgp6/files/patch-ah19
-rw-r--r--security/pgp6/files/patch-ai14
-rw-r--r--security/pgp6/files/patch-aj11
-rw-r--r--security/pgp6/files/patch-ao15
-rw-r--r--security/pgp6/files/patch-ap20
-rw-r--r--security/pgp6/files/patch-aq11
-rw-r--r--security/pgp6/files/patch-ar11
-rw-r--r--security/pgp6/files/patch-as11
-rw-r--r--security/pgp6/files/patch-at11
-rw-r--r--security/pgp6/files/patch-ca11
-rw-r--r--security/pgp6/files/patch-cb10
-rw-r--r--security/pgp6/files/patch-cc19
-rw-r--r--security/pgp6/files/patch-cmdline%keygen.c6
-rw-r--r--security/pgp6/files/patch-cmdline%keymaint.c11
-rw-r--r--security/pgp6/files/patch-cmdline%prototypes.h20
-rw-r--r--security/pgp6/files/patch-cmdline%stubs.c6
-rw-r--r--security/pgp6/files/patch-ldaplib%Makefile17
20 files changed, 0 insertions, 312 deletions
diff --git a/security/pgp6/files/build.Makefile b/security/pgp6/files/build.Makefile
deleted file mode 100644
index 3d3c64a1124e..000000000000
--- a/security/pgp6/files/build.Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# build.sh expressed as a makefile
-# mike@fate.com
-#
-
-all:
- cd libs/pfl ; ./configure
- cd libs/pfl ; gmake
- cd libs/pgpcdk ; ./configure
- cd libs/pgpcdk ; gmake headers
- cd libs/pgpcdk ; gmake
- cd clients/pgp/shared ; ./configure
- cd clients/pgp/shared ; gmake
- cd clients/pgp/cmdline ; ./configure
- cd clients/pgp/cmdline ; gmake
-
diff --git a/security/pgp6/files/patch-Make-platform b/security/pgp6/files/patch-Make-platform
deleted file mode 100644
index c6c38d9ab812..000000000000
--- a/security/pgp6/files/patch-Make-platform
+++ /dev/null
@@ -1,10 +0,0 @@
---- libs/network/ldaplib/build/platforms/freebsd-gcc/Make-platform.orig 2008-08-31 01:19:49.000000000 -0700
-+++ libs/network/ldaplib/build/platforms/freebsd-gcc/Make-platform 2008-08-31 01:19:52.000000000 -0700
-@@ -11,6 +11,6 @@
- # -------------------------------------------------------------------------
- # you will probably not need to edit anything below this point
- # -------------------------------------------------------------------------
--CC = gcc
-+#CC = gcc
-
- PLATFORMCFLAGS= -Dfreebsd
diff --git a/security/pgp6/files/patch-StPGPRefs.h b/security/pgp6/files/patch-StPGPRefs.h
deleted file mode 100644
index 584f36efba02..000000000000
--- a/security/pgp6/files/patch-StPGPRefs.h
+++ /dev/null
@@ -1,63 +0,0 @@
---- libs/pfl/common/classes/StPGPRefs.h.orig 1999-08-05 01:22:16.000000000 -0700
-+++ libs/pfl/common/classes/StPGPRefs.h 2008-08-31 01:11:35.000000000 -0700
-@@ -64,27 +64,27 @@ protected:
-
- #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 @@ protected:
- };
-
- 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
diff --git a/security/pgp6/files/patch-ah b/security/pgp6/files/patch-ah
deleted file mode 100644
index 14df73baac0b..000000000000
--- a/security/pgp6/files/patch-ah
+++ /dev/null
@@ -1,19 +0,0 @@
-*** libs/pgpcdk/priv/crypto/bignum/Makefile.in 2000/01/26 03:17:45 1.1
---- libs/pgpcdk/priv/crypto/bignum/Makefile.in 2000/01/26 03:19:25 1.2
-***************
-*** 10,16 ****
- # Architecture-dependent asm code
- .SUFFIXES: .s
- .s.o:
-! $(CC) -c $(CFLAGS) $<
-
- DEFS_sparc=-DBNINCLUDE=bnisparc.h
- OBJS_sparc=bnisparc.o
---- 10,16 ----
- # Architecture-dependent asm code
- .SUFFIXES: .s
- .s.o:
-! $(CC) -c -O -g $<
-
- DEFS_sparc=-DBNINCLUDE=bnisparc.h
- OBJS_sparc=bnisparc.o
diff --git a/security/pgp6/files/patch-ai b/security/pgp6/files/patch-ai
deleted file mode 100644
index e629d4c25567..000000000000
--- a/security/pgp6/files/patch-ai
+++ /dev/null
@@ -1,14 +0,0 @@
---- libs/pgpcdk/priv/crypto/bignum/bni80386_aout.s.orig 1998-07-31 15:03:37.000000000 -0700
-+++ libs/pgpcdk/priv/crypto/bignum/bni80386_aout.s 2008-08-31 16:41:34.000000000 -0700
-@@ -17,7 +17,8 @@
- # Different assemblers have different conventions here
- # These conventions are for a.out format assembler
--align4=2 # could be 2 or 4
--align8=3 # could be 3 or 8
--align16=4 # cound be 4 or 16
-+# Changed from 2,3,4 to 4,8,16 for FreeBSD
-+align4=4 # could be 2 or 4
-+align8=8 # could be 3 or 8
-+align16=16 # cound be 4 or 16
-
-
diff --git a/security/pgp6/files/patch-aj b/security/pgp6/files/patch-aj
deleted file mode 100644
index 2e5852c1065b..000000000000
--- a/security/pgp6/files/patch-aj
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/pgpcdk/pub/include/pgpSockets.h.orig 1999-08-04 11:36:04.000000000 -0700
-+++ libs/pgpcdk/pub/include/pgpSockets.h 2008-08-31 00:37:11.000000000 -0700
-@@ -20,7 +20,7 @@ ________________________________________
- #if PGP_UNIX
- # include <sys/types.h>
- # include <sys/socket.h>
--#if PGP_UNIX_LINUX
-+#if PGP_UNIX_LINUX || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
- # include <sys/time.h> /* Needed for unknown reason */
- # include <sys/ioctl.h> /* Need FIONREAD */
- #elif PGP_UNIX_SOLARIS
diff --git a/security/pgp6/files/patch-ao b/security/pgp6/files/patch-ao
deleted file mode 100644
index 1b6b9e15d38a..000000000000
--- a/security/pgp6/files/patch-ao
+++ /dev/null
@@ -1,15 +0,0 @@
-*** libs/network/ldaplib/liblber/io.c 2000/01/26 03:10:31 1.1.1.1
---- libs/network/ldaplib/liblber/io.c 2000/01/26 03:12:55 1.1.1.2
-***************
-*** 14,19 ****
---- 14,23 ----
- #include <stdio.h>
- #include <ctype.h>
-
-+ #ifdef __FreeBSD__
-+ #include <sys/time.h>
-+ #endif
-+
- #if PGPSOCKETSLDAP /* jason */
- #include "pgpSocketsLDAP.h"
-
diff --git a/security/pgp6/files/patch-ap b/security/pgp6/files/patch-ap
deleted file mode 100644
index a5386cd9acc4..000000000000
--- a/security/pgp6/files/patch-ap
+++ /dev/null
@@ -1,20 +0,0 @@
---- clients/pgp/cmdline/Makefile.in.orig Fri Sep 1 14:11:16 2000
-+++ clients/pgp/cmdline/Makefile.in Fri Sep 29 21:06:48 2000
-@@ -48,7 +48,7 @@
- -I$(SDKDIR)/priv/include/opaque \
- -I$(RSAINC)
-
--LIBDIRS+=-L$(PFLDIR) -L$(SDKDIR)/unix -L$(RSALIBRARY)$(RSA_OS)
-+LIBDIRS+=-L$(PFLDIR) -L$(SDKDIR)/unix
-
- LIBS=-lPGPui -lPGPsdkNetwork -lPGPsdk -lpfl @THREADLIB@ $(RSALIBS) @LIBS@
-
-@@ -73,7 +73,7 @@
- CFLAGS=@CFLAGS@
- LDFLAGS=@LDFLAGS@
-
--CFLAGS+= -g
-+CFLAGS+= -g -pthread
-
- TARGET=pgp
-
diff --git a/security/pgp6/files/patch-aq b/security/pgp6/files/patch-aq
deleted file mode 100644
index ab27c1c51609..000000000000
--- a/security/pgp6/files/patch-aq
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/network/ldaplib/include/ldap.h.orig 1999-08-04 11:35:42.000000000 -0700
-+++ libs/network/ldaplib/include/ldap.h 2008-08-31 00:47:21.000000000 -0700
-@@ -86,7 +86,7 @@ extern __declspec(dllimport) unsigned lo
- #define GetThreadID GetCurrentThreadId
- #elif PGP_UNIX_SOLARIS
- #define GetThreadID thr_self
--#elif PGP_UNIX_LINUX || PGP_UNIX_AIX || PGP_UNIX_HPUX
-+#elif PGP_UNIX_LINUX || PGP_UNIX_AIX || PGP_UNIX_HPUX || defined(__FreeBSD__)
- /* This is for all pthreads systems, including Linux and AIX. */
- #define GetThreadID pthread_self
- #endif
diff --git a/security/pgp6/files/patch-ar b/security/pgp6/files/patch-ar
deleted file mode 100644
index b2e0c43ee0c2..000000000000
--- a/security/pgp6/files/patch-ar
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/pfl/common/lthread/pgpThreads.h.orig 1999-04-19 10:59:53.000000000 -0700
-+++ libs/pfl/common/lthread/pgpThreads.h 2008-08-31 17:22:17.000000000 -0700
-@@ -138,7 +138,7 @@ typedef pthread_key_t PGPThreadKey_t;
- #endif /* end HAVE_PTHREAD_ATTR_CREATE */
-
- /* My version of Linux has sem_init in pthreads.so, but *zero* headers ?? */
--#if HAVE_SEM_INIT && !PGP_UNIX_LINUX
-+#if HAVE_SEM_INIT && !PGP_UNIX_LINUX && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
-
- #undef HAVE_SEMGET /* prefer POSIX sem_init over semget */
- #define HAVE_SEMGET 0
diff --git a/security/pgp6/files/patch-as b/security/pgp6/files/patch-as
deleted file mode 100644
index f78f4fc4b91f..000000000000
--- a/security/pgp6/files/patch-as
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/pfl/common/lthread/pgpSemaphore.c.orig 1998-03-17 21:08:17.000000000 -0800
-+++ libs/pfl/common/lthread/pgpSemaphore.c 2008-09-01 10:01:39.000000000 -0700
-@@ -41,7 +41,7 @@ int PGPSemDestroy(PGPSem_t *sem)
- #endif /* end PGP_UNIX_SOLARIS */
-
- /* Linux has sem_init function but no headers ?? */
--#if HAVE_SEM_INIT && !PGP_UNIX_LINUX
-+#if HAVE_SEM_INIT && !PGP_UNIX_LINUX && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
-
- PGPSemAttr_t PGPSemAttr_def = {0, 0};
-
diff --git a/security/pgp6/files/patch-at b/security/pgp6/files/patch-at
deleted file mode 100644
index 7d549aa4fd72..000000000000
--- a/security/pgp6/files/patch-at
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/pgpcdk/priv/networklib/pgpsockets/common/pgpSockets.c.orig 1999-08-04 11:36:04.000000000 -0700
-+++ libs/pgpcdk/priv/networklib/pgpsockets/common/pgpSockets.c 2008-08-31 00:40:02.000000000 -0700
-@@ -39,7 +39,7 @@ ________________________________________
- # define closesocket(x) close((x))
- # define ioctlsocket(a,b,c) ioctl((a),(b),(c))
- typedef int SOCKET;
--#if PGP_UNIX_LINUX || PGP_UNIX_HPUX || PGP_UNIX_AIX
-+#if PGP_UNIX_LINUX || PGP_UNIX_HPUX || PGP_UNIX_AIX || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
- int gethostname (char * name, size_t namelen);
- #else
- int gethostname (char * name, int namelen);
diff --git a/security/pgp6/files/patch-ca b/security/pgp6/files/patch-ca
deleted file mode 100644
index 00b223975287..000000000000
--- a/security/pgp6/files/patch-ca
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/pgpcdk/priv/crypto/random/pgpRandomPool.c.orig 1999-08-06 13:56:49.000000000 -0700
-+++ libs/pgpcdk/priv/crypto/random/pgpRandomPool.c 2008-09-01 10:07:20.000000000 -0700
-@@ -424,7 +424,7 @@ pgpInitGlobalRandomPoolContext( PGPRando
- * #define UMULH_32(r,a,b) (r) = 0
- */
- #ifndef UMULH_32
--#if defined(__GNUC__) && defined(__i386__)
-+#if defined(__GNUC__) && defined(__i386__) && 0
- /* Inline asm goodies */
- #define UMULH_32(r,a,b) __asm__("mull %2" : "=d"(r) : "%a"(a), "mr"(b) : "ax")
- #elif HAVE64
diff --git a/security/pgp6/files/patch-cb b/security/pgp6/files/patch-cb
deleted file mode 100644
index 0e24f0e95803..000000000000
--- a/security/pgp6/files/patch-cb
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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: PGPKeyServerDialogs.cpp,v 1.2 1999/03/10 02:52:17 heller Exp $
- ____________________________________________________________________________*/
- #include <string.h>
-+#include <stdlib.h>
-
- #include "pgpDialogs.h"
- #include "pgpKeyServerDialogCommon.h"
diff --git a/security/pgp6/files/patch-cc b/security/pgp6/files/patch-cc
deleted file mode 100644
index 9366ea2eafeb..000000000000
--- a/security/pgp6/files/patch-cc
+++ /dev/null
@@ -1,19 +0,0 @@
---- clients/pgp/cmdline/doencode.c Thu Sep 30 20:10:21 1999
-+++ clients/pgp/cmdline/doencode.c Thu Jan 11 20:50:20 2001
-@@ -283,6 +283,7 @@
- PGPBoolean batchmode = pgpenvGetInt( env, PGPENV_BATCHMODE, &pri, &err );
- PGPBoolean verbose = pgpenvGetInt( env, PGPENV_VERBOSE, &pri, &err );
- PGPBoolean quietmode = pgpenvGetInt( env, PGPENV_NOOUT, &pri, &err);
-+ PGPBoolean force = pgpenvGetInt( env, PGPENV_FORCE, &pri, &err);
- PGPKeySetRef tmpset;
-
- err = PGPNewEmptyKeySet( toSet, &tmpset );
-@@ -317,7 +318,7 @@
- if(verbose)
- pgpShowKeyValidity( filebPtr, key );
-
-- if( validity < kPGPValidity_Marginal ) {
-+ if( validity < kPGPValidity_Marginal && !force) {
- char useridstr[ kPGPMaxUserIDSize ];
- PGPBoolean answer;
- err = pgpGetUserIDStringFromKey( key, useridstr );
diff --git a/security/pgp6/files/patch-cmdline%keygen.c b/security/pgp6/files/patch-cmdline%keygen.c
deleted file mode 100644
index 21c1217fda04..000000000000
--- a/security/pgp6/files/patch-cmdline%keygen.c
+++ /dev/null
@@ -1,6 +0,0 @@
---- clients/pgp/cmdline/keygen.c.orig 1999-09-30 17:10:21.000000000 -0700
-+++ clients/pgp/cmdline/keygen.c 2008-08-31 01:51:34.000000000 -0700
-@@ -14,2 +14,3 @@ ________________________________________
- #include <stdio.h>
-+#include <string.h>
-
diff --git a/security/pgp6/files/patch-cmdline%keymaint.c b/security/pgp6/files/patch-cmdline%keymaint.c
deleted file mode 100644
index 8acf0a252d9b..000000000000
--- a/security/pgp6/files/patch-cmdline%keymaint.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- clients/pgp/cmdline/keymaint.c.orig 1999-05-12 14:01:04.000000000 -0700
-+++ clients/pgp/cmdline/keymaint.c 2008-08-31 01:36:27.000000000 -0700
-@@ -264,7 +264,7 @@ PGPError markSignatureChainDepths(struct
- pgpAssertNoErr(err);
-
- if ( (PGPUInt32)traceValue == 0) {
-- (PGPUInt32)traceValue = depth;
-+ traceValue = depth;
-
- err = PGPSetKeyUserVal( key, traceValue);
- pgpAssertNoErr(err);
diff --git a/security/pgp6/files/patch-cmdline%prototypes.h b/security/pgp6/files/patch-cmdline%prototypes.h
deleted file mode 100644
index e0e37c0c732f..000000000000
--- a/security/pgp6/files/patch-cmdline%prototypes.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- clients/pgp/cmdline/prototypes.h.orig 1999-11-08 16:56:31.000000000 -0800
-+++ clients/pgp/cmdline/prototypes.h 2008-08-31 01:49:53.000000000 -0700
-@@ -307,7 +307,6 @@ int get_CONVERSION( );
-
- int maintCheck( PGPFileSpecRef ringfilespec, int options );
- struct newkey;
--int maintUpdate( PGPFileSpecRef ringfilespec, struct newkey const *nkeys );
- void init_charset( void );
- void CONVERT_TO_CANONICAL_CHARSET( char *s );
- char EXT_C( char c );
-@@ -317,9 +316,6 @@ struct IdeaCfbContext;
- int cryptRandOpen( struct IdeaCfbContext *cfb );
- void cryptRandSave( struct IdeaCfbContext *cfb );
-
--int cryptRandWriteFile( char const *name, struct IdeaCfbContext *cfb,
-- unsigned bytes );
--
- char * get_ext_c_ptr( void );
-
- /* see libPGPui.a */
diff --git a/security/pgp6/files/patch-cmdline%stubs.c b/security/pgp6/files/patch-cmdline%stubs.c
deleted file mode 100644
index 93b3d904c600..000000000000
--- a/security/pgp6/files/patch-cmdline%stubs.c
+++ /dev/null
@@ -1,6 +0,0 @@
---- clients/pgp/cmdline/stubs.c.orig 2008-08-31 01:34:02.000000000 -0700
-+++ clients/pgp/cmdline/stubs.c 2008-08-31 01:34:26.000000000 -0700
-@@ -0,0 +1 @@
-+#if 0
-@@ -49,0 +51 @@ int maintUpdate(PGPFileSpecRef ringfiles
-+#endif
diff --git a/security/pgp6/files/patch-ldaplib%Makefile b/security/pgp6/files/patch-ldaplib%Makefile
deleted file mode 100644
index 15c7cd2f412a..000000000000
--- a/security/pgp6/files/patch-ldaplib%Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
---- libs/network/ldaplib/Makefile.orig 1999-08-04 11:35:42.000000000 -0700
-+++ libs/network/ldaplib/Makefile 2008-08-31 01:17:43.000000000 -0700
-@@ -237,14 +237,6 @@ makeconfig: .makefiles buildtools
- CC=$(CC); \
- OLDIFS="$$IFS"; \
- IFS=":"; \
--if test -n "$CC"; then \
-- for dir in $$PATH; do \
-- if [ -f $$dir/gcc ]; then \
-- CC=gcc; \
-- break; \
-- fi; \
-- done; \
--fi; \
- IFS="$$OLDIFS"; \
- $(LN) ./build/platforms/$$PLATFORM-$$CC/Make-platform .make-platform; \
- echo ""; \
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-29 07:42:05 +0000