From 5d73f61156c00ed714b2b275f62df8cec1fcaead Mon Sep 17 00:00:00 2001
From: Bojan Smojver <bojan@rexursive.com>
Date: May 18 2011 04:56:02 +0000
Subject: Merge branch 'master' into f13


Conflicts:
	.gitignore

---

diff --git a/.gitignore b/.gitignore
index 2c9fb80..7b856d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,7 @@
 apr-1.3.9.tar.bz2
+/apr-1.4.2.tar.bz2
+/*.rpm
+/clog
+/x86_64
+/.build*.log
+/apr-1.4.4.tar.bz2
diff --git a/apr-1.3.9.tar.bz2.asc b/apr-1.3.9.tar.bz2.asc
deleted file mode 100644
index 4ce48e7..0000000
--- a/apr-1.3.9.tar.bz2.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (Darwin)
-
-iD8DBQBKt/dNNEqETXUdfycRAl7mAKDo689ziRnAAbjhYqNCgKToyk97KgCgpBEG
-EjGzexofTLhk4jlz+VLTJg0=
-=F4XE
------END PGP SIGNATURE-----
diff --git a/apr-1.4.4-top_builddir.patch b/apr-1.4.4-top_builddir.patch
new file mode 100644
index 0000000..311ca52
--- /dev/null
+++ b/apr-1.4.4-top_builddir.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in.orig	2008-05-03 03:04:46.000000000 +1000
++++ b/Makefile.in	2011-05-10 12:42:31.428378451 +1000
+@@ -66,7 +66,7 @@
+ 
+ # Create apr_rules.mk suitable for the install tree
+ build/apr_rules.out: build/apr_rules.mk
+-	sed 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@
++	sed -e 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' -e 's,^\(top_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@
+ 
+ install: $(TARGETS)
+ 	$(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir) \
diff --git a/apr-1.4.4.tar.bz2.asc b/apr-1.4.4.tar.bz2.asc
new file mode 100644
index 0000000..e3be830
--- /dev/null
+++ b/apr-1.4.4.tar.bz2.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQIcBAABCgAGBQJNxEq6AAoJEOxYLrY5/wkseXsQALXdbQjG5yr0zOQSONES82Ie
+SL6VMwwceh94D5p/fPBrOfB1FaVFpCsQn+I5BXNiwlT5Mlkl3A+TAyrPv3A+f+ty
+ROhBb4IybD7KmTcwt6MXewrq2j8AEk+vUDDeVrLxRTusrD4TYcZBtja0Buo4h924
+qMoC2H+6nlvaL7nQdiR3oubsUoUVi+eqVuej+y8UsJgA2f2viNRxWCLA2IoYDWir
+FIHgGcAuacMAKMjQDxDIQw/aoVwVqORXjt7v+AZYJHaxIoI8v9+pIamvX9JAz0CR
++WIqOk5NoJ0g34GQboHx+2iznB5hYZWMZeK9EUUgNsqm4y49PpI32k6EEr79UKm8
+s5Wnh25JZkTp2Ty3UKDa87PD5bB1Y2I1rU9N5JelHaVea6rtK7f9x0aeE5qpAYD+
+7Lt5OBS+A+vLSKwSZ6T0RQGd2RN0vu5B9XG+m3hdFHg2/9biSqUVQrjc2pWb9c49
+VGIB2zwBYEtJdfP39atmUFiI6HarPPcPRo5CL/MsHHXSiVgIF99IfYRjqRxOXr/p
+vqhZlGCZRxcqimZ94un+rjVRdPZHX3A/EQq0Jg+eBJ1OFaTvP5KZ/GFhQEZCQEz0
+znzJYMiCg9jJALgjsGEwxE79AqdF7PCSmRRsIGk6fVwmEv878SNpC60Xxn+ZwkDs
+sZ4r6aSojncjlshuSa4O
+=WEeu
+-----END PGP SIGNATURE-----
diff --git a/apr.spec b/apr.spec
index d088de5..be38c41 100644
--- a/apr.spec
+++ b/apr.spec
@@ -5,8 +5,8 @@
 
 Summary: Apache Portable Runtime library
 Name: apr
-Version: 1.3.9
-Release: 3%{?dist}
+Version: 1.4.4
+Release: 2%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -16,8 +16,11 @@ Patch1: apr-0.9.7-deepbind.patch
 Patch2: apr-1.2.2-locktimeout.patch
 Patch3: apr-1.2.2-libdir.patch
 Patch4: apr-1.2.7-pkgconf.patch
+Patch5: apr-1.4.4-top_builddir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: autoconf, libtool, libuuid-devel, python
+# To enable SCTP support
+BuildRequires: lksctp-tools-devel
 
 %description
 The mission of the Apache Portable Runtime (APR) is to provide a
@@ -43,6 +46,7 @@ C data structures and routines.
 %patch2 -p1 -b .locktimeout
 %patch3 -p1 -b .libdir
 %patch4 -p1 -b .pkgconf
+%patch5 -p1 -b .top_builddir
 
 %build
 # regenerate configure script etc.
@@ -123,6 +127,24 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Tue May 10 2011 Bojan Smojver <bojan@rexursive.com> - 1.4.4-2
+- fix top_builddir in apr_rules.mk
+
+* Mon May  9 2011 Bojan Smojver <bojan@rexursive.com> - 1.4.4-1
+- bump up to 1.4.4
+- CVE-2011-0419
+
+* Wed Mar  2 2011 Joe Orton <jorton@redhat.com> - 1.4.2-3
+- work around alising issue in ring macros (upstream PR 50190)
+- fix buildconf with newer libtool (#670621)
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Sat Dec  4 2010 Joe Orton <jorton@redhat.com> - 1.4.2-1
+- update to 1.4.2
+- always enable SCTP support (#659815)
+
 * Sun Oct 25 2009 Bojan Smojver <bojan@rexursive.com> - 1.3.9-3
 - remove uuid/crypt libs from pkg-config file (#511522)
 
diff --git a/sources b/sources
index 303a098..136be64 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7138ac64d4458eeeaa9b9aefa4e6e51b  apr-1.3.9.tar.bz2
+daf5487c82dd7bec9c005c96f8cb01b1  apr-1.4.4.tar.bz2