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

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next

Browse Source
This commit is contained in:
Michael Tremer
2013-07-14 12:48:29 +02:00
parent 3f7ae7b715 a0da39f67c
commit bf9a484fb8
51 changed files with 2906 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/common/apache2
View File

@@ -1431,6 +1431,7 @@ srv/web/ipfire/cgi-bin/vpnmain.cgi
srv/web/ipfire/cgi-bin/wakeonlan.cgi
srv/web/ipfire/cgi-bin/webaccess.cgi
srv/web/ipfire/cgi-bin/wireless.cgi
srv/web/ipfire/cgi-bin/wirelessclient.cgi
srv/web/ipfire/cgi-bin/xtaccess.cgi
srv/web/ipfire/html
var/updatecache

6
config/rootfiles/common/armv5tel/initscripts
View File

@@ -64,6 +64,7 @@ etc/rc.d/init.d/network-vlans
etc/rc.d/init.d/networking/any
etc/rc.d/init.d/networking/blue
etc/rc.d/init.d/networking/dhcpcd.exe
etc/rc.d/init.d/networking/functions.network
etc/rc.d/init.d/networking/green
etc/rc.d/init.d/networking/orange
etc/rc.d/init.d/networking/red
@@ -94,6 +95,7 @@ etc/rc.d/init.d/networking/red.up/98-leds
etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
etc/rc.d/init.d/networking/red.up/99-fireinfo
etc/rc.d/init.d/networking/red.up/99-pakfire-update
etc/rc.d/init.d/networking/wpa_supplicant.exe
#etc/rc.d/init.d/nfs-server
etc/rc.d/init.d/ntp
#etc/rc.d/init.d/nut
@@ -132,6 +134,7 @@ etc/rc.d/init.d/upnpd
#etc/rc.d/init.d/vsftpd
#etc/rc.d/init.d/watchdog
#etc/rc.d/init.d/winbind
etc/rc.d/init.d/wlanclient
#etc/rc.d/init.d/xinetd
#etc/rc.d/rc0.d
#etc/rc.d/rc0.d/K01imspetor
@@ -149,6 +152,7 @@ etc/rc.d/rc0.d/K49cyrus-sasl
etc/rc.d/rc0.d/K78snort
etc/rc.d/rc0.d/K79leds
etc/rc.d/rc0.d/K80network
etc/rc.d/rc0.d/K82wlanclient
#etc/rc.d/rc0.d/K84bluetooth
#etc/rc.d/rc0.d/K85messagebus
etc/rc.d/rc0.d/K85tmpfs
@@ -165,6 +169,7 @@ etc/rc.d/rc3.d/S10sysklogd
#etc/rc.d/rc3.d/S16bluetooth
#etc/rc.d/rc3.d/S18cpufreq
etc/rc.d/rc3.d/S19smartenabler
etc/rc.d/rc3.d/S19wlanclient
etc/rc.d/rc3.d/S20network
etc/rc.d/rc3.d/S21leds
etc/rc.d/rc3.d/S24cyrus-sasl
@@ -195,6 +200,7 @@ etc/rc.d/rc6.d/K49cyrus-sasl
etc/rc.d/rc6.d/K78snort
etc/rc.d/rc6.d/K79leds
etc/rc.d/rc6.d/K80network
etc/rc.d/rc6.d/K82wlanclient
#etc/rc.d/rc6.d/K84bluetooth
#etc/rc.d/rc6.d/K85messagebus
etc/rc.d/rc6.d/K85tmpfs

1
config/rootfiles/common/configroot
View File

@@ -36,6 +36,7 @@ var/ipfire/ethernet
#var/ipfire/ethernet/scanned_nics
#var/ipfire/ethernet/settings
#var/ipfire/ethernet/vlans
#var/ipfire/ethernet/wireless
#var/ipfire/extrahd
#var/ipfire/extrahd/bin
var/ipfire/extrahd/bin/extrahd.pl

6
config/rootfiles/common/i586/initscripts
View File

