From 45fba4eaff00c74564fb4a07fe8f62b11e723f92 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 7 Aug 2012 20:21:06 +0200
Subject: [PATCH] nasm: Update to 2.10.03.

nasm >= 2.0 is required to build flac.
---
 config/rootfiles/common/nasm | 4 ++--
 lfs/nasm                     | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/config/rootfiles/common/nasm b/config/rootfiles/common/nasm
index 8f20850056..9d3e196231 100644
--- a/config/rootfiles/common/nasm
+++ b/config/rootfiles/common/nasm
@@ -1,4 +1,4 @@
 #usr/bin/nasm
 #usr/bin/ndisasm
-#usr/man/man1/nasm.1
-#usr/man/man1/ndisasm.1
+#usr/share/man/man1/nasm.1
+#usr/share/man/man1/ndisasm.1
diff --git a/lfs/nasm b/lfs/nasm
index 9d5ad08208..f6aeac7a8f 100644
--- a/lfs/nasm
+++ b/lfs/nasm
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 0.98.39
+VER        = 2.10.03
 
 THISAPP    = nasm-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2032ad44c7359f7a9a166a40a633e772
+$(DL_FILE)_MD5 = a5d0ed070476a7c5b4f0893dc4a4ea4b
 
 install : $(TARGET)
 
@@ -69,8 +69,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-security_fix-1.patch
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-- 
2.39.5