Index: head/www/hiawatha/Makefile =================================================================== --- head/www/hiawatha/Makefile (revision 416895) +++ head/www/hiawatha/Makefile (revision 416896) @@ -1,85 +1,84 @@ # Created by: Hugo Leisink # $FreeBSD$ PORTNAME= hiawatha -PORTVERSION= 10.1 -PORTREVISION= 1 +PORTVERSION= 10.3 CATEGORIES= www MASTER_SITES= https://www.hiawatha-webserver.org/files/ MAINTAINER= portmaster@BSDforge.com COMMENT= Advanced and secure webserver for Unix LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE PORTDOCS= ChangeLog README.md CONFIG_FILES= hiawatha.conf mimetype.conf cgi-wrapper.conf toolkit.conf \ error.xslt index.xslt SUB_FILES= pkg-message USES= cmake compiler:c11 USE_LDCONFIG= yes USE_RC_SUBR= hiawatha CMAKE_ARGS= -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ -DCMAKE_INSTALL_MANDIR=${PREFIX}/man \ -DWEBROOT_DIR=${WWWDIR} OPTIONS_DEFINE= CACHE DOCS IPV6 MONITOR RPROXY SSL TOMAHAWK TOOLKIT XSLT OPTIONS_DEFAULT= CACHE RPROXY SSL TOOLKIT XSLT CACHE_DESC= Enable cache support MONITOR_DESC= Enable Hiawatha Monitor RPROXY_DESC= Enable reverse proxy TOMAHAWK_DESC= Enable Tomahawk command channel TOOLKIT_DESC= Enable URL toolkit XSLT_DESC= Enable XSLT support CACHE_CMAKE_ON= -DENABLE_CACHE=on CACHE_CMAKE_OFF= -DENABLE_CACHE=off TOMAHAWK_CMAKE_ON= -DENABLE_TOMAHAWK=on TOMAHAWK_CMAKE_OFF= -DENABLE_TOMAHAWK=off IPV6_CMAKE_ON= -DENABLE_IPV6=on IPV6_CMAKE_OFF= -DENABLE_IPV6=off MONITOR_CMAKE_ON= -DENABLE_MONITOR=on MONITOR_CMAKE_OFF= -DENABLE_MONITOR=off RPROXY_CMAKE_ON= -DENABLE_RPROXY=on RPROXY_CMAKE_OFF= -DENABLE_RPROXY=off SSL_CMAKE_ON= -DENABLE_SSL=on SSL_CMAKE_OFF= -DENABLE_SSL=off TOOLKIT_CMAKE_ON= -DENABLE_TOOLKIT=on TOOLKIT_CMAKE_OFF= -DENABLE_TOOLKIT=off XSLT_USE= GNOME=libxslt XSLT_CMAKE_ON= -DENABLE_XSLT=on XSLT_CMAKE_OFF= -DENABLE_XSLT=off post-patch: @${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \ ${WRKSRC}/man/hiawatha.1.in ${WRKSRC}/man/cgi-wrapper.1.in \ ${WRKSRC}/config/cgi-wrapper.conf ${WRKSRC}/config/hiawatha.conf.in @${REINPLACE_CMD} -e 's|/etc/hiawatha|${ETCDIR}|g' \ ${WRKSRC}/man/hiawatha.1.in ${WRKSRC}/man/cgi-wrapper.1.in post-install: .for FILE in ${CONFIG_FILES} ${INSTALL_DATA} ${WRKSRC}/config/${FILE} ${STAGEDIR}${PREFIX}/etc/hiawatha/${FILE}.sample .endfor @${MKDIR} ${STAGEDIR}${WWWDIR} ; \ ${INSTALL_DATA} ${WRKSRC}/extra/index.html ${STAGEDIR}${WWWDIR}/index.html.sample post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ .include Index: head/www/hiawatha/distinfo =================================================================== --- head/www/hiawatha/distinfo (revision 416895) +++ head/www/hiawatha/distinfo (revision 416896) @@ -1,2 +1,3 @@ -SHA256 (hiawatha-10.1.tar.gz) = 3892e0a1836661c8dcc649f9ae965289f701640a618baf2c2287da9b78e36cf1 -SIZE (hiawatha-10.1.tar.gz) = 887895 +TIMESTAMP = 1465723990 +SHA256 (hiawatha-10.3.tar.gz) = 99d185fb16bb1ab706724494d3cac86464f1485ed4b0fff09a192eca6da5ff8e +SIZE (hiawatha-10.3.tar.gz) = 897607 Index: head/www/hiawatha/files/patch-src__http.c =================================================================== --- head/www/hiawatha/files/patch-src__http.c (revision 416895) +++ head/www/hiawatha/files/patch-src__http.c (nonexistent) @@ -1,13 +0,0 @@ ---- src/http.c.orig 2015-12-28 15:05:15 UTC -+++ src/http.c -@@ -845,8 +845,8 @@ int last_forwarded_ip(t_http_header *htt - /* Forwarded header - */ - begin = NULL; -- while ((forwarded = strcasestr(forwarded, "for=")) == NULL) { -- begin = forwarded; -+ while ((forwarded = strcasestr(forwarded, "for=")) != NULL) { -+ begin = forwarded + 4; - forwarded++; - } - Property changes on: head/www/hiawatha/files/patch-src__http.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property