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

OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=550

Browse Source
This commit is contained in:
Petr Gajdos 2018-02-05 10:06:42 +00:00 committed by Git OBS Bridge
parent 165db2ef44
commit c3abd19c56
3 changed files with 179 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apache2.changes
View File

@ -1,8 +1,3 @@
-------------------------------------------------------------------
Mon Feb 5 07:14:03 UTC 2018 - pgajdos@suse.com
- build mod_http2 also for 42.3
-------------------------------------------------------------------
Fri Feb 2 07:39:23 UTC 2018 - pgajdos@suse.com

13
apache2.spec
View File

@ -62,11 +62,6 @@
%else
%define use_firewalld 0
%endif
%if 0%{?suse_version} >= 1500 || 0%{?is_opensuse}
%define build_http2 1
%else
%define build_http2 0
%endif
Name: apache2
Version: 2.4.29
Release: 0
@ -209,7 +204,7 @@ BuildRequires: pkgconfig
BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(systemd)
%endif
%if 0%{?build_http2}
%if 0%{?suse_version} > 1320
BuildRequires: pkgconfig(libnghttp2) >= 1.2.1
%endif
@ -957,7 +952,7 @@ mv %{buildroot}/%{sysconfdir}/original .
%{_libdir}/%{name}-prefork/mod_filter.so
%{_libdir}/%{name}-prefork/mod_headers.so
%{_libdir}/%{name}-prefork/mod_heartmonitor.so
%if 0%{?build_http2}
%if 0%{?suse_version} > 1320
%{_libdir}/%{name}-prefork/mod_http2.so
%endif
%{_libdir}/%{name}-prefork/mod_imagemap.so
@ -1085,7 +1080,7 @@ mv %{buildroot}/%{sysconfdir}/original .
%{_libdir}/%{name}-worker/mod_filter.so
%{_libdir}/%{name}-worker/mod_headers.so
%{_libdir}/%{name}-worker/mod_heartmonitor.so
%if 0%{?build_http2}
%if 0%{?suse_version} > 1320
%{_libdir}/%{name}-worker/mod_http2.so
%endif
%{_libdir}/%{name}-worker/mod_imagemap.so
@ -1212,7 +1207,7 @@ mv %{buildroot}/%{sysconfdir}/original .
%{_libdir}/%{name}-event/mod_file_cache.so
%{_libdir}/%{name}-event/mod_filter.so
%{_libdir}/%{name}-event/mod_headers.so
%if 0%{?build_http2}
%if 0%{?suse_version} > 1320
%{_libdir}/%{name}-event/mod_http2.so
%endif
%{_libdir}/%{name}-event/mod_heartmonitor.so

175
project.diff Normal file
View File

