From: Stephen Walker <stephendwalker@gmail.com>
Date: Sun, 23 May 2010 21:11:51 +0000 (+0000)
Subject: [packages] upx: update to 3.05
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=e090eea109a2b4485af18c7d7ee362ed056d8487

[packages] upx: update to 3.05


SVN-Revision: 21553
---

diff --git a/utils/upx/Makefile b/utils/upx/Makefile
index 5437db7995..f8548313f1 100644
--- a/utils/upx/Makefile
+++ b/utils/upx/Makefile
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=upx
-PKG_VERSION:=3.04
+PKG_VERSION:=3.05
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2
-PKG_SOURCE_URL:=http://upx.sourceforge.net/download/
-PKG_MD5SUM:=68d662b1f831335460f9bfdbf632c6ce
+PKG_SOURCE_URL:=http://upx.sourceforge.net/download
+PKG_MD5SUM:=1f0ca94c8c26a816402274dd7e628334
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/utils/upx/patches/100-disable_doc.patch b/utils/upx/patches/100-disable_doc.patch
index 842598cc1b..d960c00c7c 100644
--- a/utils/upx/patches/100-disable_doc.patch
+++ b/utils/upx/patches/100-disable_doc.patch
@@ -1,6 +1,5 @@
-diff -pruN upx-3.04.orig//Makefile upx-3.04/Makefile
---- upx-3.04.orig//Makefile	2010-02-18 15:07:46.894410571 +0100
-+++ upx-3.04/Makefile	2010-02-18 15:08:32.758657685 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -35,7 +35,7 @@ ifeq ($(BUILD_STUB),1)
  	$(MAKE) -C src/stub $@
  endif
@@ -9,4 +8,4 @@ diff -pruN upx-3.04.orig//Makefile upx-3.04/Makefile
 +#	$(MAKE) -C doc $@
  
  
- ifneq ($(wildcard .hg/.),)
+ .PHONY: default all mostlyclean clean distclean maintainer-clean
diff --git a/utils/upx/patches/101-avr32.patch b/utils/upx/patches/101-avr32.patch
deleted file mode 100644
index a65fb9c276..0000000000
--- a/utils/upx/patches/101-avr32.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/src/miniacc.h
-+++ b/src/miniacc.h
-@@ -756,6 +756,9 @@
- #elif (UINT_MAX <= ACC_0xffffL) && defined(__AVR__)
- #  define ACC_ARCH_AVR              1
- #  define ACC_INFO_ARCH             "avr"
-+#elif defined(__avr32__)
-+#  define ACC_ARCH_AVR32            1
-+#  define ACC_INFO_ARCH             "avr32"
- #elif defined(__bfin__)
- #  define ACC_ARCH_BLACKFIN         1
- #  define ACC_INFO_ARCH             "blackfin"
-@@ -1316,7 +1319,7 @@ extern "C" {
- #  define ACC_ABI_BIG_ENDIAN        1
- #elif (ACC_ARCH_ALPHA || ACC_ARCH_AMD64 || ACC_ARCH_BLACKFIN || ACC_ARCH_CRIS || ACC_ARCH_I086 || ACC_ARCH_I386 || ACC_ARCH_MSP430)
- #  define ACC_ABI_LITTLE_ENDIAN     1
--#elif (ACC_ARCH_M68K || ACC_ARCH_S390)
-+#elif (ACC_ARCH_AVR32 || ACC_ARCH_M68K || ACC_ARCH_S390)
- #  define ACC_ABI_BIG_ENDIAN        1
- #elif 1 && defined(__IAR_SYSTEMS_ICC__) && defined(__LITTLE_ENDIAN__)
- #  if (__LITTLE_ENDIAN__ == 1)