pool/apache2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 260088 from home:Ledest:misc

Browse Source 
fix bashism in apache2ctl script: replace 'source' with '.'

OBS-URL: https://build.opensuse.org/request/show/260088
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=417
This commit is contained in:
Kristyna Streitova 2014-11-07 15:23:57 +00:00 committed by Git OBS Bridge
parent 5494e05306
commit a751749ac2
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apache2.changes
View File

@ -4,6 +4,11 @@ Fri Oct 31 16:04:15 UTC 2014 - crrodriguez@opensuse.org
- httpd-event-deadlock.patch: Fix worker-listener - httpd-event-deadlock.patch: Fix worker-listener
deadlock in graceful restart. deadlock in graceful restart.
-------------------------------------------------------------------
Sat Oct 18 16:21:00 UTC 2014 - Led <ledest@gmail.com>
- updated httpd-2.4.10-apachectl.patch (fixed bashism)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 16 12:29:06 UTC 2014 - pgajdos@suse.com Thu Oct 16 12:29:06 UTC 2014 - pgajdos@suse.com

2
apache2.spec
View File

@ -150,7 +150,7 @@ Source142: start_apache2
Source143: apache2-systemd-ask-pass Source143: apache2-systemd-ask-pass
Source144: apache2.service Source144: apache2.service
Patch2: httpd-2.1.3alpha-layout.dif Patch2: httpd-2.1.3alpha-layout.dif
Patch23: httpd-2.1.9-apachectl.dif Patch23: httpd-2.4.10-apachectl.patch
#Patch65: httpd-2.0.49-log_server_status.dif #Patch65: httpd-2.0.49-log_server_status.dif
Patch66: httpd-2.0.54-envvars.dif Patch66: httpd-2.0.54-envvars.dif
Patch67: httpd-2.2.0-apxs-a2enmod.dif Patch67: httpd-2.2.0-apxs-a2enmod.dif

7
httpd-2.1.9-apachectl.dif → httpd-2.4.10-apachectl.patch
View File

@ -1,5 +1,6 @@
--- httpd-2.4.6.orig/support/apachectl.in diff -Ndurp httpd-2.4.10/support/apachectl.in httpd-2.4.10-apachectl/support/apachectl.in
+++ httpd-2.4.6/support/apachectl.in --- httpd-2.4.10/support/apachectl.in 2012-02-01 05:47:28.000000000 +0200
+++ httpd-2.4.10-apachectl/support/apachectl.in 2014-10-18 19:18:51.203692588 +0300
@@ -42,17 +42,32 @@ ARGV="$@" @@ -42,17 +42,32 @@ ARGV="$@"
# -------------------- -------------------- # -------------------- --------------------
# #
@ -16,7 +17,7 @@
+sysconfig_apache=/etc/sysconfig/$pname +sysconfig_apache=/etc/sysconfig/$pname
+sysconfdir=/etc/$pname +sysconfdir=/etc/$pname
+ +
+test -s $sysconfig_apache && source $sysconfig_apache +test -s $sysconfig_apache && . $sysconfig_apache
+httpd_conf=${APACHE_HTTPD_CONF:-$sysconfdir/httpd.conf} +httpd_conf=${APACHE_HTTPD_CONF:-$sysconfdir/httpd.conf}
+ +
# #