From ba0620fb6d74e94525a3256b4c5204fb3f5a247f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 2 Oct 2010 10:01:36 +0200 Subject: work on httpd 2.3.8 --- apr.spec | 470 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 470 insertions(+) create mode 100644 apr.spec (limited to 'apr.spec') diff --git a/apr.spec b/apr.spec new file mode 100644 index 0000000..33b4f2b --- /dev/null +++ b/apr.spec @@ -0,0 +1,470 @@ +%define aprver 1 + +# Arches on which the multilib apr.h hack is needed: +%define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64 + +Summary: Apache Portable Runtime library +Name: apr +Version: 1.4.2 +Release: 1%{?dist} +License: ASL 2.0 +Group: System Environment/Libraries +URL: http://apr.apache.org/ +Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2 +Source1: apr-wrapper.h +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 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +BuildRequires: autoconf, libtool, libuuid-devel, python + +%description +The mission of the Apache Portable Runtime (APR) is to provide a +free library of C data structures and routines, forming a system +portability layer to as many operating systems as possible, +including Unices, MS Win32, BeOS and OS/2. + +%package devel +Group: Development/Libraries +Summary: APR library development kit +Conflicts: subversion-devel < 0.20.1-2 +Requires: apr = %{version}-%{release}, pkgconfig + +%description devel +This package provides the support files which can be used to +build applications using the APR library. The mission of the +Apache Portable Runtime (APR) is to provide a free library of +C data structures and routines. + +%prep +%setup -q +%patch1 -p1 -b .deepbind +%patch2 -p1 -b .locktimeout +%patch3 -p1 -b .libdir +%patch4 -p1 -b .pkgconf + +%build +# regenerate configure script etc. +./buildconf + +# Forcibly prevent detection of shm_open (which then picks up but +# does not use -lrt). +export ac_cv_search_shm_open=no + +%configure \ + --includedir=%{_includedir}/apr-%{aprver} \ + --with-installbuilddir=%{_libdir}/apr-%{aprver}/build \ + --with-devrandom=/dev/urandom +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/aclocal +install -m 644 build/find_apr.m4 $RPM_BUILD_ROOT/%{_datadir}/aclocal + +# Trim exported dependecies +sed -ri '/^dependency_libs/{s,-l(uuid|crypt) ,,g}' \ + $RPM_BUILD_ROOT%{_libdir}/libapr*.la +sed -ri '/^LIBS=/{s,-l(uuid|crypt) ,,g;s/ */ /g}' \ + $RPM_BUILD_ROOT%{_bindir}/apr-%{aprver}-config +sed -ri '/^Libs/{s,-l(uuid|crypt) ,,g}' \ + $RPM_BUILD_ROOT%{_libdir}/pkgconfig/apr-%{aprver}.pc + +%ifarch %{multilib_arches} +# Ugly hack to allow parallel installation of 32-bit and 64-bit apr-devel +# packages: +mv $RPM_BUILD_ROOT%{_includedir}/apr-%{aprver}/apr.h \ + $RPM_BUILD_ROOT%{_includedir}/apr-%{aprver}/apr-%{_arch}.h +install -c -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_includedir}/apr-%{aprver}/apr.h +%endif + +# Unpackaged files: +rm -f $RPM_BUILD_ROOT%{_libdir}/apr.exp \ + $RPM_BUILD_ROOT%{_libdir}/libapr-*.a + +%check +# Fail if LFS support isn't present in a 32-bit build, since this +# breaks ABI and the soname doesn't change: see #254241 +if grep 'define SIZEOF_VOIDP 4' include/apr.h \ + && ! grep off64_t include/apr.h; then + cat config.log + : LFS support not present in 32-bit build + exit 1 +fi + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc CHANGES LICENSE NOTICE +%{_libdir}/libapr-%{aprver}.so.* + +%files devel +%defattr(-,root,root,-) +%doc docs/APRDesign.html docs/canonical_filenames.html +%doc docs/incomplete_types docs/non_apr_programs +%{_bindir}/apr-%{aprver}-config +%{_libdir}/libapr-%{aprver}.*a +%{_libdir}/libapr-%{aprver}.so +%{_libdir}/pkgconfig/*.pc +%dir %{_libdir}/apr-%{aprver} +%dir %{_libdir}/apr-%{aprver}/build +%{_libdir}/apr-%{aprver}/build/* +%dir %{_includedir}/apr-%{aprver} +%{_includedir}/apr-%{aprver}/*.h +%{_datadir}/aclocal/*.m4 + +%changelog +* Fri Oct 01 2010 Remi Collet - 1.4.2-1 +- update to 1.4.2 + +* Sun Oct 25 2009 Bojan Smojver - 1.3.9-3 +- remove uuid/crypt libs from pkg-config file + +* Mon Sep 28 2009 Bojan Smojver - 1.3.9-2 +- revert use of accept4(), dup3() and epoll_create1() + +* Fri Sep 25 2009 Bojan Smojver - 1.3.9-1 +- bump up to 1.3.9 + +* Thu Aug 6 2009 Bojan Smojver - 1.3.8-1 +- bump up to 1.3.8 +- CVE-2009-2412 +- allocator alignment fixes + +* Sun Jul 26 2009 Bojan Smojver - 1.3.7-2 +- include apr_cv_sock_cloexec too + +* Sun Jul 26 2009 Bojan Smojver - 1.3.7-1 +- bump up to 1.3.7 + +* Fri Jul 24 2009 Fedora Release Engineering - 1.3.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Jul 15 2009 Bojan Smojver - 1.3.6-1 +- bump up to 1.3.6 + +* Tue Jun 30 2009 Joe Orton 1.3.5-5 +- BR libuuid-devel instead of e2fsprogs-devel + +* Mon Jun 8 2009 Bojan Smojver - 1.3.5-4 +- bump up to 1.3.5 + +* Mon Feb 23 2009 Fedora Release Engineering - 1.3.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Feb 4 2009 Joe Orton 1.3.3 +- fix build with libtool 2.2 + +* Fri Jan 2 2009 Joe Orton 1.3.3 +- rebuild + +* Sat Aug 16 2008 Bojan Smojver - 1.3.3-1 +- bump up to 1.3.3 + +* Wed Jul 16 2008 Bojan Smojver - 1.3.2-2 +- ship find_apr.m4, fix bug #455189 + +* Thu Jun 19 2008 Bojan Smojver - 1.3.2-1 +- bump up to 1.3.2 + +* Sun Jun 1 2008 Bojan Smojver - 1.3.0-1 +- bump up to 1.3.0 + +* Tue Feb 19 2008 Fedora Release Engineering - 1.2.12-2 +- Autorebuild for GCC 4.3 + +* Mon Nov 26 2007 Bojan Smojver 1.2.12-1 +- bump up to 1.2.12 +- add dist +- remove a comment from apr-1.2.7-psprintfpi.patch (applied upstream) + +* Tue Sep 18 2007 Joe Orton 1.2.11-2 +- fix %%check for non-multilib 64-bit platforms + +* Sun Sep 9 2007 Bojan Smojver 1.2.11-1 +- bump up to 1.2.11 +- drop openlfs patch (fixed upstream) + +* Sun Sep 2 2007 Joe Orton 1.2.9-4 +- fix API/ABI of 32-bit builds (#254241) + +* Tue Aug 21 2007 Joe Orton 1.2.9-2 +- fix License + +* Mon Jun 25 2007 Bojan Smojver 1.2.9-1 +- bump up to 1.2.9 + +* Mon Jun 4 2007 Joe Orton 1.2.8-7 +- drop %%check section entirely; inappropriate to run in build env. + +* Fri Mar 30 2007 Joe Orton 1.2.8-6 +- merge review (#225253): drop .a archive; drop use of CC/CXX, + use BuildRequires; drop old Conflicts; URL reference for Source + +* Thu Mar 22 2007 Joe Orton 1.2.8-5 +- drop the doxygen documentation (which causes multilib conflicts) + +* Thu Feb 15 2007 Joe Orton 1.2.8-4 +- add BR for python + +* Thu Feb 15 2007 Joe Orton 1.2.8-3 +- update to pick up new libtool, drop specific gcc requirement + +* Mon Dec 4 2006 Joe Orton 1.2.8-2 +- update to 1.2.8 + +* Wed Jul 19 2006 Joe Orton 1.2.7-10 +- fix buildconf with autoconf 2.60 (#199067) + +* Wed Jul 12 2006 Jesse Keating 1.2.7-9.1 +- rebuild + +* Mon Jun 19 2006 Joe Orton 1.2.7-9 +- add fix for use of %%pI with psprintf + +* Fri May 26 2006 Jakub Jelinek 1.2.7-8 +- rebuilt with GCC 4.1.0 + +* Tue May 23 2006 Joe Orton 1.2.7-7 +- fix another multilib conflict (#192659) + +* Tue May 16 2006 Joe Orton 1.2.7-6 +- BR e2fsprogs-devel for libuuid + +* Mon May 8 2006 Joe Orton 1.2.7-4 +- use multilib parallel-installation wrapper hack for apr.h + +* Tue May 2 2006 Joe Orton 1.2.7-3 +- fix installbuilddir in apr-1-config + +* Tue May 2 2006 Joe Orton 1.2.7-2 +- update to 1.2.7 +- use pkg-config in apr-1-config to make it libdir-agnostic + +* Thu Apr 6 2006 Joe Orton 1.2.6-2 +- update to 1.2.6 + +* Fri Feb 10 2006 Jesse Keating - 1.2.2-7.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 1.2.2-7.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Wed Jan 4 2006 Joe Orton 1.2.2-7 +- fix namespace pollution (r354824, r355464) + +* Wed Jan 4 2006 Joe Orton 1.2.2-6 +- fix build with recent glibc (#176911) + +* Tue Jan 3 2006 Jesse Keating 1.2.2-5.2 +- rebuilt again + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Fri Dec 9 2005 Joe Orton 1.2.2-5 +- rebuild for new gcc + +* Thu Dec 8 2005 Joe Orton 1.2.2-4 +- add apr_file_seek() fixes from upstream (r326593, r326597) + +* Wed Dec 7 2005 Joe Orton 1.2.2-3 +- apr-1-config: strip more exports (#175124) + +* Tue Dec 6 2005 Joe Orton 1.2.2-2 +- avoid linking against -lrt +- don't print -L${libdir} in --libs output +- don't export -lcrypt/-luuid in .la file + +* Fri Dec 2 2005 Joe Orton 1.2.2-1 +- update to 1.2.2 + +* Thu Nov 24 2005 Joe Orton 0.9.7-3 +- use RTLD_DEEPBIND in apr_dso_open by default + +* Thu Oct 20 2005 Joe Orton 0.9.7-2 +- update to 0.9.7 + +* Fri Sep 30 2005 Florian La Roche +- rebuild for new gcc + +* Thu Sep 15 2005 Joe Orton 0.9.6-6 +- don't override CFLAGS at build time +- allow setting TCP_NODELAY and TCP_CORK concurrently +- use _exit() not exit() in child if exec*() fails (upstream #30913) + +* Fri Sep 9 2005 Joe Orton 0.9.6-5 +- add from 0.9.x branch: + * fix for apr_{uid,gid}_* error handling (r239592) + * fix for apr_file_ write flushing (r267192) +- add backport for use of readdir64_r (r265032, r265681, r265684) + +* Mon Jul 11 2005 Florian La Roche +- rebuild + +* Tue May 17 2005 Joe Orton 0.9.6-3 +- fix apr_procattr_child_*_set error handling + +* Tue Mar 1 2005 Joe Orton 0.9.6-2 +- have apr-devel depend on specific version of gcc +- add NOTICE to docdir + +* Wed Feb 9 2005 Joe Orton 0.9.6-1 +- update to 0.9.6 + +* Wed Feb 2 2005 Joe Orton 0.9.5-4 +- don't disable sendfile on s390 (IBM LTC, #146891) + +* Mon Nov 22 2004 Joe Orton 0.9.5-3 +- really fix apr-config --srcdir + +* Mon Nov 22 2004 Joe Orton 0.9.5-2 +- fix apr-config --srcdir again + +* Sun Nov 21 2004 Joe Orton 0.9.5-1 +- update to 0.9.5 + +* Mon Sep 27 2004 Joe Orton 0.9.4-24 +- rebuild + +* Wed Sep 1 2004 Joe Orton 0.9.4-23 +- have -devel require apr of same V-R + +* Tue Aug 31 2004 Joe Orton 0.9.4-22 +- backport fixes from HEAD: + * correct implementation of nested mutexes + * support for POSIX semaphores on LP64 platforms + +* Thu Jul 15 2004 Joe Orton 0.9.4-21 +- rebuild for another attempt at using sem_open + +* Tue Jul 13 2004 Joe Orton 0.9.4-20 +- move sticky/suid bits outside APR_OS_DEFAULT bitmask (Greg Hudson) + +* Thu Jul 1 2004 Joe Orton 0.9.4-19 +- rebuild + +* Wed Jun 30 2004 Joe Orton 0.9.4-18 +- rebuild now /dev/shm is mounted + +* Thu Jun 17 2004 Joe Orton 0.9.4-17 +- add fix for cleanup structure reuse (part of upstream #23567) + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Thu Jun 10 2004 Joe Orton 0.9.4-15 +- add support for setuid/setgid/sticky bits (André Malo) +- add apr_threadattr_{guardsize,stacksize}_set() (latter by Jeff Trawick) + +* Mon Jun 7 2004 Joe Orton 0.9.4-14 +- enable posixsem and process-shared pthread mutex support, but + ensure that sysvsem remains the default mechanism + +* Mon May 24 2004 Joe Orton 0.9.4-13 +- entirely remove 2Gb file size limit from apr_file_copy(); + fixes "svnadmin hotcopy" on repos with >2Gb strings table +- work around getnameinfo bugs with v4-mapped addresses +- fix apr_time_exp_get() for dates in 2038 (Philip Martin) + +* Thu May 13 2004 Joe Orton 0.9.4-12 +- use APR_LARGEFILE in apr_file_{copy,append} + +* Wed Mar 24 2004 Joe Orton 0.9.4-11 +- add APR_LARGEFILE flag + +* Mon Mar 15 2004 Joe Orton 0.9.4-10 +- fix configure check for mmap of /dev/zero +- just put -D_GNU_SOURCE in CPPFLAGS not _{BSD,SVID,XOPEN}_SOURCE + +* Tue Mar 02 2004 Elliot Lee 0.9.4-9.1 +- rebuilt + +* Thu Feb 19 2004 Joe Orton 0.9.4-9 +- undocument apr_dir_read() ordering constraint and fix tests + +* Sun Feb 15 2004 Joe Orton 0.9.4-8 +- rebuilt without -Wall -Werror + +* Fri Feb 13 2004 Elliot Lee 0.9.4-7 +- rebuilt + +* Tue Feb 3 2004 Joe Orton 0.9.4-6 +- define apr_off_t as int/long/... to prevent it changing + with _FILE_OFFSET_BITS on 32-bit platforms + +* Mon Jan 12 2004 Joe Orton 0.9.4-5 +- add apr_temp_dir_get fixes from HEAD + +* Thu Jan 8 2004 Joe Orton 0.9.4-4 +- ensure that libapr is linked against libpthread +- don't link libapr against -lnsl + +* Thu Nov 13 2003 Joe Orton 0.9.4-3 +- -devel package no longer requires libtool + +* Fri Oct 3 2003 Joe Orton 0.9.4-2 +- disable tests on x86_64 (#97611) + +* Fri Oct 3 2003 Joe Orton 0.9.4-1 +- update to 0.9.4, enable tests +- ensure that libresolv is not used + +* Sun Sep 7 2003 Joe Orton 0.9.3-14 +- use /dev/urandom (#103049) + +* Thu Jul 24 2003 Joe Orton 0.9.3-13 +- add back CC=gcc, CXX=g++ + +* Tue Jul 22 2003 Nalin Dahyabhai 0.9.3-12 +- rebuild + +* Mon Jul 14 2003 Joe Orton 0.9.3-11 +- work round useless autoconf 2.57 AC_DECL_SYS_SIGLIST + +* Thu Jul 10 2003 Joe Orton 0.9.3-10 +- support --cc and --cpp arguments in apr-config + +* Thu Jul 3 2003 Joe Orton 0.9.3-9 +- force libtool to use CC=gcc, CXX=g++ + +* Thu Jul 3 2003 Joe Orton 0.9.3-8 +- fix libtool location in apr_rules.mk + +* Mon Jun 30 2003 Joe Orton 0.9.3-7 +- use AI_ADDRCONFIG in getaddrinfo() support (#73350) +- include a working libtool script rather than relying on + /usr/bin/libtool (#97695) + +* Wed Jun 18 2003 Joe Orton 0.9.3-6 +- don't use /usr/bin/libtool + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Tue May 20 2003 Joe Orton 0.9.3-5 +- add fix for psprintf memory corruption (CAN-2003-0245) +- remove executable bit from apr_poll.h + +* Thu May 1 2003 Joe Orton 0.9.3-4 +- link libapr against libpthread +- make apr-devel conflict with old subversion-devel +- fix License + +* Tue Apr 29 2003 Joe Orton 0.9.3-3 +- run ldconfig in post/postun + +* Tue Apr 29 2003 Joe Orton 0.9.3-2 +- patch test suite to not care if IPv6 is disabled + +* Mon Apr 28 2003 Joe Orton 0.9.3-1 +- initial build -- cgit