diff options
| author | jperkin <jperkin@pkgsrc.org> | 2015-09-01 12:14:05 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2015-09-01 12:14:05 +0000 |
| commit | 6ab871b907336826b46502b21df6041be38b4a83 (patch) | |
| tree | 2e3279072d3c1a1828ec69a01187e7442bd6f237 /pkgtools/pkg_install/Makefile | |
| parent | 05bed435286e1468bd84f0d99d71e591b678f642 (diff) | |
| download | pkgsrc-6ab871b907336826b46502b21df6041be38b4a83.tar.gz | |
Implement inline package signature verification.
This replaces calling out to an external gpg command for verification
with inline verification using the security/netpgpverify library.
Bump version to 20150901.
Diffstat (limited to 'pkgtools/pkg_install/Makefile')
| -rw-r--r-- | pkgtools/pkg_install/Makefile | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile index 92e418d86a5..240772d5be5 100644 --- a/pkgtools/pkg_install/Makefile +++ b/pkgtools/pkg_install/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.208 2015/04/21 00:28:19 joerg Exp $ +# $NetBSD: Makefile,v 1.209 2015/09/01 12:14:05 jperkin Exp $ # Notes to package maintainers: # @@ -128,6 +128,7 @@ FILESDIR.bzip2?= ${.CURDIR}/../../archivers/bzip2/files FILESDIR.libarchive?= ${.CURDIR}/../../archivers/libarchive/files FILESDIR.zlib?= ${.CURDIR}/../../devel/zlib/files FILESDIR.libfetch?= ${.CURDIR}/../../net/libfetch/files +FILESDIR.netpgpverify?= ${.CURDIR}/../../security/netpgpverify/files .if empty(USE_BUILTIN.bzip2:M[yY][eE][sS]) CPPFLAGS+= -I${WRKDIR}/bzip2 @@ -176,6 +177,10 @@ pre-configure: config-guess-override config-sub-override .endif CPPFLAGS+= -I${WRKDIR}/libfetch LDFLAGS+= -L${WRKDIR}/libfetch +# Avoid duplicate and conflicting headers, pull in any we need +# directly with <netpgpgverify/*.h> +CPPFLAGS+= -I${WRKDIR} +LDFLAGS+= -L${WRKDIR}/netpgpverify CONFIGURE_ENV+= LIBS=${LIBS:Q} @@ -191,6 +196,7 @@ do-extract: @${CP} -R ${FILESDIR.libarchive} ${WRKDIR}/libarchive .endif @${CP} -R ${FILESDIR.libfetch} ${WRKDIR}/libfetch + @${CP} -R ${FILESDIR.netpgpverify} ${WRKDIR}/netpgpverify pre-configure: .if empty(USE_BUILTIN.bzip2:M[yY][eE][sS]) @@ -213,7 +219,11 @@ pre-configure: ${SETENV} ${MAKE_ENV} ${BSD_MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} ${BUILD_MAKE_FLAGS} \ -f ${MAKE_FILE} depend all - + cd ${WRKDIR}/netpgpverify && \ + ${SED} -e '/zlib/d' Makefile.lib.in >Makefile.in && \ + ./configure && ${SETENV} ${MAKE_ENV} ${BSD_MAKE_ENV} \ + ${MAKE_PROGRAM} ${MAKE_FLAGS} ${BUILD_MAKE_FLAGS} \ + -f ${MAKE_FILE} all # XXX Reverse the order that update does things since # XXX we need pkg_delete built before we can deinstall. |