cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- remove NO_PACKAGE and NEED_VERSION tags

Browse Source 
- improve patch-ao by also adding an option --with-rsaref so that the use
of RSAREF has to be enabled instead of enabling it based on the existance
of librsaref. Thus would allow someone to be able to build a version of
PGP on a system that has librsaref installed already. Quite useful in the
situation of doing automated package building.
This commit is contained in:
brad 1999-12-13 05:56:17 +00:00
parent dc0957332f
commit a0867b4c9b
2 changed files with 50 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
security/pgp5/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 1999/12/12 22:26:59 dugsong Exp $
# $OpenBSD: Makefile,v 1.6 1999/12/13 05:56:17 brad Exp $
DISTNAME= pgp50i-unix-src
PKGNAME= pgp-5.0i
@ -21,13 +21,15 @@ MASTER_SITES= ftp://ftp.no.pgpi.com/pub/pgp/5.0/unix/ \
NO_CDROM= "CRYPTO: Third party crypto not allowed."
RESTRICTED= "Crypto; export-controlled"
NEED_VERSION= 1.121
MAINTAINER= fgsch@openbsd.org
USE_AUTOCONF= yes
CONFIGURE_ENV= LOCALBASE="${LOCALBASE}"
.if defined(USA_RESIDENT) && ${USA_RESIDENT:U} == YES
CONFIGURE_ARGS= --with-rsaref
.endif
NO_PACKAGE= yes
WRKSRC= ${WRKDIR}/pgp50i/src
pre-fetch:
@ -49,10 +51,10 @@ pre-fetch:
post-patch:
@mv ${WRKSRC}/man/pgp.1 ${WRKSRC}/man/pgp5.1
.if defined(USA_RESIDENT) && ${USA_RESIDENT:U} == YES
pre-configure:
@${MV} ${WRKSRC}/lib/pgp/pubkey/pgpRSAGlue1.c \
${WRKSRC}/lib/pgp/pubkey/pgpRSAGlue1.c-
.if defined(USA_RESIDENT) && ${USA_RESIDENT:U} == YES
@mv ${WRKSRC}/lib/pgp/pubkey/pgpRSAGlue1.c \
${WRKSRC}/lib/pgp/pubkey/pgpRSAGlue1.c-
.endif
pre-install:

48
security/pgp5/patches/patch-ao
View File

@ -1,13 +1,39 @@
--- configure.in.orig Sun Dec 12 16:51:44 1999
+++ configure.in Sun Dec 12 16:54:49 1999
@@ -170,15 +170,14 @@
--- configure.in.orig Sat Feb 7 14:54:56 1998
+++ configure.in Mon Dec 13 00:05:31 1999
@@ -148,6 +148,25 @@
#source files (pgpRSAGlue[12].c, pgpRSAKeyGen.c and pgpAltRSAGlu.c)
#is handled with the make distribution-* flags.
+AC_MSG_CHECKING(whether to use rsaref)
+AC_ARG_WITH(rsaref,
+[ --with-rsaref Use RSAREF (try to avoid patent problems in U.S.)],
+[
+WITH_RSAREF=0
+ case "$withval" in
+ yes)
+ AC_MSG_RESULT(yes)
+ WITH_RSAREF=1
+ ;;
+ *)
+ AC_MSG_RESULT(no)
+ AC_DEFINE(WITH_RSAREF)
+ ;;
+ esac ],
+ AC_MSG_RESULT(no)
+)
+
+if test "x$WITH_RSAREF" = "x1"; then
AC_MSG_CHECKING(for internal RSA encrypt/sign support)
RSALIB=""
RSAINCS=""
@@ -170,15 +189,14 @@
AC_MSG_CHECKING(for lib/pgp/pubkey/pgpAltRSAGlu.c)
if test -f "lib/pgp/pubkey/pgpAltRSAGlu.c"; then
AC_MSG_RESULT(yes)
- AC_MSG_CHECKING(for RSAREF in ../rsaref/install/unix)
- if test -f "../rsaref/install/unix/rsaref.a"; then
+ AC_MSG_CHECKING(for RSAREF in ${prefix})
+ if test -f "${prefix}/lib/librsaref.a"; then
+ AC_MSG_CHECKING(for RSAREF in ${LOCALBASE})
+ if test -f "${LOCALBASE}/lib/librsaref.a"; then
HAVE_RSAREF=1
AC_MSG_RESULT(yes)
AC_DEFINE(USE_RSAREF_FULL, 1)
@ -15,8 +41,16 @@
- RSALIB="\$(top_builddir)/../rsaref/install/unix/rsaref.a"
- RSAINCS="-I \$(top_builddir)/../rsaref/test"
- RSAINCS="$RSAINCS -I \$(top_builddir)/../rsaref/source"
+ RSALIB="${prefix}/lib/librsaref.a"
+ RSAINCS="-I${prefix}/include"
+ RSALIB="-L${LOCALBASE}/lib -lrsaref"
+ RSAINCS="-I${LOCALBASE}/include"
AC_MSG_CHECKING(for lib/pgp/pubkey/pgpRSAKeyGen.c)
if test -f "lib/pgp/pubkey/pgpRSAKeyGen.c"; then
AC_MSG_RESULT(yes)
@@ -221,6 +239,7 @@
AC_SUBST(RSAINCS)
AC_SUBST(RSAKEYGEN)
AC_SUBST(RSAKEY)
+fi
BETALICENSE=""
FREEWARELICENSE=""