[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apache-httpd-dev
Subject:    Re: [PATCH] apaci permissions
From:       Manoj Kasichainula <manoj () io ! com>
Date:       2000-03-30 23:16:24
[Download RAW message or body]

On Thu, Mar 30, 2000 at 04:16:24PM -0500, Ryan Bloom wrote:
> 
> I'm going to commit this patch, once I review it in more detail.  I was
> holding off on fixing this bug, because it looked like we were going to
> replace this stuff with a header file

Blah, I never sent this out, did I. Patch is attached.

["paths3.diff" (text/plain)]

? src/modules/extra/Makefile
Index: STATUS
===================================================================
RCS file: /home/cvs/apache-2.0/STATUS,v
retrieving revision 1.36
diff -u -d -r1.36 STATUS
--- STATUS	2000/03/21 19:28:56	1.36
+++ STATUS	2000/03/27 09:32:44
@@ -84,14 +84,6 @@
 	modules/mpm/.deps
 	os/.deps
 
-    * apaci permissions problem:
-	cvs checkout apache-2.0
-	cd apache-2.0/src
-	./configure
-	edit some Makefile.in
-	./config.status
-	now apaci is no longer executable and future makes fail
-
     * the top-level configure.in appears to use $USE_MAINTAINER_MODE = yes
 	to set -Wall/etc. flags, and the APR configure.in appears to use
 	--with-debug.  both seem like more of a hardwired pain compaired
Index: src/.cvsignore
===================================================================
RCS file: /home/cvs/apache-2.0/src/.cvsignore,v
retrieving revision 1.4
diff -u -d -r1.4 .cvsignore
--- src/.cvsignore	2000/01/11 13:03:54	1.4
+++ src/.cvsignore	2000/03/27 09:32:44
@@ -38,5 +38,4 @@
 Makefile
 Makefile.config
 modules.c
-apaci
 .apaci.*
Index: src/apaci.in
===================================================================
RCS file: apaci.in
diff -N apaci.in
--- /tmp/cvsM42967	Mon Mar 27 01:32:55 2000
+++ /dev/null	Mon Mar 27 01:32:14 2000
@@ -1,13 +0,0 @@
-#!/bin/sh
-## USED AS A COMMAND LINE EXPANDER TO OVERRIDE PATHS
-## WITHOUT DISTURBING THE KNOWN MAKE BUILD PROCESS DISPLAY
-echo '-DHTTPD_ROOT="@prefix@"'
-echo '-DSUEXEC_BIN="@prefix@/bin/suexec"'
-echo '-DSHARED_CORE_DIR="@prefix@/libexec"'
-echo '-DDEFAULT_PIDLOG="logs/httpd.pid"'
-echo '-DDEFAULT_SCOREBOARD="logs/httpd.scoreboard"'
-echo '-DDEFAULT_LOCKFILE="logs/httpd.lock"'
-echo '-DDEFAULT_XFERLOG="logs/access_log"'
-echo '-DDEFAULT_ERRORLOG="logs/error_log"'
-echo '-DTYPES_CONFIG_FILE="conf/mime.types"'
-echo '-DSERVER_CONFIG_FILE="conf/httpd.conf"'
Index: src/configure.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/configure.in,v
retrieving revision 1.25
diff -u -d -r1.25 configure.in
--- src/configure.in	2000/03/18 11:09:52	1.25
+++ src/configure.in	2000/03/27 09:32:46
@@ -13,9 +13,6 @@
 APACHE_VERSION=$VERSION
 APACHE_SUBST(APACHE_VERSION)
 
-test "$exec_prefix" = "NONE" && exec_prefix='${prefix}'
-test "$prefix" = "NONE" && prefix='/usr/local'
-
 dnl Needed for APACHE_MODULE() to work
 cwd=`pwd`
 
@@ -146,18 +143,33 @@
 if test "$apache_need_shared" = "yes"; then
   $SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir \
--cache-file=./config.cache $srcdir/ltmain.sh  fi
-
-EXTRA_CFLAGS="$EXTRA_CFLAGS \`\$(abs_srcdir)/apaci\`"
 
-APACHE_FAST_OUTPUT(apaci Makefile ap/Makefile lib/Makefile main/Makefile
-           modules/Makefile os/Makefile)
+APACHE_FAST_OUTPUT(Makefile ap/Makefile lib/Makefile main/Makefile
+            modules/Makefile os/Makefile)
 APACHE_FAST_GENERATE
 	
 dnl ## Build modules.c
 rm -f $srcdir/modules.c
 echo $MODLIST | $AWK -f $srcdir/helpers/build-modules-c.awk > $srcdir/modules.c
 
-AC_SUBST(prefix)
+AC_OUTPUT_COMMANDS([
+echo '/* Generated by configure */' > ${path_h}.new
+echo "#define HTTPD_ROOT \"$prefix\"" >> ${path_h}.new
+echo "#define SUEXEC_BIN \"$bindir/suexec\"" >> ${path_h}.new
 
-AC_OUTPUT($APACHE_OUTPUT_FILES apaci)
-chmod 744 apaci
+cmp ${path_h}.new ${path_h} >/dev/null 2>&1
+if test $? -ne 0 ; then
+    rm -f ${path_h} && mv ${path_h}.new ${path_h} && \
+    echo "Updated ${path_h}"
+else
+    rm -f ${path_h}.new && \
+    echo "${path_h} unchanged"
+fi
+],[
+path_h=./include/ap_config_path.h
+prefix=$prefix
+exec_prefix=$exec_prefix
+bindir=$bindir
+])
+
+AC_OUTPUT($APACHE_OUTPUT_FILES)
Index: src/include/.cvsignore
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/.cvsignore,v
retrieving revision 1.2
diff -u -d -r1.2 .cvsignore
--- src/include/.cvsignore	1999/12/24 18:35:06	1.2
+++ src/include/.cvsignore	2000/03/27 09:32:46
@@ -1,2 +1,3 @@
 stamp-h*
 ap_config_auto.h*
+ap_config_path.h
Index: src/include/ap_ac_config.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/ap_ac_config.h,v
retrieving revision 1.9
diff -u -d -r1.9 ap_ac_config.h
--- src/include/ap_ac_config.h	2000/03/10 00:05:50	1.9
+++ src/include/ap_ac_config.h	2000/03/27 09:32:48
@@ -70,6 +70,7 @@
 #include "apr_win.h"
 #else
 #include "ap_config_auto.h"
+#include "ap_config_path.h"
 #include "os.h"
 #include "apr.h"
 #endif /* WIN32 */



[prev in list] [next in list] [prev in thread] [next in thread]