Hello community,
here is the log from the commit of package apache2 for openSUSE:Factory checked
in at 2018-02-05 10:46:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache2 (Old)
and /work/SRC/openSUSE:Factory/.apache2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2"
Mon Feb 5 10:46:29 2018 rev:141 rq:572001 version:2.4.29
Changes:
--------
--- /work/SRC/openSUSE:Factory/apache2/apache2.changes 2018-01-09
14:37:56.658705338 +0100
+++ /work/SRC/openSUSE:Factory/.apache2.new/apache2.changes 2018-02-05
10:46:46.345828381 +0100
@@ -1,0 +2,15 @@
+Fri Feb 2 07:39:23 UTC 2018 - pgaj...@suse.com
+
+- remove NameVirtualHost from documentation [bsc#1078557]
+
+-------------------------------------------------------------------
+Tue Jan 30 09:16:26 UTC 2018 - pgaj...@suse.com
+
+- for older distros, still use SuSEFirewall2 [bsc#1071548c#7]
+
+-------------------------------------------------------------------
+Mon Jan 29 09:23:46 UTC 2018 - knut.anders...@suse.com
+
+- Replace SuSEFirewall2 by firewalld (fate#323460)
+
+-------------------------------------------------------------------
Old:
----
apache2.firewall
apache2.ssl-firewall
New:
----
apache2.firewalld
apache2.ssl.firewalld
apache2.ssl.susefirewall
apache2.susefirewall
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache2.spec ++++++
--- /var/tmp/diff_new_pack.TmEBJe/_old 2018-02-05 10:46:58.093278388 +0100
+++ /var/tmp/diff_new_pack.TmEBJe/_new 2018-02-05 10:46:58.097278200 +0100
@@ -57,6 +57,11 @@
%define runtimedir %{_localstatedir}/run
%define mods_static unixd
%endif
+%if 0%{?suse_version} >= 1500
+%define use_firewalld 1
+%else
+%define use_firewalld 0
+%endif
Name: apache2
Version: 2.4.29
Release: 0
@@ -88,8 +93,13 @@
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
@@ -686,9 +696,14 @@
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 +876,15 @@
%{_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
++++++ apache2-listen.conf ++++++
--- /var/tmp/diff_new_pack.TmEBJe/_old 2018-02-05 10:46:58.333267152 +0100
+++ /var/tmp/diff_new_pack.TmEBJe/_new 2018-02-05 10:46:58.333267152 +0100
@@ -30,18 +30,3 @@
</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 ++++++
--- /var/tmp/diff_new_pack.TmEBJe/_old 2018-02-05 10:46:58.537257601 +0100
+++ /var/tmp/diff_new_pack.TmEBJe/_new 2018-02-05 10:46:58.537257601 +0100
@@ -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 ++++++
--- /var/tmp/diff_new_pack.TmEBJe/_old 2018-02-05 10:46:58.561256478 +0100
+++ /var/tmp/diff_new_pack.TmEBJe/_new 2018-02-05 10:46:58.565256291 +0100
@@ -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.firewalld ++++++
<?xml version="1.0" encoding="utf-8"?>
<service>
<short>WWW (HTTP)</short>
<description>HTTP is the protocol used to serve Web pages. If you plan to
make your Web server publicly available, enable this option. This option is not
required for viewing pages locally or developing Web pages.</description>
<port protocol="tcp" port="80"/>
</service>
++++++ apache2.ssl.firewalld ++++++
<?xml version="1.0" encoding="utf-8"?>
<service>
<short>Secure WWW (HTTPS)</short>
<description>HTTPS is a modified HTTP used to serve Web pages when security
is important. Examples are sites that require logins like stores or web mail.
This option is not required for viewing pages locally or developing Web pages.
You need the httpd package installed for this option to be useful.</description>
<port protocol="tcp" port="443"/>
</service>
++++++ apache2.ssl.susefirewall ++++++
## Name: HTTPS Server
## Description: Opens ports for Apache Web Server.
# space separated list of allowed TCP ports
TCP="https"
# space separated list of allowed UDP ports
UDP=""
# space separated list of allowed RPC services
RPC=""
# space separated list of allowed IP protocols
IP=""
# space separated list of allowed UDP broadcast ports
BROADCAST=""
++++++ apache2.susefirewall ++++++
## Name: HTTP Server
## Description: Opens ports for Apache Web Server.
# space separated list of allowed TCP ports
TCP="http"
# space separated list of allowed UDP ports
UDP=""
# space separated list of allowed RPC services
RPC=""
# space separated list of allowed IP protocols
IP=""
# space separated list of allowed UDP broadcast ports
BROADCAST=""
