Author: ktdreyer Update of /cvs/free/rpms/openafs/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19436 Modified Files: openafs.spec Added Files: openafs-1.6.1-afsd-sys-resource-h.patch Log Message: * Wed Aug 22 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; 0:1.6.1-4 - Upstream patch for new glibc openafs-1.6.1-afsd-sys-resource-h.patch: afsd_kernel.c | 4 ++++ 1 file changed, 4 insertions(+) --- NEW FILE openafs-1.6.1-afsd-sys-resource-h.patch --- commit 94a6a552ae8b45f02dd6a6a3a92907d355801eb1 Author: Marc Dionne <marc.c.dionne(a)gmail.com&gt; Date: Sat Jun 2 20:45:08 2012 -0400 afsd: include sys/resource.h in afsd_kernel.c With a recent glibc update, sys/wait.h no longer includes sys/resource.h unless __USE_SVID, __USE_XOPEN or __USE_XOPEN2K8 are set. Don't rely on the indirect inclusion to get the bits we need; include it directly in afsd_kernel.c. This include used to be there but was dropped when afsd_kernel.c was split off. Change-Id: I1bfd2e0c340e15ca44472aa89614f088e0c0ce0c Reviewed-on: http://gerrit.openafs.org/7522 Tested-by: BuildBot <buildbot(a)rampaginggeek.com&gt; Reviewed-by: Derrick Brashear <shadow(a)dementix.org&gt; (cherry picked from commit bc3a32a84facb8114a8c7de87025f972d0281098) Conflicts: src/afsd/afsd_kernel.c diff --git a/src/afsd/afsd_kernel.c b/src/afsd/afsd_kernel.c index 1f7fdbb..3c7c6ee 100644 --- a/src/afsd/afsd_kernel.c +++ b/src/afsd/afsd_kernel.c @@ -33,6 +33,10 @@ #include <sys/wait.h> +#if defined(AFS_LINUX20_ENV) +#include <sys/resource.h> +#endif + #ifdef HAVE_SYS_PARAM_H #include <sys/param.h> #endif Index: openafs.spec =================================================================== RCS file: /cvs/free/rpms/openafs/devel/openafs.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- openafs.spec 22 Aug 2012 20:19:22 -0000 1.25 +++ openafs.spec 23 Aug 2012 01:02:51 -0000 1.26 @@ -13,7 +13,7 @@ Summary: Enterprise Network File System Name: openafs Version: 1.6.1 -Release: 3%{?dist} +Release: 4%{?dist} License: IBM Group: System Environment/Daemons URL: http://www.openafs.org @@ -31,6 +31,10 @@ Patch0: openafs-1.6.0-fPIC.patch # Upstream patch to fix fileservers with >2TB partitions Patch1: openafs-1.6.1-int31-partsize.patch +# Upstream patch to compile with newer glibc +# (not yet on openafs-stable-1_6_x; cherry-picked from master) +Patch2: openafs-1.6.1-afsd-sys-resource-h.patch + %description The AFS distributed filesystem. AFS is a distributed filesystem @@ -101,6 +105,9 @@ # This allows fileservers to serve data from partition sizes greater than 2TB. %patch1 -p1 +# This allows us to build with newer glibc +%patch2 -p1 + # Convert the licese to UTF-8 mv src/LICENSE src/LICENSE~ iconv -f ISO-8859-1 -t UTF8 src/LICENSE~ > src/LICENSE @@ -329,6 +336,9 @@ %{_datadir}/openafs/C/afszcm.cat %changelog +* Wed Aug 22 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; 0:1.6.1-4 +- Upstream patch for new glibc + * Wed Aug 22 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; 0:1.6.1-3 - Upstream patch for fileserver partitions >2TB