diff -Nru sysprof-1.0.10/aclocal.m4 sysprof-1.0.11/aclocal.m4 --- sysprof-1.0.10/aclocal.m4 2008-04-28 01:41:22.000000000 +0200 +++ sysprof-1.0.11/aclocal.m4 2008-10-25 01:06:45.000000000 +0200 @@ -927,16 +927,14 @@ # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], -[if test -n "$PKG_CONFIG"; then - if test -n "$$1"; then - pkg_cv_[]$1="$$1" - else - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - fi -else - pkg_failed=untried +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -980,9 +978,9 @@ if test $pkg_failed = yes; then _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD diff -Nru sysprof-1.0.10/binfile.c sysprof-1.0.11/binfile.c --- sysprof-1.0.10/binfile.c 2007-03-04 02:45:29.000000000 +0100 +++ sysprof-1.0.11/binfile.c 2008-10-25 01:05:55.000000000 +0200 @@ -3,7 +3,7 @@ * Copyright 2002, Kristian Rietveld * * Sysprof -- Sampling, systemwide CPU profiler - * Copyright 2004, 2005, Soeren Sandmann + * Copyright 2004, 2005, 2008 Soeren Sandmann * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -132,7 +132,7 @@ get_debug_link_info (bfd *abfd, unsigned long *crc32_out) { asection *sect; - bfd_size_type debuglink_size; + ssize_t debuglink_size; unsigned long crc32; char *contents; int crc_offset; @@ -142,12 +142,28 @@ if (sect == NULL) return NULL; - debuglink_size = bfd_section_size (abfd, sect); - + debuglink_size = bfd_get_section_limit (abfd, sect); + + if (debuglink_size < 6) + { + g_warning ("%s: .gnu_debuglink section is %d bytes long", + abfd->filename, debuglink_size); + return NULL; + } + contents = g_malloc (debuglink_size); bfd_get_section_contents (abfd, sect, contents, (file_ptr)0, (bfd_size_type)debuglink_size); - + + /* Sanity check */ + if (!memchr (contents, '\0', debuglink_size - 4)) + { + g_warning ("%s: Malformed .gnu_debuglink section", abfd->filename); + + g_free (contents); + return NULL; + } + /* Crc value is stored after the filename, aligned up to 4 bytes. */ crc_offset = strlen (contents) + 1; crc_offset = (crc_offset + 3) & ~3; diff -Nru sysprof-1.0.10/configure sysprof-1.0.11/configure --- sysprof-1.0.10/configure 2008-04-28 01:41:25.000000000 +0200 +++ sysprof-1.0.11/configure 2008-10-25 01:06:48.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for sysprof 1.0.10. +# Generated by GNU Autoconf 2.61 for sysprof 1.0.11. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -572,8 +572,8 @@ # Identity of this package. PACKAGE_NAME='sysprof' PACKAGE_TARNAME='sysprof' -PACKAGE_VERSION='1.0.10' -PACKAGE_STRING='sysprof 1.0.10' +PACKAGE_VERSION='1.0.11' +PACKAGE_STRING='sysprof 1.0.11' PACKAGE_BUGREPORT='' ac_unique_file="sysprof.glade" @@ -1168,7 +1168,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sysprof 1.0.10 to adapt to many kinds of systems. +\`configure' configures sysprof 1.0.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1234,7 +1234,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sysprof 1.0.10:";; + short | recursive ) echo "Configuration of sysprof 1.0.11:";; esac cat <<\_ACEOF @@ -1325,7 +1325,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sysprof configure 1.0.10 +sysprof configure 1.0.11 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1339,7 +1339,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sysprof $as_me 1.0.10, which was +It was created by sysprof $as_me 1.0.11, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -1979,7 +1979,7 @@ # Define the identity of the package. PACKAGE='sysprof' - VERSION='1.0.10' + VERSION='1.0.11' # Some tools Automake needs. @@ -3481,11 +3481,10 @@ { echo "$as_me:$LINENO: checking for DEP" >&5 echo $ECHO_N "checking for DEP... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$DEP_CFLAGS"; then - pkg_cv_DEP_CFLAGS="$DEP_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$DEP_CFLAGS"; then + pkg_cv_DEP_CFLAGS="$DEP_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$dep_modules\"") >&5 ($PKG_CONFIG --exists --print-errors "$dep_modules") 2>&5 ac_status=$? @@ -3495,15 +3494,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$DEP_LIBS"; then - pkg_cv_DEP_LIBS="$DEP_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$DEP_LIBS"; then + pkg_cv_DEP_LIBS="$DEP_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$dep_modules\"") >&5 ($PKG_CONFIG --exists --print-errors "$dep_modules") 2>&5 ac_status=$? @@ -3513,9 +3510,8 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -3528,9 +3524,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$dep_modules"` + DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$dep_modules" 2>&1` else - DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$dep_modules"` + DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$dep_modules" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DEP_PKG_ERRORS" >&5 @@ -4186,7 +4182,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sysprof $as_me 1.0.10, which was +This file was extended by sysprof $as_me 1.0.11, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4239,7 +4235,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -sysprof config.status 1.0.10 +sysprof config.status 1.0.11 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -Nru sysprof-1.0.10/configure.ac sysprof-1.0.11/configure.ac --- sysprof-1.0.10/configure.ac 2008-04-28 01:40:08.000000000 +0200 +++ sysprof-1.0.11/configure.ac 2008-10-25 01:06:21.000000000 +0200 @@ -1,6 +1,6 @@ AC_PREREQ(2.54) -AC_INIT([sysprof], [1.0.10]) +AC_INIT([sysprof], [1.0.11]) AC_CONFIG_SRCDIR(sysprof.glade) AM_INIT_AUTOMAKE(no-define) diff -Nru sysprof-1.0.10/debian/changelog sysprof-1.0.11/debian/changelog --- sysprof-1.0.10/debian/changelog 2008-10-27 12:09:00.000000000 +0100 +++ sysprof-1.0.11/debian/changelog 2008-10-27 09:47:38.000000000 +0100 @@ -1,3 +1,9 @@ +sysprof (1.0.11-1) intrepid; urgency=low + + * New upstream release, closes: #272204. + + -- marmuta Mon, 27 Oct 2008 09:32:13 +0100 + sysprof (1.0.10-1) unstable; urgency=low * New upstream release. diff -Nru sysprof-1.0.10/module/sysprof-module.c sysprof-1.0.11/module/sysprof-module.c --- sysprof-1.0.10/module/sysprof-module.c 2008-04-28 03:07:48.000000000 +0200 +++ sysprof-1.0.11/module/sysprof-module.c 2008-10-25 01:13:13.000000000 +0200 @@ -249,7 +249,7 @@ static struct file_operations fops; trace_proc_file = - create_proc_entry ("sysprof-trace", S_IFREG | S_IRUGO, &proc_root); + create_proc_entry ("sysprof-trace", S_IFREG | S_IRUGO, NULL); if (!trace_proc_file) return 1; @@ -273,7 +273,7 @@ { unregister_timer_hook (timer_notify); - remove_proc_entry("sysprof-trace", &proc_root); + remove_proc_entry("sysprof-trace", NULL); printk(KERN_ALERT "sysprof: unloaded\n"); } diff -Nru sysprof-1.0.10/TODO sysprof-1.0.11/TODO --- sysprof-1.0.10/TODO 2008-04-28 01:44:49.000000000 +0200 +++ sysprof-1.0.11/TODO 2008-10-25 01:07:32.000000000 +0200 @@ -5,19 +5,19 @@ - sysprof.c about box - any file that changed - - make announce-1.0.10 file + - make announce-1.0.11 file - search-and-replace 1.0.(x-1) 1.0.x - Add notes in sysprof-1.0.x section - - svn add announce-1.0.x + - git add announce-1.0.x - Make tarball - Check that tarball works - - svn commit + - git commit - - svn copy svn+ssh://ssp@svn.gnome.org/svn/sysprof/branches/sysprof-1-0 svn+ssh://ssp@svn.gnome.org/svn/sysprof/tags/SYSPROF-1-0-9 -m "tag 1.0.10" + - git tag -a sysprof-1.0.11 -m "Sysprof 1.0.11" - Update website