@ -0,0 +1,175 @@
--- apache2-listen.conf.orig
+++ apache2-listen.conf
@@ -30,18 +30,3 @@ Listen 80
</IfDefine>
-# Use name-based virtual hosting
-#
-# - on a specified address / port:
-#
-#NameVirtualHost 12.34.56.78:80
-#
-# - name-based virtual hosting:
-#
-#NameVirtualHost *:80
-#
-# - on all addresses and ports. This is your best bet when you are on
-# dynamically assigned IP addresses:
-#
-#NameVirtualHost *
-
--- apache2-vhost-ssl.template.orig
+++ apache2-vhost-ssl.template
@@ -4,9 +4,6 @@
#
# See /usr/share/doc/packages/apache2/README.QUICKSTART for further hints
# about virtual hosts.
-
-# NameVirtualHost statements should be added to /etc/apache2/listen.conf.
-
#
# This is the Apache server configuration file providing SSL support.
# It contains the configuration directives to instruct the server how to
--- apache2-vhost.template.orig
+++ apache2-vhost.template
@@ -6,8 +6,6 @@
# See /usr/share/doc/packages/apache2/README.QUICKSTART for further hints
# about virtual hosts.
#
-# NameVirtualHost statements can be added to /etc/apache2/listen.conf.
-#
# Almost any Apache directive may go into a VirtualHost container.
# The first VirtualHost section is used for requests without a known
# server name.
--- apache2.changes.orig
+++ apache2.changes
@@ -1,4 +1,24 @@
-------------------------------------------------------------------
+Mon Feb 5 07:14:03 UTC 2018 - pgajdos@suse.com
+
+- build mod_http2 also for 42.3
+
+-------------------------------------------------------------------
+Fri Feb 2 07:39:23 UTC 2018 - pgajdos@suse.com
+
+- remove NameVirtualHost from documentation [bsc#1078557]
+
+-------------------------------------------------------------------
+Tue Jan 30 09:16:26 UTC 2018 - pgajdos@suse.com
+
+- for older distros, still use SuSEFirewall2 [bsc#1071548c#7]
+
+-------------------------------------------------------------------
+Mon Jan 29 09:23:46 UTC 2018 - knut.anderssen@suse.com
+
+- Replace SuSEFirewall2 by firewalld (fate#323460)
+
+-------------------------------------------------------------------
Wed Dec 20 16:18:56 UTC 2017 - pgajdos@suse.com
- build brotli module
--- apache2.spec.orig
+++ apache2.spec
@@ -57,6 +57,16 @@
%define runtimedir %{_localstatedir}/run
%define mods_static unixd
%endif
+%if 0%{?suse_version} >= 1500
+%define use_firewalld 1
+%else
+%define use_firewalld 0
+%endif
+%if 0%{?suse_version} >= 1500 || 0%{?is_opensuse}
+%define build_http2 1
+%else
+%define build_http2 0
+%endif
Name: apache2
Version: 2.4.29
Release: 0
@@ -88,8 +98,13 @@ Source31: apache2-README-instances
Source45: sysconf_addword
Source46: a2enflag
Source47: a2enmod
-Source49: apache2.firewall
-Source50: apache2.ssl-firewall
+#%%if %{use_firewalld}
+Source49: apache2.firewalld
+Source50: apache2.ssl.firewalld
+#%%%else
+Source51: apache2.susefirewall
+Source52: apache2.ssl.susefirewall
+#%%endif
Source100: apache2-httpd.conf
Source101: apache2-errors.conf
Source102: apache2-default-server.conf
@@ -194,7 +209,7 @@ BuildRequires: pkgconfig
BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(systemd)
%endif
-%if 0%{?suse_version} > 1320
+%if 0%{?build_http2}
BuildRequires: pkgconfig(libnghttp2) >= 1.2.1
%endif
@@ -686,9 +701,14 @@ pushd %{buildroot}/%{_bindir}
popd
# install firewall information file
+%if %{use_firewalld}
+install -D -m 644 %{SOURCE49} %{buildroot}%{_libexecdir}/firewalld/services/%{name}.xml
+install -D -m 644 %{SOURCE50} %{buildroot}%{_libexecdir}/firewalld/services/%{name}-ssl.xml
+%else
install -d %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/
-install -m 644 %{SOURCE49} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
-install -m 644 %{SOURCE50} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}-ssl
+install -m 644 %{SOURCE51} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
+install -m 644 %{SOURCE52} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}-ssl
+%endif
ln -sf %{_bindir}/apxs %{buildroot}%{_sbindir}
#
# compat symlinks apache2 -> apache
@@ -861,8 +881,15 @@ mv %{buildroot}/%{sysconfdir}/original .
%{_datadir}/%{name}/deprecated-scripts
%{_datadir}/%{name}/script-helpers
%{_datadir}/%{name}/sysconf_addword
+%if %{use_firewalld}
+%dir %{_libexecdir}/firewalld
+%dir %{_libexecdir}/firewalld/services
+%{_libexecdir}/firewalld/services/%{name}.xml
+%{_libexecdir}/firewalld/services/%{name}-ssl.xml
+%else
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}-ssl
+%endif
%if 0%{?suse_version} == 1110
/usr/share/apache2/find_mpm
/usr/share/apache2/get_includes
@@ -930,7 +957,7 @@ mv %{buildroot}/%{sysconfdir}/original .
%{_libdir}/%{name}-prefork/mod_filter.so
%{_libdir}/%{name}-prefork/mod_headers.so
%{_libdir}/%{name}-prefork/mod_heartmonitor.so
-%if 0%{?suse_version} > 1320
+%if 0%{?build_http2}
%{_libdir}/%{name}-prefork/mod_http2.so
%endif
%{_libdir}/%{name}-prefork/mod_imagemap.so
@@ -1058,7 +1085,7 @@ mv %{buildroot}/%{sysconfdir}/original .
%{_libdir}/%{name}-worker/mod_filter.so
%{_libdir}/%{name}-worker/mod_headers.so
%{_libdir}/%{name}-worker/mod_heartmonitor.so
-%if 0%{?suse_version} > 1320
+%if 0%{?build_http2}
%{_libdir}/%{name}-worker/mod_http2.so
%endif
%{_libdir}/%{name}-worker/mod_imagemap.so
@@ -1185,7 +1212,7 @@ mv %{buildroot}/%{sysconfdir}/original .
%{_libdir}/%{name}-event/mod_file_cache.so
%{_libdir}/%{name}-event/mod_filter.so
%{_libdir}/%{name}-event/mod_headers.so
-%if 0%{?suse_version} > 1320
+%if 0%{?build_http2}
%{_libdir}/%{name}-event/mod_http2.so
%endif
%{_libdir}/%{name}-event/mod_heartmonitor.so