Attachment 158542 Details for Bug 198705 – Updated httpd with alternative name to avoid Apache conflicts

Updated httpd with alternative name to avoid Apache conflicts

new-httpd.txt (text/plain), 3.21 KB, created by Jesse Smith on 2015-07-08 20:02:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jesse Smith

Created: 2015-07-08 20:02:29 UTC

Size: 3.21 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	httpd
>#	httpd/distinfo
>#	httpd/Makefile
>#	httpd/files
>#	httpd/files/patch-Makefile
>#	httpd/files/httpd.in
>#	httpd/pkg-descr
>#
>echo c - httpd
>mkdir -p httpd > /dev/null 2>&1
>echo x - httpd/distinfo
>sed 's/^X//' >httpd/distinfo << 'a42585453d7025bd9cf74d2154a6a2de'
>XSHA256 (koue-httpd-5.6.20150209_GH0.tar.gz) = 09b43adfccd5b4d3e218ad00f032fe303e1fdacc99ba872787929428e7886625
>XSIZE (koue-httpd-5.6.20150209_GH0.tar.gz) = 119099
>a42585453d7025bd9cf74d2154a6a2de
>echo x - httpd/Makefile
>sed 's/^X//' >httpd/Makefile << 'f7f951c907c3eba000eee8c712995b38'
>X# $FreeBSD$
>X
>XPORTNAME=	httpd
>XPORTVERSION=	5.6.20150209
>XCATEGORIES=	www
>XMASTER_SITES=	GH
>X
>XMAINTAINER=	koue@chaosophia.net
>XCOMMENT=	The OpenBSD http server
>X
>XLICENSE=	BSD3CLAUSE
>X
>XGH_ACCOUNT=	koue
>XGH_COMMIT=	4609b8c
>X
>XWRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src/usr.sbin/${PORTNAME}
>X
>XUSE_GITHUB=	yes
>XUSE_OPENSSL=	yes
>XUSE_RC_SUBR=	httpd
>X
>XWITH_OPENSSL_PORT=yes
>XOPENSSL_PORT=	security/libressl
>X
>XCFLAGS+=	-Wall
>X
>XMAKE_ARGS+=	BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man
>X
>XUSERS=		www
>XGROUPS=		www
>X
>XPLIST_FILES=	man/man5/openbsd-httpd.conf.5.gz man/man8/openbsd-httpd.8.gz sbin/openbsd-httpd 
>X
>Xpost-patch:
>X	${MV} ${WRKSRC}/${PORTNAME}.8 ${WRKSRC}/openbsd-${PORTNAME}.8
>X	${MV} ${WRKSRC}/${PORTNAME}.conf.5 ${WRKSRC}/openbsd-${PORTNAME}.conf.5
>X
>X
>X.include <bsd.port.mk>
>f7f951c907c3eba000eee8c712995b38
>echo c - httpd/files
>mkdir -p httpd/files > /dev/null 2>&1
>echo x - httpd/files/patch-Makefile
>sed 's/^X//' >httpd/files/patch-Makefile << 'c768583e632f5fa38f2243b68885b83c'
>X--- Makefile.orig	2015-07-08 19:45:57 UTC
>X+++ Makefile
>X@@ -1,6 +1,6 @@
>X #	$OpenBSD: Makefile,v 1.26 2014/10/31 13:49:52 jsing Exp $
>X 
>X-PROG=		httpd
>X+PROG=		openbsd-httpd
>X SRCS=		parse.y
>X SRCS+=		config.c control.c httpd.c log.c logger.c proc.c
>X SRCS+=		server.c server_http.c server_file.c server_fcgi.c
>X@@ -33,7 +33,7 @@ SRCS+=  buffer.c \
>X         select.c \
>X         signal.c
>X 
>X-MAN=		httpd.8 httpd.conf.5
>X+MAN=		openbsd-httpd.8 openbsd-httpd.conf.5
>X 
>X LDADD=		${LIBEVENT} ${LIBTLS} -lssl -lcrypto -lutil -lcrypt
>X DPADD=		${LIBEVENT} ${LIBTLS} ${LIBSSL} ${LIBCRYPTO} ${LIBUTIL}
>c768583e632f5fa38f2243b68885b83c
>echo x - httpd/files/httpd.in
>sed 's/^X//' >httpd/files/httpd.in << '8747fff5d349bd778535354492091e65'
>X#!/bin/sh
>X#
>X# $FreeBSD$
>X#
>X# PROVIDE: httpd
>X# REQUIRE: DAEMON
>X# BEFORE:  LOGIN
>X# KEYWORD: shutdown
>X
>X# Add the following lines to /etc/rc.conf to enable httpd:
>X# httpd_enable="YES"
>X# httpd_flags="<set as needed>"
>X
>X. /etc/rc.subr
>X
>Xname=httpd
>Xrcvar=httpd_enable
>X
>Xcommand="%%PREFIX%%/sbin/openbsd-httpd"
>X
>Xhttpd_enable=${httpd_enable:-"NO"}
>Xhttpd_flags=${httpd_flags:-"-c %%PREFIX%%/etc/openbsd-httpd.conf"}
>X
>Xload_rc_config $name
>Xrun_rc_command "$1"
>8747fff5d349bd778535354492091e65
>echo x - httpd/pkg-descr
>sed 's/^X//' >httpd/pkg-descr << '72fd6a3c26d909c9ff5107fa2383aac5'
>XThis is the FreeBSD port of the OpenBSD http server.
>X
>XWWW: https://github.com/koue/httpd
>72fd6a3c26d909c9ff5107fa2383aac5
>exit
>

Actions: View

Attachments on bug 198705: 154513 | 158542 | 163606