[Pkg-apache-commits] r1383 - in /trunk/apache2: ./ config-dir/ config-dir/mods-available/ icons/ patches/ source/
atoell-guest at alioth.debian.org
atoell-guest at alioth.debian.org
Tue Dec 13 21:57:37 UTC 2011
Author: atoell-guest
Date: Tue Dec 13 21:57:36 2011
New Revision: 1383
URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1383
Log:
Rework the source package:
* Switch to source format 3.0 / quilt, rewrite debian/rules file to make use of dh and overrides
* Switch to quilt, drop dpatch entirely. Move 001_branding equivalent handling to debian/rules, add target to handle 201_build_suexec-custom.dpatch
* Incorporate changes from -3; replace find(1) call in convert_icons by using File::Find; Fix #649888, #440058
* Remove Lintian override, redundant debian/control priorities
Added:
trunk/apache2/apache2-doc.docs
trunk/apache2/apache2.2-bin.docs
trunk/apache2/apache2.2-common.apache2.logrotate
- copied, changed from r1377, trunk/apache2/logrotate
trunk/apache2/apache2.2-common.docs
trunk/apache2/icons/odf6odb-20x22.png
trunk/apache2/icons/odf6odc-20x22.png
trunk/apache2/icons/odf6odf-20x22.png
trunk/apache2/icons/odf6odg-20x22.png
trunk/apache2/icons/odf6odi-20x22.png
trunk/apache2/icons/odf6odm-20x22.png
trunk/apache2/icons/odf6odp-20x22.png
trunk/apache2/icons/odf6ods-20x22.png
trunk/apache2/icons/odf6odt-20x22.png
trunk/apache2/icons/odf6otc-20x22.png
trunk/apache2/icons/odf6otf-20x22.png
trunk/apache2/icons/odf6otg-20x22.png
trunk/apache2/icons/odf6oth-20x22.png
trunk/apache2/icons/odf6oti-20x22.png
trunk/apache2/icons/odf6otp-20x22.png
trunk/apache2/icons/odf6ots-20x22.png
trunk/apache2/icons/odf6ott-20x22.png
trunk/apache2/patches/series
- copied, changed from r1377, trunk/apache2/patches/00list
trunk/apache2/source/include-binaries
trunk/apache2/source/options
Removed:
trunk/apache2/icons/odf6odb-20x22.png.uue
trunk/apache2/icons/odf6odc-20x22.png.uue
trunk/apache2/icons/odf6odf-20x22.png.uue
trunk/apache2/icons/odf6odg-20x22.png.uue
trunk/apache2/icons/odf6odi-20x22.png.uue
trunk/apache2/icons/odf6odm-20x22.png.uue
trunk/apache2/icons/odf6odp-20x22.png.uue
trunk/apache2/icons/odf6ods-20x22.png.uue
trunk/apache2/icons/odf6odt-20x22.png.uue
trunk/apache2/icons/odf6otc-20x22.png.uue
trunk/apache2/icons/odf6otf-20x22.png.uue
trunk/apache2/icons/odf6otg-20x22.png.uue
trunk/apache2/icons/odf6oth-20x22.png.uue
trunk/apache2/icons/odf6oti-20x22.png.uue
trunk/apache2/icons/odf6otp-20x22.png.uue
trunk/apache2/icons/odf6ots-20x22.png.uue
trunk/apache2/icons/odf6ott-20x22.png.uue
trunk/apache2/logrotate
trunk/apache2/patches/001_branding
trunk/apache2/patches/00list
trunk/apache2/patches/200_cp_suexec.dpatch
trunk/apache2/source.lintian-overrides
Modified:
trunk/apache2/apache2.2-common.dirs
trunk/apache2/apache2.2-common.install
trunk/apache2/changelog
trunk/apache2/compat
trunk/apache2/config-dir/apache2.conf
trunk/apache2/config-dir/mods-available/alias.conf
trunk/apache2/control
trunk/apache2/convert_docs
trunk/apache2/patches/004_usr_bin_perl_0wnz_j00
trunk/apache2/patches/008_make_include_safe
trunk/apache2/patches/009_apache2_has_dso
trunk/apache2/patches/010_fhs_compliance
trunk/apache2/patches/031_apxs2_sucks_more
trunk/apache2/patches/032_suexec_is_shared
trunk/apache2/patches/033_dbm_read_hash_or_btree
trunk/apache2/patches/034_apxs2_libtool_fixtastic
trunk/apache2/patches/038_no_LD_LIBRARY_PATH
trunk/apache2/patches/045_suexec_log_cloexec.dpatch
trunk/apache2/patches/047_fix_usage_message.dpatch
trunk/apache2/patches/052_logresolve_linelength.dpatch
trunk/apache2/patches/057_disablemods.dpatch
trunk/apache2/patches/058_suexec-CVE-2007-1742.dpatch
trunk/apache2/patches/067_fix_segfault_in_ab.dpatch
trunk/apache2/patches/071_fix_cacheenable.dpatch
trunk/apache2/patches/073_mod_dav_trunk_fixes.dpatch
trunk/apache2/patches/074_link_support_progs_with_lcrypt.dpatch
trunk/apache2/patches/075_mod_rewrite_literal_ipv6_redirect.dpatch
trunk/apache2/patches/076_apxs2_a2enmod.dpatch
trunk/apache2/patches/077_CacheIgnoreURLSessionIdentifiers.dpatch
trunk/apache2/patches/079_polish_translation.dpatch
trunk/apache2/patches/082_ab_num_requests.dpatch
trunk/apache2/patches/083_CVE-2011-3368.dpatch
trunk/apache2/patches/084_CVE-2011-4317.dpatch
trunk/apache2/patches/085_CVE-2011-3607.dpatch
trunk/apache2/patches/099_config_guess_sub_update.dpatch
trunk/apache2/patches/201_build_suexec-custom.dpatch
trunk/apache2/patches/202_suexec-custom.dpatch
trunk/apache2/rules
trunk/apache2/source/format
trunk/apache2/suexec.8
Added: trunk/apache2/apache2-doc.docs
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2-doc.docs?rev=1383&op=file
==============================================================================
--- trunk/apache2/apache2-doc.docs (added)
+++ trunk/apache2/apache2-doc.docs Tue Dec 13 21:57:36 2011
@@ -1,0 +1,1 @@
+debian/README.Debian
Added: trunk/apache2/apache2.2-bin.docs
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2.2-bin.docs?rev=1383&op=file
==============================================================================
--- trunk/apache2/apache2.2-bin.docs (added)
+++ trunk/apache2/apache2.2-bin.docs Tue Dec 13 21:57:36 2011
@@ -1,0 +1,1 @@
+debian/README.backtrace
Copied: trunk/apache2/apache2.2-common.apache2.logrotate (from r1377, trunk/apache2/logrotate)
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2.2-common.apache2.logrotate?rev=1383&op=diff
==============================================================================
--- trunk/apache2/logrotate (original)
+++ trunk/apache2/apache2.2-common.apache2.logrotate Tue Dec 13 21:57:36 2011
@@ -10,4 +10,9 @@
postrotate
/etc/init.d/apache2 reload > /dev/null
endscript
+ prerotate
+ if [ -d /etc/logrotate.d/httpd-prerotate ]; then \
+ run-parts /etc/logrotate.d/httpd-prerotate; \
+ fi; \
+ endscript
}
Modified: trunk/apache2/apache2.2-common.dirs
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2.2-common.dirs?rev=1383&op=diff
==============================================================================
--- trunk/apache2/apache2.2-common.dirs (original)
+++ trunk/apache2/apache2.2-common.dirs Tue Dec 13 21:57:36 2011
@@ -4,6 +4,7 @@
etc/bash_completion.d
etc/logrotate.d
usr/lib/cgi-bin
+usr/share/apache2
usr/share/apache2/build
usr/share/apache2/default-site
usr/share/bug/apache2.2-common
Added: trunk/apache2/apache2.2-common.docs
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2.2-common.docs?rev=1383&op=file
==============================================================================
--- trunk/apache2/apache2.2-common.docs (added)
+++ trunk/apache2/apache2.2-common.docs Tue Dec 13 21:57:36 2011
@@ -1,0 +1,2 @@
+debian/README.backtrace
+debian/README.multiple-instances
Modified: trunk/apache2/apache2.2-common.install
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2.2-common.install?rev=1383&op=diff
==============================================================================
--- trunk/apache2/apache2.2-common.install (original)
+++ trunk/apache2/apache2.2-common.install Tue Dec 13 21:57:36 2011
@@ -1,4 +1,5 @@
usr/share/apache2/icons
+debian/icons/*.png usr/share/apache2/icons
usr/share/apache2/error
usr/sbin/envvars-std usr/share/apache2/build
etc/apache2 usr/share/doc/apache2.2-common/examples
Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1383&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Tue Dec 13 21:57:36 2011
@@ -1,3 +1,37 @@
+apache2 (2.2.21-4) unstable; urgency=low
+
+ * Upgrade package to 3.0/quilt.
+ + Remove uuencoded images, keep them in their binary format in debian/icons
+ + Upgrade to quilt from dpatch and refresh all patches by keeping all hunks
+ unchanged. Remove the `001_branding' patch by supplying -DPLATFORM at
+ build time where needed Move the 200_cp_suexec.dpatch patch and
+ 202_suexec-custom.dpatch patch to debian/rules. 200_cp_suexec.dpatch was a
+ script, not a patch which is not supported by quilt.
+ * Rewrite debian/rules and base it on dh(1).
+ + use overrides where possible, replace some debhelper calls by our own
+ implementation where needed. That's required since the Apache package is
+ compiled in parts several times for each MPM once.
+ + move some install operations to the their respective .install files
+ + Support dpkg-buildflags now, which also enables by default hardening
+ flags. Thus, remove them from their explicit appearance in debian/rules
+ + Remove DEB_BUILD_OPTIONS legacy support. It comes for free when using
+ dh(1)/dpkg-buildflags(1).
+ * Push debhelper compatibility to 8
+ * Remove unused Lintian overrides for the Debian source package remove and
+ redundant priorities in debian/control.
+ * Fix "add pre-rotate hook to logrotate script" execute scripts in
+ /etc/logrotate.d/httpd-prerotate if available (Closes: #590096).
+ * Fix "Hide /icons index" Disables indexes on the icon directory. By upgrading
+ to Debian's 3.0/quilt source format also images don't need to be generated
+ at build time anymore. Hence, the icon date can no longer lead to
+ information disclosure (Closes: #649888).
+ * Fix "Suggest removing DefaultType from apache2.conf" change the DefaultType
+ from text/plain to None. This lets the browser guess a proper MIME type
+ instead of being forced to treat a given file according to our default type
+ (Closes: #440058)
+
+ -- Arno Töll <debian at toell.net> Mon, 05 Dec 2011 19:22:53 +0100
+
apache2 (2.2.21-3) unstable; urgency=medium
* Fix CVE-2011-4317: Prevent unintended pattern expansion in some
Modified: trunk/apache2/compat
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/compat?rev=1383&op=diff
==============================================================================
--- trunk/apache2/compat (original)
+++ trunk/apache2/compat Tue Dec 13 21:57:36 2011
@@ -1,1 +1,1 @@
-7
+8
Modified: trunk/apache2/config-dir/apache2.conf
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/config-dir/apache2.conf?rev=1383&op=diff
==============================================================================
--- trunk/apache2/config-dir/apache2.conf (original)
+++ trunk/apache2/config-dir/apache2.conf Tue Dec 13 21:57:36 2011
@@ -171,7 +171,14 @@
# keep browsers from trying to display binary files as though they are
# text.
#
-DefaultType text/plain
+# It is also possible to omit any default MIME type and let the
+# client's browser guess an appropriate action instead. Typically the
+# browser will decide based on the file's extension then. In cases
+# where no good assumption can be made, letting the default MOME type
+# unset is suggested instead of forcing the browser to accept
+# incorrect metadata.
+#
+DefaultType None
#
Modified: trunk/apache2/config-dir/mods-available/alias.conf
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/config-dir/mods-available/alias.conf?rev=1383&op=diff
==============================================================================
--- trunk/apache2/config-dir/mods-available/alias.conf (original)
+++ trunk/apache2/config-dir/mods-available/alias.conf Tue Dec 13 21:57:36 2011
@@ -15,7 +15,7 @@
Alias /icons/ "/usr/share/apache2/icons/"
<Directory "/usr/share/apache2/icons">
- Options Indexes MultiViews
+ Options -Indexes -MultiViews
AllowOverride None
Order allow,deny
Allow from all
Modified: trunk/apache2/control
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/control?rev=1383&op=diff
==============================================================================
--- trunk/apache2/control (original)
+++ trunk/apache2/control Tue Dec 13 21:57:36 2011
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Apache Maintainers <debian-apache at lists.debian.org>
Uploaders: Stefan Fritsch <sf at debian.org>, Steinar H. Gunderson <sesse at debian.org>
-Build-Depends: debhelper (>= 7.4.3), dpatch, lsb-release, libaprutil1-dev (>= 1.3.4), libapr1-dev, openssl, libpcre3-dev, mawk, zlib1g-dev, libssl-dev (>= 0.9.8m), sharutils, libcap-dev [linux-any], autoconf
+Build-Depends: debhelper (>= 8), lsb-release, libaprutil1-dev (>= 1.3.4), libapr1-dev, openssl, libpcre3-dev, mawk, zlib1g-dev, libssl-dev (>= 0.9.8m), sharutils, libcap-dev [linux-any], autoconf
Build-Conflicts: autoconf2.13
Standards-Version: 3.9.2
Vcs-Browser: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2
@@ -123,7 +123,6 @@
- check_forensic (Extract mod_log_forensic output from Apache log files)
Package: apache2-suexec
-Priority: optional
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, apache2.2-common
Conflicts: apache2-suexec, apache-common
Modified: trunk/apache2/convert_docs
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/convert_docs?rev=1383&op=diff
==============================================================================
--- trunk/apache2/convert_docs (original)
+++ trunk/apache2/convert_docs Tue Dec 13 21:57:36 2011
@@ -3,11 +3,16 @@
use strict;
use File::Path;
use Fatal qw/mkpath symlink open close/;
+use File::Copy;
+use File::Find;
-scalar @ARGV == 2 or die;
-my $SRC=$ARGV[0];
-my $TGT=$ARGV[1];
+scalar @ARGV == 1 or die;
+
+my $TGT=$ARGV[0];
+my $SRC=$TGT.".orig";
+
+move($TGT, $SRC);
# list of languages
my @lang = glob("$SRC/index.html.*") or die;
@@ -21,10 +26,8 @@
$lpath{$l}="$t/";
}
-
-my @html=`find $SRC -name *.html` or die;
-chomp(@html);
-map { s{^$SRC/}{} } @html;
+my @html;
+find(sub { $File::Find::name =~ s/^$SRC\///; push(@html, $File::Find::name) if $File::Find::name =~ /\.html$/; }, $SRC);
foreach my $h (@html) {
my $dir="";
@@ -61,6 +64,13 @@
}
print $out '</table></body></html>';
+move("$SRC/images", "$TGT/images");
+move("$SRC/style", "$TGT/style");
+rmdir("$TGT/style/lang");
+rmdir("$TGT/style/xsl/util");
+rmdir("$TGT/style/xsl");
+rmtree("$SRC");
+
### END
@@ -84,11 +94,14 @@
# language directories one level up
$file =~ s{href="\.\./$l}{href="../../$l}g;
$file =~ s{href="(?:\./)?$l}{href="../$l}g;
+ $file =~ s{apachectl(?!\.html)}{apache2ctl}g;
}
# Debian tweaks
$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;
+
open(my $out, ">", $new);
print $out $file;
Added: trunk/apache2/icons/odf6odb-20x22.png
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/icons/odf6odb-20x22.png?rev=1383&op=file
==============================================================================
--- trunk/apache2/icons/odf6odb-20x22.png (added)
+++ trunk/apache2/icons/odf6odb-20x22.png Tue Dec 13 21:57:36 2011
@@ -1,0 +1,4 @@
+‰PNG
+
+
IHDR ÷ŸL4 UPLTEÙÙÙ&&&'''('''((((()))33333™\\¬]\]]^^®™™™šššœ››ŸŸŸ¢¡¢¡¢¢¦¦¥§§§ÎÎÜÎÏÜÑÐÞÑÑÝÑÑßÒÑàÒÒàÓÓàÓÔàÕÕâ ×ØäØØäÚÚÚÛÚÛÛÛÛÜÛÜÛÜÛÜÜÛÜÜÜÜÝÜÝÝÜÝÝÝÝÞÞÞÞÝÞÞÞÞßÞÞßßßßßÞÞèàßßßàßàààßßéààááààáàáááàáááááââáááââââáâââãââãâãâãâãããããääããäãäãäääääääååäääåääåååååååææååæåæåæååæææææææççæçæçææçççççççèææñèççèçèçèèèèçèèèèçñéèéèééééèéééééêêééêéêéêééêêêêéêêêêêëëêëêëëëëëëëììëëìëìëìëëìììììììííììíìíìíííííîíííîííîîîîíîîîîîïïîïïïîïïïïïððïðïðïïðððððñððñðñðñððññññðñññññòñòñòòñòòòòòóóòòóòóòóòòóóóóòóóóóóôôóôóôóôôóôôôõôôõôõôõôôõõõõõõõööõõöõöõööööööö÷÷ö÷÷÷÷ø÷ø÷ø÷÷øøøøøøøùùùùùùúúùùúùúúúúûúúûúûúûûûûûüûûüüüýüüüýüýýüýýýþýýþýþþþþþþÿÿþÿÿÿÿö0¼Ú tRNS @æØf bKGD ˆ
H pHYs šœ NIDATÓc`G PÀ~ìØቻ¶mÞ°†}L”ýèaE
n¹
k–³ÏŸe?¤À2K°Ï˜ÔeßÃÃ!·q4ׂÙì»:Á¢ìÑ u+—p˜M–gCànŽÕËKpö÷ÉC Hpƒ,‡ÔqÑþ–æj^ ®Y)ÉÉÁ)ÖÙÚX]^ \²xö,£~6NV¡ˆàÂyS'÷µ³ Wæ¦ ²DBgMîïlkg©d–÷ƒNìíli¨–/ÈN‹ ‘÷„ö·7ÕUʧ'ÄFúûÉ»@[škÊ
+råSbB¼Üäm ‚
ÕÅ9©ò‘!~žnòÁªÒ‚ôä8ù@ w{kyCˆ`QNjBT(“€‡ƒ?£.D($Àr#Ÿ&D0%6"ÐÏÕÅÁÚÔPO[]"È΋ÀAÇÀ »`™{ˆÖë IEND®B`‚
Added: trunk/apache2/icons/odf6odc-20x22.png
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/icons/odf6odc-20x22.png?rev=1383&op=file
==============================================================================
--- trunk/apache2/icons/odf6odc-20x22.png (added)
+++ trunk/apache2/icons/odf6odc-20x22.png Tue Dec 13 21:57:36 2011
@@ -1,0 +1,5 @@
+‰PNG
+
+
IHDR ÷ŸL4 .PLTEÙÙÙ33333™\\¬]\]]^^®™™™ÎÎÜÎÏÜÑÐÞÑÑÝÑÑßÒÑàÒÒàÓÓàÓÔàÕÕâ ×ØäØØäÚÚÚÛÚÛÛÛÛÜÛÜÛÜÛÜÜÛÜÜÜÜÝÜÝÝÜÝÝÝÝÞÞÞÞÝÞÞÞÞßÞÞßßßßßÞÞèàßßßàßàààßßéààááààáàáááàáááááââáááââââáâââãââãâãâãâãããããääããäãäãäääääääååäääåääåååååååææååæåæåæååæææææææççæçæçææçççççççèææñèççèçèçèèèèçèèèèçñéèéèééééèéééééêêééêéêéêééêêêêéêêêêêëëêëêëëëëëëëììëëìëìëìëëìììììììííììíìíìíííííîíííîííîîîîíîîîîîïïîïïïîïïïïïððïðïðïïðððððñððñðñðñððññññðñññññòñòñòòñòòòòòóóòòóòóòóòòóóóóòóóóóóôôóôóôóôôóôôôõôôõôõôõôôõõõõõõõööõõöõöõööööööö÷÷ö÷÷÷÷ø÷ø÷ø÷÷øøøøøøøùùùùùùúúùùúùúúúúûúúûúûúûûûûûüûûüüüýüüüýüýýüýýýþýýþýþþþþþþÿÿþÿÿÿÿr§U tRNS @æØf bKGD ˆ
H pHYs šœ FIDATÓc`D PÀ¸sç¶Í!kW.[<Ÿq&L”qÇ66&VÁÅóg1Nê
Š2nfþé“»[ë!¢ŒëÙ˜—Ìçc™ÜÇØR[]eô©›3I³Mˆ A‚ËY™æÍšÆÍÜÔ( ÁÅL¼“¹˜8šÊËòØ ,833gMEI^V2Lpú´¾^Õ¦šò¢¼Ì¤è°`ˆà”‰
mU%E¹) ‘¡>Á^¡¦šÊâ¼Ìd¡Ø`wGˆ`‹PM9H,N(ÐÇ]È"Ø$TZ˜› ,äãä(d,ÊÏLNˆòr²Ò‡ ¥%Ç µ
+ iCs
’
„<
ì
Ì
ô„T ‚©BÁ¾
.¶ÖƆºjJ
+Áx!d ðvq´07ÖÓPQ”“‡2²£ pÐ10¡ ÇR¾ëˆ³e IEND®B`‚
Added: trunk/apache2/icons/odf6odf-20x22.png
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/icons/odf6odf-20x22.png?rev=1383&op=file
==============================================================================
--- trunk/apache2/icons/odf6odf-20x22.png (added)
+++ trunk/apache2/icons/odf6odf-20x22.png Tue Dec 13 21:57:36 2011
@@ -1,0 +1,4 @@
+‰PNG
+
+
IHDR ÷ŸL4 XPLTEÙÙÙ&&&'''(((33333™\\¬]\]]^^®™™™žŸŸ ¡ ¡ ¡¡¡¢¡¡£¢££££¥¤¤¤¥¥¥¥¤¦¦¦ÎÎÜÎÏÜÑÐÞÑÑÝÑÑßÒÑàÒÒàÓÓàÓÔàÕÕâ ×ØäØØäÚÚÚÛÚÛÛÛÛÜÛÜÛÜÛÜÜÛÜÜÜÜÝÜÝÝÜÝÝÝÝÞÞÞÞÝÞÞÞÞßÞÞßßßßßÞÞèàßßßàßàààßßéààááààáàáááàáááááââáááââââáâââãââãâãâãâãããããääããäãäãäääääääååäääåääåååååååææååæåæåæååæææææææççæçæçææçççççççèææñèççèçèçèèèèçèèèèçñéèéèééééèéééééêêééêéêéêééêêêêéêêêêêëëêëêëëëëëëëììëëìëìëìëëìììììììííììíìíìíííííîíííîííîîîîíîîîîîïïîïïïîïïïïïððïðïðïïðððððñððñðñðñððññññðñññññòñòñòòñòòòòòóóòòóòóòóòòóóóóòóóóóóôôóôóôóôôóôôôõôôõôõôõôôõõõõõõõööõõöõöõööööööö÷÷ö÷÷÷÷ø÷ø÷ø÷÷øøøøøøøùùùùùùúúùùúùúúúúûúúûúûúûûûûûüûûüüüýüüüýüýýüýýýþýýþýþþþþþþÿÿþÿÿÿÿó˜Ë tRNS @æØf bKGD ˆ
H pHYs šœ KIDATÓc`A PÀrüø‘ƒI»·oÙ¸–e9L”åØ%NVùkW°,˜
e9¬È
+²K²ÌœÜ eÙËÉ*¿i ûÂ9,“º;›À¢,1 u«–²šOQ`CàVÖ5+–H²MèW€ àF9Vé
¬bZ[j¸€ ,¸v•+›xW[SME!Lpé’9³'tµ6Ô”d¦$BÍŸ6¥¿b\r|Dpö” ]íÌ¢
¹Â̱¡þÁI}]5¢Ì"iñQ¡þ^Á
ÍõÕE¹BÌ‚Qþ
®ÁÖ–Úò¼¬TA&~owg[ˆ`cMIanZ¢ Ÿ—»£%D°º¬0#%^€‰×ÃÕÁÆÌ"X T
ÆÄãéÈÍhb ŠE
CÜ©¯£L‹ òwsujÕ×ÑP
²p¡ pÐ10( ”a² &ž IEND®B`‚
Added: trunk/apache2/icons/odf6odg-20x22.png
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/icons/odf6odg-20x22.png?rev=1383&op=file
==============================================================================
--- trunk/apache2/icons/odf6odg-20x22.png (added)
+++ trunk/apache2/icons/odf6odg-20x22.png Tue Dec 13 21:57:36 2011
@@ -1,0 +1,6 @@
+‰PNG
+
+
IHDR ÷ŸL4 mPLTEÙÙÙ***+**+++++,,,,,,----33333™\\¬]\]]^^®™™™š›šŸŸ ŸŸ¡¡¡¢¢¢¢£¢¢£££££¤¤¤¤¥¥¥¥¥¦¦¦¦¦§ÎÎÜÎÏÜÑÐÞÑÑÝÑÑßÒÑàÒÒàÓÓàÓÔàÕÕâ ×ØäØØäÚÚÚÛÚÛÛÛÛÜÛÜÛÜÛÜÜÛÜÜÜÜÝÜÝÝÜÝÝÝÝÞÞÞÞÝÞÞÞÞßÞÞßßßßßÞÞèàßßßàßàààßßéààááààáàáááàáááááââáááââââáâââãââãâãâãâãããããääããäãäãäääääääååäääåääåååååååææååæåæåæååæææææææççæçæçææçççççççèææñèççèçèçèèèèçèèèèçñéèéèééééèéééééêêééêéêéêééêêêêéêêêêêëëêëêëëëëëëëììëëìëìëìëëìììììììííììíìíìíííííîíííîííîîîîíîîîîîïïîïïïîïïïïïððïðïðïïðððððñððñðñðñððññññðñññññòñòñòòñòòòòòóóòòóòóòóòòóóóóòóóóóóôôóôóôóôôóôôôõôôõôõôõôôõõõõõõõööõõöõöõööööööö÷÷ö÷÷÷÷ø÷ø÷ø÷÷øøøøøøøùùùùùùúúùùúùúúúúûúúûúûúûûûûûüûûüüüýüüüýüýýüýýýþýýþýþþþþþþÿÿþÿÿÿÿaarù tRNS @æØf bKGD ˆ
H pHYs šœ OIDATÓcà@ PÀqîÜ陇öíÞ±
c
L”ãìiM^N
µ
[Ös,_å8¥Á *kVp,˜5"Êq„—Smçeî‹9fNšÐ åH©Û¸†Ón¶:‚÷ðpn^¿Zkú4u îPåTZ!Ï);½§»™À‚[6*rqrÉM”él®¯€ ®Y½x‘Õô‰ÒìRuåÙÁ•ËæΞÖßÉ.É^š—•–\4{úľ)ö
+V±Œ”˜0ˆàÌ©{:šÙ%ŠEXcÂ!‚Óû»Úš$Xó3RYÃü} ‚=Ý-ul¢9)1B,~^.ÁŽæê
+qÖ VfWˆ`SmE>«p\dˆ¿ ³%D°ª$W˜562(ÀÃ͉‰ß"X’›ÁªŒ†ÁœÔ„È0_ g[K3c}
ˆ
+
ƒ:`` n fj,õ£Ž IEND®B`‚
Added: trunk/apache2/icons/odf6odi-20x22.png
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/icons/odf6odi-20x22.png?rev=1383&op=file
==============================================================================
--- trunk/apache2/icons/odf6odi-20x22.png (added)
+++ trunk/apache2/icons/odf6odi-20x22.png Tue Dec 13 21:57:36 2011
@@ -1,0 +1,6 @@
+‰PNG
+
+
IHDR ÷ŸL4 mPLTEÙÙÙ+++,,,,,----33333™\\¬]\]]^^®™™™¸¸¸¹¸¸»»»»»¼¼»»¼¼¼½½½¾½½¾½¾½¾¾¾¾¾¿¾¾¾¿¾ÀÀÀÀÀÁÁÀÁÀÁÁÎÎÜÎÏÜÑÐÞÑÑÝÑÑßÒÑàÒÒàÓÓàÓÔàÕÕâ ×ØäØØäÚÚÚÛÚÛÛÛÛÜÛÜÛÜÛÜÜÛÜÜÜÜÝÜÝÝÜÝÝÝÝÞÞÞÞÝÞÞÞÞßÞÞßßßßßÞÞèàßßßàßàààßßéààááààáàáááàáááááââáááââââáâââãââãâãâãâãããããääããäãäãäääääääååäääåääåååååååææååæåæåæååæææææææççæçæçææçççççççèææñèççèçèçèèèèçèèèèçñéèéèééééèéééééêêééêéêéêééêêêêéêêêêêëëêëêëëëëëëëììëëìëìëìëëìììììììííììíìíìíííííîíííîííîîîîíîîîîîïïîïïïîïïïïïððïðïðïïðððððñððñðñðñððññññðñññññòñòñòòñòòòòòóóòòóòóòóòòóóóóòóóóóóôôóôóôóôôóôôôõôôõôõôõôôõõõõõõõööõõöõöõööööööö÷÷ö÷÷÷÷ø÷ø÷ø÷÷øøøøøøøùùùùùùúúùùúùúúúúûúúûúûúûûûûûüûûüüüýüüüýüýýüýýýþýýþýþþþþþþÿÿþÿÿÿÿ
z
+ tRNS @æØf bKGD ˆ
H pHYs šœ JIDATÓc`E PÀzîÜ陇öíÞ±
u
L”õìiM.6Nµ
[Ö³._e=¥Á*kV°.˜5"Êz„‹MmçeŽ‹YgNšÐ eM©Û¸†Ín¶:+‚÷p²m^¿Z}ú4u îPeSZ!Ï&;½§»™À‚[6*²³±ËMìíl®¯€ ®Y½x‘Õô‰=íÍuåÙÁ•ËæΞÖßÙÞTYš—•–\4{úľŽæºŠ’¢Œ”˜0ˆàÌ©{@bŹ¢L‚aÁéý]mMRLâ"LüLþ>Ážî–:If &a& u/ˆ`G³4 “X†_ #¯D°I†E<;-.2ÄßLJÑ"XT–àáædn
+,QG†ÁœÔ„È0_ g[K3c}
ˆ +7
+
ƒ:`` † fO™ˆ IEND®B`‚
Added: trunk/apache2/icons/odf6odm-20x22.png
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/icons/odf6odm-20x22.png?rev=1383&op=file
==============================================================================
--- trunk/apache2/icons/odf6odm-20x22.png (added)
+++ trunk/apache2/icons/odf6odm-20x22.png Tue Dec 13 21:57:36 2011
@@ -1,0 +1,3 @@
+‰PNG
+
+
IHDR ÷ŸL4 [PLTEÙÙÙ---..../////33333™\\¬]\]]^^®™™™Ÿžž Ÿ ¡¡¡¢¢¡¢¢££¢£¤¤¤¤¥¥¦¦¦ÎÎÜÎÏÜÑÐÞÑÑÝÑÑßÒÑàÒÒàÓÓàÓÔàÕÕâ ×ØäØØäÚÚÚÛÚÛÛÛÛÜÛÜÛÜÛÜÜÛÜÜÜÜÝÜÝÝÜÝÝÝÝÞÞÞÞÝÞÞÞÞßÞÞßßßßßÞÞèàßßßàßàààßßéààááààáàáááàáááááââáááââââáâââãââãâãâãâãããããääããäãäãäääääääååäääåääåååååååææååæåæåæååæææææææççæçæçææçççççççèææñèççèçèçèèèèçèèèèçñéèéèééééèéééééêêééêéêéêééêêêêéêêêêêëëêëêëëëëëëëììëëìëìëìëëìììììììííììíìíìíííííîíííîííîîîîíîîîîîïïîïïïîïïïïïððïðïðïïðððððñððñðñðñððññññðñññññòñòñòòñòòòòòóóòòóòóòóòòóóóóòóóóóóôôóôóôóôôóôôôõôôõôõôõôôõõõõõõõööõõöõöõööööööö÷÷ö÷÷÷÷ø÷ø÷ø÷÷øøøøøøøùùùùùùúúùùúùúúúúûúúûúûúûûûûûüûûüüüýüüüýüýýüýýýþýýþýþþþþþþÿÿþÿÿÿÿû 3 tRNS @æØf bKGD ˆ
H pHYs šœ UIDATÓc`E PÀzâÄÑCÉ{vlÝ´ŽuL”õøQe.6N
MëV².œe=¢Är˱ΚÒeÝÇŦ°y,Ç¢¹¬“{ºšÁ¢¬± u«—±YLUdCà6N¶µ+—J±Oœ ÁMòl2‹$ÙÄ'¶µÖrXpÝjiv6v‰îöæÚÊ"˜à²¥sç˜Lìc©`NM‚.^0}ê„N1Ñâ|!&hˆàœ©»;šXDŠòr’˜ ‚“û»Ûšj‹rӢý!‚;[jŠ3“â£Ý ‚muEùL‚qaA>¼ŒvÁ¦ÚÒ¢¼t&þ o^F
+ˆ`MyQfjB £§#¹1D°$/=)&<ØGÑÉAÑÔP "‹ ñwS´µR4ÐÕ†¦ÅG¸»9ÙšèjªAY¹Q 8èÑ ƒb\
Þ$õ IEND®B`‚
Added: trunk/apache2/icons/odf6odp-20x22.png
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/icons/odf6odp-20x22.png?rev=1383&op=file
==============================================================================
--- trunk/apache2/icons/odf6odp-20x22.png (added)
+++ trunk/apache2/icons/odf6odp-20x22.png Tue Dec 13 21:57:36 2011
@@ -1,0 +1,3 @@
+‰PNG
+
+
IHDR ÷ŸL4 .PLTEÙÙÙ33333™\\¬]\]]^^®™™™ÎÎÜÎÏÜÑÐÞÑÑÝÑÑßÒÑàÒÒàÓÓàÓÔàÕÕâ ×ØäØØäÚÚÚÛÚÛÛÛÛÜÛÜÛÜÛÜÜÛÜÜÜÜÝÜÝÝÜÝÝÝÝÞÞÞÞÝÞÞÞÞßÞÞßßßßßÞÞèàßßßàßàààßßéààááààáàáááàáááááââáááââââáâââãââãâãâãâãããããääããäãäãäääääääååäääåääåååååååææååæåæåæååæææææææççæçæçææçççççççèææñèççèçèçèèèèçèèèèçñéèéèééééèéééééêêééêéêéêééêêêêéêêêêêëëêëêëëëëëëëììëëìëìëìëëìììììììííììíìíìíííííîíííîííîîîîíîîîîîïïîïïïîïïïïïððïðïðïïðððððñððñðñðñððññññðñññññòñòñòòñòòòòòóóòòóòóòóòòóóóóòóóóóóôôóôóôóôôóôôôõôôõôõôõôôõõõõõõõööõõöõöõööööööö÷÷ö÷÷÷÷ø÷ø÷ø÷÷øøøøøøøùùùùùùúúùùúùúúúúûúúûúûúûûûûûüûûüüüýüüüýüýýüýýýþýýþýþþþþþþÿÿþÿÿÿÿr§U tRNS @æØf bKGD ˆ
H pHYs šœ 0IDATÓc`D PÀ¸sç¶Í!kW.[<Ÿq&L”qÇ66&VÁÅóg1Nê
Š2nfþé“»[ë!¢ŒëÙ˜—Ìçc™ÜÇØR[]eô©›3I³Mˆ A‚ËY™æÍšÆÍÜÔ( ÁÅL¼“¹˜8šÊËòØ ,833gMEI^V2Lpú´¾^Õ¦šò¢¼Ì¤è°`ˆà”‰
mU%E¹) ‘¡>ÁÞ¶¦šÊâ¼ÌäøØ`wGˆ`‹PØ@›ªJ sS⣂|œ
Ì!‚åBùH*õ!‚ÅyiÉñÁ>îŽ6–ÆÚÁ\¡d$•*ÁT 2_[kcC]5%ˆ`¼P0’Jˆ`x€·‹£
¹±ž†Š¢œ”8D‘
€ƒŽA
00 i0P©"7¨Á IEND®B`‚
Added: trunk/apache2/icons/odf6ods-20x22.png
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/icons/odf6ods-20x22.png?rev=1383&op=file
==============================================================================
--- trunk/apache2/icons/odf6ods-20x22.png (added)
+++ trunk/apache2/icons/odf6ods-20x22.png Tue Dec 13 21:57:36 2011
@@ -1,0 +1,6 @@
+‰PNG
+
+
IHDR ÷ŸL4 .PLTEÙÙÙ33333™\\¬]\]]^^®™™™ÎÎÜÎÏÜÑÐÞÑÑÝÑÑßÒÑàÒÒàÓÓàÓÔàÕÕâ ×ØäØØäÚÚÚÛÚÛÛÛÛÜÛÜÛÜÛÜÜÛÜÜÜÜÝÜÝÝÜÝÝÝÝÞÞÞÞÝÞÞÞÞßÞÞßßßßßÞÞèàßßßàßàààßßéààááààáàáááàáááááââáááââââáâââãââãâãâãâãããããääããäãäãäääääääååäääåääåååååååææååæåæåæååæææææææççæçæçææçççççççèææñèççèçèçèèèèçèèèèçñéèéèééééèéééééêêééêéêéêééêêêêéêêêêêëëêëêëëëëëëëììëëìëìëìëëìììììììííììíìíìíííííîíííîííîîîîíîîîîîïïîïïïîïïïïïððïðïðïïðððððñððñðñðñððññññðñññññòñòñòòñòòòòòóóòòóòóòóòòóóóóòóóóóóôôóôóôóôôóôôôõôôõôõôõôôõõõõõõõööõõöõöõööööööö÷÷ö÷÷÷÷ø÷ø÷ø÷÷øøøøøøøùùùùùùúúùùúùúúúúûúúûúûúûûûûûüûûüüüýüüüýüýýüýýýþýýþýþþþþþþÿÿþÿÿÿÿr§U tRNS @æØf bKGD ˆ
H pHYs šœ )IDATÓc`D PÀ¸sç¶Í!kW.[<Ÿq&L”qÇ66&VÁÅóg1Nê
Š2nfþé“»[ë!¢ŒëÙ˜—Ìçc™ÜÇØR[]eô©›3I³Mˆ A‚ËY™æÍšÆÍÜÔ( ÁÅL¼“¹˜8šÊËòØ ,833gMEI^V2Lpú´¾^Õ¦šò¢¼Ì¤è°`ˆà”‰
mU%E¹) ‘¡>ÁÞ¶¦šÊâ¼ÌäøØ`wGˆ`‹2°6 •æ¦Ä ø89
+™CËQTêC‹
Ò’ã#‚
Ü
m,
´!‚¹(*U ‚©BÁ¾
.BÖƆºjB
+Áx•2Áð oG sc=
E9)qˆ #;
+
ƒ`` lþM<Aõp IEND®B`‚
Added: trunk/apache2/icons/odf6odt-20x22.png
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/icons/odf6odt-20x22.png?rev=1383&op=file
==============================================================================
--- trunk/apache2/icons/odf6odt-20x22.png (added)
+++ trunk/apache2/icons/odf6odt-20x22.png Tue Dec 13 21:57:36 2011
@@ -1,0 +1,4 @@
+‰PNG
+
+
IHDR ÷ŸL4 .PLTEÙÙÙ33333™\\¬]\]]^^®™™™ÎÎÜÎÏÜÑÐÞÑÑÝÑÑßÒÑàÒÒàÓÓàÓÔàÕÕâ ×ØäØØäÚÚÚÛÚÛÛÛÛÜÛÜÛÜÛÜÜÛÜÜÜÜÝÜÝÝÜÝÝÝÝÞÞÞÞÝÞÞÞÞßÞÞßßßßßÞÞèàßßßàßàààßßéààááààáàáááàáááááââáááââââáâââãââãâãâãâãããããääããäãäãäääääääååäääåääåååååååææååæåæåæååæææææææççæçæçææçççççççèææñèççèçèçèèèèçèèèèçñéèéèééééèéééééêêééêéêéêééêêêêéêêêêêëëêëêëëëëëëëììëëìëìëìëëìììììììííììíìíìíííííîíííîííîîîîíîîîîîïïîïïïîïïïïïððïðïðïïðððððñððñðñðñððññññðñññññòñòñòòñòòòòòóóòòóòóòóòòóóóóòóóóóóôôóôóôóôôóôôôõôôõôõôõôôõõõõõõõööõõöõöõööööööö÷÷ö÷÷÷÷ø÷ø÷ø÷÷øøøøøøøùùùùùùúúùùúùúúúúûúúûúûúûûûûûüûûüüüýüüüýüýýüýýýþýýþýþþþþþþÿÿþÿÿÿÿr§U tRNS @æØf bKGD ˆ
H pHYs šœ 5IDATÓc`D PÀ¸sç¶Í!kW.[<Ÿq&L”qÇ66&VÁÅóg1Nê
Š2nfþé“»[ë!¢ŒëÙ˜—Ìçc™ÜÇØR[]eô©›3I³Mˆ A‚ËY™æÍšÆÍÜÔ( ÁÅL¼“¹˜8šÊËòØ ,833gMEI^V2Lpú´¾^Õ¦šò¢¼Ì¤è°`ˆà”‰
mU%E¹) ‘¡>ÁÞ¶¦šÊâ¼ÌäøØ`wGˆ`‹2°6¡šCËËò3“bÂýÝm-Mõ!‚Å@ùx¡`2K!!mˆ`nFrTX §‹½•¹‘ž†
+D0U(BÈlž!+@ã#‚}Ü]
Ìõ´Uåd ‚áÞ.Ž@1
˜”8D‘
€ƒŽA
00 MO°ŸÉŸf IEND®B`‚
Added: trunk/apache2/icons/odf6otc-20x22.png
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/icons/odf6otc-20x22.png?rev=1383&op=file
==============================================================================
--- trunk/apache2/icons/odf6otc-20x22.png (added)
+++ trunk/apache2/icons/odf6otc-20x22.png Tue Dec 13 21:57:36 2011
@@ -1,0 +1,4 @@
+‰PNG
+
+
IHDR ÷ŸL4 FPLTEÙÙÙ!!!33344455533™\\¬]\]]^^®™™™¥¤¤¥¥¥¦¦¦¦§¦¦§§§§§¨¨¨¨¨©©©ªª©ªÎÎÜÎÏÜÑÐÞÑÑÝÑÑßÒÑàÒÒàÓÓàÓÔàÕÕâ ×ØäØØäÚÚÚÛÚÛÛÛÛÜÛÜÛÜÛÜÜÛÜÜÜÜÝÜÝÝÜÝÝÝÝÞÞÞÞÝÞÞÞÞßÞÞßßßßßÞÞèàßßßàßàààßßéààááààáàáááàáááááââáááââââáâââãââãâãâãâãããããääããäãäãäääääääååäääåääåååååååææååæåæåæååæææææææççæçæçææçççççççèææñèççèçèçèèèèçèèèèçñéèéèééééèéééééêêééêéêéêééêêêêéêêêêêëëêëêëëëëëëëììëëìëìëìëëìììììììííìììíííííîíííîííîîîîíîîîîîïïîïïïîïïïïïððïðïðïïðððððñðððñððññññðññññòñòòñòòòóòòóòóòóòòóóóóòóóóóóôôóôóôóôôóôôôõôôõôõôõôôõõõõõõõööõõöõöööööö÷÷ö÷÷÷÷ø÷ø÷ø÷÷øøøøøøøùùùùùùúúùùúùúúúúûúúûúûúûûûûûüûûüüüýüüüýüýýüýýýþýýþýþþþþþþÿÿþÿÿÿÿÎÚÓö tRNS @æØf bKGD ˆ
H pHYs šœ VIDATÓc`Bò ÀÀÀÀtðà¾Ý‰[7®[½|é¢y3
Á‚ö)r²rÈ^¾xÁìi‚Ì\`Á½
+¬ ³€EdŠ ³ Dp;'«ÜšåÒìs„Y™ù ‚Ñ uK°šMd櫯®ç`]¶x¾[oO;/3O1Dpµ,«Ô
qVÑÞæ¦*n¦<ˆàò%’l¬lb
-
Uå¹ÙÁó§O3êíh®«*ËÏHN€Î5qBO[C]eanZR\$Dpš|oGk}UY|VBLˆ D°O¾£$–- "ï ì•o¬,ÌIOô÷“w6ËW—äfÊÇÈÈ»ÉÛ@ëå‹ rääZå
ä- ‚•òòÉòaò>ò.òÖò†Á"ùÔ„¨Ð@/;+c}]ˆ`Ž<2Є¦ÄFú¹º8X›êi««@™¸P HA
00 ã*c=Wg–Á IEND®B`‚
Added: trunk/apache2/icons/odf6otf-20x22.png
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/icons/odf6otf-20x22.png?rev=1383&op=file
==============================================================================
--- trunk/apache2/icons/odf6otf-20x22.png (added)
+++ trunk/apache2/icons/odf6otf-20x22.png Tue Dec 13 21:57:36 2011
@@ -1,0 +1,4 @@
+‰PNG
+
+
IHDR ÷ŸL4 jPLTEÙÙÙ!!!&&&'''(((33344455533™\\¬]\]]^^®™™™žŸŸ ¡ ¡ ¡¡¡¢¡¡£¢££££¥¤¤¤¥¥¥¥¤¥¥¥¦¦¦¦§¦¦§§§§§¨¨¨¨¨©©©ªª©ªÎÎÜÎÏÜÑÐÞÑÑÝÑÑßÒÑàÒÒàÓÓàÓÔàÕÕâ ×ØäØØäÚÚÚÛÚÛÛÛÛÜÛÜÛÜÛÜÜÛÜÜÜÜÝÜÝÝÜÝÝÝÝÞÞÞÞÝÞÞÞÞßÞÞßßßßßÞÞèàßßßàßàààßßéààááààáàáááàáááááââáááââââáâââãââãâãâãâãããããääããäãäãäääääääååäääåääåååååååææååæåæåæååæææææææççæçæçææçççççççèææñèççèçèçèèèèçèèèèçñéèéèééééèéééééêêééêéêéêééêêêêéêêêêêëëêëêëëëëëëëììëëìëìëìëëìììììììííìììíííííîíííîííîîîîíîîîîîïïîïïïîïïïïïððïðïðïïðððððñðððñððññññðññññòñòòñòòòóòòóòóòóòòóóóóòóóóóóôôóôóôóôôóôôôõôôõôõôõôôõõõõõõõööõõöõöööööö÷÷ö÷÷÷÷ø÷ø÷ø÷÷øøøøøøøùùùùùùúúùùúùúúúúûúúûúûúûûûûûüûûüüüýüüüýüýýüýýýþýýþýþþþþþþÿÿþÿÿÿÿ[A´£ tRNS @æØf bKGD ˆ
H pHYs šœ \IDATÓc`EÚ ÀÀÀÀzöì©ã¹÷îÚ¾yãºUKåÁ‚gNéòppkmß¼~ÍòE²l¼`Á“:
±†]a,› Dð0‡ÖŽÍê\+äÙeÙ¤{ ‚é uÖp8Í‘e“êî€îææØ´~µ
+çÌ“%Ù$ê!‚Û59ÔV(s(Îìïke‚nÞ ÊÉÁ©4eBO[sMe9DpÍêÅ‹ìfNéïjkª.ÉÏ®\6wÎŒI`¿hçe¥BÍ™9eb7‹dM
KFBDpÖô)ýÝm’,â
Y© Q¡Á™“z;[k+DYDR££‚ ‚ý}íM5•¥"ÌBaA~
Áî¶úšŠÂ
fÁÐ Oˆ`kcMq~–0³@p€·»£-D°¨,-‘™?ćÉÞÚ"KMˆƒ¸ÓÊÜ"X™àÔjenl dåE¬ Am4ÀÀ b¢oüxÄ7 IEND®B`‚
Added: trunk/apache2/icons/odf6otg-20x22.png
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/icons/odf6otg-20x22.png?rev=1383&op=file
==============================================================================
--- trunk/apache2/icons/odf6otg-20x22.png (added)
+++ trunk/apache2/icons/odf6otg-20x22.png Tue Dec 13 21:57:36 2011
@@ -1,0 +1,4 @@
+‰PNG
+
+
IHDR ÷ŸL4 PLTEÙÙÙ!!!***+**+++++,,,,,,----33344455533™\\¬]\]]^^®™™™š›šŸŸ ŸŸ¡¡¡¢¢¢¢£¢¢£££££¤¤¤¥¤¤¤¥¥¥¥¥¦¦¦¦¦§¦§¦¦§§§§§¨¨¨¨¨©©©ªª©ªÎÎÜÎÏÜÑÐÞÑÑÝÑÑßÒÑàÒÒàÓÓàÓÔàÕÕâ ×ØäØØäÚÚÚÛÚÛÛÛÛÜÛÜÛÜÛÜÜÛÜÜÜÜÝÜÝÝÜÝÝÝÝÞÞÞÞÝÞÞÞÞßÞÞßßßßßÞÞèàßßßàßàààßßéààááààáàáááàáááááââáááââââáâââãââãâãâãâãããããääããäãäãäääääääååäääåääåååååååææååæåæåæååæææææææççæçæçææçççççççèææñèççèçèçèèèèçèèèèçñéèéèééééèéééééêêééêéêéêééêêêêéêêêêêëëêëêëëëëëëëììëëìëìëìëëìììììììííìììíííííîíííîííîîîîíîîîîîïïîïïïîïïïïïððïðïðïïðððððñðððñððññññðññññòñòòñòòòóòòóòóòóòòóóóóòóóóóóôôóôóôóôôóôôôõôôõôõôõôôõõõõõõõööõõöõöööööö÷÷ö÷÷÷÷ø÷ø÷ø÷÷øøøøøøøùùùùùùúúùùúùúúúúûúúûúûúûûûûûüûûüüüýüüüýüýýüýýýþýýþýþþþþþþÿÿþÿÿÿÿÐYzÔ tRNS @æØf bKGD ˆ
H pHYs šœ _IDATÓcàDF ÀÀÀÀyåÊÅs%'Ž
Ü·kÇÖkTÁ‚—/šððîÛµmóº•*\‚`Á Æ< ¿™[}¹
+—2Dð” áþ]z|ëÕ¸U¸”&Có@ê¶oæñ\¬Â¥8© "xˆŸgç¶MÚ¼ æÏ’ç’kƒî3àÑ]¯Å£±`ÚÔ^ÎFˆà®í:¼<¼š³&÷v57ÔA7oZµÒuÁly¹Î¦ê²bˆà†µKÏŸ9™C–£¡²´0"¸rñ‚Ù3&Éq4³Iç§'BΛ=mR/‡t8[Nzb DpÁÌ)z¤ÙªŠ ØD£Â!‚Ó¦öu6³K”秋²F†úC'õ¶5K±ƒ´²xC{:š«ØÄ2Sâ£Â
Y<\ ‚õbl)±ÑÁ¾ÌBÁúŠb6#`²–d§$F„ûy¸8ÚY™C9Q 'HÁ
00 ŒatŸ¶Lž IEND®B`‚
Added: trunk/apache2/icons/odf6oth-20x22.png
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/icons/odf6oth-20x22.png?rev=1383&op=file
==============================================================================
--- trunk/apache2/icons/odf6oth-20x22.png (added)
+++ trunk/apache2/icons/odf6oth-20x22.png Tue Dec 13 21:57:36 2011
@@ -1,0 +1,5 @@
+‰PNG
+
+
IHDR ÷ŸL4 XPLTEÙÙÙ!!!33344455533™\\¬]\]]^^®wwµxx¶yx·yy·zz¸{{¹™™™¥¤¤¥¥¥¦¦¦¦§¦¦§§§§§¨¨¨¨¨©©©ªª©ªÎÎÜÎÏÜÑÐÞÑÑÝÑÑßÒÑàÒÒàÓÓàÓÔàÕÕâ ×ØäØØäÚÚÚÛÚÛÛÛÛÜÛÜÛÜÛÜÜÛÜÜÜÜÝÜÝÝÜÝÝÝÝÞÞÞÞÝÞÞÞÞßÞÞßßßßßÞÞèàßßßàßàààßßéààááààáàáááàáááááââáááââââáâââãââãâãâãâãããããääããäãäãäääääääååäääåääåååååååææååæåæåæååæææææææççæçæçææçççççççèææñèççèçèçèèèèçèèèèçñéèéèééééèéééééêêééêéêéêééêêêêéêêêêêëëêëêëëëëëëëììëëìëìëìëëìììììììííìììíííííîíííîííîîîîíîîîîîïïîïïïîïïïïïððïðïðïïðððððñðððñððññññðññññòñòòñòòòóòòóòóòóòòóóóóòóóóóóôôóôóôóôôóôôôõôôõôõôõôôõõõõõõõööõõöõöööööö÷÷ö÷÷÷÷ø÷ø÷ø÷÷øøøøøøøùùùùùùúúùùúùúúúúûúúûúûúûûûûûüûûüüüýüüüýüýýüýýýþýýþýþþþþþþÿÿþÿÿÿÿl.B9 tRNS @æØf bKGD ˆ
H pHYs šœ ZIDATÓc`Bª ÀÀÀÀtüø‘ƒé»·oÙ¸võŠ%ó%Á‚ÇŽ¨s²r¨l\»rÙÂ9âÌ`ÁÃj¬ ´ŒEj–8³Dp/'«Ê¦µŠì‹$YÄ™EÛ ‚‰ u«–±ÚLgim‚nå`]³r©
ÛäI½ÂÌB•Áʬ
+‹dY¥'wv42•@×®’gce“éëjk¨-+.„.[:wŽÅä¾Î–†šÒ¼Ì4ˆàâÓ§Mêik©//ÎÉH‰‡Î™6¹¯»µ¡†Ÿ/-)*"8eb_'H è0Þ¨ˆàäžöæúr>VÖäxVn_/ˆ`gGcMY1P0*Œ•Ûà "ØÚPYV”ÍËÔÏål¬¯.ËÍL‰áùÖÑÚ
"XQ”–
ÀÍÅå`ij ŠÅGE{¹9Ú™›êC³’ãÂC¼bÖ@1]-ˆ “
+` 20¨¢ Si꺘 IEND®B`‚
Added: trunk/apache2/icons/odf6oti-20x22.png
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/icons/odf6oti-20x22.png?rev=1383&op=file
==============================================================================
--- trunk/apache2/icons/odf6oti-20x22.png (added)
+++ trunk/apache2/icons/odf6oti-20x22.png Tue Dec 13 21:57:36 2011
@@ -1,0 +1,4 @@
+‰PNG
+
+
IHDR ÷ŸL4
PLTEÙÙÙ!!!+++,,,,,----33344455533™\\¬]\]]^^®™™™¥¤¤¥¥¥¦¦¦¦§¦¦§§§§§¨¨¨¨¨©©©ªª©ª¸¸¸¹¸¸»»»»»¼¼»»¼¼¼½½½¾½½¾½¾½¾¾¾¾¾¿¾¾¾¿¾ÀÀÀÀÀÁÁÀÁÀÁÁÎÎÜÎÏÜÑÐÞÑÑÝÑÑßÒÑàÒÒàÓÓàÓÔàÕÕâ ×ØäØØäÚÚÚÛÚÛÛÛÛÜÛÜÛÜÛÜÜÛÜÜÜÜÝÜÝÝÜÝÝÝÝÞÞÞÞÝÞÞÞÞßÞÞßßßßßÞÞèàßßßàßàààßßéààááààáàáááàáááááââáááââââáâââãââãâãâãâãããããääããäãäãäääääääååäääåääåååååååææååæåæåæååæææææææççæçæçææçççççççèææñèççèçèçèèèèçèèèèçñéèéèééééèéééééêêééêéêéêééêêêêéêêêêêëëêëêëëëëëëëììëëìëìëìëëìììììììííìììíííííîíííîííîîîîíîîîîîïïîïïïîïïïïïððïðïðïïðððððñðððñððññññðññññòñòòñòòòóòòóòóòóòòóóóóòóóóóóôôóôóôóôôóôôôõôôõôõôõôôõõõõõõõööõõöõöööööö÷÷ö÷÷÷÷ø÷ø÷ø÷÷øøøøøøøùùùùùùúúùùúùúúúúûúúûúûúûûûûûüûûüüüýüüüýüýýüýýýþýýþýþþþþþþÿÿþÿÿÿÿF*6û tRNS @æØf bKGD ˆ
H pHYs šœ ZIDATÓc`C& ÀÀÀÀvíÚå e§Ž
>°g×öÍëÄÁ‚W/›ñrò سcë†Õ¢ì|`ÁK¦œ `¸•Cb¥(»Dð /§ñÁ=ÜÅ9DÙ
§B @êvnåô^*Ê.4e"Dðçî
[t¹-œ#È.Ð<`Ä©¿Q‡SkÑŒéýülÍÁ=;õ¸8¹´çÎœÚßÓÚÔ ÜºeÍj÷EsgLîïn©(
nZ¿léÂÙS'÷µ5U—çAW/]4wÖ”þîÖÆúÒÂÌdˆàâsg€Äª”˜å’ã ‚‹fO›Ô§Î¬RªÈ,Ã
œ1}B·‹*³³l¼Ix DpJ¿+³r©<³t\4“”/D°O“U¥¢8;-1&2D’É
"ØT–Ÿ• ìïaâl4AvÁʢܴä¨ÈÐ /7gKˆ
+` 20˜ æsv^Å´eE IEND®B`‚
Added: trunk/apache2/icons/odf6otp-20x22.png
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/icons/odf6otp-20x22.png?rev=1383&op=file
==============================================================================
--- trunk/apache2/icons/odf6otp-20x22.png (added)
+++ trunk/apache2/icons/odf6otp-20x22.png Tue Dec 13 21:57:36 2011
@@ -1,0 +1,5 @@
+‰PNG
+
+
IHDR ÷ŸL4 FPLTEÙÙÙ!!!33344455533™\\¬]\]]^^®™™™¥¤¤¥¥¥¦¦¦¦§¦¦§§§§§¨¨¨¨¨©©©ªª©ªÎÎÜÎÏÜÑÐÞÑÑÝÑÑßÒÑàÒÒàÓÓàÓÔàÕÕâ ×ØäØØäÚÚÚÛÚÛÛÛÛÜÛÜÛÜÛÜÜÛÜÜÜÜÝÜÝÝÜÝÝÝÝÞÞÞÞÝÞÞÞÞßÞÞßßßßßÞÞèàßßßàßàààßßéààááààáàáááàáááááââáááââââáâââãââãâãâãâãããããääããäãäãäääääääååäääåääåååååååææååæåæåæååæææææææççæçæçææçççççççèææñèççèçèçèèèèçèèèèçñéèéèééééèéééééêêééêéêéêééêêêêéêêêêêëëêëêëëëëëëëììëëìëìëìëëìììììììííìììíííííîíííîííîîîîíîîîîîïïîïïïîïïïïïððïðïðïïðððððñðððñððññññðññññòñòòñòòòóòòóòóòóòòóóóóòóóóóóôôóôóôóôôóôôôõôôõôõôõôôõõõõõõõööõõöõöööööö÷÷ö÷÷÷÷ø÷ø÷ø÷÷øøøøøøøùùùùùùúúùùúùúúúúûúúûúûúûûûûûüûûüüüýüüüýüýýüýýýþýýþýþþþþþþÿÿþÿÿÿÿÎÚÓö tRNS @æØf bKGD ˆ
H pHYs šœ ?IDATÓc`Bò ÀÀÀÀtðà¾Ý‰[7®[½|é¢y3
Á‚ö)r²rÈ^¾xÁìi‚Ì\`Á½
+¬ ³€EdŠ ³ Dp;'«ÜšåÒìs„Y™ù ‚Ñ uK°šMd櫯®ç`]¶x¾[oO;/3O1Dpµ,«Ô
qVÑÞæ¦*n¦<ˆàò%’l¬lb
-
Uå¹ÙÁó§O3êíh®«*ËÏHN€Î5qBO[C]eanZR\$DpÚ„ÞŽÖúª²‚œ¬„˜?ˆ`Ÿ|‡<xB{Ûk+ sÒb#ýýÜ] ‚ÍòÕH*m ‚õUÅ9© ‘!~žn¶ÁJù$•†Á" ²¨Ð@/;+c}]ˆ`Ž|’JMˆ`JlD Ÿ«‹ƒµ©¡ž¶º
+D‰ 0äÑ Ja&! IEND®B`‚
Added: trunk/apache2/icons/odf6ots-20x22.png
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/icons/odf6ots-20x22.png?rev=1383&op=file
==============================================================================
--- trunk/apache2/icons/odf6ots-20x22.png (added)
+++ trunk/apache2/icons/odf6ots-20x22.png Tue Dec 13 21:57:36 2011
@@ -1,0 +1,5 @@
+‰PNG
+
+
IHDR ÷ŸL4 FPLTEÙÙÙ!!!33344455533™\\¬]\]]^^®™™™¥¤¤¥¥¥¦¦¦¦§¦¦§§§§§¨¨¨¨¨©©©ªª©ªÎÎÜÎÏÜÑÐÞÑÑÝÑÑßÒÑàÒÒàÓÓàÓÔàÕÕâ ×ØäØØäÚÚÚÛÚÛÛÛÛÜÛÜÛÜÛÜÜÛÜÜÜÜÝÜÝÝÜÝÝÝÝÞÞÞÞÝÞÞÞÞßÞÞßßßßßÞÞèàßßßàßàààßßéààááààáàáááàáááááââáááââââáâââãââãâãâãâãããããääããäãäãäääääääååäääåääåååååååææååæåæåæååæææææææççæçæçææçççççççèææñèççèçèçèèèèçèèèèçñéèéèééééèéééééêêééêéêéêééêêêêéêêêêêëëêëêëëëëëëëììëëìëìëìëëìììììììííìììíííííîíííîííîîîîíîîîîîïïîïïïîïïïïïððïðïðïïðððððñðððñððññññðññññòñòòñòòòóòòóòóòóòòóóóóòóóóóóôôóôóôóôôóôôôõôôõôõôõôôõõõõõõõööõõöõöööööö÷÷ö÷÷÷÷ø÷ø÷ø÷÷øøøøøøøùùùùùùúúùùúùúúúúûúúûúûúûûûûûüûûüüüýüüüýüýýüýýýþýýþýþþþþþþÿÿþÿÿÿÿÎÚÓö tRNS @æØf bKGD ˆ
H pHYs šœ 8IDATÓc`Bò ÀÀÀÀtðà¾Ý‰[7®[½|é¢y3
Á‚ö)r²rÈ^¾xÁìi‚Ì\`Á½
+¬ ³€EdŠ ³ Dp;'«ÜšåÒìs„Y™ù ‚Ñ uK°šMd櫯®ç`]¶x¾[oO;/3O1Dpµ,«Ô
qVÑÞæ¦*n¦<ˆàò%’l¬lb
-
Uå¹ÙÁó§O3êíh®«*ËÏHN€Î5qBO[C]eanZR\$DpÚ„ÞŽÖúª²‚œ¬„˜?ˆ`Ÿ<2ð„öÊ7ÖVæÈ'ÄFúûÉ»@›QTÚ@ëå‹ rRäCü<Ý
ä- ‚•(*
!‚Eò© Q¡ò
vVÆòºÁ
•šÁ”؈@?WkSC=muˆ
+` 20È£ Pš]½n½Ç' IEND®B`‚
Added: trunk/apache2/icons/odf6ott-20x22.png
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/icons/odf6ott-20x22.png?rev=1383&op=file
==============================================================================
--- trunk/apache2/icons/odf6ott-20x22.png (added)
+++ trunk/apache2/icons/odf6ott-20x22.png Tue Dec 13 21:57:36 2011
@@ -1,0 +1,7 @@
+‰PNG
+
+
IHDR ÷ŸL4 FPLTEÙÙÙ!!!33344455533™\\¬]\]]^^®™™™¥¤¤¥¥¥¦¦¦¦§¦¦§§§§§¨¨¨¨¨©©©ªª©ªÎÎÜÎÏÜÑÐÞÑÑÝÑÑßÒÑàÒÒàÓÓàÓÔàÕÕâ ×ØäØØäÚÚÚÛÚÛÛÛÛÜÛÜÛÜÛÜÜÛÜÜÜÜÝÜÝÝÜÝÝÝÝÞÞÞÞÝÞÞÞÞßÞÞßßßßßÞÞèàßßßàßàààßßéààááààáàáááàáááááââáááââââáâââãââãâãâãâãããããääããäãäãäääääääååäääåääåååååååææååæåæåæååæææææææççæçæçææçççççççèææñèççèçèçèèèèçèèèèçñéèéèééééèéééééêêééêéêéêééêêêêéêêêêêëëêëêëëëëëëëììëëìëìëìëëìììììììííìììíííííîíííîííîîîîíîîîîîïïîïïïîïïïïïððïðïðïïðððððñðððñððññññðññññòñòòñòòòóòòóòóòóòòóóóóòóóóóóôôóôóôóôôóôôôõôôõôõôõôôõõõõõõõööõõöõöööööö÷÷ö÷÷÷÷ø÷ø÷ø÷÷øøøøøøøùùùùùùúúùùúùúúúúûúúûúûúûûûûûüûûüüüýüüüýüýýüýýýþýýþýþþþþþþÿÿþÿÿÿÿÎÚÓö tRNS @æØf bKGD ˆ
H pHYs šœ DIDATÓc`Bò ÀÀÀÀtðà¾Ý‰[7®[½|é¢y3
Á‚ö)r²rÈ^¾xÁìi‚Ì\`Á½
+¬ ³€EdŠ ³ Dp;'«ÜšåÒìs„Y™ù ‚Ñ uK°šMd櫯®ç`]¶x¾[oO;/3O1Dpµ,«Ô
qVÑÞæ¦*n¦<ˆàò%’l¬lb
-
Uå¹ÙÁó§O3êíh®«*ËÏHN€Î5qBO[C]eanZR\$DpÚ„ÞŽÖúª²‚œ¬„˜?ˆ`Ÿ<2ð„ö¢º@››ªË
+r3SbB¼Üœl ‚õ@ù
ù27yy ˆ`eiAzr\X »‹½µ©!D°H>U>
+lž
ëBsR"C‚|]
¬- õ´5!‚)±~®@1S ˜º
+D‰ 0äÑ ô¹`23‹S3 IEND®B`‚
Modified: trunk/apache2/patches/004_usr_bin_perl_0wnz_j00
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/004_usr_bin_perl_0wnz_j00?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/004_usr_bin_perl_0wnz_j00 (original)
+++ trunk/apache2/patches/004_usr_bin_perl_0wnz_j00 Tue Dec 13 21:57:36 2011
@@ -5,8 +5,8 @@
## DP: Call /usr/bin/perl in printenv, not /usr/local/bin/perl
@DPATCH@
---- apache2/docs/cgi-examples/printenv.orig Fri Sep 21 17:31:24 2001
-+++ apache2/docs/cgi-examples/printenv Fri Sep 21 17:31:29 2001
+--- a/docs/cgi-examples/printenv
++++ b/docs/cgi-examples/printenv
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
Modified: trunk/apache2/patches/008_make_include_safe
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/008_make_include_safe?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/008_make_include_safe (original)
+++ trunk/apache2/patches/008_make_include_safe Tue Dec 13 21:57:36 2011
@@ -5,8 +5,8 @@
## DP: Avoid including dpkg droppings in globbed includes.
@DPATCH@
---- apache2-2.2.0/server/config.c 2005-11-17 13:39:15.000000000 +0000
-+++ apache2-2.2.0/server/config.c 2006-01-27 17:06:19.000000000 +0000
+--- a/server/config.c
++++ b/server/config.c
@@ -34,6 +34,7 @@
#include "apr_portable.h"
#include "apr_file_io.h"
@@ -15,7 +15,7 @@
#define APR_WANT_STDIO
#define APR_WANT_STRFUNC
-@@ -1521,6 +1522,30 @@
+@@ -1543,6 +1544,30 @@
return strcmp(f1->fname,f2->fname);
}
@@ -46,7 +46,7 @@
static const char *process_resource_config_nofnmatch(server_rec *s,
const char *fname,
ap_directive_t **conftree,
-@@ -1564,7 +1589,8 @@
+@@ -1586,7 +1611,8 @@
while (apr_dir_read(&dirent, APR_FINFO_DIRENT, dirp) == APR_SUCCESS) {
/* strip out '.' and '..' */
if (strcmp(dirent.name, ".")
@@ -56,7 +56,7 @@
fnew = (fnames *) apr_array_push(candidates);
fnew->fname = ap_make_full_path(p, path, dirent.name);
}
-@@ -1692,7 +1718,8 @@
+@@ -1714,7 +1740,8 @@
if (strcmp(dirent.name, ".")
&& strcmp(dirent.name, "..")
&& (apr_fnmatch(pattern, dirent.name,
Modified: trunk/apache2/patches/009_apache2_has_dso
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/009_apache2_has_dso?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/009_apache2_has_dso (original)
+++ trunk/apache2/patches/009_apache2_has_dso Tue Dec 13 21:57:36 2011
@@ -5,9 +5,9 @@
## DP: Make apxs usable without having apache2 installed.
@DPATCH@
---- apache2/support/apxs.in 2003-04-05 11:07:55.000000000 +0200
-+++ apache2/support/apxs.in 2003-04-05 11:25:19.000000000 +0200
-@@ -237,18 +237,19 @@
+--- a/support/apxs.in
++++ b/support/apxs.in
+@@ -198,18 +198,19 @@
($httpd = $0) =~ s:support/apxs$::;
}
@@ -15,7 +15,12 @@
- error("$httpd not found or not executable");
- exit 1;
-}
--
++#commented out for Debian GNU/Linux. We know that apache2 has dso support
++#unless (-x "$httpd") {
++# error("$httpd not found or not executable");
++# exit 1;
++#}
+
-unless (grep /mod_so/, `. $envvars && $httpd -l`) {
- error("Sorry, no shared object support for Apache");
- error("available under your platform. Make sure");
@@ -23,12 +28,6 @@
- error("your server binary `$httpd'.");
- exit 1;
-}
-+#commented out for Debian GNU/Linux. We know that apache2 has dso support
-+#unless (-x "$httpd") {
-+# error("$httpd not found or not executable");
-+# exit 1;
-+#}
-+
+#unless (grep /mod_so/, `. $envvars && $httpd -l`) {
+# error("Sorry, no shared object support for Apache");
+# error("available under your platform. Make sure");
Modified: trunk/apache2/patches/010_fhs_compliance
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/010_fhs_compliance?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/010_fhs_compliance (original)
+++ trunk/apache2/patches/010_fhs_compliance Tue Dec 13 21:57:36 2011
@@ -5,9 +5,8 @@
## DP: Fix up FHS file locations for apache2 droppings.
@DPATCH@
-diff -urNad trunk~/config.layout trunk/config.layout
---- trunk~/config.layout 2010-02-07 01:01:14.000000000 +0100
-+++ trunk/config.layout 2010-02-07 01:01:42.858033215 +0100
+--- a/config.layout
++++ b/config.layout
@@ -314,11 +314,11 @@
manualdir: ${htdocsdir}/manual
cgidir: ${prefix}/usr/lib/cgi-bin
@@ -23,10 +22,9 @@
+ installbuilddir: ${prefix}/usr/share/apache2/build
errordir: ${datadir}/error
</Layout>
-diff -urNad trunk~/configure trunk/configure
---- trunk~/configure 2010-02-07 01:01:14.000000000 +0100
-+++ trunk/configure 2010-02-07 01:01:55.166032804 +0100
-@@ -18881,17 +18881,17 @@
+--- a/configure
++++ b/configure
+@@ -19110,17 +19110,17 @@
cat >>confdefs.h <<_ACEOF
@@ -47,10 +45,9 @@
_ACEOF
-diff -urNad trunk~/configure.in trunk/configure.in
---- trunk~/configure.in 2010-02-07 01:01:14.000000000 +0100
-+++ trunk/configure.in 2010-02-07 01:01:42.866058396 +0100
-@@ -649,11 +649,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -665,11 +665,11 @@
echo $MODLIST | $AWK -f $srcdir/build/build-modules-c.awk > modules.c
APR_EXPAND_VAR(ap_prefix, $prefix)
@@ -65,9 +62,8 @@
[Location of the MIME types config file, relative to the Apache root directory])
AC_DEFINE_UNQUOTED(APACHE_MPM_DIR, "$MPM_DIR",
[Location of the source for the current MPM])
-diff -urNad trunk~/include/ap_config_layout.h.in trunk/include/ap_config_layout.h.in
---- trunk~/include/ap_config_layout.h.in 2010-02-07 01:01:14.000000000 +0100
-+++ trunk/include/ap_config_layout.h.in 2010-02-07 01:01:42.866058396 +0100
+--- a/include/ap_config_layout.h.in
++++ b/include/ap_config_layout.h.in
@@ -60,5 +60,6 @@
#define DEFAULT_REL_LOGFILEDIR "@rel_logfiledir@"
#define DEFAULT_EXP_PROXYCACHEDIR "@exp_proxycachedir@"
Modified: trunk/apache2/patches/031_apxs2_sucks_more
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/031_apxs2_sucks_more?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/031_apxs2_sucks_more (original)
+++ trunk/apache2/patches/031_apxs2_sucks_more Tue Dec 13 21:57:36 2011
@@ -5,10 +5,9 @@
## DP: Make apxs2 use httpd.conf, instead of apache2.conf, plus other random fixes.
@DPATCH@
-diff -urNad trunk~/support/apxs.in trunk/support/apxs.in
---- trunk~/support/apxs.in 2010-07-16 20:24:58.337788441 +0200
-+++ trunk/support/apxs.in 2010-07-16 20:25:13.333807240 +0200
-@@ -190,7 +190,7 @@
+--- a/support/apxs.in
++++ b/support/apxs.in
+@@ -189,7 +189,7 @@
my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
$httpd = eval qq("$httpd");
$httpd = eval qq("$httpd");
@@ -17,7 +16,7 @@
$envvars = eval qq("$envvars");
$envvars = eval qq("$envvars");
-@@ -293,6 +293,7 @@
+@@ -292,6 +292,7 @@
$data =~ s|%TARGET%|$CFG_TARGET|sg;
$data =~ s|%PREFIX%|$prefix|sg;
$data =~ s|%INSTALLBUILDDIR%|$installbuilddir|sg;
@@ -25,7 +24,7 @@
my ($mkf, $mods, $src) = ($data =~ m|^(.+)-=#=-\n(.+)-=#=-\n(.+)|s);
-@@ -481,7 +482,7 @@
+@@ -480,7 +481,7 @@
if ($opt_i) {
push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" .
"$libtool' $f $CFG_LIBEXECDIR");
@@ -34,7 +33,7 @@
}
# determine module symbolname and filename
-@@ -517,7 +518,8 @@
+@@ -516,7 +517,8 @@
$filename = "mod_${name}.c";
}
my $dir = $CFG_LIBEXECDIR;
@@ -44,7 +43,7 @@
$dir =~ s|(.)$|$1/|;
$t =~ s|\.la$|.so|;
push(@lmd, sprintf("LoadModule %-18s %s", "${name}_module", "$dir$t"));
-@@ -528,17 +530,17 @@
+@@ -527,17 +529,17 @@
# activate module via LoadModule/AddModule directive
if ($opt_a or $opt_A) {
@@ -66,8 +65,8 @@
error("At least one `LoadModule' directive already has to exist.");
exit(1);
}
-@@ -614,15 +616,15 @@
- $content =~ s|^(.*\n)#?\s*$lmd[^\n]*\n|$1$c$lmd\n|s;
+@@ -616,15 +618,15 @@
+ $content =~ s|^(.*\n)#?\s*$lmd_re[^\n]*\n|$1$c$lmd\n|s;
}
$lmd =~ m|LoadModule\s+(.+?)_module.*|;
- notice("[$what module `$1' in $CFG_SYSCONFDIR/$CFG_TARGET.conf]");
@@ -87,7 +86,7 @@
} else {
notice("unable to open configuration file");
}
-@@ -646,8 +648,8 @@
+@@ -648,8 +650,8 @@
##
builddir=.
Modified: trunk/apache2/patches/032_suexec_is_shared
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/032_suexec_is_shared?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/032_suexec_is_shared (original)
+++ trunk/apache2/patches/032_suexec_is_shared Tue Dec 13 21:57:36 2011
@@ -5,9 +5,9 @@
## DP: Patch to allow suEXEC as shared.
@DPATCH@
---- apache2/os/unix/unixd.c 2004-09-27 19:53:29.000000000 -0600
-+++ apache2/os/unix/unixd.c 2004-09-27 19:56:57.000000000 -0600
-@@ -209,6 +209,10 @@
+--- a/os/unix/unixd.c
++++ b/os/unix/unixd.c
+@@ -266,6 +266,10 @@
/* Check for suexec */
unixd_config.suexec_enabled = 0;
Modified: trunk/apache2/patches/033_dbm_read_hash_or_btree
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/033_dbm_read_hash_or_btree?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/033_dbm_read_hash_or_btree (original)
+++ trunk/apache2/patches/033_dbm_read_hash_or_btree Tue Dec 13 21:57:36 2011
@@ -5,9 +5,9 @@
## DP: Be more liberal in the sorts of DBM files we accept.
@DPATCH@
---- apache2/support/dbmmanage.in 2004-09-28 00:28:58.000000000 -0600
-+++ apache2/support/dbmmanage.in 2004-09-28 00:29:33.000000000 -0600
-@@ -24,7 +24,7 @@
+--- a/support/dbmmanage.in
++++ b/support/dbmmanage.in
+@@ -25,7 +25,7 @@
BEGIN { @AnyDBM_File::ISA = qw(DB_File NDBM_File GDBM_File SDBM_File) }
use strict;
use Fcntl;
@@ -16,7 +16,7 @@
sub usage {
my $cmds = join "|", sort keys %dbmc::;
-@@ -154,7 +154,9 @@
+@@ -155,7 +155,9 @@
my($mode, $flags) = $command =~
/^(?:view|check)$/ ? (0644, O_RDONLY) : (0644, O_RDWR|O_CREAT);
@@ -27,7 +27,7 @@
dbmc->$command();
untie %DB;
-@@ -168,7 +168,7 @@
+@@ -167,7 +169,7 @@
srand (time ^ $$ or time ^ ($$ + ($$ << 15)));
}
else {
Modified: trunk/apache2/patches/034_apxs2_libtool_fixtastic
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/034_apxs2_libtool_fixtastic?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/034_apxs2_libtool_fixtastic (original)
+++ trunk/apache2/patches/034_apxs2_libtool_fixtastic Tue Dec 13 21:57:36 2011
@@ -4,9 +4,9 @@
## All lines beginning with `## DP:' are a description of the patch.
## DP: Make libtool happier
---- apache2/support/apxs.in
-+++ apache2/support/apxs.in
-@@ -409,7 +409,7 @@
+--- a/support/apxs.in
++++ b/support/apxs.in
+@@ -410,7 +410,7 @@
$la =~ s|\.c$|.la|;
my $o = $s;
$o =~ s|\.c$|.o|;
@@ -15,7 +15,7 @@
unshift(@objs, $lo);
}
-@@ -446,7 +446,7 @@
+@@ -447,7 +447,7 @@
$opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version $apr_ldflags";
}
Modified: trunk/apache2/patches/038_no_LD_LIBRARY_PATH
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/038_no_LD_LIBRARY_PATH?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/038_no_LD_LIBRARY_PATH (original)
+++ trunk/apache2/patches/038_no_LD_LIBRARY_PATH Tue Dec 13 21:57:36 2011
@@ -5,9 +5,9 @@
## DP: Remove LD_LIBRARY_PATH from envvars-std
@DPATCH@
---- apache2/support/envvars-std.in 2004-11-07 04:07:56.000000000 -0700
-+++ apache2/support/envvars-std.in 2004-11-07 04:08:08.000000000 -0700
-@@ -17,7 +17,4 @@
+--- a/support/envvars-std.in
++++ b/support/envvars-std.in
+@@ -18,7 +18,4 @@
#
# This file is generated from envvars-std.in
#
Modified: trunk/apache2/patches/045_suexec_log_cloexec.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/045_suexec_log_cloexec.dpatch?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/045_suexec_log_cloexec.dpatch (original)
+++ trunk/apache2/patches/045_suexec_log_cloexec.dpatch Tue Dec 13 21:57:36 2011
@@ -7,9 +7,8 @@
@DPATCH@
-diff -ru apache2-2.2.3.orig/support/suexec.c apache2-2.2.3/support/suexec.c
---- apache2-2.2.3.orig/support/suexec.c 2006-07-12 05:38:44.000000000 +0200
-+++ apache2-2.2.3/support/suexec.c 2007-05-24 18:37:04.000000000 +0200
+--- a/support/suexec.c
++++ b/support/suexec.c
@@ -46,6 +46,7 @@
#include <stdio.h>
#include <stdarg.h>
@@ -18,7 +17,7 @@
#ifdef HAVE_PWD_H
#include <pwd.h>
-@@ -596,17 +597,14 @@
+@@ -598,17 +599,14 @@
#endif /* AP_SUEXEC_UMASK */
/*
Modified: trunk/apache2/patches/047_fix_usage_message.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/047_fix_usage_message.dpatch?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/047_fix_usage_message.dpatch (original)
+++ trunk/apache2/patches/047_fix_usage_message.dpatch Tue Dec 13 21:57:36 2011
@@ -5,9 +5,8 @@
## DP: Add -X to the help message
@DPATCH@
-diff -urNad trunk~/server/main.c trunk/server/main.c
---- trunk~/server/main.c 2011-02-06 15:33:27.000000000 +0100
-+++ trunk/server/main.c 2011-02-06 15:38:54.900628737 +0100
+--- a/server/main.c
++++ b/server/main.c
@@ -353,7 +353,7 @@
#endif /* AP_MPM_WANT_SET_GRACEFUL_SHUTDOWN */
#endif
Modified: trunk/apache2/patches/052_logresolve_linelength.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/052_logresolve_linelength.dpatch?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/052_logresolve_linelength.dpatch (original)
+++ trunk/apache2/patches/052_logresolve_linelength.dpatch Tue Dec 13 21:57:36 2011
@@ -5,9 +5,8 @@
## DP: remove limit of 1024 bytes per line #331631
@DPATCH@
-diff -urNad trunk~/support/logresolve.c trunk/support/logresolve.c
---- trunk~/support/logresolve.c 2006-07-12 05:38:44.000000000 +0200
-+++ trunk/support/logresolve.c 2007-09-27 20:12:47.093217594 +0200
+--- a/support/logresolve.c
++++ b/support/logresolve.c
@@ -82,7 +82,7 @@
#endif
Modified: trunk/apache2/patches/057_disablemods.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/057_disablemods.dpatch?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/057_disablemods.dpatch (original)
+++ trunk/apache2/patches/057_disablemods.dpatch Tue Dec 13 21:57:36 2011
@@ -6,10 +6,9 @@
## DP: no optional modules enabled.
@DPATCH@
-diff -urNad trunk~/acinclude.m4 trunk/acinclude.m4
---- trunk~/acinclude.m4 2005-11-13 07:33:15.000000000 +0100
-+++ trunk/acinclude.m4 2008-03-14 01:28:42.379287995 +0100
-@@ -289,14 +289,19 @@
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -290,14 +290,19 @@
AC_ARG_ENABLE(modules,
APACHE_HELP_STRING(--enable-modules=MODULE-LIST,Space-separated list of modules to enable | "all" | "most"),[
@@ -37,12 +36,11 @@
])
AC_ARG_ENABLE(mods-shared,
-diff -urNad trunk~/configure trunk/configure
---- trunk~/configure 2008-01-10 17:54:40.000000000 +0100
-+++ trunk/configure 2008-03-14 01:31:55.675287371 +0100
-@@ -8106,6 +8106,10 @@
+--- a/configure
++++ b/configure
+@@ -7385,6 +7385,10 @@
# Check whether --enable-modules was given.
- if test "${enable_modules+set}" = set; then
+ if test "${enable_modules+set}" = set; then :
enableval=$enable_modules;
+ if test "$enableval" = "none"; then
+ module_default=no
@@ -51,7 +49,7 @@
for i in $enableval; do
if test "$i" = "all" -o "$i" = "most"; then
module_selection=$i
-@@ -8114,7 +8118,7 @@
+@@ -7393,7 +7397,7 @@
eval "enable_$i=yes"
fi
done
Modified: trunk/apache2/patches/058_suexec-CVE-2007-1742.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/058_suexec-CVE-2007-1742.dpatch?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/058_suexec-CVE-2007-1742.dpatch (original)
+++ trunk/apache2/patches/058_suexec-CVE-2007-1742.dpatch Tue Dec 13 21:57:36 2011
@@ -6,8 +6,8 @@
## DP: (the same for public_html* instead of public_html/* )
@DPATCH@
---- a/support/suexec.c (revision 644465)
-+++ b/support/suexec.c (working copy)
+--- a/support/suexec.c
++++ b/support/suexec.c
@@ -42,6 +42,7 @@
#if APR_HAVE_UNISTD_H
#include <unistd.h>
@@ -16,7 +16,7 @@
#include <stdio.h>
#include <stdarg.h>
-@@ -263,6 +264,7 @@
+@@ -264,6 +265,7 @@
struct group *gr; /* group entry holder */
struct stat dir_info; /* directory info holder */
struct stat prg_info; /* program info holder */
@@ -24,7 +24,7 @@
/*
* Start with a "clean" environment
-@@ -496,11 +498,16 @@
+@@ -499,11 +501,16 @@
exit(111);
}
@@ -42,7 +42,7 @@
log_err("cannot get docroot information (%s)\n", target_homedir);
exit(112);
}
-@@ -508,12 +515,18 @@
+@@ -511,12 +518,18 @@
else {
if (((chdir(AP_DOC_ROOT)) != 0) ||
((getcwd(dwd, AP_MAXPATH)) == NULL) ||
Modified: trunk/apache2/patches/067_fix_segfault_in_ab.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/067_fix_segfault_in_ab.dpatch?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/067_fix_segfault_in_ab.dpatch (original)
+++ trunk/apache2/patches/067_fix_segfault_in_ab.dpatch Tue Dec 13 21:57:36 2011
@@ -7,10 +7,9 @@
## Forwarded: https://issues.apache.org/bugzilla/show_bug.cgi?id=46393
@DPATCH@
-diff -urNad apache2-2.2.9~/support/ab.c apache2-2.2.9/support/ab.c
---- apache2-2.2.9~/support/ab.c 2008-05-28 05:58:01.000000000 -0700
-+++ apache2-2.2.9/support/ab.c 2008-11-29 15:47:41.000000000 -0800
-@@ -535,7 +535,6 @@
+--- a/support/ab.c
++++ b/support/ab.c
+@@ -548,7 +548,6 @@
for (i=1; i<count; i++) {
cert = (X509 *)SK_VALUE(sk, i);
ssl_print_cert_info(bio_out, cert);
Modified: trunk/apache2/patches/071_fix_cacheenable.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/071_fix_cacheenable.dpatch?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/071_fix_cacheenable.dpatch (original)
+++ trunk/apache2/patches/071_fix_cacheenable.dpatch Tue Dec 13 21:57:36 2011
@@ -5,11 +5,9 @@
## DP: r821333,r821538,r821539 from upstream svn
@DPATCH@
-diff --git a/modules/cache/cache_util.c b/modules/cache/cache_util.c
-index ec2d749..aec7b09 100644
--- a/modules/cache/cache_util.c
+++ b/modules/cache/cache_util.c
-@@ -27,41 +27,78 @@ extern module AP_MODULE_DECLARE_DATA cache_module;
+@@ -29,41 +29,78 @@
/* Determine if "url" matches the hostname, scheme and port and path
* in "filter". All but the path comparisons are case-insensitive.
*/
@@ -26,7 +24,13 @@
- }
+static int uri_meets_conditions(const apr_uri_t filter, const int pathlen,
+ const apr_uri_t url) {
-+
+
+- /* Compare the schemes */
+- if(filter.scheme) {
+- if (!url.scheme) {
+- return 0;
+- }
+- else if (strcasecmp(filter.scheme, url.scheme)) {
+ /* Scheme, hostname port and local part. The filter URI and the
+ * URI we test may have the following shapes:
+ * /<path>
@@ -39,13 +43,7 @@
+ * Note that this means that "/<path>" only matches local paths,
+ * and to match proxied paths one *must* specify the scheme.
+ */
-
-- /* Compare the schemes */
-- if(filter.scheme) {
-- if (!url.scheme) {
-- return 0;
-- }
-- else if (strcasecmp(filter.scheme, url.scheme)) {
++
+ /* Is the filter is just for a local path or a proxy URI? */
+ if (!filter.scheme) {
+ if (url.scheme || url.hostname) {
Modified: trunk/apache2/patches/073_mod_dav_trunk_fixes.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/073_mod_dav_trunk_fixes.dpatch?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/073_mod_dav_trunk_fixes.dpatch (original)
+++ trunk/apache2/patches/073_mod_dav_trunk_fixes.dpatch Tue Dec 13 21:57:36 2011
@@ -25,9 +25,8 @@
## DP: the DavLockDB. The old DavLockDB must be deleted on upgrade.
## DP: [Stefan Fritsch]
@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/modules/dav/fs/lock.c trunk/modules/dav/fs/lock.c
---- trunk~/modules/dav/fs/lock.c 2010-03-29 21:46:51.000000000 +0200
-+++ trunk/modules/dav/fs/lock.c 2010-03-29 21:49:00.970983302 +0200
+--- a/modules/dav/fs/lock.c
++++ b/modules/dav/fs/lock.c
@@ -48,9 +48,8 @@
**
** KEY
@@ -169,9 +168,8 @@
return NULL;
}
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/modules/dav/fs/repos.c trunk/modules/dav/fs/repos.c
---- trunk~/modules/dav/fs/repos.c 2010-03-29 21:46:51.000000000 +0200
-+++ trunk/modules/dav/fs/repos.c 2010-03-29 21:49:08.031078314 +0200
+--- a/modules/dav/fs/repos.c
++++ b/modules/dav/fs/repos.c
@@ -27,6 +27,10 @@
#include <stdio.h> /* for sprintf() */
#endif
@@ -461,10 +459,9 @@
continue;
}
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/modules/dav/main/mod_dav.c trunk/modules/dav/main/mod_dav.c
---- trunk~/modules/dav/main/mod_dav.c 2010-03-29 21:46:51.000000000 +0200
-+++ trunk/modules/dav/main/mod_dav.c 2010-03-29 21:49:00.966964568 +0200
-@@ -986,7 +986,10 @@
+--- a/modules/dav/main/mod_dav.c
++++ b/modules/dav/main/mod_dav.c
+@@ -998,7 +998,10 @@
if (rc != APR_SUCCESS) {
err = dav_new_error(r->pool, HTTP_INTERNAL_SERVER_ERROR, 0,
@@ -476,7 +473,7 @@
break;
}
-@@ -1009,8 +1012,10 @@
+@@ -1021,8 +1024,10 @@
rc = apr_bucket_read(b, &data, &len, APR_BLOCK_READ);
if (rc != APR_SUCCESS) {
err = dav_new_error(r->pool, HTTP_BAD_REQUEST, 0,
@@ -489,7 +486,7 @@
break;
}
-@@ -2966,6 +2971,7 @@
+@@ -2978,6 +2983,7 @@
{
dav_error *err;
dav_resource *resource;
@@ -497,7 +494,7 @@
const dav_hooks_locks *locks_hooks;
int result;
int depth;
-@@ -2997,6 +3003,20 @@
+@@ -3009,6 +3015,20 @@
if (err != NULL)
return dav_handle_err(r, err, NULL);
Modified: trunk/apache2/patches/074_link_support_progs_with_lcrypt.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/074_link_support_progs_with_lcrypt.dpatch?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/074_link_support_progs_with_lcrypt.dpatch (original)
+++ trunk/apache2/patches/074_link_support_progs_with_lcrypt.dpatch Tue Dec 13 21:57:36 2011
@@ -6,10 +6,9 @@
## DP: binutils-gold (bug #553946)
@DPATCH@
-diff -urNad trunk~/configure trunk/configure
---- trunk~/configure 2009-12-05 23:44:43.501042252 +0100
-+++ trunk/configure 2009-12-05 23:47:07.640043829 +0100
-@@ -14628,11 +14628,11 @@
+--- a/configure
++++ b/configure
+@@ -14831,11 +14831,11 @@
fi
@@ -23,9 +22,8 @@
ab_LTFLAGS=""
checkgid_LTFLAGS=""
htcacheclean_LTFLAGS=""
-diff -urNad trunk~/support/config.m4 trunk/support/config.m4
---- trunk~/support/config.m4 2006-12-24 15:40:19.000000000 +0100
-+++ trunk/support/config.m4 2009-12-05 23:47:29.388150162 +0100
+--- a/support/config.m4
++++ b/support/config.m4
@@ -1,8 +1,8 @@
-htpasswd_LTFLAGS=""
+htpasswd_LTFLAGS="-lcrypt"
Modified: trunk/apache2/patches/075_mod_rewrite_literal_ipv6_redirect.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/075_mod_rewrite_literal_ipv6_redirect.dpatch?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/075_mod_rewrite_literal_ipv6_redirect.dpatch (original)
+++ trunk/apache2/patches/075_mod_rewrite_literal_ipv6_redirect.dpatch Tue Dec 13 21:57:36 2011
@@ -5,10 +5,9 @@
## DP: Add [] to literal ipv6 hosts in URLs (bug #557015)
@DPATCH@
-diff -urNad trunk~/modules/mappers/mod_rewrite.c trunk/modules/mappers/mod_rewrite.c
---- trunk~/modules/mappers/mod_rewrite.c 2009-07-10 14:20:45.000000000 +0200
-+++ trunk/modules/mappers/mod_rewrite.c 2009-12-06 00:10:57.468047872 +0100
-@@ -833,6 +833,23 @@
+--- a/modules/mappers/mod_rewrite.c
++++ b/modules/mappers/mod_rewrite.c
+@@ -840,6 +840,23 @@
}
/*
@@ -32,7 +31,7 @@
* add 'http[s]://ourhost[:ourport]/' to URI
* if URI is still not fully qualified
*/
-@@ -843,7 +860,7 @@
+@@ -853,7 +870,7 @@
char *thisport;
int port;
@@ -41,7 +40,7 @@
port = ap_get_server_port(r);
thisport = ap_is_default_port(port, r)
? ""
-@@ -4271,7 +4288,7 @@
+@@ -4290,7 +4307,7 @@
*/
/* add the canonical URI of this URL */
Modified: trunk/apache2/patches/076_apxs2_a2enmod.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/076_apxs2_a2enmod.dpatch?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/076_apxs2_a2enmod.dpatch (original)
+++ trunk/apache2/patches/076_apxs2_a2enmod.dpatch Tue Dec 13 21:57:36 2011
@@ -5,9 +5,8 @@
## DP: Make apxs2 use a2enmod and /etc/apache2/mods-available
@DPATCH@
-diff -urNad trunk~/support/apxs.in trunk/support/apxs.in
---- trunk~/support/apxs.in 2010-01-02 21:52:57.828866228 +0100
-+++ trunk/support/apxs.in 2010-01-02 21:55:48.375597120 +0100
+--- a/support/apxs.in
++++ b/support/apxs.in
@@ -521,7 +521,7 @@
# $dir =~ s|^$CFG_PREFIX/?||;
$dir =~ s|(.)$|$1/|;
Modified: trunk/apache2/patches/077_CacheIgnoreURLSessionIdentifiers.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/077_CacheIgnoreURLSessionIdentifiers.dpatch?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/077_CacheIgnoreURLSessionIdentifiers.dpatch (original)
+++ trunk/apache2/patches/077_CacheIgnoreURLSessionIdentifiers.dpatch Tue Dec 13 21:57:36 2011
@@ -5,11 +5,9 @@
## DP: r892289, r897705 from upstream svn. Debian bug #556383
@DPATCH@
-diff --git a/modules/cache/cache_storage.c b/modules/cache/cache_storage.c
-index c122bdd..a44b9e4 100644
--- a/modules/cache/cache_storage.c
+++ b/modules/cache/cache_storage.c
-@@ -498,28 +498,60 @@ apr_status_t cache_generate_key_default(request_rec *r, apr_pool_t* p,
+@@ -505,28 +505,60 @@
&& (*(param + len + 1) == '=')
&& !strchr(param + len + 2, '/')) {
path = apr_pstrndup(p, path, param - path);
Modified: trunk/apache2/patches/079_polish_translation.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/079_polish_translation.dpatch?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/079_polish_translation.dpatch (original)
+++ trunk/apache2/patches/079_polish_translation.dpatch Tue Dec 13 21:57:36 2011
@@ -5,10 +5,9 @@
## DP: #570228
@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/docs/error/HTTP_NOT_FOUND.html.var trunk/docs/error/HTTP_NOT_FOUND.html.var
---- trunk~/docs/error/HTTP_NOT_FOUND.html.var 2005-11-13 14:22:28.000000000 +0100
-+++ trunk/docs/error/HTTP_NOT_FOUND.html.var 2010-02-20 11:37:08.229021346 +0100
-@@ -292,7 +292,7 @@
+--- a/docs/error/HTTP_NOT_FOUND.html.var
++++ b/docs/error/HTTP_NOT_FOUND.html.var
+@@ -289,7 +289,7 @@
o problemie.
<!--#else -->
Modified: trunk/apache2/patches/082_ab_num_requests.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/082_ab_num_requests.dpatch?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/082_ab_num_requests.dpatch (original)
+++ trunk/apache2/patches/082_ab_num_requests.dpatch Tue Dec 13 21:57:36 2011
@@ -5,9 +5,8 @@
## DP: Upstream r940526, Debian bug #541158
@DPATCH@
-diff -urNad trunk~/support/ab.c trunk/support/ab.c
---- trunk~/support/ab.c 2010-07-16 22:17:41.697762479 +0200
-+++ trunk/support/ab.c 2010-07-16 22:17:45.661763246 +0200
+--- a/support/ab.c
++++ b/support/ab.c
@@ -628,6 +628,10 @@
static void write_request(struct connection * c)
@@ -35,7 +34,7 @@
#ifdef USE_SSL
if (c->ssl) {
ssl_proceed_handshake(c);
-@@ -1766,7 +1770,6 @@
+@@ -1768,7 +1772,6 @@
}
else {
c->state = STATE_CONNECTED;
Modified: trunk/apache2/patches/083_CVE-2011-3368.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/083_CVE-2011-3368.dpatch?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/083_CVE-2011-3368.dpatch (original)
+++ trunk/apache2/patches/083_CVE-2011-3368.dpatch Tue Dec 13 21:57:36 2011
@@ -22,11 +22,9 @@
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1179525 13f79535-47bb-0310-9956-ffa450edef68
-diff --git a/server/protocol.c b/server/protocol.c
-index 55468fc..b45851a 100644
--- a/server/protocol.c
+++ b/server/protocol.c
-@@ -640,6 +640,25 @@ static int read_request_line(request_rec *r, apr_bucket_brigade *bb)
+@@ -640,6 +640,25 @@
ap_parse_uri(r, uri);
Modified: trunk/apache2/patches/084_CVE-2011-4317.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/084_CVE-2011-4317.dpatch?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/084_CVE-2011-4317.dpatch (original)
+++ trunk/apache2/patches/084_CVE-2011-4317.dpatch Tue Dec 13 21:57:36 2011
@@ -22,11 +22,9 @@
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209432 13f79535-47bb-0310-9956-ffa450edef68
-diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
-index 470e01c..d29cb45 100644
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
-@@ -4419,6 +4419,18 @@ static int hook_uri2file(request_rec *r)
+@@ -4283,6 +4283,18 @@
return DECLINED;
}
@@ -45,11 +43,9 @@
/*
* add the SCRIPT_URL variable to the env. this is a bit complicated
* due to the fact that apache uses subrequests and internal redirects
-diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
-index 35195f8..8e90c9e 100644
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
-@@ -655,6 +655,18 @@ static int proxy_trans(request_rec *r)
+@@ -566,6 +566,18 @@
return OK;
}
Modified: trunk/apache2/patches/085_CVE-2011-3607.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/085_CVE-2011-3607.dpatch?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/085_CVE-2011-3607.dpatch (original)
+++ trunk/apache2/patches/085_CVE-2011-3607.dpatch Tue Dec 13 21:57:36 2011
@@ -5,9 +5,8 @@
## DP: Fix integer overflow, based on upstream r1198940
@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/server/util.c trunk/server/util.c
---- trunk~/server/util.c 2011-05-19 04:17:37.000000000 +0200
-+++ trunk/server/util.c 2011-12-03 18:46:39.875941529 +0100
+--- a/server/util.c
++++ b/server/util.c
@@ -366,7 +366,7 @@
char *dest, *dst;
char c;
Modified: trunk/apache2/patches/099_config_guess_sub_update.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/099_config_guess_sub_update.dpatch?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/099_config_guess_sub_update.dpatch (original)
+++ trunk/apache2/patches/099_config_guess_sub_update.dpatch Tue Dec 13 21:57:36 2011
@@ -5,9 +5,8 @@
## DP: No description.
@DPATCH@
-diff -urNad apache2-2.2.3~/config.guess apache2-2.2.3/config.guess
---- apache2-2.2.3~/config.guess 1970-01-01 01:00:00.000000000 +0100
-+++ apache2-2.2.3/config.guess 2006-09-27 21:50:35.000000000 +0200
+--- /dev/null
++++ b/config.guess
@@ -0,0 +1,1500 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
@@ -1509,9 +1508,8 @@
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
-diff -urNad apache2-2.2.3~/config.sub apache2-2.2.3/config.sub
---- apache2-2.2.3~/config.sub 1970-01-01 01:00:00.000000000 +0100
-+++ apache2-2.2.3/config.sub 2006-09-27 21:50:35.000000000 +0200
+--- /dev/null
++++ b/config.sub
@@ -0,0 +1,1608 @@
+#! /bin/sh
+# Configuration validation subroutine script.
Modified: trunk/apache2/patches/201_build_suexec-custom.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/201_build_suexec-custom.dpatch?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/201_build_suexec-custom.dpatch (original)
+++ trunk/apache2/patches/201_build_suexec-custom.dpatch Tue Dec 13 21:57:36 2011
@@ -5,10 +5,9 @@
## DP: add suexec-custom to the build system
@DPATCH@
-diff -urNad trunk~/Makefile.in trunk/Makefile.in
---- trunk~/Makefile.in 2007-04-24 13:08:01.000000000 +0200
-+++ trunk/Makefile.in 2008-04-02 23:03:53.928260185 +0200
-@@ -221,7 +221,7 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -225,7 +225,7 @@
fi
suexec:
@@ -17,9 +16,8 @@
x-local-distclean:
@rm -rf autom4te.cache
-diff -urNad trunk~/support/Makefile.in trunk/support/Makefile.in
---- trunk~/support/Makefile.in 2008-04-02 23:03:30.000000000 +0200
-+++ trunk/support/Makefile.in 2008-04-02 23:03:39.188260967 +0200
+--- a/support/Makefile.in
++++ b/support/Makefile.in
@@ -1,7 +1,7 @@
DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \
logresolve.pl phf_abuse_log.cgi split-logfile envvars-std
@@ -27,7 +25,7 @@
-CLEAN_TARGETS = suexec
+CLEAN_TARGETS = suexec suexec-custom
- PROGRAMS = htpasswd htdigest rotatelogs logresolve ab checkgid htdbm htcacheclean httxt2dbm
+ PROGRAMS = htpasswd htdigest rotatelogs logresolve ab htdbm htcacheclean httxt2dbm $(NONPORTABLE_SUPPORT)
TARGETS = $(PROGRAMS)
@@ -62,6 +62,10 @@
suexec: $(suexec_OBJECTS)
Modified: trunk/apache2/patches/202_suexec-custom.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/202_suexec-custom.dpatch?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/202_suexec-custom.dpatch (original)
+++ trunk/apache2/patches/202_suexec-custom.dpatch Tue Dec 13 21:57:36 2011
@@ -5,9 +5,8 @@
## DP: the actual patch to make suexec-custom read a config file
@DPATCH@
-diff -urNad trunk~/support/suexec-custom.c trunk/support/suexec-custom.c
---- trunk~/support/suexec-custom.c 2008-05-04 19:41:30.559379143 +0200
-+++ trunk/support/suexec-custom.c 2008-05-04 19:42:30.817574842 +0200
+--- a/support/suexec-custom.c
++++ b/support/suexec-custom.c
@@ -29,6 +29,7 @@
*
*
@@ -177,7 +176,7 @@
* Error out if the target username is invalid.
*/
if (strspn(target_uname, "1234567890") != strlen(target_uname)) {
-@@ -506,7 +564,7 @@
+@@ -508,7 +566,7 @@
if (userdir) {
if (((chdir(target_homedir)) != 0) ||
@@ -186,7 +185,7 @@
((getcwd(dwd, AP_MAXPATH)) == NULL) ||
((fchdir(cwdh)) != 0)) {
log_err("cannot get docroot information (%s)\n", target_homedir);
-@@ -514,10 +572,10 @@
+@@ -516,10 +574,10 @@
}
}
else {
Copied: trunk/apache2/patches/series (from r1377, trunk/apache2/patches/00list)
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/series?rev=1383&op=diff
==============================================================================
--- trunk/apache2/patches/00list (original)
+++ trunk/apache2/patches/series Tue Dec 13 21:57:36 2011
@@ -1,4 +1,3 @@
-001_branding
004_usr_bin_perl_0wnz_j00
008_make_include_safe
009_apache2_has_dso
@@ -21,11 +20,15 @@
076_apxs2_a2enmod.dpatch
077_CacheIgnoreURLSessionIdentifiers.dpatch
079_polish_translation.dpatch
-082_ab_num_requests
+082_ab_num_requests.dpatch
083_CVE-2011-3368.dpatch
084_CVE-2011-4317.dpatch
085_CVE-2011-3607.dpatch
-099_config_guess_sub_update
-200_cp_suexec.dpatch
+099_config_guess_sub_update.dpatch
201_build_suexec-custom.dpatch
-202_suexec-custom.dpatch
+# The patch below must not be applied by quilt at extraction time. It depends
+# on some script-fu to be executed before. Have a look
+# to debian/rules' prepare-custom-suexec target.
+# If you're aware of that you can uncomment it at any time later and work on it
+# as you wish.
+#202_suexec-custom.dpatch
Modified: trunk/apache2/rules
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/rules?rev=1383&op=diff
==============================================================================
--- trunk/apache2/rules (original)
+++ trunk/apache2/rules Tue Dec 13 21:57:36 2011
@@ -1,339 +1,310 @@
-#! /usr/bin/make -f
-
-# Code for httpd 2.1, based on apache2 and others.
-# Copyright (C) Canonical Ltd, 2005
-
-export DEB_BUILD_OPTIONS
-export DH_OPTIONS
-
-SHELL := sh -e
-
-#enable dpatch
-include /usr/share/dpatch/dpatch.make
-
-# These are used for cross-compiling and for saving the configure script
-# # from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Some caveats:
+# 1) This rules file is based on the short dh(1) form. However, it needs a lot
+# of overrides to achieve what we want. The basic outline is to build the
+# source three four times, once for each supported MPM.
+# 2) The modules aren't built for all MPMs. Given that the builtin modules are
+# the same for all MPMs it is possible to cross-load a module built for one
+# MPM in any other. Hence, we build modules only for the worker MPM and reuse
+# it for all the remaining MPMs. The worker $(DEFAULT_MPM) is the basic
+# installation path where packages are being built from. From the remaining
+# MPMs only the respective binaries are taken.
+# 3) The ITK MPM needs modification in the source tree. Hence it is absolutely
+# necessary to copy the source tree before applying patches which enable the
+# ITK. For the remaining MPMs that's not stricly necessary
+# 4) There are being built two flavors of suexec. One is supplied upstream,
+# another one is a Debian improvement which allows customization. The latter
+# suexec-custom binary is built from a copy-and-patched suexec source at
+# compile time.
+# 5) Special care must be taken to avoid having -DPLATFORM defined for apxs2.
+# 6) dh_install is not powerful enough to us. We need to copy and move into
+# (future) binary packages.See various dh_install* overrides to get the idea.
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+BUILD_DIR=debian/build-tree
+INSTALL_DIR_RELATIVE=install-tree
+INSTALL_DIR=debian/$(INSTALL_DIR_RELATIVE)
LSB_RELEASE := $(shell lsb_release -i -s)
-
-CONFFLAGS += ac_cv_prog_AWK=mawk ac_cv_prog_LYNX_PATH=www-browser
+DEFAULT_MPM=$(INSTALL_DIR)/worker
+
+MPMS=worker prefork event itk
AP2_COMMON_CONFARGS = --enable-layout=Debian --enable-so \
--with-program-name=apache2 \
- --with-ldap=yes --with-ldap-include=/usr/include \
- --with-ldap-lib=/usr/lib \
- --with-suexec-caller=www-data \
- --with-suexec-bin=/usr/lib/apache2/suexec \
- --with-suexec-docroot=/var/www \
- --with-suexec-userdir=public_html \
- --with-suexec-logfile=/var/log/apache2/suexec.log \
- --with-suexec-uidmin=100 \
- --enable-suexec=shared \
- --enable-log-config=static --enable-logio=static \
- --with-apr=/usr/bin/apr-1-config \
- --with-apr-util=/usr/bin/apu-1-config \
- --with-pcre=yes \
- --enable-pie
-
-AP2_MODS_CONFARGS = --enable-authn-alias=shared --enable-authnz-ldap=shared \
- --enable-disk-cache=shared --enable-cache=shared \
- --enable-mem-cache=shared --enable-file-cache=shared \
- --enable-cern-meta=shared --enable-dumpio=shared --enable-ext-filter=shared \
- --enable-charset-lite=shared --enable-cgi=shared \
- --enable-dav-lock=shared --enable-log-forensic=shared \
- --enable-ldap=shared --enable-proxy=shared \
- --enable-proxy-connect=shared --enable-proxy-ftp=shared \
- --enable-proxy-http=shared --enable-proxy-ajp=shared \
- --enable-proxy-scgi=shared \
- --enable-proxy-balancer=shared --enable-ssl=shared \
- --enable-authn-dbm=shared --enable-authn-anon=shared \
- --enable-authn-dbd=shared --enable-authn-file=shared \
- --enable-authn-default=shared --enable-authz-host=shared \
- --enable-authz-groupfile=shared --enable-authz-user=shared \
- --enable-authz-dbm=shared --enable-authz-owner=shared \
- --enable-authnz-ldap=shared --enable-authz-default=shared \
- --enable-auth-basic=shared --enable-auth-digest=shared \
- --enable-dbd=shared --enable-deflate=shared \
- --enable-include=shared --enable-filter=shared \
- --enable-env=shared --enable-mime-magic=shared \
- --enable-expires=shared --enable-headers=shared \
- --enable-ident=shared --enable-usertrack=shared \
- --enable-unique-id=shared --enable-setenvif=shared \
- --enable-version=shared --enable-status=shared \
- --enable-autoindex=shared --enable-asis=shared \
- --enable-info=shared --enable-cgid=shared \
- --enable-dav=shared --enable-dav-fs=shared \
- --enable-vhost-alias=shared --enable-negotiation=shared \
- --enable-dir=shared --enable-imagemap=shared \
- --enable-actions=shared --enable-speling=shared \
- --enable-userdir=shared --enable-alias=shared \
- --enable-rewrite=shared --enable-mime=shared \
- --enable-substitute=shared --enable-reqtimeout=shared
-
-AP2_CFLAGS = $(CFLAGS) -g -pipe -I/usr/include/xmltok -I/usr/include/openssl -Wall -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -fstack-protector
-AP2_LDFLAGS = -Wl,--as-needed -Wl,-z,relro
-
-#support noopt building
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- AP2_CFLAGS += -O0
-else
- AP2_CFLAGS += -O2
-endif
+ --with-ldap=yes --with-ldap-include=/usr/include \
+ --with-ldap-lib=/usr/lib \
+ --with-suexec-caller=www-data \
+ --with-suexec-bin=/usr/lib/apache2/suexec \
+ --with-suexec-docroot=/var/www \
+ --with-suexec-userdir=public_html \
+ --with-suexec-logfile=/var/log/apache2/suexec.log \
+ --with-suexec-uidmin=100 \
+ --enable-suexec=shared \
+ --enable-log-config=static --enable-logio=static \
+ --with-apr=/usr/bin/apr-1-config \
+ --with-apr-util=/usr/bin/apu-1-config \
+ --with-pcre=yes \
+ --enable-pie
+
+AP2_worker_CONFARGS = --enable-authn-alias=shared --enable-authnz-ldap=shared \
+ --enable-disk-cache=shared --enable-cache=shared \
+ --enable-mem-cache=shared --enable-file-cache=shared \
+ --enable-cern-meta=shared --enable-dumpio=shared --enable-ext-filter=shared \
+ --enable-charset-lite=shared --enable-cgi=shared \
+ --enable-dav-lock=shared --enable-log-forensic=shared \
+ --enable-ldap=shared --enable-proxy=shared \
+ --enable-proxy-connect=shared --enable-proxy-ftp=shared \
+ --enable-proxy-http=shared --enable-proxy-ajp=shared \
+ --enable-proxy-scgi=shared \
+ --enable-proxy-balancer=shared --enable-ssl=shared \
+ --enable-authn-dbm=shared --enable-authn-anon=shared \
+ --enable-authn-dbd=shared --enable-authn-file=shared \
+ --enable-authn-default=shared --enable-authz-host=shared \
+ --enable-authz-groupfile=shared --enable-authz-user=shared \
+ --enable-authz-dbm=shared --enable-authz-owner=shared \
+ --enable-authnz-ldap=shared --enable-authz-default=shared \
+ --enable-auth-basic=shared --enable-auth-digest=shared \
+ --enable-dbd=shared --enable-deflate=shared \
+ --enable-include=shared --enable-filter=shared \
+ --enable-env=shared --enable-mime-magic=shared \
+ --enable-expires=shared --enable-headers=shared \
+ --enable-ident=shared --enable-usertrack=shared \
+ --enable-unique-id=shared --enable-setenvif=shared \
+ --enable-version=shared --enable-status=shared \
+ --enable-autoindex=shared --enable-asis=shared \
+ --enable-info=shared --enable-cgid=shared \
+ --enable-dav=shared --enable-dav-fs=shared \
+ --enable-vhost-alias=shared --enable-negotiation=shared \
+ --enable-dir=shared --enable-imagemap=shared \
+ --enable-actions=shared --enable-speling=shared \
+ --enable-userdir=shared --enable-alias=shared \
+ --enable-rewrite=shared --enable-mime=shared \
+ --enable-substitute=shared --enable-reqtimeout=shared
+AP2_prefork_CONFARGS=--enable-modules=none
+AP2_event_CONFARGS=$(AP2_prefork_CONFARGS)
+AP2_itk_CONFARGS=$(AP2_prefork_CONFARGS)
+
+AP2_CFLAGS = -pipe -I/usr/include/xmltok -I/usr/include/openssl -Wall $(shell dpkg-buildflags --get CFLAGS)
+AP2_LDFLAGS = -Wl,--as-needed $(shell dpkg-buildflags --get LDFLAGS)
+AP2_CPPFLAGS = -DPLATFORM='\"$(LSB_RELEASE)\"' $(shell dpkg-buildflags --get CPPFLAGS)
+CONFFLAGS += ac_cv_prog_AWK=mawk ac_cv_prog_LYNX_PATH=www-browser
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
DEB_BUILD_STRIP = yes
endif
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- MAKEFLAGS += -j$(NUMJOBS)
-endif
-
-BUILD=debian/build-tree
-REALCURDIR=$(CURDIR)
-INSTALL=/usr/bin/install
-
-clean: unpatch
- dh_testdir
- rm -rf $(BUILD) mpm-worker mpm-prefork mpm-event mpm-itk install
- rm -rf debian/tmp-worker debian/tmp-prefork
- dh_clean
-
-build-arch: build
-build-indep: build
-
-build: patch-stamp build-stamp
-build-stamp: patch-stamp mpm-worker mpm-prefork mpm-event mpm-itk
- for mpm in prefork event itk ; do \
- if ! diff -u $(BUILD)/$$mpm/mods.list $(BUILD)/worker/mods.list ; then \
- echo Different modules built into httpd binaries, will not proceed ;\
- exit 1 ;\
- fi \
- done
- touch $@
-
-
-mpm-worker mpm-prefork mpm-event mpm-itk: mpm-%: patch-stamp mpm-%.scripts-stamp
- dh_testdir
- mkdir -p $(BUILD)/$*
- # we don't want modifications done by itk outside of server/mpm/experimental/itk
- # to appear in the other mpms. Therefore we copy the whole source tree.
- set -ex ; \
- if [ $* = itk ] ; then \
- cp -a `find . -maxdepth 1 -mindepth 1 -not -name debian` $(BUILD)/$* ; \
- cd $(BUILD)/$* ; \
- mkdir server/mpm/experimental/itk/ ; \
- cp server/mpm/prefork/* server/mpm/experimental/itk/ ; \
- mv server/mpm/experimental/itk/prefork.c server/mpm/experimental/itk/itk.c ; \
+
+prepare-custom-suexec:
+ cp support/suexec.c support/suexec-custom.c
+ patch -p1 < debian/patches/202_suexec-custom.dpatch
+
+unapply-custom-suexec:
+ rm -f support/suexec-custom.c
+
+override_dh_auto_clean: unapply-custom-suexec
+ rm -rf $(BUILD_DIR)
+ rm -rf $(INSTALL_DIR)
+ rm -f debian/tmp
+
+$(BUILD_DIR):
+ mkdir $(BUILD_DIR)
+
+$(INSTALL_DIR):
+ mkdir $(INSTALL_DIR)
+
+configure-%: $(BUILD_DIR)
+ @set -ex
+ mkdir "$(BUILD_DIR)/$*"
+ cp -a `find . -maxdepth 1 -mindepth 1 -not -name debian` $(BUILD_DIR)/$*
+ if [ $* = itk ] ; then \
+ cd $(BUILD_DIR)/$* ; \
+ mkdir server/mpm/experimental/itk/ ; \
+ cp server/mpm/prefork/* server/mpm/experimental/itk/ ; \
+ mv server/mpm/experimental/itk/prefork.c server/mpm/experimental/itk/itk.c ; \
\
- for PATCH in `tail -n +2 ../../mpm-itk/patches/series`; do \
- echo Applying $$PATCH ... ; \
- patch -p1 < ../../mpm-itk/patches/$$PATCH ; \
- echo ; \
- done ; \
+ for PATCH in `tail -n +2 ../../mpm-itk/patches/series`; do \
+ echo Applying $$PATCH ... ; \
+ patch -p1 < ../../mpm-itk/patches/$$PATCH ; \
+ echo ; \
+ done ; \
\
- autoheader ; \
- autoconf ; \
- CONFIGURE=./configure ; \
- else \
- cd $(BUILD)/$* ; \
- CONFIGURE="$(REALCURDIR)/configure --srcdir=$(REALCURDIR)" ; \
- fi ; \
- if [ $* = worker ] ; then \
- ENABLE_MODULES="$(AP2_MODS_CONFARGS)" ; \
- else \
- ENABLE_MODULES=--enable-modules=none ; \
- fi ; \
- CFLAGS="$(AP2_CFLAGS)" LDFLAGS="$(AP2_LDFLAGS)" $(CONFFLAGS) $$CONFIGURE \
- $(AP2_COMMON_CONFARGS) $$ENABLE_MODULES --with-mpm=$* ; \
- $(MAKE) ; \
- ./apache2 -l |grep -v $* > mods.list
- touch $@
-
-mpm-%.scripts-stamp: debian/mpms.postinst debian/mpms.preinst debian/mpms.prerm debian/mpms.lintian-overrides debian/mpms.dirs debian/mpms.links
- for f in postinst preinst prerm links dirs ; do \
- perl -p -e "s/MPMXXX/$*/g" < debian/mpms.$$f > debian/apache2-mpm-$*.$$f ;\
- done
- perl -p -e "s/^/apache2-mpm-$*: /" < debian/mpms.lintian-overrides > debian/apache2-mpm-$*.lintian-overrides
- touch $@
-
-install-worker: mpm-worker
- dh_testdir
- dh_testroot
- # force one process since mkdir.sh used by 'make install' is not reliable otherwise
- cd $(BUILD)/worker ;\
- $(MAKE) DESTDIR=$(REALCURDIR)/debian/tmp -j 1 install
- for m in logresolve ab; do d=$(REALCURDIR)/debian/tmp/usr/share/man/ ;\
- perl -p -e 's/^([.]TH.*?) 8 (.*)/$$1 1 $$2/' < $$d/man8/$$m.8 > $$d/man1/$$m.1 ;\
- done
- ln -sf tmp debian/tmp-worker
-
-install-prefork: mpm-prefork
- dh_testdir
- dh_testroot
- # force one process since mkdir.sh used by 'make install' is not reliable otherwise
- cd $(BUILD)/prefork ;\
- $(MAKE) DESTDIR=$(REALCURDIR)/debian/tmp-prefork -j 1 install
-
-install-dev: install-worker install-prefork
- dh_testdir
- dh_testroot
- dh_installdirs
+ autoheader ; \
+ autoconf ; \
+ fi ;
+ cd $(BUILD_DIR)/$* && ./configure \
+ $(AP2_COMMON_CONFARGS) --with-mpm=$* $(AP2_$(*)_CONFARGS) $(CONFFLAGS) \
+ CFLAGS="$(AP2_CFLAGS)" CPPFLAGS="$(AP2_CPPFLAGS)" LDFLAGS="$(AP2_LDFLAGS)"
+
+build-%:
+ dh_auto_build -D "$(BUILD_DIR)/$*"
+ cd "$(BUILD_DIR)/$*" && ./apache2 -l |grep -v $* > mods.list
+
+
+auto-install-%: $(INSTALL_DIR)
+ # force one process since mkdir.sh used by 'make install' is not
+ # reliable otherwise
+ dh_auto_install -D "$(BUILD_DIR)/$*" --destdir="$(INSTALL_DIR)/$*" -- -j1
+
+install-dev:
for i in worker prefork; do \
if [ "$$i" = "prefork" ]; then \
TARGET=prefork ;\
else \
TARGET=threaded ;\
fi ;\
- cp debian/tmp-$$i/usr/include/apache2/* debian/apache2-$$TARGET-dev/usr/include/apache2/ ;\
- cp debian/tmp-$$i/usr/share/apache2/build/* debian/apache2-$$TARGET-dev/usr/share/apache2/build/ ;\
- cp $(BUILD)/$$i/support/apxs debian/apache2-$$TARGET-dev/usr/bin/apxs2 ;\
+ cp $(INSTALL_DIR)/$$i/usr/include/apache2/* debian/apache2-$$TARGET-dev/usr/include/apache2/ ;\
+ cp $(INSTALL_DIR)/$$i/usr/share/apache2/build/* debian/apache2-$$TARGET-dev/usr/share/apache2/build/ ;\
+ cp $(BUILD_DIR)/$$i/support/apxs debian/apache2-$$TARGET-dev/usr/bin/apxs2 ;\
perl -p -e s/^P=apache2/P=apache2-$${TARGET}-dev/ < debian/apache2.postinst > debian/apache2-$${TARGET}-dev.postinst ;\
done
-# Clean up config_vars.mk
+ # Clean up config_vars.mk
set -x ; for i in threaded prefork; do \
( cd debian/apache2-$$i-dev/usr/share/apache2/build/ ; \
grep -v -E '(^|_)(CPP|C)FLAGS' config_vars.mk > tmp_config_vars.mk ; \
- printf "CPPFLAGS = %s\n" "`grep -E '(^|_)(CPPFLAGS|INCLUDES)' config_vars.mk | cut -d= -f 2- | tr ' ' '\n' | grep -E '^-([DI]|pthread)' | sort | uniq | tr '\n' ' '`" >> tmp_config_vars.mk ; \
- printf "CFLAGS = %s\n" "`grep -E '(^|_)(CPPFLAGS|CFLAGS|INCLUDES)' config_vars.mk | cut -d= -f 2- | tr ' ' '\n' | grep -E '^-(D|I/|pthread)' | sort | uniq | tr '\n' ' '`" >> tmp_config_vars.mk ; \
+ printf "CPPFLAGS = %s\n" "`grep -E '(^|_)(CPPFLAGS|INCLUDES)' config_vars.mk | cut -d= -f 2- | tr ' ' '\n' | grep -E '^-([DI]|pthread)' | grep -v "PLATFORM" | sort | uniq | tr '\n' ' '`" >> tmp_config_vars.mk ; \
+ printf "CFLAGS = %s\n" "`grep -E '(^|_)(CPPFLAGS|CFLAGS|INCLUDES)' config_vars.mk | cut -d= -f 2- | tr ' ' '\n' | grep -E '^-(D|I/|pthread)' | grep -v "PLATFORM" | sort | uniq | tr '\n' ' '`" >> tmp_config_vars.mk ; \
printf "NOTEST_CPPFLAGS = \n" >> tmp_config_vars.mk ; \
printf "EXTRA_CPPFLAGS = \n" >> tmp_config_vars.mk ; \
printf "EXTRA_CFLAGS = \n" >> tmp_config_vars.mk ; \
mv tmp_config_vars.mk config_vars.mk ) ; \
done
-install: build install-dev
- dh_testroot
- dh_testdir
- dh_installdirs
-
+install-%:
+ install -m 755 $(BUILD_DIR)/$*/apache2 debian/apache2.2-bin/usr/lib/apache2/mpm-$*/apache2
+
+
+undo-mpm-%-maintainer-scripts:
+ @set -ex
+ for f in postinst preinst prerm links dirs ; do \
+ rm -f debian/apache2-mpm-$*.$$f ;\
+ done
+ rm -f debian/apache2-mpm-$*.lintian-overrides
+
+mpm-%-maintainer-scripts: debian/mpms.postinst debian/mpms.preinst debian/mpms.prerm debian/mpms.lintian-overrides debian/mpms.dirs debian/mpms.links
+ @set -ex
+ for f in postinst preinst prerm links dirs ; do \
+ perl -p -e "s/MPMXXX/$*/g" < debian/mpms.$$f > debian/apache2-mpm-$*.$$f ;\
+ done
+ perl -p -e "s/^/apache2-mpm-$*: /" < debian/mpms.lintian-overrides > debian/apache2-mpm-$*.lintian-overrides
+
+
+
+%:
+ dh $@ --parallel
+
+override_dh_auto_configure: prepare-custom-suexec $(patsubst %, configure-%, $(MPMS))
+
+override_dh_auto_build: $(patsubst %, mpm-%-maintainer-scripts, $(MPMS)) $(patsubst %, build-%, $(MPMS))
+ @set -ex
+ for mpm in $(filter-out worker, $(MPMS)) ; do \
+ if ! diff -u $(BUILD_DIR)/$$mpm/mods.list $(BUILD_DIR)/worker/mods.list ; then \
+ echo Different modules built into httpd binaries, will not proceed ;\
+ exit 1 ;\
+ fi \
+ done
+
+
+override_dh_auto_install: $(patsubst %, auto-install-%, $(MPMS)) install-dev
+ cd debian && ln -s $(INSTALL_DIR_RELATIVE)/worker tmp
+ for m in logresolve ab; do d=debian/tmp/usr/share/man/ ;\
+ perl -p -e 's/^([.]TH.*?) 8 (.*)/$$1 1 $$2/' < $$d/man8/$$m.8 > $$d/man1/$$m.1 ;\
+ done
#cleanup of death
- rm -rf debian/tmp/etc/apache2/original
- rm -rf debian/tmp/usr/include
- rm -rf debian/tmp/usr/share/apache2/build
- rm -f debian/tmp/usr/share/man/man8/httpd.8 # We install our own
- rm -f debian/tmp/usr/sbin/apxs debian/tmp/usr/sbin/apache2 debian/tmp/usr/sbin/apachectl
-
+ rm -rf $(DEFAULT_MPM)/etc/apache2/original
+ rm -rf $(DEFAULT_MPM)/usr/include
+ rm -rf $(DEFAULT_MPM)/usr/share/apache2/build
+ rm -f $(DEFAULT_MPM)/usr/share/man/man8/httpd.8 # We install our own
+ rm -f $(DEFAULT_MPM)/usr/sbin/apxs $(DEFAULT_MPM)/usr/sbin/apache2 debian/tmp/usr/sbin/apachectl
+ mv $(DEFAULT_MPM)/usr/share/man/man8/apxs.8 $(DEFAULT_MPM)/usr/share/man/man8/apxs2.8
+ mv $(DEFAULT_MPM)/usr/share/man/man8/apachectl.8 $(DEFAULT_MPM)/usr/share/man/man8/apache2ctl.8
+
+override_dh_install: $(patsubst %, install-%, $(MPMS))
+ dh_install --list-missing
# DO NOT FALL FOR THE TEMPTATION TO MV INTO PACKAGES OR DOOM
# WILL FIND YOU. Use dh_install, this is just because dh_install
# can't rename files
-
- mv debian/tmp/usr/share/man/man8/apxs.8 debian/tmp/usr/share/man/man8/apxs2.8
- mv debian/tmp/usr/share/man/man8/apachectl.8 debian/tmp/usr/share/man/man8/apache2ctl.8
- mkdir -p debian/tmp/usr/share/apache2/icons/
- for i in `ls debian/icons/ | cut -d. -f1,2`; do \
- uudecode -o debian/tmp/usr/share/apache2/icons/$$i debian/icons/$$i".uue"; \
- done
-
- dh_install --list-missing
-
+ cp debian/default-index.html debian/apache2.2-common/usr/share/apache2/default-site/index.html
cp debian/bash_completion debian/apache2.2-common/etc/bash_completion.d/apache2.2-common
-
+ cp debian/apache2-doc.conf debian/apache2-doc/etc/apache2/conf.d/apache2-doc
+ cp debian/default-index.html debian/apache2.2-common/usr/share/apache2/default-site/index.html
+ perl debian/convert_docs debian/apache2-doc/usr/share/doc/apache2-doc/manual
+
+override_dh_fixperms:
+ @set -ex
# standard suexec
- chmod 4754 debian/apache2-suexec/usr/lib/apache2/suexec
+ chmod 4754 debian/apache2-suexec/usr/lib/apache2/suexec
chgrp www-data debian/apache2-suexec/usr/lib/apache2/suexec
-
# configurable suexec
- cp debian/build-tree/worker/support/suexec-custom debian/apache2-suexec-custom/usr/lib/apache2/suexec
+ cp $(BUILD_DIR)/worker/support/suexec-custom debian/apache2-suexec-custom/usr/lib/apache2/suexec
cp debian/suexec-custom.config debian/apache2-suexec-custom/etc/apache2/suexec/www-data
- chmod 4754 debian/apache2-suexec-custom/usr/lib/apache2/suexec
+ chmod 4754 debian/apache2-suexec-custom/usr/lib/apache2/suexec
chgrp www-data debian/apache2-suexec-custom/usr/lib/apache2/suexec
-
- cp debian/apache2-doc.conf debian/apache2-doc/etc/apache2/conf.d/apache2-doc
- grep -rl apachectl debian/apache2-doc/usr/share/doc/apache2-doc/manual | xargs perl -p -i -e 's/apachectl(?!\.html)/apache2ctl/g'
- # remove content negotiation
- mv debian/apache2-doc/usr/share/doc/apache2-doc/manual \
- debian/apache2-doc/usr/share/doc/apache2-doc/manual.orig
- perl debian/convert_docs debian/apache2-doc/usr/share/doc/apache2-doc/manual.orig \
- debian/apache2-doc/usr/share/doc/apache2-doc/manual
- mv debian/apache2-doc/usr/share/doc/apache2-doc/manual.orig/images \
- debian/apache2-doc/usr/share/doc/apache2-doc/manual.orig/style \
- debian/apache2-doc/usr/share/doc/apache2-doc/manual
- rmdir debian/apache2-doc/usr/share/doc/apache2-doc/manual/style/lang
- rmdir debian/apache2-doc/usr/share/doc/apache2-doc/manual/style/xsl/util
- rmdir debian/apache2-doc/usr/share/doc/apache2-doc/manual/style/xsl
- rm -r debian/apache2-doc/usr/share/doc/apache2-doc/manual.orig
-
- cp debian/logrotate debian/apache2.2-common/etc/logrotate.d/apache2
- cp debian/default-index.html debian/apache2.2-common/usr/share/apache2/default-site/index.html
-
- for i in worker prefork event itk; do \
- install -m 755 $(BUILD)/$$i/apache2 debian/apache2.2-bin/usr/lib/apache2/mpm-$$i/apache2 ;\
- done
-
- for pkg in `awk '/^Package:/ { print $$2 }' debian/control`; do \
- find debian/$$pkg/ -name .svn -exec rm -rf {} + ; \
- done
-
+ dh_fixperms -Xusr/lib/apache2/suexec
+ chown -R www-data:www-data debian/apache2.2-common/var/cache/apache2
+ chown root:adm debian/apache2.2-common/var/log/apache2
+ chmod o-rx debian/apache2.2-common/var/log/apache2
+
+override_dh_installinit:
+ dh_installinit --no-start --no-restart-on-upgrade --name=apache2 -- defaults 91 09
+
+override_dh_installcron:
+ dh_installcron --name=apache2
+
+override_dh_installdocs:
dh_installdocs debian/README.backtrace -papache2.2-bin
dh_installdocs debian/README.backtrace debian/README.multiple-instances -papache2.2-common
dh_installdocs -Napache2.2-common -Napache2.2-bin
cp debian/README.Debian debian/apache2-doc/usr/share/doc/apache2-doc/
- dh_installman
- dh_bugfiles
- dh_installinit --no-start -r --name=apache2 -- defaults 91 09
- dh_installcron --name=apache2
- dh_installchangelogs CHANGES -Napache2-suexec -Napache2-suexec-custom -Napache2
- dh_installchangelogs -papache2-suexec -papache2-suexec-custom -papache2
- dh_lintian
- rm -f debian/apache2.2-bin/usr/share/doc/apache2.2-bin/NEWS.Debian
- rm -f debian/apache2-utils/usr/share/doc/apache2-utils/NEWS.Debian
-
- dh_strip --dbg-package=apache2-dbg -Napache2-dbg -Xusr/lib/apache2/mpm
- if [ "$(LSB_RELEASE)" != "Ubuntu" ] && [ -n "$(DEB_BUILD_STRIP)" ] ; then \
- for i in worker prefork event itk; do \
- MPM=usr/lib/apache2/mpm-$$i/apache2 ;\
- objcopy --only-keep-debug $(BUILD)/$$i/apache2 \
- debian/apache2-dbg/usr/lib/debug/$$MPM-mpm-$$i ;\
- chmod 644 debian/apache2-dbg/usr/lib/debug/$$MPM-mpm-$$i ;\
- strip --remove-section=.comment --remove-section=.note --strip-unneeded \
- debian/apache2.2-bin/$$MPM ;\
- objcopy --add-gnu-debuglink=debian/apache2-dbg/usr/lib/debug/$$MPM-mpm-$$i \
- debian/apache2.2-bin/$$MPM ;\
- done ;\
- fi
-
cp debian/mpm-itk/README debian/apache2.2-common/usr/share/doc/apache2.2-common/README.mpm-itk
cp debian/mpm-itk/CHANGES debian/apache2.2-common/usr/share/doc/apache2.2-common/changelog.mpm-itk
cp debian/mpm-itk/debian/changelog debian/apache2.2-common/usr/share/doc/apache2.2-common/changelog.mpm-itk.Debian
+ @set -ex
for p in apache2-prefork-dev apache2-threaded-dev apache2-mpm-prefork apache2-mpm-event \
- apache2-mpm-worker apache2-mpm-itk apache2; \
+ apache2-mpm-worker apache2-mpm-itk apache2; \
do \
rm -rf debian/$$p/usr/share/doc/$$p ;\
ln -s apache2.2-common debian/$$p/usr/share/doc/$$p ;\
done
rm -rf debian/apache2-dbg/usr/share/doc/apache2-dbg
ln -s apache2.2-bin debian/apache2-dbg/usr/share/doc/apache2-dbg
- dh_link
- dh_installexamples
- dh_compress
- dh_fixperms -Xusr/lib/apache2/suexec
- chown -R www-data:www-data debian/apache2.2-common/var/cache/apache2
- chown root:adm debian/apache2.2-common/var/log/apache2
- chmod o-rx debian/apache2.2-common/var/log/apache2
-
- touch $@
-
-binary-indep: install
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-binary-arch: install
- dh_makeshlibs -a -V
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
+
+override_dh_installchangelogs:
+ dh_installchangelogs CHANGES -Napache2-suexec -Napache2-suexec-custom -Napache2
+ dh_installchangelogs -papache2-suexec -papache2-suexec-custom -papache2
+ rm -f debian/apache2.2-bin/usr/share/doc/apache2.2-bin/NEWS.Debian
+ rm -f debian/apache2-utils/usr/share/doc/apache2-utils/NEWS.Debian
+
+override_dh_strip:
+ dh_strip --dbg-package=apache2-dbg -Napache2-dbg -Xusr/lib/apache2/mpm
+ if [ "$(LSB_RELEASE)" != "Ubuntu" ] && [ -n "$(DEB_BUILD_STRIP)" ] ; then \
+ for i in $(MPMS); do \
+ MPM=usr/lib/apache2/mpm-$$i/apache2 ;\
+ objcopy --only-keep-debug $(BUILD_DIR)/$$i/apache2 \
+ debian/apache2-dbg/usr/lib/debug/$$MPM-mpm-$$i ;\
+ chmod 644 debian/apache2-dbg/usr/lib/debug/$$MPM-mpm-$$i ;\
+ strip --remove-section=.comment --remove-section=.note --strip-unneeded \
+ debian/apache2.2-bin/$$MPM ;\
+ objcopy --add-gnu-debuglink=debian/apache2-dbg/usr/lib/debug/$$MPM-mpm-$$i \
+ debian/apache2.2-bin/$$MPM ;\
+ done ;\
+ fi
+override_dh_builddeb:
if [ "$(LSB_RELEASE)" = "Ubuntu" ]; then \
rm -rf debian/apache2-dbg; \
sed -i '/apache2-dbg/d' debian/files; \
- dh_builddeb -a -Napache2-dbg; \
+ dh_builddeb -Napache2-dbg; \
else \
- dh_builddeb -a; \
+ dh_builddeb; \
fi
-binary: binary-arch binary-indep
+override_dh_installlogrotate:
+ dh_installlogrotate --name=apache2
+
+override_dh_clean: $(patsubst %, undo-mpm-%-maintainer-scripts, $(MPMS))
+ dh_clean
+
+.PHONY: configure-% build-%-tree prepare-custom-suexec unapply-custom-suexec
Modified: trunk/apache2/source/format
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/source/format?rev=1383&op=diff
==============================================================================
--- trunk/apache2/source/format (original)
+++ trunk/apache2/source/format Tue Dec 13 21:57:36 2011
@@ -1,1 +1,1 @@
-1.0
+3.0 (quilt)
Added: trunk/apache2/source/include-binaries
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/source/include-binaries?rev=1383&op=file
==============================================================================
--- trunk/apache2/source/include-binaries (added)
+++ trunk/apache2/source/include-binaries Tue Dec 13 21:57:36 2011
@@ -1,0 +1,17 @@
+debian/icons/odf6ott-20x22.png
+debian/icons/odf6otf-20x22.png
+debian/icons/odf6odc-20x22.png
+debian/icons/odf6odb-20x22.png
+debian/icons/odf6odg-20x22.png
+debian/icons/odf6odt-20x22.png
+debian/icons/odf6otc-20x22.png
+debian/icons/odf6odm-20x22.png
+debian/icons/odf6odf-20x22.png
+debian/icons/odf6odi-20x22.png
+debian/icons/odf6ots-20x22.png
+debian/icons/odf6otg-20x22.png
+debian/icons/odf6oti-20x22.png
+debian/icons/odf6ods-20x22.png
+debian/icons/odf6odp-20x22.png
+debian/icons/odf6otp-20x22.png
+debian/icons/odf6oth-20x22.png
Added: trunk/apache2/source/options
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/source/options?rev=1383&op=file
==============================================================================
--- trunk/apache2/source/options (added)
+++ trunk/apache2/source/options Tue Dec 13 21:57:36 2011
@@ -1,0 +1,1 @@
+--extend-diff-ignore='\.svn'
Modified: trunk/apache2/suexec.8
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/suexec.8?rev=1383&op=diff
==============================================================================
--- trunk/apache2/suexec.8 (original)
+++ trunk/apache2/suexec.8 Tue Dec 13 21:57:36 2011
@@ -41,8 +41,7 @@
If suexec is called by a user with name 'username', it will look into
/etc/apache2/suexec/username for configuration. If the file does not exist,
suexec will abort. By creating several config files, you can allow several
-different apache run users to use suexec. You may need to change the
-permissions of /usr/lib/apache2/suexec with dpkg-statoverride.
+different apache run users to use suexec.
.PP
The first line in the file is used as the document root (/var/www in the
standard suexec) and the second line in the file is used as the suffix that is
More information about the Pkg-apache-commits
mailing list