mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-19 07:23:03 +02:00
Merge remote-tracking branch 'origin/next' into kernel-update
This commit is contained in:
Arne Fitzenreiter
@@ -34,12 +34,16 @@ done
|
||||
|
||||
#
|
||||
#Stop services
|
||||
/etc/init.d/ipsec stop
|
||||
/etc/init.d/sshd stop
|
||||
|
||||
#
|
||||
#Extract files
|
||||
extract_files
|
||||
|
||||
#
|
||||
#Start services
|
||||
/etc/init.d/sshd start
|
||||
if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
|
||||
/etc/init.d/ipsec start
|
||||
fi
|
||||
|
||||
12
config/rootfiles/core/60/exclude
Normal file
12
config/rootfiles/core/60/exclude
Normal file
@@ -0,0 +1,12 @@
|
||||
srv/web/ipfire/html/proxy.pac
|
||||
etc/udev/rules.d/30-persistent-network.rules
|
||||
etc/ipsec.conf
|
||||
etc/ipsec.secrets
|
||||
etc/ipsec.user.conf
|
||||
etc/ipsec.user.secrets
|
||||
var/updatecache
|
||||
etc/localtime
|
||||
var/ipfire/ovpn
|
||||
etc/ssh/ssh_config
|
||||
etc/ssh/sshd_config
|
||||
etc/ssl/openssl.cnf
|
||||
2
config/rootfiles/core/60/filelists/files
Normal file
2
config/rootfiles/core/60/filelists/files
Normal file
@@ -0,0 +1,2 @@
|
||||
etc/system-release
|
||||
etc/issue
|
||||
1
config/rootfiles/core/60/filelists/strongswan
Symbolic link
1
config/rootfiles/core/60/filelists/strongswan
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/strongswan
|
||||
1
config/rootfiles/core/60/meta
Normal file
1
config/rootfiles/core/60/meta
Normal file
@@ -0,0 +1 @@
|
||||
DEPS=""
|
||||
83
config/rootfiles/core/60/update.sh
Normal file
83
config/rootfiles/core/60/update.sh
Normal file
@@ -0,0 +1,83 @@
|
||||
#!/bin/bash
|
||||
############################################################################
|
||||
# #
|
||||
# This file is part of the IPFire Firewall. #
|
||||
# #
|
||||
# IPFire 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 3 of the License, or #
|
||||
# (at your option) any later version. #
|
||||
# #
|
||||
# IPFire 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. #
|
||||
# #
|
||||
# You should have received a copy of the GNU General Public License #
|
||||
# along with IPFire; if not, write to the Free Software #
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
||||
# #
|
||||
# Copyright (C) 2012 IPFire-Team <info@ipfire.org>. #
|
||||
# #
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
|
||||
|
||||
#
|
||||
# Remove old core updates from pakfire cache to save space...
|
||||
core=60
|
||||
for (( i=1; i<=$core; i++ ))
|
||||
do
|
||||
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
|
||||
done
|
||||
|
||||
#
|
||||
#Stop services
|
||||
/etc/init.d/ipsec stop
|
||||
|
||||
#
|
||||
#Extract files
|
||||
extract_files
|
||||
#
|
||||
#Start services
|
||||
if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
|
||||
/etc/init.d/ipsec start
|
||||
fi
|
||||
|
||||
#
|
||||
#Update Language cache
|
||||
#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
|
||||
|
||||
#Rebuild module dep's
|
||||
#arch=`uname -m`
|
||||
#if [ ${arch::3} == "arm" ]; then
|
||||
# depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1
|
||||
# depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1
|
||||
#else
|
||||
# depmod -a 2.6.32.45-ipfire >/dev/null 2>&1
|
||||
# depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1
|
||||
# depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1
|
||||
#fi
|
||||
|
||||
|
||||
#Rebuild initrd's because some compat-wireless modules are inside
|
||||
#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire
|
||||
#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then
|
||||
#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae
|
||||
#fi
|
||||
#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then
|
||||
#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen
|
||||
#fi
|
||||
|
||||
sync
|
||||
|
||||
# This update need a reboot...
|
||||
#touch /var/run/need_reboot
|
||||
|
||||
#
|
||||
#Finish
|
||||
/etc/init.d/fireinfo start
|
||||
sendprofile
|
||||
#Don't report the exitcode last command
|
||||
exit 0
|
||||
12
config/rootfiles/core/61/exclude
Normal file
12
config/rootfiles/core/61/exclude
Normal file
@@ -0,0 +1,12 @@
|
||||
srv/web/ipfire/html/proxy.pac
|
||||
etc/udev/rules.d/30-persistent-network.rules
|
||||
etc/ipsec.conf
|
||||
etc/ipsec.secrets
|
||||
etc/ipsec.user.conf
|
||||
etc/ipsec.user.secrets
|
||||
var/updatecache
|
||||
etc/localtime
|
||||
var/ipfire/ovpn
|
||||
etc/ssh/ssh_config
|
||||
etc/ssh/sshd_config
|
||||
etc/ssl/openssl.cnf
|
||||
1
config/rootfiles/core/61/filelists/GeoIP
Normal file
1
config/rootfiles/core/61/filelists/GeoIP
Normal file
@@ -0,0 +1 @@
|
||||
usr/local/share/GeoIP/GeoIP.dat
|
||||
1
config/rootfiles/core/61/filelists/Net-Telnet
Symbolic link
1
config/rootfiles/core/61/filelists/Net-Telnet
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/Net-Telnet
|
||||
7
config/rootfiles/core/61/filelists/files
Normal file
7
config/rootfiles/core/61/filelists/files
Normal file
@@ -0,0 +1,7 @@
|
||||
etc/system-release
|
||||
etc/issue
|
||||
etc/rc.d/init.d/collectd
|
||||
srv/web/ipfire/cgi-bin/index.cgi
|
||||
srv/web/ipfire/cgi-bin/ovpnmain.cgi
|
||||
var/ipfire/general-functions.pl
|
||||
var/ipfire/langs
|
||||
1
config/rootfiles/core/61/meta
Normal file
1
config/rootfiles/core/61/meta
Normal file
@@ -0,0 +1 @@
|
||||
DEPS=""
|
||||
80
config/rootfiles/core/61/update.sh
Normal file
80
config/rootfiles/core/61/update.sh
Normal file
@@ -0,0 +1,80 @@
|
||||
#!/bin/bash
|
||||
############################################################################
|
||||
# #
|
||||
# This file is part of the IPFire Firewall. #
|
||||
# #
|
||||
# IPFire 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 3 of the License, or #
|
||||
# (at your option) any later version. #
|
||||
# #
|
||||
# IPFire 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. #
|
||||
# #
|
||||
# You should have received a copy of the GNU General Public License #
|
||||
# along with IPFire; if not, write to the Free Software #
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
||||
# #
|
||||
# Copyright (C) 2012 IPFire-Team <info@ipfire.org>. #
|
||||
# #
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
|
||||
|
||||
#
|
||||
# Remove old core updates from pakfire cache to save space...
|
||||
core=61
|
||||
for (( i=1; i<=$core; i++ ))
|
||||
do
|
||||
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
|
||||
done
|
||||
|
||||
#
|
||||
#Stop services
|
||||
|
||||
#
|
||||
#Extract files
|
||||
extract_files
|
||||
|
||||
#
|
||||
#Start services
|
||||
|
||||
#
|
||||
#Update Language cache
|
||||
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
|
||||
|
||||
#Rebuild module dep's
|
||||
#arch=`uname -m`
|
||||
#if [ ${arch::3} == "arm" ]; then
|
||||
# depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1
|
||||
# depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1
|
||||
#else
|
||||
# depmod -a 2.6.32.45-ipfire >/dev/null 2>&1
|
||||
# depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1
|
||||
# depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1
|
||||
#fi
|
||||
|
||||
|
||||
#Rebuild initrd's because some compat-wireless modules are inside
|
||||
#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire
|
||||
#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then
|
||||
#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae
|
||||
#fi
|
||||
#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then
|
||||
#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen
|
||||
#fi
|
||||
|
||||
sync
|
||||
|
||||
# This update need a reboot...
|
||||
#touch /var/run/need_reboot
|
||||
|
||||
#
|
||||
#Finish
|
||||
/etc/init.d/fireinfo start
|
||||
sendprofile
|
||||
#Don't report the exitcode last command
|
||||
exit 0
|
||||
2
config/rootfiles/packages/mtr
Normal file
2
config/rootfiles/packages/mtr
Normal file
@@ -0,0 +1,2 @@
|
||||
usr/sbin/mtr
|
||||
#usr/share/man/man8/mtr.8
|
||||
3
config/rootfiles/packages/tcpick
Normal file
3
config/rootfiles/packages/tcpick
Normal file
@@ -0,0 +1,3 @@
|
||||
usr/bin/tcpick
|
||||
#usr/man/man8/tcpick.8
|
||||
#usr/man/man8/tcpick_italian.8
|
||||
@@ -421,7 +421,7 @@ if ($confighash{$dkey}[3] eq 'net') {
|
||||
$display = "<font color=$Header::colourred>$tustate[1]</font>"; }
|
||||
|
||||
print <<END;
|
||||
<tr><td align='center' bgcolor='$Header::colourvpn' width='25%'><a href="/cgi-bin/ovpnmain.cgi"><font size='2' color='white'><b>OpenVPN n2n</b></font></a><br>
|
||||
<tr><td align='center' bgcolor='$Header::colourovpn' width='25%'><a href="/cgi-bin/ovpnmain.cgi"><font size='2' color='white'><b>OpenVPN n2n</b></font></a><br>
|
||||
<td width='30%' align='center'> $confighash{$dkey}[10]<td width='45%' align='center'> $display
|
||||
|
||||
END
|
||||
|
||||
@@ -572,6 +572,10 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) {
|
||||
}
|
||||
&write_routepushfile;
|
||||
undef $vpnsettings{'ROUTES_PUSH'};
|
||||
}
|
||||
else {
|
||||
undef $vpnsettings{'ROUTES_PUSH'};
|
||||
&write_routepushfile;
|
||||
}
|
||||
if ((length($cgiparams{'MAX_CLIENTS'}) == 0) || (($cgiparams{'MAX_CLIENTS'}) < 1 ) || (($cgiparams{'MAX_CLIENTS'}) > 255 )) {
|
||||
$errormessage = $Lang::tr{'invalid input for max clients'};
|
||||
|
||||
@@ -1368,7 +1368,7 @@
|
||||
'ovpnstatus log' => 'OVPN-Status-Log',
|
||||
'ovpnsys log' => 'OVPN-System-Log',
|
||||
'ovpn routes push options' => 'Route push Optionen',
|
||||
'ovpn routes push' => 'Routen',
|
||||
'ovpn routes push' => 'Routen (eine pro Zeile)',
|
||||
'ovpn errmsg invalid ip or mask' => 'Ungültige Netzwerk-Adresse oder Subnetzmaske',
|
||||
'ovpn errmsg green already pushed' => 'Route für grünes Netzwerk wird immer gesetzt',
|
||||
'package failed to install' => 'Programmpaket konnte nicht installiert werden.',
|
||||
|
||||
@@ -1395,6 +1395,10 @@
|
||||
'ovpn_processprioVH' => 'Very high',
|
||||
'ovpnstatus log' => 'OVPN-Status-Log',
|
||||
'ovpnsys log' => 'OVPN-System-Log',
|
||||
'ovpn routes push options' => 'Route push options',
|
||||
'ovpn routes push' => 'Routes (one per line):',
|
||||
'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask',
|
||||
'ovpn errmsg green already pushed' => 'Route for green network is always set',
|
||||
'package failed to install' => 'Package failed to install.',
|
||||
'pagerefresh' => 'Page is beeing refreshed, please wait.',
|
||||
'pakfire accept all' => 'Do you want to install all packages?',
|
||||
|
||||
@@ -1352,6 +1352,10 @@
|
||||
'ovpn_processprioVH' => 'Muy alto',
|
||||
'ovpnstatus log' => 'OVPN-Status-Log',
|
||||
'ovpnsys log' => 'OVPN-System-Log',
|
||||
'ovpn routes push options' => 'Route push options',
|
||||
'ovpn routes push' => 'Routes (one per line):',
|
||||
'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask',
|
||||
'ovpn errmsg green already pushed' => 'Route for green network is always set',
|
||||
'package failed to install' => 'Falló la instalación del paquete',
|
||||
'pagerefresh' => 'La página se está actualiszando, por favor espere.',
|
||||
'pakfire accept all' => '¿Desea instalar todos los paquetes?',
|
||||
|
||||
@@ -1364,6 +1364,10 @@
|
||||
'ovpn_processprioVH' => 'Très haute',
|
||||
'ovpnstatus log' => 'Journal statut OVPN',
|
||||
'ovpnsys log' => 'Journal système OVPN',
|
||||
'ovpn routes push options' => 'Options de Route push',
|
||||
'ovpn routes push' => 'Routes (une par ligne):',
|
||||
'ovpn errmsg invalid ip or mask' => 'Adresse ou masque de sous-r?seau invalide',
|
||||
'ovpn errmsg green already pushed' => 'La route pour le r?seau green est toujours activ?e',
|
||||
'package failed to install' => 'L\'installation du paquet a échoué.',
|
||||
'pagerefresh' => 'La page est entrain d\'être rafraichie, veuillez attendre.',
|
||||
'pakfire accept all' => 'Voulez-vous installer tout les paquets?',
|
||||
|
||||
@@ -1375,6 +1375,10 @@
|
||||
'ovpn_processprioVH' => 'Bardzo wysoki',
|
||||
'ovpnstatus log' => 'OVPN-Status-Log',
|
||||
'ovpnsys log' => 'OVPN-System-Log',
|
||||
'ovpn routes push options' => 'Route push options',
|
||||
'ovpn routes push' => 'Routes (one per line):',
|
||||
'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask',
|
||||
'ovpn errmsg green already pushed' => 'Route for green network is always set',
|
||||
'package failed to install' => 'Błąd instalacji pakietu.',
|
||||
'pagerefresh' => 'Strona jest odświeżana, proszę czekać.',
|
||||
'pakfire accept all' => 'Czy chcesz zainstalować wszystkie pakiety?',
|
||||
|
||||
@@ -1366,6 +1366,10 @@
|
||||
'ovpn_processprioVH' => 'Very high',
|
||||
'ovpnstatus log' => 'OVPN-Status-Log',
|
||||
'ovpnsys log' => 'OVPN-System-Log',
|
||||
'ovpn routes push options' => 'Настройки маршрутизации',
|
||||
'ovpn routes push' => 'Маршрутизаторы (по одному на строчку)',
|
||||
'ovpn errmsg invalid ip or mask' => 'Неправильный адрес или маска подсти',
|
||||
'ovpn errmsg green already pushed' => 'Маршрут для зелёной сети всегда включён',
|
||||
'package failed to install' => 'Package failed to install.',
|
||||
'pagerefresh' => 'Page is beeing refreshed, please wait.',
|
||||
'pakfire accept all' => 'Do you want to install all packages?',
|
||||
|
||||
85
lfs/mtr
Normal file
85
lfs/mtr
Normal file
@@ -0,0 +1,85 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
|
||||
# #
|
||||
# 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 3 of the License, or #
|
||||
# (at your option) any later version. #
|
||||
# #
|
||||
# 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. #
|
||||
# #
|
||||
# You should have received a copy of the GNU General Public License #
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
|
||||
# #
|
||||
###############################################################################
|
||||
|
||||
###############################################################################
|
||||
# Definitions
|
||||
###############################################################################
|
||||
|
||||
include Config
|
||||
|
||||
VER = 0.82
|
||||
|
||||
THISAPP = mtr-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.gz
|
||||
DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
PROG = mtr
|
||||
PAK_VER = 1
|
||||
|
||||
DEPS = ""
|
||||
|
||||
###############################################################################
|
||||
# Top-level Rules
|
||||
###############################################################################
|
||||
|
||||
objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 10601ea543fda3e51545c4bce195b64c
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
|
||||
|
||||
download :$(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
|
||||
md5 : $(subst %,%_MD5,$(objects))
|
||||
|
||||
dist:
|
||||
@$(PAK)
|
||||
|
||||
###############################################################################
|
||||
# Downloading, checking, md5sum
|
||||
###############################################################################
|
||||
|
||||
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
|
||||
@$(CHECK)
|
||||
|
||||
$(patsubst %,$(DIR_DL)/%,$(objects)) :
|
||||
@$(LOAD)
|
||||
|
||||
$(subst %,%_MD5,$(objects)) :
|
||||
@$(MD5)
|
||||
|
||||
###############################################################################
|
||||
# Installation Details
|
||||
###############################################################################
|
||||
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
|
||||
cd $(DIR_APP) && ./configure --prefix=/usr
|
||||
cd $(DIR_APP) && make $(MAKETUNING)
|
||||
cd $(DIR_APP) && make install
|
||||
@rm -rf $(DIR_APP)
|
||||
@$(POSTBUILD)
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 4.6.3
|
||||
VER = 4.6.4
|
||||
|
||||
THISAPP = strongswan-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.bz2
|
||||
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 34146e514ced1738b4f2d9e7169bbb52
|
||||
$(DL_FILE)_MD5 = 4c0999c42faa0860ae0afc4f8efd9d04
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
|
||||
84
lfs/tcpick
Normal file
84
lfs/tcpick
Normal file
@@ -0,0 +1,84 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
|
||||
# #
|
||||
# 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 3 of the License, or #
|
||||
# (at your option) any later version. #
|
||||
# #
|
||||
# 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. #
|
||||
# #
|
||||
# You should have received a copy of the GNU General Public License #
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
|
||||
# #
|
||||
###############################################################################
|
||||
|
||||
###############################################################################
|
||||
# Definitions
|
||||
###############################################################################
|
||||
|
||||
include Config
|
||||
|
||||
VER = 0.2.1
|
||||
|
||||
THISAPP = tcpick-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.gz
|
||||
DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
PROG = tcpick
|
||||
PAK_VER = 1
|
||||
|
||||
DEPS = ""
|
||||
|
||||
###############################################################################
|
||||
# Top-level Rules
|
||||
###############################################################################
|
||||
|
||||
objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = bb94f2f9ea81aeb645619fbe9b3b9a29
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
|
||||
|
||||
download :$(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
|
||||
md5 : $(subst %,%_MD5,$(objects))
|
||||
|
||||
dist:
|
||||
@$(PAK)
|
||||
|
||||
###############################################################################
|
||||
# Downloading, checking, md5sum
|
||||
###############################################################################
|
||||
|
||||
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
|
||||
@$(CHECK)
|
||||
|
||||
$(patsubst %,$(DIR_DL)/%,$(objects)) :
|
||||
@$(LOAD)
|
||||
|
||||
$(subst %,%_MD5,$(objects)) :
|
||||
@$(MD5)
|
||||
|
||||
###############################################################################
|
||||
# Installation Details
|
||||
###############################################################################
|
||||
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
|
||||
cd $(DIR_APP) && ./configure --prefix=/usr
|
||||
cd $(DIR_APP) && make $(MAKETUNING)
|
||||
cd $(DIR_APP) && make install
|
||||
@rm -rf $(DIR_APP)
|
||||
@$(POSTBUILD)
|
||||
6
make.sh
6
make.sh
@@ -25,8 +25,8 @@
|
||||
NAME="IPFire" # Software name
|
||||
SNAME="ipfire" # Short name
|
||||
VERSION="2.11" # Version number
|
||||
CORE="59" # Core Level (Filename)
|
||||
PAKFIRE_CORE="59" # Core Level (PAKFIRE)
|
||||
CORE="61" # Core Level (Filename)
|
||||
PAKFIRE_CORE="60" # 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
|
||||
@@ -771,6 +771,8 @@ buildipfire() {
|
||||
ipfiremake transmission
|
||||
ipfiremake dpfhack
|
||||
ipfiremake lcd4linux
|
||||
ipfiremake mtr
|
||||
ipfiremake tcpick
|
||||
echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
|
||||
cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
|
||||
echo >> $BASEDIR/build/var/ipfire/firebuild
|
||||
|
||||
@@ -86,9 +86,14 @@ case "$1" in
|
||||
sed -i -e "s|^#LoadPlugin swap|LoadPlugin swap|g" /etc/collectd.conf
|
||||
fi
|
||||
|
||||
boot_mesg "Starting Collection daemon..."
|
||||
/usr/sbin/collectd -C /etc/collectd.conf
|
||||
evaluate_retval
|
||||
if [ $(date +%Y) -gt 2011 ]; then
|
||||
boot_mesg "Starting Collection daemon..."
|
||||
/usr/sbin/collectd -C /etc/collectd.conf
|
||||
evaluate_retval
|
||||
else
|
||||
boot_mesg "collectd: cannot start with incorrect time ($(date))."
|
||||
echo_warning;
|
||||
fi
|
||||
;;
|
||||
stop)
|
||||
boot_mesg "Stopping Collection daemon..."
|
||||
|
||||
Reference in New Issue
Block a user