remove, nothing uses it any more

This commit is contained in:
sthen 2016-04-28 18:19:47 +00:00
parent 6772492fc9
commit cb95a82248
9 changed files with 1 additions and 412 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.779 2016/04/28 17:43:23 sthen Exp $
# $OpenBSD: Makefile,v 1.780 2016/04/28 18:19:47 sthen Exp $
SUBDIR =
SUBDIR += ajaxterm
@ -8,7 +8,6 @@
SUBDIR += ap2-mod_perl
SUBDIR += ap2-mod_wsgi
SUBDIR += apache-httpd
SUBDIR += apache-httpd-openbsd
SUBDIR += aria2
SUBDIR += arora
SUBDIR += asql

View File

@ -1,35 +0,0 @@
# $OpenBSD: Makefile,v 1.13 2016/03/27 20:53:15 naddy Exp $
COMMENT= OpenBSD improved and secured version of Apache 1.3
DISTNAME= apache-httpd-openbsd-1.3.20140502
REVISION= 7
CATEGORIES= www
HOMEPAGE= https://github.com/fobser/apache-httpd-openbsd
# Apache 1.1
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += c crypto m pthread ssl
MASTER_SITES= http://sha256.net/apache-httpd-openbsd/
NO_TEST= Yes
MAKE_FILE= Makefile.bsd-wrapper
MAKE_FLAGS= MANDIR=${PREFIX}/man/man
RUN_DEPENDS= www/apache-httpd,-common
do-configure:
@${SUBST_CMD} ${WRKSRC}/config.layout ${WRKSRC}/Makefile.bsd-wrapper
post-install:
.for i in httpd.conf mime.types magic
mv ${WRKINST}/var/www/conf/$i{,.default}
.endfor
# remove conflicts with www/apache-httpd
rm -rf ${WRKINST}/var/www/{cgi-bin,icons}
.include <bsd.port.mk>

View File

@ -1,2 +0,0 @@
SHA256 (apache-httpd-openbsd-1.3.20140502.tar.gz) = TMW7aQD03pGVxArnxFonoyIMmjuWzLItPtPqFz5pBNU=
SIZE (apache-httpd-openbsd-1.3.20140502.tar.gz) = 2007407

View File

@ -1,36 +0,0 @@
$OpenBSD: patch-Makefile_bsd-wrapper,v 1.2 2014/09/17 09:04:38 sthen Exp $
Last hunk: patch to install CGIs as mode 700, so that pkg_create run as
non-root is able to add them to the package. They are still installed with
mode 000 by pkg_add because the PLIST has an "@mode 000" marker.
--- Makefile.bsd-wrapper.orig Thu Mar 13 01:50:02 2014
+++ Makefile.bsd-wrapper Thu Mar 13 01:52:23 2014
@@ -28,15 +28,15 @@ LNDIR= /usr/bin/lndir
# proxycachedir: $prefix/proxy
#</Layout>
-HTTPD_EXEC_PREFIX= TRUEPREFIX
+HTTPD_EXEC_PREFIX= ${TRUEPREFIX}
HTTPD_BINDIR= ${HTTPD_EXEC_PREFIX}/bin
HTTPD_SBINDIR= ${HTTPD_EXEC_PREFIX}/sbin
HTTPD_LIBEXECDIR= ${HTTPD_EXEC_PREFIX}/lib/apache/modules
HTTPD_SYSCONFDIR= ${HTTPD_PREFIX}/conf
HTTPD_ICONSDIR= ${HTTPD_PREFIX}/icons
HTTPD_HTDOCSDIR= ${HTTPD_PREFIX}/htdocs
-HTTPD_MANUALDIR= ${HTTPD_EXEC_PREFIX}/share/apache-httpd-openbsd/doc/
-HTTPD_PREFIX= ${HTTPD_EXEC_PREFIX}/share/apache-httpd-openbsd/www
+HTTPD_MANUALDIR= ${HTTPD_EXEC_PREFIX}/share/doc/apache-httpd-openbsd
+HTTPD_PREFIX= /var/www
HTTPD_INCLUDEDIR= ${HTTPD_EXEC_PREFIX}/lib/apache/include
HTTPD_RUNDIR= ${HTTPD_PREFIX}/logs
HTTPD_LOGDIR= ${HTTPD_PREFIX}/logs
@@ -767,7 +767,7 @@ distribution:
j=`dirname $$i`; \
${INSTALL} -d -g ${BINGRP} -m 755 ${DESTDIR}${HTTPD_PREFIX}/$$j/; \
echo "Installing ${DESTDIR}${HTTPD_PREFIX}/$$i"; \
- ${INSTALL} ${INSTALL_COPY} -g ${BINGRP} -m 000 \
+ ${INSTALL} ${INSTALL_COPY} -g ${BINGRP} -m 700 \
${.OBJDIR}/$$i ${DESTDIR}${HTTPD_PREFIX}/$$j/; \
done
@-for i in ${ICONFILES}; do \

