svn commit: r487922 - in head/security/hitch: . files

[Ryan Steinmetz]

Author: zi
Date: Thu Dec 20 21:07:47 2018
New Revision: 487922
URL: https://svnweb.freebsd.org/changeset/ports/487922

Log:
  - Update to 1.5.0
  - Add OCSP stapling smarts to port [1]
  
  PR:		232436 [1]
  Submitted by:	Graham Percival [1]

Added:
  head/security/hitch/files/hitch.conf.sample.in
     - copied, changed from r487921, head/security/hitch/files/hitch.conf.sample
Deleted:
  head/security/hitch/files/hitch.conf.sample
Modified:
  head/security/hitch/Makefile
  head/security/hitch/distinfo
  head/security/hitch/pkg-message
  head/security/hitch/pkg-plist

Modified: head/security/hitch/Makefile
==============================================================================
--- head/security/hitch/Makefile	Thu Dec 20 21:04:51 2018	(r487921)
+++ head/security/hitch/Makefile	Thu Dec 20 21:07:47 2018	(r487922)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=		hitch
-PORTVERSION=		1.4.8
-PORTREVISION=		2
+PORTVERSION=		1.5.0
 CATEGORIES=		security
 MASTER_SITES=		http://hitch-tls.org/source/ \
 			ZI
@@ -27,11 +26,15 @@ CONFIGURE_ENV=		CRYPTO_CFLAGS="-I${OPENSSLINC}" CRYPTO
 USE_RC_SUBR=		${PORTNAME}
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib -lcrypto -lssl
+CACHE_DIR?=		/var/cache/hitch
+PLIST_SUB=		CACHE_DIR=${CACHE_DIR}
+SUB_LIST+=		CACHE_DIR="${CACHE_DIR}"
+SUB_FILES=		${PORTNAME}.conf.sample
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc
-	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.conf.sample ${STAGEDIR}${PREFIX}/etc/
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc ${STAGEDIR}${CACHE_DIR}
+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.conf.sample ${STAGEDIR}${PREFIX}/etc/
 
 .include <bsd.port.mk>

Modified: head/security/hitch/distinfo
==============================================================================
--- head/security/hitch/distinfo	Thu Dec 20 21:04:51 2018	(r487921)
+++ head/security/hitch/distinfo	Thu Dec 20 21:07:47 2018	(r487922)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1526906812
-SHA256 (hitch-1.4.8.tar.gz) = d52ba690d90c25bbfca73f5e0ed427738366dac12faf46fb5834e497cc2d1ac3
-SIZE (hitch-1.4.8.tar.gz) = 297107
+TIMESTAMP = 1545338657
+SHA256 (hitch-1.5.0.tar.gz) = 0ec254699292f73e419ff279d2834db31026192ef373a91badd82e2dc7154d0b
+SIZE (hitch-1.5.0.tar.gz) = 304169

Copied and modified: head/security/hitch/files/hitch.conf.sample.in (from r487921, head/security/hitch/files/hitch.conf.sample)
==============================================================================
--- head/security/hitch/files/hitch.conf.sample	Thu Dec 20 21:04:51 2018	(r487921, copy source)
+++ head/security/hitch/files/hitch.conf.sample.in	Thu Dec 20 21:07:47 2018	(r487922)
@@ -45,6 +45,11 @@ prefer-server-ciphers = off
 # type: string
 ssl-engine = ""
 
+# Directory for OCSP staple retrieval
+#
+# type: string
+ocsp-dir = "%%CACHE_DIR%%"
+
 # Number of worker processes
 #
 # type: integer

Modified: head/security/hitch/pkg-message
==============================================================================
--- head/security/hitch/pkg-message	Thu Dec 20 21:04:51 2018	(r487921)
+++ head/security/hitch/pkg-message	Thu Dec 20 21:07:47 2018	(r487922)
@@ -1,2 +1,2 @@
 Don't forget to append DH params to your pem file using:
-openssl dhparam -rand - 1024 >> /path/to/cert.pem
+openssl dhparam -rand - 2048 >> /path/to/cert.pem

Modified: head/security/hitch/pkg-plist
==============================================================================
--- head/security/hitch/pkg-plist	Thu Dec 20 21:04:51 2018	(r487921)
+++ head/security/hitch/pkg-plist	Thu Dec 20 21:07:47 2018	(r487922)
@@ -5,3 +5,4 @@ sbin/hitch
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/hitch.conf.example
 @sample etc/hitch.conf.sample
+ at dir(hitch,hitch,) %%CACHE_DIR%%