X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fgnump3d;h=fbde7ca0564eabe9715d36259fd5f3f644a74c5e;hp=8643e14844b8349b987fda1240f95e6ea983b358;hb=41b7369f8078d5dc4998483fa005b2f8e3b89624;hpb=f86b0cc33aa1a7778f24a9e6bd7759c868da482d

diff --git a/lfs/gnump3d b/lfs/gnump3d
index 8643e14844..fbde7ca056 100644
--- a/lfs/gnump3d
+++ b/lfs/gnump3d
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,17 +24,17 @@
 
 include Config
 
-VER        = 2.9.9.9
+VER        = 3.0
 
 THISAPP    = gnump3d-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = gnump3d
-PAK_VER    = 1
+PAK_VER    = 5
 
-DEPS       = "lame sox"
+DEPS       = ""
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 61aadff26da4e5539d481e7397ddaf3e
+$(DL_FILE)_MD5 = 41786650bbc591484c08014a89478bf9
 
 install : $(TARGET)
 
@@ -76,7 +76,24 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-remove_badbannerlink.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-cookie_expiration.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fix_random_dir_for_opera.patch
+	# gnump3d.org is not related with gnump3d anymore
+	# change the links to project page on gnu.org
+	cd $(DIR_APP) && find . -type f -exec sed -e 's|http://www.gnump3d.org|http://www.gnu.org/software/gnump3d|g' -i {} \;
+	cd $(DIR_APP) && find . -type f -exec sed -e 's|http://gnump3d.org|http://www.gnu.org/software/gnump3d|g' -i {} \;
+
 	cd $(DIR_APP) && make install
+	mkdir -p /var/mp3
+	echo Folder for music files > /var/mp3/info
+	chown nobody.nobody /var/mp3
+	install -m 644 $(DIR_SRC)/config/gnump3d/gnump3d.conf /etc/gnump3d/
+	ln -sf /usr/bin/gnump3d-index /etc/fcron.daily/gnump3d-index
+
+	#install initscripts
+	$(call INSTALL_INITSCRIPT,gnump3d)
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)