Update to 1.25.

PR:		72472

13 files changed, 358 insertions, 650 deletions

diff --git a/archivers/upx/Makefile b/archivers/upx/Makefile
index 2fcf0b01a9a6..c37b605973ec 100644
--- a/archivers/upx/Makefile
+++ b/archivers/upx/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	upx
-PORTVERSION=	1.24
+PORTVERSION=	1.25
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	upx/
@@ -27,7 +27,6 @@ MAN1=		upx.1
 PLIST_FILES=	bin/upx
 
 post-patch:
-	@${CP} ${FILESDIR}/freebsd.h ${WRKSRC}/config_h
 	@${CP} ${FILESDIR}/l_b_n2?.h ${WRKSRC}/stub
 
 post-build:
diff --git a/archivers/upx/distinfo b/archivers/upx/distinfo
index d4c0638def74..a26fbc1ceb89 100644
--- a/archivers/upx/distinfo
+++ b/archivers/upx/distinfo
@@ -1,4 +1,2 @@
-MD5 (upx-1.24-src.tar.gz) = c7addf22766bdc9878e0a191855eec16
-SIZE (upx-1.24-src.tar.gz) = 222976
-MD5 (ucl-1.02.tar.gz) = e35efd120104c522acfd0e1a5c3ec091
-SIZE (ucl-1.02.tar.gz) = 513433
+MD5 (upx-1.25-src.tar.gz) = 6f20a62999a46a1864652454b3c8a5d8
+SIZE (upx-1.25-src.tar.gz) = 250849
diff --git a/archivers/upx/files/freebsd.h b/archivers/upx/files/freebsd.h
deleted file mode 100644
index eb94e286dd80..000000000000
--- a/archivers/upx/files/freebsd.h
+++ /dev/null
@@ -1,229 +0,0 @@
-/* pseudo <config.h> for Linux */
-
-#ifndef __UPX_CONFIG_H
-#define __UPX_CONFIG_H
-
-/* $TOP$ */
-
-/* Define to empty if the keyword does not work.  */
-/* #undef const */
-
-/* Define if your C compiler doesn't accept -c and -o together.  */
-/* #undef NO_MINUS_C_MINUS_O */
-
-/* Define as the return type of signal handlers (int or void).  */
-#define RETSIGTYPE void
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-/* #undef size_t */
-
-/* Define if you have the ANSI C header files.  */
-#define STDC_HEADERS 1
-
-/* Define if you can safely include both <sys/time.h> and <time.h>.  */
-#define TIME_WITH_SYS_TIME 1
-
-/* Define if your memcmp is broken.  */
-/* #undef NO_MEMCMP */
-
-/* Define to `long' if <stddef.h> doesn't define.  */
-/* #undef ptrdiff_t */
-
-/* Define when using the dmalloc package.  */
-/* #undef WITH_DMALLOC */
-
-/* Define if you have the access function.  */
-#define HAVE_ACCESS 1
-
-/* Define if you have the atoi function.  */
-#define HAVE_ATOI 1
-
-/* Define if you have the chmod function.  */
-#define HAVE_CHMOD 1
-
-/* Define if you have the chown function.  */
-#define HAVE_CHOWN 1
-
-/* Define if you have the ctime function.  */
-#define HAVE_CTIME 1
-
-/* Define if you have the difftime function.  */
-#define HAVE_DIFFTIME 1
-
-/* Define if you have the fchmod function.  */
-#define HAVE_FCHMOD 1
-
-/* Define if you have the fileno function.  */
-#define HAVE_FILENO 1
-
-/* Define if you have the fstat function.  */
-#define HAVE_FSTAT 1
-
-/* Define if you have the XXX function.  */
-#define HAVE_GETPID 1
-
-/* Define if you have the XXX function.  */
-#define HAVE_GETTIMEOFDAY 1
-
-/* Define if you have the getumask function.  */
-/* #undef HAVE_GETUMASK */
-
-/* Define if you have the gmtime function.  */
-#define HAVE_GMTIME 1
-
-/* Define if you have the index function.  */
-#define HAVE_INDEX 1
-
-/* Define if you have the isatty function.  */
-#define HAVE_ISATTY 1
-
-/* Define if you have the lstat function.  */
-#define HAVE_LSTAT 1
-
-/* Define if you have the localtime function.  */
-#define HAVE_LOCALTIME 1
-
-/* Define if you have the memcmp function.  */
-#define HAVE_MEMCMP 1
-
-/* Define if you have the memcpy function.  */
-#define HAVE_MEMCPY 1
-
-/* Define if you have the memmove function.  */
-#define HAVE_MEMMOVE 1
-
-/* Define if you have the memset function.  */
-#define HAVE_MEMSET 1
-
-/* Define if you have the mktime function.  */
-#define HAVE_MKTIME 1
-
-/* Define if you have the setmode function.  */
-/* #undef HAVE_SETMODE */
-
-/* Define if you have the stat function.  */
-#define HAVE_STAT 1
-
-/* Define if you have the strcasecmp function.  */
-#define HAVE_STRCASECMP 1
-
-/* Define if you have the strchr function.  */
-#define HAVE_STRCHR 1
-
-/* Define if you have the strdup function.  */
-#define HAVE_STRDUP 1
-
-/* Define if you have the strftime function.  */
-#define HAVE_STRFTIME 1
-
-/* Define if you have the stricmp function.  */
-/* #undef HAVE_STRICMP */
-
-/* Define if you have the strncasecmp function.  */
-#define HAVE_STRNCASECMP 1
-
-/* Define if you have the strnicmp function.  */
-/* #undef HAVE_STRNICMP */
-
-/* Define if you have the strstr function.  */
-#define HAVE_STRSTR 1
-
-/* Define if you have the tzset function.  */
-#define HAVE_TZSET 1
-
-/* Define if you have the umask function.  */
-#define HAVE_UMASK 1
-
-/* Define if you have the utime function.  */
-#define HAVE_UTIME 1
-
-/* Define if you have the vsnprintf function.  */
-#define HAVE_VSNPRINTF 1
-
-/* Define if you have the <assert.h> header file.  */
-#define HAVE_ASSERT_H 1
-
-/* Define if you have the <ctype.h> header file.  */
-#define HAVE_CTYPE_H 1
-
-/* Define if you have the <curses.h> header file.  */
-#define HAVE_CURSES_H 1
-
-/* Define if you have the <limits.h> header file.  */
-#define HAVE_LIMITS_H 1
-
-/* Define if you have the <linux/kd.h> header file.  */
-#define HAVE_LINUX_KD_H 1
-
-/* Define if you have the <linux/kdev_t.h> header file.  */
-#define HAVE_LINUX_KDEV_T_H 1
-
-/* Define if you have the <linux/major.h> header file.  */
-#define HAVE_LINUX_MAJOR_H 1
-
-/* Define if you have the <memory.h> header file.  */
-#define HAVE_MEMORY_H 1
-
-/* Define if you have the <ncurses.h> header file.  */
-#define HAVE_NCURSES_H 1
-
-/* Define if you have the <signal.h> header file.  */
-#define HAVE_SIGNAL_H 1
-
-/* Define if you have the <stddef.h> header file.  */
-#define HAVE_STDDEF_H 1
-
-/* Define if you have the <stdint.h> header file.  */
-/* #undef HAVE_STDINT_H */
-
-/* Define if you have the <sys/param.h> header file.  */
-#define HAVE_SYS_PARAM_H 1
-
-/* Define if you have the <sys/resource.h> header file.  */
-#define HAVE_SYS_RESOURCE_H 1
-
-/* Define if you have the <sys/time.h> header file.  */
-#define HAVE_SYS_TIME_H 1
-
-/* Define if you have the <sys/times.h> header file.  */
-#define HAVE_SYS_TIMES_H 1
-
-/* Define if you have the <sys/utime.h> header file.  */
-/* #undef HAVE_SYS_UTIME_H */
-
-/* Define if you have the <time.h> header file.  */
-#define HAVE_TIME_H 1
-
-/* Define if you have the <unistd.h> header file.  */
-#define HAVE_UNISTD_H 1
-
-/* Define if you have the <utime.h> header file.  */
-#define HAVE_UTIME_H 1
-
-/* $BOTTOM$ */
-
-#if defined(HAVE_GMTIME) && !defined(TIME_WITH_SYS_TIME)
-#  undef /**/ HAVE_GMTIME
-#endif
-
-#if defined(HAVE_LOCALTIME) && !defined(TIME_WITH_SYS_TIME)
-#  undef /**/ HAVE_LOCALTIME
-#endif
-
-#if defined(HAVE_STRFTIME) && !defined(TIME_WITH_SYS_TIME)
-#  undef /**/ HAVE_STRFTIME
-#endif
-
-#if defined(HAVE_SYS_RESOURCE_H) && !defined(TIME_WITH_SYS_TIME)
-#  undef /**/ HAVE_SYS_RESOURCE_H
-#endif
-
-#if defined(HAVE_SYS_TIMES_H) && !defined(TIME_WITH_SYS_TIME)
-#  undef /**/ HAVE_SYS_TIMES_H
-#endif
-
-#endif /* already included */
-
-/*
-vi:ts=4
-*/
diff --git a/archivers/upx/files/l_b_n2b.h b/archivers/upx/files/l_b_n2b.h
index f14a4c71dc66..0b536031e270 100644
--- a/archivers/upx/files/l_b_n2b.h
+++ b/archivers/upx/files/l_b_n2b.h
@@ -1,9 +1,9 @@
-/* l_b_n2b.h -- created from l_b_n2b.bin, 1980 (0x7bc) bytes
+/* l_b_n2b.h -- created from l_b_n2b.bin, 1820 (0x71c) bytes
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2002 Laszlo Molnar
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2004 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -26,27 +26,27 @@
  */
 
 
-#define FREEBSD_I386_NRV2B_LOADER_ADLER32 0x6722f524
-#define FREEBSD_I386_NRV2B_LOADER_CRC32   0xbd6617db
+#define FREEBSD_I386_NRV2B_LOADER_ADLER32 0xa3a5bd8e
+#define FREEBSD_I386_NRV2B_LOADER_CRC32   0x77221c07
 
