From a5ecf39d533e4136e884c87704c5663b452c621d Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 2 May 2009 16:41:54 +0200
Subject: [PATCH] Fix gnump3d: cookie expiration, recurse links and link to
 homepage

---
 lfs/gnump3d                                          |  8 +++++++-
 src/patches/gnump3d-3.0-remove_badbannerlink.patch   |  2 +-
 .../gnump3d-3.0-remove_cookie_expiration_date.patch  | 12 ++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 src/patches/gnump3d-3.0-remove_cookie_expiration_date.patch

diff --git a/lfs/gnump3d b/lfs/gnump3d
index b3eb8439c1..300697e0af 100644
--- a/lfs/gnump3d
+++ b/lfs/gnump3d
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = gnump3d
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""
 
@@ -78,6 +78,12 @@ $(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)-remove_badbannerlink.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-remove_cookie_expiration_date.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 /var/mp3
 	chown nobody.nobody /var/mp3
diff --git a/src/patches/gnump3d-3.0-remove_badbannerlink.patch b/src/patches/gnump3d-3.0-remove_badbannerlink.patch
index 6f999fb958..75d8e6c6e3 100644
--- a/src/patches/gnump3d-3.0-remove_badbannerlink.patch
+++ b/src/patches/gnump3d-3.0-remove_badbannerlink.patch
@@ -5,7 +5,7 @@
      }
  
 -    if ( $dir ne '/prefs/' ) {
-+    if ( ($dir ne '/prefs/')&&($dir ne '/tagbrowse/')&&($dir ne '/playlist/')&&($dir ne '/random/')&&($dir ne '/stats/') ) {
++    if ( ($dir ne '/prefs/')&&($dir ne '/tagbrowse/')&&($dir ne '/playlist/')&&($dir ne '/random/')&&($dir ne '/stats/')&&($dir ne '/recent/')&&($dir ne '/now/') ) {
          #
          # Interpolate links - chopping out trailing '/' if necessary.
          #
diff --git a/src/patches/gnump3d-3.0-remove_cookie_expiration_date.patch b/src/patches/gnump3d-3.0-remove_cookie_expiration_date.patch
new file mode 100644
index 0000000000..dc613fd81e
--- /dev/null
+++ b/src/patches/gnump3d-3.0-remove_cookie_expiration_date.patch
@@ -0,0 +1,12 @@
+diff -Naur gnump3d-3.0.org/bin/gnump3d2 gnump3d-3.0/bin/gnump3d2
+--- gnump3d-3.0.org/bin/gnump3d2	2007-10-18 19:34:02.000000000 +0200
++++ gnump3d-3.0/bin/gnump3d2	2009-05-02 15:17:51.000000000 +0200
+@@ -1346,7 +1346,7 @@
+ 
+ 	my $val = $ARGUMENTS{ $key };
+ 
+-	$header .= "Set-Cookie: " . $key . "=" . $val . ";path=/; expires=Mon, 10-Mar-08 14:36:42 GMT;\r\n";
++	$header .= "Set-Cookie: " . $key . "=" . $val . ";path=/; \r\n";
+     }
+     print "Header: $header\n";
+ 
-- 
2.39.2