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

Set GNUPGHOME during port build to avoid additional patch.

Browse Source 
Enable regression test that checks the signature with gpg.
ok sturm
This commit is contained in:
bluhm 2009-08-25 20:23:45 +00:00
parent a072f5f576
commit 507038562a
2 changed files with 15 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
security/p5-Module-Signature/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2008/10/03 23:47:24 bluhm Exp $ # $OpenBSD: Makefile,v 1.4 2009/08/25 20:23:45 bluhm Exp $
COMMENT = module signature file manipulation COMMENT = module signature file manipulation
DISTNAME = Module-Signature-0.55 DISTNAME = Module-Signature-0.55
PKGNAME = p5-${DISTNAME}p1 PKGNAME = p5-${DISTNAME}p2
CATEGORIES = security CATEGORIES = security
@ -19,6 +19,19 @@ MODULES = cpan
BUILD_DEPENDS = ${RUN_DEPENDS} BUILD_DEPENDS = ${RUN_DEPENDS}
RUN_DEPENDS = ::security/gnupg RUN_DEPENDS = ::security/gnupg
# Enable signature check by the module itself during make regress.
# Thus the regression test only works on an unpatched port as it
# verifies the signatures of the files in wrkdist directory. The
# public keys for that are added to the key ring during make configure.
# This does not provide additional security as the keys are shipped
# together with the source. It just ensures that the port works fine.
GNUPGHOME = ${WRKDIR}/gnupg
CONFIGURE_ENV = GNUPGHOME=${GNUPGHOME}
MAKE_ENV = GNUPGHOME=${GNUPGHOME} TEST_SIGNATURE=1
pre-configure:
mkdir -p -m 0700 ${GNUPGHOME}
post-install: post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/p5-Module-Signature ${INSTALL_DATA_DIR} ${PREFIX}/share/p5-Module-Signature
.for f in *.pub .for f in *.pub

29
security/p5-Module-Signature/patches/patch-Makefile_PL
View File

@ -1,29 +0,0 @@
$OpenBSD: patch-Makefile_PL,v 1.1.1.1 2008/07/19 12:12:53 bluhm Exp $
--- Makefile.PL.orig Sun Jul 30 03:11:14 2006
+++ Makefile.PL Thu Jul 17 23:40:31 2008
@@ -58,23 +58,8 @@ my @OPEN_PGP = qw{
Crypt::OpenPGP 1.00
};
-# Is openpgp currently installed
-if ( can_use('Crypt::OpenPGP') ) {
- # If OpenPGP is already installed, so relist all the
- # dependencies so they will upgrade as needed.
- requires( @OPEN_PGP );
-
-} elsif ( locate_gpg() ) {
- # We SHOULD have gpg, double-check formally
- requires_external_bin 'gpg';
-
-} elsif ( can_cc() and $ENV{AUTOMATED_TESTING} ) {
- # Dive headlong into a full Crypt::OpenPGP install.
- requires( @OPEN_PGP );
-} else {
- # Ask the user what to do
- ask_user();
-}
+# We SHOULD have gpg, double-check formally
+requires_external_bin 'gpg';
unless ( can_run('diff') ) {
# We know Text::Diff fails on Cygwin (for now)