webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 19:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'core104' into next

Browse Source
This commit is contained in:
Arne Fitzenreiter
2016-08-17 19:51:01 +02:00
parent 6bc2225a5d 40607f8126
commit d1d60e001a
7 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/rootfiles/core/104/update.sh
View File

@@ -139,11 +139,6 @@ esac
# Extract files # Extract files
tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / 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 # Remove some old files
rm -f /bin/groups /lib/libshadow.so.0* rm -f /bin/groups /lib/libshadow.so.0*

2
lfs/clamav
View File

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

2
lfs/hostapd
View File

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

2
lfs/mc
View File

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

2
lfs/nfs
View File

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

2
lfs/rpcbind
View File

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

2
make.sh
View File

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