@@ -66,6 +66,7 @@ etc/rc.d/init.d/network-vlans
etc/rc.d/init.d/networking/any
etc/rc.d/init.d/networking/blue
etc/rc.d/init.d/networking/dhcpcd.exe
etc/rc.d/init.d/networking/functions.network
etc/rc.d/init.d/networking/green
etc/rc.d/init.d/networking/orange
etc/rc.d/init.d/networking/red
@@ -96,6 +97,7 @@ etc/rc.d/init.d/networking/red.up/98-leds
etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
etc/rc.d/init.d/networking/red.up/99-fireinfo
etc/rc.d/init.d/networking/red.up/99-pakfire-update
etc/rc.d/init.d/networking/wpa_supplicant.exe
#etc/rc.d/init.d/nfs-server
etc/rc.d/init.d/ntp
#etc/rc.d/init.d/nut
@@ -135,6 +137,7 @@ etc/rc.d/init.d/upnpd
#etc/rc.d/init.d/vsftpd
#etc/rc.d/init.d/watchdog
#etc/rc.d/init.d/winbind
etc/rc.d/init.d/wlanclient
#etc/rc.d/init.d/xinetd
#etc/rc.d/rc0.d
#etc/rc.d/rc0.d/K01imspetor
@@ -152,6 +155,7 @@ etc/rc.d/rc0.d/K49cyrus-sasl
etc/rc.d/rc0.d/K78snort
etc/rc.d/rc0.d/K79leds
etc/rc.d/rc0.d/K80network
etc/rc.d/rc0.d/K82wlanclient
#etc/rc.d/rc0.d/K84bluetooth
#etc/rc.d/rc0.d/K85messagebus
etc/rc.d/rc0.d/K85tmpfs
@@ -170,6 +174,7 @@ etc/rc.d/rc3.d/S12acpid
#etc/rc.d/rc3.d/S16bluetooth
#etc/rc.d/rc3.d/S18cpufreq
etc/rc.d/rc3.d/S19smartenabler
etc/rc.d/rc3.d/S19wlanclient
etc/rc.d/rc3.d/S20network
etc/rc.d/rc3.d/S21leds
etc/rc.d/rc3.d/S24cyrus-sasl
@@ -200,6 +205,7 @@ etc/rc.d/rc6.d/K49cyrus-sasl
etc/rc.d/rc6.d/K78snort
etc/rc.d/rc6.d/K79leds
etc/rc.d/rc6.d/K80network
etc/rc.d/rc6.d/K82wlanclient
#etc/rc.d/rc6.d/K84bluetooth
#etc/rc.d/rc6.d/K85messagebus
etc/rc.d/rc6.d/K85tmpfs

1
config/rootfiles/common/inetutils
View File

@@ -5,7 +5,6 @@ bin/ping
#usr/bin/rsh
#usr/bin/talk
#usr/bin/tftp
usr/bin/whois
#usr/sbin/ftpd
#usr/sbin/inetd
#usr/sbin/rexecd

25
config/rootfiles/common/jwhois Normal file
View File

@@ -0,0 +1,25 @@
etc/jwhois.conf
usr/bin/jwhois
usr/bin/whois
#usr/share/info/jwhois.info
#usr/share/locale/es/LC_MESSAGES/jwhois.mo
#usr/share/locale/fr/LC_MESSAGES/jwhois.mo
#usr/share/locale/hu/LC_MESSAGES/jwhois.mo
#usr/share/locale/id/LC_MESSAGES/jwhois.mo
#usr/share/locale/it/LC_MESSAGES/jwhois.mo
#usr/share/locale/nl/LC_MESSAGES/jwhois.mo
#usr/share/locale/pl/LC_MESSAGES/jwhois.mo
#usr/share/locale/pt_BR/LC_MESSAGES/jwhois.mo
#usr/share/locale/ro
#usr/share/locale/ro/LC_MESSAGES
#usr/share/locale/ro/LC_MESSAGES/jwhois.mo
#usr/share/locale/ru/LC_MESSAGES/jwhois.mo
#usr/share/locale/rw/LC_MESSAGES/jwhois.mo
#usr/share/locale/sv/LC_MESSAGES/jwhois.mo
#usr/share/locale/tr/LC_MESSAGES/jwhois.mo
#usr/share/locale/vi/LC_MESSAGES/jwhois.mo
#usr/share/locale/zh_TW/LC_MESSAGES/jwhois.mo
#usr/share/man/man1/jwhois.1
#usr/share/man/sv
#usr/share/man/sv/man1
#usr/share/man/sv/man1/jwhois.1

1
config/rootfiles/common/misc-progs
View File

@@ -35,5 +35,6 @@ usr/local/bin/timectrl
usr/local/bin/updxlratorctrl
usr/local/bin/upnpctrl
usr/local/bin/urlfilterctrl
usr/local/bin/wirelessclient
usr/local/bin/wirelessctrl
#usr/local/bin/wlanapctrl

17
config/rootfiles/core/71/exclude Normal file
View File

@@ -0,0 +1,17 @@
srv/web/ipfire/html/proxy.pac
boot/config.txt
etc/udev/rules.d/30-persistent-network.rules
etc/collectd.custom
etc/shadow
etc/ipsec.conf
etc/ipsec.secrets
etc/ipsec.user.conf
etc/ipsec.user.secrets
var/log/cache
var/updatecache
etc/localtime
var/ipfire/ovpn
etc/ssh/ssh_config
etc/ssh/sshd_config
etc/ssl/openssl.cnf
var/state/dhcp/dhcpd.leases

1
config/rootfiles/core/71/filelists/curl Symbolic link
View File

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

18
config/rootfiles/core/71/filelists/files Normal file
View File

@@ -0,0 +1,18 @@
etc/system-release
etc/issue
var/ipfire/general-functions.pl
var/ipfire/header.pl
var/ipfire/menu.d/10-system.menu
etc/rc.d/init.d/dnsmasq
etc/rc.d/init.d/wlanclient
etc/rc.d/init.d/networking/functions.network
etc/rc.d/init.d/networking/wpa_supplicant.exe
etc/rc.d/init.d/networking/red
etc/rc.d/rc0.d/K82wlanclient
etc/rc.d/rc3.d/S19wlanclient
etc/rc.d/rc6.d/K82wlanclient
usr/local/bin/wirelessclient
srv/web/ipfire/cgi-bin/pppsetup.cgi
srv/web/ipfire/cgi-bin/wirelessclient.cgi
var/ipfire/langs
var/ipfire/backup/include

1
config/rootfiles/core/71/filelists/jwhois Symbolic link
View File

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

1
config/rootfiles/core/71/meta Normal file
View File

@@ -0,0 +1 @@
DEPS=""

65
config/rootfiles/core/71/update.sh Normal file
View File

@@ -0,0 +1,65 @@
#!/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) 2013 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=71
for (( i=1; i<=$core; i++ ))
do
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
done
#
#Stop services
#
#Extract files
extract_files
#
#Create wireless config file...
touch /var/ipfire/ethernet/wireless
chown nobody:nobody /var/ipfire/ethernet/wireless
#
#Start services
#
#Update Language cache
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
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

8
config/rootfiles/packages/mc
View File

@@ -110,6 +110,14 @@ usr/share/mc/skins/double-lines.ini
usr/share/mc/skins/featured.ini
usr/share/mc/skins/gotar.ini
usr/share/mc/skins/mc46.ini
usr/share/mc/skins/modarcon16-defbg.ini
usr/share/mc/skins/modarcon16.ini
usr/share/mc/skins/modarcon16root-defbg.ini
usr/share/mc/skins/modarcon16root.ini
usr/share/mc/skins/modarin256-defbg.ini
usr/share/mc/skins/modarin256.ini
usr/share/mc/skins/modarin256root-defbg.ini
usr/share/mc/skins/modarin256root.ini
usr/share/mc/skins/nicedark.ini
usr/share/mc/skins/sand256.ini
usr/share/mc/skins/xoria256.ini