From 1d1adb7d2d690ca3a9faf73ad56aec96c0db2395 Mon Sep 17 00:00:00 2001 From: Henning Brauer Date: Thu, 15 Feb 2007 16:51:50 +0000 Subject: get rid of the ConfigStart/End section used by the weird fragile apache configure system. the mod_auth_digest module has such a section, and there (via two other indirections, of course!) -DDEV_RANDOM=/dev/arandom is added to CFLAGS. via a few more bizarre indicrections that ends up in ap_config_auto.h. Since ap_config_auto.h gets installed in /usr/lib/apache/include/ and thus might be used by 3rd party modules, we must be very careful with removing shitz there. But I kinda doubt anything relies on a define that is only there when a module marked as experimental is compiled in. since we long ago made mod_auth_digest use arc4random and do not use said DEV_RANDOM define at all any more, we don't need it ourselves. so nuke the mod_auth_digest ConfigStart/End section, which doesn't do anything else, alltogether. Since mod_auth_digest is only compiled as DSO, the define was missing on static archs, therefore breaking the build on vax an friends since espie put the pregenerated ap_config_auto.h in. ok millert deraadt --- .../src/modules/experimental/mod_auth_digest.c | 36 ---------------------- 1 file changed, 36 deletions(-) diff --git a/usr.sbin/httpd/src/modules/experimental/mod_auth_digest.c b/usr.sbin/httpd/src/modules/experimental/mod_auth_digest.c index c5d2d90bd11..62c267891ed 100644 --- a/usr.sbin/httpd/src/modules/experimental/mod_auth_digest.c +++ b/usr.sbin/httpd/src/modules/experimental/mod_auth_digest.c @@ -95,42 +95,6 @@ * one. Should we add "AuthDigestNcCheck Strict"? */ -/* The section for the Configure script: - * MODULE-DEFINITION-START - * Name: digest_auth_module - * ConfigStart - - RULE_DEV_RANDOM=`sh ./helpers/CutRule DEV_RANDOM $file` - if [ "$RULE_DEV_RANDOM" = "default" ]; then - if [ -r "/dev/random" ]; then - RULE_DEV_RANDOM="/dev/random" - elif [ -r "/dev/urandom" ]; then - RULE_DEV_RANDOM="/dev/urandom" - else - RULE_DEV_RANDOM="truerand" - if sh helpers/TestCompile func randbyte; then - : - elif sh helpers/TestCompile lib rand randbyte; then - : - else - echo " (mod_auth_digest) truerand library missing!" - echo "** This will most probably defeat successful compilation." - echo "** See Rule DEV_RANDOM in src/Configuration.tmpl for more information." - fi - fi - fi - if [ "$RULE_DEV_RANDOM" = "truerand" ]; then - echo " using truerand library (-lrand) for the random seed" - LIBS="$LIBS -L/usr/local/lib -lrand" - else - echo " using $RULE_DEV_RANDOM for the random seed" - CFLAGS="$CFLAGS -DDEV_RANDOM=$RULE_DEV_RANDOM" - fi - - * ConfigEnd - * MODULE-DEFINITION-END - */ - #include "httpd.h" #include "http_config.h" #include "http_conf_globals.h" -- cgit v1.2.3