Merge branch 'core48'

diff --git a/config/gnump3d/gnump3d.conf b/config/gnump3d/gnump3d.conf
index 079874e0454ead5a8036a9abec7caebcb4c90603..e6a6e445f458b43637905ab63b83e29f27db685c 100644 (file)
--- a/config/gnump3d/gnump3d.conf
+++ b/config/gnump3d/gnump3d.conf
@@ -731,7 +731,7 @@ sort_order = $TRACK
 # the installation script - if this doesn't happen report this as
 # a bug.
 #
-plugin_directory = /usr/lib/perl5/5.8.8/gnump3d/plugins
+plugin_directory = /usr/lib/perl5/5.12.3/gnump3d/plugins
 #
 
 

diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder
index 4e21567effbf8545b5f42e3fac41cde8c9cb7384..866d173c6f782fecb71c6fde6562deee259c014a 100644 (file)
--- a/config/rootfiles/packages/ipfireseeder
+++ b/config/rootfiles/packages/ipfireseeder
@@ -1,5 +1,5 @@
 etc/rc.d/init.d/ipfireseeder
 #var/ipfire/seeder
-var/ipfire/seeder/ipfire-2.9.i586-full-core47.iso.torrent
+var/ipfire/seeder/ipfire-2.9.i586-full-core48.iso.torrent
 #var/log/seeder
 var/log/seeder/info

diff --git a/config/rootfiles/packages/nano b/config/rootfiles/packages/nano
index 8a2f616249cea5375a605c1687a6d661f7869c79..815c3fac7fda262866a2da40e3be8416881160d4 100644 (file)
--- a/config/rootfiles/packages/nano
+++ b/config/rootfiles/packages/nano
@@ -9,17 +9,34 @@ usr/bin/rnano
 #usr/share/man/man5/nanorc.5
 #usr/share/nano
 usr/share/nano/asm.nanorc
+usr/share/nano/awk.nanorc
 usr/share/nano/c.nanorc
+usr/share/nano/cmake.nanorc
+usr/share/nano/css.nanorc
+usr/share/nano/debian.nanorc
+usr/share/nano/fortran.nanorc
+usr/share/nano/gentoo.nanorc
 usr/share/nano/groff.nanorc
 usr/share/nano/html.nanorc
 usr/share/nano/java.nanorc
+usr/share/nano/makefile.nanorc
+#usr/share/nano/man-html
+#usr/share/nano/man-html/nano.1.html
+#usr/share/nano/man-html/nanorc.5.html
+#usr/share/nano/man-html/rnano.1.html
 usr/share/nano/man.nanorc
+usr/share/nano/mgp.nanorc
 usr/share/nano/mutt.nanorc
 usr/share/nano/nanorc.nanorc
+usr/share/nano/objc.nanorc
+usr/share/nano/ocaml.nanorc
 usr/share/nano/patch.nanorc
 usr/share/nano/perl.nanorc
+usr/share/nano/php.nanorc
 usr/share/nano/pov.nanorc
 usr/share/nano/python.nanorc
 usr/share/nano/ruby.nanorc
 usr/share/nano/sh.nanorc
+usr/share/nano/tcl.nanorc
 usr/share/nano/tex.nanorc
+usr/share/nano/xml.nanorc

diff --git a/lfs/gnump3d b/lfs/gnump3d
index e59753b98c6e04c9dbc48474ef0b4377bb9016c7..ca14c27e93d62fbfdf29e60d4ac466b028d58aca 100644 (file)
--- 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    = 4
+PAK_VER    = 5
 
 DEPS       = ""
 

diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder
index 4bdbc481f04716ad91f62f2b6b891f18740fbdc4..2292c3ee2c828e465cd671563cfb55e8abb29396 100644 (file)
--- a/lfs/ipfireseeder
+++ b/lfs/ipfireseeder
@@ -27,13 +27,13 @@ include Config
 VER        = 1.00
 
 THISAPP    = ipfireseeder-$(VER)
-DL_FILE    = ipfire-2.9.i586-full-core47.iso.torrent
+DL_FILE    = ipfire-2.9.i586-full-core48.iso.torrent
 
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ipfireseeder
-PAK_VER    = 23
+PAK_VER    = 24
 
 DEPS       = "rtorrent"
 
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 388d32a2f741df4afa76578948804ae3
+$(DL_FILE)_MD5 = 37dd855f48af4efae045eb9b1f971a6e
 
 install : $(TARGET)
 

diff --git a/lfs/nano b/lfs/nano
index 1bd26a3206561efc8dea87b4371c739d9fd9438c..b0346770fa07e203ab29d43105a58aac79161b21 100644 (file)
--- a/lfs/nano
+++ b/lfs/nano
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.0.9
+VER        = 2.2.6
 
 THISAPP    = nano-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nano
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2be94dc43fb60fff4626a2401a977220
+$(DL_FILE)_MD5 = 03233ae480689a008eb98feb1b599807
 
 install : $(TARGET)
 

diff --git a/lfs/nmap b/lfs/nmap
index f746b21c50f96a422ad266d16bc6d5f04c09a121..5ff3221ab55052bb892f60cd67222948fdfb2796 100644 (file)
--- a/lfs/nmap
+++ b/lfs/nmap
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.50
+VER        = 5.51
 
 THISAPP    = nmap-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nmap
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a4df96e52cb52a1bbe76caace5f21388
+$(DL_FILE)_MD5 = 0b80d2cb92ace5ebba8095a4c2850275
 
 install : $(TARGET)
 

diff --git a/lfs/vsftpd b/lfs/vsftpd
index d5e809399e185525202c7400110b8798a2089b1d..f3e74a00e1ac37e0e8b1f0656e107dd7d106b71a 100644 (file)
--- a/lfs/vsftpd
+++ b/lfs/vsftpd
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.2.2
+VER        = 2.3.4
 
 THISAPP    = vsftpd-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vsftpd
-PAK_VER    = 6
+PAK_VER    = 7
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6d6bc136af14c23f8fef6f1a51f55418
+$(DL_FILE)_MD5 = 2ea5d19978710527bb7444d93b67767a
 
 install : $(TARGET)
 

diff --git a/src/paks/gnump3d/install.sh b/src/paks/gnump3d/install.sh
index 745dfb7e20d27e28ef2af33e7b5f218cf66aae45..1e0f3cb651c379ede8803a149245501eb5ea6c94 100644 (file)
--- a/src/paks/gnump3d/install.sh
+++ b/src/paks/gnump3d/install.sh
@@ -24,6 +24,7 @@
 . /opt/pakfire/lib/functions.sh
 extract_files
 [ -d /var/mp3 ] ||  ( mkdir /var/mp3 && chown nobody.nobody /var/mp3 )
+/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