summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbeck <beck@openbsd.org>1998-10-01 17:29:04 +0000
committerbeck <beck@openbsd.org>1998-10-01 17:29:04 +0000
commit8fc7fba6898d7283328c999f7d2a2f9162835da8 (patch)
tree1c3943e972e6804d73a87feca2074ff6209660f2
parent1.3.2 Makefile. (diff)
downloadwireguard-openbsd-8fc7fba6898d7283328c999f7d2a2f9162835da8.tar.xz
wireguard-openbsd-8fc7fba6898d7283328c999f7d2a2f9162835da8.zip
Config and wrapper for 1.3.2.
-rw-r--r--usr.sbin/httpd/src/Configuration10
-rw-r--r--usr.sbin/httpd/src/Makefile.bsd-wrapper4
2 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/httpd/src/Configuration b/usr.sbin/httpd/src/Configuration
index 9482f4baa64..48a8dd2bc50 100644
--- a/usr.sbin/httpd/src/Configuration
+++ b/usr.sbin/httpd/src/Configuration
@@ -159,7 +159,7 @@ Rule SHARED_CHAIN=default
Rule SOCKS4=no
Rule SOCKS5=no
Rule IRIXNIS=no
-Rule IRIXN32=yes
+Rule IRIXN32=no
Rule PARANOID=no
# The following rules should be set automatically by Configure. However, if
@@ -178,7 +178,7 @@ Rule PARANOID=no
# out the Rule. The "default" action is "yes" unless overruled
# by OS specifics
-Rule WANTHSREGEX=default
+Rule WANTHSREGEX=no
################################################################
# Module configuration
@@ -288,7 +288,7 @@ AddModule modules/standard/mod_actions.o
## The UserDir module for selecting resource directories by user name
## and a common prefix, e.g., /~<user> , /usr/web/<user> , etc.
-AddModule modules/standard/mod_userdir.o
+# AddModule modules/standard/mod_userdir.o
## The proxy module enables the server to act as a proxy for outside
## http and ftp services. It's not as complete as it could be yet.
@@ -323,8 +323,8 @@ AddModule modules/standard/mod_auth.o
## "gdbm" package if not and possibly adjust EXTRA_LIBS. (This may be
## done by Configure at a later date)
-# AddModule modules/standard/mod_auth_dbm.o
-# AddModule modules/standard/mod_auth_db.o
+AddModule modules/standard/mod_auth_dbm.o
+AddModule modules/standard/mod_auth_db.o
## "digest" implements HTTP Digest Authentication rather than the less
## secure Basic Auth used by the other modules.
diff --git a/usr.sbin/httpd/src/Makefile.bsd-wrapper b/usr.sbin/httpd/src/Makefile.bsd-wrapper
index d49a5fc72e1..3dd71d4f802 100644
--- a/usr.sbin/httpd/src/Makefile.bsd-wrapper
+++ b/usr.sbin/httpd/src/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.4 1998/03/26 18:10:43 deraadt Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.5 1998/10/01 17:29:04 beck Exp $
.include <bsd.own.mk>
PROG=httpd
BINDIR=/usr/sbin
@@ -12,7 +12,7 @@ all: Makefile
.FORCE: .IGNORE
helpers/GuessOS:
- lndir -e Makefile.bsd-wrapper -e obj ${.CURDIR} ${.OBJDIR}
+ lndir -e Makefile.bsd-wrapper -e obj ${.CURDIR} ${.OBJDIR}; touch ${.OBJDIR}/Configuration
config: .FORCE
sh ${.CURDIR}/Configure -file ${.CURDIR}/Configuration -make ${.CURDIR}/Makefile.tmpl