Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

diff --git a/config/rootfiles/core/48/filelists/perl-GD b/config/rootfiles/core/48/filelists/perl-GD
new file mode 120000 (symlink)
index 0000000..962d937
--- /dev/null
+++ b/config/rootfiles/core/48/filelists/perl-GD
@@ -0,0 +1 @@
+../../../common/perl-GD
\ No newline at end of file

diff --git a/config/rootfiles/core/49/exclude b/config/rootfiles/core/49/exclude
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files
new file mode 100644 (file)
index 0000000..0037af1
--- /dev/null
+++ b/config/rootfiles/core/49/filelists/files
@@ -0,0 +1 @@
+etc/system-release

diff --git a/config/rootfiles/core/49/filelists/perl-GD b/config/rootfiles/core/49/filelists/perl-GD
new file mode 120000 (symlink)
index 0000000..962d937
--- /dev/null
+++ b/config/rootfiles/core/49/filelists/perl-GD
@@ -0,0 +1 @@
+../../../common/perl-GD
\ No newline at end of file

diff --git a/config/rootfiles/core/49/meta b/config/rootfiles/core/49/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/49/meta
@@ -0,0 +1 @@
+DEPS=""

diff --git a/config/rootfiles/core/49/update.sh b/config/rootfiles/core/49/update.sh
new file mode 100644 (file)
index 0000000..7c2a8bf
--- /dev/null
+++ b/config/rootfiles/core/49/update.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 3 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2011 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+# Remove old core updates from pakfire cache to save space...
+core=49
+for (( i=1; i<=$core; i++ ))
+do
+       rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+#Stop services
+
+#
+#Extract files
+extract_files
+
+#
+#Start services
+
+#
+#Update Language cache
+#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#Rebuild module dep's
+#depmod 2.6.32.28-ipfire     >/dev/null 2>&1
+#depmod 2.6.32.28-ipfire-pae >/dev/null 2>&1
+#depmod 2.6.32.28-ipfire-xen >/dev/null 2>&1
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0

diff --git a/make.sh b/make.sh
index a05cfbcc2980423c6a979d89e2375f3d34e96594..f572b9304a7bcdc781d1e65607d1e348a8e8656a 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.9"                                                  # Version number
-CORE="48"                                                      # Core Level (Filename)
+CORE="49"                                                      # Core Level (Filename)
 PAKFIRE_CORE="48"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan

diff --git a/src/paks/gnump3d/install.sh b/src/paks/gnump3d/install.sh
index 13c7e8a857e1a7397907995be34cadea01ba7596..1e0f3cb651c379ede8803a149245501eb5ea6c94 100644 (file)
--- a/src/paks/gnump3d/install.sh
+++ b/src/paks/gnump3d/install.sh
@@ -24,7 +24,7 @@
 . /opt/pakfire/lib/functions.sh
 extract_files
 [ -d /var/mp3 ] ||  ( mkdir /var/mp3 && chown nobody.nobody /var/mp3 )
-gnump3d-index &
+/usr/bin/gnump3d-index &
 start_service ${NAME}
 ln -svf  ../init.d/gnump3d /etc/rc.d/rc0.d/K00gnump3d
 ln -svf  ../init.d/gnump3d /etc/rc.d/rc3.d/S99gnump3d