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

Merge commit 'origin/core43'

Browse Source 
Conflicts:
	lfs/openssl
	make.sh
This commit is contained in:
Arne Fitzenreiter
2010-12-03 18:56:37 +01:00
parent 473725f5b0 20651e22d4
commit 51cac9a1ce
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/rootfiles/oldcore/42/exclude
View File

@@ -0,0 +1,3 @@
etc/ssh/ssh_config
etc/ssh/sshd_config
etc/ssl/openssl.cnf

4
lfs/openssl
View File

@@ -24,7 +24,7 @@
include Config
VER = 0.9.8p
VER = 0.9.8q
THISAPP = openssl-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 7f24047f70364c9eabc94899e356ce39
$(DL_FILE)_MD5 = 80e67291bec9230f03eefb5cfe858998
install : $(TARGET)

4
make.sh
View File

@@ -25,8 +25,8 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.8test" # Version number
CORE="43" # Core Level (Filename)
PAKFIRE_CORE="42" # Core Level (PAKFIRE)
CORE="44" # Core Level (Filename)
PAKFIRE_CORE="43" # Core Level (PAKFIRE)
GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir