mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-09 18:45:54 +02:00
Not every process has to wait 60 seconds to start.
We need to load the idn module into php. Some packages are not compiled any more. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@1007 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
1336
config/php/php.ini
Normal file
1336
config/php/php.ini
Normal file
File diff suppressed because it is too large
Load Diff
@@ -483,7 +483,7 @@ usr/lib/php/System.php
|
||||
#usr/lib/php/extensions
|
||||
#usr/lib/php/extensions/no-debug-non-zts-20060613
|
||||
#usr/lib/php/extensions/no-debug-non-zts-20060613/dba.so
|
||||
#usr/lib/php/extensions/no-debug-non-zts-20060613/idn.so
|
||||
usr/lib/php/extensions/no-debug-non-zts-20060613/idn.so
|
||||
#usr/lib/php/pearcmd.php
|
||||
#usr/lib/php/peclcmd.php
|
||||
#usr/lib/php/test
|
||||
|
||||
2
lfs/php
2
lfs/php
@@ -122,7 +122,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
--with-iconv
|
||||
cd $(DIR_APP) && make $(MAKETUNING)
|
||||
cd $(DIR_APP) && make install
|
||||
cd $(DIR_APP) && install -v -m644 php.ini-recommended /etc/php.ini
|
||||
cd $(DIR_APP) && install -v -m644 $(DIR_SRC)/config/php/php.ini /etc/php.ini
|
||||
-grep -v libphp5.so < /etc/httpd/conf/httpd.conf > /etc/httpd/conf/httpd.conf.bak
|
||||
mv -f /etc/httpd/conf/httpd.conf.bak /etc/httpd/conf/httpd.conf
|
||||
cd $(DIR_SRC) && tar xfz $(DIR_DL)/idn-0.1.tgz
|
||||
|
||||
10
make.sh
10
make.sh
@@ -490,13 +490,13 @@ buildipfire() {
|
||||
ipfiremake lame
|
||||
ipfiremake sox
|
||||
ipfiremake libshout
|
||||
ipfiremake icecast
|
||||
ipfiremake icegenerator
|
||||
#ipfiremake icecast
|
||||
#ipfiremake icegenerator
|
||||
ipfiremake mpd
|
||||
ipfiremake mpc
|
||||
ipfiremake xvid
|
||||
ipfiremake libmpeg2
|
||||
ipfiremake videolan
|
||||
#ipfiremake xvid
|
||||
#ipfiremake libmpeg2
|
||||
#ipfiremake videolan
|
||||
ipfiremake libpri
|
||||
ipfiremake asterisk
|
||||
ipfiremake gnump3d
|
||||
|
||||
@@ -1,178 +0,0 @@
|
||||
#!/bin/sh
|
||||
# IPsec startup and shutdown script
|
||||
# Copyright (C) 1998, 1999, 2001 Henry Spencer.
|
||||
# Copyright (C) 2002 Michael Richardson <mcr@freeswan.org>
|
||||
#
|
||||
# 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 the
|
||||
# Free Software Foundation; either version 2 of the License, or (at your
|
||||
# option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful, but
|
||||
# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# for more details.
|
||||
#
|
||||
# RCSID $Id: setup.in,v 1.122.6.3 2006/10/26 23:54:32 paul Exp $
|
||||
#
|
||||
# ipsec init.d script for starting and stopping
|
||||
# the IPsec security subsystem (KLIPS and Pluto).
|
||||
#
|
||||
# This script becomes /etc/rc.d/init.d/ipsec (or possibly /etc/init.d/ipsec)
|
||||
# and is also accessible as "ipsec setup" (the preferred route for human
|
||||
# invocation).
|
||||
#
|
||||
# The startup and shutdown times are a difficult compromise (in particular,
|
||||
# it is almost impossible to reconcile them with the insanely early/late
|
||||
# times of NFS filesystem startup/shutdown). Startup is after startup of
|
||||
# syslog and pcmcia support; shutdown is just before shutdown of syslog.
|
||||
#
|
||||
# chkconfig: 2345 47 76
|
||||
# description: IPsec provides encrypted and authenticated communications; \
|
||||
# KLIPS is the kernel half of it, Pluto is the user-level management daemon.
|
||||
|
||||
me='ipsec setup' # for messages
|
||||
|
||||
# where the private directory and the config files are
|
||||
IPSEC_EXECDIR="${IPSEC_EXECDIR-/usr/libexec/ipsec}"
|
||||
IPSEC_LIBDIR="${IPSEC_LIBDIR-/usr/lib/ipsec}"
|
||||
IPSEC_SBINDIR="${IPSEC_SBINDIR-/usr/sbin}"
|
||||
IPSEC_CONFS="${IPSEC_CONFS-/etc}"
|
||||
|
||||
if test " $IPSEC_DIR" = " " # if we were not called by the ipsec command
|
||||
then
|
||||
# we must establish a suitable PATH ourselves
|
||||
PATH="${IPSEC_SBINDIR}":/sbin:/usr/sbin:/usr/local/bin:/bin:/usr/bin
|
||||
export PATH
|
||||
|
||||
IPSEC_DIR="$IPSEC_LIBDIR"
|
||||
export IPSEC_DIR IPSEC_CONFS IPSEC_LIBDIR IPSEC_EXECDIR
|
||||
fi
|
||||
|
||||
# Check that the ipsec command is available.
|
||||
found=
|
||||
for dir in `echo $PATH | tr ':' ' '`
|
||||
do
|
||||
if test -f $dir/ipsec -a -x $dir/ipsec
|
||||
then
|
||||
found=yes
|
||||
break # NOTE BREAK OUT
|
||||
fi
|
||||
done
|
||||
if ! test "$found"
|
||||
then
|
||||
echo "cannot find ipsec command -- \`$1' aborted" |
|
||||
logger -s -p daemon.error -t ipsec_setup
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# accept a few flags
|
||||
|
||||
export IPSEC_setupflags
|
||||
IPSEC_setupflags=""
|
||||
|
||||
config=""
|
||||
|
||||
for dummy
|
||||
do
|
||||
case "$1" in
|
||||
--showonly|--show) IPSEC_setupflags="$1" ;;
|
||||
--config) config="--config $2" ; shift ;;
|
||||
*) break ;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
|
||||
# Pick up IPsec configuration (until we have done this, successfully, we
|
||||
# do not know where errors should go, hence the explicit "daemon.error"s.)
|
||||
# Note the "--export", which exports the variables created.
|
||||
eval `ipsec _confread $config --optional --varprefix IPSEC --export --type config setup`
|
||||
|
||||
if test " $IPSEC_confreadstatus" != " "
|
||||
then
|
||||
case $1 in
|
||||
stop|--stop|_autostop)
|
||||
echo "$IPSEC_confreadstatus -- \`$1' may not work" |
|
||||
logger -s -p daemon.error -t ipsec_setup;;
|
||||
|
||||
*) echo "$IPSEC_confreadstatus -- \`$1' aborted" |
|
||||
logger -s -p daemon.error -t ipsec_setup;
|
||||
exit 1;;
|
||||
esac
|
||||
fi
|
||||
|
||||
IPSEC_confreadsection=${IPSEC_confreadsection:-setup}
|
||||
export IPSEC_confreadsection
|
||||
|
||||
IPSECsyslog=${IPSECsyslog-daemon.error}
|
||||
export IPSECsyslog
|
||||
|
||||
# misc setup
|
||||
umask 022
|
||||
|
||||
mkdir -p /var/run/pluto
|
||||
|
||||
|
||||
# do it
|
||||
case "$1" in
|
||||
start|--start|stop|--stop|_autostop|_autostart)
|
||||
if test " `id -u`" != " 0"
|
||||
then
|
||||
echo "permission denied (must be superuser)" |
|
||||
logger -s -p $IPSECsyslog -t ipsec_setup 2>&1
|
||||
exit 1
|
||||
fi
|
||||
tmp=/var/run/pluto/ipsec_setup.st
|
||||
outtmp=/var/run/pluto/ipsec_setup.out
|
||||
(
|
||||
ipsec _realsetup $1
|
||||
echo "$?" >$tmp
|
||||
) > ${outtmp} 2>&1
|
||||
st=$?
|
||||
if test -f $tmp
|
||||
then
|
||||
st=`cat $tmp`
|
||||
rm -f $tmp
|
||||
fi
|
||||
if [ -f ${outtmp} ]; then
|
||||
cat ${outtmp} | logger -s -p $IPSECsyslog -t ipsec_setup 2>&1
|
||||
rm -f ${outtmp}
|
||||
fi
|
||||
sleep 20 && chown root:nobody /var/run/pluto -R && chmod 770 /var/run/pluto -R && ln -sf /var/run/pluto/pluto.pid /var/run/pluto.pid 2>&1 &
|
||||
exit $st
|
||||
;;
|
||||
|
||||
restart|--restart|force-reload)
|
||||
$0 $IPSEC_setupflags stop
|
||||
$0 $IPSEC_setupflags start
|
||||
;;
|
||||
|
||||
_autorestart) # for internal use only
|
||||
$0 $IPSEC_setupflags _autostop
|
||||
$0 $IPSEC_setupflags _autostart
|
||||
;;
|
||||
|
||||
status|--status)
|
||||
ipsec _realsetup $1
|
||||
exit
|
||||
;;
|
||||
|
||||
--version)
|
||||
echo "$me $IPSEC_VERSION"
|
||||
exit 0
|
||||
;;
|
||||
|
||||
--help)
|
||||
echo "Usage: $me [ --showonly ] {--start|--stop|--restart}"
|
||||
echo " $me --status"
|
||||
exit 0
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "Usage: $me [ --showonly ] {--start|--stop|--restart}"
|
||||
echo " $me --status"
|
||||
exit 2
|
||||
esac
|
||||
|
||||
exit 0
|
||||
@@ -37,18 +37,18 @@ remove_files() {
|
||||
}
|
||||
|
||||
make_backup() {
|
||||
if [ -e "/var/ipfire/backup/addons/includes/${1}" ];then
|
||||
echo "Creating Backup..."
|
||||
/usr/local/bin/backupctrl addonbackup ${1}
|
||||
echo "...Finished."
|
||||
if [ -e "/var/ipfire/backup/addons/includes/${1}" ]; then
|
||||
echo "Creating Backup..."
|
||||
/usr/local/bin/backupctrl addonbackup ${1}
|
||||
echo "...Finished."
|
||||
fi
|
||||
}
|
||||
|
||||
restore_backup() {
|
||||
if [ -e "/var/ipfire/backup/addons/backup/${1}.ipf" ];then
|
||||
echo "Restoring Backup..."
|
||||
/usr/local/bin/backupctrl restoreaddon ${1}.ipf
|
||||
echo "...Finished."
|
||||
if [ -e "/var/ipfire/backup/addons/backup/${1}.ipf" ]; then
|
||||
echo "Restoring Backup..."
|
||||
/usr/local/bin/backupctrl restoreaddon ${1}.ipf
|
||||
echo "...Finished."
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -79,14 +79,14 @@ start_service() {
|
||||
esac
|
||||
done
|
||||
|
||||
if [ -e "/etc/init.d/${1}" ];then
|
||||
sleep ${DELAY}
|
||||
/etc/init.d/${1} start ${BACKGROUND}
|
||||
fi
|
||||
if [ -e "/etc/init.d/${1}" ]; then
|
||||
sleep ${DELAY}
|
||||
/etc/init.d/${1} start ${BACKGROUND}
|
||||
fi
|
||||
}
|
||||
|
||||
stop_service() {
|
||||
if [ -e "/etc/init.d/${1}" ];then
|
||||
/etc/init.d/${1} stop
|
||||
if [ -e "/etc/init.d/${1}" ]; then
|
||||
/etc/init.d/${1} stop
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -4,4 +4,4 @@
|
||||
extract_files
|
||||
restore_backup ${NAME}
|
||||
|
||||
start_service --delay 60 --background ${NAME}
|
||||
start_service --background ${NAME}
|
||||
|
||||
Reference in New Issue
Block a user