diff -Nru kerneltop-0.91/debian/changelog kerneltop-0.91/debian/changelog --- kerneltop-0.91/debian/changelog 2014-02-04 07:14:20.000000000 +0000 +++ kerneltop-0.91/debian/changelog 2014-04-26 09:04:09.000000000 +0000 @@ -1,3 +1,13 @@ +kerneltop (0.91-2) unstable; urgency=medium + + * Updated architecture to linux-any (Closes: #745197) + * Added patch to fix display 64bit addresses (Closes: #686791) + * Added patch to etext on 64 bit systems + * Fixed hardening hardening-no-relro and hardening-no-fortify-functions + * Added VCS fields to d/control + + -- Dariusz Dwornikowski Sun, 13 Apr 2014 20:04:35 +0200 + kerneltop (0.91-1) unstable; urgency=medium * New maintainer (closes: #729381) diff -Nru kerneltop-0.91/debian/control kerneltop-0.91/debian/control --- kerneltop-0.91/debian/control 2014-02-04 07:30:31.000000000 +0000 +++ kerneltop-0.91/debian/control 2014-04-26 16:59:25.000000000 +0000 @@ -5,13 +5,16 @@ Build-Depends: debhelper (>= 9), autotools-dev Standards-Version: 3.9.5 Homepage: http://www.infradead.org/~rdunlap/src/ +Vcs-Git: git://anonscm.debian.org/collab-maint/kerneltop.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/kerneltop.git + Package: kerneltop -Architecture: any +Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends} Description: shows Linux kernel function usage in a style like top kerneltop shows Linux kernel function information usage (modules not included) like top do for process, and is derived from readprofile. . - It needs profiling enabled on kernel and on boot time. + It needs profiling enabled on kernel at boot time. diff -Nru kerneltop-0.91/debian/patches/01-makefile-include-cflags.patch kerneltop-0.91/debian/patches/01-makefile-include-cflags.patch --- kerneltop-0.91/debian/patches/01-makefile-include-cflags.patch 2014-02-04 07:32:06.000000000 +0000 +++ kerneltop-0.91/debian/patches/01-makefile-include-cflags.patch 2014-04-26 09:04:09.000000000 +0000 @@ -8,10 +8,10 @@ ifeq "$(DEBUG)" "y" -CCFLAGS=-g -+CCFLAGS=-g $(CFLAGS) ++CCFLAGS=-g $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) else -CCFLAGS=-s -+CCFLAGS=-s $(CFLAGS) ++CCFLAGS=-s $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) endif kerneltop: kerneltop.c diff -Nru kerneltop-0.91/debian/patches/02-fix-etext-on-64bit-system.patch kerneltop-0.91/debian/patches/02-fix-etext-on-64bit-system.patch --- kerneltop-0.91/debian/patches/02-fix-etext-on-64bit-system.patch 1970-01-01 00:00:00.000000000 +0000 +++ kerneltop-0.91/debian/patches/02-fix-etext-on-64bit-system.patch 2014-04-26 09:04:09.000000000 +0000 @@ -0,0 +1,41 @@ +Description: Allow _etext to be 'T' on 64bit systems + The _etext symbol can be not only 'A' but also 'T' on 64 bit systems +Author: Vincent Stehlé +--- a/kerneltop.c ++++ b/kerneltop.c +@@ -174,7 +174,7 @@ + * ? Symbol type is unknown or object file format specific + * + * What kerneltop wants/needs is all of the 'T' and 't' symbols that +- * are between "
T _stext" and "
A _etext". ++ * are between "
T _stext" and "
A(or T) _etext". + */ + + static void +@@ -582,7 +582,7 @@ + char mode [8]; + int fn_len; + char begin_text[] = "_stext"; // want all T/t between begin/end text +- char end_text[] = "_etext"; // this one is Absolute. ++ char end_text[] = "_etext"; // this one is absolute or T. + + // try specified/default name first. + if ((mapf = myopen (mapFile, "r", &popenMap))) +@@ -651,7 +651,7 @@ + exit (1); + } + +- if (*mode == 'A' && ++ if ((*mode == 'A' || *mode == 'T') && + !strcmp (fn_name, end_text)) { + adrz = fn_adr; + text_lines++; +@@ -697,7 +697,7 @@ + prgname, mapFile, maplineno); + exit (1); + } +- if (*mode == 'A' && ++ if ((*mode == 'A' || *mode == 'T') && + !strcmp (fn_name, end_text)) + break; + if (*mode != 'T' && *mode != 't') diff -Nru kerneltop-0.91/debian/patches/03-adapt-printing-alignment-to-32-64bit-addresses.patch kerneltop-0.91/debian/patches/03-adapt-printing-alignment-to-32-64bit-addresses.patch --- kerneltop-0.91/debian/patches/03-adapt-printing-alignment-to-32-64bit-addresses.patch 1970-01-01 00:00:00.000000000 +0000 +++ kerneltop-0.91/debian/patches/03-adapt-printing-alignment-to-32-64bit-addresses.patch 2014-04-26 09:04:09.000000000 +0000 @@ -0,0 +1,50 @@ +Description: Adapt printing alignment to 32-64 bit addresses + Detect if start/end addresses are 32 bit or 64 bit, and align printing + accordingly. On my 64 bit PC, this results in a more readable display. +Author: Vincent Stehlé +--- a/kerneltop.c ++++ b/kerneltop.c +@@ -804,6 +804,7 @@ + unsigned long adr; + int valid; + char ch; ++ int aw; // Address width, in number of hex characters + + #ifdef NLS + setlocale (LC_ALL, ""); +@@ -863,6 +864,11 @@ + freqs = (int *) xmalloc (sizeof(int) * (text_lines + 1)); + memset (freqs, 0, sizeof(int) * (text_lines + 1)); + ++ // Detect addresses width. ++ aw = 8; ++ if ((adr0 > 0xffffffffu) || (adrz > 0xffffffffu)) ++ aw = 16; ++ + heading (); + + while (1) { // get profile data, put it into symbol buckets, print +@@ -877,9 +883,9 @@ + dttm = localtime (&timer); + vid_curpos (ROW_HEADINGS, 1); + vid_attr (ATTR_REVERSE_ON); +- printf (_("address function ...... %d-%02d-%02d/%02d:%02d:%02d ...... ticks"), +- dttm->tm_year + 1900, dttm->tm_mon + 1, dttm->tm_mday, +- dttm->tm_hour, dttm->tm_min, dttm->tm_sec); ++ printf (_("%-*s function ...... %d-%02d-%02d/%02d:%02d:%02d ...... ticks"), ++ aw, "address", dttm->tm_year + 1900, dttm->tm_mon + 1, ++ dttm->tm_mday, dttm->tm_hour, dttm->tm_min, dttm->tm_sec); + + #ifdef OPT_REVERSE + if (optReverse) { // reverse the byte order in the profile +@@ -932,8 +938,8 @@ + textsym = (struct text_symbol *) ((char *)textsymroot + text_entry_size * freqtable[ix].textindex); + vid_curpos (ROW_DATA + ix, 1); + vid_clear_curtoend(); +- printf ("%08lx %-41s %6i\n", +- textsym->textadr, textsym->textname, ticks); ++ printf ("%0*lx %-*s %6i\n", ++ aw, textsym->textadr, 33 + aw, textsym->textname, ticks); + } + + total_ticks = 0; diff -Nru kerneltop-0.91/debian/patches/series kerneltop-0.91/debian/patches/series --- kerneltop-0.91/debian/patches/series 2014-02-04 07:10:27.000000000 +0000 +++ kerneltop-0.91/debian/patches/series 2014-04-26 09:04:09.000000000 +0000 @@ -1 +1,3 @@ +02-fix-etext-on-64bit-system.patch +03-adapt-printing-alignment-to-32-64bit-addresses.patch 01-makefile-include-cflags.patch