[gentoo-commits] repo/gentoo:master commit in: net-nds/389-admin/files/, www-apache/libapreq2/, www-servers/apache/, ...

[Mike Frysinger]

commit:     e68f99339aa6fa5a7f57f83c2f519f2b69b81036
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  1 19:49:26 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 19:52:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e68f9933

apache: switch to https:// URI

 app-admin/apache-tools/apache-tools-2.2.31.ebuild                 | 2 +-
 app-admin/apache-tools/apache-tools-2.4.18.ebuild                 | 2 +-
 app-admin/apache-tools/apache-tools-2.4.20.ebuild                 | 2 +-
 app-backup/backuppc/files/apache2-backuppc.conf                   | 2 +-
 app-backup/backuppc/files/httpd.conf                              | 8 ++++----
 .../happstack-server/files/happstack-server-7.4.2-time-1.5.patch  | 2 +-
 net-nds/389-admin/files/389-admin.confd                           | 2 +-
 www-apache/libapreq2/libapreq2-2.13-r1.ebuild                     | 2 +-
 www-apache/mod_fcgid/mod_fcgid-2.3.9-r1.ebuild                    | 2 +-
 www-apache/mod_fcgid/mod_fcgid-2.3.9.ebuild                       | 2 +-
 www-apache/mod_mono/metadata.xml                                  | 2 +-
 www-apache/mod_proxy_fcgi/mod_proxy_fcgi-0_p816361.ebuild         | 2 +-
 www-apps/bugzilla/files/postinstall-en.txt                        | 2 +-
 www-apps/webdavcgi/files/apache-webdavcgi-0.8-example.conf        | 2 +-
 www-servers/apache/apache-2.2.31.ebuild                           | 2 +-
 www-servers/apache/apache-2.4.18-r1.ebuild                        | 2 +-
 www-servers/apache/apache-2.4.18.ebuild                           | 2 +-
 www-servers/apache/apache-2.4.20.ebuild                           | 2 +-
 18 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/app-admin/apache-tools/apache-tools-2.2.31.ebuild b/app-admin/apache-tools/apache-tools-2.2.31.ebuild
index a0a17b5..eb4d5e6 100644
--- a/app-admin/apache-tools/apache-tools-2.2.31.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.2.31.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 inherit flag-o-matic eutils
 
 DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="http://httpd.apache.org/"
+HOMEPAGE="https://httpd.apache.org/"
 SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"

diff --git a/app-admin/apache-tools/apache-tools-2.4.18.ebuild b/app-admin/apache-tools/apache-tools-2.4.18.ebuild
index f29452a..993b58d 100644
--- a/app-admin/apache-tools/apache-tools-2.4.18.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.18.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit flag-o-matic eutils multilib toolchain-funcs
 
 DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="http://httpd.apache.org/"
+HOMEPAGE="https://httpd.apache.org/"
 SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"

diff --git a/app-admin/apache-tools/apache-tools-2.4.20.ebuild b/app-admin/apache-tools/apache-tools-2.4.20.ebuild
index 1afa371..f503d5a 100644
--- a/app-admin/apache-tools/apache-tools-2.4.20.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.20.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit flag-o-matic eutils multilib toolchain-funcs
 
 DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="http://httpd.apache.org/"
+HOMEPAGE="https://httpd.apache.org/"
 SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"

diff --git a/app-backup/backuppc/files/apache2-backuppc.conf b/app-backup/backuppc/files/apache2-backuppc.conf
index 1c27c69..4df0b4e 100644
--- a/app-backup/backuppc/files/apache2-backuppc.conf
+++ b/app-backup/backuppc/files/apache2-backuppc.conf
@@ -68,6 +68,6 @@ CONFIGFILE=/etc/BackupPC/httpd.conf
 
 # Method to use when reloading the server
 # Valid options are 'restart' and 'graceful'
