Attachment #39121 for bug #61762

View | Details | Raw Unified | Return to bug 61762
Collapse All | Expand All




# New ports collection makefile for:   pgp6
# Date created:                                25 Jan 2000
# Whom:                                        Len Sassaman
#
# $FreeBSD: ports/security/pgp6/Makefile,v 1.45 2004/01/22 07:53:53 dinoex Exp $
#

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




--- 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





--- 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};
 




--- 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 );

Return to bug 61762

Lines 1-6 Link Here

(-)pgp6-new/Makefile Thu Jan 22 17:33:18 2004 (-6 / +1 lines)
1	# New ports collection makefile for: pgp6	1	# New ports collection makefile for: pgp6
2	# Date created: 25 Jan 2000	2	# Date created: 25 Jan 2000
3	# Whom: mike@fate.com	3	# Whom: Len Sassaman
4	#	4	#
5	# $FreeBSD: ports/security/pgp6/Makefile,v 1.45 2004/01/22 07:53:53 dinoex Exp $	5	# $FreeBSD: ports/security/pgp6/Makefile,v 1.45 2004/01/22 07:53:53 dinoex Exp $
6	#	6	#
Lines 30-40 Link Here
30	LATEST_LINK= pgp6	30	LATEST_LINK= pgp6
31		31
32	.include <bsd.port.pre.mk>	32	.include <bsd.port.pre.mk>
33
34	#.if ${OSVERSION} >= 500113
35	#BROKEN= "Does not compile"
36	#.endif
37	FORBIDDEN= "documented exploits exist; patches will be supplied by maintainer"
38		33
39	# the distfile is actually a tar of three compressed tars and their	34	# the distfile is actually a tar of three compressed tars and their
40	# signatures	35	# signatures

Line 0 Link Here

(-)pgp6-new/files/patch-ar Thu Jan 22 14:57:50 2004 (+14 lines)
	1	--- libs/pfl/common/lthread/pgpThreads.h.orig Mon Apr 19 10:59:53 1999
	2	+++ libs/pfl/common/lthread/pgpThreads.h Thu Jan 22 12:34:15 2004
	3	@@ -138,7 +138,9 @@
	4	#endif /* end HAVE_PTHREAD_ATTR_CREATE */
	5
	6	/* My version of Linux has sem_init in pthreads.so, but zero headers ?? */
	7	-#if HAVE_SEM_INIT && !PGP_UNIX_LINUX
	8	+/* #if HAVE_SEM_INIT && !PGP_UNIX_LINUX
	9	+ commented out for FreeBSD */
	10	+#if 0
	11
	12	#undef HAVE_SEMGET /* prefer POSIX sem_init over semget */
	13	#define HAVE_SEMGET 0
	14

Line 0 Link Here

(-)pgp6-new/files/patch-as Thu Jan 22 14:58:01 2004 (+13 lines)
	1	--- libs/pfl/common/lthread/pgpSemaphore.c.old Tue Mar 17 21:08:17 1998
	2	+++ libs/pfl/common/lthread/pgpSemaphore.c Thu Jan 22 13:00:16 2004
	3	@@ -41,7 +41,9 @@
	4	#endif /* end PGP_UNIX_SOLARIS */
	5
	6	/* Linux has sem_init function but no headers ?? */
	7	-#if HAVE_SEM_INIT && !PGP_UNIX_LINUX
	8	+/* #if HAVE_SEM_INIT && !PGP_UNIX_LINUX
	9	+ commented out for FreeBSD */
	10	+#if 0
	11
	12	PGPSemAttr_t PGPSemAttr_def = {0, 0};
	13

Line 0 Link Here

(-)pgp6-new/files/patch-cc Thu Jan 22 14:57:16 2004 (+19 lines)
	1	--- clients/pgp/cmdline/doencode.c Thu Sep 30 20:10:21 1999
	2	+++ clients/pgp/cmdline/doencode.c Thu Jan 11 20:50:20 2001
	3	@@ -283,6 +283,7 @@
	4	PGPBoolean batchmode = pgpenvGetInt( env, PGPENV_BATCHMODE, &pri, &err );
	5	PGPBoolean verbose = pgpenvGetInt( env, PGPENV_VERBOSE, &pri, &err );
	6	PGPBoolean quietmode = pgpenvGetInt( env, PGPENV_NOOUT, &pri, &err);
	7	+ PGPBoolean force = pgpenvGetInt( env, PGPENV_FORCE, &pri, &err);
	8	PGPKeySetRef tmpset;
	9
	10	err = PGPNewEmptyKeySet( toSet, &tmpset );
	11	@@ -317,7 +318,7 @@
	12	if(verbose)
	13	pgpShowKeyValidity( filebPtr, key );
	14
	15	- if( validity < kPGPValidity_Marginal ) {
	16	+ if( validity < kPGPValidity_Marginal && !force) {
	17	char useridstr[ kPGPMaxUserIDSize ];
	18	PGPBoolean answer;
	19	err = pgpGetUserIDStringFromKey( key, useridstr );