From owner-svn-ports-head@freebsd.org Tue Sep 13 20:09:19 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C59CCBD7D5F; Tue, 13 Sep 2016 20:09:19 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9E66DD22; Tue, 13 Sep 2016 20:09:19 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8DK9Iko036239; Tue, 13 Sep 2016 20:09:18 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8DK9IBW036232; Tue, 13 Sep 2016 20:09:18 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201609132009.u8DK9IBW036232@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Tue, 13 Sep 2016 20:09:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422074 - in head: . security security/dehydrated security/dehydrated/files security/letsencrypt.sh X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Sep 2016 20:09:19 -0000 Author: brnrd Date: Tue Sep 13 20:09:17 2016 New Revision: 422074 URL: https://svnweb.freebsd.org/changeset/ports/422074 Log: security/dehydrated: Rename from letsencrypt.sh - Add entry to MOVED - Rename/move entry in security/Makefile - Update to 0.3.1 - Replace all filenames and paths containing letsencrypt - Fix error in periodic file (su -m + _flags) - Improve text in periodic file (_deploy) - Add warning to periodic script and pkg-message Added: head/security/dehydrated/ - copied from r422073, head/security/letsencrypt.sh/ head/security/dehydrated/files/000.dehydrated.in - copied, changed from r422070, head/security/letsencrypt.sh/files/000.letsencrypt.sh.in Deleted: head/security/dehydrated/files/000.letsencrypt.sh.in head/security/letsencrypt.sh/ Modified: head/MOVED head/security/Makefile head/security/dehydrated/Makefile head/security/dehydrated/distinfo head/security/dehydrated/files/pkg-message.in head/security/dehydrated/pkg-descr Modified: head/MOVED ============================================================================== --- head/MOVED Tue Sep 13 20:06:28 2016 (r422073) +++ head/MOVED Tue Sep 13 20:09:17 2016 (r422074) @@ -8629,3 +8629,4 @@ www/moodle28||2016-09-13|Has expired: EO devel/php5-msgpack|devel/pecl-msgpack|2016-09-13|Has expired: This is an older version of the software, please use devel/pecl-msgpack. textproc/asciinema|textproc/py3-asciinema|2016-09-13|Has expired: use textproc/py3-asciinema instead x11-toolkits/qtada||2016-09-13|Has expired: No development since 2012, usefulness unclear +security/letsencrypt.sh|security/dehydrated|2016-09-13|Upstream renamed the project Modified: head/security/Makefile ============================================================================== --- head/security/Makefile Tue Sep 13 20:06:28 2016 (r422073) +++ head/security/Makefile Tue Sep 13 20:09:17 2016 (r422074) @@ -102,6 +102,7 @@ SUBDIR += d0_blind_id SUBDIR += dcetest SUBDIR += ddos_scan + SUBDIR += dehydrated SUBDIR += denyhosts SUBDIR += destroy SUBDIR += digest @@ -290,7 +291,6 @@ SUBDIR += l5 SUBDIR += lasso SUBDIR += lastpass-cli - SUBDIR += letsencrypt.sh SUBDIR += libadacrypt SUBDIR += libargon2 SUBDIR += libassuan Modified: head/security/dehydrated/Makefile ============================================================================== --- head/security/letsencrypt.sh/Makefile Tue Sep 13 20:06:28 2016 (r422073) +++ head/security/dehydrated/Makefile Tue Sep 13 20:09:17 2016 (r422074) @@ -1,7 +1,7 @@ # $FreeBSD$ -PORTNAME= letsencrypt.sh -PORTVERSION= 0.3.0 +PORTNAME= dehydrated +PORTVERSION= 0.3.1 DISTVERSIONPREFIX= v CATEGORIES= security @@ -31,33 +31,33 @@ BASH_RUN_DEPENDS= bash:shells/bash ZSH_RUN_DEPENDS= zsh:shells/zsh PERIODIC_DIRS= etc/periodic/weekly -PERIODIC_FILES= 000.letsencrypt.sh +PERIODIC_FILES= 000.dehydrated PLIST_DIRS= %%ETCDIR%%/.acme-challenges \ - www/letsencrypt -PLIST_FILES= bin/letsencrypt.sh \ + www/dehydrated +PLIST_FILES= bin/dehydrated \ %%ETCDIR%%/config.example \ %%ETCDIR%%/hook.sh.example \ %%ETCDIR%%/domains.txt.example \ - ${PERIODIC_DIRS}/000.letsencrypt.sh + ${PERIODIC_DIRS}/000.dehydrated PORTDOCS_PLIST_FILES= %%PORTDOCS%%%%DOCSDIR%%/README.md -SUB_FILES= 000.letsencrypt.sh pkg-message +SUB_FILES= 000.dehydrated pkg-message SUB_LIST= PORTNAME=${PORTNAME} PORTDOCS= README.md dns-verification.md domains_txt.md ecc.md hook_chain.md \ import-from-official-client.md per-certificate-config.md staging.md \ troubleshooting.md wellknown.md -SHEBANG_FILES= docs/examples/hook.sh letsencrypt.sh +SHEBANG_FILES= docs/examples/hook.sh dehydrated post-patch: -. for f in docs/examples/config letsencrypt.sh - ${REINPLACE_CMD} 's|/var/www/letsencrypt|${PREFIX}/www/letsencrypt|' \ +. for f in docs/examples/config dehydrated + ${REINPLACE_CMD} 's|/var/www/dehydrated|${PREFIX}/www/dehydrated|' \ ${WRKSRC}/${f} . endfor post-patch-ZSH-on: -. for p in docs/examples/config docs/examples/hook.sh letsencrypt.sh +. for p in docs/examples/config docs/examples/hook.sh dehydrated ${REINPLACE_CMD} '1 s/bash/zsh/' ${WRKSRC}/${p} . endfor @@ -77,6 +77,6 @@ do-install: . endfor post-stage: - ${MKDIR} ${STAGEDIR}${PREFIX}/www/letsencrypt + ${MKDIR} ${STAGEDIR}${PREFIX}/www/dehydrated .include Modified: head/security/dehydrated/distinfo ============================================================================== --- head/security/letsencrypt.sh/distinfo Tue Sep 13 20:06:28 2016 (r422073) +++ head/security/dehydrated/distinfo Tue Sep 13 20:09:17 2016 (r422074) @@ -1,3 +1,3 @@ -TIMESTAMP = 1473333268 -SHA256 (lukas2511-letsencrypt.sh-v0.3.0_GH0.tar.gz) = c04ada782c93082e760c89122c9fdf68802c67c86a38b3fd5a83bb66dc0701d0 -SIZE (lukas2511-letsencrypt.sh-v0.3.0_GH0.tar.gz) = 21530 +TIMESTAMP = 1473795613 +SHA256 (lukas2511-dehydrated-v0.3.1_GH0.tar.gz) = 7c9b9475b442dd19dbc33a26426444054781e14a2f122d2a2405f81093484239 +SIZE (lukas2511-dehydrated-v0.3.1_GH0.tar.gz) = 71375 Copied and modified: head/security/dehydrated/files/000.dehydrated.in (from r422070, head/security/letsencrypt.sh/files/000.letsencrypt.sh.in) ============================================================================== --- head/security/letsencrypt.sh/files/000.letsencrypt.sh.in Tue Sep 13 19:22:41 2016 (r422070, copy source) +++ head/security/dehydrated/files/000.dehydrated.in Tue Sep 13 20:09:17 2016 (r422074) @@ -11,23 +11,41 @@ export PATH case "$weekly_letsencrypt_enable" in [Yy][Ee][Ss]) + echo '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!' + echo '!! WARNING: letsencrypt.sh has been renamed to dehydrated !!' + echo '!! rename all weekly_letsencrypt_* periodic variables !!' + echo '!! to weekly_dehydrated_* in your periodic.conf !!' + echo '|| and mv /usr/local/etc/{letsencrypt,dehydrated} ||' + echo '|| default challenge path has been renamed as well ||' + echo '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!' + : ${weekly_dehydrated_enable:=$weekly_letsencrypt_enable} + : ${weekly_dehydrated_user:=$weekly_letsencrypt_user} + : ${weekly_dehydrated_flags:=$weekly_letsencrypt_flags} + : ${weekly_dehydrated_deployscript:=$weekly_letsencrypt_deployscript} + ;; + *) + ;; +esac + +case "$weekly_dehydrated_enable" in + [Yy][Ee][Ss]) echo echo "Checking Let's Encrypt certificate status:" - if [ -z "$weekly_letsencrypt_user" ] + if [ -z "$weekly_dehydrated_user" ] then - %%PREFIX%%/bin/letsencrypt.sh -c $weekly_letsencrypt_flags + %%PREFIX%%/bin/dehydrated -c $weekly_dehydrated_flags else - su -m "$weekly_letsencrypt_user" -c "%%PREFIX%%/bin/letsencrypt.sh -c $daily_status_disks_df_flags" + su -m "$weekly_dehydrated_user" -c "%%PREFIX%%/bin/dehydrated" -c $weekly_dehydrated_flags fi echo "Deploying Let's Encrypt certificates:" - if [ -x "$weekly_letsencrypt_deployscript" ] + if [ -x "$weekly_dehydrated_deployscript" ] then - $weekly_letsencrypt_deployscript + $weekly_dehydrated_deployscript else - echo 'Skipped, deploy script not set.' + echo 'Skipped, deploy script not set or not executable.' fi ;; *) Modified: head/security/dehydrated/files/pkg-message.in ============================================================================== --- head/security/letsencrypt.sh/files/pkg-message.in Tue Sep 13 20:06:28 2016 (r422073) +++ head/security/dehydrated/files/pkg-message.in Tue Sep 13 20:09:17 2016 (r422074) @@ -1,3 +1,10 @@ +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!! WARNING: letsencrypt.sh has been renamed to dehydrated !! +!! rename all weekly_letsencrypt_* periodic variables !! +!! to weekly_dehydrated_* in your periodic.conf !! +|| and mv /usr/local/etc/{letsencrypt,dehydrated} || +|| default challenge path has been renamed as well || +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! To use this script you should copy the examples in %%PREFIX%%/etc/%%PORTNAME%%/ and at least add a @@ -6,17 +13,17 @@ domain and a contact mail address. In order to run the script regularly to update the certificates add this line to /etc/periodic.conf -weekly_letsencrypt_enable="YES" +weekly_dehydrated_enable="YES" Additionally the following parameters can be added to /etc/periodic.conf To run the certification renenewal as a different user -weekly_letsencrypt_user="_letsencrypt" +weekly_dehydrated_user="_letsencrypt" To run a script after the renewal (as root) -weekly_letsencrypt_deployscript="%%PREFIX%%/etc/%%PORTNAME%%/deploy.sh" +weekly_dehydrated_deployscript="%%PREFIX%%/etc/%%PORTNAME%%/deploy.sh" Additional flags for the periodic run go into -weekly_letsencrypt_flags="-g" +weekly_dehydrated_flags="-g" Modified: head/security/dehydrated/pkg-descr ============================================================================== --- head/security/letsencrypt.sh/pkg-descr Tue Sep 13 20:06:28 2016 (r422073) +++ head/security/dehydrated/pkg-descr Tue Sep 13 20:09:17 2016 (r422074) @@ -1,4 +1,4 @@ -Letencrypt.sh is a pure BASH implementation of the ACME +dehydrated is a pure BASH implementation of the ACME protocol used by Lets Encrypt. -WWW: https://github.com/lukas2511/letsencrypt.sh +WWW: https://github.com/lukas2511/dehydrated