From owner-dev-commits-ports-all@freebsd.org Mon Apr 12 19:11:04 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 22B6D5DB5F5; Mon, 12 Apr 2021 19:11:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FJyy00LQVz4nhy; Mon, 12 Apr 2021 19:11:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F2CDE1CF97; Mon, 12 Apr 2021 19:11:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13CJB3Yw079951; Mon, 12 Apr 2021 19:11:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13CJB3Xs079950; Mon, 12 Apr 2021 19:11:03 GMT (envelope-from git) Date: Mon, 12 Apr 2021 19:11:03 GMT Message-Id: <202104121911.13CJB3Xs079950@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kevin Bowling Subject: git: 3d55eddff7e1 - main - www/xshttpd*: Remove from tree MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d55eddff7e1761575e29e946d384ad42eca3067 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Apr 2021 19:11:04 -0000 The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=3d55eddff7e1761575e29e946d384ad42eca3067 commit 3d55eddff7e1761575e29e946d384ad42eca3067 Author: Kevin Bowling AuthorDate: 2021-04-12 19:08:44 +0000 Commit: Kevin Bowling CommitDate: 2021-04-12 19:10:53 +0000 www/xshttpd*: Remove from tree PR: 254750 Reported by: daniel.engberg.lists@pyret.net --- MOVED | 2 + www/Makefile | 2 - www/xshttpd-devel/Makefile | 64 --------------------- www/xshttpd-devel/distinfo | 2 - www/xshttpd-devel/files/patch-src_extra.c | 34 ----------- www/xshttpd-devel/files/patch-src_httpd.c | 10 ---- www/xshttpd-devel/files/patch-src_ssl.c | 32 ----------- www/xshttpd-devel/files/xshttpd.in | 28 --------- www/xshttpd-devel/pkg-descr | 9 --- www/xshttpd-devel/pkg-plist | 94 ------------------------------- www/xshttpd/Makefile | 66 ---------------------- www/xshttpd/distinfo | 2 - www/xshttpd/files/patch-src_httpd.c | 11 ---- www/xshttpd/files/patch-src_ssl.c | 14 ----- www/xshttpd/files/xshttpd.in | 28 --------- www/xshttpd/pkg-descr | 23 -------- www/xshttpd/pkg-plist | 84 --------------------------- 17 files changed, 2 insertions(+), 503 deletions(-) diff --git a/MOVED b/MOVED index 37f905401173..7e22bb3eae4f 100644 --- a/MOVED +++ b/MOVED @@ -16278,3 +16278,5 @@ net/coturn|net/turnserver|2021-04-09|Remove duplicate port: coturn is another na databases/percona55-server||2021-04-11|EOL upstream databases/percona55-client||2021-04-11|EOL upstream graphics/ilmbase|math/Imath|2021-04-10|Ilmbase was split out into Imath and OpenEXR. +www/xshttpd||2021-04-12|Unmaintained and dead upstream +www/xshttpd-devel||2021-04-12|Unmaintained and dead upstream diff --git a/www/Makefile b/www/Makefile index fecf0b785931..2a2eb42e3381 100644 --- a/www/Makefile +++ b/www/Makefile @@ -2293,8 +2293,6 @@ SUBDIR += xfce4-smartbookmark-plugin SUBDIR += xist SUBDIR += xoops - SUBDIR += xshttpd - SUBDIR += xshttpd-devel SUBDIR += xsp SUBDIR += yabb SUBDIR += yanopaste diff --git a/www/xshttpd-devel/Makefile b/www/xshttpd-devel/Makefile deleted file mode 100644 index e8ac440c985b..000000000000 --- a/www/xshttpd-devel/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# Created by: Ed Schouten - -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 - -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 diff --git a/www/xshttpd-devel/distinfo b/www/xshttpd-devel/distinfo deleted file mode 100644 index 382e86a66d7b..000000000000 --- a/www/xshttpd-devel/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xshttpd-37b35.tar.bz2) = 2ac7806c856c0fe3920cb2972ac95e657c0dbd53bb0b2bc52c16ef8e6d1abba6 -SIZE (xshttpd-37b35.tar.bz2) = 293636 diff --git a/www/xshttpd-devel/files/patch-src_extra.c b/www/xshttpd-devel/files/patch-src_extra.c deleted file mode 100644 index a69029492b51..000000000000 --- a/www/xshttpd-devel/files/patch-src_extra.c +++ /dev/null @@ -1,34 +0,0 @@ ---- 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); diff --git a/www/xshttpd-devel/files/patch-src_httpd.c b/www/xshttpd-devel/files/patch-src_httpd.c deleted file mode 100644 index 12675db71d9f..000000000000 --- a/www/xshttpd-devel/files/patch-src_httpd.c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 */ - diff --git a/www/xshttpd-devel/files/patch-src_ssl.c b/www/xshttpd-devel/files/patch-src_ssl.c deleted file mode 100644 index 2729e75e2df7..000000000000 --- a/www/xshttpd-devel/files/patch-src_ssl.c +++ /dev/null @@ -1,32 +0,0 @@ ---- 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 diff --git a/www/xshttpd-devel/files/xshttpd.in b/www/xshttpd-devel/files/xshttpd.in deleted file mode 100644 index cb159dde1100..000000000000 --- a/www/xshttpd-devel/files/xshttpd.in +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -# PROVIDE: xshttpd -# REQUIRE: NETWORKING SERVERS -# BEFORE: DAEMON -# KEYWORD: shutdown - -# -# Add the following line to /etc/rc.conf to enable XS-HTTPD: -# xshttpd_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable XS-HTTPD. -# - -. /etc/rc.subr - -name="xshttpd" -rcvar=xshttpd_enable - -load_rc_config $name - -: ${xshttpd_enable="NO"} - -pidfile="/var/run/xshttpd.pid" -command="%%PREFIX%%/bin/httpd" -stop_cmd="%%PREFIX%%/bin/httpdc kill" -restart_cmd="%%PREFIX%%/bin/httpdc restart" - -run_rc_command "$1" diff --git a/www/xshttpd-devel/pkg-descr b/www/xshttpd-devel/pkg-descr deleted file mode 100644 index 1305acf60fc0..000000000000 --- a/www/xshttpd-devel/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -This port offers the development branch of the XS-HTTPD webserver. -The stable version of XS-HTTPD is available as well, as www/xshttpd. - -Development releases are updated much more often and will contain -all kinds of nice new features - some of them are even documented. - -Read the ChangeLog file for possible issues with backwards compatibility. - -WWW: http://www.stack.nl/xs-httpd/ diff --git a/www/xshttpd-devel/pkg-plist b/www/xshttpd-devel/pkg-plist deleted file mode 100644 index 668f8b98c3cf..000000000000 --- a/www/xshttpd-devel/pkg-plist +++ /dev/null @@ -1,94 +0,0 @@ -bin/clearxs -bin/httpd -bin/httpdc -bin/readxs -bin/xsindex -bin/xspasswd -%%WWWDIR%%/cgi-bin/error -%%WWWDIR%%/cgi-bin/gfxcount -%%WWWDIR%%/cgi-bin/imagemap -%%WWWDIR%%/cgi-bin/xschpass -%%ETCDIR%%/httpd.conf.sample -%%ETCDIR%%/mime.index -%%ETCDIR%%/script.methods.sample -%%ETCDIR%%/compress.methods.sample -%%DATADIR%%/contrib/SSL-Makefile -%%DATADIR%%/contrib/agentstats.pl -%%DATADIR%%/contrib/caroot.pem -%%DATADIR%%/contrib/logrotate.sh -%%DATADIR%%/contrib/persistent.pl -%%DATADIR%%/contrib/powered-by-xs.gif -%%DATADIR%%/contrib/wwwstats.pl -%%DATADIR%%/gfxcount/digital0.ppm -%%DATADIR%%/gfxcount/digital1.ppm -%%DATADIR%%/gfxcount/digital2.ppm -%%DATADIR%%/gfxcount/digital3.ppm -%%DATADIR%%/gfxcount/digital4.ppm -%%DATADIR%%/gfxcount/digital5.ppm -%%DATADIR%%/gfxcount/digital6.ppm -%%DATADIR%%/gfxcount/digital7.ppm -%%DATADIR%%/gfxcount/digital8.ppm -%%DATADIR%%/gfxcount/digital9.ppm -%%DATADIR%%/gfxcount/large0.ppm -%%DATADIR%%/gfxcount/large1.ppm -%%DATADIR%%/gfxcount/large2.ppm -%%DATADIR%%/gfxcount/large3.ppm -%%DATADIR%%/gfxcount/large4.ppm -%%DATADIR%%/gfxcount/large5.ppm -%%DATADIR%%/gfxcount/large6.ppm -%%DATADIR%%/gfxcount/large7.ppm -%%DATADIR%%/gfxcount/large8.ppm -%%DATADIR%%/gfxcount/large9.ppm -%%DATADIR%%/gfxcount/largecol0.ppm -%%DATADIR%%/gfxcount/largecol1.ppm -%%DATADIR%%/gfxcount/largecol2.ppm -%%DATADIR%%/gfxcount/largecol3.ppm -%%DATADIR%%/gfxcount/largecol4.ppm -%%DATADIR%%/gfxcount/largecol5.ppm -%%DATADIR%%/gfxcount/largecol6.ppm -%%DATADIR%%/gfxcount/largecol7.ppm -%%DATADIR%%/gfxcount/largecol8.ppm -%%DATADIR%%/gfxcount/largecol9.ppm -%%DATADIR%%/icons/xs-audio.gif -%%DATADIR%%/icons/xs-back.gif -%%DATADIR%%/icons/xs-base.gif -%%DATADIR%%/icons/xs-bin.gif -%%DATADIR%%/icons/xs-dir.gif -%%DATADIR%%/icons/xs-gif.gif -%%DATADIR%%/icons/xs-html.gif -%%DATADIR%%/icons/xs-image.gif -%%DATADIR%%/icons/xs-jpeg.gif -%%DATADIR%%/icons/xs-ps.gif -%%DATADIR%%/icons/xs-tar.gif -%%DATADIR%%/icons/xs-txt.gif -%%DATADIR%%/icons/xs-unknown.gif -%%DATADIR%%/icons/xs-video.gif -%%DATADIR%%/icons/xs-zip.gif -%%PERL%%libexec/xshttpd/mod_perl.so -%%LDAP%%libexec/xshttpd/mod_ldap.so -libexec/xshttpd/mod_bzip2.so -libexec/xshttpd/mod_compress.so -libexec/xshttpd/mod_gzip.so -libexec/xshttpd/mod_htcpcp.so -libexec/xshttpd/mod_magic.so -libexec/xshttpd/mod_rpaf.so -man/man1/clearxs.1.gz -man/man1/gfxcount.1.gz -man/man1/httpd.1.gz -man/man1/httpdc.1.gz -man/man1/imagemap.1.gz -man/man1/readxs.1.gz -man/man1/xschpass.1.gz -man/man1/xsindex.1.gz -man/man1/xspasswd.1.gz -man/man5/httpd.conf.5.gz -man/man5/xsauth.5.gz -man/man5/xsconf.5.gz -man/man5/xsredir.5.gz -man/man5/xsscripts.5.gz -man/man7/httpd_cgi.7.gz -man/man7/httpd_ssi.7.gz -@dir %%WWWDIR%%/htdocs -@dir /var/db/xshttpd/sessions -@dir /var/db/xshttpd -@dir /var/log/xshttpd diff --git a/www/xshttpd/Makefile b/www/xshttpd/Makefile deleted file mode 100644 index 462d20817f58..000000000000 --- a/www/xshttpd/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -# Created by: Ed Schouten - -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 - -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 diff --git a/www/xshttpd/distinfo b/www/xshttpd/distinfo deleted file mode 100644 index 8a2438595493..000000000000 --- a/www/xshttpd/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xshttpd-36g01.tar.bz2) = a21f8c1cf018e1b9195739a63067a245ec273abada89b60a2d1c3fd4cc968dc4 -SIZE (xshttpd-36g01.tar.bz2) = 241640 diff --git a/www/xshttpd/files/patch-src_httpd.c b/www/xshttpd/files/patch-src_httpd.c deleted file mode 100644 index c9474faa796b..000000000000 --- a/www/xshttpd/files/patch-src_httpd.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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);\ diff --git a/www/xshttpd/files/patch-src_ssl.c b/www/xshttpd/files/patch-src_ssl.c deleted file mode 100644 index 1980cb130b6c..000000000000 --- a/www/xshttpd/files/patch-src_ssl.c +++ /dev/null @@ -1,14 +0,0 @@ ---- 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) diff --git a/www/xshttpd/files/xshttpd.in b/www/xshttpd/files/xshttpd.in deleted file mode 100644 index 98de76d357e3..000000000000 --- a/www/xshttpd/files/xshttpd.in +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -# PROVIDE: xshttpd -# REQUIRE: NETWORKING SERVERS -# BEFORE: DAEMON -# KEYWORD: shutdown - -# -# Add the following line to /etc/rc.conf to enable XS-HTTPD: -# xshttpd_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable XS-HTTPD. -# - -. /etc/rc.subr - -name="xshttpd" -rcvar=xshttpd_enable - -load_rc_config $name - -: ${xshttpd_enable="NO"} - -pidfile="/var/run/httpd.pid" -command="%%PREFIX%%/bin/httpd" -stop_cmd="%%PREFIX%%/bin/httpdc kill" -restart_cmd="%%PREFIX%%/bin/httpdc restart" - -run_rc_command "$1" diff --git a/www/xshttpd/pkg-descr b/www/xshttpd/pkg-descr deleted file mode 100644 index 2ee77c0f3621..000000000000 --- a/www/xshttpd/pkg-descr +++ /dev/null @@ -1,23 +0,0 @@ -XS-HTTPD is a WWW server that has the following features: - -- It is pronounced as "access-HTTP-daemon" -- It is SMALL (very small in fact: a factor two to three smaller than - normal servers on disk and in memory) -- It is FAST (because it is so small and does not do unnecessary things) -- Uses very little CPU time -- Configurable (configuration compiled in to make it small, but largely - overridable on the command line) -- Runs user CGI binaries under their own user ID -- Gets users' pages under their own user ID, allowing them to really - have protected pages (using the built-in authentication mechanism) -- Does not fork for every connection (has a fixed number of servers), - only to replace a lost server (in case of timeouts). -- Comes with some other useful programs -- Offers Server-Side Includes for many common tasks, including built-in - page counters (text or graphical) -- Supports PHP and other interpreted file formats -- Supports automatic decompression to save diskspace and bandwidth -- Serves SSL (https) and http connections through the same daemon -- Full support for IPv6 - -WWW: http://www.stack.nl/xs-httpd/ diff --git a/www/xshttpd/pkg-plist b/www/xshttpd/pkg-plist deleted file mode 100644 index 60679785945d..000000000000 --- a/www/xshttpd/pkg-plist +++ /dev/null @@ -1,84 +0,0 @@ -bin/clearxs -bin/httpd -bin/httpdc -bin/readxs -bin/xsindex -bin/xspasswd -%%WWWDIR%%/cgi-bin/error -%%WWWDIR%%/cgi-bin/gfxcount -%%WWWDIR%%/cgi-bin/imagemap -%%WWWDIR%%/cgi-bin/xschpass -%%WWWDIR%%/conf/httpd.conf.sample -%%WWWDIR%%/conf/mime.index -%%WWWDIR%%/conf/script.methods.sample -%%WWWDIR%%/conf/compress.methods.sample -%%WWWDIR%%/contrib/SSL-Makefile -%%WWWDIR%%/contrib/agentstats.pl -%%WWWDIR%%/contrib/caroot.pem -%%WWWDIR%%/contrib/logrotate.sh -%%WWWDIR%%/contrib/persistent.pl -%%WWWDIR%%/contrib/powered-by-xs.gif -%%WWWDIR%%/contrib/wwwstats.pl -%%WWWDIR%%/gfxcount/digital0.ppm -%%WWWDIR%%/gfxcount/digital1.ppm -%%WWWDIR%%/gfxcount/digital2.ppm -%%WWWDIR%%/gfxcount/digital3.ppm -%%WWWDIR%%/gfxcount/digital4.ppm -%%WWWDIR%%/gfxcount/digital5.ppm -%%WWWDIR%%/gfxcount/digital6.ppm -%%WWWDIR%%/gfxcount/digital7.ppm -%%WWWDIR%%/gfxcount/digital8.ppm -%%WWWDIR%%/gfxcount/digital9.ppm -%%WWWDIR%%/gfxcount/large0.ppm -%%WWWDIR%%/gfxcount/large1.ppm -%%WWWDIR%%/gfxcount/large2.ppm -%%WWWDIR%%/gfxcount/large3.ppm -%%WWWDIR%%/gfxcount/large4.ppm -%%WWWDIR%%/gfxcount/large5.ppm -%%WWWDIR%%/gfxcount/large6.ppm -%%WWWDIR%%/gfxcount/large7.ppm -%%WWWDIR%%/gfxcount/large8.ppm -%%WWWDIR%%/gfxcount/large9.ppm -%%WWWDIR%%/gfxcount/largecol0.ppm -%%WWWDIR%%/gfxcount/largecol1.ppm -%%WWWDIR%%/gfxcount/largecol2.ppm -%%WWWDIR%%/gfxcount/largecol3.ppm -%%WWWDIR%%/gfxcount/largecol4.ppm -%%WWWDIR%%/gfxcount/largecol5.ppm -%%WWWDIR%%/gfxcount/largecol6.ppm -%%WWWDIR%%/gfxcount/largecol7.ppm -%%WWWDIR%%/gfxcount/largecol8.ppm -%%WWWDIR%%/gfxcount/largecol9.ppm -%%WWWDIR%%/icons/xs-audio.gif -%%WWWDIR%%/icons/xs-back.gif -%%WWWDIR%%/icons/xs-base.gif -%%WWWDIR%%/icons/xs-bin.gif -%%WWWDIR%%/icons/xs-dir.gif -%%WWWDIR%%/icons/xs-gif.gif -%%WWWDIR%%/icons/xs-html.gif -%%WWWDIR%%/icons/xs-image.gif -%%WWWDIR%%/icons/xs-jpeg.gif -%%WWWDIR%%/icons/xs-ps.gif -%%WWWDIR%%/icons/xs-tar.gif -%%WWWDIR%%/icons/xs-txt.gif -%%WWWDIR%%/icons/xs-unknown.gif -%%WWWDIR%%/icons/xs-video.gif -%%WWWDIR%%/icons/xs-zip.gif -man/man1/clearxs.1.gz -man/man1/gfxcount.1.gz -man/man1/httpd.1.gz -man/man1/httpdc.1.gz -man/man1/imagemap.1.gz -man/man1/readxs.1.gz -man/man1/xschpass.1.gz -man/man1/xsindex.1.gz -man/man1/xspasswd.1.gz -man/man5/httpd.conf.5.gz -man/man5/xsauth.5.gz -man/man5/xsconf.5.gz -man/man5/xsredir.5.gz -man/man5/xsscripts.5.gz -man/man7/httpd_cgi.7.gz -man/man7/httpd_ssi.7.gz -@dir %%WWWDIR%%/logs -@dir %%WWWDIR%%/htdocs