Attachment #223794 for bug #254750

Lines 2295-2302 Link Here

(-)b/www/Makefile (-2 lines)
2295	SUBDIR += xfce4-smartbookmark-plugin	2295	SUBDIR += xfce4-smartbookmark-plugin
2296	SUBDIR += xist	2296	SUBDIR += xist
2297	SUBDIR += xoops	2297	SUBDIR += xoops
2298	SUBDIR += xshttpd
2299	SUBDIR += xshttpd-devel
2300	SUBDIR += xsp	2298	SUBDIR += xsp
2301	SUBDIR += yabb	2299	SUBDIR += yabb
2302	SUBDIR += yanopaste	2300	SUBDIR += yanopaste




# Created by: Ed Schouten <ed@fxq.nl>
# $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

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 <bsd.port.mk>

Removed Link Here

(-)a/www/xshttpd-devel/distinfo (-2 lines)
1	SHA256 (xshttpd-37b35.tar.bz2) = 2ac7806c856c0fe3920cb2972ac95e657c0dbd53bb0b2bc52c16ef8e6d1abba6
2	SIZE (xshttpd-37b35.tar.bz2) = 293636




--- 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);

Removed Link Here

(-)a/www/xshttpd-devel/files/patch-src_httpd.c (-10 lines)
1	--- src/httpd.c.orig 2015-09-05 20:44:28 UTC
2	+++ src/httpd.c
3	@@ -84,6 +84,7 @@ static char referer[MYBUFSIZ], orig[MYBUFSIZ];
4	static char startparams, message503;
5	struct session session;
6	struct env env;
7	+struct socket_config *cursock;
8
9	/* Prototypes */
10




--- 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




#!/bin/sh
#
# $FreeBSD$
#

# 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"

Removed Link Here

(-)a/www/xshttpd-devel/pkg-descr (-9 lines)
1	This port offers the development branch of the XS-HTTPD webserver.
2	The stable version of XS-HTTPD is available as well, as www/xshttpd.
3
4	Development releases are updated much more often and will contain
5	all kinds of nice new features - some of them are even documented.
6
7	Read the ChangeLog file for possible issues with backwards compatibility.
8
9	WWW: http://www.stack.nl/xs-httpd/




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




# Created by: Ed Schouten <ed@fxq.nl>
# $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

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 <bsd.port.mk>

Removed Link Here

(-)a/www/xshttpd/distinfo (-2 lines)
1	SHA256 (xshttpd-36g01.tar.bz2) = a21f8c1cf018e1b9195739a63067a245ec273abada89b60a2d1c3fd4cc968dc4
2	SIZE (xshttpd-36g01.tar.bz2) = 241640

Removed Link Here

(-)a/www/xshttpd/files/patch-src_httpd.c (-11 lines)
1	--- src/httpd.c.orig 2009-01-10 22:52:29 UTC
2	+++ src/httpd.c
3	@@ -90,6 +90,8 @@ static char referer[MYBUFSIZ], orig[MYBUFSIZ];
4	static char startparams, message503;
5	struct session session;
6	struct env env;
7	+struct socket_config *cursock;
8	+
9	#define CLEANENV do { \
10	memset(&env, 0, sizeof(struct env));\
11	MALLOC(environ, char *, 1);\




--- 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)




#!/bin/sh
#
# $FreeBSD$
#

# 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"




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/




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

Return to bug 254750

Removed Link Here

