[httpd/f14/master: 3/3] - update to 2.2.17

[jorton]

commit 2581bb53dd79355101b5ab06ea0cb745f6820416
Merge: 421e29a ec012a6
Author: Joe Orton <jorton at redhat.com>
Date:   Wed Oct 27 10:59:44 2010 +0100

    - update to 2.2.17

 .gitignore               |    7 +++++++
 httpd-2.2.17.tar.bz2.asc |   17 +++++++++++++++++
 httpd.spec               |   19 +++++++++++--------
 sources                  |    2 +-
 4 files changed, 36 insertions(+), 9 deletions(-)
---
diff --cc .gitignore
index c785a88,3142045..1421a2e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,7 +1,8 @@@
  httpd-2.2.16.tar.gz
+ /httpd-2.2.17.tar.bz2
+ x86_64
+ /httpd-2.2.17
+ /*.rpm
+ /.build*.log
+ /noarch
++/clog
diff --cc httpd.spec
index b391c49,7b50301..090ed12
--- a/httpd.spec
+++ b/httpd.spec
@@@ -482,9 -479,12 +479,15 @@@ rm -rf $RPM_BUILD_ROO
  %{_libdir}/httpd/build/*.sh
  
  %changelog
+ * Wed Oct 27 2010 Joe Orton <jorton at redhat.com> - 2.2.17-1
+ - update to 2.2.17
+ 
+ * Fri Sep 10 2010 Joe Orton <jorton at redhat.com> - 2.2.16-2
+ - link everything using -z relro and -z now
+ 
 +* Tue Aug 17 2010 Joe Orton <jorton at redhat.com> - 2.2.16-1.1
 +- add fix for PR 45444
 +
  * Mon Jul 26 2010 Joe Orton <jorton at redhat.com> - 2.2.16-1
  - update to 2.2.16