-unsigned char freebsd_i386_nrv2b_loader[1980] = {
+unsigned char freebsd_i386_nrv2b_loader[1820] = {
 127, 69, 76, 70,  1,  1,  1,  9,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   2,  0,  3,  0,  1,  0,  0,  0,128,128,  4,  8, 52,  0,  0,  0,   /* 0x  10 */
   0,  0,  0,  0,  0,  0,  0,  0, 52,  0, 32,  0,  2,  0,  0,  0,   /* 0x  20 */
   0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,128,  4,  8,   /* 0x  30 */
-  0,128,  4,  8,164,  7,  0,  0,164,  7,  0,  0,  5,  0,  0,  0,   /* 0x  40 */
-  0, 16,  0,  0,  1,  0,  0,  0,164,  7,  0,  0,164,151,  4,  8,   /* 0x  50 */
-164,151,  4,  8, 24,  0,  0,  0, 28,  0,  0,  0,  6,  0,  0,  0,   /* 0x  60 */
+  0,128,  4,  8,  4,  7,  0,  0,  4,  7,  0,  0,  5,  0,  0,  0,   /* 0x  40 */
+  0, 16,  0,  0,  1,  0,  0,  0,  4,  7,  0,  0,  4,151,  4,  8,   /* 0x  50 */
+  4,151,  4,  8, 24,  0,  0,  0, 28,  0,  0,  0,  6,  0,  0,  0,   /* 0x  60 */
   0, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  70 */
  49,237, 88,137,225,141, 84,129,  4, 80,131,228,248, 82, 81,232,   /* 0x  80 */
- 36,  2,  0,  0,244, 10,  0, 36, 73,110,102,111, 58, 32, 84,104,   /* 0x  90 */
+224,  1,  0,  0,244, 10,  0, 36, 73,110,102,111, 58, 32, 84,104,   /* 0x  90 */
 105,115, 32,102,105,108,101, 32,105,115, 32,112, 97, 99,107,101,   /* 0x  a0 */
 100, 32,119,105,116,104, 32,116,104,101, 32, 85, 80, 88, 32,101,   /* 0x  b0 */
 120,101, 99,117,116, 97, 98,108,101, 32,112, 97, 99,107,101,114,   /* 0x  c0 */
  32,104,116,116,112, 58, 47, 47,117,112,120, 46,115,102, 46,110,   /* 0x  d0 */
 101,116, 32, 36, 10,  0, 36, 73,100, 58, 32, 85, 80, 88, 32, 49,   /* 0x  e0 */
- 46, 50, 52, 32, 67,111,112,121,114,105,103,104,116, 32, 40, 67,   /* 0x  f0 */
- 41, 32, 49, 57, 57, 54, 45, 50, 48, 48, 50, 32,116,104,101, 32,   /* 0x 100 */
+ 46, 50, 53, 32, 67,111,112,121,114,105,103,104,116, 32, 40, 67,   /* 0x  f0 */
+ 41, 32, 49, 57, 57, 54, 45, 50, 48, 48, 52, 32,116,104,101, 32,   /* 0x 100 */
  85, 80, 88, 32, 84,101, 97,109, 46, 32, 65,108,108, 32, 82,105,   /* 0x 110 */
 103,104,116,115, 32, 82,101,115,101,114,118,101,100, 46, 32, 36,   /* 0x 120 */
  10,  0, 85, 87, 86, 83, 81, 82,252,139,116, 36, 28,139,124, 36,   /* 0x 130 */
@@ -64,94 +64,84 @@ unsigned char freebsd_i386_nrv2b_loader[1980] = {
 139,  2,131,194,  4,137,  7,131,199,  4,131,233,  4,119,241,  1,   /* 0x 1f0 */
 207,233, 72,255,255,255,139, 84, 36, 28,  3, 84, 36, 32, 57,214,   /* 0x 200 */
 116,  1, 72, 43,124, 36, 36,139, 84, 36, 40,137, 58, 90, 89, 91,   /* 0x 210 */
- 94, 95, 93,195, 85,137,229, 87, 86, 83,139,125, 12,139,117, 16,   /* 0x 220 */
- 86, 87,255,117,  8,232, 42,  4,  0,  0,131,196, 12,133,192,137,   /* 0x 230 */
-195,121, 10,232, 56,  3,  0,  0,131, 56,  4,116,  8,133,219,126,   /* 0x 240 */
-  8,  1,223, 41,222,133,246,127,215,141,101,244, 91,137,240, 94,   /* 0x 250 */
- 95,201,195,144, 85,137,229, 87, 86,139,117, 12, 83,137,241,139,   /* 0x 260 */
- 93,  8,186, 10,  0,  0,  0,137,200,137,215, 49,210,247,247, 67,   /* 0x 270 */
-133,192,137,193,117,236,137,217,198,  3,  0,137,242,137,208,190,   /* 0x 280 */
- 10,  0,  0,  0, 49,210,247,246,131,194, 48, 75,133,192,136, 19,   /* 0x 290 */
-137,194,117,233, 91, 94,137,200, 95,201,195,144, 85,137,229,255,   /* 0x 2a0 */
-117,  8,232,213,  2,  0,  0,144, 85,137,229, 87, 86, 83,131,236,   /* 0x 2b0 */
-112,232, 38,  3,  0,  0, 80,137,199,141, 69,170, 80,199, 69,164,   /* 0x 2c0 */
- 47,112,114,111,102,199, 69,168, 99, 47,232,133,255,255,255,198,   /* 0x 2d0 */
-  0, 47,199, 64,  1,102,105,108,101,106,  0,106,  0,141, 93,164,   /* 0x 2e0 */
- 83,232, 70,  3,  0,  0,106,  0,106,  0,104, 85, 80, 88, 49, 80,   /* 0x 2f0 */
-137, 69,140,232, 40,  4,  0,  0,131,196, 36,133,210, 15,136,211,   /* 0x 300 */
-  1,  0,  0,106, 12,141, 69,228, 80,255,117,140,232,  3,255,255,   /* 0x 310 */
-255,131,196, 12,133,192, 15,133,186,  1,  0,  0,139, 77,228,129,   /* 0x 320 */
-249, 85, 80, 88, 50, 15,133,171,  1,  0,  0,190,183,151,  4,  8,   /* 0x 330 */
-186,  4,  0,  0,  0,137,251,136,216,131,224, 31, 60, 25,118,  3,   /* 0x 340 */
-131,232, 43, 78,  0,  6,193,235,  5, 74,117,235,106,  0,141, 69,   /* 0x 350 */
-156, 80, 49,203,232, 71,  2,  0,  0,139, 69,160,193,224, 12, 51,   /* 0x 360 */
- 93,156, 95, 49,195,190,179,151,  4,  8,186,  7,  0,  0,  0, 88,   /* 0x 370 */
-136,216,131,224, 31, 60, 25,118,  3,131,232, 43, 78,  0,  6,193,   /* 0x 380 */
-235,  5, 74,117,235,104,164,151,  4,  8,232, 97,  2,  0,  0,133,   /* 0x 390 */
-192, 91,121, 13,131, 61,188,151,  4,  8,  2, 15,133, 53,  1,  0,   /* 0x 3a0 */
-  0,104,192,  1,  0,  0,104,  2, 10,  0,  0,104,164,151,  4,  8,   /* 0x 3b0 */
-232,119,  2,  0,  0, 49,210, 82,137, 69,136,139, 69,232, 80,255,   /* 0x 3c0 */
-117,136,232,185,  2,  0,  0,131,196, 24,133,192, 15,133,249,  0,   /* 0x 3d0 */
-  0,  0,106,  0,106,  0,255,117,136,106,  2,106,  3,255, 53,184,   /* 0x 3e0 */
-151,  4,  8,106,  0,232,214,  2,  0,  0,131,196, 28, 61,  0,240,   /* 0x 3f0 */
-255,255,137, 69,132, 15,135,208,  0,  0,  0,106,  8,141, 69,148,   /* 0x 400 */
- 80,255,117,140,232, 11,254,255,255,131,196, 12,133,192, 15,133,   /* 0x 410 */
-183,  0,  0,  0,139, 77,148,133,201,117, 28,129,125,152, 85, 80,   /* 0x 420 */
- 88, 33, 15,133,163,  0,  0,  0,131,125,232,  0, 15,132,182,  0,   /* 0x 430 */
-  0,  0,233,148,  0,  0,  0,139, 85,152,133,210, 15,142,137,  0,   /* 0x 440 */
-  0,  0, 57,202, 15,143,129,  0,  0,  0,139, 69,236, 57,193,127,   /* 0x 450 */
-122, 41,208,141,152,  0,  8,  0,  0,139,117,132, 82,  1,222, 86,   /* 0x 460 */
-255,117,140,232,172,253,255,255,131,196, 12,133,192,117, 92,139,   /* 0x 470 */
- 85,152, 59, 85,148,125, 31,141, 69,144, 80,255,117,132, 82, 86,   /* 0x 480 */
-232,157,252,255,255,131,196, 16,133,192,137,195,117, 61,139, 69,   /* 0x 490 */
-148, 57, 69,144,117, 53,139,125,132,  1,223,139,117,148, 86, 87,   /* 0x 4a0 */
-255,117,136,232,152,  1,  0,  0,131,196, 12,133,192,137,195,121,   /* 0x 4b0 */
- 10,232,186,  0,  0,  0,131, 56,  4,116,  8,133,219,126,  8,  1,   /* 0x 4c0 */
-223, 41,222,133,246,127,215,133,246,116, 15,104,164,151,  4,  8,   /* 0x 4d0 */
-232, 27,  1,  0,  0, 89,106,127,235,101,139, 69,232, 43, 69,148,   /* 0x 4e0 */
-137, 69,232,233, 19,255,255,255,255, 53,184,151,  4,  8,255,117,   /* 0x 4f0 */
-132,232,190,  0,  0,  0,255,117,136,232, 26,  1,  0,  0,131,196,   /* 0x 500 */
- 12,133,192,117,198,255,117,140,232, 11,  1,  0,  0,133,192, 90,   /* 0x 510 */
-117,185,232, 81,  1,  0,  0,133,192,117, 41,232, 72,  1,  0,  0,   /* 0x 520 */
-133,192,117, 25,106,  0,104,156,135,  4,  8,232, 92,  0,  0,  0,   /* 0x 530 */
-104,164,151,  4,  8,232,182,  0,  0,  0,131,196, 12,106,  0,232,   /* 0x 540 */
- 88,253,255,255,106,  0,106,  0,106,  0,106,255,232,179,  0,  0,   /* 0x 550 */
-  0,255,117, 12,255,117,  8,104,164,151,  4,  8,232,103,  0,  0,   /* 0x 560 */
-  0,131,196, 28,233, 98,255,255,255,144,144,144,144,144,144,144,   /* 0x 570 */
- 85,137,229,184,188,151,  4,  8, 93,195,144,144,184,  1,  0,  0,   /* 0x 580 */
-  0,205,128,195,233,219,  1,  0,  0,141,118,  0,184,240,  0,  0,   /* 0x 590 */
-  0,205,128,114,239,195,144,144,233,199,  1,  0,  0,141,118,  0,   /* 0x 5a0 */
-184,116,  0,  0,  0,205,128,114,239,195,144,144,233,179,  1,  0,   /* 0x 5b0 */
-  0,141,118,  0,184, 73,  0,  0,  0,205,128,114,239,195,144,144,   /* 0x 5c0 */
-233,159,  1,  0,  0,141,118,  0,184, 59,  0,  0,  0,205,128,114,   /* 0x 5d0 */
-239,195,144,144,233,139,  1,  0,  0,141,118,  0,184, 20,  0,  0,   /* 0x 5e0 */
-  0,205,128,114,239,195,144,144,233,119,  1,  0,  0,141,118,  0,   /* 0x 5f0 */
-184, 10,  0,  0,  0,205,128,114,239,195,144,144,233, 99,  1,  0,   /* 0x 600 */
-  0,141,118,  0,184,  7,  0,  0,  0,205,128,114,239,195,144,144,   /* 0x 610 */
-233, 79,  1,  0,  0,141,118,  0,184,  6,  0,  0,  0,205,128,114,   /* 0x 620 */
-239,195,144,144,233, 59,  1,  0,  0,141,118,  0,184,  5,  0,  0,   /* 0x 630 */
-  0,205,128,114,239,195,144,144,233, 39,  1,  0,  0,141,118,  0,   /* 0x 640 */
-184,  4,  0,  0,  0,205,128,114,239,195,144,144,233, 19,  1,  0,   /* 0x 650 */
-  0,141,118,  0,184,  3,  0,  0,  0,205,128,114,239,195,144,144,   /* 0x 660 */
-233,255,  0,  0,  0,141,118,  0,184,  2,  0,  0,  0,205,128,114,   /* 0x 670 */
-239,195,144,144,144,144,144,144,144,144,144,144,144,144,144,144,   /* 0x 680 */
- 85,137,229,131,236, 24,139, 69, 12,139, 85, 16,137, 68, 36, 16,   /* 0x 690 */
-137, 84, 36, 20,199, 68, 36, 12,  0,  0,  0,  0,139, 69,  8,137,   /* 0x 6a0 */
- 68, 36,  8,199,  4, 36,201,  0,  0,  0,199, 68, 36,  4,  0,  0,   /* 0x 6b0 */
-  0,  0,232,201,  0,  0,  0,137,236, 93,195,144,144,144,144,144,   /* 0x 6c0 */
- 85,137,229,131,236, 40,139, 69, 28,139, 85, 32,137, 68, 36, 32,   /* 0x 6d0 */
-137, 84, 36, 36,199, 68, 36, 28,  0,  0,  0,  0,139, 69, 24,137,   /* 0x 6e0 */
- 68, 36, 24,139, 69, 20,137, 68, 36, 20,139, 69, 16,137, 68, 36,   /* 0x 6f0 */
- 16,139, 69, 12,137, 68, 36, 12,139, 69,  8,137, 68, 36,  8,199,   /* 0x 700 */
-  4, 36,197,  0,  0,  0,199, 68, 36,  4,  0,  0,  0,  0,232,109,   /* 0x 710 */
-  0,  0,  0,137,236, 93,195,144,144,144,144,144,144,144,144,144,   /* 0x 720 */
- 85,137,229,131,236, 40,139, 69, 20,137, 68, 36, 24,139, 69, 12,   /* 0x 730 */
-139, 85, 16,137, 68, 36, 16,137, 84, 36, 20,199, 68, 36, 12,  0,   /* 0x 740 */
-  0,  0,  0,139, 69,  8,137, 68, 36,  8,199,  4, 36,199,  0,  0,   /* 0x 750 */
-  0,199, 68, 36,  4,  0,  0,  0,  0,232, 34,  0,  0,  0,137,236,   /* 0x 760 */
- 93,195,144,144, 80,232,  6,254,255,255, 89,137,  8,184,255,255,   /* 0x 770 */
-255,255,186,255,255,255,255,195,233,231,255,255,255,141,118,  0,   /* 0x 780 */
-184,198,  0,  0,  0,205,128,114,239,195,  0,  0, 85, 80, 88, 52,   /* 0x 790 */
-  0,  0,  0,  0, 47,116,109,112, 47,117,112,120, 65, 65, 65, 65,   /* 0x 7a0 */
- 65, 65, 65, 65, 65, 65, 65,  0, 85, 80, 88, 53                    /* 0x 7b0 */
+ 94, 95, 93,195, 85,137,229, 87, 86, 83, 81,137,215,137, 69,240,   /* 0x 220 */
+139,117,  8, 86, 87,255,117,240,232,  7,  4,  0,  0,131,196, 12,   /* 0x 230 */
+133,192,137,195,121, 10,232, 21,  3,  0,  0,131, 56,  4,116,  8,   /* 0x 240 */
+133,219,126,  8,  1,223, 41,222,133,246,127,215,141,101,244, 91,   /* 0x 250 */
+137,240, 94, 95,201,195,137,246, 85,137,229,255,117,  8,232,249,   /* 0x 260 */
+  2,  0,  0,144, 85,137,229, 87, 86, 83,131,236,112,232, 74,  3,   /* 0x 270 */
+  0,  0,137,199,199, 69,164, 47,112,114,111,102,199, 69,168, 99,   /* 0x 280 */
+ 47,141, 93,170,137,193,186, 10,  0,  0,  0,137,200,137,214, 49,   /* 0x 290 */
+210,247,246, 67,133,192,137,193,117,236,137,217,198,  3,  0,137,   /* 0x 2a0 */
+250,137,208,190, 10,  0,  0,  0, 49,210,247,246,131,194, 48, 75,   /* 0x 2b0 */
+133,192,136, 19,137,194,117,233,198,  1, 47,199, 65,  1,102,105,   /* 0x 2c0 */
+108,101,106,  0,106,  0,141, 69,164, 80,232, 61,  3,  0,  0,106,   /* 0x 2d0 */
+  0,106,  0,104, 85, 80, 88, 49, 80,137, 69,140,232,211,  3,  0,   /* 0x 2e0 */
+  0,131,196, 28,133,210, 15,136,208,  1,  0,  0,141, 85,228,106,   /* 0x 2f0 */
+ 12,139, 69,140,232, 27,255,255,255,133,192, 90, 15,133,186,  1,   /* 0x 300 */
+  0,  0,129,125,228, 85, 80, 88, 50, 15,133,173,  1,  0,  0,190,   /* 0x 310 */
+ 23,151,  4,  8,186,  4,  0,  0,  0,137,251,136,216,131,224, 31,   /* 0x 320 */
+ 60, 25,118,  3,131,232, 43, 78,  0,  6,193,235,  5, 74,117,235,   /* 0x 330 */
+106,  0,141, 69,156, 80,232, 69,  2,  0,  0,129,243, 85, 80, 88,   /* 0x 340 */
+ 50,139, 69,160,193,224, 12, 51, 93,156, 95, 49,195,190, 19,151,   /* 0x 350 */
+  4,  8,186,  7,  0,  0,  0, 88,136,216,131,224, 31, 60, 25,118,   /* 0x 360 */
+  3,131,232, 43, 78,  0,  6,193,235,  5, 74,117,235,104,  4,151,   /* 0x 370 */
+  4,  8,232, 89,  2,  0,  0,133,192, 89,121, 13,131, 61, 28,151,   /* 0x 380 */
+  4,  8,  2, 15,133, 51,  1,  0,  0,104,192,  1,  0,  0,104,  2,   /* 0x 390 */
+ 10,  0,  0,104,  4,151,  4,  8,232,111,  2,  0,  0, 49,210, 82,   /* 0x 3a0 */
+137, 69,136,139, 69,232, 80,255,117,136,232,229,  2,  0,  0,131,   /* 0x 3b0 */
+196, 24,133,192, 15,133,247,  0,  0,  0,106,  0,106,  0,106,255,   /* 0x 3c0 */
+104,  2, 16,  0,  0,106,  3,255, 53, 24,151,  4,  8,106,  0,232,   /* 0x 3d0 */
+128,  2,  0,  0,131,196, 28, 61,  0,240,255,255,137, 69,132, 15,   /* 0x 3e0 */
+135,204,  0,  0,  0,106,  8,141, 85,148,139, 69,140,232, 34,254,   /* 0x 3f0 */
+255,255,133,192, 90, 15,133,182,  0,  0,  0,139, 77,148,133,201,   /* 0x 400 */
+117, 28,129,125,152, 85, 80, 88, 33, 15,133,162,  0,  0,  0,131,   /* 0x 410 */
+125,232,  0, 15,132,181,  0,  0,  0,233,147,  0,  0,  0,139, 85,   /* 0x 420 */
+152,133,210, 15,142,136,  0,  0,  0, 57,202, 15,143,128,  0,  0,   /* 0x 430 */
+  0,139, 69,236, 57,193,127,121, 41,208,141,152,  0,  8,  0,  0,   /* 0x 440 */
+139,117,132,  1,222, 82,139, 69,140,137,242,232,196,253,255,255,   /* 0x 450 */
+133,192, 95,117, 92,139, 85,152, 59, 85,148,125, 31,141, 69,144,   /* 0x 460 */
+ 80,255,117,132, 82, 86,232,183,252,255,255,131,196, 16,133,192,   /* 0x 470 */
+137,195,117, 61,139, 69,148, 57, 69,144,117, 53,139,125,132,  1,   /* 0x 480 */
+223,139,117,148, 86, 87,255,117,136,232,146,  1,  0,  0,131,196,   /* 0x 490 */
+ 12,133,192,137,195,121, 10,232,180,  0,  0,  0,131, 56,  4,116,   /* 0x 4a0 */
+  8,133,219,126,  8,  1,223, 41,222,133,246,127,215,133,246,116,   /* 0x 4b0 */
+ 15,104,  4,151,  4,  8,232, 21,  1,  0,  0, 94,106,127,235,101,   /* 0x 4c0 */
+139, 69,232, 43, 69,148,137, 69,232,233, 23,255,255,255,255, 53,   /* 0x 4d0 */
+ 24,151,  4,  8,255,117,132,232,184,  0,  0,  0,255,117,136,232,   /* 0x 4e0 */
+ 20,  1,  0,  0,131,196, 12,133,192,117,198,255,117,140,232,  5,   /* 0x 4f0 */
+  1,  0,  0,133,192, 91,117,185,232, 75,  1,  0,  0,133,192,117,   /* 0x 500 */
+ 41,232, 66,  1,  0,  0,133,192,117, 25,106,  0,104,252,134,  4,   /* 0x 510 */
+  8,232, 86,  0,  0,  0,104,  4,151,  4,  8,232,176,  0,  0,  0,   /* 0x 520 */
+131,196, 12,106,  0,232, 46,253,255,255,106,  0,106,  0,106,  0,   /* 0x 530 */
+106,255,232,173,  0,  0,  0,255,117, 12,255,117,  8,104,  4,151,   /* 0x 540 */
+  4,  8,232, 97,  0,  0,  0,131,196, 28,233, 98,255,255,255,144,   /* 0x 550 */
+ 85,137,229,184, 28,151,  4,  8,201,195,144,144,184,  1,  0,  0,   /* 0x 560 */
+  0,205,128,195,233, 23,  1,  0,  0,141,118,  0,184,240,  0,  0,   /* 0x 570 */
+  0,205,128,114,239,195,144,144,233,  3,  1,  0,  0,141,118,  0,   /* 0x 580 */
+184,116,  0,  0,  0,205,128,114,239,195,144,144,233,239,  0,  0,   /* 0x 590 */
+  0,141,118,  0,184, 73,  0,  0,  0,205,128,114,239,195,144,144,   /* 0x 5a0 */
+233,219,  0,  0,  0,141,118,  0,184, 59,  0,  0,  0,205,128,114,   /* 0x 5b0 */
+239,195,144,144,233,199,  0,  0,  0,141,118,  0,184, 20,  0,  0,   /* 0x 5c0 */
+  0,205,128,114,239,195,144,144,233,179,  0,  0,  0,141,118,  0,   /* 0x 5d0 */
+184, 10,  0,  0,  0,205,128,114,239,195,144,144,233,159,  0,  0,   /* 0x 5e0 */
+  0,141,118,  0,184,  7,  0,  0,  0,205,128,114,239,195,144,144,   /* 0x 5f0 */
+233,139,  0,  0,  0,141,118,  0,184,  6,  0,  0,  0,205,128,114,   /* 0x 600 */
+239,195,144,144,233,119,  0,  0,  0,141,118,  0,184,  5,  0,  0,   /* 0x 610 */
+  0,205,128,114,239,195,144,144,233, 99,  0,  0,  0,141,118,  0,   /* 0x 620 */
+184,  4,  0,  0,  0,205,128,114,239,195,144,144,233, 79,  0,  0,   /* 0x 630 */
+  0,141,118,  0,184,  3,  0,  0,  0,205,128,114,239,195,144,144,   /* 0x 640 */
+233, 59,  0,  0,  0,141,118,  0,184,  2,  0,  0,  0,205,128,114,   /* 0x 650 */
+239,195,144,144, 85,137,229,131,236, 16,255,117, 32,255,117, 28,   /* 0x 660 */
+106,  0,255,117, 24,255,117, 20,255,117, 16,255,117, 12,255,117,   /* 0x 670 */
+  8,106,  0,104,197,  0,  0,  0,232, 99,  0,  0,  0,201,195,144,   /* 0x 680 */
+ 80,232,202,254,255,255, 89,137,  8,184,255,255,255,255,186,255,   /* 0x 690 */
+255,255,255,195, 85,137,229,131,236, 16,255,117, 16,255,117, 12,   /* 0x 6a0 */
+106,  0,255,117,  8,106,  0,104,201,  0,  0,  0,232, 47,  0,  0,   /* 0x 6b0 */
+  0,201,195,144, 85,137,229,131,236, 12,255,117, 20,255,117, 16,   /* 0x 6c0 */
+255,117, 12,106,  0,255,117,  8,106,  0,104,199,  0,  0,  0,232,   /* 0x 6d0 */
+ 12,  0,  0,  0,201,195,144,144,233,163,255,255,255,141,118,  0,   /* 0x 6e0 */
+184,198,  0,  0,  0,205,128,114,239,195,  0,  0, 85, 80, 88, 52,   /* 0x 6f0 */
+  0,  0,  0,  0, 47,116,109,112, 47,117,112,120, 65, 65, 65, 65,   /* 0x 700 */
+ 65, 65, 65, 65, 65, 65, 65,  0, 85, 80, 88, 53                    /* 0x 710 */
 };
diff --git a/archivers/upx/files/l_b_n2d.h b/archivers/upx/files/l_b_n2d.h
index b57a527a1437..cc7ca5eb4a72 100644
--- a/archivers/upx/files/l_b_n2d.h
+++ b/archivers/upx/files/l_b_n2d.h
@@ -1,9 +1,9 @@
-/* l_b_n2d.h -- created from l_b_n2d.bin, 1996 (0x7cc) bytes
+/* l_b_n2d.h -- created from l_b_n2d.bin, 1840 (0x730) bytes
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2002 Laszlo Molnar
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2004 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -26,27 +26,27 @@
  */
 
 
-#define FREEBSD_I386_NRV2D_LOADER_ADLER32 0x1734fcc8
-#define FREEBSD_I386_NRV2D_LOADER_CRC32   0x72ba6bab
+#define FREEBSD_I386_NRV2D_LOADER_ADLER32 0xcde2c713
+#define FREEBSD_I386_NRV2D_LOADER_CRC32   0xcfaeba24
 
-unsigned char freebsd_i386_nrv2d_loader[1996] = {
+unsigned char freebsd_i386_nrv2d_loader[1840] = {
 127, 69, 76, 70,  1,  1,  1,  9,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   2,  0,  3,  0,  1,  0,  0,  0,128,128,  4,  8, 52,  0,  0,  0,   /* 0x  10 */
   0,  0,  0,  0,  0,  0,  0,  0, 52,  0, 32,  0,  2,  0,  0,  0,   /* 0x  20 */
   0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,128,  4,  8,   /* 0x  30 */
-  0,128,  4,  8,180,  7,  0,  0,180,  7,  0,  0,  5,  0,  0,  0,   /* 0x  40 */
-  0, 16,  0,  0,  1,  0,  0,  0,180,  7,  0,  0,180,151,  4,  8,   /* 0x  50 */
-180,151,  4,  8, 24,  0,  0,  0, 28,  0,  0,  0,  6,  0,  0,  0,   /* 0x  60 */
+  0,128,  4,  8, 24,  7,  0,  0, 24,  7,  0,  0,  5,  0,  0,  0,   /* 0x  40 */
+  0, 16,  0,  0,  1,  0,  0,  0, 24,  7,  0,  0, 24,151,  4,  8,   /* 0x  50 */
+ 24,151,  4,  8, 24,  0,  0,  0, 28,  0,  0,  0,  6,  0,  0,  0,   /* 0x  60 */
   0, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  70 */
  49,237, 88,137,225,141, 84,129,  4, 80,131,228,248, 82, 81,232,   /* 0x  80 */
- 56,  2,  0,  0,244, 10,  0, 36, 73,110,102,111, 58, 32, 84,104,   /* 0x  90 */
+244,  1,  0,  0,244, 10,  0, 36, 73,110,102,111, 58, 32, 84,104,   /* 0x  90 */
 105,115, 32,102,105,108,101, 32,105,115, 32,112, 97, 99,107,101,   /* 0x  a0 */
 100, 32,119,105,116,104, 32,116,104,101, 32, 85, 80, 88, 32,101,   /* 0x  b0 */
 120,101, 99,117,116, 97, 98,108,101, 32,112, 97, 99,107,101,114,   /* 0x  c0 */
  32,104,116,116,112, 58, 47, 47,117,112,120, 46,115,102, 46,110,   /* 0x  d0 */
 101,116, 32, 36, 10,  0, 36, 73,100, 58, 32, 85, 80, 88, 32, 49,   /* 0x  e0 */
- 46, 50, 52, 32, 67,111,112,121,114,105,103,104,116, 32, 40, 67,   /* 0x  f0 */
- 41, 32, 49, 57, 57, 54, 45, 50, 48, 48, 50, 32,116,104,101, 32,   /* 0x 100 */
+ 46, 50, 53, 32, 67,111,112,121,114,105,103,104,116, 32, 40, 67,   /* 0x  f0 */
+ 41, 32, 49, 57, 57, 54, 45, 50, 48, 48, 52, 32,116,104,101, 32,   /* 0x 100 */
  85, 80, 88, 32, 84,101, 97,109, 46, 32, 65,108,108, 32, 82,105,   /* 0x 110 */
 103,104,116,115, 32, 82,101,115,101,114,118,101,100, 46, 32, 36,   /* 0x 120 */
  10,  0, 85, 87, 86, 83, 81, 82,252,139,116, 36, 28,139,124, 36,   /* 0x 130 */
@@ -65,94 +65,84 @@ unsigned char freebsd_i386_nrv2d_loader[1996] = {
  74,255,255,255,139,  2,131,194,  4,137,  7,131,199,  4,131,233,   /* 0x 200 */
   4,119,241,  1,207,233, 52,255,255,255,139, 84, 36, 28,  3, 84,   /* 0x 210 */
  36, 32, 57,214,116,  1, 72, 43,124, 36, 36,139, 84, 36, 40,137,   /* 0x 220 */
- 58, 90, 89, 91, 94, 95, 93,195, 85,137,229, 87, 86, 83,139,125,   /* 0x 230 */
- 12,139,117, 16, 86, 87,255,117,  8,232, 38,  4,  0,  0,131,196,   /* 0x 240 */
- 12,133,192,137,195,121, 10,232, 52,  3,  0,  0,131, 56,  4,116,   /* 0x 250 */
-  8,133,219,126,  8,  1,223, 41,222,133,246,127,215,141,101,244,   /* 0x 260 */
- 91,137,240, 94, 95,201,195,144, 85,137,229, 87, 86,139,117, 12,   /* 0x 270 */
- 83,137,241,139, 93,  8,186, 10,  0,  0,  0,137,200,137,215, 49,   /* 0x 280 */
-210,247,247, 67,133,192,137,193,117,236,137,217,198,  3,  0,137,   /* 0x 290 */
-242,137,208,190, 10,  0,  0,  0, 49,210,247,246,131,194, 48, 75,   /* 0x 2a0 */
-133,192,136, 19,137,194,117,233, 91, 94,137,200, 95,201,195,144,   /* 0x 2b0 */
- 85,137,229,255,117,  8,232,209,  2,  0,  0,144, 85,137,229, 87,   /* 0x 2c0 */
- 86, 83,131,236,112,232, 34,  3,  0,  0, 80,137,199,141, 69,170,   /* 0x 2d0 */
- 80,199, 69,164, 47,112,114,111,102,199, 69,168, 99, 47,232,133,   /* 0x 2e0 */
-255,255,255,198,  0, 47,199, 64,  1,102,105,108,101,106,  0,106,   /* 0x 2f0 */
-  0,141, 93,164, 83,232, 66,  3,  0,  0,106,  0,106,  0,104, 85,   /* 0x 300 */
- 80, 88, 49, 80,137, 69,140,232, 36,  4,  0,  0,131,196, 36,133,   /* 0x 310 */
-210, 15,136,211,  1,  0,  0,106, 12,141, 69,228, 80,255,117,140,   /* 0x 320 */
-232,  3,255,255,255,131,196, 12,133,192, 15,133,186,  1,  0,  0,   /* 0x 330 */
-139, 77,228,129,249, 85, 80, 88, 50, 15,133,171,  1,  0,  0,190,   /* 0x 340 */
-199,151,  4,  8,186,  4,  0,  0,  0,137,251,136,216,131,224, 31,   /* 0x 350 */
- 60, 25,118,  3,131,232, 43, 78,  0,  6,193,235,  5, 74,117,235,   /* 0x 360 */
-106,  0,141, 69,156, 80, 49,203,232, 67,  2,  0,  0,139, 69,160,   /* 0x 370 */
-193,224, 12, 51, 93,156, 95, 49,195,190,195,151,  4,  8,186,  7,   /* 0x 380 */
-  0,  0,  0, 88,136,216,131,224, 31, 60, 25,118,  3,131,232, 43,   /* 0x 390 */
- 78,  0,  6,193,235,  5, 74,117,235,104,180,151,  4,  8,232, 93,   /* 0x 3a0 */
-  2,  0,  0,133,192, 91,121, 13,131, 61,204,151,  4,  8,  2, 15,   /* 0x 3b0 */
-133, 53,  1,  0,  0,104,192,  1,  0,  0,104,  2, 10,  0,  0,104,   /* 0x 3c0 */
-180,151,  4,  8,232,115,  2,  0,  0, 49,210, 82,137, 69,136,139,   /* 0x 3d0 */
- 69,232, 80,255,117,136,232,181,  2,  0,  0,131,196, 24,133,192,   /* 0x 3e0 */
- 15,133,249,  0,  0,  0,106,  0,106,  0,255,117,136,106,  2,106,   /* 0x 3f0 */
-  3,255, 53,200,151,  4,  8,106,  0,232,210,  2,  0,  0,131,196,   /* 0x 400 */
- 28, 61,  0,240,255,255,137, 69,132, 15,135,208,  0,  0,  0,106,   /* 0x 410 */
-  8,141, 69,148, 80,255,117,140,232, 11,254,255,255,131,196, 12,   /* 0x 420 */
-133,192, 15,133,183,  0,  0,  0,139, 77,148,133,201,117, 28,129,   /* 0x 430 */
-125,152, 85, 80, 88, 33, 15,133,163,  0,  0,  0,131,125,232,  0,   /* 0x 440 */
- 15,132,182,  0,  0,  0,233,148,  0,  0,  0,139, 85,152,133,210,   /* 0x 450 */
- 15,142,137,  0,  0,  0, 57,202, 15,143,129,  0,  0,  0,139, 69,   /* 0x 460 */
-236, 57,193,127,122, 41,208,141,152,  0,  8,  0,  0,139,117,132,   /* 0x 470 */
- 82,  1,222, 86,255,117,140,232,172,253,255,255,131,196, 12,133,   /* 0x 480 */
-192,117, 92,139, 85,152, 59, 85,148,125, 31,141, 69,144, 80,255,   /* 0x 490 */
-117,132, 82, 86,232,137,252,255,255,131,196, 16,133,192,137,195,   /* 0x 4a0 */
-117, 61,139, 69,148, 57, 69,144,117, 53,139,125,132,  1,223,139,   /* 0x 4b0 */
-117,148, 86, 87,255,117,136,232,148,  1,  0,  0,131,196, 12,133,   /* 0x 4c0 */
-192,137,195,121, 10,232,182,  0,  0,  0,131, 56,  4,116,  8,133,   /* 0x 4d0 */
-219,126,  8,  1,223, 41,222,133,246,127,215,133,246,116, 15,104,   /* 0x 4e0 */
-180,151,  4,  8,232, 23,  1,  0,  0, 89,106,127,235,101,139, 69,   /* 0x 4f0 */
-232, 43, 69,148,137, 69,232,233, 19,255,255,255,255, 53,200,151,   /* 0x 500 */
-  4,  8,255,117,132,232,186,  0,  0,  0,255,117,136,232, 22,  1,   /* 0x 510 */
-  0,  0,131,196, 12,133,192,117,198,255,117,140,232,  7,  1,  0,   /* 0x 520 */
-  0,133,192, 90,117,185,232, 77,  1,  0,  0,133,192,117, 41,232,   /* 0x 530 */
- 68,  1,  0,  0,133,192,117, 25,106,  0,104,172,135,  4,  8,232,   /* 0x 540 */
- 88,  0,  0,  0,104,180,151,  4,  8,232,178,  0,  0,  0,131,196,   /* 0x 550 */
- 12,106,  0,232, 88,253,255,255,106,  0,106,  0,106,  0,106,255,   /* 0x 560 */
-232,175,  0,  0,  0,255,117, 12,255,117,  8,104,180,151,  4,  8,   /* 0x 570 */
-232, 99,  0,  0,  0,131,196, 28,233, 98,255,255,255,144,144,144,   /* 0x 580 */
- 85,137,229,184,204,151,  4,  8, 93,195,144,144,184,  1,  0,  0,   /* 0x 590 */
-  0,205,128,195,233,219,  1,  0,  0,141,118,  0,184,240,  0,  0,   /* 0x 5a0 */
-  0,205,128,114,239,195,144,144,233,199,  1,  0,  0,141,118,  0,   /* 0x 5b0 */
-184,116,  0,  0,  0,205,128,114,239,195,144,144,233,179,  1,  0,   /* 0x 5c0 */
-  0,141,118,  0,184, 73,  0,  0,  0,205,128,114,239,195,144,144,   /* 0x 5d0 */
-233,159,  1,  0,  0,141,118,  0,184, 59,  0,  0,  0,205,128,114,   /* 0x 5e0 */
-239,195,144,144,233,139,  1,  0,  0,141,118,  0,184, 20,  0,  0,   /* 0x 5f0 */
-  0,205,128,114,239,195,144,144,233,119,  1,  0,  0,141,118,  0,   /* 0x 600 */
-184, 10,  0,  0,  0,205,128,114,239,195,144,144,233, 99,  1,  0,   /* 0x 610 */
-  0,141,118,  0,184,  7,  0,  0,  0,205,128,114,239,195,144,144,   /* 0x 620 */
-233, 79,  1,  0,  0,141,118,  0,184,  6,  0,  0,  0,205,128,114,   /* 0x 630 */
-239,195,144,144,233, 59,  1,  0,  0,141,118,  0,184,  5,  0,  0,   /* 0x 640 */
-  0,205,128,114,239,195,144,144,233, 39,  1,  0,  0,141,118,  0,   /* 0x 650 */
-184,  4,  0,  0,  0,205,128,114,239,195,144,144,233, 19,  1,  0,   /* 0x 660 */
-  0,141,118,  0,184,  3,  0,  0,  0,205,128,114,239,195,144,144,   /* 0x 670 */
-233,255,  0,  0,  0,141,118,  0,184,  2,  0,  0,  0,205,128,114,   /* 0x 680 */
-239,195,144,144,144,144,144,144,144,144,144,144,144,144,144,144,   /* 0x 690 */
- 85,137,229,131,236, 24,139, 69, 12,139, 85, 16,137, 68, 36, 16,   /* 0x 6a0 */
-137, 84, 36, 20,199, 68, 36, 12,  0,  0,  0,  0,139, 69,  8,137,   /* 0x 6b0 */
- 68, 36,  8,199,  4, 36,201,  0,  0,  0,199, 68, 36,  4,  0,  0,   /* 0x 6c0 */
-  0,  0,232,201,  0,  0,  0,137,236, 93,195,144,144,144,144,144,   /* 0x 6d0 */
- 85,137,229,131,236, 40,139, 69, 28,139, 85, 32,137, 68, 36, 32,   /* 0x 6e0 */
-137, 84, 36, 36,199, 68, 36, 28,  0,  0,  0,  0,139, 69, 24,137,   /* 0x 6f0 */
- 68, 36, 24,139, 69, 20,137, 68, 36, 20,139, 69, 16,137, 68, 36,   /* 0x 700 */
- 16,139, 69, 12,137, 68, 36, 12,139, 69,  8,137, 68, 36,  8,199,   /* 0x 710 */
-  4, 36,197,  0,  0,  0,199, 68, 36,  4,  0,  0,  0,  0,232,109,   /* 0x 720 */
-  0,  0,  0,137,236, 93,195,144,144,144,144,144,144,144,144,144,   /* 0x 730 */
- 85,137,229,131,236, 40,139, 69, 20,137, 68, 36, 24,139, 69, 12,   /* 0x 740 */
-139, 85, 16,137, 68, 36, 16,137, 84, 36, 20,199, 68, 36, 12,  0,   /* 0x 750 */
-  0,  0,  0,139, 69,  8,137, 68, 36,  8,199,  4, 36,199,  0,  0,   /* 0x 760 */
-  0,199, 68, 36,  4,  0,  0,  0,  0,232, 34,  0,  0,  0,137,236,   /* 0x 770 */
- 93,195,144,144, 80,232,  6,254,255,255, 89,137,  8,184,255,255,   /* 0x 780 */
-255,255,186,255,255,255,255,195,233,231,255,255,255,141,118,  0,   /* 0x 790 */
-184,198,  0,  0,  0,205,128,114,239,195,  0,  0, 85, 80, 88, 52,   /* 0x 7a0 */
-  0,  0,  0,  0, 47,116,109,112, 47,117,112,120, 65, 65, 65, 65,   /* 0x 7b0 */
- 65, 65, 65, 65, 65, 65, 65,  0, 85, 80, 88, 53                    /* 0x 7c0 */
+ 58, 90, 89, 91, 94, 95, 93,195, 85,137,229, 87, 86, 83, 81,137,   /* 0x 230 */
+215,137, 69,240,139,117,  8, 86, 87,255,117,240,232,  7,  4,  0,   /* 0x 240 */
+  0,131,196, 12,133,192,137,195,121, 10,232, 21,  3,  0,  0,131,   /* 0x 250 */
+ 56,  4,116,  8,133,219,126,  8,  1,223, 41,222,133,246,127,215,   /* 0x 260 */
+141,101,244, 91,137,240, 94, 95,201,195,137,246, 85,137,229,255,   /* 0x 270 */
+117,  8,232,249,  2,  0,  0,144, 85,137,229, 87, 86, 83,131,236,   /* 0x 280 */
+112,232, 74,  3,  0,  0,137,199,199, 69,164, 47,112,114,111,102,   /* 0x 290 */
+199, 69,168, 99, 47,141, 93,170,137,193,186, 10,  0,  0,  0,137,   /* 0x 2a0 */
+200,137,214, 49,210,247,246, 67,133,192,137,193,117,236,137,217,   /* 0x 2b0 */
+198,  3,  0,137,250,137,208,190, 10,  0,  0,  0, 49,210,247,246,   /* 0x 2c0 */
+131,194, 48, 75,133,192,136, 19,137,194,117,233,198,  1, 47,199,   /* 0x 2d0 */
+ 65,  1,102,105,108,101,106,  0,106,  0,141, 69,164, 80,232, 61,   /* 0x 2e0 */
+  3,  0,  0,106,  0,106,  0,104, 85, 80, 88, 49, 80,137, 69,140,   /* 0x 2f0 */
+232,211,  3,  0,  0,131,196, 28,133,210, 15,136,208,  1,  0,  0,   /* 0x 300 */
+141, 85,228,106, 12,139, 69,140,232, 27,255,255,255,133,192, 90,   /* 0x 310 */
+ 15,133,186,  1,  0,  0,129,125,228, 85, 80, 88, 50, 15,133,173,   /* 0x 320 */
+  1,  0,  0,190, 43,151,  4,  8,186,  4,  0,  0,  0,137,251,136,   /* 0x 330 */
+216,131,224, 31, 60, 25,118,  3,131,232, 43, 78,  0,  6,193,235,   /* 0x 340 */
+  5, 74,117,235,106,  0,141, 69,156, 80,232, 69,  2,  0,  0,129,   /* 0x 350 */
+243, 85, 80, 88, 50,139, 69,160,193,224, 12, 51, 93,156, 95, 49,   /* 0x 360 */
+195,190, 39,151,  4,  8,186,  7,  0,  0,  0, 88,136,216,131,224,   /* 0x 370 */
+ 31, 60, 25,118,  3,131,232, 43, 78,  0,  6,193,235,  5, 74,117,   /* 0x 380 */
+235,104, 24,151,  4,  8,232, 89,  2,  0,  0,133,192, 89,121, 13,   /* 0x 390 */
+131, 61, 48,151,  4,  8,  2, 15,133, 51,  1,  0,  0,104,192,  1,   /* 0x 3a0 */
+  0,  0,104,  2, 10,  0,  0,104, 24,151,  4,  8,232,111,  2,  0,   /* 0x 3b0 */
+  0, 49,210, 82,137, 69,136,139, 69,232, 80,255,117,136,232,229,   /* 0x 3c0 */
+  2,  0,  0,131,196, 24,133,192, 15,133,247,  0,  0,  0,106,  0,   /* 0x 3d0 */
+106,  0,106,255,104,  2, 16,  0,  0,106,  3,255, 53, 44,151,  4,   /* 0x 3e0 */
+  8,106,  0,232,128,  2,  0,  0,131,196, 28, 61,  0,240,255,255,   /* 0x 3f0 */
+137, 69,132, 15,135,204,  0,  0,  0,106,  8,141, 85,148,139, 69,   /* 0x 400 */
+140,232, 34,254,255,255,133,192, 90, 15,133,182,  0,  0,  0,139,   /* 0x 410 */
+ 77,148,133,201,117, 28,129,125,152, 85, 80, 88, 33, 15,133,162,   /* 0x 420 */
+  0,  0,  0,131,125,232,  0, 15,132,181,  0,  0,  0,233,147,  0,   /* 0x 430 */
+  0,  0,139, 85,152,133,210, 15,142,136,  0,  0,  0, 57,202, 15,   /* 0x 440 */
+143,128,  0,  0,  0,139, 69,236, 57,193,127,121, 41,208,141,152,   /* 0x 450 */
+  0,  8,  0,  0,139,117,132,  1,222, 82,139, 69,140,137,242,232,   /* 0x 460 */
+196,253,255,255,133,192, 95,117, 92,139, 85,152, 59, 85,148,125,   /* 0x 470 */
+ 31,141, 69,144, 80,255,117,132, 82, 86,232,163,252,255,255,131,   /* 0x 480 */
+196, 16,133,192,137,195,117, 61,139, 69,148, 57, 69,144,117, 53,   /* 0x 490 */
+139,125,132,  1,223,139,117,148, 86, 87,255,117,136,232,146,  1,   /* 0x 4a0 */
+  0,  0,131,196, 12,133,192,137,195,121, 10,232,180,  0,  0,  0,   /* 0x 4b0 */
+131, 56,  4,116,  8,133,219,126,  8,  1,223, 41,222,133,246,127,   /* 0x 4c0 */
+215,133,246,116, 15,104, 24,151,  4,  8,232, 21,  1,  0,  0, 94,   /* 0x 4d0 */
+106,127,235,101,139, 69,232, 43, 69,148,137, 69,232,233, 23,255,   /* 0x 4e0 */
+255,255,255, 53, 44,151,  4,  8,255,117,132,232,184,  0,  0,  0,   /* 0x 4f0 */
+255,117,136,232, 20,  1,  0,  0,131,196, 12,133,192,117,198,255,   /* 0x 500 */
+117,140,232,  5,  1,  0,  0,133,192, 91,117,185,232, 75,  1,  0,   /* 0x 510 */
+  0,133,192,117, 41,232, 66,  1,  0,  0,133,192,117, 25,106,  0,   /* 0x 520 */
+104, 16,135,  4,  8,232, 86,  0,  0,  0,104, 24,151,  4,  8,232,   /* 0x 530 */
+176,  0,  0,  0,131,196, 12,106,  0,232, 46,253,255,255,106,  0,   /* 0x 540 */
+106,  0,106,  0,106,255,232,173,  0,  0,  0,255,117, 12,255,117,   /* 0x 550 */
+  8,104, 24,151,  4,  8,232, 97,  0,  0,  0,131,196, 28,233, 98,   /* 0x 560 */
+255,255,255,144, 85,137,229,184, 48,151,  4,  8,201,195,144,144,   /* 0x 570 */
+184,  1,  0,  0,  0,205,128,195,233, 23,  1,  0,  0,141,118,  0,   /* 0x 580 */
+184,240,  0,  0,  0,205,128,114,239,195,144,144,233,  3,  1,  0,   /* 0x 590 */
+  0,141,118,  0,184,116,  0,  0,  0,205,128,114,239,195,144,144,   /* 0x 5a0 */
+233,239,  0,  0,  0,141,118,  0,184, 73,  0,  0,  0,205,128,114,   /* 0x 5b0 */
+239,195,144,144,233,219,  0,  0,  0,141,118,  0,184, 59,  0,  0,   /* 0x 5c0 */
+  0,205,128,114,239,195,144,144,233,199,  0,  0,  0,141,118,  0,   /* 0x 5d0 */
+184, 20,  0,  0,  0,205,128,114,239,195,144,144,233,179,  0,  0,   /* 0x 5e0 */
+  0,141,118,  0,184, 10,  0,  0,  0,205,128,114,239,195,144,144,   /* 0x 5f0 */
+233,159,  0,  0,  0,141,118,  0,184,  7,  0,  0,  0,205,128,114,   /* 0x 600 */
+239,195,144,144,233,139,  0,  0,  0,141,118,  0,184,  6,  0,  0,   /* 0x 610 */
+  0,205,128,114,239,195,144,144,233,119,  0,  0,  0,141,118,  0,   /* 0x 620 */
+184,  5,  0,  0,  0,205,128,114,239,195,144,144,233, 99,  0,  0,   /* 0x 630 */
+  0,141,118,  0,184,  4,  0,  0,  0,205,128,114,239,195,144,144,   /* 0x 640 */
+233, 79,  0,  0,  0,141,118,  0,184,  3,  0,  0,  0,205,128,114,   /* 0x 650 */
+239,195,144,144,233, 59,  0,  0,  0,141,118,  0,184,  2,  0,  0,   /* 0x 660 */
+  0,205,128,114,239,195,144,144, 85,137,229,131,236, 16,255,117,   /* 0x 670 */
+ 32,255,117, 28,106,  0,255,117, 24,255,117, 20,255,117, 16,255,   /* 0x 680 */
+117, 12,255,117,  8,106,  0,104,197,  0,  0,  0,232, 99,  0,  0,   /* 0x 690 */
+  0,201,195,144, 80,232,202,254,255,255, 89,137,  8,184,255,255,   /* 0x 6a0 */
+255,255,186,255,255,255,255,195, 85,137,229,131,236, 16,255,117,   /* 0x 6b0 */
+ 16,255,117, 12,106,  0,255,117,  8,106,  0,104,201,  0,  0,  0,   /* 0x 6c0 */
+232, 47,  0,  0,  0,201,195,144, 85,137,229,131,236, 12,255,117,   /* 0x 6d0 */
+ 20,255,117, 16,255,117, 12,106,  0,255,117,  8,106,  0,104,199,   /* 0x 6e0 */
+  0,  0,  0,232, 12,  0,  0,  0,201,195,144,144,233,163,255,255,   /* 0x 6f0 */
+255,141,118,  0,184,198,  0,  0,  0,205,128,114,239,195,  0,  0,   /* 0x 700 */
+ 85, 80, 88, 52,  0,  0,  0,  0, 47,116,109,112, 47,117,112,120,   /* 0x 710 */
+ 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,  0, 85, 80, 88, 53    /* 0x 720 */
 };
diff --git a/archivers/upx/files/l_b_n2e.h b/archivers/upx/files/l_b_n2e.h
index 8c239f8334d0..499f0c7ed756 100644
--- a/archivers/upx/files/l_b_n2e.h
+++ b/archivers/upx/files/l_b_n2e.h
@@ -1,9 +1,9 @@
-/* l_b_n2e.h -- created from l_b_n2e.bin, 2012 (0x7dc) bytes
+/* l_b_n2e.h -- created from l_b_n2e.bin, 1856 (0x740) bytes
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2002 Laszlo Molnar
+   Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2004 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -26,27 +26,27 @@
  */
 
 
-#define FREEBSD_I386_NRV2E_LOADER_ADLER32 0xfd390733
-#define FREEBSD_I386_NRV2E_LOADER_CRC32   0x9b19cafb
+#define FREEBSD_I386_NRV2E_LOADER_ADLER32 0xa652d070
+#define FREEBSD_I386_NRV2E_LOADER_CRC32   0xd90063b2
 
-unsigned char freebsd_i386_nrv2e_loader[2012] = {
+unsigned char freebsd_i386_nrv2e_loader[1856] = {
 127, 69, 76, 70,  1,  1,  1,  9,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x   0 */
   2,  0,  3,  0,  1,  0,  0,  0,128,128,  4,  8, 52,  0,  0,  0,   /* 0x  10 */
   0,  0,  0,  0,  0,  0,  0,  0, 52,  0, 32,  0,  2,  0,  0,  0,   /* 0x  20 */
   0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,128,  4,  8,   /* 0x  30 */
-  0,128,  4,  8,196,  7,  0,  0,196,  7,  0,  0,  5,  0,  0,  0,   /* 0x  40 */
-  0, 16,  0,  0,  1,  0,  0,  0,196,  7,  0,  0,196,151,  4,  8,   /* 0x  50 */
-196,151,  4,  8, 24,  0,  0,  0, 28,  0,  0,  0,  6,  0,  0,  0,   /* 0x  60 */
+  0,128,  4,  8, 40,  7,  0,  0, 40,  7,  0,  0,  5,  0,  0,  0,   /* 0x  40 */
+  0, 16,  0,  0,  1,  0,  0,  0, 40,  7,  0,  0, 40,151,  4,  8,   /* 0x  50 */
+ 40,151,  4,  8, 24,  0,  0,  0, 28,  0,  0,  0,  6,  0,  0,  0,   /* 0x  60 */
   0, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /* 0x  70 */
  49,237, 88,137,225,141, 84,129,  4, 80,131,228,248, 82, 81,232,   /* 0x  80 */
- 72,  2,  0,  0,244, 10,  0, 36, 73,110,102,111, 58, 32, 84,104,   /* 0x  90 */
+  4,  2,  0,  0,244, 10,  0, 36, 73,110,102,111, 58, 32, 84,104,   /* 0x  90 */
 105,115, 32,102,105,108,101, 32,105,115, 32,112, 97, 99,107,101,   /* 0x  a0 */
 100, 32,119,105,116,104, 32,116,104,101, 32, 85, 80, 88, 32,101,   /* 0x  b0 */
 120,101, 99,117,116, 97, 98,108,101, 32,112, 97, 99,107,101,114,   /* 0x  c0 */
  32,104,116,116,112, 58, 47, 47,117,112,120, 46,115,102, 46,110,   /* 0x  d0 */
 101,116, 32, 36, 10,  0, 36, 73,100, 58, 32, 85, 80, 88, 32, 49,   /* 0x  e0 */
- 46, 50, 52, 32, 67,111,112,121,114,105,103,104,116, 32, 40, 67,   /* 0x  f0 */
- 41, 32, 49, 57, 57, 54, 45, 50, 48, 48, 50, 32,116,104,101, 32,   /* 0x 100 */
+ 46, 50, 53, 32, 67,111,112,121,114,105,103,104,116, 32, 40, 67,   /* 0x  f0 */
+ 41, 32, 49, 57, 57, 54, 45, 50, 48, 48, 52, 32,116,104,101, 32,   /* 0x 100 */
  85, 80, 88, 32, 84,101, 97,109, 46, 32, 65,108,108, 32, 82,105,   /* 0x 110 */
 103,104,116,115, 32, 82,101,115,101,114,118,101,100, 46, 32, 36,   /* 0x 120 */
  10,  0, 85, 87, 86, 83, 81, 82,252,139,116, 36, 28,139,124, 36,   /* 0x 130 */
@@ -66,94 +66,84 @@ unsigned char freebsd_i386_nrv2e_loader[2012] = {
 255,144,144,144,139,  2,131,194,  4,137,  7,131,199,  4,131,233,   /* 0x 210 */
   4,119,241,  1,207,233, 36,255,255,255,139, 84, 36, 28,  3, 84,   /* 0x 220 */
  36, 32, 57,214,116,  1, 72, 43,124, 36, 36,139, 84, 36, 40,137,   /* 0x 230 */
- 58, 90, 89, 91, 94, 95, 93,195, 85,137,229, 87, 86, 83,139,125,   /* 0x 240 */
- 12,139,117, 16, 86, 87,255,117,  8,232, 38,  4,  0,  0,131,196,   /* 0x 250 */
- 12,133,192,137,195,121, 10,232, 52,  3,  0,  0,131, 56,  4,116,   /* 0x 260 */
-  8,133,219,126,  8,  1,223, 41,222,133,246,127,215,141,101,244,   /* 0x 270 */
- 91,137,240, 94, 95,201,195,144, 85,137,229, 87, 86,139,117, 12,   /* 0x 280 */
- 83,137,241,139, 93,  8,186, 10,  0,  0,  0,137,200,137,215, 49,   /* 0x 290 */
-210,247,247, 67,133,192,137,193,117,236,137,217,198,  3,  0,137,   /* 0x 2a0 */
-242,137,208,190, 10,  0,  0,  0, 49,210,247,246,131,194, 48, 75,   /* 0x 2b0 */
-133,192,136, 19,137,194,117,233, 91, 94,137,200, 95,201,195,144,   /* 0x 2c0 */
- 85,137,229,255,117,  8,232,209,  2,  0,  0,144, 85,137,229, 87,   /* 0x 2d0 */
- 86, 83,131,236,112,232, 34,  3,  0,  0, 80,137,199,141, 69,170,   /* 0x 2e0 */
- 80,199, 69,164, 47,112,114,111,102,199, 69,168, 99, 47,232,133,   /* 0x 2f0 */
-255,255,255,198,  0, 47,199, 64,  1,102,105,108,101,106,  0,106,   /* 0x 300 */
-  0,141, 93,164, 83,232, 66,  3,  0,  0,106,  0,106,  0,104, 85,   /* 0x 310 */
- 80, 88, 49, 80,137, 69,140,232, 36,  4,  0,  0,131,196, 36,133,   /* 0x 320 */
-210, 15,136,211,  1,  0,  0,106, 12,141, 69,228, 80,255,117,140,   /* 0x 330 */
-232,  3,255,255,255,131,196, 12,133,192, 15,133,186,  1,  0,  0,   /* 0x 340 */
-139, 77,228,129,249, 85, 80, 88, 50, 15,133,171,  1,  0,  0,190,   /* 0x 350 */
-215,151,  4,  8,186,  4,  0,  0,  0,137,251,136,216,131,224, 31,   /* 0x 360 */
- 60, 25,118,  3,131,232, 43, 78,  0,  6,193,235,  5, 74,117,235,   /* 0x 370 */
-106,  0,141, 69,156, 80, 49,203,232, 67,  2,  0,  0,139, 69,160,   /* 0x 380 */
-193,224, 12, 51, 93,156, 95, 49,195,190,211,151,  4,  8,186,  7,   /* 0x 390 */
-  0,  0,  0, 88,136,216,131,224, 31, 60, 25,118,  3,131,232, 43,   /* 0x 3a0 */
- 78,  0,  6,193,235,  5, 74,117,235,104,196,151,  4,  8,232, 93,   /* 0x 3b0 */
-  2,  0,  0,133,192, 91,121, 13,131, 61,220,151,  4,  8,  2, 15,   /* 0x 3c0 */
-133, 53,  1,  0,  0,104,192,  1,  0,  0,104,  2, 10,  0,  0,104,   /* 0x 3d0 */
-196,151,  4,  8,232,115,  2,  0,  0, 49,210, 82,137, 69,136,139,   /* 0x 3e0 */
- 69,232, 80,255,117,136,232,181,  2,  0,  0,131,196, 24,133,192,   /* 0x 3f0 */
- 15,133,249,  0,  0,  0,106,  0,106,  0,255,117,136,106,  2,106,   /* 0x 400 */
-  3,255, 53,216,151,  4,  8,106,  0,232,210,  2,  0,  0,131,196,   /* 0x 410 */
- 28, 61,  0,240,255,255,137, 69,132, 15,135,208,  0,  0,  0,106,   /* 0x 420 */
-  8,141, 69,148, 80,255,117,140,232, 11,254,255,255,131,196, 12,   /* 0x 430 */
-133,192, 15,133,183,  0,  0,  0,139, 77,148,133,201,117, 28,129,   /* 0x 440 */
-125,152, 85, 80, 88, 33, 15,133,163,  0,  0,  0,131,125,232,  0,   /* 0x 450 */
- 15,132,182,  0,  0,  0,233,148,  0,  0,  0,139, 85,152,133,210,   /* 0x 460 */
- 15,142,137,  0,  0,  0, 57,202, 15,143,129,  0,  0,  0,139, 69,   /* 0x 470 */
-236, 57,193,127,122, 41,208,141,152,  0,  8,  0,  0,139,117,132,   /* 0x 480 */
- 82,  1,222, 86,255,117,140,232,172,253,255,255,131,196, 12,133,   /* 0x 490 */
-192,117, 92,139, 85,152, 59, 85,148,125, 31,141, 69,144, 80,255,   /* 0x 4a0 */
-117,132, 82, 86,232,121,252,255,255,131,196, 16,133,192,137,195,   /* 0x 4b0 */
-117, 61,139, 69,148, 57, 69,144,117, 53,139,125,132,  1,223,139,   /* 0x 4c0 */
-117,148, 86, 87,255,117,136,232,148,  1,  0,  0,131,196, 12,133,   /* 0x 4d0 */
-192,137,195,121, 10,232,182,  0,  0,  0,131, 56,  4,116,  8,133,   /* 0x 4e0 */
-219,126,  8,  1,223, 41,222,133,246,127,215,133,246,116, 15,104,   /* 0x 4f0 */
-196,151,  4,  8,232, 23,  1,  0,  0, 89,106,127,235,101,139, 69,   /* 0x 500 */
-232, 43, 69,148,137, 69,232,233, 19,255,255,255,255, 53,216,151,   /* 0x 510 */
-  4,  8,255,117,132,232,186,  0,  0,  0,255,117,136,232, 22,  1,   /* 0x 520 */
-  0,  0,131,196, 12,133,192,117,198,255,117,140,232,  7,  1,  0,   /* 0x 530 */
-  0,133,192, 90,117,185,232, 77,  1,  0,  0,133,192,117, 41,232,   /* 0x 540 */
- 68,  1,  0,  0,133,192,117, 25,106,  0,104,188,135,  4,  8,232,   /* 0x 550 */
- 88,  0,  0,  0,104,196,151,  4,  8,232,178,  0,  0,  0,131,196,   /* 0x 560 */
- 12,106,  0,232, 88,253,255,255,106,  0,106,  0,106,  0,106,255,   /* 0x 570 */
-232,175,  0,  0,  0,255,117, 12,255,117,  8,104,196,151,  4,  8,   /* 0x 580 */
-232, 99,  0,  0,  0,131,196, 28,233, 98,255,255,255,144,144,144,   /* 0x 590 */
- 85,137,229,184,220,151,  4,  8, 93,195,144,144,184,  1,  0,  0,   /* 0x 5a0 */
-  0,205,128,195,233,219,  1,  0,  0,141,118,  0,184,240,  0,  0,   /* 0x 5b0 */
-  0,205,128,114,239,195,144,144,233,199,  1,  0,  0,141,118,  0,   /* 0x 5c0 */
-184,116,  0,  0,  0,205,128,114,239,195,144,144,233,179,  1,  0,   /* 0x 5d0 */
-  0,141,118,  0,184, 73,  0,  0,  0,205,128,114,239,195,144,144,   /* 0x 5e0 */
-233,159,  1,  0,  0,141,118,  0,184, 59,  0,  0,  0,205,128,114,   /* 0x 5f0 */
-239,195,144,144,233,139,  1,  0,  0,141,118,  0,184, 20,  0,  0,   /* 0x 600 */
-  0,205,128,114,239,195,144,144,233,119,  1,  0,  0,141,118,  0,   /* 0x 610 */
-184, 10,  0,  0,  0,205,128,114,239,195,144,144,233, 99,  1,  0,   /* 0x 620 */
-  0,141,118,  0,184,  7,  0,  0,  0,205,128,114,239,195,144,144,   /* 0x 630 */
-233, 79,  1,  0,  0,141,118,  0,184,  6,  0,  0,  0,205,128,114,   /* 0x 640 */
-239,195,144,144,233, 59,  1,  0,  0,141,118,  0,184,  5,  0,  0,   /* 0x 650 */
-  0,205,128,114,239,195,144,144,233, 39,  1,  0,  0,141,118,  0,   /* 0x 660 */
-184,  4,  0,  0,  0,205,128,114,239,195,144,144,233, 19,  1,  0,   /* 0x 670 */
-  0,141,118,  0,184,  3,  0,  0,  0,205,128,114,239,195,144,144,   /* 0x 680 */
-233,255,  0,  0,  0,141,118,  0,184,  2,  0,  0,  0,205,128,114,   /* 0x 690 */
-239,195,144,144,144,144,144,144,144,144,144,144,144,144,144,144,   /* 0x 6a0 */
- 85,137,229,131,236, 24,139, 69, 12,139, 85, 16,137, 68, 36, 16,   /* 0x 6b0 */
-137, 84, 36, 20,199, 68, 36, 12,  0,  0,  0,  0,139, 69,  8,137,   /* 0x 6c0 */
- 68, 36,  8,199,  4, 36,201,  0,  0,  0,199, 68, 36,  4,  0,  0,   /* 0x 6d0 */
-  0,  0,232,201,  0,  0,  0,137,236, 93,195,144,144,144,144,144,   /* 0x 6e0 */
- 85,137,229,131,236, 40,139, 69, 28,139, 85, 32,137, 68, 36, 32,   /* 0x 6f0 */
-137, 84, 36, 36,199, 68, 36, 28,  0,  0,  0,  0,139, 69, 24,137,   /* 0x 700 */
- 68, 36, 24,139, 69, 20,137, 68, 36, 20,139, 69, 16,137, 68, 36,   /* 0x 710 */
- 16,139, 69, 12,137, 68, 36, 12,139, 69,  8,137, 68, 36,  8,199,   /* 0x 720 */
-  4, 36,197,  0,  0,  0,199, 68, 36,  4,  0,  0,  0,  0,232,109,   /* 0x 730 */
-  0,  0,  0,137,236, 93,195,144,144,144,144,144,144,144,144,144,   /* 0x 740 */
- 85,137,229,131,236, 40,139, 69, 20,137, 68, 36, 24,139, 69, 12,   /* 0x 750 */
-139, 85, 16,137, 68, 36, 16,137, 84, 36, 20,199, 68, 36, 12,  0,   /* 0x 760 */
-  0,  0,  0,139, 69,  8,137, 68, 36,  8,199,  4, 36,199,  0,  0,   /* 0x 770 */
-  0,199, 68, 36,  4,  0,  0,  0,  0,232, 34,  0,  0,  0,137,236,   /* 0x 780 */
- 93,195,144,144, 80,232,  6,254,255,255, 89,137,  8,184,255,255,   /* 0x 790 */
-255,255,186,255,255,255,255,195,233,231,255,255,255,141,118,  0,   /* 0x 7a0 */
-184,198,  0,  0,  0,205,128,114,239,195,  0,  0, 85, 80, 88, 52,   /* 0x 7b0 */
-  0,  0,  0,  0, 47,116,109,112, 47,117,112,120, 65, 65, 65, 65,   /* 0x 7c0 */
- 65, 65, 65, 65, 65, 65, 65,  0, 85, 80, 88, 53                    /* 0x 7d0 */
+ 58, 90, 89, 91, 94, 95, 93,195, 85,137,229, 87, 86, 83, 81,137,   /* 0x 240 */
+215,137, 69,240,139,117,  8, 86, 87,255,117,240,232,  7,  4,  0,   /* 0x 250 */
+  0,131,196, 12,133,192,137,195,121, 10,232, 21,  3,  0,  0,131,   /* 0x 260 */
+ 56,  4,116,  8,133,219,126,  8,  1,223, 41,222,133,246,127,215,   /* 0x 270 */
+141,101,244, 91,137,240, 94, 95,201,195,137,246, 85,137,229,255,   /* 0x 280 */
+117,  8,232,249,  2,  0,  0,144, 85,137,229, 87, 86, 83,131,236,   /* 0x 290 */
+112,232, 74,  3,  0,  0,137,199,199, 69,164, 47,112,114,111,102,   /* 0x 2a0 */
+199, 69,168, 99, 47,141, 93,170,137,193,186, 10,  0,  0,  0,137,   /* 0x 2b0 */
+200,137,214, 49,210,247,246, 67,133,192,137,193,117,236,137,217,   /* 0x 2c0 */
+198,  3,  0,137,250,137,208,190, 10,  0,  0,  0, 49,210,247,246,   /* 0x 2d0 */
+131,194, 48, 75,133,192,136, 19,137,194,117,233,198,  1, 47,199,   /* 0x 2e0 */
+ 65,  1,102,105,108,101,106,  0,106,  0,141, 69,164, 80,232, 61,   /* 0x 2f0 */
+  3,  0,  0,106,  0,106,  0,104, 85, 80, 88, 49, 80,137, 69,140,   /* 0x 300 */
+232,211,  3,  0,  0,131,196, 28,133,210, 15,136,208,  1,  0,  0,   /* 0x 310 */
+141, 85,228,106, 12,139, 69,140,232, 27,255,255,255,133,192, 90,   /* 0x 320 */
+ 15,133,186,  1,  0,  0,129,125,228, 85, 80, 88, 50, 15,133,173,   /* 0x 330 */
+  1,  0,  0,190, 59,151,  4,  8,186,  4,  0,  0,  0,137,251,136,   /* 0x 340 */
+216,131,224, 31, 60, 25,118,  3,131,232, 43, 78,  0,  6,193,235,   /* 0x 350 */
+  5, 74,117,235,106,  0,141, 69,156, 80,232, 69,  2,  0,  0,129,   /* 0x 360 */
+243, 85, 80, 88, 50,139, 69,160,193,224, 12, 51, 93,156, 95, 49,   /* 0x 370 */
+195,190, 55,151,  4,  8,186,  7,  0,  0,  0, 88,136,216,131,224,   /* 0x 380 */
+ 31, 60, 25,118,  3,131,232, 43, 78,  0,  6,193,235,  5, 74,117,   /* 0x 390 */
+235,104, 40,151,  4,  8,232, 89,  2,  0,  0,133,192, 89,121, 13,   /* 0x 3a0 */
+131, 61, 64,151,  4,  8,  2, 15,133, 51,  1,  0,  0,104,192,  1,   /* 0x 3b0 */
+  0,  0,104,  2, 10,  0,  0,104, 40,151,  4,  8,232,111,  2,  0,   /* 0x 3c0 */
+  0, 49,210, 82,137, 69,136,139, 69,232, 80,255,117,136,232,229,   /* 0x 3d0 */
+  2,  0,  0,131,196, 24,133,192, 15,133,247,  0,  0,  0,106,  0,   /* 0x 3e0 */
+106,  0,106,255,104,  2, 16,  0,  0,106,  3,255, 53, 60,151,  4,   /* 0x 3f0 */
+  8,106,  0,232,128,  2,  0,  0,131,196, 28, 61,  0,240,255,255,   /* 0x 400 */
+137, 69,132, 15,135,204,  0,  0,  0,106,  8,141, 85,148,139, 69,   /* 0x 410 */
+140,232, 34,254,255,255,133,192, 90, 15,133,182,  0,  0,  0,139,   /* 0x 420 */
+ 77,148,133,201,117, 28,129,125,152, 85, 80, 88, 33, 15,133,162,   /* 0x 430 */
+  0,  0,  0,131,125,232,  0, 15,132,181,  0,  0,  0,233,147,  0,   /* 0x 440 */
+  0,  0,139, 85,152,133,210, 15,142,136,  0,  0,  0, 57,202, 15,   /* 0x 450 */
+143,128,  0,  0,  0,139, 69,236, 57,193,127,121, 41,208,141,152,   /* 0x 460 */
+  0,  8,  0,  0,139,117,132,  1,222, 82,139, 69,140,137,242,232,   /* 0x 470 */
+196,253,255,255,133,192, 95,117, 92,139, 85,152, 59, 85,148,125,   /* 0x 480 */
+ 31,141, 69,144, 80,255,117,132, 82, 86,232,147,252,255,255,131,   /* 0x 490 */
+196, 16,133,192,137,195,117, 61,139, 69,148, 57, 69,144,117, 53,   /* 0x 4a0 */
+139,125,132,  1,223,139,117,148, 86, 87,255,117,136,232,146,  1,   /* 0x 4b0 */
+  0,  0,131,196, 12,133,192,137,195,121, 10,232,180,  0,  0,  0,   /* 0x 4c0 */
+131, 56,  4,116,  8,133,219,126,  8,  1,223, 41,222,133,246,127,   /* 0x 4d0 */
+215,133,246,116, 15,104, 40,151,  4,  8,232, 21,  1,  0,  0, 94,   /* 0x 4e0 */
+106,127,235,101,139, 69,232, 43, 69,148,137, 69,232,233, 23,255,   /* 0x 4f0 */
+255,255,255, 53, 60,151,  4,  8,255,117,132,232,184,  0,  0,  0,   /* 0x 500 */
+255,117,136,232, 20,  1,  0,  0,131,196, 12,133,192,117,198,255,   /* 0x 510 */
+117,140,232,  5,  1,  0,  0,133,192, 91,117,185,232, 75,  1,  0,   /* 0x 520 */
+  0,133,192,117, 41,232, 66,  1,  0,  0,133,192,117, 25,106,  0,   /* 0x 530 */
+104, 32,135,  4,  8,232, 86,  0,  0,  0,104, 40,151,  4,  8,232,   /* 0x 540 */
+176,  0,  0,  0,131,196, 12,106,  0,232, 46,253,255,255,106,  0,   /* 0x 550 */
+106,  0,106,  0,106,255,232,173,  0,  0,  0,255,117, 12,255,117,   /* 0x 560 */
+  8,104, 40,151,  4,  8,232, 97,  0,  0,  0,131,196, 28,233, 98,   /* 0x 570 */
+255,255,255,144, 85,137,229,184, 64,151,  4,  8,201,195,144,144,   /* 0x 580 */
+184,  1,  0,  0,  0,205,128,195,233, 23,  1,  0,  0,141,118,  0,   /* 0x 590 */
+184,240,  0,  0,  0,205,128,114,239,195,144,144,233,  3,  1,  0,   /* 0x 5a0 */
+  0,141,118,  0,184,116,  0,  0,  0,205,128,114,239,195,144,144,   /* 0x 5b0 */
+233,239,  0,  0,  0,141,118,  0,184, 73,  0,  0,  0,205,128,114,   /* 0x 5c0 */
+239,195,144,144,233,219,  0,  0,  0,141,118,  0,184, 59,  0,  0,   /* 0x 5d0 */
+  0,205,128,114,239,195,144,144,233,199,  0,  0,  0,141,118,  0,   /* 0x 5e0 */
+184, 20,  0,  0,  0,205,128,114,239,195,144,144,233,179,  0,  0,   /* 0x 5f0 */
+  0,141,118,  0,184, 10,  0,  0,  0,205,128,114,239,195,144,144,   /* 0x 600 */
+233,159,  0,  0,  0,141,118,  0,184,  7,  0,  0,  0,205,128,114,   /* 0x 610 */
+239,195,144,144,233,139,  0,  0,  0,141,118,  0,184,  6,  0,  0,   /* 0x 620 */
+  0,205,128,114,239,195,144,144,233,119,  0,  0,  0,141,118,  0,   /* 0x 630 */
+184,  5,  0,  0,  0,205,128,114,239,195,144,144,233, 99,  0,  0,   /* 0x 640 */
+  0,141,118,  0,184,  4,  0,  0,  0,205,128,114,239,195,144,144,   /* 0x 650 */
+233, 79,  0,  0,  0,141,118,  0,184,  3,  0,  0,  0,205,128,114,   /* 0x 660 */
+239,195,144,144,233, 59,  0,  0,  0,141,118,  0,184,  2,  0,  0,   /* 0x 670 */
+  0,205,128,114,239,195,144,144, 85,137,229,131,236, 16,255,117,   /* 0x 680 */
+ 32,255,117, 28,106,  0,255,117, 24,255,117, 20,255,117, 16,255,   /* 0x 690 */
+117, 12,255,117,  8,106,  0,104,197,  0,  0,  0,232, 99,  0,  0,   /* 0x 6a0 */
+  0,201,195,144, 80,232,202,254,255,255, 89,137,  8,184,255,255,   /* 0x 6b0 */
+255,255,186,255,255,255,255,195, 85,137,229,131,236, 16,255,117,   /* 0x 6c0 */
+ 16,255,117, 12,106,  0,255,117,  8,106,  0,104,201,  0,  0,  0,   /* 0x 6d0 */
+232, 47,  0,  0,  0,201,195,144, 85,137,229,131,236, 12,255,117,   /* 0x 6e0 */
+ 20,255,117, 16,255,117, 12,106,  0,255,117,  8,106,  0,104,199,   /* 0x 6f0 */
+  0,  0,  0,232, 12,  0,  0,  0,201,195,144,144,233,163,255,255,   /* 0x 700 */
+255,141,118,  0,184,198,  0,  0,  0,205,128,114,239,195,  0,  0,   /* 0x 710 */
+ 85, 80, 88, 52,  0,  0,  0,  0, 47,116,109,112, 47,117,112,120,   /* 0x 720 */
+ 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,  0, 85, 80, 88, 53    /* 0x 730 */
 };
diff --git a/archivers/upx/files/patch-Makefile b/archivers/upx/files/patch-Makefile
index 13b05efe4032..a65a256b0bce 100644
--- a/archivers/upx/files/patch-Makefile
+++ b/archivers/upx/files/patch-Makefile
@@ -1,40 +1,10 @@
---- Makefile.orig	Mon Oct 28 16:43:34 2002
-+++ Makefile	Tue Feb 17 08:20:39 2004
+--- Makefile.orig	Tue Feb  3 15:50:45 2004
++++ Makefile	Wed Jan  5 13:44:11 2005
 @@ -3,6 +3,7 @@
  #
  # usage:
  #   `make target=linux'             # linux
 +#   `make target=freebsd'           # freebsd
- #   `make target=djggp2'            # dos32 - djggp2 2.03
- #   `make target=cygwin'            # win32 - cygwin 1.3.x
- #   `make target=mingw32'           # win32 - mingw32
-@@ -221,6 +222,29 @@
- 
- endif	# linux
- 
-+
-+###
-+### FreeBSD
-+###
-+
-+ifeq ($(target),freebsd)
-+override arch := $(shell uname -m | sed -e 's/^i[3456789]86$$/i386/')
-+DEFS += '-DUPX_CONFIG_H="config_h/freebsd.h"'
-+
-+ifeq ($(DEBUG),1)
-+  ##CFLAGS += -O0 -gstabs+3
-+  ##CFLAGS += -O0 -gdwarf-2
-+  CFLAGS += -O0 -g
-+else
-+  ##LDFLAGS += -static
-+  STUBEDIT_EXE = objcopy -S -R .comment -R .note $@
-+  ifeq ($(arch),i386)
-+#    STUBIFY_EXE = perl $(srcdir)/stub/scripts/brandelf.pl $@
-+    CHMOD_EXE = chmod 755 $@
-+  endif
-+endif
-+
-+endif	# freebsd
- 
- ###
- ### Linux cross compilers
+ #   `make target=dos32-djggp2'      # dos32 - djggp2
+ #   `make target=win32-cygwin'      # win32 - cygwin
+ #   `make target=win32-mingw32'     # win32 - mingw32
diff --git a/archivers/upx/files/patch-Makefile.bld b/archivers/upx/files/patch-Makefile.bld
new file mode 100644
index 000000000000..dfe6aa6bd708
--- /dev/null
+++ b/archivers/upx/files/patch-Makefile.bld
@@ -0,0 +1,40 @@
+--- Makefile.bld.orig	Fri Jun 25 01:35:14 2004
++++ Makefile.bld	Wed Jan  5 14:23:51 2005
+@@ -125,7 +125,7 @@
+ 
+ override tmp := -Wl,--rpath,
+ LDRPATH := $(addprefix $(tmp),$(LIBDIRS))
+-LIBDIRS += .
++LIBDIRS += . $(UCLDIR)/lib
+ LDLIBDIRS := $(addprefix -L,$(LIBDIRS))
+ 
+ ##LDFLAGS += $(LDRPATH)
+@@ -168,6 +168,28 @@
+ endif
+ CHMOD_EXE = chmod 755 $@
+ endif	# linux
++
++
++###
++### FreeBSD
++###
++
++ifeq ($(target),freebsd)
++include $(srcdir)/Makedefs.gcc
++override arch := $(shell uname -m | sed -e 's/^i[3456789]86$$/i386/')
++DEFS += -D_FILE_OFFSET_BITS=64
++##CFLAGS_WERROR = -Werror
++ifeq ($(DEBUG),1)
++else
++  ##LDFLAGS += -static
++  STUBEDIT_EXE = objcopy -S -R .comment -R .note $@
++  ifeq ($(arch),i386)
++##    STUBIFY_EXE = perl $(srcdir)/stub/scripts/brandelf.pl $@
++  endif
++CHMOD_EXE = chmod 755 $@
++endif
++
++endif # freebsd
+ 
+ 
+ ###
diff --git a/archivers/upx/files/patch-Makefile.inc b/archivers/upx/files/patch-Makefile.inc
deleted file mode 100644
index 599f7caee29d..000000000000
--- a/archivers/upx/files/patch-Makefile.inc
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.inc.orig	Tue Feb 17 08:55:35 2004
-+++ Makefile.inc	Tue Feb 17 08:54:46 2004
-@@ -22,7 +22,7 @@
- LIBDIRS += $(UDIR)/build/src/.libs
- endif
- ifneq ($(strip $(wildcard $(UDIR))),)
--LIBDIRS += $(UDIR)
-+LIBDIRS += $(UDIR)/lib
- DOS_LIBDIRS := $(DOS_LIBDIRS);$(UDIR)
- endif
- 
diff --git a/archivers/upx/files/patch-conf.h b/archivers/upx/files/patch-conf.h
index 9c6f6f0d752f..539224211821 100644
--- a/archivers/upx/files/patch-conf.h
+++ b/archivers/upx/files/patch-conf.h
@@ -1,14 +1,5 @@
 --- conf.h.orig	Wed Jan 28 02:49:57 2004
 +++ conf.h	Tue Feb 17 06:24:41 2004
-@@ -109,7 +109,7 @@
- #    define UPX_E_OK      UCL_E_OK
- #    define UPX_E_ERROR   UCL_E_ERROR
- #    define UPX_E_OUT_OF_MEMORY UCL_E_OUT_OF_MEMORY
--#    define __UPX_ENTRY   __UCL_ENTRY
-+#    define __UPX_ENTRY
- #  endif
- #endif
- #if defined(WITH_NRV)
 @@ -518,6 +518,7 @@
  #define UPX_F_BVMLINUZ_i386     16
  #define UPX_F_ELKS_8086         17
diff --git a/archivers/upx/files/patch-stub-Makefile b/archivers/upx/files/patch-stub-Makefile
index 117d0728f0d4..7a2ff0532ce3 100644
--- a/archivers/upx/files/patch-stub-Makefile
+++ b/archivers/upx/files/patch-stub-Makefile
@@ -1,5 +1,5 @@
---- stub/Makefile.orig	Wed Jan 28 03:28:03 2004
-+++ stub/Makefile	Tue Feb 17 07:22:01 2004
+--- stub/Makefile.orig	Fri Jun 25 01:35:35 2004
++++ stub/Makefile	Wed Jan  5 13:56:16 2005
 @@ -27,6 +27,7 @@
  	l_djgpp2.h stubify.h \
  	l_exe.h \
@@ -8,21 +8,25 @@
  	l_sys.h \
  	l_t_n2b.h l_t_n2bs.h l_t_n2d.h l_t_n2ds.h l_t_n2e.h l_t_n2es.h \
  	l_tmt.h \
-@@ -81,6 +82,13 @@
- CC_LINUX_I386 += -funsigned-char
- ###CC_LINUX_I386 += -fwritable-strings -save-temps
+@@ -103,6 +104,17 @@
  
-+# Compiler for the FreeBSD/386 stubs.
+ 
+ ###
++### FreeBSD/i386
++###
++
 +CC_FREEBSD_I386 = gcc -march=i386 -mcpu=i386 -Os -fno-strict-aliasing
 +CC_FREEBSD_I386 += -falign-functions=0 -falign-jumps=0 -falign-loops=0
 +CC_FREEBSD_I386 += -Werror
 +CC_FREEBSD_I386 += -Wall -W -Wcast-align -Wcast-qual -Wwrite-strings
 +CC_FREEBSD_I386 += -funsigned-char
 +
- # Preprocessor for the a68k 68000-assembler.
- CPP_M68K = gcc -I$(UCL_UPX) -E -x assembler-with-cpp -Wall -Wp,-P,-C,-traditional,-nostdinc -D__A68K__
- ASM_M68K = a68k -q -x
-@@ -255,6 +263,31 @@
++
++###
+ ### Motorola 68000
+ ###
+ 
+@@ -292,6 +304,31 @@
  
  
  # /***********************************************************************
@@ -54,7 +58,7 @@
  # // dependencies
  # ************************************************************************/
  
-@@ -274,10 +307,13 @@
+@@ -316,10 +353,13 @@
  l_djgpp2.h:     n2b_d32.asy  n2d_d32.asy  n2e_d32.asy  $(DEPS2)
  l_exe.h:        n2b_d8e.asy  n2d_d8e.asy  n2e_d8e.asy  $(DEPS2)
  l_lx_n2b.h:     n2b_d32.ash  $(DEPS1)
diff --git a/archivers/upx/files/patch-stub-l_linux.c b/archivers/upx/files/patch-stub-l_linux.c
index 6f436cddde12..cc6d130fcda7 100644
--- a/archivers/upx/files/patch-stub-l_linux.c
+++ b/archivers/upx/files/patch-stub-l_linux.c
@@ -1,5 +1,5 @@
---- stub/l_linux.c.orig	Wed Jan 28 03:36:25 2004
-+++ stub/l_linux.c	Tue Feb 17 07:27:42 2004
+--- stub/l_linux.c.orig	Wed Jan 21 00:32:56 2004
++++ stub/l_linux.c	Wed Jan  5 14:43:57 2005
 @@ -51,7 +51,11 @@
      // note: we can assert(count > 0);
      do {
@@ -100,9 +100,9 @@
  
  #if defined(USE_MALLOC)
 +#if defined(__FreeBSD__)
-+    buf = mmap(0, mmapsize, PROT_READ | PROT_WRITE, MAP_PRIVATE, fdo, 0);
++    buf = (unsigned char *) mmap(0, mmapsize, PROT_READ | PROT_WRITE, MAP_PRIVATE, fdo, 0);
 +#else
-     buf = mmap(malloc_args);
+     buf = (unsigned char *) mmap(malloc_args);
 +#endif
      if ((unsigned long) buf >= (unsigned long) -4095)
          goto error;
diff --git a/archivers/upx/files/patch-stub-linux.hh b/archivers/upx/files/patch-stub-linux.hh
index 868fa38c96a8..cbe7836806f3 100644
--- a/archivers/upx/files/patch-stub-linux.hh
+++ b/archivers/upx/files/patch-stub-linux.hh
@@ -1,21 +1,11 @@
---- stub/linux.hh.orig	Tue Feb 17 01:31:35 2004
-+++ stub/linux.hh	Tue Feb 17 07:30:02 2004
-@@ -26,8 +26,8 @@
-  */
- 
- 
--#if !defined(__linux__) || !defined(__i386__)
--#  error "this stub must be compiled under linux/i386"
-+#if (!defined(__linux__) || !defined(__i386__)) && !defined(__FreeBSD__)
-+#  error "this stub must be compiled under linux/i386 or FreeBSD"
- #endif
- 
- 
-@@ -35,6 +35,16 @@
- // includes
+--- stub/linux.hh.orig	Wed Jan  5 14:42:03 2005
++++ stub/linux.hh	Wed Jan  5 14:43:40 2005
+@@ -35,6 +35,19 @@
+ //
  **************************************************************************/
  
 +#if defined(__FreeBSD__)
++
 +#include <sys/types.h>
 +#include <sys/mman.h>
 +#include <sys/time.h>
@@ -24,31 +14,17 @@
 +#include <fcntl.h>
 +#include <time.h>
 +#include <unistd.h>
++
 +#else
- struct timex;
- 
- #define __need_timeval
-@@ -54,6 +64,7 @@
- 
- #define CONST_CAST(type, var) \
-     ((type) ((unsigned long) (var)))
-+#endif
++
+ // <stddef.h>
+ typedef long ptrdiff_t;
+ typedef unsigned long size_t;
+@@ -412,6 +425,7 @@
+ #define PT_INTERP       3
+ #define PT_PHDR         6
  
++#endif /* __FreeBSD__ */
  
  /*************************************************************************
-@@ -122,6 +133,7 @@
- #define PAGE_SIZE   ( 1u<<12)
- 
- 
-+#if !defined(__FreeBSD__)
- /*************************************************************************
- // syscalls
- //
-@@ -312,6 +324,7 @@
- 
- #undef Z0
- #undef Z1
-+#endif
- 
- 
- /*
+ // UPX stuff