commit procps for openSUSE:Factory
Hello community,
here is the log from the commit of package procps for openSUSE:Factory
checked in at Tue Nov 2 10:59:05 CET 2010.
--------
--- procps/procps.changes 2010-10-04 18:59:21.000000000 +0200
+++ /mounts/work_src_done/STABLE/procps/procps.changes 2010-10-29 12:18:14.000000000 +0200
@@ -1,0 +2,23 @@
+Fri Oct 29 12:17:40 CEST 2010 - werner@suse.de
+
+- Fix race in parallel make
+
+-------------------------------------------------------------------
+Fri Oct 29 11:47:52 CEST 2010 - werner@suse.de
+
+- On IA64 the priorities from 0 upto 100 are reserved for the
+ implementation
+
+-------------------------------------------------------------------
+Fri Oct 29 10:14:51 CEST 2010 - werner@suse.de
+
+- Avoid running HZ initialization twice by using priority for
+ the constructors for excuting before main()
+- Add test on "Unknown HZ value!"
+
+-------------------------------------------------------------------
+Thu Oct 28 14:06:16 UTC 2010 - seife@b1-systems.de
+
+- fix "Unknown HZ value!" error (bnc#649501)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
procps-3.2.8-fix-unknown-HZ.dif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ procps.spec ++++++
--- /var/tmp/diff_new_pack.nOHJwo/_old 2010-11-02 10:57:50.000000000 +0100
+++ /var/tmp/diff_new_pack.nOHJwo/_new 2010-11-02 10:57:50.000000000 +0100
@@ -27,7 +27,7 @@
PreReq: %fillup_prereq %insserv_prereq
AutoReqProv: on
Version: 3.2.8
-Release: 21
+Release: 22
Summary: ps utilities for /proc
Provides: ps
Obsoletes: ps
@@ -71,6 +71,8 @@
Patch34: bug-634071_procstat2.diff
Patch35: bug-634840.patch
Patch36: procps-3.2.8.dif
+# bnc #649501, apparently the initialization is depending on linking order...
+Patch37: procps-3.2.8-fix-unknown-HZ.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -135,10 +137,13 @@
%patch34 -p1
%patch35 -p1
%patch36
+%patch37 -p1
%build
make %{?_smp_mflags} CFLAGS="-Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS -pipe" \
CC="gcc"
+hz="$(ps/ps aux 2>&1 | grep -E '^Unknown HZ value')" || true
+test -z "$hz" || exit 1
%install
make DESTDIR=$RPM_BUILD_ROOT install
++++++ procps-3.2.8.dif ++++++
--- /var/tmp/diff_new_pack.nOHJwo/_old 2010-11-02 10:57:51.000000000 +0100
+++ /var/tmp/diff_new_pack.nOHJwo/_new 2010-11-02 10:57:51.000000000 +0100
@@ -9,6 +9,15 @@
ALL_LDFLAGS := $(PKG_LDFLAGS) $(LDFLAGS)
############ Add some extra flags if gcc allows
+@@ -250,7 +250,7 @@ pmap w uptime tload free sysctl vmstat u
+ slabtop top: % : %.o $(LIBPROC)
+ $(CC) $(ALL_CFLAGS) $^ $(ALL_LDFLAGS) -o $@ $(CURSES)
+
+-watch: % : %.o
++watch: % : %.o $(LIBPROC)
+ $(CC) $(ALL_CFLAGS) $^ $(ALL_LDFLAGS) -o $@ $(CURSES)
+
+ ############ progX --> progY
--- ps/module.mk
+++ ps/module.mk 2010-10-04 16:46:47.668425720 +0000
@@ -20,11 +20,11 @@ PS_X := COPYING HACKING TRANSLATION comm
++++++ procps-3.2.8-fix-unknown-HZ.dif ++++++
--- a/proc/sig.c
+++ b/proc/sig.c 2010-10-29 09:15:13.872426803 +0000
@@ -231,7 +231,7 @@ void unix_print_signals(void){
}
/* sanity check */
-static int init_signal_list(void) __attribute__((constructor));
+static int init_signal_list(void) __attribute__((constructor (103)));
static int init_signal_list(void){
if(number_of_signals != 31){
fprintf(stderr, "WARNING: %d signals -- adjust and recompile.\n", number_of_signals);
--- a/proc/sysinfo.c
+++ b/proc/sysinfo.c 2010-10-29 09:12:17.768426168 +0000
@@ -158,6 +158,14 @@ static void old_Hertz_hack(void){
unsigned long long jiffies;
unsigned h;
char *restrict savelocale;
+ long hz;
+
+#ifdef _SC_CLK_TCK
+ if((hz = sysconf(_SC_CLK_TCK)) > 0){
+ Hertz = hz;
+ return;
+ }
+#endif
savelocale = setlocale(LC_NUMERIC, NULL);
setlocale(LC_NUMERIC, "C");
@@ -258,7 +266,7 @@ long smp_num_cpus(void)
return(_smp_num_cpus);
}
-static void init_libproc(void) __attribute__((constructor));
+static void init_libproc(void) __attribute__((constructor (102)));
static void init_libproc(void){
have_privs = check_for_privs();
--- a/proc/version.c
+++ b/proc/version.c 2010-10-29 09:11:53.192426444 +0000
@@ -33,7 +33,7 @@ void display_version(void) {
int linux_version_code;
-static void init_Linux_version(void) __attribute__((constructor));
+static void init_Linux_version(void) __attribute__((constructor (101)));
static void init_Linux_version(void) {
static struct utsname uts;
int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */
++++++ procps-3.2.8-glibc-2.6.1.dif ++++++
--- /var/tmp/diff_new_pack.nOHJwo/_old 2010-11-02 10:57:51.000000000 +0100
+++ /var/tmp/diff_new_pack.nOHJwo/_new 2010-11-02 10:57:51.000000000 +0100
@@ -106,3 +106,13 @@
free(tmpname);
free(outname);
return rc;
+--- w.c
++++ w.c 2010-10-29 09:56:22.936426251 +0000
+@@ -15,6 +15,7 @@
+ #include
participants (1)
-
root@hilbert.suse.de