Fix gnump3d: cookie exp time to 1 year

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index cdab1eec660243eb9bd91870610e704e60de8719..dbb0ae89e87616c39a76957d672fb0eeae108dcf 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -1,4 +1,4 @@
-== List of softwares used to build IPFire Version: 2.5beta1 ==
+== List of softwares used to build IPFire Version: 2.5beta2 ==
 * Archive-Tar-1.29
 * Archive-Zip-1.16
 * BerkeleyDB-0.27

diff --git a/lfs/gnump3d b/lfs/gnump3d
index 7b3fdbcf853654eebd2dd7736b464de859786bf5..1c20827c040b10e0f162981d23d7d3ef744ff9c2 100644 (file)
--- a/lfs/gnump3d
+++ b/lfs/gnump3d
@@ -78,7 +78,7 @@ $(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
+       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
@@ -90,6 +90,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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 -s /usr/bin/gnump3d-index /etc/fcron.daily/gnump3d-index
+       ln -sf /usr/bin/gnump3d-index /etc/fcron.daily/gnump3d-index
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/patches/gnump3d-3.0-remove_cookie_expiration_date.patch b/src/patches/gnump3d-3.0-cookie_expiration.patch
similarity index 52%
rename from src/patches/gnump3d-3.0-remove_cookie_expiration_date.patch
rename to src/patches/gnump3d-3.0-cookie_expiration.patch
index dc613fd81edfc3f7f6ea874b12c9e7f738d5f79a..f8d92bc2a6d300cdff92235f0ff3be1ca536386c 100644 (file)
--- a/src/patches/gnump3d-3.0-remove_cookie_expiration_date.patch
+++ b/src/patches/gnump3d-3.0-cookie_expiration.patch
@@ -1,12 +1,14 @@
 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 @@
++++ gnump3d-3.0/bin/gnump3d2   2009-05-03 11:46:09.000000000 +0200
+@@ -1345,8 +1345,8 @@
+         next if $key eq 'q' or $key eq 'play';
  
        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";
++      my $exptime=gmtime(time()+365*24*3600) . " GMT" ;
++      $header .= "Set-Cookie: " . $key . "=" . $val . ";path=/; expires=" . $exptime . ";\r\n";
      }
      print "Header: $header\n";