Hello community, here is the log from the commit of package ht for openSUSE:Factory checked in at 2012-03-05 17:59:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ht (Old) and /work/SRC/openSUSE:Factory/.ht.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ht", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/ht/ht.changes 2012-02-29 14:07:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ht.new/ht.changes 2012-03-05 17:59:49.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Mar 4 11:19:50 UTC 2012 - [email protected] + +- Update to new upstream release 2.0.20 +* Last version had a bug preventing load of 32 bit ELFs + +------------------------------------------------------------------- Old: ---- ht-2.0.19.tar.bz2 ht-enable-math.diff ht-locale-fix.diff ht-search-progress.diff New: ---- ht-2.0.20.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ht.spec ++++++ --- /var/tmp/diff_new_pack.1vnlw2/_old 2012-03-05 17:59:52.000000000 +0100 +++ /var/tmp/diff_new_pack.1vnlw2/_new 2012-03-05 17:59:52.000000000 +0100 @@ -14,10 +14,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: ht -Version: 2.0.19 +Version: 2.0.20 Release: 0 Summary: Disassembler, object dumper and hex editor License: GPL-2.0 @@ -26,9 +24,6 @@ #Source-DL: http://downloads.sf.net/%name/%name-%version.tar.bz2 Source: %name-%version.tar.bz2 -Patch1: ht-locale-fix.diff -Patch2: ht-search-progress.diff -Patch3: ht-enable-math.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake BuildRequires: bison @@ -44,7 +39,6 @@ %prep %setup -q -%patch -P 1 -P 2 -P 3 -p1 %build autoreconf -fi; ++++++ ht-2.0.19.tar.bz2 -> ht-2.0.20.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ht-2.0.19/ChangeLog new/ht-2.0.20/ChangeLog --- old/ht-2.0.19/ChangeLog 2012-01-17 18:48:15.000000000 +0100 +++ new/ht-2.0.20/ChangeLog 2012-03-03 18:14:55.000000000 +0100 @@ -1,6 +1,11 @@ HT ChangeLog ============== +version 2.0.20: + - Fixed loading of 32 bit ELFs (Thanks Oleg) + - Use wide ncurses if necessars (Thanks Jan) + - Show search progress in MiB (Thanks Jan) + version 2.0.19: - [x86] fixed a lot of small bugs - fixed a crash with the "follow" function on diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ht-2.0.19/classview.cc new/ht-2.0.20/classview.cc --- old/ht-2.0.19/classview.cc 2007-06-19 20:56:27.000000000 +0200 +++ new/ht-2.0.20/classview.cc 2012-03-03 18:22:07.000000000 +0100 @@ -713,11 +713,20 @@ static ht_view *class_init(Bounds *b, File *file, ht_format_group *group) { u1 magic[4]; + u1 extra_magic[4]; - file->seek(0); - file->read(magic, 4); + try { + file->seek(0); + file->readx(magic, 4); + file->readx(extra_magic, 4); + } catch (...) { + return NULL; + } + // Mach-O binaries also use 0xcafebabe here. The second byte is the + // number of architectures; if there's more than 10 it's probably + // a Java class file instead. if (magic[0] == 0xca && magic[1] == 0xfe - && magic[2] == 0xba && magic[3] == 0xbe) { + && magic[2] == 0xba && magic[3] == 0xbe && extra_magic[3] > 10) { file->seek(0); void *shared_data = (void*)class_read(file); if (!shared_data) return NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ht-2.0.19/config.h new/ht-2.0.20/config.h --- old/ht-2.0.19/config.h 2012-01-17 18:53:41.000000000 +0100 +++ new/ht-2.0.20/config.h 2012-03-03 16:13:05.000000000 +0100 @@ -65,7 +65,7 @@ #define PACKAGE_NAME "ht" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ht 2.0.19" +#define PACKAGE_STRING "ht 2.0.20" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "ht" @@ -74,7 +74,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.0.19" +#define PACKAGE_VERSION "2.0.20" /* The size of `char', as computed by sizeof. */ #define SIZEOF_CHAR 1 @@ -98,7 +98,7 @@ /* #undef USE_MINILZO */ /* Version number of package */ -#define VERSION "2.0.19" +#define VERSION "2.0.20" /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a `char[]'. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ht-2.0.19/configure new/ht-2.0.20/configure --- old/ht-2.0.19/configure 2012-02-19 21:54:35.000000000 +0100 +++ new/ht-2.0.20/configure 2012-03-03 16:16:47.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for ht 2.0.19. +# Generated by GNU Autoconf 2.68 for ht 2.0.20. # # Report bugs to <https://sourceforge.net/tracker/?group_id=1066>. # @@ -560,8 +560,8 @@ # Identity of this package. PACKAGE_NAME='ht' PACKAGE_TARNAME='ht' -PACKAGE_VERSION='2.0.19' -PACKAGE_STRING='ht 2.0.19' +PACKAGE_VERSION='2.0.20' +PACKAGE_STRING='ht 2.0.20' PACKAGE_BUGREPORT='https://sourceforge.net/tracker/?group_id=1066' PACKAGE_URL='' @@ -1289,7 +1289,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 ht 2.0.19 to adapt to many kinds of systems. +\`configure' configures ht 2.0.20 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1360,7 +1360,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ht 2.0.19:";; + short | recursive ) echo "Configuration of ht 2.0.20:";; esac cat <<\_ACEOF @@ -1464,7 +1464,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ht configure 2.0.19 +ht configure 2.0.20 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2049,7 +2049,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ht $as_me 2.0.19, which was +It was created by ht $as_me 2.0.20, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2992,7 +2992,7 @@ # Define the identity of the package. PACKAGE='ht' - VERSION='2.0.19' + VERSION='2.0.20' cat >>confdefs.h <<_ACEOF @@ -3046,6 +3046,7 @@ echo "*** LINUX, building POSIX version. we need (n)curses." 1>&2 NEED_CURSES=1 HAVE_PIPE=1 + HT_LIBS="$HT_LIBS -lm" FLAGS_ALL="$FLAGS_ALL -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" ;; *freebsd*) @@ -5737,7 +5738,7 @@ _ACEOF $as_echo "#define CURSES_HDR <ncurses.h>" >>confdefs.h - CURSES_LIB=ncurses + CURSES_LIB=ncursesw fi done @@ -6547,7 +6548,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ht $as_me 2.0.19, which was +This file was extended by ht $as_me 2.0.20, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6613,7 +6614,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ht config.status 2.0.19 +ht config.status 2.0.20 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ht-2.0.19/configure.in new/ht-2.0.20/configure.in --- old/ht-2.0.19/configure.in 2012-02-19 21:54:19.000000000 +0100 +++ new/ht-2.0.20/configure.in 2012-03-03 16:16:45.000000000 +0100 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(ht,[2.0.19],[https://sourceforge.net/tracker/?group_id=1066]) +AC_INIT(ht,[2.0.20],[https://sourceforge.net/tracker/?group_id=1066]) AC_PREREQ(2.59) dnl Check the system. @@ -42,6 +42,7 @@ echo "*** LINUX, building POSIX version. we need (n)curses." 1>&2 NEED_CURSES=1 HAVE_PIPE=1 + HT_LIBS="$HT_LIBS -lm" FLAGS_ALL="$FLAGS_ALL -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" ;; *freebsd*) @@ -191,7 +192,7 @@ dnl AC_CONFIG_HEADER(config.h) CURSES_LIB= if test "x$NEED_CURSES" = "x1"; then - AC_CHECK_HEADERS(ncurses.h, AC_DEFINE(CURSES_HDR, <ncurses.h>, [This system provides (n)curses.h]) CURSES_LIB=ncurses) + AC_CHECK_HEADERS(ncurses.h, AC_DEFINE(CURSES_HDR, <ncurses.h>, [This system provides (n)curses.h/wide]) CURSES_LIB=ncursesw) if test "x$CURSES_LIB" = "x"; then AC_CHECK_HEADERS(curses.h, AC_DEFINE(CURSES_HDR, <curses.h>, [This system provides (n)curses.h]) CURSES_LIB=curses) if test "x$CURSES_LIB" = "x"; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ht-2.0.19/doc/ht.texi new/ht-2.0.20/doc/ht.texi --- old/ht-2.0.19/doc/ht.texi 2012-02-19 15:06:59.000000000 +0100 +++ new/ht-2.0.20/doc/ht.texi 2012-03-03 16:07:48.000000000 +0100 @@ -51,7 +51,7 @@ @titlepage @title{HT Manual} -@subtitle{Edition 2.0.19, January 2012} +@subtitle{Edition 2.0.20, January 2012} @author{Stefan Weyergraf, Sebastian Biallas} @c The following two commands start the copyright page. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ht-2.0.19/htelf.cc new/ht-2.0.20/htelf.cc --- old/ht-2.0.19/htelf.cc 2012-01-17 18:48:16.000000000 +0100 +++ new/ht-2.0.20/htelf.cc 2012-03-03 16:07:47.000000000 +0100 @@ -155,6 +155,8 @@ if (!elf_shared->sheaders.count) { elf_shared->sheaders.sheaders32 = NULL; } else { + elf_shared->sheaders.sheaders32 = + ht_malloc(elf_shared->sheaders.count * sizeof *elf_shared->sheaders.sheaders32); file->seek(header_ofs + elf_shared->header32.e_shoff); file->readx(elf_shared->sheaders.sheaders32, elf_shared->sheaders.count*sizeof *elf_shared->sheaders.sheaders32); for (uint i=0; i < elf_shared->sheaders.count; i++) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ht-2.0.19/htinfo.h new/ht-2.0.20/htinfo.h --- old/ht-2.0.19/htinfo.h 2012-01-17 18:48:16.000000000 +0100 +++ new/ht-2.0.20/htinfo.h 2012-03-03 16:07:47.000000000 +0100 @@ -24,7 +24,7 @@ #define ht_url "http://hte.sourceforge.net"; #define ht_name "ht" -#define ht_version "2.0.19" +#define ht_version "2.0.20" #define ht_author1 "Stefan Weyergraf" #define ht_copyright1 "(c) 1999-2004 "ht_author1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ht-2.0.19/htsearch.cc new/ht-2.0.20/htsearch.cc --- old/ht-2.0.19/htsearch.cc 2008-04-09 00:07:16.000000000 +0200 +++ new/ht-2.0.20/htsearch.cc 2012-03-03 16:34:48.000000000 +0100 @@ -531,10 +531,10 @@ } ctx->o -= ctx->patlen-1; - int p = (int)(((double)(ctx->o - ctx->ofs))*100/ctx->len); + int p = (((double)(ctx->o - ctx->ofs))*100/ctx->len); char status[64]; - ht_snprintf(status, sizeof status, "%d %%", p); + ht_snprintf(status, sizeof status, "%d %% (%d MiB)", p, int ((unsigned long long)ctx->o >> 20)); progress_indicator->settext(status); return true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ht-2.0.19/io/posix/sysdisplay.cc new/ht-2.0.20/io/posix/sysdisplay.cc --- old/ht-2.0.19/io/posix/sysdisplay.cc 2008-05-06 22:31:14.000000000 +0200 +++ new/ht-2.0.20/io/posix/sysdisplay.cc 2012-03-03 16:16:45.000000000 +0100 @@ -301,7 +301,7 @@ setCursor(0, 0, CURSOR_OFF); -// ::setlocale(LC_ALL, ""); + ::setlocale(LC_ALL, ""); // terminal = ::newterm(NULL, stdout, stdin); win = ::initscr(); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
