diff --git a/.gitignore b/.gitignore index 990de8c..7b856d9 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ apr-1.3.9.tar.bz2 /clog /x86_64 /.build*.log +/apr-1.4.4.tar.bz2 diff --git a/apr-1.4.2-libtool.patch b/apr-1.4.2-libtool.patch deleted file mode 100644 index ba60b56..0000000 --- a/apr-1.4.2-libtool.patch +++ /dev/null @@ -1,100 +0,0 @@ ---- apr-1.4.2/buildconf.libtool -+++ apr-1.4.2/buildconf -@@ -40,25 +40,20 @@ fi - # Note: APR supplies its own config.guess and config.sub -- we do not - # rely on libtool's versions - # --echo "Copying libtool helper files ..." -+echo "buildconf: copying libtool helper files using $libtoolize" - - # Remove any libtool files so one can switch between libtool 1.3 - # and libtool 1.4 by simply rerunning the buildconf script. --(cd build ; rm -f ltconfig ltmain.sh libtool.m4) -+(cd build ; rm -f ltconfig ltmain.sh libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4) - --$libtoolize --copy --automake --force $verbose -- --if [ -f libtool.m4 ]; then -- ltfile=`pwd`/libtool.m4 --elif grep all_pkgmacro_files $libtoolize > /dev/null; then -- # libtool 2.x -- aclocal_dir=`sed -n '/^aclocaldir=/{s/.*=//;p;q;}' < $libtoolize` -- ltfiles=`sed -n '/^all_pkgmacro_files=/{s/.*=//;;s/"//;p;q;}' < $libtoolize` -- for f in $ltfiles; do -- test -f "$aclocal_dir/$f" && cp "$aclocal_dir/$f" build -- done -- ltfile=$aclocal_dir/libtool.m4 --else -+lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` -+lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'` -+IFS=.; set $lt_version; IFS=' ' -+if test "$1" = "1"; then -+ $libtoolize --copy --automake $verbose -+ if [ -f libtool.m4 ]; then -+ ltfile=`pwd`/libtool.m4 -+ else - ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \ - < $libtoolize`" - ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`} -@@ -67,21 +62,22 @@ else - ltpath=`dirname $libtoolize` - ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4 - fi --fi -- --if [ ! -f $ltfile ]; then -+ fi -+ if [ ! -f $ltfile ]; then - echo "$ltfile not found" - exit 1 -+ fi -+ # Do we need this anymore? -+ echo "buildconf: Using libtool.m4 at ${ltfile}." -+ rm -f build/libtool.m4 -+ cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 - fi -- --echo "buildconf: Using libtool.m4 at ${ltfile}." -- --cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 -- --# libtool.m4 from 1.6 requires ltsugar.m4 --if [ -f ltsugar.m4 ]; then -- rm -f build/ltsugar.m4 -- mv ltsugar.m4 build/ltsugar.m4 -+if test "$1" = "2"; then -+ $libtoolize --copy --automake $verbose -+ # Wouldn't it just be better to define top_builddir?? -+ mv build/libtool.m4 build/libtool.m4.$$ -+ cat build/libtool.m4.$$ | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 -+ rm -f build/libtool.m4.$$ - fi - - # Clean up any leftovers -@@ -90,22 +86,22 @@ rm -f aclocal.m4 libtool.m4 - # - # Generate the autoconf header and ./configure - # --echo "Creating include/arch/unix/apr_private.h.in ..." -+echo "buildconf: creating include/arch/unix/apr_private.h.in ..." - ${AUTOHEADER:-autoheader} $verbose - --echo "Creating configure ..." -+echo "buildconf: creating configure ..." - ### do some work to toss config.cache? - ${AUTOCONF:-autoconf} $verbose - - # Remove autoconf 2.5x's cache directory - rm -rf autom4te*.cache - --echo "Generating 'make' outputs ..." -+echo "buildconf: generating 'make' outputs ..." - build/gen-build.py $verbose make - - # Create RPM Spec file - if [ -f `which cut` ]; then -- echo rebuilding rpm spec file -+ echo "buildconf: rebuilding rpm spec file" - ( REVISION=`build/get-version.sh all include/apr_version.h APR` - VERSION=`echo $REVISION | cut -d- -s -f1` - RELEASE=`echo $REVISION | cut -d- -s -f2` diff --git a/apr-1.4.2-pr50190.patch b/apr-1.4.2-pr50190.patch deleted file mode 100644 index 85475fc..0000000 --- a/apr-1.4.2-pr50190.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- apr-1.4.2/include/apr_ring.h.pr50190 -+++ apr-1.4.2/include/apr_ring.h -@@ -90,8 +90,8 @@ - */ - #define APR_RING_HEAD(head, elem) \ - struct head { \ -- struct elem *next; \ -- struct elem *prev; \ -+ struct elem * volatile next; \ -+ struct elem * volatile prev; \ - } - - /** diff --git a/apr-1.4.2.tar.bz2.asc b/apr-1.4.2.tar.bz2.asc deleted file mode 100644 index b5b922d..0000000 --- a/apr-1.4.2.tar.bz2.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.10 (GNU/Linux) - -iQIcBAABAgAGBQJLWIBcAAoJEKNIuYR/chSnqs8QAI34pXDfKwmd0kN6VcIYyBjb -kPwJG1dZf4hbIpCkUFMaOKrGrM4atnjO5pNUCRxm2YLEPRme9zBtVDww1uwIVTmw -fU0hq9/I1vLR73hAFccZ0qcR16mMnpVSO2kup9fCksJfGpkH0OBhpQxN17aUWGWD -cUH/llqP7vs3WMdXzqqpGjsq9QA1OKycd0/vWo7ZNtEr+iJAkY855LTquWtg1XzY -mP220CFD9JdhsIXTPd2+4+Vi8nGqmBmC7Hadqs2fw3iPPCWcMH9K8MRmCmRszMvE -WG6/QCJpW2QY8K7NHL5/0hFmCOdxcB+o4PXVA3Kpe10cj+Z+Z5SkerEMVJOigkZc -lYEW9qVbaKDp3aHQpNrgG6AE2BeAtU6Pg/olczNIgGfckp2ulcXGEEFm1JEGR8jb -zf9W3BSptY+wgAspesdiZE+VrLogQnQ/o80DljcAEYx8oq3bLZiIFPmo0cfivayb -CTuE/jG+usUXEI38IBjvyEmf16AKc/thYbzhA6Tmd+yYmjTI9/j8jiYgaVI50EJ3 -RIT0B6smLPCH9FvAVuaFJx34zeQfAm6G/qI7qQsH7CnBQamNf2vN1aCcddBmKLPv -3FRraP+ITj+/A0p1JyJ97VTtsTsCqghXXdXj3reZoX/A2XO+1Ng599j9KPLNsb2R -yJQ3nguRjmsYl/8epSq3 -=ZQmN ------END PGP SIGNATURE----- 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 3b98cc2..0903008 100644 --- a/apr.spec +++ b/apr.spec @@ -5,8 +5,8 @@ Summary: Apache Portable Runtime library Name: apr -Version: 1.4.2 -Release: 3%{?dist} +Version: 1.4.4 +Release: 1%{?dist} License: ASL 2.0 Group: System Environment/Libraries URL: http://apr.apache.org/ @@ -16,8 +16,6 @@ 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.2-pr50190.patch -Patch6: apr-1.4.2-libtool.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: autoconf, libtool, libuuid-devel, python # To enable SCTP support @@ -47,8 +45,6 @@ C data structures and routines. %patch2 -p1 -b .locktimeout %patch3 -p1 -b .libdir %patch4 -p1 -b .pkgconf -%patch5 -p1 -b .pr50190 -%patch6 -p1 -b .libtool %build # regenerate configure script etc. @@ -129,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/*.m4 %changelog +* Mon May 9 2011 Bojan Smojver - 1.4.4-1 +- bump up to 1.4.4 + * Wed Mar 2 2011 Joe Orton - 1.4.2-3 - work around alising issue in ring macros (upstream PR 50190) - fix buildconf with newer libtool (#670621) diff --git a/sources b/sources index 83abaae..136be64 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4b00e8f70c067893d075577962656b35 apr-1.4.2.tar.bz2 +daf5487c82dd7bec9c005c96f8cb01b1 apr-1.4.4.tar.bz2