Attachment 39121 Details for Bug 61762 – file.diff

[patch] file.diff

file.diff (text/plain), 3.07 KB, created by Len Sassaman on 2004-01-23 03:10:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Len Sassaman

Created: 2004-01-23 03:10:14 UTC

Size: 3.07 KB

patch

obsolete

>diff -ruN pgp6/Makefile pgp6-new/Makefile
>--- pgp6/Makefile       Wed Jan 21 23:53:53 2004
>+++ pgp6-new/Makefile   Thu Jan 22 17:33:18 2004
>@@ -1,6 +1,6 @@
> # New ports collection makefile for:   pgp6
> # Date created:                                25 Jan 2000
>-# Whom:                                        mike@fate.com
>+# Whom:                                        Len Sassaman
> #
> # $FreeBSD: ports/security/pgp6/Makefile,v 1.45 2004/01/22 07:53:53 dinoex Exp $
> #
>@@ -30,11 +30,6 @@
> LATEST_LINK=   pgp6
> 
> .include <bsd.port.pre.mk>
>-
>-#.if ${OSVERSION} >= 500113
>-#BROKEN=       "Does not compile"
>-#.endif
>-FORBIDDEN=     "documented exploits exist; patches will be supplied by maintainer"
> 
> # the distfile is actually a tar of three compressed tars and their
> # signatures
>diff -ruN pgp6/files/patch-ar pgp6-new/files/patch-ar
>--- pgp6/files/patch-ar Wed Dec 31 16:00:00 1969
>+++ pgp6-new/files/patch-ar     Thu Jan 22 14:57:50 2004
>@@ -0,0 +1,14 @@
>+--- libs/pfl/common/lthread/pgpThreads.h.orig   Mon Apr 19 10:59:53 1999
>++++ libs/pfl/common/lthread/pgpThreads.h        Thu Jan 22 12:34:15 2004
>+@@ -138,7 +138,9 @@
>+ #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
>++   commented out for FreeBSD        */ 
>++#if 0
>+ 
>+ #undef HAVE_SEMGET     /* prefer POSIX sem_init over semget */
>+ #define HAVE_SEMGET 0
>+
>diff -ruN pgp6/files/patch-as pgp6-new/files/patch-as
>--- pgp6/files/patch-as Wed Dec 31 16:00:00 1969
>+++ pgp6-new/files/patch-as     Thu Jan 22 14:58:01 2004
>@@ -0,0 +1,13 @@
>+--- libs/pfl/common/lthread/pgpSemaphore.c.old  Tue Mar 17 21:08:17 1998
>++++ libs/pfl/common/lthread/pgpSemaphore.c      Thu Jan 22 13:00:16 2004
>+@@ -41,7 +41,9 @@
>+ #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
>++   commented out for FreeBSD */
>++#if 0
>+ 
>+ PGPSemAttr_t PGPSemAttr_def = {0, 0};
>+ 
>diff -ruN pgp6/files/patch-cc pgp6-new/files/patch-cc
>--- pgp6/files/patch-cc Wed Dec 31 16:00:00 1969
>+++ pgp6-new/files/patch-cc     Thu Jan 22 14:57:16 2004
>@@ -0,0 +1,19 @@
>+--- 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 );

Actions: View | Diff

Attachments on bug 61762: 39121