[apache2] 04/13: Include SupportApache-small.png in apache2-doc

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch master
in repository apache2.

commit 3b17e438a012b7ec4f8443fe67f8453de9bc5e7d
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Fri Mar 30 19:44:38 2018 +0200

    Include SupportApache-small.png in apache2-doc
    
    ... instead of linking to apache.org, to avoid privacy issues.
---
 debian/SupportApache-small.png | Bin 0 -> 96596 bytes
 debian/apache2-doc.install     |   1 +
 debian/changelog               |   3 +++
 debian/convert_docs            |  10 ++++++----
 debian/source/include-binaries |   1 +
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/SupportApache-small.png b/debian/SupportApache-small.png
new file mode 100644
index 0000000..4a23e05
Binary files /dev/null and b/debian/SupportApache-small.png differ
diff --git a/debian/apache2-doc.install b/debian/apache2-doc.install
index 3974a92..7ef931d 100644
--- a/debian/apache2-doc.install
+++ b/debian/apache2-doc.install
@@ -2,3 +2,4 @@
 /usr/lib/cgi-bin/test-cgi			/usr/share/doc/apache2-doc/cgi-examples
 /usr/share/apache2/default-site/htdocs/manual	/usr/share/doc/apache2-doc
 debian/apache2-doc.conf				/etc/apache2/conf-available/
+debian/SupportApache-small.png			/usr/share/doc/apache2-doc/manual/images
diff --git a/debian/changelog b/debian/changelog
index d5cf569..de90459 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,9 @@ apache2 (2.4.33-1) UNRELEASED; urgency=medium
       is used. Closes: #878920
     - mod_ldap: Avoid possible crashes, hangs, and busy loops. Closes: #814980
 
+  * Fix lintian warnings:
+    - Include SupportApache-small.png in apache2-doc package instead of
+      linking to apache.org, to avoid privacy issues.
 
  -- Stefan Fritsch <sf at debian.org>  Fri, 30 Mar 2018 17:16:15 +0200
 
diff --git a/debian/convert_docs b/debian/convert_docs
index 77f0c43..b39a58f 100755
--- a/debian/convert_docs
+++ b/debian/convert_docs
@@ -41,15 +41,16 @@ foreach my $h (@html) {
 		
 		my $updir=$dir;
 		$updir =~ s{[^/]+}{..}g;
+		$updir .= "..";
 		
 		if ($l eq "en") {
-			conv("$SRC/$h.en", "$tdir$h", $h);
+			conv("$SRC/$h.en", "$tdir$h", $h, $updir);
 		}
 		elsif ( -f "$SRC/$h.$l" ) {
-			conv("$SRC/$h.$l", "$tdir$h", $h);
+			conv("$SRC/$h.$l", "$tdir$h", $h, $updir);
 		}
 		else {
-			symlink("${updir}../en/$h", "$tdir$h");
+			symlink("$updir/en/$h", "$tdir$h");
 		}
 		
 	}
@@ -76,7 +77,7 @@ rmtree("$SRC");
 
 
 sub conv {
-	my ($old, $new, $name) = @_;
+	my ($old, $new, $name, $updir) = @_;
 	
 	open(my $in, "<", $old);
 	local $/;
@@ -101,6 +102,7 @@ sub conv {
 	$file =~ s{/usr/local/apache2/conf/httpd[.]conf}{/etc/apache2/apache2.conf}g;
 	$file =~ s{httpd[.]conf}{apache2.conf}g;
 	$file =~ s{apachectl(?!\.html)}{apache2ctl}g;
+	$file =~ s{https://www.apache.org/images/SupportApache-small.png}{$updir/images/SupportApache-small.png}g;
 
 
 	open(my $out, ">", $new);
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index a0eb7d5..b6a30fe 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -984,3 +984,4 @@ debian/perl-framework/t/htdocs/security/CAN-2004-0959.php
 debian/perl-framework/t/htdocs/security/CAN-2005-2491/one/.htaccess
 debian/perl-framework/t/htdocs/security/CAN-2005-2491/two/.htaccess
 debian/perl-framework/t/htdocs/security/CVE-2005-3352.map
+debian/SupportApache-small.png

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git