rpm/apache2
SHA256
1
0
Fork 0
forked from pool/apache2
Code Pull Requests Activity

Accepting request 197316 from Apache

Browse Source 
- Also fix subtle non-obvious systemd unit confusion
  we really mean -DFOREGROUND not -DNO_DETACH the latter only 
  inhibits the parent from forking, not quite the same as 
  running in well.. the foreground as required. (forwarded request 197315 from elvigia)

OBS-URL: https://build.opensuse.org/request/show/197316
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2?expand=0&rev=73
This commit is contained in:
Stephan Kulow 2013-09-04 11:16:53 +00:00 committed by Git OBS Bridge
commit 501f418667
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apache2.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Tue Sep 3 15:37:37 UTC 2013 - crrodriguez@opensuse.org
- Also fix subtle non-obvious systemd unit confusion
we really mean -DFOREGROUND not -DNO_DETACH the latter only
inhibits the parent from forking, not quite the same as
running in well.. the foreground as required.
-------------------------------------------------------------------
Tue Sep 3 03:58:27 UTC 2013 - crrodriguez@opensuse.org
- Ensure we only use /run and not /var/run
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 30 04:48:07 UTC 2013 - crrodriguez@opensuse.org Fri Aug 30 04:48:07 UTC 2013 - crrodriguez@opensuse.org

6
apache2.service
View File

@ -8,9 +8,9 @@ Before=getty@tty1.service
Type=notify Type=notify
PrivateTmp=true PrivateTmp=true
EnvironmentFile=/etc/sysconfig/apache2 EnvironmentFile=/etc/sysconfig/apache2
ExecStart=/usr/sbin/start_apache2 -D SYSTEMD -DNO_DETACH -k start ExecStart=/usr/sbin/start_apache2 -D SYSTEMD -DFOREGROUND -k start
ExecReload=/usr/sbin/start_apache2 -D SYSTEMD -DNO_DETACH -t -k graceful ExecReload=/usr/sbin/start_apache2 -D SYSTEMD -DFOREGROUND -t -k graceful
ExecStop=/usr/sbin/start_apache2 -D SYSTEMD -DNO_DETACH -k graceful-stop ExecStop=/usr/sbin/start_apache2 -D SYSTEMD -DFOREGROUND -k graceful-stop
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

6
apache2.spec
View File

@ -69,7 +69,11 @@ BuildRequires: expat-devel
%define localstatedir /var/lib/%{pname} %define localstatedir /var/lib/%{pname}
%define proxycachedir /var/cache/%{pname} %define proxycachedir /var/cache/%{pname}
%define logfiledir /var/log/%{pname} %define logfiledir /var/log/%{pname}
%if %suse_version > 1220
%define runtimedir /run
%else
%define runtimedir /var/run %define runtimedir /var/run
%endif
%define sysconfdir /etc/%{pname} %define sysconfdir /etc/%{pname}
%define includedir %{_includedir}/%{pname} %define includedir %{_includedir}/%{pname}
%define libexecdir %_libdir/%{pname} %define libexecdir %_libdir/%{pname}
@ -500,10 +504,10 @@ for mpm in %{mpms_to_build}; do
configure configure
sed "s/%{vers}-$mpm//" include/ap_config_auto.h > include/ap_config_auto.h.new sed "s/%{vers}-$mpm//" include/ap_config_auto.h > include/ap_config_auto.h.new
mv include/ap_config_auto.h.new include/ap_config_auto.h mv include/ap_config_auto.h.new include/ap_config_auto.h
sed -i -e "s@/var/run@%{runtimedir}@g" include/ap_config_layout.h
make CFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden -fPIC \ make CFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden -fPIC \
-Wall \ -Wall \
-DDEFAULT_PIDLOG='\"%{runtimedir}/%{httpd}.pid\"' \
-DDEFAULT_ERRORLOG='\"%{logfiledir}/error_log\"' " \ -DDEFAULT_ERRORLOG='\"%{logfiledir}/error_log\"' " \
%{?jobs:-j%jobs} %{?jobs:-j%jobs}