first 3.0.4 thing: ELF note warning

diff --git a/Makefile b/Makefile
index cb2e1123bdbe246fe8f51f6d667c4584d95844df..fe0d87428f945be6368d7a09b0507f93f7b87862 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,9 +18,9 @@
 
 VERSION      := 3
 SUBVERSION   := 0
-MINORVERSION := 3
-TARVERSION   := 3.0.3
-LIBVERSION   := 3.0.3
+MINORVERSION := 4
+TARVERSION   := 3.0.4
+LIBVERSION   := 3.0.4
 
 ############ vars
 

diff --git a/Makefile.noam b/Makefile.noam
index f90cacebf5e7d7ba2bb204d6f37b77bc4046f352..486d310f8bad2fad522b395aedb1367937c0860d 100644 (file)
--- a/Makefile.noam
+++ b/Makefile.noam
@@ -106,7 +106,7 @@ MINORVERSION = $(shell awk '/^%define revision/ { print $$3 }' < procps.spec)
 # Note: LIBVERSION may be less than $(VERSION).$(SUBVERSION).$(MINORVERSION)
 # LIBVERSION is only set to current $(VERSION).$(SUBVERSION).$(MINORVERSION)
 # when an incompatible change is made in libproc.
-LIBVERSION   =  3.0.3
+LIBVERSION   =  3.0.4
 ifdef MINORVERSION
 LIBPROCPASS  =  SHARED=$(SHARED) SHLIBDIR=$(SHLIBDIR) VERSION=$(VERSION) SUBVERSION=$(SUBVERSION) MINORVERSION=$(MINORVERSION) LIBVERSION=$(LIBVERSION)
 else

diff --git a/NEWS b/NEWS
index e733f901a6fbc4cdf6bdf83b25ba9e0e3620f7f0..e674ec33db9852c5d2459bfc27966dcddff00de7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+procps-3.0.3 --> procps-3.0.4
+
+only Linux 2.4.0 supply the ELF note
+
 procps-3.0.2 --> procps-3.0.3
 
 more "make install" fixes

diff --git a/proc/sysinfo.c b/proc/sysinfo.c
index 36e4040dd498f64c337949b1104afb9367103ce6..8b8b466593e6e11b2fc31d58629f6306a9051e4b 100644 (file)
--- a/proc/sysinfo.c
+++ b/proc/sysinfo.c
@@ -127,7 +127,6 @@ static void old_Hertz_hack(void){
   unsigned h;
   char *savelocale;
 
-  fprintf(stderr, "ELF note not found - report to albert@users.sf.net\n");
   savelocale = setlocale(LC_NUMERIC, NULL);
   setlocale(LC_NUMERIC, "C");
   do{
@@ -195,8 +194,12 @@ static void init_libproc(void){
   smp_num_cpus = sysconf(_SC_NPROCESSORS_CONF); // or _SC_NPROCESSORS_ONLN
   if(smp_num_cpus<1) smp_num_cpus=1; /* SPARC glibc is buggy */
 
-  Hertz = find_elf_note(AT_CLKTCK);
-  if(Hertz==42) old_Hertz_hack();
+  if(linux_version_code > LINUX_VERSION(2, 4, 0)){ 
+    Hertz = find_elf_note(AT_CLKTCK);
+    if(Hertz!=42) return;
+    fprintf(stderr, "2.4 kernel w/o ELF notes? -- report to albert@users.sf.net\n");
+  }
+  old_Hertz_hack();
 }
 
 /***********************************************************************

diff --git a/procps.lsm b/procps.lsm
index daf4f25a64aa707d8f07c9b9710f6fc60890fd65..4696f537f29edc88a3c12b78fb49f564e7ae22a8 100644 (file)
--- a/procps.lsm
+++ b/procps.lsm
@@ -1,15 +1,15 @@
 Begin4
 Title: procps
-Version: 3.0.3
-Entered-date: 2002-10-14
+Version: 3.0.4
+Entered-date: 2002-10-15
 Description: Linux system utilities
 Keywords: procps /proc libproc sysctl
        ps uptime tload free w top vmstat watch skill snice kill pgrep pkill
 Author: Albert Cahalan, Michael K. Johnson, Jim Warner, etc.
 Maintained-by: various <procps-feedback@lists.sf.net>
 Primary-site: http://procps.sf.net/
-       230kB procps-3.0.3.tar.gz
+       230kB procps-3.0.4.tar.gz
 Alternate-site: http://www.debian.org/Packages/unstable/base/procps.html
-       230kB procps-3.0.3.tar.gz
+       230kB procps-3.0.4.tar.gz
 Copying-policy: mixed
 End

diff --git a/procps.spec b/procps.spec
index 3bd93506ffb1d78971ba11c9951a1022cbfa43fd..a94c1910c7e19b9138b9638b14afbdbe289e48d2 100644 (file)
--- a/procps.spec
+++ b/procps.spec
@@ -2,7 +2,7 @@ Summary: Utilities for monitoring your system and processes on your system.
 Name: procps
 %define major_version 3
 %define minor_version 0
-%define revision 3
+%define revision 4
 %define version %{major_version}.%{minor_version}.%{revision}
 Version: %{version}
 Release: 1