From 14d22d29b19455052a72db1512fdd0ef95c6521d Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Tue, 16 Jul 2002 16:18:36 +0000 Subject: [PATCH] Big re-sync with UPX 1.2 branch. committer: mfx 1026836316 +0000 --- src/stub/scripts/app.pl | 8 ++++---- src/stub/scripts/app_68k.pl | 8 ++++---- src/stub/scripts/app_r3k.pl | 8 ++++---- src/stub/scripts/asl_68k.sh | 11 +++++------ src/stub/scripts/bin2h.pl | 26 +++++++++++++++----------- src/stub/scripts/brandelf.pl | 8 ++++---- src/stub/scripts/o2bin.pl | 8 ++++---- src/stub/scripts/setfold.sh | 11 +++++------ src/stub/scripts/stripelf.pl | 8 ++++---- src/stub/scripts/version.pl | 8 ++++---- 10 files changed, 53 insertions(+), 51 deletions(-) diff --git a/src/stub/scripts/app.pl b/src/stub/scripts/app.pl index 897b7e8e..b2269ac4 100644 --- a/src/stub/scripts/app.pl +++ b/src/stub/scripts/app.pl @@ -4,8 +4,8 @@ # # This file is part of the UPX executable compressor. # -# Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer -# Copyright (C) 1996-2001 Laszlo Molnar +# Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer +# Copyright (C) 1996-2002 Laszlo Molnar # All Rights Reserved. # # UPX and the UCL library are free software; you can redistribute them @@ -23,8 +23,8 @@ # If not, write to the Free Software Foundation, Inc., # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -# Markus F.X.J. Oberhumer Laszlo Molnar -# markus@oberhumer.com ml1050@cdata.tvnet.hu +# Markus F.X.J. Oberhumer Laszlo Molnar +# # # diff --git a/src/stub/scripts/app_68k.pl b/src/stub/scripts/app_68k.pl index bdc09c1f..d832addc 100644 --- a/src/stub/scripts/app_68k.pl +++ b/src/stub/scripts/app_68k.pl @@ -4,8 +4,8 @@ # # This file is part of the UPX executable compressor. # -# Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer -# Copyright (C) 1996-2001 Laszlo Molnar +# Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer +# Copyright (C) 1996-2002 Laszlo Molnar # All Rights Reserved. # # UPX and the UCL library are free software; you can redistribute them @@ -23,8 +23,8 @@ # If not, write to the Free Software Foundation, Inc., # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -# Markus F.X.J. Oberhumer Laszlo Molnar -# markus@oberhumer.com ml1050@cdata.tvnet.hu +# Markus F.X.J. Oberhumer Laszlo Molnar +# # # diff --git a/src/stub/scripts/app_r3k.pl b/src/stub/scripts/app_r3k.pl index 1cc0516b..fed50af3 100644 --- a/src/stub/scripts/app_r3k.pl +++ b/src/stub/scripts/app_r3k.pl @@ -4,8 +4,8 @@ # # This file is part of the UPX executable compressor. # -# Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer -# Copyright (C) 1996-2001 Laszlo Molnar +# Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer +# Copyright (C) 1996-2002 Laszlo Molnar # All Rights Reserved. # # UPX and the UCL library are free software; you can redistribute them @@ -23,8 +23,8 @@ # If not, write to the Free Software Foundation, Inc., # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -# Markus F.X.J. Oberhumer Laszlo Molnar -# markus@oberhumer.com ml1050@cdata.tvnet.hu +# Markus F.X.J. Oberhumer Laszlo Molnar +# # # diff --git a/src/stub/scripts/asl_68k.sh b/src/stub/scripts/asl_68k.sh index 7f073fb0..87d1e3d7 100644 --- a/src/stub/scripts/asl_68k.sh +++ b/src/stub/scripts/asl_68k.sh @@ -1,13 +1,11 @@ #! /bin/sh -set -e - # # asl_68k.sh -- # # This file is part of the UPX executable compressor. # -# Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer -# Copyright (C) 1996-2001 Laszlo Molnar +# Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer +# Copyright (C) 1996-2002 Laszlo Molnar # All Rights Reserved. # # UPX and the UCL library are free software; you can redistribute them @@ -25,10 +23,11 @@ set -e # If not, write to the Free Software Foundation, Inc., # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -# Markus F.X.J. Oberhumer Laszlo Molnar -# markus@oberhumer.com ml1050@cdata.tvnet.hu +# Markus F.X.J. Oberhumer Laszlo Molnar +# # +set -e # wrapper for the ASL cross-assembler (version 1.42bld9) # http://john.ccac.rwth-aachen.de:8000/as/ diff --git a/src/stub/scripts/bin2h.pl b/src/stub/scripts/bin2h.pl index b4d3c3d2..b44a3f7d 100644 --- a/src/stub/scripts/bin2h.pl +++ b/src/stub/scripts/bin2h.pl @@ -4,8 +4,8 @@ # # This file is part of the UPX executable compressor. # -# Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer -# Copyright (C) 1996-2001 Laszlo Molnar +# Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer +# Copyright (C) 1996-2002 Laszlo Molnar # All Rights Reserved. # # UPX and the UCL library are free software; you can redistribute them @@ -23,11 +23,14 @@ # If not, write to the Free Software Foundation, Inc., # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -# Markus F.X.J. Oberhumer Laszlo Molnar -# markus@oberhumer.com ml1050@cdata.tvnet.hu +# Markus F.X.J. Oberhumer Laszlo Molnar +# # +use Compress::Zlib; + + $delim = $/; undef $/; # undef input record separator - read file as a whole @@ -62,8 +65,8 @@ print <<"EOF"; This file is part of the UPX executable compressor. - Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1996-2001 Laszlo Molnar + Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2002 Laszlo Molnar All Rights Reserved. UPX and the UCL library are free software; you can redistribute them @@ -81,8 +84,8 @@ print <<"EOF"; If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - Markus F.X.J. Oberhumer Laszlo Molnar - markus\@oberhumer.com ml1050\@cdata.tvnet.hu + Markus F.X.J. Oberhumer Laszlo Molnar + */ @@ -91,8 +94,9 @@ EOF $s = $ident; $s =~ tr/a-z/A-Z/; -$s .= "_ADLER32"; -printf("#define %s 0x%08x\n\n", $s, &adler32($data)); +printf("#define %s_ADLER32 0x%08x\n", $s, &adler32($data)); +printf("#define %s_CRC32 0x%08x\n", $s, &crc32($data)); +printf("\n"); printf("unsigned char %s[%d] = {", $ident, $n); for ($i = 0; $i < $n; $i++) { @@ -123,7 +127,7 @@ exit(0); # // # ************************************************************************/ -sub adler32 { +sub adler32_OLD { local($d) = @_; local($n) = length($d); local($i); diff --git a/src/stub/scripts/brandelf.pl b/src/stub/scripts/brandelf.pl index 8a838a36..4ab4349a 100644 --- a/src/stub/scripts/brandelf.pl +++ b/src/stub/scripts/brandelf.pl @@ -4,8 +4,8 @@ # # This file is part of the UPX executable compressor. # -# Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer -# Copyright (C) 1996-2001 Laszlo Molnar +# Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer +# Copyright (C) 1996-2002 Laszlo Molnar # All Rights Reserved. # # UPX and the UCL library are free software; you can redistribute them @@ -23,8 +23,8 @@ # If not, write to the Free Software Foundation, Inc., # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -# Markus F.X.J. Oberhumer Laszlo Molnar -# markus@oberhumer.com ml1050@cdata.tvnet.hu +# Markus F.X.J. Oberhumer Laszlo Molnar +# # diff --git a/src/stub/scripts/o2bin.pl b/src/stub/scripts/o2bin.pl index 18c6ec67..b5a39d7d 100644 --- a/src/stub/scripts/o2bin.pl +++ b/src/stub/scripts/o2bin.pl @@ -4,8 +4,8 @@ # # This file is part of the UPX executable compressor. # -# Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer -# Copyright (C) 1996-2001 Laszlo Molnar +# Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer +# Copyright (C) 1996-2002 Laszlo Molnar # All Rights Reserved. # # UPX and the UCL library are free software; you can redistribute them @@ -23,8 +23,8 @@ # If not, write to the Free Software Foundation, Inc., # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -# Markus F.X.J. Oberhumer Laszlo Molnar -# markus@oberhumer.com ml1050@cdata.tvnet.hu +# Markus F.X.J. Oberhumer Laszlo Molnar +# # diff --git a/src/stub/scripts/setfold.sh b/src/stub/scripts/setfold.sh index af89a7c3..bb05ba59 100644 --- a/src/stub/scripts/setfold.sh +++ b/src/stub/scripts/setfold.sh @@ -1,13 +1,11 @@ #! /bin/sh -set -e - # # setfold.sh -- # # This file is part of the UPX executable compressor. # -# Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer -# Copyright (C) 1996-2001 Laszlo Molnar +# Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer +# Copyright (C) 1996-2002 Laszlo Molnar # All Rights Reserved. # # UPX and the UCL library are free software; you can redistribute them @@ -25,10 +23,11 @@ set -e # If not, write to the Free Software Foundation, Inc., # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -# Markus F.X.J. Oberhumer Laszlo Molnar -# markus@oberhumer.com ml1050@cdata.tvnet.hu +# Markus F.X.J. Oberhumer Laszlo Molnar +# # +set -e file="$1" diff --git a/src/stub/scripts/stripelf.pl b/src/stub/scripts/stripelf.pl index b1889277..bdefae81 100644 --- a/src/stub/scripts/stripelf.pl +++ b/src/stub/scripts/stripelf.pl @@ -4,8 +4,8 @@ # # This file is part of the UPX executable compressor. # -# Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer -# Copyright (C) 1996-2001 Laszlo Molnar +# Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer +# Copyright (C) 1996-2002 Laszlo Molnar # All Rights Reserved. # # UPX and the UCL library are free software; you can redistribute them @@ -23,8 +23,8 @@ # If not, write to the Free Software Foundation, Inc., # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -# Markus F.X.J. Oberhumer Laszlo Molnar -# markus@oberhumer.com ml1050@cdata.tvnet.hu +# Markus F.X.J. Oberhumer Laszlo Molnar +# # # diff --git a/src/stub/scripts/version.pl b/src/stub/scripts/version.pl index 9aabd1bd..3e191f08 100644 --- a/src/stub/scripts/version.pl +++ b/src/stub/scripts/version.pl @@ -4,8 +4,8 @@ # # This file is part of the UPX executable compressor. # -# Copyright (C) 1996-2001 Markus Franz Xaver Johannes Oberhumer -# Copyright (C) 1996-2001 Laszlo Molnar +# Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer +# Copyright (C) 1996-2002 Laszlo Molnar # All Rights Reserved. # # UPX and the UCL library are free software; you can redistribute them @@ -23,8 +23,8 @@ # If not, write to the Free Software Foundation, Inc., # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -# Markus F.X.J. Oberhumer Laszlo Molnar -# markus@oberhumer.com ml1050@cdata.tvnet.hu +# Markus F.X.J. Oberhumer Laszlo Molnar +# #