View File

@ -1,23 +0,0 @@
$OpenBSD: patch-config_layout,v 1.1.1.1 2014/03/13 17:28:04 sthen Exp $
--- config.layout.orig Thu Mar 13 01:44:51 2014
+++ config.layout Thu Mar 13 01:47:10 2014
@@ -265,16 +265,16 @@
# OpenBSD Layout
<Layout OpenBSD>
prefix: /var/www
- exec_prefix: TRUEPREFIX
+ exec_prefix: ${TRUEPREFIX}
bindir: $exec_prefix/bin
sbindir: $exec_prefix/sbin
libexecdir: $exec_prefix/lib/apache/modules
- mandir: $exec_prefix/share/man
+ mandir: $exec_prefix/man
sysconfdir: $prefix/conf
datadir: $prefix
iconsdir: $prefix/icons
htdocsdir: $prefix/htdocs
- manualdir: $exec_prefix/share/doc/html/httpd
+ manualdir: $exec_prefix/share/doc/apache-httpd-openbsd
cgidir: $prefix/cgi-bin
includedir: $exec_prefix/lib/apache/include
localstatedir: $prefix

View File

@ -1,23 +0,0 @@
$OpenBSD: patch-src_support_apachectl,v 1.1 2014/07/16 14:41:20 sthen Exp $
--- src/support/apachectl.orig Wed Jul 16 15:30:14 2014
+++ src/support/apachectl Wed Jul 16 15:30:43 2014
@@ -30,7 +30,7 @@ HTTPD='/usr/local/apache/src/httpd'
# a command that outputs a formatted text version of the HTML at the
# url given on the command line. Designed for lynx, however other
# programs may work.
-LYNX="lynx -dump"
+LYNX="dump_html"
#
# the URL to your server's mod_status status page. If you do not
# have one, then status and fullstatus will not work.
@@ -38,6 +38,10 @@ STATUSURL="http://localhost/server-status"
#
# -------------------- --------------------
# |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
+
+dump_html() {
+ ftp -Vo- "$1" | sed 's,<[^>]*>,,g'
+}
ERROR=0
ARGV="$@"

View File

@ -1,2 +0,0 @@
OpenBSD improved and secured version of Apache 1.3, with SSL/TLS and
DSO support.

View File

