From 852969e304cba2c66a8f0e6724241aabf41dc1fe Mon Sep 17 00:00:00 2001 From: Ryo ONODERA Date: Sat, 21 Jul 2018 18:25:11 +0900 Subject: [PATCH] acme-client: this package does not use conf file and fix SUBST_* --- acme-client/Makefile | 20 ++++---------------- acme-client/PLIST | 1 - acme-client/files/acme-client.conf.in | 20 -------------------- 3 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 acme-client/files/acme-client.conf.in diff --git a/acme-client/Makefile b/acme-client/Makefile index 673b236427..59ed4efcc0 100644 --- a/acme-client/Makefile +++ b/acme-client/Makefile @@ -17,24 +17,12 @@ MAKE_FILE= GNUmakefile SUBST_CLASSES+= paths SUBST_STAGE.paths= pre-build -SUBST_FILES.paths= ${WRKSRC}/acme-client.1 -SUBST_FILES.paths+= ${WRKSRC}/config.h -SUBST_FILES.paths+= ${WRKSRC}/http.c -SUBST_FILES.paths+= ${WRKSRC}/main.c -SUBST_FILES.paths+= ${WRKDIR}/acme-client.conf +SUBST_FILES.paths= acme-client.1 +SUBST_FILES.paths+= config.h +SUBST_FILES.paths+= http.c +SUBST_FILES.paths+= main.c SUBST_SED.paths= -e 's|/etc/ssl|${PKG_SYSCONFDIR}/ssl|g' SUBST_SED.paths+= -e 's|/etc/acme|${PKG_SYSCONFDIR}/acme|g' -EGDIR= share/examples/acme-client -INSTALLATION_DIRS+= ${EGDIR} - -CONF_FILES+= ${EGDIR}/acme-client.conf ${PKG_SYSCONFDIR}/acme-client.conf - -post-extract: - ${CP} ${FILESDIR}/acme-client.conf.in ${WRKDIR}/acme-client.conf - -post-install: - ${INSTALL_DATA} ${WRKDIR}/acme-client.conf ${DESTDIR}${PREFIX}/${EGDIR} - .include "../../security/libressl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/acme-client/PLIST b/acme-client/PLIST index 9cd59b12b8..64e4eec9b4 100644 --- a/acme-client/PLIST +++ b/acme-client/PLIST @@ -1,4 +1,3 @@ @comment $NetBSD$ bin/acme-client man/man1/acme-client.1 -share/examples/acme-client/acme-client.conf diff --git a/acme-client/files/acme-client.conf.in b/acme-client/files/acme-client.conf.in deleted file mode 100644 index 1fdd4a52b4..0000000000 --- a/acme-client/files/acme-client.conf.in +++ /dev/null @@ -1,20 +0,0 @@ -# -# $OpenBSD: acme-client.conf,v 1.7 2018/04/13 08:24:38 ajacoutot Exp $ -# -authority letsencrypt { - api url "https://acme-v01.api.letsencrypt.org/directory" - account key "/etc/acme/letsencrypt-privkey.pem" -} - -authority letsencrypt-staging { - api url "https://acme-staging.api.letsencrypt.org/directory" - account key "/etc/acme/letsencrypt-staging-privkey.pem" -} - -#domain example.com { -# alternative names { secure.example.com } -# domain key "/etc/ssl/private/example.com.key" -# domain certificate "/etc/ssl/example.com.crt" -# domain full chain certificate "/etc/ssl/example.com.fullchain.pem" -# sign with letsencrypt -#}