diff options
| author |   sthen <sthen@openbsd.org> | 2018-03-21 19:16:06 +0000 |
|---|---|---|
| committer | sthen <sthen@openbsd.org> | 2018-03-21 19:16:06 +0000 |
| commit | 813d96eae242ee1096e40304a9182fcc436ed732 (patch) | |
| tree | ab01031479e19ed40f790aeef08f1d706dbd9bff | |
| parent | use new script to trim installed cert.pem on overflowing i386/ramdisk_cd (diff) | |
| download | wireguard-openbsd-813d96eae242ee1096e40304a9182fcc436ed732.tar.xz wireguard-openbsd-813d96eae242ee1096e40304a9182fcc436ed732.zip | |
trim cert.pem on all arches that install it. use the installed file from
DESTDIR rather than reaching around in src. ok deraadt
| -rw-r--r-- | distrib/amd64/ramdisk_cd/list.local | 4 | ||||
| -rw-r--r-- | distrib/arm64/ramdisk/list | 4 | ||||
| -rw-r--r-- | distrib/armv7/ramdisk/list | 4 | ||||
| -rw-r--r-- | distrib/hppa/list | 4 | ||||
| -rw-r--r-- | distrib/i386/ramdisk_cd/list.local | 4 | ||||
| -rw-r--r-- | distrib/macppc/ramdisk/list | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/distrib/amd64/ramdisk_cd/list.local b/distrib/amd64/ramdisk_cd/list.local index ced3f28ed94..e5bcac048b2 100644 --- a/distrib/amd64/ramdisk_cd/list.local +++ b/distrib/amd64/ramdisk_cd/list.local @@ -1,4 +1,4 @@ -# $OpenBSD: list.local,v 1.30 2017/11/19 12:11:53 job Exp $ +# $OpenBSD: list.local,v 1.31 2018/03/21 19:16:06 sthen Exp $ # add local links; use bin/sh since instbin has already been unlinked LINK instbin sbin/dhclient @@ -12,7 +12,7 @@ LINK instbin sbin/fsck_msdos LINK instbin sbin/growfs LINK instbin sbin/slaacd -COPY ${DESTDIR}/etc/ssl/cert.pem etc/ssl/cert.pem +SPECIAL awk -f ${UTILS}/trimcerts.awk ${DESTDIR}/etc/ssl/cert.pem etc/ssl/cert.pem LINK instbin usr/bin/ftp-ssl usr/bin/ftp SPECIAL rm usr/bin/ftp-ssl diff --git a/distrib/arm64/ramdisk/list b/distrib/arm64/ramdisk/list index 0affecbda79..a316f220b45 100644 --- a/distrib/arm64/ramdisk/list +++ b/distrib/arm64/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.7 2018/03/20 23:24:17 jsg Exp $ +# $OpenBSD: list,v 1.8 2018/03/21 19:16:06 sthen Exp $ SRCDIRS distrib/special @@ -64,7 +64,7 @@ LINK instbin usr/bin/signify LINK instbin usr/sbin/chroot LINK instbin usr/sbin/pwd_mkdb -COPY ${DESTDIR}/etc/ssl/cert.pem etc/ssl/cert.pem +SPECIAL awk -f ${UTILS}/trimcerts.awk ${DESTDIR}/etc/ssl/cert.pem etc/ssl/cert.pem LINK instbin usr/bin/ftp-ssl usr/bin/ftp SPECIAL rm usr/bin/ftp-ssl diff --git a/distrib/armv7/ramdisk/list b/distrib/armv7/ramdisk/list index c08a80fc064..c8c5bc99d2b 100644 --- a/distrib/armv7/ramdisk/list +++ b/distrib/armv7/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.35 2018/03/20 23:09:09 jsg Exp $ +# $OpenBSD: list,v 1.36 2018/03/21 19:16:06 sthen Exp $ SRCDIRS distrib/special @@ -65,7 +65,7 @@ LINK instbin usr/sbin/chroot LINK instbin usr/sbin/pwd_mkdb LINK instbin usr/sbin/mkuboot -COPY ${DESTDIR}/etc/ssl/cert.pem etc/ssl/cert.pem +SPECIAL awk -f ${UTILS}/trimcerts.awk ${DESTDIR}/etc/ssl/cert.pem etc/ssl/cert.pem LINK instbin usr/bin/ftp-ssl usr/bin/ftp SPECIAL rm usr/bin/ftp-ssl diff --git a/distrib/hppa/list b/distrib/hppa/list index f40132ce0d0..fa00ccb0f23 100644 --- a/distrib/hppa/list +++ b/distrib/hppa/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.40 2016/12/30 22:32:25 deraadt Exp $ +# $OpenBSD: list,v 1.41 2018/03/21 19:16:06 sthen Exp $ SRCDIRS distrib/special @@ -56,7 +56,7 @@ LINK instbin usr/sbin/chroot LINK instbin usr/sbin/pwd_mkdb LINK instbin usr/sbin/installboot -COPY ${DESTDIR}/etc/ssl/cert.pem etc/ssl/cert.pem +SPECIAL awk -f ${UTILS}/trimcerts.awk ${DESTDIR}/etc/ssl/cert.pem etc/ssl/cert.pem LINK instbin usr/bin/ftp-ssl usr/bin/ftp SPECIAL rm usr/bin/ftp-ssl diff --git a/distrib/i386/ramdisk_cd/list.local b/distrib/i386/ramdisk_cd/list.local index 3ad94763a3f..1033d64fdd5 100644 --- a/distrib/i386/ramdisk_cd/list.local +++ b/distrib/i386/ramdisk_cd/list.local @@ -1,4 +1,4 @@ -# $OpenBSD: list.local,v 1.40 2018/03/21 18:54:16 sthen Exp $ +# $OpenBSD: list.local,v 1.41 2018/03/21 19:16:06 sthen Exp $ # add local links; use bin/sh since instbin has already been unlinked LINK instbin sbin/growfs @@ -9,7 +9,7 @@ LINK instbin sbin/restore LINK instbin sbin/bioctl LINK instbin sbin/slaacd -SPECIAL awk -f ${UTILS}/trimcerts.awk ${CURDIR}/../../../lib/libcrypto/cert.pem etc/ssl/cert.pem +SPECIAL awk -f ${UTILS}/trimcerts.awk ${DESTDIR}/etc/ssl/cert.pem etc/ssl/cert.pem LINK instbin usr/bin/ftp-ssl usr/bin/ftp SPECIAL rm usr/bin/ftp-ssl diff --git a/distrib/macppc/ramdisk/list b/distrib/macppc/ramdisk/list index fb8f39f9513..7b09bc6e1dc 100644 --- a/distrib/macppc/ramdisk/list +++ b/distrib/macppc/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.68 2017/11/19 12:11:54 job Exp $ +# $OpenBSD: list,v 1.69 2018/03/21 19:16:06 sthen Exp $ SRCDIRS distrib/special @@ -63,7 +63,7 @@ LINK instbin usr/bin/signify LINK instbin usr/sbin/chroot LINK instbin usr/sbin/pwd_mkdb -COPY ${DESTDIR}/etc/ssl/cert.pem etc/ssl/cert.pem +SPECIAL awk -f ${UTILS}/trimcerts.awk ${DESTDIR}/etc/ssl/cert.pem etc/ssl/cert.pem LINK instbin usr/bin/ftp-ssl usr/bin/ftp SPECIAL rm usr/bin/ftp-ssl |