-# See http://httpd.apache.org/docs/2.2/stopping.html for information on
+# See https://httpd.apache.org/docs/2.2/stopping.html for information on
 # what they do and how they differ.
 #RELOAD_TYPE="graceful"

diff --git a/app-backup/backuppc/files/httpd.conf b/app-backup/backuppc/files/httpd.conf
index 00493d8..b47475c 100644
--- a/app-backup/backuppc/files/httpd.conf
+++ b/app-backup/backuppc/files/httpd.conf
@@ -8,14 +8,14 @@
 #
 # Bug Reports:
 #   http://bugs.gentoo.org                    [gentoo related bugs]
-#   http://httpd.apache.org/bug_report.html   [apache httpd related bugs]
+#   https://httpd.apache.org/bug_report.html   [apache httpd related bugs]
 #
 #
 # This is the main Apache HTTP server configuration file.  It contains the
 # configuration directives that give the server its instructions.
-# See <URL:http://httpd.apache.org/docs/2.2> for detailed information.
+# See <URL:https://httpd.apache.org/docs/2.2> for detailed information.
 # In particular, see
-# <URL:http://httpd.apache.org/docs/2.2/mod/directives.html>
+# <URL:https://httpd.apache.org/docs/2.2/mod/directives.html>
 # for a discussion of each configuration directive.
 #
 # Do NOT simply read the instructions in here without understanding
@@ -285,7 +285,7 @@ NameVirtualHost *:80
 	# doesn't give it to you.
 	#
 	# The Options directive is both complicated and important.  Please see
-	# http://httpd.apache.org/docs/2.2/mod/core.html#options
+	# https://httpd.apache.org/docs/2.2/mod/core.html#options
 	# for more information.
 	Options Indexes FollowSymLinks
 

diff --git a/dev-haskell/happstack-server/files/happstack-server-7.4.2-time-1.5.patch b/dev-haskell/happstack-server/files/happstack-server-7.4.2-time-1.5.patch
index a536ba0..d116cb6 100644
--- a/dev-haskell/happstack-server/files/happstack-server-7.4.2-time-1.5.patch
+++ b/dev-haskell/happstack-server/files/happstack-server-7.4.2-time-1.5.patch
@@ -103,7 +103,7 @@ index 5561940..c85ff81 100644
 +#endif
  
  -- | Format the time as describe in the Apache combined log format.
- --   http://httpd.apache.org/docs/2.2/logs.html#combined
+ --   https://httpd.apache.org/docs/2.2/logs.html#combined
 diff --git a/src/Happstack/Server/Response.hs b/src/Happstack/Server/Response.hs
 index 7ae52b3..23f61b0 100644
 --- a/src/Happstack/Server/Response.hs

diff --git a/net-nds/389-admin/files/389-admin.confd b/net-nds/389-admin/files/389-admin.confd
index 8f134a4..2f3e92a 100644
--- a/net-nds/389-admin/files/389-admin.confd
+++ b/net-nds/389-admin/files/389-admin.confd
@@ -68,6 +68,6 @@ APACHE2_OPTS="-D DEFAULT_VHOST -D LANGUAGE -D INFO -D SUEXEC"
 
 # Method to use when reloading the server
 # Valid options are 'restart' and 'graceful'
-# See http://httpd.apache.org/docs/2.2/stopping.html for information on
+# See https://httpd.apache.org/docs/2.2/stopping.html for information on
 # what they do and how they differ.
 #RELOAD_TYPE="graceful"

diff --git a/www-apache/libapreq2/libapreq2-2.13-r1.ebuild b/www-apache/libapreq2/libapreq2-2.13-r1.ebuild
index e136450..6ef5f7d 100644
--- a/www-apache/libapreq2/libapreq2-2.13-r1.ebuild
+++ b/www-apache/libapreq2/libapreq2-2.13-r1.ebuild
@@ -8,7 +8,7 @@ inherit apache-module perl-module multilib
 
 DESCRIPTION="A library for manipulating client request data via the Apache API"
 SRC_URI="mirror://apache/httpd/libapreq/${P}.tar.gz"
