webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-05-01 15:52:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into kernel-update

Browse Source
This commit is contained in:
Arne Fitzenreiter
2012-03-10 17:47:01 +01:00
parent d5c0c77877 b7be421741
commit e18c5b3a42
26 changed files with 525 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/rootfiles/common/Net-Telnet Normal file
View File

@@ -0,0 +1,4 @@
usr/lib/perl5/site_perl/5.12.3/Net/Telnet.pm
#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Net/Telnet
#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Net/Telnet/.packlist
#usr/share/man/man3/Net::Telnet.3

4
config/rootfiles/common/libpng
View File

@@ -9,12 +9,12 @@
#usr/lib/libpng.la
usr/lib/libpng.so
usr/lib/libpng.so.3
usr/lib/libpng.so.3.44.0
usr/lib/libpng.so.3.46.0
#usr/lib/libpng12.a
#usr/lib/libpng12.la
usr/lib/libpng12.so
usr/lib/libpng12.so.0
usr/lib/libpng12.so.0.44.0
usr/lib/libpng12.so.0.46.0
#usr/lib/pkgconfig/libpng.pc
#usr/lib/pkgconfig/libpng12.pc
#usr/share/man/man3/libpng.3

6
config/rootfiles/common/openvpn
View File

@@ -1,5 +1,6 @@
lib/openvpn-auth-pam.so
lib/openvpn-down-root.so
usr/lib/openvpn
usr/lib/openvpn/openvpn-auth-pam.so
usr/lib/openvpn/openvpn-down-root.so
usr/sbin/openvpn
#usr/share/doc/openvpn
#usr/share/doc/openvpn/management-notes.txt
@@ -16,5 +17,6 @@ var/ipfire/ovpn/n2nconf
var/ipfire/ovpn/openssl/ovpn.cnf
var/ipfire/ovpn/ovpn-leases.db
var/ipfire/ovpn/ovpnconfig
var/ipfire/ovpn/scripts
var/ipfire/ovpn/settings
var/ipfire/ovpn/verify

21
config/rootfiles/common/strongswan
View File

@@ -10,6 +10,7 @@ etc/ipsec.d/private
etc/ipsec.d/reqs
etc/ipsec.secrets
etc/strongswan.conf
#usr/lib/ipsec
#usr/lib/ipsec/libcharon.a
#usr/lib/ipsec/libcharon.la
usr/lib/ipsec/libcharon.so
@@ -25,15 +26,6 @@ usr/lib/ipsec/libhydra.so.0.0.0
usr/lib/ipsec/libstrongswan.so
usr/lib/ipsec/libstrongswan.so.0
usr/lib/ipsec/libstrongswan.so.0.0.0
#usr/libexec/ipsec
usr/libexec/ipsec/_copyright
usr/libexec/ipsec/_pluto_adns
usr/libexec/ipsec/_updown
usr/libexec/ipsec/_updown_espmark
usr/libexec/ipsec/charon
usr/libexec/ipsec/openac
usr/libexec/ipsec/pki
#usr/lib/ipsec
#usr/lib/ipsec/plugins
#usr/lib/ipsec/plugins/libstrongswan-aes.a
#usr/lib/ipsec/plugins/libstrongswan-aes.la
@@ -77,6 +69,9 @@ usr/lib/ipsec/plugins/libstrongswan-pgp.so
#usr/lib/ipsec/plugins/libstrongswan-pkcs1.a
#usr/lib/ipsec/plugins/libstrongswan-pkcs1.la
usr/lib/ipsec/plugins/libstrongswan-pkcs1.so
#usr/lib/ipsec/plugins/libstrongswan-pkcs8.a
#usr/lib/ipsec/plugins/libstrongswan-pkcs8.la
usr/lib/ipsec/plugins/libstrongswan-pkcs8.so
#usr/lib/ipsec/plugins/libstrongswan-pubkey.a
#usr/lib/ipsec/plugins/libstrongswan-pubkey.la
usr/lib/ipsec/plugins/libstrongswan-pubkey.so
@@ -113,6 +108,14 @@ usr/lib/ipsec/plugins/libstrongswan-xauth.so
#usr/lib/ipsec/plugins/libstrongswan-xcbc.a
#usr/lib/ipsec/plugins/libstrongswan-xcbc.la
usr/lib/ipsec/plugins/libstrongswan-xcbc.so
#usr/libexec/ipsec
usr/libexec/ipsec/_copyright
usr/libexec/ipsec/_pluto_adns
usr/libexec/ipsec/_updown
usr/libexec/ipsec/_updown_espmark
usr/libexec/ipsec/charon
usr/libexec/ipsec/openac
usr/libexec/ipsec/pki
usr/libexec/ipsec/pluto
usr/libexec/ipsec/scepclient
usr/libexec/ipsec/starter

2
config/rootfiles/common/usb_modeswitch
View File

@@ -1,5 +1,5 @@
etc/usb_modeswitch.conf
#lib/udev/usb_modeswitch
lib/udev/usb_modeswitch
usr/sbin/usb_modeswitch
usr/sbin/usb_modeswitch_dispatcher
#usr/share/man/man1/usb_modeswitch.1

5
config/rootfiles/core/57/update.sh
View File

@@ -36,16 +36,19 @@ done
#Stop services
/etc/init.d/squid stop
/etc/init.d/apache stop
/etc/init.d/ipsec stop
#
#Extract files
extract_files
#
#Start services
/etc/init.d/squid start
/etc/init.d/apache start
if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
/etc/init.d/ipsec start
fi
#
#Update Language cache

12
config/rootfiles/core/58/exclude Normal file
View 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/58/filelists/Net-Telnet Symbolic link
View File

@@ -0,0 +1 @@
../../../common/Net-Telnet

3
config/rootfiles/core/58/filelists/files Normal file
View File

@@ -0,0 +1,3 @@
etc/system-release
etc/issue
etc/vimrc

1
config/rootfiles/core/58/filelists/libpng Symbolic link
View File

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

1
config/rootfiles/core/58/filelists/openvpn Symbolic link
View File

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

1
config/rootfiles/core/58/filelists/strongswan Symbolic link
View File

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

1
config/rootfiles/core/58/filelists/usb_modeswitch Symbolic link
View File

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

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

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

77
config/rootfiles/core/58/update.sh Normal file
View File

@@ -0,0 +1,77 @@
#!/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=58
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
#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
#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