From afd986fb8ff7e49d6ed6770a743649bcfe7aebad64f29922d25a4a233f76e7fc Mon Sep 17 00:00:00 2001
From: Roman Drahtmueller <draht@schaltsekun.de>
Date: Tue, 13 Sep 2011 23:17:22 +0000
Subject: [PATCH] - Update to 2.2.21. News therein:   * re-worked CVE-2011-3192
 (byterange_filter.c) with a regression     fix. New config option: MaxRanges
 (PR 51748)   * multi fixes in mod_filter, mod_proxy_ajp, mod_dav_fs,    
 mod_alias, mod_rewrite. As always, see CHANGES file. - added
 httpd-%{realver}.tar.bz2.asc to source, along with   60C5442D.key which the
 tarball was signed with.

OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=337
---
 .gitattributes           |  1 +
 60C5442D.key             |  3 +++
 apache2.changes          | 11 +++++++++++
 apache2.spec             |  6 ++++--
 httpd-2.2.20.tar.bz2     |  3 ---
 httpd-2.2.21.tar.bz2     |  3 +++
 httpd-2.2.21.tar.bz2.asc | 17 +++++++++++++++++
 7 files changed, 39 insertions(+), 5 deletions(-)
 create mode 100644 60C5442D.key
 delete mode 100644 httpd-2.2.20.tar.bz2
 create mode 100644 httpd-2.2.21.tar.bz2
 create mode 100644 httpd-2.2.21.tar.bz2.asc

diff --git a/.gitattributes b/.gitattributes
index 6a7e248..8f5be96 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -22,4 +22,5 @@
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
 ## Specific LFS patterns
+60C5442D.key filter=lfs diff=lfs merge=lfs -text
 Apache.xpm filter=lfs diff=lfs merge=lfs -text
diff --git a/60C5442D.key b/60C5442D.key
new file mode 100644
index 0000000..138c2aa
--- /dev/null
+++ b/60C5442D.key
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2d0f272a697be2b07f52f676817d8a07fb1715d0a1402ed4cff60cb3bb1ba907
+size 64309
diff --git a/apache2.changes b/apache2.changes
index 8d6f0fb..7e75b3a 100644
--- a/apache2.changes
+++ b/apache2.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Sep 14 01:11:55 CEST 2011 - draht@suse.de
+
+- Update to 2.2.21. News therein:
+  * re-worked CVE-2011-3192 (byterange_filter.c) with a regression
+    fix. New config option: MaxRanges (PR 51748)
+  * multi fixes in mod_filter, mod_proxy_ajp, mod_dav_fs,
+    mod_alias, mod_rewrite. As always, see CHANGES file.
+- added httpd-%{realver}.tar.bz2.asc to source, along with
+  60C5442D.key which the tarball was signed with.
+
 -------------------------------------------------------------------
 Tue Sep 13 10:37:37 CEST 2011 - draht@suse.de
 
diff --git a/apache2.spec b/apache2.spec
index 3a6b13c..739a110 100644
--- a/apache2.spec
+++ b/apache2.spec
@@ -67,13 +67,15 @@ BuildRequires:  expat-devel
 %define platform_string	Linux/%VENDOR
 License:        ASLv..
 Group:          Productivity/Networking/Web/Servers
-%define realver 2.2.20
-Version:        2.2.20
+%define realver 2.2.21
+Version:        2.2.21
 Release:        1
 #Source0:      http://www.apache.org/dist/httpd-%{version}.tar.bz2
 Source0:        http://httpd.apache.org/dev/dist/httpd-%{realver}.tar.bz2
 # Add file to take mtime from it in prep section
 Source1:        apache2.changes
+Source5:        http://httpd.apache.org/dev/dist/httpd-%{realver}.tar.bz2.asc
+Source6:        60C5442D.key
 Source10:       SUSE-NOTICE
 Source11:       rc.%{pname}
 Source13:       sysconfig.%{pname}
diff --git a/httpd-2.2.20.tar.bz2 b/httpd-2.2.20.tar.bz2
deleted file mode 100644
index cd5e7bc..0000000
--- a/httpd-2.2.20.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1ee914855249b09d9cd2e20e98a0ab02f15c270fe277d4a5c9b62975479fc81e
-size 5174611
diff --git a/httpd-2.2.21.tar.bz2 b/httpd-2.2.21.tar.bz2
new file mode 100644
index 0000000..599657a
--- /dev/null
+++ b/httpd-2.2.21.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:18d5591fe48cfbac44fc20316036ffe17456df60bc3a2aaad238d56c6445577f
+size 5324905
diff --git a/httpd-2.2.21.tar.bz2.asc b/httpd-2.2.21.tar.bz2.asc
new file mode 100644
index 0000000..d11ac68
--- /dev/null
+++ b/httpd-2.2.21.tar.bz2.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAABAgAGBQJOaiQfAAoJEFWTvKlgxUQtWu4P/j/xCzXtpb2h1H4gNQtakXjp
+KFhfccvzlOGFpkUjauQ0so5Jj+wVVAgiElr7L0+YvmtXoUyNjCgToqqJTqT/3fwG
+uxKDFfqB5ujbCstKbJ4yKhMy92aDjX1+uWWr8J/1WX//SOWY/uUl/GhJnhEFAB6p
+YExuqqrQfrZcAfC6ME35Gbam6+I8OfHVIeT0m6hLOw6UaHaPXdoRj0CAKNy4NFEf
+ckyw2ddlz83ivek9naGxVFg4v/jN8CoSw3zVfto1QaQ7P+FMA5CrYoCPiEI0A6KA
+534L8xcXf02mN6Y2lgl3C6PYQYcGO198Zmd9xU3RCXsfaFgaOrV4D/fD9TVq1hLK
+OSHPU3AOf7IdFiq99qo7EsXNYrxS0xurv67HaodKXvNNRg8D8TBxDNWO1NpbGp3A
+/zDLm3wxpV2qSOSaZbIbyH8PhX2i4UurSo6y2AVrLENUmV4/bD51qJlitCL23YOo
+5vnK99CnPsWHe36p/GyMMJW2d2fn2tUroLTo/ebCdICZlQJhhWYI7+GHNQNkhqMt
+hp5m8so9Goabs+cKtdxiyARR6+AsyLh+2aRc35dgHpa95Tn3SkuAJ1KTM3ecbzgj
+BxJbA0M3snO9RmNo2h88HELzaA5WaB0Z1kVgYW6gjYELnWRpu+iGMJxFpgXQ6guQ
+CUiByAFuIQukRlpIU/qx
+=AWI2
+-----END PGP SIGNATURE-----