@ -1,278 +0,0 @@
@comment $OpenBSD: PLIST,v 1.6 2016/03/27 20:53:15 naddy Exp $
bin/dbmmanage
@bin bin/htdigest
@bin bin/htpasswd
lib/apache/
lib/apache/include/
lib/apache/include/ap.h
lib/apache/include/ap_alloc.h
lib/apache/include/ap_compat.h
lib/apache/include/ap_config.h
lib/apache/include/ap_config_auto.h
lib/apache/include/ap_ctx.h
lib/apache/include/ap_ctype.h
lib/apache/include/ap_hook.h
lib/apache/include/ap_md5.h
lib/apache/include/ap_mm.h
lib/apache/include/ap_mmn.h
lib/apache/include/ap_sha1.h
lib/apache/include/buff.h
lib/apache/include/compat.h
lib/apache/include/conf.h
lib/apache/include/explain.h
lib/apache/include/fdcache.h
lib/apache/include/fnmatch.h
lib/apache/include/http_conf_globals.h
lib/apache/include/http_config.h
lib/apache/include/http_core.h
lib/apache/include/http_log.h
lib/apache/include/http_main.h
lib/apache/include/http_protocol.h
lib/apache/include/http_request.h
lib/apache/include/http_vhost.h
lib/apache/include/httpd.h
lib/apache/include/mod_ssl.h
lib/apache/include/multithread.h
lib/apache/include/os-inline.c
lib/apache/include/os.h
lib/apache/include/rfc1413.h
lib/apache/include/scoreboard.h
lib/apache/include/ssl_expr.h
lib/apache/include/ssl_util_ssl.h
lib/apache/include/ssl_util_table.h
lib/apache/include/util_date.h
lib/apache/include/util_md5.h
lib/apache/include/util_script.h
lib/apache/include/util_uri.h
lib/apache/include/xml/
lib/apache/include/xml/asciitab.h
lib/apache/include/xml/hashtable.h
lib/apache/include/xml/iasciitab.h
lib/apache/include/xml/latin1tab.h
lib/apache/include/xml/nametab.h
lib/apache/include/xml/utf8tab.h
lib/apache/include/xml/xmldef.h
lib/apache/include/xml/xmlparse.h
lib/apache/include/xml/xmlrole.h
lib/apache/include/xml/xmltok.h
lib/apache/include/xml/xmltok_impl.h
lib/apache/modules/
lib/apache/modules/libproxy.so
lib/apache/modules/mod_auth_anon.so
lib/apache/modules/mod_auth_db.so
lib/apache/modules/mod_auth_dbm.so
lib/apache/modules/mod_auth_digest.so
lib/apache/modules/mod_cern_meta.so
lib/apache/modules/mod_define.so
lib/apache/modules/mod_digest.so
lib/apache/modules/mod_expires.so
lib/apache/modules/mod_headers.so
lib/apache/modules/mod_info.so
lib/apache/modules/mod_log_agent.so
lib/apache/modules/mod_log_referer.so
lib/apache/modules/mod_mime_magic.so
lib/apache/modules/mod_mmap_static.so
lib/apache/modules/mod_rewrite.so
lib/apache/modules/mod_speling.so
lib/apache/modules/mod_unique_id.so
lib/apache/modules/mod_usertrack.so
lib/apache/modules/mod_vhost_alias.so
@man man/man1/dbmmanage.1
@man man/man1/htdigest.1
@man man/man1/htpasswd.1
@man man/man8/apachectl.8
@man man/man8/apxs.8
@man man/man8/httpd.8
@man man/man8/logresolve.8
@man man/man8/rotatelogs.8
@man man/man8/suexec.8
sbin/apachectl
sbin/apxs
@bin sbin/httpd
@bin sbin/logresolve
@bin sbin/rotatelogs
@bin sbin/suexec
share/doc/apache-httpd-openbsd/
share/doc/apache-httpd-openbsd/LICENSE
share/doc/apache-httpd-openbsd/bind.html
share/doc/apache-httpd-openbsd/configuring.html
share/doc/apache-httpd-openbsd/content-negotiation.html
share/doc/apache-httpd-openbsd/custom-error.html
share/doc/apache-httpd-openbsd/dns-caveats.html
share/doc/apache-httpd-openbsd/dso.html
share/doc/apache-httpd-openbsd/env.html
share/doc/apache-httpd-openbsd/handler.html
share/doc/apache-httpd-openbsd/howto/
share/doc/apache-httpd-openbsd/howto/auth.html
share/doc/apache-httpd-openbsd/howto/cgi.html
share/doc/apache-httpd-openbsd/howto/htaccess.html
share/doc/apache-httpd-openbsd/howto/ssi.html
share/doc/apache-httpd-openbsd/images/
share/doc/apache-httpd-openbsd/images/apache_header.gif
share/doc/apache-httpd-openbsd/images/apache_pb.gif
share/doc/apache-httpd-openbsd/images/custom_errordocs.gif
share/doc/apache-httpd-openbsd/images/feather.jpg
share/doc/apache-httpd-openbsd/images/home.gif
share/doc/apache-httpd-openbsd/images/index.gif
share/doc/apache-httpd-openbsd/images/mod_rewrite_fig1.fig
share/doc/apache-httpd-openbsd/images/mod_rewrite_fig1.gif
share/doc/apache-httpd-openbsd/images/mod_rewrite_fig2.fig
share/doc/apache-httpd-openbsd/images/mod_rewrite_fig2.gif
share/doc/apache-httpd-openbsd/images/mod_ssl_sb.gif
share/doc/apache-httpd-openbsd/images/openssl_ics.gif
share/doc/apache-httpd-openbsd/images/pixel.gif
share/doc/apache-httpd-openbsd/images/sub.gif
share/doc/apache-httpd-openbsd/index.html
share/doc/apache-httpd-openbsd/invoking.html
share/doc/apache-httpd-openbsd/ipv6.html
share/doc/apache-httpd-openbsd/keepalive.html
share/doc/apache-httpd-openbsd/location.html
share/doc/apache-httpd-openbsd/logs.html
share/doc/apache-httpd-openbsd/misc/
share/doc/apache-httpd-openbsd/misc/API.html
share/doc/apache-httpd-openbsd/misc/FAQ.html
share/doc/apache-httpd-openbsd/misc/custom_errordocs.html
share/doc/apache-httpd-openbsd/misc/descriptors.html
share/doc/apache-httpd-openbsd/misc/fin_wait_2.html
share/doc/apache-httpd-openbsd/misc/howto.html
share/doc/apache-httpd-openbsd/misc/index.html
share/doc/apache-httpd-openbsd/misc/known_client_problems.html
share/doc/apache-httpd-openbsd/misc/perf-bsd44.html
share/doc/apache-httpd-openbsd/misc/perf-tuning.html
share/doc/apache-httpd-openbsd/misc/perf.html
share/doc/apache-httpd-openbsd/misc/rewriteguide.html
share/doc/apache-httpd-openbsd/misc/security_tips.html
share/doc/apache-httpd-openbsd/misc/tutorials.html
share/doc/apache-httpd-openbsd/mod/
share/doc/apache-httpd-openbsd/mod/core.html
share/doc/apache-httpd-openbsd/mod/directive-dict.html
share/doc/apache-httpd-openbsd/mod/directives.html
share/doc/apache-httpd-openbsd/mod/index-bytype.html
share/doc/apache-httpd-openbsd/mod/index.html
share/doc/apache-httpd-openbsd/mod/mod_access.html
share/doc/apache-httpd-openbsd/mod/mod_actions.html
share/doc/apache-httpd-openbsd/mod/mod_alias.html
share/doc/apache-httpd-openbsd/mod/mod_asis.html
share/doc/apache-httpd-openbsd/mod/mod_auth.html
share/doc/apache-httpd-openbsd/mod/mod_auth_anon.html
share/doc/apache-httpd-openbsd/mod/mod_auth_db.html
share/doc/apache-httpd-openbsd/mod/mod_auth_dbm.html
share/doc/apache-httpd-openbsd/mod/mod_auth_digest.html
share/doc/apache-httpd-openbsd/mod/mod_autoindex.html
share/doc/apache-httpd-openbsd/mod/mod_cern_meta.html
share/doc/apache-httpd-openbsd/mod/mod_cgi.html
share/doc/apache-httpd-openbsd/mod/mod_define.html
share/doc/apache-httpd-openbsd/mod/mod_digest.html
share/doc/apache-httpd-openbsd/mod/mod_dir.html
share/doc/apache-httpd-openbsd/mod/mod_env.html
share/doc/apache-httpd-openbsd/mod/mod_expires.html
share/doc/apache-httpd-openbsd/mod/mod_headers.html
share/doc/apache-httpd-openbsd/mod/mod_imap.html
share/doc/apache-httpd-openbsd/mod/mod_include.html
share/doc/apache-httpd-openbsd/mod/mod_info.html
share/doc/apache-httpd-openbsd/mod/mod_log_agent.html
share/doc/apache-httpd-openbsd/mod/mod_log_common.html
share/doc/apache-httpd-openbsd/mod/mod_log_config.html
share/doc/apache-httpd-openbsd/mod/mod_log_referer.html
share/doc/apache-httpd-openbsd/mod/mod_mime.html
share/doc/apache-httpd-openbsd/mod/mod_mime_magic.html
share/doc/apache-httpd-openbsd/mod/mod_mmap_static.html
share/doc/apache-httpd-openbsd/mod/mod_negotiation.html
share/doc/apache-httpd-openbsd/mod/mod_proxy.html
share/doc/apache-httpd-openbsd/mod/mod_rewrite.html
share/doc/apache-httpd-openbsd/mod/mod_setenvif.html
share/doc/apache-httpd-openbsd/mod/mod_so.html
share/doc/apache-httpd-openbsd/mod/mod_speling.html
share/doc/apache-httpd-openbsd/mod/mod_ssl/
share/doc/apache-httpd-openbsd/mod/mod_ssl/index.html
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_compat.gfont000.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_compat.html
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_cover_logo.jpg
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_cover_title.jpg
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_faq.gfont000.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_faq.html
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_glossary.html
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_howto.gfont000.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_howto.html
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_intro.gfont000.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_intro.html
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_intro_fig1.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_intro_fig2.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_intro_fig3.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_overview.gfont000.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_overview.html
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_overview_fig1.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_reference.gfont000.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_reference.html
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_template.head-chapter.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_template.head-num-1.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_template.head-num-2.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_template.head-num-3.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_template.head-num-4.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_template.head-num-5.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_template.head-num-6.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_template.head-num-7.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_template.imgdot-1x1-000000.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_template.imgdot-1x1-transp.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_template.navbut-next-n.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_template.navbut-next-s.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_template.navbut-prev-n.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_template.navbut-prev-s.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_template.title-abstract.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_template.title-compat.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_template.title-faq.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_template.title-gloss.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_template.title-howto.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_template.title-intro.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_template.title-over.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_template.title-preface.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_template.title-ref.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_template.title-toc.gif
share/doc/apache-httpd-openbsd/mod/mod_ssl/ssl_template.title-tutor.gif
share/doc/apache-httpd-openbsd/mod/mod_status.html
share/doc/apache-httpd-openbsd/mod/mod_unique_id.html
share/doc/apache-httpd-openbsd/mod/mod_userdir.html
share/doc/apache-httpd-openbsd/mod/mod_usertrack.html
share/doc/apache-httpd-openbsd/mod/mod_vhost_alias.html
share/doc/apache-httpd-openbsd/mod/module-dict.html
share/doc/apache-httpd-openbsd/multilogs.html
share/doc/apache-httpd-openbsd/process-model.html
share/doc/apache-httpd-openbsd/programs/
share/doc/apache-httpd-openbsd/programs/ab.html
share/doc/apache-httpd-openbsd/programs/apachectl.html
share/doc/apache-httpd-openbsd/programs/apxs.html
share/doc/apache-httpd-openbsd/programs/dbmmanage.html
share/doc/apache-httpd-openbsd/programs/htdigest.html
share/doc/apache-httpd-openbsd/programs/htpasswd.html
share/doc/apache-httpd-openbsd/programs/httpd.html
share/doc/apache-httpd-openbsd/programs/index.html
share/doc/apache-httpd-openbsd/programs/logresolve.html
share/doc/apache-httpd-openbsd/programs/other.html
share/doc/apache-httpd-openbsd/programs/rotatelogs.html
share/doc/apache-httpd-openbsd/programs/suexec.html
share/doc/apache-httpd-openbsd/sections.html
share/doc/apache-httpd-openbsd/server-wide.html
share/doc/apache-httpd-openbsd/sitemap.html
share/doc/apache-httpd-openbsd/stopping.html
share/doc/apache-httpd-openbsd/suexec.html
share/doc/apache-httpd-openbsd/urlmapping.html
share/doc/apache-httpd-openbsd/vhosts/
share/doc/apache-httpd-openbsd/vhosts/details.html
share/doc/apache-httpd-openbsd/vhosts/examples.html
share/doc/apache-httpd-openbsd/vhosts/fd-limits.html
share/doc/apache-httpd-openbsd/vhosts/host.html
share/doc/apache-httpd-openbsd/vhosts/index.html
share/doc/apache-httpd-openbsd/vhosts/ip-based.html
share/doc/apache-httpd-openbsd/vhosts/mass.html
share/doc/apache-httpd-openbsd/vhosts/name-based.html
share/doc/apache-httpd-openbsd/vhosts/vhosts-in-depth.html
share/doc/apache-httpd-openbsd/vhosts/virtual-host.html
@rcscript ${RCDIR}/apache
@cwd /var/www
conf/httpd.conf.default
@sample conf/httpd.conf
conf/magic.default
@sample conf/magic
conf/mime.types.default
@sample conf/mime.types
conf/modules/

View File

@ -1,11 +0,0 @@
#!/bin/sh
#
# $OpenBSD: apache.rc,v 1.2 2015/07/17 23:58:25 ajacoutot Exp $
daemon="${TRUEPREFIX}/sbin/httpd"
. /etc/rc.d/rc.subr
pexp="httpd: parent.*"
rc_cmd $1