pool/procps
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/procps?expand=0&rev=10

Browse Source
This commit is contained in:
OBS User unknown 2008-02-15 00:39:06 +00:00 committed by Git OBS Bridge
parent b272b3fd83
commit 3dfac40fc1
3 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
procps-3.2.7-glibc-2.6.1.dif
View File

@ -1,5 +1,5 @@
--- sysctl.c --- sysctl.c
+++ sysctl.c 2007-12-12 12:05:48.138322148 +0100 +++ sysctl.c 2008-02-14 12:04:35.540780685 +0100
@@ -128,6 +128,7 @@ static int ReadSetting(const char *restr @@ -128,6 +128,7 @@ static int ReadSetting(const char *restr
char *restrict outname; char *restrict outname;
char inbuf[1025]; char inbuf[1025];
@ -41,7 +41,15 @@
fp = fopen(tmpname, "r"); fp = fopen(tmpname, "r");
if (!fp) { if (!fp) {
@@ -194,8 +212,9 @@ static int ReadSetting(const char *restr @@ -164,6 +182,7 @@ static int ReadSetting(const char *restr
break;
}
} else {
+ errno = 0;
if(fgets(inbuf, sizeof inbuf - 1, fp)) {
// this loop is required, see
// /sbin/sysctl -a | egrep -6 dev.cdrom.info
@@ -194,18 +213,20 @@ static int ReadSetting(const char *restr
len = strlen(tmpname); len = strlen(tmpname);
tmpname[len] = '/'; tmpname[len] = '/';
tmpname[len+1] = '\0'; tmpname[len+1] = '\0';
@ -52,7 +60,10 @@
} }
default: default:
fprintf(stderr, ERR_UNKNOWN_READING, strerror(errno), outname); fprintf(stderr, ERR_UNKNOWN_READING, strerror(errno), outname);
@@ -205,7 +224,7 @@ static int ReadSetting(const char *restr rc = -1;
+ case 0:
break;
}
} }
fclose(fp); fclose(fp);
} }
@ -61,7 +72,7 @@
free(tmpname); free(tmpname);
free(outname); free(outname);
return rc; return rc;
@@ -265,8 +284,9 @@ static int WriteSetting(const char *sett @@ -265,8 +286,9 @@ static int WriteSetting(const char *sett
const char *value; const char *value;
const char *equals; const char *equals;
char *tmpname; char *tmpname;
@ -72,7 +83,7 @@
if (!name) { /* probably don't want to display this err */ if (!name) { /* probably don't want to display this err */
return 0; return 0;
@@ -299,6 +319,22 @@ static int WriteSetting(const char *sett @@ -299,6 +321,22 @@ static int WriteSetting(const char *sett
outname[equals-name] = 0; outname[equals-name] = 0;
slashdot(outname,'/','.'); /* change / to . */ slashdot(outname,'/','.'); /* change / to . */
@ -95,7 +106,7 @@
fp = fopen(tmpname, "w"); fp = fopen(tmpname, "w");
if (!fp) { if (!fp) {
@@ -343,7 +379,7 @@ static int WriteSetting(const char *sett @@ -343,7 +381,7 @@ static int WriteSetting(const char *sett
} }
} }
} }

5
procps.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Feb 14 12:06:17 CET 2008 - werner@suse.de
- Also ignore empty proc files in sysctl (bnc #347322, #361049)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 6 16:54:05 CET 2008 - werner@suse.de Wed Feb 6 16:54:05 CET 2008 - werner@suse.de

5
procps.spec
View File

@ -10,6 +10,7 @@
# norootforbuild # norootforbuild
Name: procps Name: procps
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
Url: http://procps.sf.net Url: http://procps.sf.net
@ -18,7 +19,7 @@ Group: System/Monitoring
PreReq: %fillup_prereq %insserv_prereq PreReq: %fillup_prereq %insserv_prereq
AutoReqProv: on AutoReqProv: on
Version: 3.2.7 Version: 3.2.7
Release: 91 Release: 93
Summary: ps utilities for /proc Summary: ps utilities for /proc
Provides: ps Provides: ps
Obsoletes: ps Obsoletes: ps
@ -158,6 +159,8 @@ rm -rf $RPM_BUILD_ROOT
%_mandir/man8/sysctl.8.gz %_mandir/man8/sysctl.8.gz
%changelog %changelog
* Thu Feb 14 2008 werner@suse.de
- Also ignore empty proc files in sysctl (bnc #347322, #361049)
* Wed Feb 06 2008 werner@suse.de * Wed Feb 06 2008 werner@suse.de
- Do not delete secondary IPs on deleting primary IP (bnc#212053) - Do not delete secondary IPs on deleting primary IP (bnc#212053)
* Thu Jan 17 2008 werner@suse.de * Thu Jan 17 2008 werner@suse.de