mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-05-07 05:26:10 +02:00
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update
This commit is contained in:
Dirk Wagner
1
config/backup/includes/stunnel
Normal file
1
config/backup/includes/stunnel
Normal file
@@ -0,0 +1 @@
|
||||
/etc/stunnel/
|
||||
@@ -1 +1,2 @@
|
||||
/etc/sysconfig/watchdog
|
||||
/etc/watchdog.conf
|
||||
|
||||
@@ -353,7 +353,7 @@ sub iporsubtodec
|
||||
}
|
||||
#Subnet already in decimal and valid?
|
||||
if ($mask=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/ &&(($1<=255 && $2<=$1 && $3<=$2 && $4<=$3 ))) {
|
||||
for (my $i=8;$i<=32;$i++){
|
||||
for (my $i=0;$i<=32;$i++){
|
||||
if (&General::cidrtosub($i) eq $mask){
|
||||
if ($full == 0){return $mask;}else{
|
||||
return $net."/".$mask;
|
||||
@@ -362,7 +362,7 @@ sub iporsubtodec
|
||||
}
|
||||
}
|
||||
#Subnet in binary format?
|
||||
if ($mask=~/^(\d{1,2})$/ && (($1<=32 && $1>=8))){
|
||||
if ($mask=~/^(\d{1,2})$/ && (($1<=32 && $1>=0))){
|
||||
if($full == 0){ return &General::cidrtosub($mask);}else{
|
||||
return $net."/".&General::cidrtosub($mask);
|
||||
}
|
||||
@@ -389,7 +389,7 @@ sub iporsubtocidr
|
||||
}
|
||||
#Subnet in decimal and valid?
|
||||
if ($mask=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/ &&(($1<=255 && $2<=$1 && $3<=$2 && $4<=$3 ))) {
|
||||
for (my $i=8;$i<=32;$i++){
|
||||
for (my $i=0;$i<=32;$i++){
|
||||
if (&General::cidrtosub($i) eq $mask){
|
||||
if ($full == 0){return &General::subtocidr($mask);}else{
|
||||
return $net."/".&General::subtocidr($mask);
|
||||
@@ -398,7 +398,7 @@ sub iporsubtocidr
|
||||
}
|
||||
}
|
||||
#Subnet already in binary format?
|
||||
if ($mask=~/^(\d{1,2})$/ && (($1<=32 && $1>=8))){
|
||||
if ($mask=~/^(\d{1,2})$/ && (($1<=32 && $1>=0))){
|
||||
if($full == 0){ return $mask;}else{
|
||||
return $net."/".$mask;
|
||||
}
|
||||
@@ -488,13 +488,13 @@ sub validipandmask
|
||||
if ($ccdip=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/ &&(($1>0 && $1<=255 && $2>=0 && $2<=255 && $3>=0 && $3<=255 && $4<=255 ))) {
|
||||
#Subnet in decimal and valid?
|
||||
if ($ccdsubnet=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/ &&(($1<=255 && $2<=$1 && $3<=$2 && $4<=$3 ))) {
|
||||
for (my $i=8;$i<=32;$i++){
|
||||
for (my $i=0;$i<=32;$i++){
|
||||
if (&General::cidrtosub($i) eq $ccdsubnet){
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
#Subnet already in binary format?
|
||||
}elsif ($ccdsubnet=~/^(\d{1,2})$/ && (($1<=32 && $1>=8))){
|
||||
}elsif ($ccdsubnet=~/^(\d{1,2})$/ && (($1<=32 && $1>=0))){
|
||||
return 1;
|
||||
}else{
|
||||
return 0;
|
||||
|
||||
@@ -8,6 +8,7 @@ mysql:x:41:41:MySQL Server:/dev/null:/bin/false
|
||||
ftp:x:45:45:anonymous_user:/home/ftp:/bin/false
|
||||
vsftpd:x:47:47:vsftpd User:/home/ftp:/bin/false
|
||||
rsyncd:x:48:48:rsyncd Daemon:/home/rsync:/bin/false
|
||||
stunnel:x:51:51:stunnel Daemon:/var/lib/stunnel:/bin/false
|
||||
sshd:x:74:74:sshd:/var/empty:/bin/false
|
||||
nobody:x:99:99:Nobody:/home/nobody:/bin/false
|
||||
postfix:x:100:100::/var/spool/postfix:/bin/false
|
||||
|
||||
@@ -427,8 +427,8 @@ sub process_rules
|
||||
$grp1='std_net_src';
|
||||
$source='ORANGE';
|
||||
}elsif ($configline[2] eq 'red') {
|
||||
$grp1='std_net_src';
|
||||
$source='IPFire';
|
||||
$grp1='ipfire_src';
|
||||
$source='RED1';
|
||||
&General::readhash($fwdfwsettings,\%fwdsettings);
|
||||
$fwdsettings{'POLICY1'}=$outsettings{'POLICY'};
|
||||
$fwdsettings{'POLICY'}=$outsettings{'POLICY'};
|
||||
@@ -538,7 +538,7 @@ sub process_rules
|
||||
my $chain;
|
||||
foreach my $protocol (@prot){
|
||||
my $now=localtime;
|
||||
if ($source eq 'IPFire'){
|
||||
if ($source eq 'RED1'){
|
||||
$chain='OUTGOINGFW';
|
||||
}else{
|
||||
$chain='FORWARDFW';
|
||||
|
||||
@@ -354,20 +354,21 @@ sub buildrules {
|
||||
|
||||
# Destination NAT
|
||||
if ($NAT_MODE eq "DNAT") {
|
||||
# Make port-forwardings useable from the internal networks.
|
||||
my @internal_addresses = &fwlib::get_internal_firewall_ip_addresses(1);
|
||||
unless ($nat_address ~~ @internal_addresses) {
|
||||
&add_dnat_mangle_rules($nat_address, @options);
|
||||
}
|
||||
|
||||
my @nat_options = ();
|
||||
if ($protocol ne "all") {
|
||||
my @nat_protocol_options = &get_protocol_options($hash, $key, $protocol, 1);
|
||||
push(@nat_options, @nat_protocol_options);
|
||||
}
|
||||
push(@nat_options, @time_options);
|
||||
|
||||
# Make port-forwardings useable from the internal networks.
|
||||
my @internal_addresses = &fwlib::get_internal_firewall_ip_addresses(1);
|
||||
unless ($nat_address ~~ @internal_addresses) {
|
||||
&add_dnat_mangle_rules($nat_address, @nat_options);
|
||||
}
|
||||
|
||||
push(@nat_options, @source_options);
|
||||
push(@nat_options, ("-d", $nat_address));
|
||||
push(@nat_options, @time_options);
|
||||
|
||||
my $dnat_port;
|
||||
if ($protocol_has_ports) {
|
||||
|
||||
@@ -1934,6 +1934,7 @@ CONFIG_WLAN=y
|
||||
CONFIG_LIBERTAS_THINFIRM=m
|
||||
# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
|
||||
CONFIG_LIBERTAS_THINFIRM_USB=m
|
||||
CONFIG_LIBERTAS_UAP=m
|
||||
CONFIG_ATMEL=m
|
||||
CONFIG_PCI_ATMEL=m
|
||||
CONFIG_AT76C50X_USB=m
|
||||
|
||||
@@ -2141,6 +2141,7 @@ CONFIG_WLAN=y
|
||||
CONFIG_LIBERTAS_THINFIRM=m
|
||||
# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
|
||||
CONFIG_LIBERTAS_THINFIRM_USB=m
|
||||
CONFIG_LIBERTAS_UAP=m
|
||||
CONFIG_ATMEL=m
|
||||
CONFIG_PCI_ATMEL=m
|
||||
CONFIG_AT76C50X_USB=m
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 3.10.32 Kernel Configuration
|
||||
# Linux/arm 3.10.38 Kernel Configuration
|
||||
#
|
||||
CONFIG_ARM=y
|
||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
||||
@@ -681,6 +681,8 @@ CONFIG_NETFILTER_XT_MATCH_HELPER=m
|
||||
CONFIG_NETFILTER_XT_MATCH_HL=m
|
||||
CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
|
||||
CONFIG_NETFILTER_XT_MATCH_IPVS=m
|
||||
CONFIG_NETFILTER_XT_MATCH_LAYER7=m
|
||||
# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
|
||||
CONFIG_NETFILTER_XT_MATCH_LENGTH=m
|
||||
CONFIG_NETFILTER_XT_MATCH_LIMIT=m
|
||||
CONFIG_NETFILTER_XT_MATCH_MAC=m
|
||||
@@ -699,8 +701,6 @@ CONFIG_NETFILTER_XT_MATCH_RECENT=m
|
||||
CONFIG_NETFILTER_XT_MATCH_SCTP=m
|
||||
CONFIG_NETFILTER_XT_MATCH_SOCKET=m
|
||||
CONFIG_NETFILTER_XT_MATCH_STATE=m
|
||||
CONFIG_NETFILTER_XT_MATCH_LAYER7=m
|
||||
# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
|
||||
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
|
||||
CONFIG_NETFILTER_XT_MATCH_STRING=m
|
||||
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
|
||||
@@ -1530,6 +1530,7 @@ CONFIG_WLAN=y
|
||||
CONFIG_LIBERTAS_THINFIRM=m
|
||||
# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
|
||||
CONFIG_LIBERTAS_THINFIRM_USB=m
|
||||
CONFIG_LIBERTAS_UAP=m
|
||||
CONFIG_AT76C50X_USB=m
|
||||
CONFIG_USB_ZD1201=m
|
||||
CONFIG_USB_NET_RNDIS_WLAN=m
|
||||
@@ -2956,11 +2957,13 @@ CONFIG_SND_BCM2708_SOC_I2S=m
|
||||
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m
|
||||
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
|
||||
CONFIG_SND_BCM2708_SOC_RPI_DAC=m
|
||||
# CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC is not set
|
||||
CONFIG_SND_DESIGNWARE_I2S=m
|
||||
CONFIG_SND_SOC_I2C_AND_SPI=m
|
||||
# CONFIG_SND_SOC_ALL_CODECS is not set
|
||||
CONFIG_SND_SOC_PCM1794A=m
|
||||
CONFIG_SND_SOC_PCM5102A=m
|
||||
# CONFIG_SND_SOC_PCM512x is not set
|
||||
CONFIG_SND_SOC_WM8804=m
|
||||
CONFIG_SND_SIMPLE_CARD=m
|
||||
# CONFIG_SOUND_PRIME is not set
|
||||
|
||||
@@ -2120,6 +2120,7 @@ CONFIG_WLAN=y
|
||||
CONFIG_LIBERTAS_THINFIRM=m
|
||||
# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
|
||||
CONFIG_LIBERTAS_THINFIRM_USB=m
|
||||
CONFIG_LIBERTAS_UAP=m
|
||||
CONFIG_AIRO=m
|
||||
CONFIG_ATMEL=m
|
||||
CONFIG_PCI_ATMEL=m
|
||||
@@ -3052,37 +3053,37 @@ CONFIG_WATCHDOG_NOWAYOUT=y
|
||||
#
|
||||
CONFIG_SOFT_WATCHDOG=m
|
||||
CONFIG_RETU_WATCHDOG=m
|
||||
# CONFIG_ACQUIRE_WDT is not set
|
||||
# CONFIG_ADVANTECH_WDT is not set
|
||||
CONFIG_ACQUIRE_WDT=m
|
||||
CONFIG_ADVANTECH_WDT=m
|
||||
CONFIG_ALIM1535_WDT=m
|
||||
CONFIG_ALIM7101_WDT=m
|
||||
CONFIG_F71808E_WDT=m
|
||||
CONFIG_SP5100_TCO=m
|
||||
CONFIG_GEODE_WDT=m
|
||||
# CONFIG_SC520_WDT is not set
|
||||
CONFIG_SC520_WDT=m
|
||||
CONFIG_SBC_FITPC2_WATCHDOG=m
|
||||
# CONFIG_EUROTECH_WDT is not set
|
||||
CONFIG_EUROTECH_WDT=m
|
||||
CONFIG_IB700_WDT=m
|
||||
CONFIG_IBMASR=m
|
||||
# CONFIG_WAFER_WDT is not set
|
||||
CONFIG_WAFER_WDT=m
|
||||
CONFIG_I6300ESB_WDT=m
|
||||
CONFIG_IE6XX_WDT=m
|
||||
CONFIG_ITCO_WDT=m
|
||||
# CONFIG_ITCO_VENDOR_SUPPORT is not set
|
||||
CONFIG_ITCO_VENDOR_SUPPORT=y
|
||||
CONFIG_IT8712F_WDT=m
|
||||
CONFIG_IT87_WDT=m
|
||||
CONFIG_HP_WATCHDOG=m
|
||||
CONFIG_HPWDT_NMI_DECODING=y
|
||||
# CONFIG_SC1200_WDT is not set
|
||||
# CONFIG_SCx200_WDT is not set
|
||||
# CONFIG_PC87413_WDT is not set
|
||||
CONFIG_SC1200_WDT=m
|
||||
CONFIG_SCx200_WDT=m
|
||||
CONFIG_PC87413_WDT=m
|
||||
CONFIG_NV_TCO=m
|
||||
# CONFIG_60XX_WDT is not set
|
||||
# CONFIG_SBC8360_WDT is not set
|
||||
# CONFIG_SBC7240_WDT is not set
|
||||
# CONFIG_CPU5_WDT is not set
|
||||
CONFIG_60XX_WDT=m
|
||||
CONFIG_SBC8360_WDT=m
|
||||
CONFIG_SBC7240_WDT=m
|
||||
CONFIG_CPU5_WDT=m
|
||||
CONFIG_SMSC_SCH311X_WDT=m
|
||||
# CONFIG_SMSC37B787_WDT is not set
|
||||
CONFIG_SMSC37B787_WDT=m
|
||||
CONFIG_VIA_WDT=m
|
||||
CONFIG_W83627HF_WDT=m
|
||||
CONFIG_W83697HF_WDT=m
|
||||
@@ -3090,7 +3091,7 @@ CONFIG_W83697UG_WDT=m
|
||||
CONFIG_W83877F_WDT=m
|
||||
CONFIG_W83977F_WDT=m
|
||||
CONFIG_MACHZ_WDT=m
|
||||
# CONFIG_SBC_EPX_C3_WATCHDOG is not set
|
||||
CONFIG_SBC_EPX_C3_WATCHDOG=m
|
||||
|
||||
#
|
||||
# ISA-based Watchdog Cards
|
||||
|
||||
@@ -2134,6 +2134,7 @@ CONFIG_WLAN=y
|
||||
CONFIG_LIBERTAS_THINFIRM=m
|
||||
# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
|
||||
CONFIG_LIBERTAS_THINFIRM_USB=m
|
||||
CONFIG_LIBERTAS_UAP=m
|
||||
CONFIG_AIRO=m
|
||||
CONFIG_ATMEL=m
|
||||
CONFIG_PCI_ATMEL=m
|
||||
@@ -3071,36 +3072,36 @@ CONFIG_WATCHDOG_NOWAYOUT=y
|
||||
#
|
||||
CONFIG_SOFT_WATCHDOG=m
|
||||
CONFIG_RETU_WATCHDOG=m
|
||||
# CONFIG_ACQUIRE_WDT is not set
|
||||
# CONFIG_ADVANTECH_WDT is not set
|
||||
CONFIG_ACQUIRE_WDT=m
|
||||
CONFIG_ADVANTECH_WDT=m
|
||||
CONFIG_ALIM1535_WDT=m
|
||||
CONFIG_ALIM7101_WDT=m
|
||||
CONFIG_F71808E_WDT=m
|
||||
CONFIG_SP5100_TCO=m
|
||||
CONFIG_GEODE_WDT=m
|
||||
# CONFIG_SC520_WDT is not set
|
||||
CONFIG_SC520_WDT=m
|
||||
CONFIG_SBC_FITPC2_WATCHDOG=m
|
||||
# CONFIG_EUROTECH_WDT is not set
|
||||
CONFIG_EUROTECH_WDT=m
|
||||
CONFIG_IB700_WDT=m
|
||||
CONFIG_IBMASR=m
|
||||
# CONFIG_WAFER_WDT is not set
|
||||
CONFIG_WAFER_WDT=m
|
||||
CONFIG_I6300ESB_WDT=m
|
||||
CONFIG_IE6XX_WDT=m
|
||||
CONFIG_ITCO_WDT=m
|
||||
# CONFIG_ITCO_VENDOR_SUPPORT is not set
|
||||
CONFIG_ITCO_VENDOR_SUPPORT=y
|
||||
CONFIG_IT8712F_WDT=m
|
||||
CONFIG_IT87_WDT=m
|
||||
CONFIG_HP_WATCHDOG=m
|
||||
CONFIG_HPWDT_NMI_DECODING=y
|
||||
# CONFIG_SC1200_WDT is not set
|
||||
# CONFIG_PC87413_WDT is not set
|
||||
CONFIG_SC1200_WDT=m
|
||||
CONFIG_PC87413_WDT=m
|
||||
CONFIG_NV_TCO=m
|
||||
# CONFIG_60XX_WDT is not set
|
||||
# CONFIG_SBC8360_WDT is not set
|
||||
# CONFIG_SBC7240_WDT is not set
|
||||
# CONFIG_CPU5_WDT is not set
|
||||
CONFIG_60XX_WDT=m
|
||||
CONFIG_SBC8360_WDT=m
|
||||
CONFIG_SBC7240_WDT=m
|
||||
CONFIG_CPU5_WDT=m
|
||||
CONFIG_SMSC_SCH311X_WDT=m
|
||||
# CONFIG_SMSC37B787_WDT is not set
|
||||
CONFIG_SMSC37B787_WDT=m
|
||||
CONFIG_VIA_WDT=m
|
||||
CONFIG_W83627HF_WDT=m
|
||||
CONFIG_W83697HF_WDT=m
|
||||
@@ -3108,7 +3109,7 @@ CONFIG_W83697UG_WDT=m
|
||||
CONFIG_W83877F_WDT=m
|
||||
CONFIG_W83977F_WDT=m
|
||||
CONFIG_MACHZ_WDT=m
|
||||
# CONFIG_SBC_EPX_C3_WATCHDOG is not set
|
||||
CONFIG_SBC_EPX_C3_WATCHDOG=m
|
||||
CONFIG_XEN_WDT=m
|
||||
|
||||
#
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
ENABLED=off
|
||||
ENABLED_BLUE=off
|
||||
ENABLED_ORANGE=off
|
||||
DDEST_PORT=1149
|
||||
DDEST_PORT=1194
|
||||
DPROTOCOL=udp
|
||||
VPN_IP=
|
||||
|
||||
@@ -115,6 +115,7 @@ etc/rc.d/init.d/squid
|
||||
etc/rc.d/init.d/sshd
|
||||
#etc/rc.d/init.d/sslh
|
||||
etc/rc.d/init.d/static-routes
|
||||
#etc/rc.d/init.d/stunnel
|
||||
etc/rc.d/init.d/swap
|
||||
etc/rc.d/init.d/sysctl
|
||||
etc/rc.d/init.d/sysklogd
|
||||
|
||||
@@ -1394,6 +1394,8 @@ lib/modules/KVER-ipfire-kirkwood
|
||||
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/libertas_tf
|
||||
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
|
||||
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
|
||||
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/libertas_uap
|
||||
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/libertas_uap/uap8xxx.ko
|
||||
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/mac80211_hwsim.ko
|
||||
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/mwifiex
|
||||
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/mwifiex/mwifiex.ko
|
||||
|
||||
@@ -1356,6 +1356,8 @@ lib/modules/KVER-ipfire-multi
|
||||
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/libertas_tf
|
||||
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
|
||||
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
|
||||
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/libertas_uap
|
||||
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/libertas_uap/uap8xxx.ko
|
||||
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/mac80211_hwsim.ko
|
||||
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/mwifiex
|
||||
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/mwifiex/mwifiex.ko
|
||||
|
||||
@@ -1125,6 +1125,8 @@ lib/modules/KVER-ipfire-rpi
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/libertas_tf
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/libertas_uap
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/libertas_uap/uap8xxx.ko
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/mwifiex
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/mwifiex/mwifiex.ko
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/mwifiex/mwifiex_sdio.ko
|
||||
|
||||
@@ -21,7 +21,7 @@ usr/lib/daq
|
||||
#usr/lib/libdaq.la
|
||||
#usr/lib/libdaq.so
|
||||
usr/lib/libdaq.so.2
|
||||
usr/lib/libdaq.so.2.0.1
|
||||
usr/lib/libdaq.so.2.0.2
|
||||
#usr/lib/libdaq_static.a
|
||||
#usr/lib/libdaq_static.la
|
||||
#usr/lib/libdaq_static_modules.a
|
||||
|
||||
@@ -117,6 +117,7 @@ etc/rc.d/init.d/squid
|
||||
etc/rc.d/init.d/sshd
|
||||
#etc/rc.d/init.d/sslh
|
||||
etc/rc.d/init.d/static-routes
|
||||
#etc/rc.d/init.d/stunnel
|
||||
etc/rc.d/init.d/swap
|
||||
etc/rc.d/init.d/sysctl
|
||||
etc/rc.d/init.d/sysklogd
|
||||
|
||||
@@ -1299,9 +1299,6 @@ lib/modules/KVER-ipfire
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/misc/ics932s401.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/misc/lis3lv02d
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/misc/lis3lv02d/lis3lv02d.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/misc/mei
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/misc/mei/mei-me.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/misc/mei/mei.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/misc/pch_phub.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/misc/ti-st
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/misc/ti-st/st_drv.ko
|
||||
@@ -1651,6 +1648,8 @@ lib/modules/KVER-ipfire
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas_tf
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas_uap
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas_uap/uap8xxx.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/mac80211_hwsim.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/mwifiex
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/mwifiex/mwifiex.ko
|
||||
@@ -2191,12 +2190,17 @@ lib/modules/KVER-ipfire
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/w1/slaves/w1_therm.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/w1/wire.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/acquirewdt.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/advantechwdt.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/alim1535_wdt.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/alim7101_wdt.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/cpu5wdt.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/eurotechwdt.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/f71808e_wdt.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/geodewdt.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/hpwdt.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/i6300esb.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/iTCO_vendor_support.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/iTCO_wdt.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/ib700wdt.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/ibmasr.ko
|
||||
@@ -2205,11 +2209,20 @@ lib/modules/KVER-ipfire
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/it87_wdt.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/machzwd.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/nv_tco.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/pc87413_wdt.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/pcwd_pci.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/pcwd_usb.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/retu_wdt.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sbc60xxwdt.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sbc7240_wdt.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sbc8360.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sbc_epx_c3.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sbc_fitpc2_wdt.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sc1200wdt.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sc520_wdt.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sch311x_wdt.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/scx200_wdt.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/smsc37b787_wdt.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/softdog.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sp5100_tco.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/via_wdt.ko
|
||||
@@ -2218,6 +2231,7 @@ lib/modules/KVER-ipfire
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/w83697ug_wdt.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/w83877f_wdt.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/w83977f_wdt.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/wafer5823wdt.ko
|
||||
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/wdt_pci.ko
|
||||
#lib/modules/KVER-ipfire/kernel/fs
|
||||
#lib/modules/KVER-ipfire/kernel/fs/btrfs
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#sbin/extlinux
|
||||
#usr/bin/gethostip
|
||||
#usr/bin/isohybrid
|
||||
usr/bin/isohybrid
|
||||
#usr/bin/isohybrid.pl
|
||||
#usr/bin/keytab-lilo
|
||||
#usr/bin/lss16toppm
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,48 +0,0 @@
|
||||
#usr/include/torrent
|
||||
#usr/include/torrent/bitfield.h
|
||||
#usr/include/torrent/chunk_manager.h
|
||||
#usr/include/torrent/common.h
|
||||
#usr/include/torrent/connection_manager.h
|
||||
#usr/include/torrent/data
|
||||
#usr/include/torrent/data/block.h
|
||||
#usr/include/torrent/data/block_list.h
|
||||
#usr/include/torrent/data/block_transfer.h
|
||||
#usr/include/torrent/data/file.h
|
||||
#usr/include/torrent/data/file_list.h
|
||||
#usr/include/torrent/data/file_list_iterator.h
|
||||
#usr/include/torrent/data/file_manager.h
|
||||
#usr/include/torrent/data/file_utils.h
|
||||
#usr/include/torrent/data/piece.h
|
||||
#usr/include/torrent/data/transfer_list.h
|
||||
#usr/include/torrent/download.h
|
||||
#usr/include/torrent/error.h
|
||||
#usr/include/torrent/event.h
|
||||
#usr/include/torrent/exceptions.h
|
||||
#usr/include/torrent/hash_string.h
|
||||
#usr/include/torrent/http.h
|
||||
#usr/include/torrent/object.h
|
||||
#usr/include/torrent/object_stream.h
|
||||
#usr/include/torrent/path.h
|
||||
#usr/include/torrent/peer
|
||||
#usr/include/torrent/peer/client_info.h
|
||||
#usr/include/torrent/peer/client_list.h
|
||||
#usr/include/torrent/peer/peer.h
|
||||
#usr/include/torrent/peer/peer_info.h
|
||||
#usr/include/torrent/peer/peer_list.h
|
||||
#usr/include/torrent/poll.h
|
||||
#usr/include/torrent/poll_epoll.h
|
||||
#usr/include/torrent/poll_kqueue.h
|
||||
#usr/include/torrent/poll_select.h
|
||||
#usr/include/torrent/rate.h
|
||||
#usr/include/torrent/resume.h
|
||||
#usr/include/torrent/torrent.h
|
||||
#usr/include/torrent/tracker.h
|
||||
#usr/include/torrent/tracker_list.h
|
||||
#usr/lib/libtorrent.la
|
||||
#usr/lib/libtorrent.so
|
||||
#usr/lib/libtorrent.so.11
|
||||
#usr/lib/libtorrent.so.11.0.6
|
||||
#usr/lib/pkgconfig/libtorrent.pc
|
||||
#usr/include/torrent/dht_manager.h
|
||||
#usr/include/torrent/peer/connection_list.h
|
||||
#usr/include/torrent/throttle.h
|
||||
@@ -30,7 +30,6 @@ usr/bin/u2spewfoo
|
||||
#usr/include/snort/dynamic_preproc/bitop.h
|
||||
#usr/include/snort/dynamic_preproc/cpuclock.h
|
||||
#usr/include/snort/dynamic_preproc/file_api.h
|
||||
#usr/include/snort/dynamic_preproc/file_lib.h
|
||||
#usr/include/snort/dynamic_preproc/idle_processing.h
|
||||
#usr/include/snort/dynamic_preproc/ipv6_port.h
|
||||
#usr/include/snort/dynamic_preproc/mempool.h
|
||||
@@ -180,11 +179,14 @@ usr/sbin/snort
|
||||
#usr/share/doc/snort/README.dnp3
|
||||
#usr/share/doc/snort/README.dns
|
||||
#usr/share/doc/snort/README.event_queue
|
||||
#usr/share/doc/snort/README.file
|
||||
#usr/share/doc/snort/README.file_ips
|
||||
#usr/share/doc/snort/README.filters
|
||||
#usr/share/doc/snort/README.flowbits
|
||||
#usr/share/doc/snort/README.frag3
|
||||
#usr/share/doc/snort/README.ftptelnet
|
||||
#usr/share/doc/snort/README.gre
|
||||
#usr/share/doc/snort/README.ha
|
||||
#usr/share/doc/snort/README.http_inspect
|
||||
#usr/share/doc/snort/README.imap
|
||||
#usr/share/doc/snort/README.ipip
|
||||
|
||||
@@ -58,6 +58,7 @@ etc/strongswan.d/charon/updown.conf
|
||||
etc/strongswan.d/charon/x509.conf
|
||||
etc/strongswan.d/charon/xauth-eap.conf
|
||||
etc/strongswan.d/charon/xauth-generic.conf
|
||||
etc/strongswan.d/charon/xauth-noauth.conf
|
||||
etc/strongswan.d/charon/xcbc.conf
|
||||
etc/strongswan.d/starter.conf
|
||||
etc/strongswan.d/tools.conf
|
||||
@@ -134,6 +135,7 @@ usr/lib/ipsec/plugins/libstrongswan-updown.so
|
||||
usr/lib/ipsec/plugins/libstrongswan-x509.so
|
||||
usr/lib/ipsec/plugins/libstrongswan-xauth-eap.so
|
||||
usr/lib/ipsec/plugins/libstrongswan-xauth-generic.so
|
||||
usr/lib/ipsec/plugins/libstrongswan-xauth-noauth.so
|
||||
usr/lib/ipsec/plugins/libstrongswan-xcbc.so
|
||||
#usr/libexec/ipsec
|
||||
usr/libexec/ipsec/_copyright
|
||||
@@ -212,6 +214,7 @@ usr/sbin/ipsec
|
||||
#usr/share/strongswan/templates/config/plugins/x509.conf
|
||||
#usr/share/strongswan/templates/config/plugins/xauth-eap.conf
|
||||
#usr/share/strongswan/templates/config/plugins/xauth-generic.conf
|
||||
#usr/share/strongswan/templates/config/plugins/xauth-noauth.conf
|
||||
#usr/share/strongswan/templates/config/plugins/xcbc.conf
|
||||
#usr/share/strongswan/templates/config/strongswan.conf
|
||||
#usr/share/strongswan/templates/config/strongswan.d
|
||||
|
||||
@@ -43,6 +43,7 @@ usr/share/usb_modeswitch/05c6:6503
|
||||
usr/share/usb_modeswitch/05c6:9024
|
||||
usr/share/usb_modeswitch/05c6:f000
|
||||
usr/share/usb_modeswitch/05c7:1000
|
||||
usr/share/usb_modeswitch/0685:2000
|
||||
usr/share/usb_modeswitch/072f:100d
|
||||
usr/share/usb_modeswitch/07d1:a800
|
||||
usr/share/usb_modeswitch/07d1:a804
|
||||
@@ -174,6 +175,8 @@ usr/share/usb_modeswitch/12d1:1553
|
||||
usr/share/usb_modeswitch/12d1:1557
|
||||
usr/share/usb_modeswitch/12d1:155b
|
||||
usr/share/usb_modeswitch/12d1:156a
|
||||
usr/share/usb_modeswitch/12d1:157c
|
||||
usr/share/usb_modeswitch/12d1:157d
|
||||
usr/share/usb_modeswitch/12d1:1805
|
||||
usr/share/usb_modeswitch/12d1:1c0b
|
||||
usr/share/usb_modeswitch/12d1:1c1b
|
||||
@@ -188,6 +191,10 @@ usr/share/usb_modeswitch/12d1:1f16
|
||||
usr/share/usb_modeswitch/12d1:1f17
|
||||
usr/share/usb_modeswitch/12d1:1f18
|
||||
usr/share/usb_modeswitch/12d1:1f19
|
||||
usr/share/usb_modeswitch/12d1:1f1b
|
||||
usr/share/usb_modeswitch/12d1:1f1c
|
||||
usr/share/usb_modeswitch/12d1:1f1d
|
||||
usr/share/usb_modeswitch/12d1:1f1e
|
||||
usr/share/usb_modeswitch/12d1:380b
|
||||
usr/share/usb_modeswitch/1307:1169
|
||||
usr/share/usb_modeswitch/1410:5010
|
||||
@@ -228,25 +235,34 @@ usr/share/usb_modeswitch/19d2:0166
|
||||
usr/share/usb_modeswitch/19d2:0169
|
||||
usr/share/usb_modeswitch/19d2:0266
|
||||
usr/share/usb_modeswitch/19d2:0304
|
||||
usr/share/usb_modeswitch/19d2:0318
|
||||
usr/share/usb_modeswitch/19d2:0325
|
||||
usr/share/usb_modeswitch/19d2:1001
|
||||
usr/share/usb_modeswitch/19d2:1007
|
||||
usr/share/usb_modeswitch/19d2:1009
|
||||
usr/share/usb_modeswitch/19d2:1013
|
||||
usr/share/usb_modeswitch/19d2:1017
|
||||
usr/share/usb_modeswitch/19d2:1030
|
||||
usr/share/usb_modeswitch/19d2:1171
|
||||
usr/share/usb_modeswitch/19d2:1175
|
||||
usr/share/usb_modeswitch/19d2:1179
|
||||
usr/share/usb_modeswitch/19d2:1201
|
||||
usr/share/usb_modeswitch/19d2:1207
|
||||
usr/share/usb_modeswitch/19d2:1210
|
||||
usr/share/usb_modeswitch/19d2:1216
|
||||
usr/share/usb_modeswitch/19d2:1219
|
||||
usr/share/usb_modeswitch/19d2:1224
|
||||
usr/share/usb_modeswitch/19d2:1225
|
||||
usr/share/usb_modeswitch/19d2:1227
|
||||
usr/share/usb_modeswitch/19d2:1233
|
||||
usr/share/usb_modeswitch/19d2:1238
|
||||
usr/share/usb_modeswitch/19d2:1511
|
||||
usr/share/usb_modeswitch/19d2:1514
|
||||
usr/share/usb_modeswitch/19d2:1517
|
||||
usr/share/usb_modeswitch/19d2:1520
|
||||
usr/share/usb_modeswitch/19d2:1523
|
||||
usr/share/usb_modeswitch/19d2:1528
|
||||
usr/share/usb_modeswitch/19d2:1536
|
||||
usr/share/usb_modeswitch/19d2:1542
|
||||
usr/share/usb_modeswitch/19d2:2000
|
||||
usr/share/usb_modeswitch/19d2:2004
|
||||
|
||||
1
config/rootfiles/core/77/filelists/GeoIP
Normal file
1
config/rootfiles/core/77/filelists/GeoIP
Normal file
@@ -0,0 +1 @@
|
||||
usr/local/share/GeoIP/GeoIP.dat
|
||||
@@ -20,6 +20,7 @@ srv/web/ipfire/html/themes/ipfire
|
||||
srv/web/ipfire/html/themes/ipfire-legacy
|
||||
srv/web/ipfire/html/themes/maniac
|
||||
usr/lib/firewall
|
||||
usr/local/bin/backupiso
|
||||
usr/local/bin/timezone-transition
|
||||
usr/local/bin/setddns.pl
|
||||
usr/sbin/updxlrator
|
||||
@@ -31,3 +32,4 @@ var/ipfire/header.pl
|
||||
var/ipfire/graphs.pl
|
||||
var/ipfire/langs
|
||||
var/ipfire/menu.d/10-system.menu
|
||||
var/ipfire/menu.d/20-status.menu
|
||||
|
||||
2
config/rootfiles/core/77/filelists/hwdata
Normal file
2
config/rootfiles/core/77/filelists/hwdata
Normal file
@@ -0,0 +1,2 @@
|
||||
usr/share/hwdata/pci.ids
|
||||
usr/share/hwdata/usb.ids
|
||||
@@ -399,13 +399,17 @@ if [ -e /var/ipfire/qos/enable ]; then
|
||||
/usr/local/bin/qosctrl start
|
||||
fi
|
||||
|
||||
chown cron:cron /var/spool/cron
|
||||
# Update crontab
|
||||
cat <<EOF >> /var/spool/cron/root.orig
|
||||
grep -q timezone-transition /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig
|
||||
|
||||
# Re-read firewall rules every Sunday in March, October and November to take care of daylight saving time
|
||||
00 3 * 3 0 /usr/local/bin/timezone-transition /usr/local/bin/firewallctrl
|
||||
00 2 * 10-11 0 /usr/local/bin/timezone-transition /usr/local/bin/firewallctrl
|
||||
EOF
|
||||
|
||||
# Remove dialctrl script.
|
||||
sed -i /var/spool/cron/root.orig -e "/Dialup/,/dialctrl.pl/d"
|
||||
fcrontab -z &>/dev/null
|
||||
|
||||
|
||||
|
||||
20
config/rootfiles/core/78/exclude
Normal file
20
config/rootfiles/core/78/exclude
Normal file
@@ -0,0 +1,20 @@
|
||||
boot/config.txt
|
||||
etc/collectd.custom
|
||||
etc/ipsec.conf
|
||||
etc/ipsec.secrets
|
||||
etc/ipsec.user.conf
|
||||
etc/ipsec.user.secrets
|
||||
etc/localtime
|
||||
etc/shadow
|
||||
etc/ssh/ssh_config
|
||||
etc/ssh/sshd_config
|
||||
etc/ssl/openssl.cnf
|
||||
etc/sudoers
|
||||
etc/sysconfig/firewall.local
|
||||
etc/sysconfig/rc.local
|
||||
etc/udev/rules.d/30-persistent-network.rules
|
||||
srv/web/ipfire/html/proxy.pac
|
||||
var/ipfire/ovpn
|
||||
var/log/cache
|
||||
var/state/dhcp/dhcpd.leases
|
||||
var/updatecache
|
||||
1
config/rootfiles/core/78/filelists/armv5tel/linux-kirkwood
Symbolic link
1
config/rootfiles/core/78/filelists/armv5tel/linux-kirkwood
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/armv5tel/linux-kirkwood
|
||||
1
config/rootfiles/core/78/filelists/armv5tel/linux-multi
Symbolic link
1
config/rootfiles/core/78/filelists/armv5tel/linux-multi
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/armv5tel/linux-multi
|
||||
1
config/rootfiles/core/78/filelists/armv5tel/linux-rpi
Symbolic link
1
config/rootfiles/core/78/filelists/armv5tel/linux-rpi
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/armv5tel/linux-rpi
|
||||
1
config/rootfiles/core/78/filelists/daq
Symbolic link
1
config/rootfiles/core/78/filelists/daq
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/daq
|
||||
16
config/rootfiles/core/78/filelists/files
Normal file
16
config/rootfiles/core/78/filelists/files
Normal file
@@ -0,0 +1,16 @@
|
||||
etc/system-release
|
||||
etc/issue
|
||||
srv/web/ipfire/cgi-bin/ddns.cgi
|
||||
srv/web/ipfire/cgi-bin/ids.cgi
|
||||
srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat
|
||||
srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat
|
||||
srv/web/ipfire/cgi-bin/modem-status.cgi
|
||||
srv/web/ipfire/cgi-bin/ovpnmain.cgi
|
||||
srv/web/ipfire/cgi-bin/proxy.cgi
|
||||
srv/web/ipfire/html/themes/ipfire/include/functions.pl
|
||||
usr/local/bin/setddns.pl
|
||||
var/ipfire/langs
|
||||
var/ipfire/menu.d/20-status.menu
|
||||
var/ipfire/menu.d/70-log.menu
|
||||
var/ipfire/modem-lib.pl
|
||||
var/ipfire/ovpn/openssl/ovpn.cnf
|
||||
1
config/rootfiles/core/78/filelists/i586/grub
Symbolic link
1
config/rootfiles/core/78/filelists/i586/grub
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/i586/grub
|
||||
1
config/rootfiles/core/78/filelists/i586/linux
Symbolic link
1
config/rootfiles/core/78/filelists/i586/linux
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/i586/linux
|
||||
1
config/rootfiles/core/78/filelists/i586/syslinux
Symbolic link
1
config/rootfiles/core/78/filelists/i586/syslinux
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/i586/syslinux
|
||||
1
config/rootfiles/core/78/filelists/openvpn
Symbolic link
1
config/rootfiles/core/78/filelists/openvpn
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/openvpn
|
||||
1
config/rootfiles/core/78/filelists/ppp
Symbolic link
1
config/rootfiles/core/78/filelists/ppp
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/ppp
|
||||
1
config/rootfiles/core/78/filelists/snort
Symbolic link
1
config/rootfiles/core/78/filelists/snort
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/snort
|
||||
1
config/rootfiles/core/78/filelists/squid
Symbolic link
1
config/rootfiles/core/78/filelists/squid
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/squid
|
||||
1
config/rootfiles/core/78/filelists/vnstat
Symbolic link
1
config/rootfiles/core/78/filelists/vnstat
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/vnstat
|
||||
292
config/rootfiles/core/78/update.sh
Normal file
292
config/rootfiles/core/78/update.sh
Normal file
@@ -0,0 +1,292 @@
|
||||
#!/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) 2014 IPFire-Team <info@ipfire.org>. #
|
||||
# #
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
|
||||
|
||||
function add_to_backup ()
|
||||
{
|
||||
# Add path to ROOTFILES but remove old entries to prevent double
|
||||
# files in the tar
|
||||
grep -v "^$1" /opt/pakfire/tmp/ROOTFILES > /opt/pakfire/tmp/ROOTFILES.tmp
|
||||
mv /opt/pakfire/tmp/ROOTFILES.tmp /opt/pakfire/tmp/ROOTFILES
|
||||
echo $1 >> /opt/pakfire/tmp/ROOTFILES
|
||||
}
|
||||
|
||||
#
|
||||
# Remove old core updates from pakfire cache to save space...
|
||||
core=78
|
||||
for (( i=1; i<=${core}; i++ ))
|
||||
do
|
||||
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
|
||||
done
|
||||
|
||||
#
|
||||
# Do some sanity checks.
|
||||
case $(uname -r) in
|
||||
*-ipfire-versatile )
|
||||
/usr/bin/logger -p syslog.emerg -t ipfire \
|
||||
"core-update-${core}: ERROR cannot update. versatile support is dropped."
|
||||
# Report no error to pakfire. So it does not try to install it again.
|
||||
exit 0
|
||||
;;
|
||||
*-ipfire-xen )
|
||||
BOOTSIZE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f2 | tail -n 1`
|
||||
if [ $BOOTSIZE -lt 28000 ]; then
|
||||
/usr/bin/logger -p syslog.emerg -t ipfire \
|
||||
"core-update-${core}: ERROR cannot update because not enough space on boot."
|
||||
exit 2
|
||||
fi
|
||||
;;
|
||||
*-ipfire* )
|
||||
# Ok.
|
||||
;;
|
||||
* )
|
||||
/usr/bin/logger -p syslog.emerg -t ipfire \
|
||||
"core-update-${core}: ERROR cannot update. No IPFire Kernel."
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
#
|
||||
#
|
||||
KVER="xxxKVERxxx"
|
||||
MOUNT=`grep "kernel" /boot/grub/grub.conf 2>/dev/null | tail -n 1 `
|
||||
# Nur den letzten Parameter verwenden
|
||||
echo $MOUNT > /dev/null
|
||||
MOUNT=$_
|
||||
if [ ! $MOUNT == "rw" ]; then
|
||||
MOUNT="ro"
|
||||
fi
|
||||
|
||||
#
|
||||
# check if we the backup file already exist
|
||||
if [ -e /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz ]; then
|
||||
echo Moving backup to backup-old ...
|
||||
mv -f /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \
|
||||
/var/ipfire/backup/core-upgrade${core}_${KVER}-old.tar.xz
|
||||
fi
|
||||
echo First we made a backup of all files that was inside of the
|
||||
echo update archive. This may take a while ...
|
||||
# Add some files that are not in the package to backup
|
||||
add_to_backup lib/modules
|
||||
add_to_backup boot
|
||||
|
||||
# Backup the files
|
||||
tar cJvf /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \
|
||||
-C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' --exclude='/var/cache' > /dev/null 2>&1
|
||||
|
||||
# Check diskspace on root
|
||||
ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
|
||||
|
||||
if [ $ROOTSPACE -lt 100000 ]; then
|
||||
/usr/bin/logger -p syslog.emerg -t ipfire \
|
||||
"core-update-${core}: ERROR cannot update because not enough free space on root."
|
||||
exit 2
|
||||
fi
|
||||
|
||||
|
||||
echo
|
||||
echo Update Kernel to $KVER ...
|
||||
#
|
||||
# Remove old kernel, configs, initrd, modules ...
|
||||
#
|
||||
rm -rf /boot/System.map-*
|
||||
rm -rf /boot/config-*
|
||||
rm -rf /boot/ipfirerd-*
|
||||
rm -rf /boot/vmlinuz-*
|
||||
rm -rf /boot/uImage-ipfire-*
|
||||
rm -rf /boot/uInit-ipfire-*
|
||||
rm -rf /lib/modules
|
||||
|
||||
case $(uname -m) in
|
||||
i?86 )
|
||||
#
|
||||
# Backup grub.conf
|
||||
#
|
||||
cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org
|
||||
;;
|
||||
esac
|
||||
#
|
||||
#Stop services
|
||||
/etc/init.d/snort stop
|
||||
/etc/init.d/squid stop
|
||||
/etc/init.d/ipsec stop
|
||||
/etc/init.d/apache stop
|
||||
|
||||
# rename /etc/modprobe.d files
|
||||
for i in $(find /etc/modprobe.d/* | grep -v ".conf"); do
|
||||
mv $i $i.conf
|
||||
done
|
||||
|
||||
#
|
||||
#Extract files
|
||||
tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /
|
||||
|
||||
# Check diskspace on boot
|
||||
BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
|
||||
|
||||
if [ $BOOTSPACE -lt 1000 ]; then
|
||||
case $(uname -r) in
|
||||
*-ipfire-kirkwood )
|
||||
# Special handling for old kirkwood images.
|
||||
# (install only kirkwood kernel)
|
||||
rm -rf /boot/*
|
||||
tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \
|
||||
--numeric-owner -C / --wildcards 'boot/*-kirkwood*'
|
||||
;;
|
||||
* )
|
||||
/usr/bin/logger -p syslog.emerg -t ipfire \
|
||||
"core-update-${core}: FATAL-ERROR space run out on boot. System is not bootable..."
|
||||
/etc/init.d/apache start
|
||||
exit 4
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
|
||||
# Update Language cache
|
||||
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
|
||||
|
||||
#
|
||||
# Start services
|
||||
#
|
||||
/etc/init.d/apache start
|
||||
/etc/init.d/squid start
|
||||
/etc/init.d/snort start
|
||||
if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
|
||||
/etc/init.d/ipsec start
|
||||
fi
|
||||
|
||||
case $(uname -m) in
|
||||
i?86 )
|
||||
#
|
||||
# Modify grub.conf
|
||||
#
|
||||
echo
|
||||
echo Update grub configuration ...
|
||||
ROOT=`mount | grep " / " | cut -d" " -f1`
|
||||
|
||||
if [ ! -z $ROOT ]; then
|
||||
ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2`
|
||||
fi
|
||||
|
||||
if [ ! -z $ROOTUUID ]; then
|
||||
sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf
|
||||
else
|
||||
sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf
|
||||
fi
|
||||
sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf
|
||||
sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf
|
||||
|
||||
if [ "$(grep "^serial" /boot/grub/grub.conf.org)" == "" ]; then
|
||||
echo "grub use default console ..."
|
||||
else
|
||||
echo "grub use serial console ..."
|
||||
sed -i -e "s|splashimage|#splashimage|g" /boot/grub/grub.conf
|
||||
sed -i -e "s|#serial|serial|g" /boot/grub/grub.conf
|
||||
sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf
|
||||
sed -i -e "s| panic=10 | console=ttyS0,115200n8 panic=10 |g" /boot/grub/grub.conf
|
||||
fi
|
||||
|
||||
#
|
||||
# ReInstall grub
|
||||
#
|
||||
echo "(hd0) ${ROOT::`expr length $ROOT`-1}" > /boot/grub/device.map
|
||||
grub-install --no-floppy ${ROOT::`expr length $ROOT`-1}
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
# Force (re)install pae kernel if pae is supported
|
||||
rm -rf /opt/pakfire/db/*/meta-linux-pae
|
||||
if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
|
||||
ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
|
||||
BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
|
||||
if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then
|
||||
/usr/bin/logger -p syslog.emerg -t ipfire \
|
||||
"core-update-${core}: WARNING not enough space for pae kernel."
|
||||
else
|
||||
echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
|
||||
echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
|
||||
echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae
|
||||
echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae
|
||||
echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae
|
||||
echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-pae
|
||||
fi
|
||||
fi
|
||||
|
||||
# Force reinstall xen kernel if it was installed
|
||||
if [ -e "/opt/pakfire/db/installed/meta-linux-xen" ]; then
|
||||
echo "Name: linux-xen" > /opt/pakfire/db/installed/meta-linux-xen
|
||||
echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-xen
|
||||
echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-xen
|
||||
echo "Name: linux-xen" > /opt/pakfire/db/meta/meta-linux-xen
|
||||
echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-xen
|
||||
echo "Release: 0" >> /opt/pakfire/db/meta/meta-linux-xen
|
||||
# Add xvc0 to /etc/securetty
|
||||
echo "xvc0" >> /etc/securetty
|
||||
fi
|
||||
|
||||
#
|
||||
# After pakfire has ended run it again and update the lists and do upgrade
|
||||
#
|
||||
echo '#!/bin/bash' > /tmp/pak_update
|
||||
echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update
|
||||
echo ' sleep 1' >> /tmp/pak_update
|
||||
echo 'done' >> /tmp/pak_update
|
||||
echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update
|
||||
echo ' sleep 1' >> /tmp/pak_update
|
||||
echo 'done' >> /tmp/pak_update
|
||||
echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update
|
||||
echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
|
||||
echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
|
||||
echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
|
||||
echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update
|
||||
echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update
|
||||
echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update
|
||||
echo 'touch /var/run/need_reboot ' >> /tmp/pak_update
|
||||
#
|
||||
killall -KILL pak_update
|
||||
chmod +x /tmp/pak_update
|
||||
/tmp/pak_update &
|
||||
|
||||
sync
|
||||
|
||||
#
|
||||
#Finish
|
||||
(
|
||||
/etc/init.d/fireinfo start
|
||||
sendprofile
|
||||
) >/dev/null 2>&1 &
|
||||
|
||||
# Update Package list for addon installation
|
||||
/opt/pakfire/pakfire update -y --force
|
||||
|
||||
echo
|
||||
echo Please wait until pakfire has ended...
|
||||
echo
|
||||
#Don't report the exitcode last command
|
||||
exit 0
|
||||
|
||||
1
config/rootfiles/oldcore/75/meta
Normal file
1
config/rootfiles/oldcore/75/meta
Normal file
@@ -0,0 +1 @@
|
||||
DEPS=""
|
||||
@@ -4,21 +4,22 @@ usr/bin/clamconf
|
||||
usr/bin/clamdscan
|
||||
usr/bin/clamdtop
|
||||
usr/bin/clamscan
|
||||
usr/bin/clamsubmit
|
||||
usr/bin/freshclam
|
||||
usr/bin/sigtool
|
||||
#usr/include/clamav.h
|
||||
#usr/lib/libclamav.la
|
||||
usr/lib/libclamav.so
|
||||
usr/lib/libclamav.so.6
|
||||
usr/lib/libclamav.so.6.1.20
|
||||
usr/lib/libclamav.so.6.1.22
|
||||
#usr/lib/libclamunrar.la
|
||||
usr/lib/libclamunrar.so
|
||||
usr/lib/libclamunrar.so.6
|
||||
usr/lib/libclamunrar.so.6.1.20
|
||||
usr/lib/libclamunrar.so.6.1.22
|
||||
#usr/lib/libclamunrar_iface.la
|
||||
usr/lib/libclamunrar_iface.so
|
||||
usr/lib/libclamunrar_iface.so.6
|
||||
usr/lib/libclamunrar_iface.so.6.1.20
|
||||
usr/lib/libclamunrar_iface.so.6.1.22
|
||||
#usr/lib/pkgconfig/libclamav.pc
|
||||
usr/sbin/clamd
|
||||
usr/share/clamav
|
||||
@@ -27,6 +28,7 @@ usr/share/clamav
|
||||
#usr/share/man/man1/clamdscan.1
|
||||
#usr/share/man/man1/clamdtop.1
|
||||
#usr/share/man/man1/clamscan.1
|
||||
#usr/share/man/man1/clamsubmit.1
|
||||
#usr/share/man/man1/freshclam.1
|
||||
#usr/share/man/man1/sigtool.1
|
||||
#usr/share/man/man5/clamav-milter.conf.5
|
||||
|
||||
@@ -1295,9 +1295,6 @@ lib/modules/KVER-ipfire-pae
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/ics932s401.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/lis3lv02d
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/lis3lv02d/lis3lv02d.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/mei
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/mei/mei-me.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/mei/mei.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/pch_phub.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/ti-st
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/ti-st/st_drv.ko
|
||||
@@ -1647,6 +1644,8 @@ lib/modules/KVER-ipfire-pae
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas_tf
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas_uap
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas_uap/uap8xxx.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/mac80211_hwsim.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/mwifiex
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/mwifiex/mwifiex.ko
|
||||
@@ -2192,12 +2191,17 @@ lib/modules/KVER-ipfire-pae
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/w1/slaves/w1_therm.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/w1/wire.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/acquirewdt.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/advantechwdt.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/alim1535_wdt.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/alim7101_wdt.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/cpu5wdt.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/eurotechwdt.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/f71808e_wdt.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/geodewdt.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/hpwdt.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/i6300esb.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/iTCO_vendor_support.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/iTCO_wdt.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/ib700wdt.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/ibmasr.ko
|
||||
@@ -2206,11 +2210,19 @@ lib/modules/KVER-ipfire-pae
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/it87_wdt.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/machzwd.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/nv_tco.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/pc87413_wdt.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/pcwd_pci.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/pcwd_usb.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/retu_wdt.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sbc60xxwdt.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sbc7240_wdt.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sbc8360.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sbc_epx_c3.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sbc_fitpc2_wdt.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sc1200wdt.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sc520_wdt.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sch311x_wdt.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/smsc37b787_wdt.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/softdog.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sp5100_tco.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/via_wdt.ko
|
||||
@@ -2219,6 +2231,7 @@ lib/modules/KVER-ipfire-pae
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/w83697ug_wdt.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/w83877f_wdt.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/w83977f_wdt.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/wafer5823wdt.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/wdt_pci.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/xen_wdt.ko
|
||||
#lib/modules/KVER-ipfire-pae/kernel/drivers/xen
|
||||
|
||||
@@ -6,8 +6,10 @@ etc/nut/upsd.users.sample
|
||||
etc/nut/upsmon.conf.sample
|
||||
etc/nut/upssched.conf.sample
|
||||
etc/udev/rules.d/52-nut-usbups.rules
|
||||
usr/bin/al175
|
||||
usr/bin/apcsmart
|
||||
usr/bin/apcsmart-old
|
||||
usr/bin/apcupsd-ups
|
||||
usr/bin/bcmxcp
|
||||
usr/bin/bcmxcp_usb
|
||||
usr/bin/belkin
|
||||
@@ -34,14 +36,18 @@ usr/bin/metasys
|
||||
usr/bin/mge-shut
|
||||
usr/bin/mge-utalk
|
||||
usr/bin/microdowell
|
||||
usr/bin/newmge-shut
|
||||
usr/bin/nut-scanner
|
||||
usr/bin/nutdrv_atcl_usb
|
||||
usr/bin/nutdrv_qx
|
||||
usr/bin/oldmge-shut
|
||||
usr/bin/oneac
|
||||
usr/bin/optiups
|
||||
usr/bin/powercom
|
||||
usr/bin/powerpanel
|
||||
usr/bin/rhino
|
||||
usr/bin/richcomm_usb
|
||||
usr/bin/riello_ser
|
||||
usr/bin/riello_usb
|
||||
usr/bin/safenet
|
||||
usr/bin/skel
|
||||
usr/bin/snmp-ups
|
||||
@@ -52,14 +58,16 @@ usr/bin/tripplitesu
|
||||
usr/bin/upsc
|
||||
usr/bin/upscmd
|
||||
usr/bin/upscode2
|
||||
usr/bin/upsdrvctl
|
||||
usr/bin/upslog
|
||||
usr/bin/upsrw
|
||||
usr/bin/upssched-cmd
|
||||
usr/bin/usbhid-ups
|
||||
usr/bin/victronups
|
||||
#usr/cgi-bin
|
||||
#usr/html
|
||||
#usr/lib/libnutclient.a
|
||||
#usr/lib/libnutclient.la
|
||||
usr/lib/libnutclient.so
|
||||
usr/lib/libnutclient.so.0
|
||||
usr/lib/libnutclient.so.0.0.0
|
||||
#usr/lib/libnutscan.a
|
||||
#usr/lib/libnutscan.la
|
||||
usr/lib/libnutscan.so
|
||||
@@ -68,9 +76,10 @@ usr/lib/libnutscan.so.1.0.0
|
||||
#usr/lib/libupsclient.a
|
||||
#usr/lib/libupsclient.la
|
||||
usr/lib/libupsclient.so
|
||||
usr/lib/libupsclient.so.1
|
||||
usr/lib/libupsclient.so.1.1.0
|
||||
usr/lib/libupsclient.so.4
|
||||
usr/lib/libupsclient.so.4.0.0
|
||||
usr/sbin/upsd
|
||||
usr/sbin/upsdrvctl
|
||||
usr/sbin/upsmon
|
||||
usr/sbin/upssched
|
||||
usr/share/cmdvartab
|
||||
@@ -81,8 +90,10 @@ usr/share/driver.list
|
||||
#usr/share/man/man5/upsd.users.5
|
||||
#usr/share/man/man5/upsmon.conf.5
|
||||
#usr/share/man/man5/upssched.conf.5
|
||||
#usr/share/man/man8/al175.8
|
||||
#usr/share/man/man8/apcsmart-old.8
|
||||
#usr/share/man/man8/apcsmart.8
|
||||
#usr/share/man/man8/apcupsd-ups.8
|
||||
#usr/share/man/man8/bcmxcp.8
|
||||
#usr/share/man/man8/bcmxcp_usb.8
|
||||
#usr/share/man/man8/belkin.8
|
||||
@@ -91,7 +102,8 @@ usr/share/driver.list
|
||||
#usr/share/man/man8/bestfortress.8
|
||||
#usr/share/man/man8/bestuferrups.8
|
||||
#usr/share/man/man8/bestups.8
|
||||
#usr/share/man/man8/blazer.8
|
||||
#usr/share/man/man8/blazer_ser.8
|
||||
#usr/share/man/man8/blazer_usb.8
|
||||
#usr/share/man/man8/clone.8
|
||||
#usr/share/man/man8/dummy-ups.8
|
||||
#usr/share/man/man8/etapro.8
|
||||
@@ -107,7 +119,10 @@ usr/share/driver.list
|
||||
#usr/share/man/man8/mge-shut.8
|
||||
#usr/share/man/man8/mge-utalk.8
|
||||
#usr/share/man/man8/microdowell.8
|
||||
#usr/share/man/man8/nut-recorder.8
|
||||
#usr/share/man/man8/nut-scanner.8
|
||||
#usr/share/man/man8/nutdrv_atcl_usb.8
|
||||
#usr/share/man/man8/nutdrv_qx.8
|
||||
#usr/share/man/man8/nutupsdrv.8
|
||||
#usr/share/man/man8/oneac.8
|
||||
#usr/share/man/man8/optiups.8
|
||||
@@ -115,6 +130,8 @@ usr/share/driver.list
|
||||
#usr/share/man/man8/powerpanel.8
|
||||
#usr/share/man/man8/rhino.8
|
||||
#usr/share/man/man8/richcomm_usb.8
|
||||
#usr/share/man/man8/riello_ser.8
|
||||
#usr/share/man/man8/riello_usb.8
|
||||
#usr/share/man/man8/safenet.8
|
||||
#usr/share/man/man8/snmp-ups.8
|
||||
#usr/share/man/man8/solis.8
|
||||
|
||||
@@ -1,7 +1,4 @@
|
||||
etc/rc.d/init.d/pound
|
||||
etc/rc.d/rc0.d/K40pound
|
||||
etc/rc.d/rc3.d/S60pound
|
||||
etc/rc.d/rc6.d/K40pound
|
||||
#etc/pound.cfg
|
||||
usr/sbin/pound
|
||||
usr/sbin/poundctl
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
2
config/rootfiles/packages/sslscan
Normal file
2
config/rootfiles/packages/sslscan
Normal file
@@ -0,0 +1,2 @@
|
||||
usr/bin/sslscan
|
||||
#usr/share/man/man1/sslscan.1
|
||||
41
config/rootfiles/packages/stunnel
Normal file
41
config/rootfiles/packages/stunnel
Normal file
@@ -0,0 +1,41 @@
|
||||
etc/rc.d/init.d/stunnel
|
||||
etc/stunnel
|
||||
etc/stunnel/stunnel.conf
|
||||
#etc/stunnel/stunnel.conf-sample
|
||||
usr/bin/stunnel
|
||||
#usr/bin/stunnel3
|
||||
#usr/lib/stunnel
|
||||
#usr/lib/stunnel/libstunnel.la
|
||||
usr/lib/stunnel/libstunnel.so
|
||||
#usr/share/doc/stunnel
|
||||
#usr/share/doc/stunnel/AUTHORS
|
||||
#usr/share/doc/stunnel/BUGS
|
||||
#usr/share/doc/stunnel/COPYING
|
||||
#usr/share/doc/stunnel/COPYRIGHT.GPL
|
||||
#usr/share/doc/stunnel/CREDITS
|
||||
#usr/share/doc/stunnel/ChangeLog
|
||||
#usr/share/doc/stunnel/INSTALL
|
||||
#usr/share/doc/stunnel/INSTALL.FIPS
|
||||
#usr/share/doc/stunnel/INSTALL.W32
|
||||
#usr/share/doc/stunnel/INSTALL.WCE
|
||||
#usr/share/doc/stunnel/PORTS
|
||||
#usr/share/doc/stunnel/README
|
||||
#usr/share/doc/stunnel/TODO
|
||||
#usr/share/doc/stunnel/examples
|
||||
#usr/share/doc/stunnel/examples/ca.html
|
||||
#usr/share/doc/stunnel/examples/ca.pl
|
||||
#usr/share/doc/stunnel/examples/importCA.html
|
||||
#usr/share/doc/stunnel/examples/importCA.sh
|
||||
#usr/share/doc/stunnel/examples/script.sh
|
||||
#usr/share/doc/stunnel/examples/stunnel.init
|
||||
#usr/share/doc/stunnel/examples/stunnel.service
|
||||
#usr/share/doc/stunnel/examples/stunnel.spec
|
||||
#usr/share/doc/stunnel/stunnel.fr.html
|
||||
#usr/share/doc/stunnel/stunnel.html
|
||||
#usr/share/doc/stunnel/stunnel.pl.html
|
||||
#usr/share/man/man8/stunnel.8
|
||||
#usr/share/man/man8/stunnel.fr.8
|
||||
#usr/share/man/man8/stunnel.pl.8
|
||||
var/ipfire/backup/addons/includes/stunnel
|
||||
var/lib/stunnel
|
||||
var/lib/stunnel/run
|
||||
21
config/stunnel/stunnel.conf
Normal file
21
config/stunnel/stunnel.conf
Normal file
@@ -0,0 +1,21 @@
|
||||
; File: /etc/stunnel/stunnel.conf
|
||||
|
||||
; Note: The pid and output locations are relative to the chroot location.
|
||||
|
||||
pid = /run/stunnel.pid
|
||||
chroot = /var/lib/stunnel
|
||||
client = no
|
||||
setuid = stunnel
|
||||
setgid = stunnel
|
||||
cert = /etc/stunnel/stunnel.pem
|
||||
|
||||
;debug = 7
|
||||
;output = stunnel.log
|
||||
|
||||
;[https]
|
||||
;accept = 443
|
||||
;connect = 80
|
||||
;; "TIMEOUTclose = 0" is a workaround for a design flaw in Microsoft SSL
|
||||
;; Microsoft implementations do not use SSL close-notify alert and thus
|
||||
;; they are vulnerable to truncation attacks
|
||||
;TIMEOUTclose = 0
|
||||
@@ -27,15 +27,16 @@ KERN_TYPE=pae
|
||||
KVER=xxxKVERxxx
|
||||
KERN_PACK=xxxKERN_PACKxxx
|
||||
KRNDOWN=http://mirror0.ipfire.org/pakfire2/$VERSION/paks
|
||||
|
||||
CONSOLE=hvc0
|
||||
###############################################################################
|
||||
# If you really want to use outdated legacy kernel uncomment this lines. #####
|
||||
# Not recommended!!! ##########################################################
|
||||
######################
|
||||
#KERN_TYPE=xen
|
||||
#KVER=2.6.32.61
|
||||
#KERN_PACK=28
|
||||
#KERN_PACK=29
|
||||
#KRNDOWN=http://mirror0.ipfire.org/pakfire2/2.15/paks
|
||||
#CONSOLE=xvc0
|
||||
###############################################################################
|
||||
|
||||
SIZEboot=64
|
||||
@@ -108,10 +109,10 @@ mount -o loop $IMGvar $MNThdd/var
|
||||
|
||||
# Install IPFire without kernel modules
|
||||
tar -C $MNThdd/ -xvf $ISODIR/$SNAME-$VERSION.tlz --lzma \
|
||||
--exclude=lib/modules* --exclude=boot*
|
||||
--exclude=lib/modules* --exclude=boot* --numeric-owner
|
||||
|
||||
#Install Kernel
|
||||
tar -C $MNThdd/opt/pakfire/tmp -xvf $TMPDIR/$KERNEL
|
||||
tar -C $MNThdd/opt/pakfire/tmp -xvf $TMPDIR/$KERNEL --numeric-owner
|
||||
chroot $MNThdd /opt/pakfire/tmp/install.sh
|
||||
rm -rf $MNThdd/opt/pakfire/tmp/*
|
||||
|
||||
@@ -120,7 +121,7 @@ mkdir $MNThdd/boot/grub
|
||||
echo "timeout 10" > $MNThdd/boot/grub/grub.conf
|
||||
echo "default 0" >> $MNThdd/boot/grub/grub.conf
|
||||
echo "title IPFire ($KERN_TYPE-kernel)" >> $MNThdd/boot/grub/grub.conf
|
||||
echo " kernel /vmlinuz-$KVER-ipfire-xen root=/dev/xvda3 rootdelay=10 panic=10 console=xvc0 ro" \
|
||||
echo " kernel /vmlinuz-$KVER-ipfire-$KERN_TYPE root=/dev/xvda3 rootdelay=10 panic=10 console=$CONSOLE ro" \
|
||||
>> $MNThdd/boot/grub/grub.conf
|
||||
echo " initrd /ipfirerd-$KVER-$KERN_TYPE.img" >> $MNThdd/boot/grub/grub.conf
|
||||
echo "# savedefault 0" >> $MNThdd/boot/grub/grub.conf
|
||||
@@ -161,12 +162,12 @@ rm -rf $MNThdd/etc/rc.d/rcsysinit.d/S19checkfstab
|
||||
#Remove console init
|
||||
rm -rf $MNThdd/etc/rc.d/rcsysinit.d/S70console
|
||||
|
||||
#Add xvc0 to securetty
|
||||
echo xvc0 >> $MNThdd/etc/securetty
|
||||
#Add console to securetty
|
||||
echo $CONSOLE >> $MNThdd/etc/securetty
|
||||
|
||||
#Add getty for xvc0
|
||||
#Add getty for console
|
||||
echo "#Enable login for XEN" >> $MNThdd/etc/inittab
|
||||
echo "8:2345:respawn:/sbin/agetty xvc0 9600 --noclear" >> $MNThdd/etc/inittab
|
||||
echo "8:2345:respawn:/sbin/agetty $CONSOLE 9600 --noclear" >> $MNThdd/etc/inittab
|
||||
|
||||
#Disable some initskripts
|
||||
echo "#!/bin/sh" > $MNThdd/etc/rc.d/init.d/setclock
|
||||
|
||||
Reference in New Issue
Block a user