-HOMEPAGE="http://httpd.apache.org/apreq/"
+HOMEPAGE="https://httpd.apache.org/apreq/"
 
 LICENSE="Apache-2.0"
 SLOT="2"

diff --git a/www-apache/mod_fcgid/mod_fcgid-2.3.9-r1.ebuild b/www-apache/mod_fcgid/mod_fcgid-2.3.9-r1.ebuild
index 6d6d73d..3ddd2a2 100644
--- a/www-apache/mod_fcgid/mod_fcgid-2.3.9-r1.ebuild
+++ b/www-apache/mod_fcgid/mod_fcgid-2.3.9-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit apache-module eutils multilib
 
 DESCRIPTION="A binary-compatible alternative to mod_fastcgi with better process management"
-HOMEPAGE="http://httpd.apache.org/mod_fcgid/"
+HOMEPAGE="https://httpd.apache.org/mod_fcgid/"
 SRC_URI="mirror://apache/httpd/mod_fcgid/${P}.tar.bz2"
 
 LICENSE="GPL-2"

diff --git a/www-apache/mod_fcgid/mod_fcgid-2.3.9.ebuild b/www-apache/mod_fcgid/mod_fcgid-2.3.9.ebuild
index 4b43cb6..3739ac2 100644
--- a/www-apache/mod_fcgid/mod_fcgid-2.3.9.ebuild
+++ b/www-apache/mod_fcgid/mod_fcgid-2.3.9.ebuild
@@ -5,7 +5,7 @@
 inherit apache-module eutils multilib
 
 DESCRIPTION="mod_fcgid is a binary-compatible alternative to mod_fastcgi with better process management"
-HOMEPAGE="http://httpd.apache.org/mod_fcgid/"
+HOMEPAGE="https://httpd.apache.org/mod_fcgid/"
 SRC_URI="mirror://apache/httpd/mod_fcgid/${P}.tar.bz2"
 
 LICENSE="GPL-2"

diff --git a/www-apache/mod_mono/metadata.xml b/www-apache/mod_mono/metadata.xml
index 7f9136b..153f190 100644
--- a/www-apache/mod_mono/metadata.xml
+++ b/www-apache/mod_mono/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Gentoo Dotnet Project</name>
 	</maintainer>
 	<longdescription lang="en">
