Przeglądaj źródła

remove calculation of relative path in APACI; performed under threat of force only

Ralf S. Engelschall 23 lat temu
rodzic
commit
7b50325ecb
2 zmienionych plików z 20 dodań i 1 usunięć
  1. 17 0
      apache/apache.patch
  2. 3 1
      apache/apache.spec

+ 17 - 0
apache/apache.patch

@@ -0,0 +1,17 @@
+--- apache_1.3.27/configure.orig	Tue May 21 14:24:59 2002
++++ apache_1.3.27/configure	Mon Feb 10 11:08:40 2003
+@@ -1216,10 +1216,10 @@
+ ##   or we cannot support the case where the relative
+ ##   path is just the emtpy one, i.e. ""]
+ ##
+-runtimedir_relative=`echo $runtimedir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'`
+-logfiledir_relative=`echo $logfiledir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'`
+-sysconfdir_relative=`echo $sysconfdir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'`
+-libexecdir_relative=`echo $libexecdir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'`
++runtimedir_relative="$runtimedir/"
++logfiledir_relative="$logfiledir/"
++sysconfdir_relative="$sysconfdir/"
++libexecdir_relative="$libexecdir/"
+ 
+ ##
+ ##  check and debug

+ 3 - 1
apache/apache.spec

@@ -60,7 +60,7 @@ Distribution: OpenPKG [BASE]
 Group:        Web
 License:      ASF
 Version:      %{V_apache}
-Release:      20030207
+Release:      20030210
 
 #   package options (additionally used Apache modules; can be enabled without thinking)
 %option       with_mod_ssl            no
@@ -169,6 +169,7 @@ Source21:     apache.base
 Source22:     apache.vhost
 Source23:     apache.pl
 Source24:     rc.apache
+Patch0:       apache.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -284,6 +285,7 @@ AutoReqProv:  no
 %prep
     #   unpack Apache distribution
     %setup0 -q -c
+    %patch -p0
 
     #   unpack optional extension modules
 %if "%{with_mod_ssl}" == "yes"