(-)a/www/xshttpd-devel/Makefile (-65 lines)
1	# Created by: Ed Schouten <ed@fxq.nl>
2	# $FreeBSD$
3
4	PORTNAME= xshttpd
5	DISTVERSION= 3.7b35
6	CATEGORIES= www
7	MASTER_SITES= ftp://ftp.stack.nl/pub/xs-httpd/release/ \
8	ftp://mud.stack.nl/pub/xs-httpd/release/
9	PKGNAMESUFFIX= -devel
10	DISTNAME= ${PORTNAME}-${DISTVERSION:S/.//}
11
12	MAINTAINER= ports@FreeBSD.org
13	COMMENT= Webserver with CGI as own user and SSL support
14
15	RUN_DEPENDS= run-mailcap:misc/mime-support
16	LIB_DEPENDS= libpcre.so:devel/pcre
17
18	CONFLICTS_INSTALL= xshttpd-[0-9]* publicfile-[0-9]*
19
20	USES= ssl tar:bzip2
21	USE_RC_SUBR= xshttpd
22	GNU_CONFIGURE= yes
23	CONFIGURE_ARGS= --enable-hier=bsd --with-userid=${WWWOWN}:${WWWGRP}
24
25	OPTIONS_DEFINE= BDB CURL LDAP M4 NETPBM PERL DOCS
26	OPTIONS_DEFAULT= BDB CURL M4 NETPBM
27	OPTIONS_SUB= yes
28	BDB_USES= bdb:5+
29	BDB_CONFIGURE_ON= --with-db-libdir=${BDB_LIB_DIR} \
30	--with-db-include-dir=${BDB_INCLUDE_DIR}
31	BDB_CONFIGURE_WITH= db
32	CURL_LIB_DEPENDS= libcurl.so:ftp/curl
33	CURL_CONFIGURE_WITH= curl
34	LDAP_USE= openldap
35	LDAP_CONFIGURE_WITH= ldap
36	M4_DESC= Enable configuration preprocessor (m4)
37	M4_CONFIGURE_WITH= preprocessor
38	NETPBM_DESC= Enable NETPBM (for graphical counters)
39	NETPBM_RUN_DEPENDS= ppmtogif:graphics/netpbm
40	PERL_DESC= Enable persistent Perl interpreter
41	PERL_USES= perl5
42	PERL_CONFIGURE_WITH= perl
43
44	PORTDOCS= README ChangeLog
45
46	post-patch:
47	@${REINPLACE_CMD} \
48	-e 's\|\(MIME_TYPES\).*\|\1 "${LOCALBASE}/etc/mime.types"\|' \
49	${WRKSRC}/src/constants.h
50	@${REINPLACE_CMD} -e 's\|^struct socket_config\|extern &\|' \
51	${WRKSRC}/src/htconfig.h
52	@${REINPLACE_CMD} -e 's\|mime.types \|\|g' \
53	${WRKSRC}/config/Makefile.in
54	@${REINPLACE_CMD} -e '/libdir/ s\|(INSTALL_DATA)\|& -s\|' \
55	${WRKSRC}/src/Makefile.in
56	@${REINPLACE_CMD} -e 's/$$(htmldir)/$$(DESTDIR)&/' \
57	${WRKSRC}/contrib/Makefile.in
58
59	post-install:
60	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${WWWDIR}/htdocs \
61	${STAGEDIR}/var/log/xshttpd \
62	${STAGEDIR}/var/db/xshttpd/sessions
63	${INSTALL_DATA} ${PORTDOCS:S\|^\|${WRKSRC}/\|} ${STAGEDIR}${DOCSDIR}
64
65	.include <bsd.port.mk>

Removed Link Here

(-)a/www/xshttpd-devel/files/patch-src_extra.c (-34 lines)
1	--- src/extra.c.orig 2015-01-02 16:49:11 UTC
2	+++ src/extra.c
3	@@ -586,7 +586,7 @@ do_crypt(const char * const skey, const char * const i
4	const unsigned int IVLEN = 16;
5	int outlen,
6	tmplen;
7	- EVP_CIPHER_CTX ctx;
8	+ EVP_CIPHER_CTX *ctx;
9	unsigned char plain[16] = { 0 };
10	unsigned char outbuf[1024];
11	char *encrypted;
12	@@ -600,17 +600,17 @@ do_crypt(const char * const skey, const char * const i
13	}
14
15	/* init aes-128-cbc */
16	- EVP_CIPHER_CTX_init(&ctx);
17	- EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, outbuf /* iv */);
18	+ ctx = EVP_CIPHER_CTX_new();
19	+ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, outbuf /* iv */);
20
21	- if (!EVP_EncryptUpdate(&ctx, outbuf + outlen, &tmplen,
22	+ if (!EVP_EncryptUpdate(ctx, outbuf + outlen, &tmplen,
23	plain, sizeof(plain)))
24	return false;
25	outlen += tmplen;
26	- if (!EVP_EncryptFinal_ex(&ctx, outbuf + outlen, &tmplen))
27	+ if (!EVP_EncryptFinal_ex(ctx, outbuf + outlen, &tmplen))
28	return false;
29	outlen += tmplen;
30	- EVP_CIPHER_CTX_cleanup(&ctx);
31	+ EVP_CIPHER_CTX_free(ctx);
32
33	MALLOC(encrypted, char, outlen);
34	memcpy(encrypted, outbuf, outlen);

Removed Link Here

(-)a/www/xshttpd-devel/files/patch-src_ssl.c (-32 lines)
1	--- src/ssl.c.orig 2015-09-05 20:50:21 UTC
2	+++ src/ssl.c
3	@@ -538,7 +538,11 @@ sslverify_callback(int preverify_ok, X509_STORE_CTX *x
4	X509_NAME *xsname;
5	char *strname;
6	int rc, ovector[OVSIZE];
7	+# if OPENSSL_VERSION_NUMBER < 0x10100005L
8	X509 *xs = x509_ctx->cert;
9	+# else
10	+ X509 *xs = X509_STORE_CTX_get0_cert(x509_ctx);
11	+# endif
12
13	/* match subject */
14	if (cursock->sslpcresdn)
15	@@ -937,11 +941,12 @@ loadssl(struct socket_config * const lsock, struct ssl
16	unsigned char sign[EVP_PKEY_size(evpkey)];
17	unsigned int siglen = 0;
18
19	- EVP_MD_CTX mdctx;
20	- EVP_MD_CTX_init(&mdctx);
21	- EVP_SignInit(&mdctx, EVP_sha384());
22	- EVP_SignUpdate(&mdctx, ticketkey, strlen(ticketkey));
23	- EVP_SignFinal(&mdctx, sign, &siglen, evpkey);
24	+ EVP_MD_CTX *mdctx;
25	+ mdctx = EVP_MD_CTX_create();
26	+ EVP_SignInit(mdctx, EVP_sha384());
27	+ EVP_SignUpdate(mdctx, ticketkey, strlen(ticketkey));
28	+ EVP_SignFinal(mdctx, sign, &siglen, evpkey);
29	+ EVP_MD_CTX_destroy(mdctx);
30
31	/* The first 48 bytes are used:
32	* - 16 bytes ticket key name

Removed Link Here

(-)a/www/xshttpd-devel/files/xshttpd.in (-31 lines)
1	#!/bin/sh
2	#
3	# $FreeBSD$
4	#
5
6	# PROVIDE: xshttpd
7	# REQUIRE: NETWORKING SERVERS
8	# BEFORE: DAEMON
9	# KEYWORD: shutdown
10
11	#
12	# Add the following line to /etc/rc.conf to enable XS-HTTPD:
13	# xshttpd_enable (bool): Set to "NO" by default.
14	# Set it to "YES" to enable XS-HTTPD.
15	#
16
17	. /etc/rc.subr
18
19	name="xshttpd"
20	rcvar=xshttpd_enable
21
22	load_rc_config $name
23
24	: ${xshttpd_enable="NO"}
25
26	pidfile="/var/run/xshttpd.pid"
27	command="%%PREFIX%%/bin/httpd"
28	stop_cmd="%%PREFIX%%/bin/httpdc kill"
29	restart_cmd="%%PREFIX%%/bin/httpdc restart"
30
31	run_rc_command "$1"

Removed Link Here

(-)a/www/xshttpd-devel/pkg-plist (-94 lines)
1	bin/clearxs
2	bin/httpd
3	bin/httpdc
4	bin/readxs
5	bin/xsindex
6	bin/xspasswd
7	%%WWWDIR%%/cgi-bin/error
8	%%WWWDIR%%/cgi-bin/gfxcount
9	%%WWWDIR%%/cgi-bin/imagemap
10	%%WWWDIR%%/cgi-bin/xschpass
11	%%ETCDIR%%/httpd.conf.sample
12	%%ETCDIR%%/mime.index
13	%%ETCDIR%%/script.methods.sample
14	%%ETCDIR%%/compress.methods.sample
15	%%DATADIR%%/contrib/SSL-Makefile
16	%%DATADIR%%/contrib/agentstats.pl
17	%%DATADIR%%/contrib/caroot.pem
18	%%DATADIR%%/contrib/logrotate.sh
19	%%DATADIR%%/contrib/persistent.pl
20	%%DATADIR%%/contrib/powered-by-xs.gif
21	%%DATADIR%%/contrib/wwwstats.pl
22	%%DATADIR%%/gfxcount/digital0.ppm
23	%%DATADIR%%/gfxcount/digital1.ppm
24	%%DATADIR%%/gfxcount/digital2.ppm
25	%%DATADIR%%/gfxcount/digital3.ppm
26	%%DATADIR%%/gfxcount/digital4.ppm
27	%%DATADIR%%/gfxcount/digital5.ppm
28	%%DATADIR%%/gfxcount/digital6.ppm
29	%%DATADIR%%/gfxcount/digital7.ppm
30	%%DATADIR%%/gfxcount/digital8.ppm
31	%%DATADIR%%/gfxcount/digital9.ppm
32	%%DATADIR%%/gfxcount/large0.ppm
33	%%DATADIR%%/gfxcount/large1.ppm
34	%%DATADIR%%/gfxcount/large2.ppm
35	%%DATADIR%%/gfxcount/large3.ppm
36	%%DATADIR%%/gfxcount/large4.ppm
37	%%DATADIR%%/gfxcount/large5.ppm
38	%%DATADIR%%/gfxcount/large6.ppm
39	%%DATADIR%%/gfxcount/large7.ppm
40	%%DATADIR%%/gfxcount/large8.ppm
41	%%DATADIR%%/gfxcount/large9.ppm
42	%%DATADIR%%/gfxcount/largecol0.ppm
43	%%DATADIR%%/gfxcount/largecol1.ppm
44	%%DATADIR%%/gfxcount/largecol2.ppm
45	%%DATADIR%%/gfxcount/largecol3.ppm
46	%%DATADIR%%/gfxcount/largecol4.ppm
47	%%DATADIR%%/gfxcount/largecol5.ppm
48	%%DATADIR%%/gfxcount/largecol6.ppm
49	%%DATADIR%%/gfxcount/largecol7.ppm
50	%%DATADIR%%/gfxcount/largecol8.ppm
51	%%DATADIR%%/gfxcount/largecol9.ppm
52	%%DATADIR%%/icons/xs-audio.gif
53	%%DATADIR%%/icons/xs-back.gif
54	%%DATADIR%%/icons/xs-base.gif
55	%%DATADIR%%/icons/xs-bin.gif
56	%%DATADIR%%/icons/xs-dir.gif
57	%%DATADIR%%/icons/xs-gif.gif
58	%%DATADIR%%/icons/xs-html.gif
59	%%DATADIR%%/icons/xs-image.gif
60	%%DATADIR%%/icons/xs-jpeg.gif
61	%%DATADIR%%/icons/xs-ps.gif
62	%%DATADIR%%/icons/xs-tar.gif
63	%%DATADIR%%/icons/xs-txt.gif
64	%%DATADIR%%/icons/xs-unknown.gif
65	%%DATADIR%%/icons/xs-video.gif
66	%%DATADIR%%/icons/xs-zip.gif
67	%%PERL%%libexec/xshttpd/mod_perl.so
68	%%LDAP%%libexec/xshttpd/mod_ldap.so
69	libexec/xshttpd/mod_bzip2.so
70	libexec/xshttpd/mod_compress.so
71	libexec/xshttpd/mod_gzip.so
72	libexec/xshttpd/mod_htcpcp.so
73	libexec/xshttpd/mod_magic.so
74	libexec/xshttpd/mod_rpaf.so
75	man/man1/clearxs.1.gz
76	man/man1/gfxcount.1.gz
77	man/man1/httpd.1.gz
78	man/man1/httpdc.1.gz
79	man/man1/imagemap.1.gz
80	man/man1/readxs.1.gz
81	man/man1/xschpass.1.gz
82	man/man1/xsindex.1.gz
83	man/man1/xspasswd.1.gz
84	man/man5/httpd.conf.5.gz
85	man/man5/xsauth.5.gz
86	man/man5/xsconf.5.gz
87	man/man5/xsredir.5.gz
88	man/man5/xsscripts.5.gz
89	man/man7/httpd_cgi.7.gz
90	man/man7/httpd_ssi.7.gz
91	@dir %%WWWDIR%%/htdocs
92	@dir /var/db/xshttpd/sessions
93	@dir /var/db/xshttpd
94	@dir /var/log/xshttpd

Removed Link Here

(-)a/www/xshttpd/Makefile (-67 lines)
1	# Created by: Ed Schouten <ed@fxq.nl>
2	# $FreeBSD$
3
4	PORTNAME= xshttpd
5	DISTVERSION= 3.6g01
6	PORTREVISION= 9
7	CATEGORIES= www
8	MASTER_SITES= ftp://ftp.stack.nl/pub/xs-httpd/release/ \
9	ftp://mud.stack.nl/pub/xs-httpd/release/
10	DISTNAME= ${PORTNAME}-${DISTVERSION:S/.//}
11
12	MAINTAINER= ports@FreeBSD.org
13	COMMENT= Webserver with CGI as own user and SSL support
14
15	RUN_DEPENDS= run-mailcap:misc/mime-support \
16	ppmtogif:graphics/netpbm
17
18	CONFLICTS_INSTALL= xshttpd-devel-[0-9]* publicfile-[0-9]*
19
20	USES= tar:bzip2
21	USE_RC_SUBR= xshttpd
22	GNU_CONFIGURE= yes
23
24	WWWDIR= ${PREFIX}/www/${PORTNAME}
25	CONFIGURE_ARGS+=--with-rootdir=${WWWDIR}
26
27	OPTIONS_DEFINE= SSL PCRE LDAP CURL M4_CONFIG PERSISTENT_PERL DOCS
28	OPTIONS_DEFAULT=SSL PCRE
29	SSL_USES= ssl
30	SSL_CONFIGURE_WITH= ssl
31	LDAP_USE= OPENLDAP=yes
32	LDAP_CONFIGURE_WITH= ldap
33	M4_CONFIG_DESC= Enable m4 configuration preprocessor
34	M4_CONFIG_CONFIGURE_WITH=preprocessor
35	PERSISTENT_PERL_DESC= Enable persistent Perl interpreter
36	PERSISTENT_PERL_USES= perl5
37	PERSISTENT_PERL_CONFIGURE_WITH= perl
38	PCRE_LIB_DEPENDS= libpcre.so:devel/pcre
39	PCRE_CONFIGURE_WITH= pcre
40	CURL_LIB_DEPENDS= libcurl.so:ftp/curl
41	CURL_CONFIGURE_WITH= curl
42
43	PORTDOCS= README ChangeLog
44
45	post-patch:
46	.for i in man/httpd.1.in man/httpd.conf.5 config/httpd.conf.sample \
47	contrib/SSL-Makefile contrib/logrotate.sh
48	@${REINPLACE_CMD} \
49	-e 's\|/wwwsys\|${WWWDIR}\|g' \
50	-e 's\|/usr/local/lib/httpd\|${WWWDIR}\|g' \
51	-e 's\|nobody\|${WWWOWN}\|g' \
52	-e 's\|nogroup\|${WWWGRP}\|g' \
53	${WRKSRC}/$i
54	.endfor
55	@${REINPLACE_CMD} \
56	-e 's\|\(MIME_TYPES\).*\|\1 "${LOCALBASE}/etc/mime.types"\|' \
57	${WRKSRC}/src/constants.h
58	@${REINPLACE_CMD} -e 's\|^struct socket_config\|extern &\|' \
59	${WRKSRC}/src/htconfig.h
60	@${REINPLACE_CMD} -e 's\|mime.types \|\|g' \
61	${WRKSRC}/config/Makefile.in
62
63	post-install:
64	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${WWWDIR}/htdocs
65	${INSTALL_DATA} ${PORTDOCS:S\|^\|${WRKSRC}/\|} ${STAGEDIR}${DOCSDIR}
66
67	.include <bsd.port.mk>

Removed Link Here

(-)a/www/xshttpd/files/patch-src_ssl.c (-14 lines)
1	--- src/ssl.c.orig 2009-01-10 22:52:29 UTC
2	+++ src/ssl.c
3	@@ -244,7 +244,11 @@ sslverify_callback(int preverify_ok, X509_STORE_CTX *x
4	X509_NAME *xsname;
5	char *strname;
6	int rc, ovector[OVSIZE];
7	+# if OPENSSL_VERSION_NUMBER < 0x10100005L
8	X509 *xs = x509_ctx->cert;
9	+# else
10	+ X509 *xs = X509_STORE_CTX_get0_cert(x509_ctx);
11	+# endif
12
13	/* match subject */
14	if (cursock->sslpcresdn)

Removed Link Here

(-)a/www/xshttpd/files/xshttpd.in (-31 lines)
1	#!/bin/sh
2	#
3	# $FreeBSD$
4	#
5
6	# PROVIDE: xshttpd
7	# REQUIRE: NETWORKING SERVERS
8	# BEFORE: DAEMON
9	# KEYWORD: shutdown
10
11	#
12	# Add the following line to /etc/rc.conf to enable XS-HTTPD:
13	# xshttpd_enable (bool): Set to "NO" by default.
14	# Set it to "YES" to enable XS-HTTPD.
15	#
16
17	. /etc/rc.subr
18
19	name="xshttpd"
20	rcvar=xshttpd_enable
21
22	load_rc_config $name
23
24	: ${xshttpd_enable="NO"}
25
26	pidfile="/var/run/httpd.pid"
27	command="%%PREFIX%%/bin/httpd"
28	stop_cmd="%%PREFIX%%/bin/httpdc kill"
29	restart_cmd="%%PREFIX%%/bin/httpdc restart"
30
31	run_rc_command "$1"

Removed Link Here

(-)a/www/xshttpd/pkg-descr (-23 lines)
1	XS-HTTPD is a WWW server that has the following features:
2
3	- It is pronounced as "access-HTTP-daemon"
4	- It is SMALL (very small in fact: a factor two to three smaller than
5	normal servers on disk and in memory)
6	- It is FAST (because it is so small and does not do unnecessary things)
7	- Uses very little CPU time
8	- Configurable (configuration compiled in to make it small, but largely
9	overridable on the command line)
10	- Runs user CGI binaries under their own user ID
11	- Gets users' pages under their own user ID, allowing them to really
12	have protected pages (using the built-in authentication mechanism)
13	- Does not fork for every connection (has a fixed number of servers),
14	only to replace a lost server (in case of timeouts).
15	- Comes with some other useful programs
16	- Offers Server-Side Includes for many common tasks, including built-in
17	page counters (text or graphical)
18	- Supports PHP and other interpreted file formats
19	- Supports automatic decompression to save diskspace and bandwidth
20	- Serves SSL (https) and http connections through the same daemon
21	- Full support for IPv6
22
23	WWW: http://www.stack.nl/xs-httpd/

Removed Link Here

(-)a/www/xshttpd/pkg-plist (-84 lines)
1	bin/clearxs
2	bin/httpd
3	bin/httpdc
4	bin/readxs
5	bin/xsindex
6	bin/xspasswd
7	%%WWWDIR%%/cgi-bin/error
8	%%WWWDIR%%/cgi-bin/gfxcount
9	%%WWWDIR%%/cgi-bin/imagemap
10	%%WWWDIR%%/cgi-bin/xschpass
11	%%WWWDIR%%/conf/httpd.conf.sample
12	%%WWWDIR%%/conf/mime.index
13	%%WWWDIR%%/conf/script.methods.sample
14	%%WWWDIR%%/conf/compress.methods.sample
15	%%WWWDIR%%/contrib/SSL-Makefile
16	%%WWWDIR%%/contrib/agentstats.pl
17	%%WWWDIR%%/contrib/caroot.pem
18	%%WWWDIR%%/contrib/logrotate.sh
19	%%WWWDIR%%/contrib/persistent.pl
20	%%WWWDIR%%/contrib/powered-by-xs.gif
21	%%WWWDIR%%/contrib/wwwstats.pl
22	%%WWWDIR%%/gfxcount/digital0.ppm
23	%%WWWDIR%%/gfxcount/digital1.ppm
24	%%WWWDIR%%/gfxcount/digital2.ppm
25	%%WWWDIR%%/gfxcount/digital3.ppm
26	%%WWWDIR%%/gfxcount/digital4.ppm
27	%%WWWDIR%%/gfxcount/digital5.ppm
28	%%WWWDIR%%/gfxcount/digital6.ppm
29	%%WWWDIR%%/gfxcount/digital7.ppm
30	%%WWWDIR%%/gfxcount/digital8.ppm
31	%%WWWDIR%%/gfxcount/digital9.ppm
32	%%WWWDIR%%/gfxcount/large0.ppm
33	%%WWWDIR%%/gfxcount/large1.ppm
34	%%WWWDIR%%/gfxcount/large2.ppm
35	%%WWWDIR%%/gfxcount/large3.ppm
36	%%WWWDIR%%/gfxcount/large4.ppm
37	%%WWWDIR%%/gfxcount/large5.ppm
38	%%WWWDIR%%/gfxcount/large6.ppm
39	%%WWWDIR%%/gfxcount/large7.ppm
40	%%WWWDIR%%/gfxcount/large8.ppm
41	%%WWWDIR%%/gfxcount/large9.ppm
42	%%WWWDIR%%/gfxcount/largecol0.ppm
43	%%WWWDIR%%/gfxcount/largecol1.ppm
44	%%WWWDIR%%/gfxcount/largecol2.ppm
45	%%WWWDIR%%/gfxcount/largecol3.ppm
46	%%WWWDIR%%/gfxcount/largecol4.ppm
47	%%WWWDIR%%/gfxcount/largecol5.ppm
48	%%WWWDIR%%/gfxcount/largecol6.ppm
49	%%WWWDIR%%/gfxcount/largecol7.ppm
50	%%WWWDIR%%/gfxcount/largecol8.ppm
51	%%WWWDIR%%/gfxcount/largecol9.ppm
52	%%WWWDIR%%/icons/xs-audio.gif
53	%%WWWDIR%%/icons/xs-back.gif
54	%%WWWDIR%%/icons/xs-base.gif
55	%%WWWDIR%%/icons/xs-bin.gif
56	%%WWWDIR%%/icons/xs-dir.gif
57	%%WWWDIR%%/icons/xs-gif.gif
58	%%WWWDIR%%/icons/xs-html.gif
59	%%WWWDIR%%/icons/xs-image.gif
60	%%WWWDIR%%/icons/xs-jpeg.gif
61	%%WWWDIR%%/icons/xs-ps.gif
62	%%WWWDIR%%/icons/xs-tar.gif
63	%%WWWDIR%%/icons/xs-txt.gif
64	%%WWWDIR%%/icons/xs-unknown.gif
65	%%WWWDIR%%/icons/xs-video.gif
66	%%WWWDIR%%/icons/xs-zip.gif
67	man/man1/clearxs.1.gz
68	man/man1/gfxcount.1.gz
69	man/man1/httpd.1.gz
70	man/man1/httpdc.1.gz
71	man/man1/imagemap.1.gz
72	man/man1/readxs.1.gz
73	man/man1/xschpass.1.gz
74	man/man1/xsindex.1.gz
75	man/man1/xspasswd.1.gz
76	man/man5/httpd.conf.5.gz
77	man/man5/xsauth.5.gz
78	man/man5/xsconf.5.gz
79	man/man5/xsredir.5.gz
80	man/man5/xsscripts.5.gz
81	man/man7/httpd_cgi.7.gz
82	man/man7/httpd_ssi.7.gz
83	@dir %%WWWDIR%%/logs
84	@dir %%WWWDIR%%/htdocs