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

Merge remote-tracking branch 'origin/kernel-update' into glibc-update2

Browse Source
This commit is contained in:
Michael Tremer
2012-08-13 16:34:23 -04:00
parent de473c48bc 21df33072c
commit db95c20736
21 changed files with 318 additions and 598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/rootfiles/common/stage2
View File

@@ -13,8 +13,8 @@ etc/hddtemp.db
etc/host.conf
etc/inittab
etc/inputrc
#etc/ipsec.user.conf
#etc/ipsec.user.secrets
etc/ipsec.user.conf
etc/ipsec.user.secrets
etc/issue
etc/ld.so.conf
etc/localtime
@@ -75,7 +75,6 @@ usr/local/bin/setddns.pl
usr/local/bin/settime
usr/local/bin/timecheck
#usr/local/bin/uname
usr/local/bin/vpn-watch
#usr/local/include
#usr/local/lib
#usr/local/sbin

90
config/rootfiles/common/strongswan
View File

@@ -13,133 +13,62 @@ etc/strongswan.conf
#usr/lib/ipsec
#usr/lib/ipsec/libcharon.a
#usr/lib/ipsec/libcharon.la
usr/lib/ipsec/libcharon.so
#usr/lib/ipsec/libcharon.so
usr/lib/ipsec/libcharon.so.0
usr/lib/ipsec/libcharon.so.0.0.0
#usr/lib/ipsec/libhydra.a
#usr/lib/ipsec/libhydra.la
usr/lib/ipsec/libhydra.so
#usr/lib/ipsec/libhydra.so
usr/lib/ipsec/libhydra.so.0
usr/lib/ipsec/libhydra.so.0.0.0
#usr/lib/ipsec/libstrongswan.a
#usr/lib/ipsec/libstrongswan.la
usr/lib/ipsec/libstrongswan.so
#usr/lib/ipsec/libstrongswan.so
usr/lib/ipsec/libstrongswan.so.0
usr/lib/ipsec/libstrongswan.so.0.0.0
#usr/lib/ipsec/plugins
#usr/lib/ipsec/plugins/libstrongswan-aes.a
#usr/lib/ipsec/plugins/libstrongswan-aes.la
usr/lib/ipsec/plugins/libstrongswan-aes.so
#usr/lib/ipsec/plugins/libstrongswan-attr.a
#usr/lib/ipsec/plugins/libstrongswan-attr.la
usr/lib/ipsec/plugins/libstrongswan-attr.so
#usr/lib/ipsec/plugins/libstrongswan-cmac.a
#usr/lib/ipsec/plugins/libstrongswan-cmac.la
usr/lib/ipsec/plugins/libstrongswan-cmac.so
#usr/lib/ipsec/plugins/libstrongswan-constraints.a
#usr/lib/ipsec/plugins/libstrongswan-constraints.la
usr/lib/ipsec/plugins/libstrongswan-constraints.so
#usr/lib/ipsec/plugins/libstrongswan-curl.a
#usr/lib/ipsec/plugins/libstrongswan-curl.la
usr/lib/ipsec/plugins/libstrongswan-curl.so
#usr/lib/ipsec/plugins/libstrongswan-des.a
#usr/lib/ipsec/plugins/libstrongswan-des.la
usr/lib/ipsec/plugins/libstrongswan-des.so
#usr/lib/ipsec/plugins/libstrongswan-dnskey.a
#usr/lib/ipsec/plugins/libstrongswan-dnskey.la
usr/lib/ipsec/plugins/libstrongswan-dnskey.so
#usr/lib/ipsec/plugins/libstrongswan-fips-prf.a
#usr/lib/ipsec/plugins/libstrongswan-fips-prf.la
usr/lib/ipsec/plugins/libstrongswan-fips-prf.so
#usr/lib/ipsec/plugins/libstrongswan-gmp.a
#usr/lib/ipsec/plugins/libstrongswan-gmp.la
usr/lib/ipsec/plugins/libstrongswan-gmp.so
#usr/lib/ipsec/plugins/libstrongswan-hmac.a
#usr/lib/ipsec/plugins/libstrongswan-hmac.la
usr/lib/ipsec/plugins/libstrongswan-hmac.so
#usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.a
#usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.la
usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.so
#usr/lib/ipsec/plugins/libstrongswan-md5.a
#usr/lib/ipsec/plugins/libstrongswan-md5.la
usr/lib/ipsec/plugins/libstrongswan-md5.so
#usr/lib/ipsec/plugins/libstrongswan-pem.a
#usr/lib/ipsec/plugins/libstrongswan-pem.la
usr/lib/ipsec/plugins/libstrongswan-nonce.so
usr/lib/ipsec/plugins/libstrongswan-openssl.so
usr/lib/ipsec/plugins/libstrongswan-padlock.so
usr/lib/ipsec/plugins/libstrongswan-pem.so
#usr/lib/ipsec/plugins/libstrongswan-pgp.a
#usr/lib/ipsec/plugins/libstrongswan-pgp.la
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
#usr/lib/ipsec/plugins/libstrongswan-random.a
#usr/lib/ipsec/plugins/libstrongswan-random.la
usr/lib/ipsec/plugins/libstrongswan-random.so
#usr/lib/ipsec/plugins/libstrongswan-resolve.a
#usr/lib/ipsec/plugins/libstrongswan-resolve.la
usr/lib/ipsec/plugins/libstrongswan-resolve.so
#usr/lib/ipsec/plugins/libstrongswan-revocation.a
#usr/lib/ipsec/plugins/libstrongswan-revocation.la
usr/lib/ipsec/plugins/libstrongswan-revocation.so
#usr/lib/ipsec/plugins/libstrongswan-sha1.a
#usr/lib/ipsec/plugins/libstrongswan-sha1.la
usr/lib/ipsec/plugins/libstrongswan-sha1.so
#usr/lib/ipsec/plugins/libstrongswan-sha2.a
#usr/lib/ipsec/plugins/libstrongswan-sha2.la
usr/lib/ipsec/plugins/libstrongswan-sha2.so
#usr/lib/ipsec/plugins/libstrongswan-socket-raw.a
#usr/lib/ipsec/plugins/libstrongswan-socket-raw.la
usr/lib/ipsec/plugins/libstrongswan-socket-raw.so
#usr/lib/ipsec/plugins/libstrongswan-stroke.a
#usr/lib/ipsec/plugins/libstrongswan-stroke.la
usr/lib/ipsec/plugins/libstrongswan-socket-default.so
usr/lib/ipsec/plugins/libstrongswan-stroke.so
#usr/lib/ipsec/plugins/libstrongswan-updown.a
#usr/lib/ipsec/plugins/libstrongswan-updown.la
usr/lib/ipsec/plugins/libstrongswan-updown.so
#usr/lib/ipsec/plugins/libstrongswan-x509.a
#usr/lib/ipsec/plugins/libstrongswan-x509.la
usr/lib/ipsec/plugins/libstrongswan-x509.so
#usr/lib/ipsec/plugins/libstrongswan-xauth.a
#usr/lib/ipsec/plugins/libstrongswan-xauth.la
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-xauth-generic.so
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
usr/libexec/ipsec/stroke
usr/libexec/ipsec/whack
usr/sbin/ipsec
#usr/share/man/man3/anyaddr.3
#usr/share/man/man3/atoaddr.3
#usr/share/man/man3/atoasr.3
#usr/share/man/man3/atoul.3
#usr/share/man/man3/goodmask.3
#usr/share/man/man3/initaddr.3
#usr/share/man/man3/initsubnet.3
#usr/share/man/man3/portof.3
#usr/share/man/man3/rangetosubnet.3
#usr/share/man/man3/sameaddr.3
#usr/share/man/man3/subnetof.3
#usr/share/man/man3/ttoaddr.3
#usr/share/man/man3/ttodata.3
#usr/share/man/man3/ttosa.3
#usr/share/man/man3/ttoul.3
#usr/share/man/man5/ipsec.conf.5
#usr/share/man/man5/ipsec.secrets.5
#usr/share/man/man5/strongswan.conf.5
@@ -147,7 +76,4 @@ usr/sbin/ipsec
#usr/share/man/man8/_updown_espmark.8
#usr/share/man/man8/ipsec.8
#usr/share/man/man8/openac.8
#usr/share/man/man8/pluto.8
#usr/share/man/man8/scepclient.8
etc/ipsec.user.conf
etc/ipsec.user.secrets

12
config/rootfiles/core/strongswan/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

6
config/rootfiles/core/strongswan/filelists/files Normal file
View File

@@ -0,0 +1,6 @@
etc/system-release
etc/issue
etc/rc.d/init.d/tmpfs
srv/web/ipfire/cgi-bin/services.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
usr/local/bin/ipsecctrl

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

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

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

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

89
config/rootfiles/core/strongswan/update.sh Normal file
View File

@@ -0,0 +1,89 @@
#!/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
ipsecctrl D
#
#Extract files
extract_files
# Remove old pluto binaries.
rm -f /usr/libexec/ipsec/{pluto,_pluto_adns,whack}
rm -f /usr/local/bin/vpn-watch
#
#Start services
# Call the CGI script to regenerate the configuration files.
/srv/web/ipfire/cgi-bin/vpnmain.cgi
ipsecctrl S
#
#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

1
config/rootfiles/installer/findutils Symbolic link
View File

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