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

Merge branch 'master' into next

Browse Source
This commit is contained in:
Arne Fitzenreiter
2012-01-05 14:59:54 +01:00
parent f4afa6ddf7 9ad2f534d9
commit dc29e3d019
6 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/55/filelists/openssh Symbolic link
View File

@@ -0,0 +1 @@
../../../common/openssh

1
config/rootfiles/core/55/filelists/openssl Symbolic link
View File

@@ -0,0 +1 @@
../../../common/openssl

10
config/rootfiles/core/55/update.sh
View File

@@ -17,7 +17,7 @@
# along with IPFire; if not, write to the Free Software # # along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# # # #
# Copyright (C) 2011 IPFire-Team <info@ipfire.org>. # # Copyright (C) 2012 IPFire-Team <info@ipfire.org>. #
# # # #
############################################################################ ############################################################################
# #
@@ -34,7 +34,8 @@ done
# #
#Stop services #Stop services
/etc/init.d/sshd stop
/etc/init.d/apache stop
# #
#Extract files #Extract files
@@ -42,6 +43,8 @@ extract_files
# #
#Start services #Start services
/etc/init.d/apache start
/etc/init.d/sshd start
# #
@@ -64,6 +67,9 @@ extract_files
sync sync
# This update need a reboot...
touch /var/run/need_reboot
# #
#Finish #Finish
/etc/init.d/fireinfo start /etc/init.d/fireinfo start

6
lfs/openssh
View File

@@ -1,7 +1,7 @@
############################################################################### ###############################################################################
# # # #
# IPFire.org - A linux based firewall # # IPFire.org - A linux based firewall #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> # # Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> #
# # # #
# This program is free software: you can redistribute it and/or modify # # This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by # # it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config include Config
VER = 5.8p1 VER = 5.9p1
THISAPP = openssh-$(VER) THISAPP = openssh-$(VER)
DL_FILE = $(THISAPP).tar.gz DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 86f5e1c23b4c4845f23b9b7b493fb53d $(DL_FILE)_MD5 = afe17eee7e98d3b8550cc349834a85d0
install : $(TARGET) install : $(TARGET)

6
lfs/openssl
View File

@@ -1,7 +1,7 @@
############################################################################### ###############################################################################
# # # #
# IPFire.org - A linux based firewall # # IPFire.org - A linux based firewall #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> # # Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> #
# # # #
# This program is free software: you can redistribute it and/or modify # # This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by # # it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config include Config
VER = 0.9.8r VER = 0.9.8s
THISAPP = openssl-$(VER) THISAPP = openssl-$(VER)
DL_FILE = $(THISAPP).tar.gz DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 0352932ea863bc02b056cda7c9ac5b79 $(DL_FILE)_MD5 = fbf71e8e050bc1ec290b7468bab1a76e
install : $(TARGET) install : $(TARGET)

5
make.sh
View File

@@ -17,7 +17,7 @@
# along with IPFire; if not, write to the Free Software # # along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# # # #
# Copyright (C) 2007-2011 IPFire-Team <info@ipfire.org>. # # Copyright (C) 2007-2012 IPFire Team <info@ipfire.org>. #
# # # #
############################################################################ ############################################################################
# #
@@ -26,7 +26,7 @@ NAME="IPFire" # Software name
SNAME="ipfire" # Short name SNAME="ipfire" # Short name
VERSION="2.11" # Version number VERSION="2.11" # Version number
CORE="55" # Core Level (Filename) CORE="55" # Core Level (Filename)
PAKFIRE_CORE="54" # Core Level (PAKFIRE) PAKFIRE_CORE="55" # Core Level (PAKFIRE)
GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # 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
@@ -1002,6 +1002,7 @@ downloadsrc)
ERROR=0 ERROR=0
for i in *; do for i in *; do
if [ -f "$i" -a "$i" != "Config" ]; then if [ -f "$i" -a "$i" != "Config" ]; then
lfsmakecommoncheck ${i} > /dev/null || continue
make -s -f $i LFS_BASEDIR=$BASEDIR MACHINE=$MACHINE \ make -s -f $i LFS_BASEDIR=$BASEDIR MACHINE=$MACHINE \
MESSAGE="$i\t " md5 >> $LOGFILE 2>&1 MESSAGE="$i\t " md5 >> $LOGFILE 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then