X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fnasm;h=f6aeac7a8fca79659e2f01f4aba4e6e6ce8ed4a0;hb=cbb88df1548953beeca06d462c9d3006a15dc9ef;hp=9d5ad08208b0fc4a0bc55977859d7784a8c4c3d6;hpb=70df830214c97a68fcb7e89ae0d7df58c35590be;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/nasm b/lfs/nasm
index 9d5ad0820..f6aeac7a8 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