Merge branch 'core104' into next

config/rootfiles/core/104/update.sh

@@ -139,11 +139,6 @@ esac
 # Extract files
 tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /
 
-# Update customservices
-cp /var/ipfire/fwhosts/customservices /var/ipfire/fwhosts/customservices.old
-echo 35,Submission (TCP),587,TCP,BLANK,0 >> /var/ipfire/fwhosts/customservices
-echo 36,SSMTP,465,TCP,BLANK,0 >> /var/ipfire/fwhosts/customservices
-
 # Remove some old files
 rm -f /bin/groups /lib/libshadow.so.0*
 

lfs/clamav

@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
-PAK_VER    = 33
+PAK_VER    = 34
 
 DEPS       = ""
 

lfs/hostapd

@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hostapd
-PAK_VER    = 36
+PAK_VER    = 37
 
 DEPS       = ""
 

lfs/mc

@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mc
-PAK_VER    = 12
+PAK_VER    = 13
 
 DEPS       = ""
 

lfs/nfs

@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nfs
-PAK_VER    = 8
+PAK_VER    = 9
 
 DEPS       = "rpcbind"
 

lfs/rpcbind

@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = rpcbind
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = "libtirpc"
 

make.sh

@@ -26,7 +26,7 @@ NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.19"							# Version number
 CORE="104"							# Core Level (Filename)
-PAKFIRE_CORE="103"						# Core Level (PAKFIRE)
+PAKFIRE_CORE="104"						# Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`			# Git Branch
 SLOGAN="www.ipfire.org"						# Software slogan
 CONFIG_ROOT=/var/ipfire						# Configuration rootdir