From 31f5f757db81d2041cc7afb6b91d63725cadaac56171676ae7d2d878dce191c9 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 10 Sep 2009 10:40:13 +0000 Subject: [PATCH] checked in OBS-URL: https://build.opensuse.org/package/show/Base:System/procps?expand=0&rev=9 --- procps-3.2.8-fdleak.dif | 18 ------------------ procps.changes | 5 ----- procps.spec | 2 -- 3 files changed, 25 deletions(-) delete mode 100644 procps-3.2.8-fdleak.dif diff --git a/procps-3.2.8-fdleak.dif b/procps-3.2.8-fdleak.dif deleted file mode 100644 index 794fc40..0000000 --- a/procps-3.2.8-fdleak.dif +++ /dev/null @@ -1,18 +0,0 @@ ---- vmstat.c -+++ vmstat.c 2009-09-10 10:10:17.509902189 +0200 -@@ -413,13 +413,12 @@ static void slabheader(void){ - //////////////////////////////////////////////////////////////////////////// - - static void slabformat (void){ -- FILE *fSlab; -+ struct stat fSlab; - struct slab_cache *slabs; - unsigned long nSlab,i,j,k; - const char format[]="%-24s %6u %6u %6u %6u\n"; - -- fSlab=fopen("/proc/slabinfo", "rb"); -- if(!fSlab){ -+ if(stat("/proc/slabinfo", &fSlab) < 0){ - fprintf(stderr, "Your kernel doesn't support slabinfo.\n"); - return; - } diff --git a/procps.changes b/procps.changes index 1ebb36c..7fcd38e 100644 --- a/procps.changes +++ b/procps.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Sep 10 10:13:00 CEST 2009 - werner@suse.de - -- Yet an other fd leak found by David Binderman (bnc#536207) - ------------------------------------------------------------------- Wed Aug 19 14:45:52 CEST 2009 - werner@suse.de diff --git a/procps.spec b/procps.spec index f072fb5..8b72bd7 100644 --- a/procps.spec +++ b/procps.spec @@ -62,7 +62,6 @@ Patch25: procps-3.2.7-cgroups_flag.diff Patch26: procps-3.2.8-pgrep_coption.dif Patch27: procps-3.2.7-terabyte.dif Patch28: procps-3.2.6-xen.dif -Patch29: procps-3.2.8-fdleak.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -119,7 +118,6 @@ Authors: %patch26 %patch27 %patch28 -%patch29 %build make CFLAGS="-Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS -pipe" \