Browse code
Update build configure for httpd
Change-Id: Ica5e5a1edc08e865c03a9c7ff0dab56f8b0e3d44
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/6843
Tested-by: michellew <michellew@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
michellew-vmware authored on 2019/03/09 08:07:18Showing 1 changed files
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: The Apache HTTP Server |
| 2 | 2 |
Name: httpd |
| 3 | 3 |
Version: 2.4.34 |
| 4 |
-Release: 2%{?dist}
|
|
| 4 |
+Release: 3%{?dist}
|
|
| 5 | 5 |
License: Apache License 2.0 |
| 6 | 6 |
URL: http://httpd.apache.org/ |
| 7 | 7 |
Group: Applications/System |
| ... | ... |
@@ -64,8 +64,6 @@ The httpd-tools of httpd. |
| 64 | 64 |
|
| 65 | 65 |
%build |
| 66 | 66 |
%configure \ |
| 67 |
- --prefix=%{_sysconfdir}/httpd \
|
|
| 68 |
- --exec-prefix=%{_prefix} \
|
|
| 69 | 67 |
--sysconfdir=%{_confdir}/httpd/conf \
|
| 70 | 68 |
--libexecdir=%{_libdir}/httpd/modules \
|
| 71 | 69 |
--datadir=%{_sysconfdir}/httpd \
|
| ... | ... |
@@ -73,14 +71,13 @@ The httpd-tools of httpd. |
| 73 | 73 |
--enable-mods-shared="all cgi" \ |
| 74 | 74 |
--enable-mpms-shared=all \ |
| 75 | 75 |
--with-apr=%{_prefix} \
|
| 76 |
- --with-apr-util=%{_prefix}
|
|
| 77 |
- |
|
| 76 |
+ --with-apr-util=%{_prefix} \
|
|
| 77 |
+ --enable-layout=RPM |
|
| 78 | 78 |
make %{?_smp_mflags}
|
| 79 | 79 |
|
| 80 | 80 |
%install |
| 81 | 81 |
make DESTDIR=%{buildroot} install
|
| 82 | 82 |
install -vdm755 %{buildroot}/usr/lib/systemd/system
|
| 83 |
-install -vdm755 %{buildroot}/etc/httpd/logs
|
|
| 84 | 83 |
|
| 85 | 84 |
cat << EOF >> %{buildroot}/usr/lib/systemd/system/httpd.service
|
| 86 | 85 |
[Unit] |
| ... | ... |
@@ -161,7 +158,7 @@ fi |
| 161 | 161 |
%exclude %{_bindir}/dbmmanage
|
| 162 | 162 |
%{_sbindir}/*
|
| 163 | 163 |
%{_datadir}/*
|
| 164 |
-%{_sysconfdir}/httpd/build/*
|
|
| 164 |
+%{_sysconfdir}/httpd/html/index.html
|
|
| 165 | 165 |
%{_sysconfdir}/httpd/cgi-bin/*
|
| 166 | 166 |
%{_sysconfdir}/httpd/conf/extra
|
| 167 | 167 |
%{_sysconfdir}/httpd/conf/original
|
| ... | ... |
@@ -170,12 +167,11 @@ fi |
| 170 | 170 |
%config(noreplace) %{_sysconfdir}/httpd/conf/httpd.conf
|
| 171 | 171 |
%{_sysconfdir}/httpd/conf/mime.types
|
| 172 | 172 |
%{_sysconfdir}/httpd/error/*
|
| 173 |
-%{_sysconfdir}/httpd/htdocs/*
|
|
| 174 | 173 |
%{_sysconfdir}/httpd/icons/*
|
| 175 | 174 |
%{_sysconfdir}/httpd/httpd.conf
|
| 176 |
-%dir %{_sysconfdir}/httpd/logs
|
|
| 177 | 175 |
%{_libdir}/systemd/system/httpd.service
|
| 178 | 176 |
%{_libdir}/systemd/system-preset/50-httpd.preset
|
| 177 |
+%{_localstatedir}/log/httpd
|
|
| 179 | 178 |
|
| 180 | 179 |
%files tools |
| 181 | 180 |
%defattr(-,root,root) |
| ... | ... |
@@ -183,6 +179,8 @@ fi |
| 183 | 183 |
%{_bindir}/dbmmanage
|
| 184 | 184 |
|
| 185 | 185 |
%changelog |
| 186 |
+* Thu Mar 7 2019 Michelle Wang <michellew@vmware.com> 2.4.34-3 |
|
| 187 |
+- Update build configure for httpd |
|
| 186 | 188 |
* Thu Jan 24 2019 Dweep Advani <dadvani@vmware.com> 2.4.34-2 |
| 187 | 189 |
- Fixed CVE-2018-11763 |
| 188 | 190 |
* Wed Aug 29 2018 Tapas Kundu <tkundu@vmware.com> 2.4.34-1 |