Attachment 136527 Details for Bug 181767 – bozohttpd-20130711.patch

[patch] bozohttpd-20130711.patch

bozohttpd-20130711.patch (text/plain), 3.80 KB, created by Janos Mohacsi on 2013-09-03 00:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Janos Mohacsi

Created: 2013-09-03 00:20:00 UTC

Size: 3.80 KB

patch

obsolete

>diff -ruN ../bozohttpd.orig/Makefile ./Makefile
>--- ../bozohttpd.orig/Makefile	2013-09-03 00:00:59.000000000 +0200
>+++ ./Makefile	2013-09-03 00:03:25.000000000 +0200
>@@ -2,7 +2,7 @@
> # $FreeBSD: ports/www/bozohttpd/Makefile,v 1.24 2013/01/09 20:05:15 svnexp Exp $
> 
> PORTNAME=	bozohttpd
>-PORTVERSION=	20100920
>+PORTVERSION=	20130711
> CATEGORIES=	www ipv6
> MASTER_SITES=	http://www.eterna.com.au/bozohttpd/ \
> 		${MASTER_SITE_NETBSD}
>diff -ruN ../bozohttpd.orig/distinfo ./distinfo
>--- ../bozohttpd.orig/distinfo	2013-09-03 00:00:59.000000000 +0200
>+++ ./distinfo	2013-09-03 00:08:29.000000000 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (bozohttpd-20100920.tar.bz2) = 9bdac5c171d1cd703ecd98dcd55d6571b4eece3b50c3dc8a399358ff3908fe13
>-SIZE (bozohttpd-20100920.tar.bz2) = 46550
>+SHA256 (bozohttpd-20130711.tar.bz2) = b9682e37ae2c4a1b7309225e95787df8c037239fe1d8c9dd8faede35921e910b
>+SIZE (bozohttpd-20130711.tar.bz2) = 48974
>diff -ruN ../bozohttpd.orig/files/patch-Makefile ./files/patch-Makefile
>--- ../bozohttpd.orig/files/patch-Makefile	2013-09-03 00:00:59.000000000 +0200
>+++ ./files/patch-Makefile	2013-09-03 01:11:41.000000000 +0200
>@@ -1,16 +1,56 @@
> 
>-$FreeBSD: ports/www/bozohttpd/files/patch-Makefile,v 1.4 2012/11/17 06:02:29 svnexp Exp $
>+$FreeBSD$
> 
> --- Makefile.orig
> +++ Makefile
>-@@ -23,6 +23,10 @@
>+@@ -19,30 +19,34 @@
>+ #   % make COPTS="-DDO_HTPASSWD"
>+ 
>+ COPTS+=	-DDO_HTPASSWD
>+-PROG=	httpd
>+-MAN=	httpd.8
>+-BUILDSYMLINKS+=bozohttpd.8 httpd.8
>++PROG=	bozohttpd
>++MAN=	bozohttpd.8
>++#BUILDSYMLINKS+=bozohttpd.8
>+ SRCS=	bozohttpd.c ssl-bozo.c auth-bozo.c cgi-bozo.c daemon-bozo.c \
>+ 	tilde-luzah-bozo.c dir-index-bozo.c content-bozo.c
>  SRCS+=	main.c
>  
>+-LDADD=	-lcrypt
>++LDADD=	-lcrypt -lcrypto -lssl
>+ DPADD=	${LIBCRYPT}
>+ 
>  WARNS?=	4
> +NO_WERROR=1
> + 
> +BINDIR=$(PREFIX)/libexec
> +MANDIR=$(PREFIX)/man/man
>  
>- check:
>- 	cd $(.CURDIR)/testsuite && $(MAKE) check
>+-.include <bsd.own.mk>
>+-
>+-.if ${MKCRYPTO} != "no"
>+-
>+-LDADD+=	-lssl -lcrypto
>+-DPADD+=	${LIBSSL} ${LIBCRYPTO}
>+-
>+-.else
>+-
>+-COPTS+=	-DNO_SSL_SUPPORT
>+-
>+-.endif
>++#.include <bsd.own.mk>
>++#
>++#.if ${PORT_OPTIONS:MSSL}
>++#
>++#LDADD+=	-lssl -lcrypto
>++#DPADD+=	${LIBSSL} ${LIBCRYPTO}
>++#
>++#.else
>++#
>++#COPTS+=	-DNO_SSL_SUPPORT
>++#
>++#.endif
>+ 
>+ #
>+ # Build release things.
>diff -ruN ../bozohttpd.orig/files/patch-bozohttpd.8 ./files/patch-bozohttpd.8
>--- ../bozohttpd.orig/files/patch-bozohttpd.8	2013-09-03 00:00:59.000000000 +0200
>+++ ./files/patch-bozohttpd.8	2013-09-03 00:13:29.000000000 +0200
>@@ -1,25 +1,25 @@
> 
>-$FreeBSD: ports/www/bozohttpd/files/patch-bozohttpd.8,v 1.4 2012/11/17 06:02:29 svnexp Exp $
>+$FreeBSD$
> 
> --- bozohttpd.8.orig
> +++ bozohttpd.8
>-@@ -284,8 +284,8 @@
>+@@ -316,8 +316,8 @@
>  .Xr inetd.conf 5
>  entry would be:
>  .Bd -literal
>--http stream tcp  nowait:600 httpd /usr/pkg/libexec/bozohttpd bozohttpd /var/www
>--http stream tcp6 nowait:600 httpd /usr/pkg/libexec/bozohttpd bozohttpd /var/www
>-+http stream tcp  nowait:600 httpd @@PREFIX@@/libexec/bozohttpd bozohttpd /var/www
>-+http stream tcp6 nowait:600 httpd @@PREFIX@@/libexec/bozohttpd bozohttpd /var/www
>+-http stream tcp  nowait:600 _httpd /usr/libexec/httpd httpd /var/www
>+-http stream tcp6 nowait:600 _httpd /usr/libexec/httpd httpd /var/www
>++http stream tcp  nowait:600 _httpd @@PREFIX@@/libexec/httpd httpd /var/www
>++http stream tcp6 nowait:600 _httpd @@PREFIX@@/libexec/httpd httpd /var/www
>  .Ed
>  .Pp
>  This would serve web pages from
>-@@ -308,7 +308,7 @@
>+@@ -447,7 +447,7 @@
>  .Xr inetd.conf 5
>  entry like:
>  .Bd -literal
>--http stream tcp  nowait:600 httpd /usr/pkg/libexec/bozohttpd bozohttpd -v /var/vroot /var/www
>-+http stream tcp  nowait:600 httpd @@PREFIX@@/libexec/bozohttpd bozohttpd -v /var/vroot /var/www
>+-http stream tcp  nowait:600 _httpd /usr/libexec/httpd httpd -v /var/vroot /var/www
>++http stream tcp  nowait:600 _httpd @@PREFIX@@/libexec/httpd httpd -v /var/vroot /var/www
>  .Ed
>  .Pp
>  and inside

Actions: View | Diff

Attachments on bug 181767: 136527