From 2581bb53dd79355101b5ab06ea0cb745f6820416 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Oct 27 2010 09:59:44 +0000
Subject: - update to 2.2.17


---

diff --git a/.gitignore b/.gitignore
index c785a88..1421a2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +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 --git a/httpd-2.2.17.tar.bz2.asc b/httpd-2.2.17.tar.bz2.asc
new file mode 100644
index 0000000..0af0d10
--- /dev/null
+++ b/httpd-2.2.17.tar.bz2.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (MingW32)
+
+iQIcBAABAgAGBQJMt1B/AAoJEKNIuYR/chSnm/QQAKuk2dv9MFYl/udLCho/roYK
+0B4y4KoLMgdkPNbUvlKG5c8+6nMIfCZZ3ywwKTNih0M23yUiN7oYbrsdJdh8K+Wh
+fI+zeADmzvZuQgrygh7qk5sRd1frygHP+6hh+hZ9K4eAR2dO4xZkAM64FEkCT/Hw
+iJ6ibxx/xhnCsOEYOI9Xnd/0Kq65OVEnGcrT6rg+bo+nSxmc/DAp4ENHs4GFTTLv
+dN2Sk+Sdd0xUhBBJ7x2mCw5opXEaHg0a7hLjm8dhlRsVVD8Vus/BhNm5ArbhwDpV
+NigNXEXlF6fpktf984TSLXtVGPXjWQIByRjaWWqiO9Ja9qJM5Sp7f/llsfafiR58
+67trEELsr70/udijJWeRZrUsCOjRfNFF3I9lk208O0r9VSPiMKjk7vmiY1w+zFcw
+LcN9tw40MCw9zxT11cbfgR3UwmHTnHWe5+TbhPOjUA2GfO2cW+bO88yhkPcyCGzJ
+AaU9q8uM79b9B0qSBMWr7onVn0T1Tgg1uUTuDPmkt71RAbDttdRcktrkq3ryTCR5
+VfD+baRxnCphzniPfV1VJgi5xYcweEkq74YMBGgXk4wBZxhsarJ3kOcI6aG73ndz
+VMUfbxoVqQyhNLTnpYWBuj72GZd2LnQsyvxQ63AO1pgxfcSxkMwZgzutiz5wOHqc
+gfMu2sYWvGRamswtAKXw
+=HMRA
+-----END PGP SIGNATURE-----
diff --git a/httpd.spec b/httpd.spec
index b391c49..090ed12 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -6,10 +6,10 @@
 
 Summary: Apache HTTP Server
 Name: httpd
-Version: 2.2.16
-Release: 1.1%{?dist}
+Version: 2.2.17
+Release: 1%{?dist}
 URL: http://httpd.apache.org/
-Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
+Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
 Source1: index.html
 Source3: httpd.logrotate
 Source4: httpd.init
@@ -36,7 +36,6 @@ Patch25: httpd-2.2.11-selinux.patch
 Patch26: httpd-2.2.9-suenable.patch
 # Bug fixes
 Patch54: httpd-2.2.0-authnoprov.patch
-Patch55: httpd-2.2.16-pr45444.patch
 License: ASL 2.0
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -123,7 +122,6 @@ Security (TLS) protocols.
 %patch26 -p1 -b .suenable
 
 %patch54 -p1 -b .authnoprov
-%patch55 -p1 -b .pr45444
 
 # Patch in vendor/release string
 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -149,9 +147,8 @@ autoheader && autoconf || exit 1
 %{__perl} -pi -e "s:\@exp_installbuilddir\@:%{_libdir}/httpd/build:g" \
 	support/apxs.in
 
-CFLAGS=$RPM_OPT_FLAGS
-SH_LDFLAGS="-Wl,-z,relro"
-export CFLAGS SH_LDFLAGS
+export CFLAGS=$RPM_OPT_FLAGS
+export LDFLAGS="-Wl,-z,relro,-z,now"
 
 # Hard-code path to links to avoid unnecessary builddep
 export LYNX_PATH=/usr/bin/links
@@ -482,6 +479,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Wed Oct 27 2010 Joe Orton <jorton@redhat.com> - 2.2.17-1
+- update to 2.2.17
+
+* Fri Sep 10 2010 Joe Orton <jorton@redhat.com> - 2.2.16-2
+- link everything using -z relro and -z now
+
 * Tue Aug 17 2010 Joe Orton <jorton@redhat.com> - 2.2.16-1.1
 - add fix for PR 45444
 
diff --git a/sources b/sources
index 14720ba..0860a08 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7f33f2c8b213ad758c009ae46d2795ed  httpd-2.2.16.tar.gz
+16eadc59ea6b38af33874d300973202e  httpd-2.2.17.tar.bz2