Index: head/www/xshttpd/Makefile =================================================================== --- head/www/xshttpd/Makefile (revision 547153) +++ head/www/xshttpd/Makefile (revision 547154) @@ -1,72 +1,67 @@ # Created by: Ed Schouten # $FreeBSD$ PORTNAME= xshttpd DISTVERSION= 3.6g01 PORTREVISION= 9 CATEGORIES= www MASTER_SITES= ftp://ftp.stack.nl/pub/xs-httpd/release/ \ ftp://mud.stack.nl/pub/xs-httpd/release/ DISTNAME= ${PORTNAME}-${DISTVERSION:S/.//} MAINTAINER= ports@FreeBSD.org COMMENT= Webserver with CGI as own user and SSL support RUN_DEPENDS= run-mailcap:misc/mime-support \ ppmtogif:graphics/netpbm CONFLICTS_INSTALL= xshttpd-devel-[0-9]* publicfile-[0-9]* USES= tar:bzip2 USE_RC_SUBR= xshttpd GNU_CONFIGURE= yes WWWDIR= ${PREFIX}/www/${PORTNAME} CONFIGURE_ARGS+=--with-rootdir=${WWWDIR} OPTIONS_DEFINE= SSL PCRE LDAP CURL M4_CONFIG PERSISTENT_PERL DOCS OPTIONS_DEFAULT=SSL PCRE SSL_USES= ssl SSL_CONFIGURE_WITH= ssl LDAP_USE= OPENLDAP=yes LDAP_CONFIGURE_WITH= ldap M4_CONFIG_DESC= Enable m4 configuration preprocessor M4_CONFIG_CONFIGURE_WITH=preprocessor PERSISTENT_PERL_DESC= Enable persistent Perl interpreter PERSISTENT_PERL_USES= perl5 PERSISTENT_PERL_CONFIGURE_WITH= perl PCRE_LIB_DEPENDS= libpcre.so:devel/pcre PCRE_CONFIGURE_WITH= pcre CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_CONFIGURE_WITH= curl PORTDOCS= README ChangeLog -.include - -.if ${SSL_DEFAULT} == base -BROKEN_FreeBSD_12= incomplete definition of type 'struct x509_store_ctx_st' -BROKEN_FreeBSD_13= incomplete definition of type 'struct x509_store_ctx_st' -.endif - post-patch: .for i in man/httpd.1.in man/httpd.conf.5 config/httpd.conf.sample \ contrib/SSL-Makefile contrib/logrotate.sh @${REINPLACE_CMD} \ -e 's|/wwwsys|${WWWDIR}|g' \ -e 's|/usr/local/lib/httpd|${WWWDIR}|g' \ -e 's|nobody|${WWWOWN}|g' \ -e 's|nogroup|${WWWGRP}|g' \ ${WRKSRC}/$i .endfor @${REINPLACE_CMD} \ -e 's|\(MIME_TYPES\).*|\1 "${LOCALBASE}/etc/mime.types"|' \ ${WRKSRC}/src/constants.h + @${REINPLACE_CMD} -e 's|^struct socket_config|extern &|' \ + ${WRKSRC}/src/htconfig.h @${REINPLACE_CMD} -e 's|mime.types ||g' \ ${WRKSRC}/config/Makefile.in post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${WWWDIR}/htdocs ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -.include +.include Index: head/www/xshttpd/files/patch-src_httpd.c =================================================================== --- head/www/xshttpd/files/patch-src_httpd.c (nonexistent) +++ head/www/xshttpd/files/patch-src_httpd.c (revision 547154) @@ -0,0 +1,11 @@ +--- src/httpd.c.orig 2009-01-10 22:52:29 UTC ++++ src/httpd.c +@@ -90,6 +90,8 @@ static char referer[MYBUFSIZ], orig[MYBUFSIZ]; + static char *startparams, *message503; + struct session session; + struct env env; ++struct socket_config *cursock; ++ + #define CLEANENV do { \ + memset(&env, 0, sizeof(struct env));\ + MALLOC(environ, char *, 1);\ Property changes on: head/www/xshttpd/files/patch-src_httpd.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/xshttpd/files/patch-src_ssl.c =================================================================== --- head/www/xshttpd/files/patch-src_ssl.c (nonexistent) +++ head/www/xshttpd/files/patch-src_ssl.c (revision 547154) @@ -0,0 +1,14 @@ +--- src/ssl.c.orig 2009-01-10 22:52:29 UTC ++++ src/ssl.c +@@ -244,7 +244,11 @@ sslverify_callback(int preverify_ok, X509_STORE_CTX *x + X509_NAME *xsname; + char *strname; + int rc, ovector[OVSIZE]; ++# if OPENSSL_VERSION_NUMBER < 0x10100005L + X509 *xs = x509_ctx->cert; ++# else ++ X509 *xs = X509_STORE_CTX_get0_cert(x509_ctx); ++# endif + + /* match subject */ + if (cursock->sslpcresdn) Property changes on: head/www/xshttpd/files/patch-src_ssl.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/xshttpd-devel/Makefile =================================================================== --- head/www/xshttpd-devel/Makefile (revision 547153) +++ head/www/xshttpd-devel/Makefile (revision 547154) @@ -1,70 +1,65 @@ # Created by: Ed Schouten # $FreeBSD$ PORTNAME= xshttpd DISTVERSION= 3.7b35 CATEGORIES= www MASTER_SITES= ftp://ftp.stack.nl/pub/xs-httpd/release/ \ ftp://mud.stack.nl/pub/xs-httpd/release/ PKGNAMESUFFIX= -devel DISTNAME= ${PORTNAME}-${DISTVERSION:S/.//} MAINTAINER= ports@FreeBSD.org COMMENT= Webserver with CGI as own user and SSL support RUN_DEPENDS= run-mailcap:misc/mime-support LIB_DEPENDS= libpcre.so:devel/pcre CONFLICTS_INSTALL= xshttpd-[0-9]* publicfile-[0-9]* USES= ssl tar:bzip2 USE_RC_SUBR= xshttpd GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-hier=bsd --with-userid=${WWWOWN}:${WWWGRP} OPTIONS_DEFINE= BDB CURL LDAP M4 NETPBM PERL DOCS OPTIONS_DEFAULT= BDB CURL M4 NETPBM OPTIONS_SUB= yes BDB_USES= bdb:5+ BDB_CONFIGURE_ON= --with-db-libdir=${BDB_LIB_DIR} \ --with-db-include-dir=${BDB_INCLUDE_DIR} BDB_CONFIGURE_WITH= db CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_CONFIGURE_WITH= curl LDAP_USE= openldap LDAP_CONFIGURE_WITH= ldap M4_DESC= Enable configuration preprocessor (m4) M4_CONFIGURE_WITH= preprocessor NETPBM_DESC= Enable NETPBM (for graphical counters) NETPBM_RUN_DEPENDS= ppmtogif:graphics/netpbm PERL_DESC= Enable persistent Perl interpreter PERL_USES= perl5 PERL_CONFIGURE_WITH= perl PORTDOCS= README ChangeLog -.include - -.if ${SSL_DEFAULT} == base -BROKEN_FreeBSD_12= variable has incomplete type 'EVP_CIPHER_CTX' (aka 'struct evp_cipher_ctx_st') -BROKEN_FreeBSD_13= variable has incomplete type 'EVP_CIPHER_CTX' (aka 'struct evp_cipher_ctx_st') -.endif - post-patch: @${REINPLACE_CMD} \ -e 's|\(MIME_TYPES\).*|\1 "${LOCALBASE}/etc/mime.types"|' \ ${WRKSRC}/src/constants.h + @${REINPLACE_CMD} -e 's|^struct socket_config|extern &|' \ + ${WRKSRC}/src/htconfig.h @${REINPLACE_CMD} -e 's|mime.types ||g' \ ${WRKSRC}/config/Makefile.in @${REINPLACE_CMD} -e '/libdir/ s|(INSTALL_DATA)|& -s|' \ ${WRKSRC}/src/Makefile.in @${REINPLACE_CMD} -e 's/$$(htmldir)/$$(DESTDIR)&/' \ ${WRKSRC}/contrib/Makefile.in post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${WWWDIR}/htdocs \ ${STAGEDIR}/var/log/xshttpd \ ${STAGEDIR}/var/db/xshttpd/sessions ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -.include +.include Index: head/www/xshttpd-devel/files/patch-src_extra.c =================================================================== --- head/www/xshttpd-devel/files/patch-src_extra.c (nonexistent) +++ head/www/xshttpd-devel/files/patch-src_extra.c (revision 547154) @@ -0,0 +1,34 @@ +--- src/extra.c.orig 2015-01-02 16:49:11 UTC ++++ src/extra.c +@@ -586,7 +586,7 @@ do_crypt(const char * const skey, const char * const i + const unsigned int IVLEN = 16; + int outlen, + tmplen; +- EVP_CIPHER_CTX ctx; ++ EVP_CIPHER_CTX *ctx; + unsigned char plain[16] = { 0 }; + unsigned char outbuf[1024]; + char *encrypted; +@@ -600,17 +600,17 @@ do_crypt(const char * const skey, const char * const i + } + + /* init aes-128-cbc */ +- EVP_CIPHER_CTX_init(&ctx); +- EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, outbuf /* iv */); ++ ctx = EVP_CIPHER_CTX_new(); ++ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, outbuf /* iv */); + +- if (!EVP_EncryptUpdate(&ctx, outbuf + outlen, &tmplen, ++ if (!EVP_EncryptUpdate(ctx, outbuf + outlen, &tmplen, + plain, sizeof(plain))) + return false; + outlen += tmplen; +- if (!EVP_EncryptFinal_ex(&ctx, outbuf + outlen, &tmplen)) ++ if (!EVP_EncryptFinal_ex(ctx, outbuf + outlen, &tmplen)) + return false; + outlen += tmplen; +- EVP_CIPHER_CTX_cleanup(&ctx); ++ EVP_CIPHER_CTX_free(ctx); + + MALLOC(encrypted, char, outlen); + memcpy(encrypted, outbuf, outlen); Property changes on: head/www/xshttpd-devel/files/patch-src_extra.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/xshttpd-devel/files/patch-src_httpd.c =================================================================== --- head/www/xshttpd-devel/files/patch-src_httpd.c (nonexistent) +++ head/www/xshttpd-devel/files/patch-src_httpd.c (revision 547154) @@ -0,0 +1,10 @@ +--- src/httpd.c.orig 2015-09-05 20:44:28 UTC ++++ src/httpd.c +@@ -84,6 +84,7 @@ static char referer[MYBUFSIZ], orig[MYBUFSIZ]; + static char *startparams, *message503; + struct session session; + struct env env; ++struct socket_config *cursock; + + /* Prototypes */ + Property changes on: head/www/xshttpd-devel/files/patch-src_httpd.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/xshttpd-devel/files/patch-src_ssl.c =================================================================== --- head/www/xshttpd-devel/files/patch-src_ssl.c (nonexistent) +++ head/www/xshttpd-devel/files/patch-src_ssl.c (revision 547154) @@ -0,0 +1,32 @@ +--- src/ssl.c.orig 2015-09-05 20:50:21 UTC ++++ src/ssl.c +@@ -538,7 +538,11 @@ sslverify_callback(int preverify_ok, X509_STORE_CTX *x + X509_NAME *xsname; + char *strname; + int rc, ovector[OVSIZE]; ++# if OPENSSL_VERSION_NUMBER < 0x10100005L + X509 *xs = x509_ctx->cert; ++# else ++ X509 *xs = X509_STORE_CTX_get0_cert(x509_ctx); ++# endif + + /* match subject */ + if (cursock->sslpcresdn) +@@ -937,11 +941,12 @@ loadssl(struct socket_config * const lsock, struct ssl + unsigned char sign[EVP_PKEY_size(evpkey)]; + unsigned int siglen = 0; + +- EVP_MD_CTX mdctx; +- EVP_MD_CTX_init(&mdctx); +- EVP_SignInit(&mdctx, EVP_sha384()); +- EVP_SignUpdate(&mdctx, ticketkey, strlen(ticketkey)); +- EVP_SignFinal(&mdctx, sign, &siglen, evpkey); ++ EVP_MD_CTX *mdctx; ++ mdctx = EVP_MD_CTX_create(); ++ EVP_SignInit(mdctx, EVP_sha384()); ++ EVP_SignUpdate(mdctx, ticketkey, strlen(ticketkey)); ++ EVP_SignFinal(mdctx, sign, &siglen, evpkey); ++ EVP_MD_CTX_destroy(mdctx); + + /* The first 48 bytes are used: + * - 16 bytes ticket key name Property changes on: head/www/xshttpd-devel/files/patch-src_ssl.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property