-		The module allows Apache (http://httpd.apache.org) to serve ASP.NET
+		The module allows Apache (https://httpd.apache.org/) to serve ASP.NET
 		pages by proxying the requests to a slightly modified version of our XSP
 		called mod-mono-server that is installed along with XSP.
 	</longdescription>

diff --git a/www-apache/mod_proxy_fcgi/mod_proxy_fcgi-0_p816361.ebuild b/www-apache/mod_proxy_fcgi/mod_proxy_fcgi-0_p816361.ebuild
index e3b3456..bceea6d 100644
--- a/www-apache/mod_proxy_fcgi/mod_proxy_fcgi-0_p816361.ebuild
+++ b/www-apache/mod_proxy_fcgi/mod_proxy_fcgi-0_p816361.ebuild
@@ -5,7 +5,7 @@
 inherit apache-module
 
 DESCRIPTION="mod_proxy_fcgi is a FastCGI protocol handler for mod_proxy"
-HOMEPAGE="http://httpd.apache.org"
+HOMEPAGE="https://httpd.apache.org/"
 SRC_URI="https://dev.gentoo.org/~hollow/distfiles/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"

diff --git a/www-apps/bugzilla/files/postinstall-en.txt b/www-apps/bugzilla/files/postinstall-en.txt
index 2d18de0..9b6a879 100644
--- a/www-apps/bugzilla/files/postinstall-en.txt
+++ b/www-apps/bugzilla/files/postinstall-en.txt
@@ -9,5 +9,5 @@
 
 3. Please note that Apache2 sets AllowOverride None by default. You may have
    to edit it to process the .htaccess file provided by Bugzilla. Please see
-   http://httpd.apache.org/docs/2.2/mod/core.html#allowoverride and
+   https://httpd.apache.org/docs/2.2/mod/core.html#allowoverride and
    http://www.bugzilla.org/docs/${MY_PB}/en/html/configuration.html#http for more info.

diff --git a/www-apps/webdavcgi/files/apache-webdavcgi-0.8-example.conf b/www-apps/webdavcgi/files/apache-webdavcgi-0.8-example.conf
index 58bef75..cf1d4d4 100644
--- a/www-apps/webdavcgi/files/apache-webdavcgi-0.8-example.conf
+++ b/www-apps/webdavcgi/files/apache-webdavcgi-0.8-example.conf
@@ -32,7 +32,7 @@
 #
 # For further informations and other configuration possibilities consult the
 # WebDAV CGI documentation which is located at http://webdavcgi.sourceforge.net
-# and the Apache HTTP server documentation at http://httpd.apache.org/docs/
+# and the Apache HTTP server documentation at https://httpd.apache.org/docs/
 #
     ScriptAlias /webdavcgi "/usr/libexec/webdavcgi-0.8/cgi-bin/webdavwrapper"
     ScriptAlias /webdav/logout "/usr/libexec/webdavcgi-0.8/cgi-bin/logout"

diff --git a/www-servers/apache/apache-2.2.31.ebuild b/www-servers/apache/apache-2.2.31.ebuild
index 414698f..6a3ac35 100644
--- a/www-servers/apache/apache-2.2.31.ebuild
+++ b/www-servers/apache/apache-2.2.31.ebuild
@@ -84,7 +84,7 @@ MODULE_CRITICAL="
 inherit apache-2 systemd toolchain-funcs
 
 DESCRIPTION="The Apache Web Server"
-HOMEPAGE="http://httpd.apache.org/"
+HOMEPAGE="https://httpd.apache.org/"
 
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"

diff --git a/www-servers/apache/apache-2.4.18-r1.ebuild b/www-servers/apache/apache-2.4.18-r1.ebuild
index 3892d01..d2eebc8 100644
--- a/www-servers/apache/apache-2.4.18-r1.ebuild
+++ b/www-servers/apache/apache-2.4.18-r1.ebuild
@@ -120,7 +120,7 @@ MODULE_CRITICAL="
 inherit eutils apache-2 systemd toolchain-funcs
 
 DESCRIPTION="The Apache Web Server"
-HOMEPAGE="http://httpd.apache.org/"
+HOMEPAGE="https://httpd.apache.org/"
 
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"

diff --git a/www-servers/apache/apache-2.4.18.ebuild b/www-servers/apache/apache-2.4.18.ebuild
index 931cd78..40cfb2e 100644
--- a/www-servers/apache/apache-2.4.18.ebuild
+++ b/www-servers/apache/apache-2.4.18.ebuild
@@ -120,7 +120,7 @@ MODULE_CRITICAL="
 inherit eutils apache-2 systemd toolchain-funcs
 
 DESCRIPTION="The Apache Web Server"
-HOMEPAGE="http://httpd.apache.org/"
+HOMEPAGE="https://httpd.apache.org/"
 
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"

diff --git a/www-servers/apache/apache-2.4.20.ebuild b/www-servers/apache/apache-2.4.20.ebuild
index 16d1143..2227c4d 100644
--- a/www-servers/apache/apache-2.4.20.ebuild
+++ b/www-servers/apache/apache-2.4.20.ebuild
@@ -120,7 +120,7 @@ MODULE_CRITICAL="
 inherit eutils apache-2 systemd toolchain-funcs
 
 DESCRIPTION="The Apache Web Server"
-HOMEPAGE="http://httpd.apache.org/"
+HOMEPAGE="https://httpd.apache.org/"
 
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"