Accepting request 196614 from home:elvigia:branches:Apache

- Use %requires_ge for libapr1 and libapr-util1
- apache2-default-server.conf: Need to use IncludeOptional
- apache-20-22-upgrade: also load authz_core
- httpd-visibility.patch: Use compiler symbol visibility.

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

apache2.spec

@@ -155,6 +155,7 @@ Patch70:        apache2-implicit-pointer-decl.patch
 # PATCH-FEATURE-UPSTREAM httpd-2.4.3-mod_systemd.patch crrodriguez@opensuse.org simple module provides systemd integration.
 Patch109:       httpd-2.4.3-mod_systemd.patch
 Patch110:       http://people.apache.org/~minfrin/httpd-event-ssl.patch
+Patch111:       httpd-visibility.patch
 Url:            http://httpd.apache.org/
 Icon:           Apache.xpm
 Summary:        The Apache Web Server Version 2.2
@@ -170,11 +171,8 @@ Requires:       %{pname}-MPM
 Requires:       /etc/mime.types
 PreReq:         %{name}-utils
 Requires:       logrotate
-# in the past, libapr1 >= 1.0 was sufficient. But since 2.2.16, a failure to
-# create listen sockets can occur, unless newer libapr1 is used, with certain kernels.
-# see https://bugzilla.redhat.com/show_bug.cgi?id=516331
-Requires:       libapr1 < 2.0
-Requires:       libapr1 >= 1.4.2
+%requires_ge     libapr1
+%requires_ge     libapr-util1
 %{?systemd_requires}
 PreReq:         fileutils textutils grep sed 
 %if %{?suse_version:1}0
@@ -378,7 +376,8 @@ to administrators of web servers in general.
 %patch70 -p1
 #%patch108 -p1
 %patch109 -p1
-%patch110 
+%patch110
+%patch111 -p1
 cat $RPM_SOURCE_DIR/SUSE-NOTICE >> NOTICE
 
 # install READMEs
@@ -502,7 +501,7 @@ for mpm in %{mpms_to_build}; do
 	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
 
-	make CFLAGS="$RPM_OPT_FLAGS -fPIC \
+	make CFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden -fPIC \
 		-Wall \
 		-DDEFAULT_PIDLOG='\"%{runtimedir}/%{httpd}.pid\"' \
 		-DDEFAULT_ERRORLOG='\"%{logfiledir}/error_log\"' " \