Magellan Linux

Diff of /trunk/extras/apache2/apache2-2.4.3-r1.smage2

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 13913 by niro, Wed Oct 31 11:49:32 2012 UTC revision 13914 by niro, Wed Oct 31 11:55:39 2012 UTC
# Line 39  SRC_URI=( Line 39  SRC_URI=(
39   mirror://${PNAME}/${PNAME}-${PVER}-default-mpm-settings.patch   mirror://${PNAME}/${PNAME}-${PVER}-default-mpm-settings.patch
40   mirror://${PNAME}/${PNAME}-2.2.9-default-dav-settings.patch   mirror://${PNAME}/${PNAME}-2.2.9-default-dav-settings.patch
41   mirror://${PNAME}/${PNAME}-${PVER}-default-ssl-settings.patch   mirror://${PNAME}/${PNAME}-${PVER}-default-ssl-settings.patch
42   mirror://${PNAME}/${PNAME}-${PVER}-default-httpd-config.patch   mirror://${PNAME}/${PNAME}-${PVER}-default-httpd-config-2.patch
43   mirror://${PNAME}/${PNAME}-2.2.4-apxs-httpd-config-2.patch   mirror://${PNAME}/${PNAME}-2.2.4-apxs-httpd-config-2.patch
44   mirror://${PNAME}/${PNAME}-2.2.4-mod_dir-adddirectoryindex.patch   mirror://${PNAME}/${PNAME}-2.2.4-mod_dir-adddirectoryindex.patch
45   mirror://${PNAME}/${PNAME}-${PVER}-mod_systemd.patch   mirror://${PNAME}/${PNAME}-${PVER}-mod_systemd.patch
# Line 86  src_prepare() Line 86  src_prepare()
86   # use modules.d instead of extra directory for addons   # use modules.d instead of extra directory for addons
87   # and renamed the config files without the 'httpd-' prefix   # and renamed the config files without the 'httpd-' prefix
88   # and now load mpm.conf and default.conf   # and now load mpm.conf and default.conf
89   mpatch ${PNAME}-${PVER}-default-httpd-config.patch || die   mpatch ${PNAME}-${PVER}-default-httpd-config-2.patch || die
90    
91   # fixes apxs to not use progname.conf but httpd.conf as httpd config   # fixes apxs to not use progname.conf but httpd.conf as httpd config
92   # and fixes to modules path relative to server root also   # and fixes to modules path relative to server root also
# Line 198  src_install() Line 198  src_install()
198   local i   local i
199   for i in ${BINDIR}/etc/apache2/modules.d/*   for i in ${BINDIR}/etc/apache2/modules.d/*
200   do   do
201   mv ${i} ${i/httpd-/} || die ${i}   if [[ ${i/httpd-/} != ${i} ]]
202     then
203     mv ${i} ${i/httpd-/} || die ${i}
204     fi
205   done   done
206    
207   # prune backup files   # prune backup files

Legend:
Removed from v.13913  
changed lines
  Added in v.13914