IPFire-SCM December 2012

ipfire-scm@lists.ipfire.org

1 participants
59 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b88cd7caa1a8b2975804ff2923fd98c1a4eb1640
by git＠ipfire.org 17 Dec '12

17 Dec '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via b88cd7caa1a8b2975804ff2923fd98c1a4eb1640 (commit) from 51379603c8161d5ef6ede182251789d098a3d833 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b88cd7caa1a8b2975804ff2923fd98c1a4eb1640 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Dec 17 16:08:44 2012 +0100 samba: update to 3.5.20. ----------------------------------------------------------------------- Summary of changes: lfs/samba | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/samba b/lfs/samba index 84a8a2b..ed4554a 100644 --- a/lfs/samba +++ b/lfs/samba @@ -24,7 +24,7 @@ include Config -VER = 3.5.19 +VER = 3.5.20 THISAPP = samba-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 43 +PAK_VER = 44 DEPS = "cups" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 48718ed4fbc0f0fa7fcc38d52ca3cfff +$(DL_FILE)_MD5 = 5ac0420b2e7336f902204bcef3319b9f install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. fc992179a15a53c920d8f18e276624c0ace6a6ec
by git＠ipfire.org 17 Dec '12

17 Dec '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, thirteen has been updated via fc992179a15a53c920d8f18e276624c0ace6a6ec (commit) via 51379603c8161d5ef6ede182251789d098a3d833 (commit) via f17d112c0480e951771bdca5f5eace7592ecd2c2 (commit) via f9f13c135b2c8d86a1861aec8f80985483843f52 (commit) via 7c8301fb8a501d03e47923bf7eb321330b663736 (commit) via ff1ed674e01b7db0acd4a565dc74cca01b825f6b (commit) via 1d0fcb09edd3929dda72d23afd3a8d16f7713794 (commit) from d65e0bd38d3bf816c854d57d520bea9836959747 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fc992179a15a53c920d8f18e276624c0ace6a6ec Merge: d65e0bd 5137960 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Dec 17 10:16:46 2012 +0100 Merge remote-tracking branch 'origin/next' into thirteen ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/configroot | 4 ++++ config/rootfiles/core/65/filelists/files | 2 ++ html/cgi-bin/routing.cgi | 4 +++- lfs/configroot | 4 ++-- src/misc-progs/launch-ether-wake.c | 4 ++++ src/scripts/ovpn-ccd-convert | 7 +++++-- 6 files changed, 20 insertions(+), 5 deletions(-) Difference in files: diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index e14f7e0..1d2fc9d 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -110,6 +110,10 @@ var/ipfire/outgoing/defaultservices #var/ipfire/outgoing/p2protocols #var/ipfire/outgoing/rules #var/ipfire/outgoing/settings +var/ipfire/ovpn +var/ipfire/ovpn/ccd.conf +var/ipfire/ovpn/ccdroute +var/ipfire/ovpn/ccdroute2 var/ipfire/pakfire #var/ipfire/pakfire/settings #var/ipfire/patches diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/core/65/filelists/files index 67bd0b3..13788f1 100644 --- a/config/rootfiles/core/65/filelists/files +++ b/config/rootfiles/core/65/filelists/files @@ -3,7 +3,9 @@ etc/system-release etc/issue srv/web/ipfire/cgi-bin/logs.cgi/calamaris.dat srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/routing.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi +usr/local/bin/launch-ether-wake usr/sbin/ovpn-ccd-convert var/ipfire/general-functions.pl var/ipfire/langs diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi index 86e0429..afcd388 100644 --- a/html/cgi-bin/routing.cgi +++ b/html/cgi-bin/routing.cgi @@ -118,6 +118,8 @@ if ($settings{'ACTION'} eq $Lang::tr{'toggle enable disable'}) { } if ($settings{'ACTION'} eq $Lang::tr{'add'}) { + # Convert subnet masks to CIDR notation. + $settings{'IP'} = &General::iporsubtocidr($settings{'IP'}); # Validate inputs if (( !&General::validip($settings{'IP'})) and ( !&General::validipandmask($settings{'IP'}))){ @@ -443,4 +445,4 @@ sub SortDataFile # sub BuildConfiguration { system '/usr/local/bin/rebuildroutes'; -} \ No newline at end of file +} diff --git a/lfs/configroot b/lfs/configroot index 90f5afa..f8fe426 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -53,7 +53,7 @@ $(TARGET) : for i in addon-lang auth backup ca certs connscheduler crls ddns dhcp dhcpc dmzholes dns \ ethernet extrahd/bin fwlogs isdn key langs logging mac main menu.d modem net-traffic \ net-traffic/templates nfs optionsfw outgoing/bin outgoing/groups outgoing/groups/ipgroups \ - outgoing/groups/macgroups patches pakfire portfw ppp private proxy/advanced/cre \ + outgoing/groups/macgroups ovpn patches pakfire portfw ppp private proxy/advanced/cre \ proxy/calamaris/bin qos/bin red remote sensors snort time tripwire/report \ updatexlrator/bin updatexlrator/autocheck urlfilter/autoupdate urlfilter/bin upnp vpn \ wakeonlan wireless xtaccess ; do \ @@ -66,7 +66,7 @@ $(TARGET) : dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dmzholes/config dns/settings ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \ extrahd/scan extrahd/devices extrahd/partitions extrahd/settings fwlogs/ipsettings fwlogs/portsettings \ isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing main/settings net-traffic/settings optionsfw/settings outgoing/settings outgoing/rules \ - pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \ + ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \ ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \ qos/tosconfig snort/settings tripwire/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \ vpn/ipsec.secrets vpn/caconfig wakeonlan/clients.conf wireless/config wireless/settings; do \ diff --git a/src/misc-progs/launch-ether-wake.c b/src/misc-progs/launch-ether-wake.c index f487041..cac4d3c 100644 --- a/src/misc-progs/launch-ether-wake.c +++ b/src/misc-progs/launch-ether-wake.c @@ -29,5 +29,9 @@ int main(int argc, char *argv[]) snprintf(command, BUFFER_SIZE-1, "/usr/sbin/etherwake -i %s %s", argv[2], argv[1]); safe_system(command); + /* Send magic packet with broadcast flag set. */ + snprintf(command, BUFFER_SIZE-1, "/usr/sbin/etherwake -i %s -b %s", argv[2], argv[1]); + safe_system(command); + return(0); } diff --git a/src/scripts/ovpn-ccd-convert b/src/scripts/ovpn-ccd-convert index 86b7c94..ac76435 100644 --- a/src/scripts/ovpn-ccd-convert +++ b/src/scripts/ovpn-ccd-convert @@ -1,13 +1,15 @@ #!/usr/bin/perl - +# Converter script for old openvpn clients my %net=(); my %ovpnconfig=(); my @serverconf=(); my $greennet; my $greensubnet; my $running='off'; -require '/var/ipfire/general-functions.pl'; +require '/var/ipfire/general-functions.pl'; +unless (-d "${General::swroot}/ovpn/ccd") { system("mkdir ${General::swroot}/ovpn/ccd"); } +system ("chown nobody.nobody ${General::swroot}/ovpn/ccd"); if ( -e "/var/run/openvpn.pid"){ $running='on'; system('/usr/local/bin/openvpnctrl', '-k'); @@ -46,3 +48,4 @@ if ($running eq 'on') { system('/usr/local/bin/openvpnctrl', '-s'); } +system ("chown nobody:nobody /var/ipfire/ovpn/ccd/*"); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. d65e0bd38d3bf816c854d57d520bea9836959747
by git＠ipfire.org 17 Dec '12

17 Dec '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, thirteen has been updated via d65e0bd38d3bf816c854d57d520bea9836959747 (commit) via 13e294d9c267f2ed58496bd1c33d368b00499ea2 (commit) from c51f6767e956061da2cd3db417328e03ae92a4ce (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d65e0bd38d3bf816c854d57d520bea9836959747 Merge: 13e294d c51f676 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Dec 17 10:15:44 2012 +0100 Merge branch 'thirteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into thirteen commit 13e294d9c267f2ed58496bd1c33d368b00499ea2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Dec 17 10:15:03 2012 +0100 kernel: updated kernel config. ----------------------------------------------------------------------- Summary of changes: .../kernel/kernel.config.armv5tel-ipfire-kirkwood | 350 ++++---- config/kernel/kernel.config.armv5tel-ipfire-omap | 405 ++++----- config/kernel/kernel.config.armv5tel-ipfire-rpi | 909 +++++++++++++-------- config/kernel/kernel.config.i586-ipfire | 5 +- config/kernel/kernel.config.i586-ipfire-pae | 5 +- config/rootfiles/common/armv5tel/linux-kirkwood | 146 ++-- config/rootfiles/common/armv5tel/linux-omap | 288 +++++-- config/rootfiles/common/armv5tel/linux-rpi | 440 +++++++--- config/rootfiles/common/i586/linux | 4 +- config/rootfiles/packages/linux-pae | 2 + 10 files changed, 1613 insertions(+), 941 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood index 715c7fa..59f7ded 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood +++ b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.2.34-ipfire-kirkwood Kernel Configuration +# Linux/arm 3.2.35 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -439,7 +439,7 @@ CONFIG_HAVE_AOUT=y CONFIG_PM_RUNTIME=y CONFIG_PM=y # CONFIG_PM_DEBUG is not set -CONFIG_APM_EMULATION=m +# CONFIG_APM_EMULATION is not set CONFIG_CPU_PM=y # CONFIG_ARM_CPU_SUSPEND is not set CONFIG_NET=y @@ -460,7 +460,7 @@ CONFIG_NET_KEY_MIGRATE=y CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_FIB_TRIE_STATS=y +# CONFIG_IP_FIB_TRIE_STATS is not set CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_ROUTE_MULTIPATH=y CONFIG_IP_ROUTE_VERBOSE=y @@ -518,7 +518,7 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m CONFIG_INET6_XFRM_MODE_BEET=m CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m CONFIG_IPV6_SIT=m -CONFIG_IPV6_SIT_6RD=y +# CONFIG_IPV6_SIT_6RD is not set CONFIG_IPV6_NDISC_NODETYPE=y CONFIG_IPV6_TUNNEL=m CONFIG_IPV6_MULTIPLE_TABLES=y @@ -539,7 +539,7 @@ CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_MARK=y -CONFIG_NF_CONNTRACK_ZONES=y +# CONFIG_NF_CONNTRACK_ZONES is not set CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NF_CONNTRACK_TIMESTAMP=y CONFIG_NF_CT_PROTO_DCCP=m @@ -566,7 +566,6 @@ CONFIG_NETFILTER_XTABLES=m # CONFIG_NETFILTER_XT_MARK=m CONFIG_NETFILTER_XT_CONNMARK=m -CONFIG_NETFILTER_XT_SET=m # # Xtables targets @@ -636,19 +635,7 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_TCPMSS=m CONFIG_NETFILTER_XT_MATCH_TIME=m CONFIG_NETFILTER_XT_MATCH_U32=m -CONFIG_IP_SET=m -CONFIG_IP_SET_MAX=256 -CONFIG_IP_SET_BITMAP_IP=m -CONFIG_IP_SET_BITMAP_IPMAC=m -CONFIG_IP_SET_BITMAP_PORT=m -CONFIG_IP_SET_HASH_IP=m -CONFIG_IP_SET_HASH_IPPORT=m -CONFIG_IP_SET_HASH_IPPORTIP=m -CONFIG_IP_SET_HASH_IPPORTNET=m -CONFIG_IP_SET_HASH_NET=m -CONFIG_IP_SET_HASH_NETPORT=m -CONFIG_IP_SET_HASH_NETIFACE=m -CONFIG_IP_SET_LIST_SET=m +# CONFIG_IP_SET is not set CONFIG_IP_VS=m CONFIG_IP_VS_IPV6=y # CONFIG_IP_VS_DEBUG is not set @@ -863,7 +850,7 @@ CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=m CONFIG_NET_ACT_PEDIT=m -# CONFIG_NET_ACT_SIMP is not set +CONFIG_NET_ACT_SIMP=m CONFIG_NET_ACT_SKBEDIT=m CONFIG_NET_ACT_CSUM=m CONFIG_NET_CLS_IND=y @@ -990,11 +977,12 @@ CONFIG_MAC80211_LEDS=y CONFIG_RFKILL=m CONFIG_RFKILL_LEDS=y CONFIG_RFKILL_INPUT=y +CONFIG_RFKILL_REGULATOR=m # CONFIG_NET_9P is not set -CONFIG_CAIF=m -# CONFIG_CAIF_DEBUG is not set -CONFIG_CAIF_NETDEV=m -# CONFIG_CEPH_LIB is not set +# CONFIG_CAIF is not set +CONFIG_CEPH_LIB=m +# CONFIG_CEPH_LIB_PRETTYDEBUG is not set +# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set # CONFIG_NFC is not set # @@ -1036,7 +1024,7 @@ CONFIG_MTD_BLOCK=m # CONFIG_INFTL is not set # CONFIG_RFD_FTL is not set # CONFIG_SSFDC is not set -# CONFIG_SM_FTL is not set +CONFIG_SM_FTL=m # CONFIG_MTD_OOPS is not set # CONFIG_MTD_SWAP is not set @@ -1138,9 +1126,10 @@ CONFIG_PARPORT_AX88796=m CONFIG_PARPORT_1284=y CONFIG_PARPORT_NOT_PC=y CONFIG_BLK_DEV=y -# CONFIG_BLK_CPQ_DA is not set -# CONFIG_BLK_CPQ_CISS_DA is not set -# CONFIG_BLK_DEV_DAC960 is not set +CONFIG_BLK_CPQ_DA=m +CONFIG_BLK_CPQ_CISS_DA=m +# CONFIG_CISS_SCSI_TAPE is not set +CONFIG_BLK_DEV_DAC960=m # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y @@ -1148,6 +1137,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 CONFIG_BLK_DEV_CRYPTOLOOP=m # CONFIG_BLK_DEV_DRBD is not set CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_OSD=m CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=y @@ -1158,7 +1148,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 CONFIG_ATA_OVER_ETH=m CONFIG_MG_DISK=m CONFIG_MG_DISK_RES=0 -# CONFIG_BLK_DEV_RBD is not set +CONFIG_BLK_DEV_RBD=m CONFIG_SENSORS_LIS3LV02D=m CONFIG_MISC_DEVICES=y # CONFIG_AD525X_DPOT is not set @@ -1283,7 +1273,7 @@ CONFIG_SCSI_AIC94XX=m # CONFIG_AIC94XX_DEBUG is not set CONFIG_SCSI_MVSAS=m CONFIG_SCSI_MVSAS_DEBUG=y -CONFIG_SCSI_MVSAS_TASKLET=y +# CONFIG_SCSI_MVSAS_TASKLET is not set CONFIG_SCSI_MVUMI=m CONFIG_SCSI_DPT_I2O=m # CONFIG_SCSI_ADVANSYS is not set @@ -1337,7 +1327,10 @@ CONFIG_SCSI_DH_RDAC=m CONFIG_SCSI_DH_HP_SW=m CONFIG_SCSI_DH_EMC=m CONFIG_SCSI_DH_ALUA=m -# CONFIG_SCSI_OSD_INITIATOR is not set +CONFIG_SCSI_OSD_INITIATOR=m +CONFIG_SCSI_OSD_ULD=m +CONFIG_SCSI_OSD_DPRINT_SENSE=1 +# CONFIG_SCSI_OSD_DEBUG is not set CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_VERBOSE_ERROR=y @@ -1478,7 +1471,7 @@ CONFIG_FIREWIRE_OHCI=m CONFIG_FIREWIRE_OHCI_DEBUG=y CONFIG_FIREWIRE_SBP2=m CONFIG_FIREWIRE_NET=m -CONFIG_FIREWIRE_NOSY=m +# CONFIG_FIREWIRE_NOSY is not set # CONFIG_I2O is not set CONFIG_NETDEVICES=y CONFIG_NET_CORE=y @@ -1545,10 +1538,6 @@ CONFIG_ATM_SOLOS=m # # CAIF transport drivers # -CONFIG_CAIF_TTY=m -CONFIG_CAIF_SPI_SLAVE=m -# CONFIG_CAIF_SPI_SYNC is not set -CONFIG_CAIF_HSI=m CONFIG_ETHERNET=y CONFIG_MDIO=m CONFIG_NET_VENDOR_3COM=y @@ -2020,7 +2009,7 @@ CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # CONFIG_INPUT_JOYDEV is not set -CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVDEV is not set # CONFIG_INPUT_EVBUG is not set # @@ -2054,12 +2043,11 @@ CONFIG_INPUT_88PM860X_ONKEY=m CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m CONFIG_INPUT_BMA150=m -CONFIG_INPUT_MMA8450=m -CONFIG_INPUT_MPU3050=m +# CONFIG_INPUT_MMA8450 is not set +# CONFIG_INPUT_MPU3050 is not set CONFIG_INPUT_ATI_REMOTE2=m CONFIG_INPUT_KEYSPAN_REMOTE=m -CONFIG_INPUT_KXTJ9=m -# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set +# CONFIG_INPUT_KXTJ9 is not set CONFIG_INPUT_POWERMATE=m CONFIG_INPUT_YEALINK=m CONFIG_INPUT_CM109=m @@ -2067,10 +2055,8 @@ CONFIG_INPUT_CM109=m CONFIG_INPUT_PCF50633_PMU=m CONFIG_INPUT_PCF8574=m CONFIG_INPUT_GPIO_ROTARY_ENCODER=m -CONFIG_INPUT_ADXL34X=m -CONFIG_INPUT_ADXL34X_I2C=m -CONFIG_INPUT_CMA3000=m -CONFIG_INPUT_CMA3000_I2C=m +# CONFIG_INPUT_ADXL34X is not set +# CONFIG_INPUT_CMA3000 is not set # # Hardware I/O ports @@ -2098,7 +2084,7 @@ CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set # CONFIG_SERIAL_NONSTANDARD is not set CONFIG_NOZOMI=m -# CONFIG_N_GSM is not set +CONFIG_N_GSM=m # CONFIG_TRACE_SINK is not set CONFIG_DEVKMEM=y @@ -2122,6 +2108,7 @@ CONFIG_SERIAL_8250_DW=m # Non-8250 serial port support # CONFIG_SERIAL_MFD_HSU=m +CONFIG_SERIAL_UARTLITE=m CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_JSM is not set @@ -2146,6 +2133,7 @@ CONFIG_IPMI_WATCHDOG=m CONFIG_IPMI_POWEROFF=m CONFIG_HW_RANDOM=m CONFIG_HW_RANDOM_TIMERIOMEM=m +CONFIG_NVRAM=m # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set @@ -2220,7 +2208,7 @@ CONFIG_I2C_EG20T=m CONFIG_I2C_DIOLAN_U2C=m CONFIG_I2C_PARPORT=m CONFIG_I2C_PARPORT_LIGHT=m -# CONFIG_I2C_TAOS_EVM is not set +CONFIG_I2C_TAOS_EVM=m CONFIG_I2C_TINY_USB=m # @@ -2242,9 +2230,9 @@ CONFIG_PPS=m # PPS clients support # # CONFIG_PPS_CLIENT_KTIMER is not set -CONFIG_PPS_CLIENT_LDISC=m -CONFIG_PPS_CLIENT_PARPORT=m -CONFIG_PPS_CLIENT_GPIO=m +# CONFIG_PPS_CLIENT_LDISC is not set +# CONFIG_PPS_CLIENT_PARPORT is not set +# CONFIG_PPS_CLIENT_GPIO is not set # # PPS generators support @@ -2258,7 +2246,7 @@ CONFIG_DP83640_PHY=m CONFIG_ARCH_REQUIRE_GPIOLIB=y CONFIG_GPIOLIB=y # CONFIG_DEBUG_GPIO is not set -# CONFIG_GPIO_SYSFS is not set +CONFIG_GPIO_SYSFS=y CONFIG_GPIO_GENERIC=m CONFIG_GPIO_MAX730X=m @@ -2283,6 +2271,7 @@ CONFIG_GPIO_ADP5588=m # # CONFIG_GPIO_BT8XX is not set CONFIG_GPIO_ML_IOH=m +# CONFIG_GPIO_TIMBERDALE is not set CONFIG_GPIO_RDC321X=m # @@ -2293,10 +2282,12 @@ CONFIG_GPIO_MCP23S08=m # # AC97 GPIO expanders: # +# CONFIG_GPIO_UCB1400 is not set # # MODULbus GPIO expanders: # +CONFIG_GPIO_JANZ_TTL=m CONFIG_W1=m CONFIG_W1_CON=y @@ -2325,18 +2316,15 @@ CONFIG_W1_SLAVE_BQ27000=m CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set # CONFIG_PDA_POWER is not set -# CONFIG_APM_POWER is not set # CONFIG_TEST_POWER is not set # CONFIG_BATTERY_DS2760 is not set # CONFIG_BATTERY_DS2780 is not set -CONFIG_BATTERY_DS2782=m +# CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_BQ20Z75 is not set -CONFIG_BATTERY_BQ27x00=m -CONFIG_BATTERY_BQ27X00_I2C=y -CONFIG_BATTERY_BQ27X00_PLATFORM=y -CONFIG_BATTERY_MAX17040=m +# CONFIG_BATTERY_BQ27x00 is not set +# CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set -CONFIG_CHARGER_PCF50633=m +# CONFIG_CHARGER_PCF50633 is not set # CONFIG_CHARGER_ISP1704 is not set # CONFIG_CHARGER_MAX8903 is not set # CONFIG_CHARGER_GPIO is not set @@ -2355,11 +2343,11 @@ CONFIG_SENSORS_ADM1026=m CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m -# CONFIG_SENSORS_ADT7411 is not set +CONFIG_SENSORS_ADT7411=m CONFIG_SENSORS_ADT7462=m CONFIG_SENSORS_ADT7470=m CONFIG_SENSORS_ADT7475=m -# CONFIG_SENSORS_ASC7621 is not set +CONFIG_SENSORS_ASC7621=m CONFIG_SENSORS_ATXP1=m CONFIG_SENSORS_DS620=m CONFIG_SENSORS_DS1621=m @@ -2510,10 +2498,10 @@ CONFIG_MFD_SM501=m # CONFIG_HTC_EGPIO is not set CONFIG_HTC_PASIC3=m # CONFIG_HTC_I2CPLD is not set -# CONFIG_UCB1400_CORE is not set -# CONFIG_TPS6105X is not set +CONFIG_UCB1400_CORE=m +CONFIG_TPS6105X=m CONFIG_TPS65010=m -# CONFIG_TPS6507X is not set +CONFIG_TPS6507X=m # CONFIG_MFD_TPS6586X is not set # CONFIG_MFD_TPS65910 is not set # CONFIG_MFD_TPS65912_I2C is not set @@ -2535,14 +2523,35 @@ CONFIG_MFD_PCF50633=m CONFIG_PCF50633_ADC=m CONFIG_PCF50633_GPIO=m # CONFIG_ABX500_CORE is not set -# CONFIG_MFD_TIMBERDALE is not set +CONFIG_MFD_TIMBERDALE=m CONFIG_LPC_SCH=m CONFIG_MFD_RDC321X=m -# CONFIG_MFD_JANZ_CMODIO is not set +CONFIG_MFD_JANZ_CMODIO=m CONFIG_MFD_VX855=m -# CONFIG_MFD_WL1273_CORE is not set +CONFIG_MFD_WL1273_CORE=m # CONFIG_MFD_AAT2870_CORE is not set -# CONFIG_REGULATOR is not set +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +# CONFIG_REGULATOR_DUMMY is not set +CONFIG_REGULATOR_FIXED_VOLTAGE=m +# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set +# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set +CONFIG_REGULATOR_GPIO=m +# CONFIG_REGULATOR_BQ24022 is not set +# CONFIG_REGULATOR_MAX1586 is not set +# CONFIG_REGULATOR_MAX8649 is not set +# CONFIG_REGULATOR_MAX8660 is not set +# CONFIG_REGULATOR_MAX8952 is not set +# CONFIG_REGULATOR_WM8400 is not set +# CONFIG_REGULATOR_PCF50633 is not set +# CONFIG_REGULATOR_LP3971 is not set +# CONFIG_REGULATOR_LP3972 is not set +# CONFIG_REGULATOR_TPS6105X is not set +# CONFIG_REGULATOR_TPS65023 is not set +# CONFIG_REGULATOR_TPS6507X is not set +# CONFIG_REGULATOR_88PM8607 is not set +# CONFIG_REGULATOR_ISL6271A is not set +# CONFIG_REGULATOR_AD5398 is not set CONFIG_MEDIA_SUPPORT=m # @@ -2562,21 +2571,21 @@ CONFIG_VIDEO_MEDIA=m CONFIG_RC_CORE=m CONFIG_LIRC=m CONFIG_RC_MAP=m -CONFIG_IR_NEC_DECODER=m -CONFIG_IR_RC5_DECODER=m -CONFIG_IR_RC6_DECODER=m -CONFIG_IR_JVC_DECODER=m -CONFIG_IR_SONY_DECODER=m -CONFIG_IR_RC5_SZ_DECODER=m -CONFIG_IR_MCE_KBD_DECODER=m -CONFIG_IR_LIRC_CODEC=m +# CONFIG_IR_NEC_DECODER is not set +# CONFIG_IR_RC5_DECODER is not set +# CONFIG_IR_RC6_DECODER is not set +# CONFIG_IR_JVC_DECODER is not set +# CONFIG_IR_SONY_DECODER is not set +# CONFIG_IR_RC5_SZ_DECODER is not set +# CONFIG_IR_MCE_KBD_DECODER is not set +# CONFIG_IR_LIRC_CODEC is not set # CONFIG_RC_ATI_REMOTE is not set # CONFIG_IR_IMON is not set # CONFIG_IR_MCEUSB is not set # CONFIG_IR_REDRAT3 is not set # CONFIG_IR_STREAMZAP is not set # CONFIG_RC_LOOPBACK is not set -# CONFIG_MEDIA_ATTACH is not set +CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_TUNER=m # CONFIG_MEDIA_TUNER_CUSTOMISE is not set CONFIG_MEDIA_TUNER_SIMPLE=m @@ -2739,6 +2748,7 @@ CONFIG_RADIO_ADAPTERS=y # CONFIG_RADIO_TEA5764 is not set # CONFIG_RADIO_SAA7706H is not set # CONFIG_RADIO_TEF6862 is not set +# CONFIG_RADIO_TIMBERDALE is not set # CONFIG_RADIO_WL1273 is not set # @@ -2979,7 +2989,7 @@ CONFIG_DISPLAY_SUPPORT=m # CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set # CONFIG_FONTS is not set CONFIG_FONT_8x8=y @@ -3032,6 +3042,7 @@ CONFIG_SND_MPU401=m CONFIG_SND_PORTMAN2X4=m CONFIG_SND_AC97_POWER_SAVE=y CONFIG_SND_AC97_POWER_SAVE_DEFAULT=60 +CONFIG_SND_TEA575X=m CONFIG_SND_PCI=y CONFIG_SND_AD1889=m CONFIG_SND_ALS300=m @@ -3074,16 +3085,18 @@ CONFIG_SND_ENS1370=m CONFIG_SND_ENS1371=m CONFIG_SND_ES1938=m CONFIG_SND_ES1968=m -# CONFIG_SND_ES1968_INPUT is not set -# CONFIG_SND_ES1968_RADIO is not set +CONFIG_SND_ES1968_INPUT=y +CONFIG_SND_ES1968_RADIO=y CONFIG_SND_FM801=m -# CONFIG_SND_FM801_TEA575X_BOOL is not set +CONFIG_SND_FM801_TEA575X_BOOL=y CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDA_PREALLOC_SIZE=64 -# CONFIG_SND_HDA_HWDEP is not set -# CONFIG_SND_HDA_INPUT_BEEP is not set -# CONFIG_SND_HDA_INPUT_JACK is not set -# CONFIG_SND_HDA_PATCH_LOADER is not set +CONFIG_SND_HDA_HWDEP=y +CONFIG_SND_HDA_RECONFIG=y +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_INPUT_BEEP_MODE=2 +CONFIG_SND_HDA_INPUT_JACK=y +CONFIG_SND_HDA_PATCH_LOADER=y CONFIG_SND_HDA_CODEC_REALTEK=y CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y CONFIG_SND_HDA_CODEC_ANALOG=y @@ -3097,7 +3110,8 @@ CONFIG_SND_HDA_CODEC_CA0132=y CONFIG_SND_HDA_CODEC_CMEDIA=y CONFIG_SND_HDA_CODEC_SI3054=y CONFIG_SND_HDA_GENERIC=y -# CONFIG_SND_HDA_POWER_SAVE is not set +CONFIG_SND_HDA_POWER_SAVE=y +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=60 CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m CONFIG_SND_ICE1712=m @@ -3105,10 +3119,10 @@ CONFIG_SND_ICE1724=m CONFIG_SND_INTEL8X0=m CONFIG_SND_INTEL8X0M=m CONFIG_SND_KORG1212=m -# CONFIG_SND_LOLA is not set +CONFIG_SND_LOLA=m CONFIG_SND_LX6464ES=m CONFIG_SND_MAESTRO3=m -# CONFIG_SND_MAESTRO3_INPUT is not set +CONFIG_SND_MAESTRO3_INPUT=y CONFIG_SND_MIXART=m CONFIG_SND_NM256=m CONFIG_SND_PCXHR=m @@ -3164,19 +3178,21 @@ CONFIG_USB_HIDDEV=y # Special HID drivers # CONFIG_HID_A4TECH=m -# CONFIG_HID_ACRUX is not set +CONFIG_HID_ACRUX=m +# CONFIG_HID_ACRUX_FF is not set CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m -# CONFIG_HID_PRODIKEYS is not set +CONFIG_HID_PRODIKEYS=m CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m -CONFIG_DRAGONRISE_FF=y +# CONFIG_DRAGONRISE_FF is not set # CONFIG_HID_EMS_FF is not set CONFIG_HID_ELECOM=m CONFIG_HID_EZKEY=m -# CONFIG_HID_HOLTEK is not set +CONFIG_HID_HOLTEK=m +# CONFIG_HOLTEK_FF is not set CONFIG_HID_KEYTOUCH=m CONFIG_HID_KYE=m CONFIG_HID_UCLOGIC=m @@ -3187,10 +3203,10 @@ CONFIG_HID_KENSINGTON=m CONFIG_HID_LCPOWER=m CONFIG_HID_LOGITECH=m CONFIG_HID_LOGITECH_DJ=m -CONFIG_LOGITECH_FF=y -CONFIG_LOGIRUMBLEPAD2_FF=y +# CONFIG_LOGITECH_FF is not set +# CONFIG_LOGIRUMBLEPAD2_FF is not set # CONFIG_LOGIG940_FF is not set -CONFIG_LOGIWHEELS_FF=y +# CONFIG_LOGIWHEELS_FF is not set CONFIG_HID_MAGICMOUSE=m CONFIG_HID_MICROSOFT=m CONFIG_HID_MONTEREY=m @@ -3198,7 +3214,7 @@ CONFIG_HID_MULTITOUCH=m CONFIG_HID_NTRIG=m CONFIG_HID_ORTEK=m CONFIG_HID_PANTHERLORD=m -CONFIG_PANTHERLORD_FF=y +# CONFIG_PANTHERLORD_FF is not set CONFIG_HID_PETALYNX=m CONFIG_HID_PICOLCD=m CONFIG_HID_PICOLCD_FB=y @@ -3219,17 +3235,17 @@ CONFIG_HID_SONY=m CONFIG_HID_SPEEDLINK=m CONFIG_HID_SUNPLUS=m CONFIG_HID_GREENASIA=m -CONFIG_GREENASIA_FF=y +# CONFIG_GREENASIA_FF is not set CONFIG_HID_SMARTJOYPLUS=m -CONFIG_SMARTJOYPLUS_FF=y +# CONFIG_SMARTJOYPLUS_FF is not set CONFIG_HID_TOPSEED=m CONFIG_HID_THRUSTMASTER=m -CONFIG_THRUSTMASTER_FF=y +# CONFIG_THRUSTMASTER_FF is not set CONFIG_HID_WACOM=m -CONFIG_HID_WACOM_POWER_SUPPLY=y +# CONFIG_HID_WACOM_POWER_SUPPLY is not set CONFIG_HID_WIIMOTE=m CONFIG_HID_ZEROPLUS=m -CONFIG_ZEROPLUS_FF=y +# CONFIG_ZEROPLUS_FF is not set CONFIG_HID_ZYDACRON=m CONFIG_USB_SUPPORT=y CONFIG_USB_COMMON=y @@ -3268,7 +3284,7 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_OXU210HP_HCD=m CONFIG_USB_ISP116X_HCD=m # CONFIG_USB_ISP1760_HCD is not set -# CONFIG_USB_ISP1362_HCD is not set +CONFIG_USB_ISP1362_HCD=m CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set @@ -3276,7 +3292,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_UHCI_HCD=y CONFIG_USB_U132_HCD=m CONFIG_USB_SL811_HCD=m -CONFIG_USB_SL811_HCD_ISO=y +# CONFIG_USB_SL811_HCD_ISO is not set # CONFIG_USB_SL811_CS is not set CONFIG_USB_R8A66597_HCD=m CONFIG_USB_WHCI_HCD=m @@ -3301,7 +3317,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m CONFIG_REALTEK_AUTOPM=y -# CONFIG_USB_STORAGE_DATAFAB is not set +CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m CONFIG_USB_STORAGE_USBAT=m @@ -3339,12 +3355,12 @@ CONFIG_USB_SERIAL_CP210X=m CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m -# CONFIG_USB_SERIAL_FUNSOFT is not set -# CONFIG_USB_SERIAL_VISOR is not set -# CONFIG_USB_SERIAL_IPAQ is not set -# CONFIG_USB_SERIAL_IR is not set +CONFIG_USB_SERIAL_FUNSOFT=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m CONFIG_USB_SERIAL_EDGEPORT=m -# CONFIG_USB_SERIAL_EDGEPORT_TI is not set +CONFIG_USB_SERIAL_EDGEPORT_TI=m CONFIG_USB_SERIAL_GARMIN=m CONFIG_USB_SERIAL_IPW=m CONFIG_USB_SERIAL_IUU=m @@ -3376,9 +3392,9 @@ CONFIG_USB_SERIAL_WWAN=m CONFIG_USB_SERIAL_OPTION=m # CONFIG_USB_SERIAL_OMNINET is not set CONFIG_USB_SERIAL_OPTICON=m -# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set +CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m CONFIG_USB_SERIAL_ZIO=m -# CONFIG_USB_SERIAL_SSU100 is not set +CONFIG_USB_SERIAL_SSU100=m # CONFIG_USB_SERIAL_DEBUG is not set # @@ -3449,9 +3465,10 @@ CONFIG_MMC_MVSDIO=m CONFIG_MMC_SDRICOH_CS=m CONFIG_MMC_CB710=m CONFIG_MMC_VIA_SDMMC=m -# CONFIG_MMC_DW is not set -# CONFIG_MMC_VUB300 is not set -# CONFIG_MMC_USHC is not set +CONFIG_MMC_DW=m +# CONFIG_MMC_DW_IDMAC is not set +CONFIG_MMC_VUB300=m +CONFIG_MMC_USHC=m CONFIG_MEMSTICK=m # CONFIG_MEMSTICK_DEBUG is not set @@ -3466,7 +3483,7 @@ CONFIG_MSPRO_BLOCK=m # CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MEMSTICK_JMICRON_38X=m -# CONFIG_MEMSTICK_R592 is not set +CONFIG_MEMSTICK_R592=m CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y @@ -3476,12 +3493,13 @@ CONFIG_LEDS_CLASS=y CONFIG_LEDS_88PM860X=m CONFIG_LEDS_LM3530=m CONFIG_LEDS_PCA9532=m -# CONFIG_LEDS_PCA9532_GPIO is not set +CONFIG_LEDS_PCA9532_GPIO=y CONFIG_LEDS_GPIO=m CONFIG_LEDS_LP3944=m CONFIG_LEDS_LP5521=m CONFIG_LEDS_LP5523=m CONFIG_LEDS_PCA955X=m +CONFIG_LEDS_REGULATOR=m CONFIG_LEDS_BD2802=m CONFIG_LEDS_LT3593=m CONFIG_LEDS_NS2=y @@ -3521,26 +3539,27 @@ CONFIG_RTC_INTF_DEV=y # # I2C RTC drivers # -CONFIG_RTC_DRV_88PM860X=m -# CONFIG_RTC_DRV_DS1307 is not set -# CONFIG_RTC_DRV_DS1374 is not set -# CONFIG_RTC_DRV_DS1672 is not set -# CONFIG_RTC_DRV_DS3232 is not set -# CONFIG_RTC_DRV_MAX6900 is not set -# CONFIG_RTC_DRV_RS5C372 is not set -# CONFIG_RTC_DRV_ISL1208 is not set -# CONFIG_RTC_DRV_ISL12022 is not set -# CONFIG_RTC_DRV_X1205 is not set -# CONFIG_RTC_DRV_PCF8563 is not set -# CONFIG_RTC_DRV_PCF8583 is not set -# CONFIG_RTC_DRV_M41T80 is not set -# CONFIG_RTC_DRV_BQ32K is not set -# CONFIG_RTC_DRV_S35390A is not set -# CONFIG_RTC_DRV_FM3130 is not set -# CONFIG_RTC_DRV_RX8581 is not set -# CONFIG_RTC_DRV_RX8025 is not set -# CONFIG_RTC_DRV_EM3027 is not set -# CONFIG_RTC_DRV_RV3029C2 is not set +CONFIG_RTC_DRV_88PM860X=y +CONFIG_RTC_DRV_DS1307=m +CONFIG_RTC_DRV_DS1374=m +CONFIG_RTC_DRV_DS1672=m +CONFIG_RTC_DRV_DS3232=m +CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_RS5C372=m +CONFIG_RTC_DRV_ISL1208=m +CONFIG_RTC_DRV_ISL12022=m +CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF8583=m +CONFIG_RTC_DRV_M41T80=m +CONFIG_RTC_DRV_M41T80_WDT=y +CONFIG_RTC_DRV_BQ32K=m +CONFIG_RTC_DRV_S35390A=m +CONFIG_RTC_DRV_FM3130=m +CONFIG_RTC_DRV_RX8581=m +CONFIG_RTC_DRV_RX8025=m +CONFIG_RTC_DRV_EM3027=m +CONFIG_RTC_DRV_RV3029C2=m # # SPI RTC drivers @@ -3549,20 +3568,20 @@ CONFIG_RTC_DRV_88PM860X=m # # Platform RTC drivers # -# CONFIG_RTC_DRV_CMOS is not set -# CONFIG_RTC_DRV_DS1286 is not set -# CONFIG_RTC_DRV_DS1511 is not set -# CONFIG_RTC_DRV_DS1553 is not set -# CONFIG_RTC_DRV_DS1742 is not set -# CONFIG_RTC_DRV_STK17TA8 is not set -# CONFIG_RTC_DRV_M48T86 is not set -# CONFIG_RTC_DRV_M48T35 is not set -# CONFIG_RTC_DRV_M48T59 is not set -# CONFIG_RTC_DRV_MSM6242 is not set -# CONFIG_RTC_DRV_BQ4802 is not set -# CONFIG_RTC_DRV_RP5C01 is not set -# CONFIG_RTC_DRV_V3020 is not set -# CONFIG_RTC_DRV_PCF50633 is not set +CONFIG_RTC_DRV_CMOS=m +CONFIG_RTC_DRV_DS1286=m +CONFIG_RTC_DRV_DS1511=m +CONFIG_RTC_DRV_DS1553=m +CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_STK17TA8=m +CONFIG_RTC_DRV_M48T86=m +CONFIG_RTC_DRV_M48T35=m +CONFIG_RTC_DRV_M48T59=m +CONFIG_RTC_DRV_MSM6242=m +CONFIG_RTC_DRV_BQ4802=m +CONFIG_RTC_DRV_RP5C01=m +CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_PCF50633=m # # on-CPU RTC drivers @@ -3593,7 +3612,7 @@ CONFIG_UIO_PDRV_GENIRQ=m CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m -# CONFIG_UIO_NETX is not set +CONFIG_UIO_NETX=m # # Virtio drivers @@ -3662,24 +3681,16 @@ CONFIG_IOMMU_SUPPORT=y # # File systems # -CONFIG_EXT2_FS=m -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -# CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=m -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_EXT3_FS_XATTR=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4_FS=m +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set +CONFIG_EXT4_FS=y +CONFIG_EXT4_USE_FOR_EXT23=y CONFIG_EXT4_FS_XATTR=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y # CONFIG_EXT4_DEBUG is not set -CONFIG_JBD=m -CONFIG_JBD2=m -CONFIG_FS_MBCACHE=m +CONFIG_JBD2=y +CONFIG_FS_MBCACHE=y CONFIG_REISERFS_FS=m # CONFIG_REISERFS_CHECK is not set CONFIG_REISERFS_PROC_INFO=y @@ -3697,7 +3708,6 @@ CONFIG_XFS_POSIX_ACL=y # CONFIG_XFS_RT is not set # CONFIG_XFS_DEBUG is not set # CONFIG_GFS2_FS is not set -# CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set # CONFIG_NILFS2_FS is not set CONFIG_FS_POSIX_ACL=y @@ -3710,7 +3720,7 @@ CONFIG_FANOTIFY=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_PRINT_QUOTA_WARNING=y -CONFIG_QUOTA_DEBUG=y +# CONFIG_QUOTA_DEBUG is not set CONFIG_QUOTA_TREE=m CONFIG_QFMT_V1=m CONFIG_QFMT_V2=m @@ -3761,7 +3771,7 @@ CONFIG_TMPFS=y # CONFIG_TMPFS_POSIX_ACL is not set CONFIG_TMPFS_XATTR=y # CONFIG_HUGETLB_PAGE is not set -CONFIG_CONFIGFS_FS=m +# CONFIG_CONFIGFS_FS is not set CONFIG_MISC_FILESYSTEMS=y # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set @@ -3801,6 +3811,7 @@ CONFIG_JFFS2_CMODE_PRIORITY=y CONFIG_UFS_FS=m # CONFIG_UFS_FS_WRITE is not set # CONFIG_UFS_DEBUG is not set +# CONFIG_EXOFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m CONFIG_NFS_V3=y @@ -3833,7 +3844,7 @@ CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set -CONFIG_CIFS_FSCACHE=y +# CONFIG_CIFS_FSCACHE is not set CONFIG_CIFS_ACL=y # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set @@ -3901,7 +3912,6 @@ CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_KOI8_R is not set # CONFIG_NLS_KOI8_U is not set CONFIG_NLS_UTF8=y -# CONFIG_DLM is not set # # Kernel hacking @@ -4123,7 +4133,7 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y CONFIG_RAID6_PQ=m CONFIG_BITREVERSE=y CONFIG_CRC_CCITT=m -CONFIG_CRC16=m +CONFIG_CRC16=y CONFIG_CRC_T10DIF=m CONFIG_CRC_ITU_T=m CONFIG_CRC32=y diff --git a/config/kernel/kernel.config.armv5tel-ipfire-omap b/config/kernel/kernel.config.armv5tel-ipfire-omap index ef5c5cc..a517782 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-omap +++ b/config/kernel/kernel.config.armv5tel-ipfire-omap @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.2.34 Kernel Configuration +# Linux/arm 3.2.35 Kernel Configuration # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -28,6 +28,7 @@ CONFIG_ARM_PATCH_PHYS_VIRT=y CONFIG_GENERIC_BUG=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_HAVE_IRQ_WORK=y +CONFIG_IRQ_WORK=y # # General setup @@ -123,8 +124,9 @@ CONFIG_PERF_USE_VMALLOC=y # # Kernel Performance Events And Counters # -# CONFIG_PERF_EVENTS is not set +CONFIG_PERF_EVENTS=y # CONFIG_PERF_COUNTERS is not set +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set CONFIG_VM_EVENT_COUNTERS=y CONFIG_SLUB_DEBUG=y # CONFIG_COMPAT_BRK is not set @@ -140,6 +142,7 @@ CONFIG_USE_GENERIC_SMP_HELPERS=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_CLK=y CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_HW_BREAKPOINT=y # # GCOV-based kernel profiling @@ -263,8 +266,8 @@ CONFIG_ARCH_OMAP=y # CONFIG_PLAT_SPEAR is not set # CONFIG_ARCH_VT8500 is not set # CONFIG_ARCH_ZYNQ is not set -# CONFIG_GPIO_PCA953X is not set -# CONFIG_KEYBOARD_GPIO_POLLED is not set +CONFIG_GPIO_PCA953X=m +CONFIG_KEYBOARD_GPIO_POLLED=m # # TI OMAP Common Features @@ -382,7 +385,7 @@ CONFIG_CPU_USE_DOMAINS=y # Processor Features # CONFIG_ARM_THUMB=y -CONFIG_ARM_THUMBEE=y +# CONFIG_ARM_THUMBEE is not set # CONFIG_CPU_ICACHE_DISABLE is not set # CONFIG_CPU_DCACHE_DISABLE is not set # CONFIG_CPU_BPREDICT_DISABLE is not set @@ -658,7 +661,6 @@ CONFIG_NETFILTER_XTABLES=m # CONFIG_NETFILTER_XT_MARK=m CONFIG_NETFILTER_XT_CONNMARK=m -CONFIG_NETFILTER_XT_SET=m # # Xtables targets @@ -728,19 +730,7 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_TCPMSS=m CONFIG_NETFILTER_XT_MATCH_TIME=m CONFIG_NETFILTER_XT_MATCH_U32=m -CONFIG_IP_SET=m -CONFIG_IP_SET_MAX=256 -CONFIG_IP_SET_BITMAP_IP=m -CONFIG_IP_SET_BITMAP_IPMAC=m -CONFIG_IP_SET_BITMAP_PORT=m -CONFIG_IP_SET_HASH_IP=m -CONFIG_IP_SET_HASH_IPPORT=m -CONFIG_IP_SET_HASH_IPPORTIP=m -CONFIG_IP_SET_HASH_IPPORTNET=m -CONFIG_IP_SET_HASH_NET=m -CONFIG_IP_SET_HASH_NETPORT=m -CONFIG_IP_SET_HASH_NETIFACE=m -CONFIG_IP_SET_LIST_SET=m +# CONFIG_IP_SET is not set CONFIG_IP_VS=m CONFIG_IP_VS_IPV6=y # CONFIG_IP_VS_DEBUG is not set @@ -773,7 +763,7 @@ CONFIG_IP_VS_TAB_BITS=12 # # IPVS application helper # -CONFIG_IP_VS_NFCT=y +# CONFIG_IP_VS_NFCT is not set # # IP: Netfilter Configuration @@ -955,7 +945,7 @@ CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=m CONFIG_NET_ACT_PEDIT=m -# CONFIG_NET_ACT_SIMP is not set +CONFIG_NET_ACT_SIMP=m CONFIG_NET_ACT_SKBEDIT=m CONFIG_NET_ACT_CSUM=m CONFIG_NET_CLS_IND=y @@ -1083,9 +1073,7 @@ CONFIG_RFKILL_INPUT=y CONFIG_RFKILL_REGULATOR=m CONFIG_RFKILL_GPIO=m # CONFIG_NET_9P is not set -CONFIG_CAIF=m -# CONFIG_CAIF_DEBUG is not set -CONFIG_CAIF_NETDEV=m +# CONFIG_CAIF is not set CONFIG_CEPH_LIB=m # CONFIG_CEPH_LIB_PRETTYDEBUG is not set # CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set @@ -1132,7 +1120,7 @@ CONFIG_MTD_BLOCK=m # CONFIG_SSFDC is not set CONFIG_SM_FTL=m # CONFIG_MTD_OOPS is not set -CONFIG_MTD_SWAP=m +# CONFIG_MTD_SWAP is not set # # RAM/ROM/Flash chip drivers @@ -1220,6 +1208,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 CONFIG_BLK_DEV_CRYPTOLOOP=m # CONFIG_BLK_DEV_DRBD is not set CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_OSD=m # CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=8 @@ -1229,24 +1218,24 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 CONFIG_ATA_OVER_ETH=m CONFIG_MG_DISK=m CONFIG_MG_DISK_RES=0 -# CONFIG_BLK_DEV_RBD is not set -# CONFIG_SENSORS_LIS3LV02D is not set +CONFIG_BLK_DEV_RBD=m +CONFIG_SENSORS_LIS3LV02D=m CONFIG_MISC_DEVICES=y # CONFIG_AD525X_DPOT is not set # CONFIG_ATMEL_PWM is not set CONFIG_ICS932S401=m CONFIG_ENCLOSURE_SERVICES=m -# CONFIG_APDS9802ALS is not set +CONFIG_APDS9802ALS=m CONFIG_ISL29003=m -# CONFIG_ISL29020 is not set +CONFIG_ISL29020=m CONFIG_SENSORS_TSL2550=m -# CONFIG_SENSORS_BH1780 is not set -# CONFIG_SENSORS_BH1770 is not set -# CONFIG_SENSORS_APDS990X is not set -# CONFIG_HMC6352 is not set +CONFIG_SENSORS_BH1780=m +CONFIG_SENSORS_BH1770=m +CONFIG_SENSORS_APDS990X=m +CONFIG_HMC6352=m CONFIG_DS1682=m -# CONFIG_BMP085 is not set -# CONFIG_USB_SWITCH_FSA9480 is not set +CONFIG_BMP085=m +CONFIG_USB_SWITCH_FSA9480=m CONFIG_C2PORT=m # @@ -1264,7 +1253,7 @@ CONFIG_IWMC3200TOP=m # Texas Instruments shared transport line discipline # CONFIG_TI_ST=m -# CONFIG_SENSORS_LIS3_I2C is not set +CONFIG_SENSORS_LIS3_I2C=m # # Altera FPGA firmware download module @@ -1321,7 +1310,10 @@ CONFIG_SCSI_DH_RDAC=m CONFIG_SCSI_DH_HP_SW=m CONFIG_SCSI_DH_EMC=m CONFIG_SCSI_DH_ALUA=m -# CONFIG_SCSI_OSD_INITIATOR is not set +CONFIG_SCSI_OSD_INITIATOR=m +CONFIG_SCSI_OSD_ULD=m +CONFIG_SCSI_OSD_DPRINT_SENSE=1 +# CONFIG_SCSI_OSD_DEBUG is not set CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_VERBOSE_ERROR=y @@ -1416,10 +1408,6 @@ CONFIG_ATM_TCP=m # # CAIF transport drivers # -CONFIG_CAIF_TTY=m -CONFIG_CAIF_SPI_SLAVE=m -# CONFIG_CAIF_SPI_SYNC is not set -CONFIG_CAIF_HSI=m CONFIG_ETHERNET=y CONFIG_NET_VENDOR_BROADCOM=y CONFIG_B44=m @@ -1442,7 +1430,7 @@ CONFIG_KS8851_MLL=m CONFIG_NET_VENDOR_NATSEMI=y CONFIG_NET_VENDOR_8390=y CONFIG_AX88796=m -# CONFIG_AX88796_93CX6 is not set +CONFIG_AX88796_93CX6=y CONFIG_ETHOC=m CONFIG_NET_VENDOR_SEEQ=y CONFIG_SEEQ8005=m @@ -1554,9 +1542,7 @@ CONFIG_HOSTAP_FIRMWARE=y # CONFIG_LIBERTAS is not set # CONFIG_P54_COMMON is not set # CONFIG_RT2X00 is not set -CONFIG_RTL8192CU=m -CONFIG_RTLWIFI=m -CONFIG_RTL8192C_COMMON=m +# CONFIG_RTL8192CU is not set # CONFIG_WL1251 is not set # CONFIG_WL12XX_MENU is not set # CONFIG_ZD1211RW is not set @@ -1656,8 +1642,8 @@ CONFIG_ISDN_CAPI_CAPIDRV=m CONFIG_CAPI_AVM=y CONFIG_CAPI_EICON=y CONFIG_ISDN_DRV_GIGASET=m -# CONFIG_GIGASET_CAPI is not set -CONFIG_GIGASET_I4L=y +CONFIG_GIGASET_CAPI=y +# CONFIG_GIGASET_I4L is not set # CONFIG_GIGASET_DUMMYLL is not set CONFIG_GIGASET_BASE=m CONFIG_GIGASET_M105=m @@ -1723,8 +1709,9 @@ CONFIG_KEYBOARD_XTKBD=m # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y -# CONFIG_INPUT_AD714X is not set -# CONFIG_INPUT_BMA150 is not set +CONFIG_INPUT_AD714X=m +CONFIG_INPUT_AD714X_I2C=m +CONFIG_INPUT_BMA150=m # CONFIG_INPUT_MMA8450 is not set # CONFIG_INPUT_MPU3050 is not set CONFIG_INPUT_ATI_REMOTE2=m @@ -1770,8 +1757,7 @@ CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set # CONFIG_SERIAL_NONSTANDARD is not set CONFIG_N_GSM=m -CONFIG_TRACE_ROUTER=m -CONFIG_TRACE_SINK=m +# CONFIG_TRACE_SINK is not set CONFIG_DEVKMEM=y # @@ -1793,7 +1779,7 @@ CONFIG_SERIAL_8250_DW=m # CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_SERIAL_OF_PLATFORM=m +CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_OMAP=y CONFIG_SERIAL_OMAP_CONSOLE=y CONFIG_SERIAL_TIMBERDALE=m @@ -1817,6 +1803,7 @@ CONFIG_IPMI_POWEROFF=m CONFIG_HW_RANDOM=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_OMAP=m +CONFIG_NVRAM=m # CONFIG_R3964 is not set # CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set @@ -1860,7 +1847,7 @@ CONFIG_I2C_XILINX=m CONFIG_I2C_DIOLAN_U2C=m CONFIG_I2C_PARPORT=m CONFIG_I2C_PARPORT_LIGHT=m -# CONFIG_I2C_TAOS_EVM is not set +CONFIG_I2C_TAOS_EVM=m CONFIG_I2C_TINY_USB=m # @@ -1881,10 +1868,10 @@ CONFIG_PPS=m # # PPS clients support # -CONFIG_PPS_CLIENT_KTIMER=m -CONFIG_PPS_CLIENT_LDISC=m -CONFIG_PPS_CLIENT_PARPORT=m -CONFIG_PPS_CLIENT_GPIO=m +# CONFIG_PPS_CLIENT_KTIMER is not set +# CONFIG_PPS_CLIENT_LDISC is not set +# CONFIG_PPS_CLIENT_PARPORT is not set +# CONFIG_PPS_CLIENT_GPIO is not set # # PPS generators support @@ -1898,7 +1885,7 @@ CONFIG_DP83640_PHY=m CONFIG_ARCH_REQUIRE_GPIOLIB=y CONFIG_GPIOLIB=y # CONFIG_DEBUG_GPIO is not set -# CONFIG_GPIO_SYSFS is not set +CONFIG_GPIO_SYSFS=y CONFIG_GPIO_GENERIC=m CONFIG_GPIO_MAX730X=m @@ -1965,14 +1952,12 @@ CONFIG_POWER_SUPPLY=y # CONFIG_TEST_POWER is not set # CONFIG_BATTERY_DS2760 is not set # CONFIG_BATTERY_DS2780 is not set -CONFIG_BATTERY_DS2782=m +# CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_BQ20Z75 is not set -CONFIG_BATTERY_BQ27x00=m -CONFIG_BATTERY_BQ27X00_I2C=y -CONFIG_BATTERY_BQ27X00_PLATFORM=y -CONFIG_BATTERY_MAX17040=m +# CONFIG_BATTERY_BQ27x00 is not set +# CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set -CONFIG_CHARGER_PCF50633=m +# CONFIG_CHARGER_PCF50633 is not set # CONFIG_CHARGER_ISP1704 is not set # CONFIG_CHARGER_MAX8903 is not set CONFIG_CHARGER_TWL4030=m @@ -1992,13 +1977,13 @@ CONFIG_SENSORS_ADM1026=m CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m -# CONFIG_SENSORS_ADT7411 is not set +CONFIG_SENSORS_ADT7411=m CONFIG_SENSORS_ADT7462=m CONFIG_SENSORS_ADT7470=m CONFIG_SENSORS_ADT7475=m -# CONFIG_SENSORS_ASC7621 is not set +CONFIG_SENSORS_ASC7621=m CONFIG_SENSORS_ATXP1=m -# CONFIG_SENSORS_DS620 is not set +CONFIG_SENSORS_DS620=m CONFIG_SENSORS_DS1621=m CONFIG_SENSORS_F71805F=m CONFIG_SENSORS_F71882FG=m @@ -2092,7 +2077,7 @@ CONFIG_WATCHDOG_CORE=y # Watchdog Device Drivers # CONFIG_SOFT_WATCHDOG=m -# CONFIG_DW_WATCHDOG is not set +CONFIG_DW_WATCHDOG=m CONFIG_MPCORE_WATCHDOG=m CONFIG_OMAP_WATCHDOG=m CONFIG_TWL4030_WATCHDOG=m @@ -2131,9 +2116,9 @@ CONFIG_MFD_SM501=m # CONFIG_HTC_EGPIO is not set CONFIG_HTC_PASIC3=m # CONFIG_HTC_I2CPLD is not set -# CONFIG_TPS6105X is not set +CONFIG_TPS6105X=m CONFIG_TPS65010=m -# CONFIG_TPS6507X is not set +CONFIG_TPS6507X=m # CONFIG_MFD_TPS6586X is not set # CONFIG_MFD_TPS65910 is not set # CONFIG_MFD_TPS65912_I2C is not set @@ -2172,7 +2157,7 @@ CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set -# CONFIG_REGULATOR_GPIO is not set +CONFIG_REGULATOR_GPIO=m # CONFIG_REGULATOR_BQ24022 is not set # CONFIG_REGULATOR_MAX1586 is not set # CONFIG_REGULATOR_MAX8649 is not set @@ -2183,8 +2168,9 @@ CONFIG_REGULATOR_TWL4030=y # CONFIG_REGULATOR_PCF50633 is not set # CONFIG_REGULATOR_LP3971 is not set # CONFIG_REGULATOR_LP3972 is not set -CONFIG_REGULATOR_TPS65023=m -CONFIG_REGULATOR_TPS6507X=m +# CONFIG_REGULATOR_TPS6105X is not set +# CONFIG_REGULATOR_TPS65023 is not set +# CONFIG_REGULATOR_TPS6507X is not set # CONFIG_REGULATOR_ISL6271A is not set # CONFIG_REGULATOR_AD5398 is not set CONFIG_MEDIA_SUPPORT=m @@ -2192,9 +2178,10 @@ CONFIG_MEDIA_SUPPORT=m # # Multimedia core support # -# CONFIG_MEDIA_CONTROLLER is not set +CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_DEV=m CONFIG_VIDEO_V4L2_COMMON=m +CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_DVB_CORE=m CONFIG_DVB_NET=y CONFIG_VIDEO_MEDIA=m @@ -2204,7 +2191,7 @@ CONFIG_VIDEO_MEDIA=m # CONFIG_RC_CORE=m CONFIG_LIRC=m -# CONFIG_RC_MAP is not set +CONFIG_RC_MAP=m # CONFIG_IR_NEC_DECODER is not set # CONFIG_IR_RC5_DECODER is not set # CONFIG_IR_RC6_DECODER is not set @@ -2219,7 +2206,7 @@ CONFIG_LIRC=m # CONFIG_IR_REDRAT3 is not set # CONFIG_IR_STREAMZAP is not set # CONFIG_RC_LOOPBACK is not set -# CONFIG_MEDIA_ATTACH is not set +CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_TUNER=m # CONFIG_MEDIA_TUNER_CUSTOMISE is not set CONFIG_MEDIA_TUNER_SIMPLE=m @@ -2239,7 +2226,7 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set -# CONFIG_VIDEO_IR_I2C is not set +CONFIG_VIDEO_IR_I2C=m # # Encoders, decoders, sensors and other helper chips @@ -2253,11 +2240,11 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_TDA9840 is not set # CONFIG_VIDEO_TEA6415C is not set # CONFIG_VIDEO_TEA6420 is not set -CONFIG_VIDEO_MSP3400=m +# CONFIG_VIDEO_MSP3400 is not set # CONFIG_VIDEO_CS5345 is not set -CONFIG_VIDEO_CS53L32A=m +# CONFIG_VIDEO_CS53L32A is not set # CONFIG_VIDEO_TLV320AIC23B is not set -CONFIG_VIDEO_WM8775=m +# CONFIG_VIDEO_WM8775 is not set # CONFIG_VIDEO_WM8739 is not set # CONFIG_VIDEO_VP27SMPX is not set @@ -2269,14 +2256,14 @@ CONFIG_VIDEO_WM8775=m # # Video decoders # -CONFIG_VIDEO_ADV7180=m +# CONFIG_VIDEO_ADV7180 is not set # CONFIG_VIDEO_BT819 is not set # CONFIG_VIDEO_BT856 is not set # CONFIG_VIDEO_BT866 is not set # CONFIG_VIDEO_KS0127 is not set # CONFIG_VIDEO_SAA7110 is not set -CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_SAA7191=m +# CONFIG_VIDEO_SAA711X is not set +# CONFIG_VIDEO_SAA7191 is not set # CONFIG_VIDEO_TVP514X is not set # CONFIG_VIDEO_TVP5150 is not set # CONFIG_VIDEO_TVP7002 is not set @@ -2286,12 +2273,12 @@ CONFIG_VIDEO_SAA7191=m # Video and audio decoders # # CONFIG_VIDEO_SAA717X is not set -CONFIG_VIDEO_CX25840=m +# CONFIG_VIDEO_CX25840 is not set # # MPEG video encoders # -CONFIG_VIDEO_CX2341X=m +# CONFIG_VIDEO_CX2341X is not set # # Video encoders @@ -2307,13 +2294,20 @@ CONFIG_VIDEO_CX2341X=m # Camera sensor devices # # CONFIG_VIDEO_OV7670 is not set +# CONFIG_VIDEO_MT9P031 is not set +# CONFIG_VIDEO_MT9T001 is not set # CONFIG_VIDEO_MT9V011 is not set +# CONFIG_VIDEO_MT9V032 is not set # CONFIG_VIDEO_TCM825X is not set -CONFIG_VIDEO_SR030PC30=m +# CONFIG_VIDEO_SR030PC30 is not set +# CONFIG_VIDEO_NOON010PC30 is not set +# CONFIG_VIDEO_M5MOLS is not set +# CONFIG_VIDEO_S5K6AA is not set # # Flash devices # +# CONFIG_VIDEO_ADP1653 is not set # # Video improvement chips @@ -2419,23 +2413,24 @@ CONFIG_DVB_CAPTURE_DRIVERS=y # # Graphics support # -# CONFIG_DRM is not set +CONFIG_DRM=m # CONFIG_VGASTATE is not set -# CONFIG_VIDEO_OUTPUT_CONTROL is not set +CONFIG_VIDEO_OUTPUT_CONTROL=m CONFIG_FB=y -# CONFIG_FIRMWARE_EDID is not set +CONFIG_FIRMWARE_EDID=y # CONFIG_FB_DDC is not set # CONFIG_FB_BOOT_VESA_SUPPORT is not set CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set -# CONFIG_FB_SYS_FILLRECT is not set -# CONFIG_FB_SYS_COPYAREA is not set -# CONFIG_FB_SYS_IMAGEBLIT is not set +CONFIG_FB_SYS_FILLRECT=m +CONFIG_FB_SYS_COPYAREA=m +CONFIG_FB_SYS_IMAGEBLIT=m # CONFIG_FB_FOREIGN_ENDIAN is not set -# CONFIG_FB_SYS_FOPS is not set +CONFIG_FB_SYS_FOPS=m # CONFIG_FB_WMT_GE_ROPS is not set +CONFIG_FB_DEFERRED_IO=y # CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set # CONFIG_FB_BACKLIGHT is not set @@ -2445,14 +2440,15 @@ CONFIG_FB_TILEBLITTING=y # # Frame buffer hardware drivers # -# CONFIG_FB_UVESA is not set +CONFIG_FB_UVESA=m # CONFIG_FB_S1D13XXX is not set -# CONFIG_FB_TMIO is not set -# CONFIG_FB_SM501 is not set -# CONFIG_FB_SMSCUFX is not set +CONFIG_FB_TMIO=m +CONFIG_FB_TMIO_ACCELL=y +CONFIG_FB_SM501=m +CONFIG_FB_SMSCUFX=m # CONFIG_FB_UDL is not set # CONFIG_FB_VIRTUAL is not set -# CONFIG_FB_METRONOME is not set +CONFIG_FB_METRONOME=m # CONFIG_FB_BROADSHEET is not set # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set CONFIG_OMAP2_VRAM=y @@ -2566,7 +2562,7 @@ CONFIG_SND_USB=y CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_UA101=m CONFIG_SND_USB_CAIAQ=m -# CONFIG_SND_USB_CAIAQ_INPUT is not set +CONFIG_SND_USB_CAIAQ_INPUT=y CONFIG_SND_USB_6FIRE=m CONFIG_SND_SOC=m CONFIG_SND_SOC_CACHE_LZO=y @@ -2613,63 +2609,75 @@ CONFIG_USB_MOUSE=m # Special HID drivers # CONFIG_HID_A4TECH=m -# CONFIG_HID_ACRUX is not set +CONFIG_HID_ACRUX=m +# CONFIG_HID_ACRUX_FF is not set CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m -# CONFIG_HID_PRODIKEYS is not set +CONFIG_HID_PRODIKEYS=m CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m -CONFIG_DRAGONRISE_FF=y +# CONFIG_DRAGONRISE_FF is not set # CONFIG_HID_EMS_FF is not set CONFIG_HID_ELECOM=m CONFIG_HID_EZKEY=m -# CONFIG_HID_HOLTEK is not set -# CONFIG_HID_KEYTOUCH is not set +CONFIG_HID_HOLTEK=m +# CONFIG_HOLTEK_FF is not set +CONFIG_HID_KEYTOUCH=m CONFIG_HID_KYE=m -# CONFIG_HID_UCLOGIC is not set -# CONFIG_HID_WALTOP is not set +CONFIG_HID_UCLOGIC=m +CONFIG_HID_WALTOP=m CONFIG_HID_GYRATION=m CONFIG_HID_TWINHAN=m CONFIG_HID_KENSINGTON=m -# CONFIG_HID_LCPOWER is not set +CONFIG_HID_LCPOWER=m CONFIG_HID_LOGITECH=m CONFIG_HID_LOGITECH_DJ=m -CONFIG_LOGITECH_FF=y -CONFIG_LOGIRUMBLEPAD2_FF=y +# CONFIG_LOGITECH_FF is not set +# CONFIG_LOGIRUMBLEPAD2_FF is not set # CONFIG_LOGIG940_FF is not set -CONFIG_LOGIWHEELS_FF=y +# CONFIG_LOGIWHEELS_FF is not set CONFIG_HID_MAGICMOUSE=m CONFIG_HID_MICROSOFT=m CONFIG_HID_MONTEREY=m -# CONFIG_HID_MULTITOUCH is not set +CONFIG_HID_MULTITOUCH=m CONFIG_HID_NTRIG=m -# CONFIG_HID_ORTEK is not set +CONFIG_HID_ORTEK=m CONFIG_HID_PANTHERLORD=m -CONFIG_PANTHERLORD_FF=y +# CONFIG_PANTHERLORD_FF is not set CONFIG_HID_PETALYNX=m -# CONFIG_HID_PICOLCD is not set +CONFIG_HID_PICOLCD=m +CONFIG_HID_PICOLCD_FB=y +CONFIG_HID_PICOLCD_BACKLIGHT=y +CONFIG_HID_PICOLCD_LCD=y +CONFIG_HID_PICOLCD_LEDS=y CONFIG_HID_PRIMAX=m -# CONFIG_HID_QUANTA is not set -# CONFIG_HID_ROCCAT is not set +CONFIG_HID_QUANTA=m +CONFIG_HID_ROCCAT=m +CONFIG_HID_ROCCAT_COMMON=m +CONFIG_HID_ROCCAT_ARVO=m +CONFIG_HID_ROCCAT_KONE=m +CONFIG_HID_ROCCAT_KONEPLUS=m +CONFIG_HID_ROCCAT_KOVAPLUS=m +CONFIG_HID_ROCCAT_PYRA=m CONFIG_HID_SAMSUNG=m CONFIG_HID_SONY=m CONFIG_HID_SPEEDLINK=m CONFIG_HID_SUNPLUS=m CONFIG_HID_GREENASIA=m -CONFIG_GREENASIA_FF=y +# CONFIG_GREENASIA_FF is not set CONFIG_HID_SMARTJOYPLUS=m -CONFIG_SMARTJOYPLUS_FF=y +# CONFIG_SMARTJOYPLUS_FF is not set CONFIG_HID_TOPSEED=m CONFIG_HID_THRUSTMASTER=m -CONFIG_THRUSTMASTER_FF=y +# CONFIG_THRUSTMASTER_FF is not set CONFIG_HID_WACOM=m # CONFIG_HID_WACOM_POWER_SUPPLY is not set CONFIG_HID_WIIMOTE=m CONFIG_HID_ZEROPLUS=m -CONFIG_ZEROPLUS_FF=y -# CONFIG_HID_ZYDACRON is not set +# CONFIG_ZEROPLUS_FF is not set +CONFIG_HID_ZYDACRON=m CONFIG_USB_SUPPORT=y CONFIG_USB_COMMON=y CONFIG_USB_ARCH_HAS_HCD=y @@ -2690,7 +2698,8 @@ CONFIG_USB_SUSPEND=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OTG_BLACKLIST_HUB is not set -# CONFIG_USB_DWC3 is not set +CONFIG_USB_DWC3=m +# CONFIG_USB_DWC3_DEBUG is not set # CONFIG_USB_MON is not set # CONFIG_USB_WUSB is not set # CONFIG_USB_WUSB_CBAF is not set @@ -2703,19 +2712,20 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_EHCI_HCD_OMAP=y -# CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_ISP116X_HCD is not set +CONFIG_USB_OXU210HP_HCD=m +CONFIG_USB_ISP116X_HCD=m # CONFIG_USB_ISP1760_HCD is not set -# CONFIG_USB_ISP1362_HCD is not set +CONFIG_USB_ISP1362_HCD=m CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_HCD_OMAP1=y CONFIG_USB_OHCI_HCD_OMAP3=y # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y -# CONFIG_USB_U132_HCD is not set -# CONFIG_USB_SL811_HCD is not set -# CONFIG_USB_R8A66597_HCD is not set +CONFIG_USB_U132_HCD=m +CONFIG_USB_SL811_HCD=m +# CONFIG_USB_SL811_HCD_ISO is not set +CONFIG_USB_R8A66597_HCD=m # CONFIG_USB_HWA_HCD is not set # @@ -2737,7 +2747,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m CONFIG_REALTEK_AUTOPM=y -# CONFIG_USB_STORAGE_DATAFAB is not set +CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m CONFIG_USB_STORAGE_USBAT=m @@ -2775,12 +2785,12 @@ CONFIG_USB_SERIAL_CP210X=m CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m -# CONFIG_USB_SERIAL_FUNSOFT is not set -# CONFIG_USB_SERIAL_VISOR is not set -# CONFIG_USB_SERIAL_IPAQ is not set -# CONFIG_USB_SERIAL_IR is not set +CONFIG_USB_SERIAL_FUNSOFT=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m CONFIG_USB_SERIAL_EDGEPORT=m -# CONFIG_USB_SERIAL_EDGEPORT_TI is not set +CONFIG_USB_SERIAL_EDGEPORT_TI=m CONFIG_USB_SERIAL_GARMIN=m CONFIG_USB_SERIAL_IPW=m CONFIG_USB_SERIAL_IUU=m @@ -2881,7 +2891,8 @@ CONFIG_MMC_SDHCI_PLTFM=m # CONFIG_MMC_SDHCI_PXAV2 is not set CONFIG_MMC_OMAP=y CONFIG_MMC_OMAP_HS=y -# CONFIG_MMC_DW is not set +CONFIG_MMC_DW=m +# CONFIG_MMC_DW_IDMAC is not set CONFIG_MMC_VUB300=m CONFIG_MMC_USHC=m CONFIG_MEMSTICK=m @@ -2902,18 +2913,18 @@ CONFIG_LEDS_CLASS=y # # LED drivers # -# CONFIG_LEDS_LM3530 is not set +CONFIG_LEDS_LM3530=m CONFIG_LEDS_PCA9532=m -# CONFIG_LEDS_PCA9532_GPIO is not set +CONFIG_LEDS_PCA9532_GPIO=y CONFIG_LEDS_GPIO=m CONFIG_LEDS_LP3944=m -# CONFIG_LEDS_LP5521 is not set -# CONFIG_LEDS_LP5523 is not set +CONFIG_LEDS_LP5521=m +CONFIG_LEDS_LP5523=m CONFIG_LEDS_PCA955X=m # CONFIG_LEDS_PWM is not set -# CONFIG_LEDS_REGULATOR is not set +CONFIG_LEDS_REGULATOR=m CONFIG_LEDS_BD2802=m -# CONFIG_LEDS_LT3593 is not set +CONFIG_LEDS_LT3593=m # CONFIG_LEDS_RENESAS_TPU is not set CONFIG_LEDS_TRIGGERS=y @@ -2949,27 +2960,28 @@ CONFIG_RTC_INTF_DEV=y # # I2C RTC drivers # -# CONFIG_RTC_DRV_DS1307 is not set -# CONFIG_RTC_DRV_DS1374 is not set -# CONFIG_RTC_DRV_DS1672 is not set -# CONFIG_RTC_DRV_DS3232 is not set -# CONFIG_RTC_DRV_MAX6900 is not set -# CONFIG_RTC_DRV_RS5C372 is not set -# CONFIG_RTC_DRV_ISL1208 is not set -# CONFIG_RTC_DRV_ISL12022 is not set -# CONFIG_RTC_DRV_X1205 is not set -# CONFIG_RTC_DRV_PCF8563 is not set -# CONFIG_RTC_DRV_PCF8583 is not set -# CONFIG_RTC_DRV_M41T80 is not set +CONFIG_RTC_DRV_DS1307=m +CONFIG_RTC_DRV_DS1374=m +CONFIG_RTC_DRV_DS1672=m +CONFIG_RTC_DRV_DS3232=m +CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_RS5C372=m +CONFIG_RTC_DRV_ISL1208=m +CONFIG_RTC_DRV_ISL12022=m +CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF8583=m +CONFIG_RTC_DRV_M41T80=m +CONFIG_RTC_DRV_M41T80_WDT=y CONFIG_RTC_DRV_BQ32K=y CONFIG_RTC_DRV_TWL92330=y CONFIG_RTC_DRV_TWL4030=y -# CONFIG_RTC_DRV_S35390A is not set -# CONFIG_RTC_DRV_FM3130 is not set -# CONFIG_RTC_DRV_RX8581 is not set -# CONFIG_RTC_DRV_RX8025 is not set -# CONFIG_RTC_DRV_EM3027 is not set -# CONFIG_RTC_DRV_RV3029C2 is not set +CONFIG_RTC_DRV_S35390A=m +CONFIG_RTC_DRV_FM3130=m +CONFIG_RTC_DRV_RX8581=m +CONFIG_RTC_DRV_RX8025=m +CONFIG_RTC_DRV_EM3027=m +CONFIG_RTC_DRV_RV3029C2=m # # SPI RTC drivers @@ -2978,20 +2990,20 @@ CONFIG_RTC_DRV_TWL4030=y # # Platform RTC drivers # -# CONFIG_RTC_DRV_CMOS is not set -# CONFIG_RTC_DRV_DS1286 is not set -# CONFIG_RTC_DRV_DS1511 is not set -# CONFIG_RTC_DRV_DS1553 is not set -# CONFIG_RTC_DRV_DS1742 is not set -# CONFIG_RTC_DRV_STK17TA8 is not set -# CONFIG_RTC_DRV_M48T86 is not set -# CONFIG_RTC_DRV_M48T35 is not set -# CONFIG_RTC_DRV_M48T59 is not set -# CONFIG_RTC_DRV_MSM6242 is not set +CONFIG_RTC_DRV_CMOS=m +CONFIG_RTC_DRV_DS1286=m +CONFIG_RTC_DRV_DS1511=m +CONFIG_RTC_DRV_DS1553=m +CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_STK17TA8=m +CONFIG_RTC_DRV_M48T86=m +CONFIG_RTC_DRV_M48T35=m +CONFIG_RTC_DRV_M48T59=m +CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_BQ4802=y -# CONFIG_RTC_DRV_RP5C01 is not set -# CONFIG_RTC_DRV_V3020 is not set -# CONFIG_RTC_DRV_PCF50633 is not set +CONFIG_RTC_DRV_RP5C01=m +CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_PCF50633=m # # on-CPU RTC drivers @@ -3011,7 +3023,7 @@ CONFIG_DMA_ENGINE=y # CONFIG_NET_DMA=y CONFIG_ASYNC_TX_DMA=y -# CONFIG_DMATEST is not set +CONFIG_DMATEST=m # CONFIG_AUXDISPLAY is not set CONFIG_UIO=m CONFIG_UIO_PDRV=m @@ -3023,15 +3035,17 @@ CONFIG_UIO_PDRV_GENIRQ=m # CONFIG_VIRTIO_BALLOON is not set # CONFIG_VIRTIO_MMIO is not set CONFIG_STAGING=y -# CONFIG_USBIP_CORE is not set +CONFIG_USBIP_CORE=m +CONFIG_USBIP_VHCI_HCD=m +CONFIG_USBIP_HOST=m +# CONFIG_USBIP_DEBUG is not set # CONFIG_W35UND is not set # CONFIG_PRISM2_USB is not set # CONFIG_ECHO is not set # CONFIG_ASUS_OLED is not set # CONFIG_PANEL is not set -CONFIG_R8712U=m -CONFIG_RTS5139=m -# CONFIG_RTS5139_DEBUG is not set +# CONFIG_R8712U is not set +# CONFIG_RTS5139 is not set # CONFIG_TRANZPORT is not set # CONFIG_POHMELFS is not set # CONFIG_LINE6_USB is not set @@ -3043,7 +3057,7 @@ CONFIG_RTS5139=m # CONFIG_ZRAM is not set # CONFIG_FB_SM7XX is not set # CONFIG_TIDSPBRIDGE is not set -CONFIG_USB_ENESTORAGE=m +# CONFIG_USB_ENESTORAGE is not set # CONFIG_BCM_WIMAX is not set # CONFIG_FT1000 is not set @@ -3062,31 +3076,24 @@ CONFIG_HWSPINLOCK=m # CONFIG_HWSPINLOCK_OMAP=m CONFIG_CLKSRC_MMIO=y -# CONFIG_IOMMU_SUPPORT is not set +CONFIG_IOMMU_SUPPORT=y +# CONFIG_OMAP_IOMMU is not set # CONFIG_VIRT_DRIVERS is not set # CONFIG_PM_DEVFREQ is not set # # File systems # -CONFIG_EXT2_FS=m -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -# CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=m -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_EXT3_FS_XATTR=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4_FS=m +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set +CONFIG_EXT4_FS=y +CONFIG_EXT4_USE_FOR_EXT23=y CONFIG_EXT4_FS_XATTR=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y # CONFIG_EXT4_DEBUG is not set -CONFIG_JBD=m -CONFIG_JBD2=m -CONFIG_FS_MBCACHE=m +CONFIG_JBD2=y +CONFIG_FS_MBCACHE=y CONFIG_REISERFS_FS=m # CONFIG_REISERFS_CHECK is not set CONFIG_REISERFS_PROC_INFO=y @@ -3112,7 +3119,7 @@ CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y -# CONFIG_FANOTIFY is not set +CONFIG_FANOTIFY=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_PRINT_QUOTA_WARNING=y @@ -3165,7 +3172,7 @@ CONFIG_PROC_PAGE_MONITOR=y CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_TMPFS_POSIX_ACL is not set -# CONFIG_TMPFS_XATTR is not set +CONFIG_TMPFS_XATTR=y # CONFIG_HUGETLB_PAGE is not set # CONFIG_CONFIGFS_FS is not set CONFIG_MISC_FILESYSTEMS=y @@ -3207,6 +3214,7 @@ CONFIG_JFFS2_CMODE_PRIORITY=y CONFIG_UFS_FS=m # CONFIG_UFS_FS_WRITE is not set # CONFIG_UFS_DEBUG is not set +# CONFIG_EXOFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m CONFIG_NFS_V3=y @@ -3389,7 +3397,10 @@ CONFIG_HAVE_ARCH_KGDB=y # CONFIG_STRICT_DEVMEM is not set # CONFIG_ARM_UNWIND is not set # CONFIG_DEBUG_USER is not set -# CONFIG_DEBUG_LL is not set +CONFIG_DEBUG_LL=y +CONFIG_DEBUG_LL_UART_NONE=y +# CONFIG_DEBUG_ICEDCC is not set +CONFIG_EARLY_PRINTK=y # # Security options @@ -3526,7 +3537,7 @@ CONFIG_CRYPTO_DEV_OMAP_AES=m CONFIG_RAID6_PQ=m CONFIG_BITREVERSE=y CONFIG_CRC_CCITT=m -CONFIG_CRC16=m +CONFIG_CRC16=y CONFIG_CRC_T10DIF=m CONFIG_CRC_ITU_T=m CONFIG_CRC32=y diff --git a/config/kernel/kernel.config.armv5tel-ipfire-rpi b/config/kernel/kernel.config.armv5tel-ipfire-rpi index 1b86625..a149d03 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-rpi +++ b/config/kernel/kernel.config.armv5tel-ipfire-rpi @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.2.34-ipfire-rpi Kernel Configuration +# Linux/arm 3.2.35 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -29,6 +29,7 @@ CONFIG_NEED_MACH_MEMORY_H=y CONFIG_GENERIC_BUG=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_HAVE_IRQ_WORK=y +CONFIG_IRQ_WORK=y # # General setup @@ -97,9 +98,9 @@ CONFIG_RD_LZO=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y CONFIG_ANON_INODES=y -CONFIG_EXPERT=y +# CONFIG_EXPERT is not set CONFIG_UID16=y -CONFIG_SYSCTL_SYSCALL=y +# CONFIG_SYSCTL_SYSCALL is not set CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set CONFIG_HOTPLUG=y @@ -121,14 +122,14 @@ CONFIG_PERF_USE_VMALLOC=y # # Kernel Performance Events And Counters # -# CONFIG_PERF_EVENTS is not set +CONFIG_PERF_EVENTS=y # CONFIG_PERF_COUNTERS is not set +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set CONFIG_VM_EVENT_COUNTERS=y CONFIG_SLUB_DEBUG=y # CONFIG_COMPAT_BRK is not set # CONFIG_SLAB is not set CONFIG_SLUB=y -# CONFIG_SLOB is not set # CONFIG_PROFILING is not set CONFIG_HAVE_OPROFILE=y # CONFIG_KPROBES is not set @@ -137,6 +138,7 @@ CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_CLK=y CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_HW_BREAKPOINT=y # # GCOV-based kernel profiling @@ -259,7 +261,8 @@ CONFIG_MMU=y CONFIG_ARCH_BCM2708=y # CONFIG_ARCH_VT8500 is not set # CONFIG_ARCH_ZYNQ is not set -# CONFIG_GPIO_PCA953X is not set +CONFIG_GPIO_PCA953X=m +CONFIG_KEYBOARD_GPIO_POLLED=m # # System MMU @@ -334,6 +337,7 @@ CONFIG_AEABI=y # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set CONFIG_HAVE_ARCH_PFN_VALID=y # CONFIG_HIGHMEM is not set +CONFIG_HW_PERF_EVENTS=y CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y CONFIG_FLATMEM=y @@ -345,7 +349,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=0 CONFIG_VIRT_TO_BUS=y -# CONFIG_KSM is not set +CONFIG_KSM=y CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_NEED_PER_CPU_KM=y # CONFIG_CLEANCACHE is not set @@ -363,7 +367,7 @@ CONFIG_USE_OF=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 # CONFIG_ARM_APPENDED_DTB is not set -CONFIG_CMDLINE="dwc_otg.lpm_enable=0 console=tty1 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p3 rootwait ro" +CONFIG_CMDLINE="dwc_otg.lpm_enable=0 console=ttyAMA0,115200 root=/dev/mmcblk0p3 rootwait" CONFIG_CMDLINE_FROM_BOOTLOADER=y # CONFIG_CMDLINE_EXTEND is not set # CONFIG_CMDLINE_FORCE is not set @@ -384,15 +388,14 @@ CONFIG_CPU_FREQ_TABLE=y CONFIG_CPU_FREQ_STAT=m # CONFIG_CPU_FREQ_STAT_DETAILS is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=m -CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y # # ARM CPU frequency scaling drivers @@ -558,7 +561,6 @@ CONFIG_NETFILTER_XTABLES=m # CONFIG_NETFILTER_XT_MARK=m CONFIG_NETFILTER_XT_CONNMARK=m -CONFIG_NETFILTER_XT_SET=m # # Xtables targets @@ -628,19 +630,7 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_TCPMSS=m CONFIG_NETFILTER_XT_MATCH_TIME=m CONFIG_NETFILTER_XT_MATCH_U32=m -CONFIG_IP_SET=m -CONFIG_IP_SET_MAX=256 -CONFIG_IP_SET_BITMAP_IP=m -CONFIG_IP_SET_BITMAP_IPMAC=m -CONFIG_IP_SET_BITMAP_PORT=m -CONFIG_IP_SET_HASH_IP=m -CONFIG_IP_SET_HASH_IPPORT=m -CONFIG_IP_SET_HASH_IPPORTIP=m -CONFIG_IP_SET_HASH_IPPORTNET=m -CONFIG_IP_SET_HASH_NET=m -CONFIG_IP_SET_HASH_NETPORT=m -CONFIG_IP_SET_HASH_NETIFACE=m -CONFIG_IP_SET_LIST_SET=m +# CONFIG_IP_SET is not set CONFIG_IP_VS=m CONFIG_IP_VS_IPV6=y # CONFIG_IP_VS_DEBUG is not set @@ -673,7 +663,7 @@ CONFIG_IP_VS_TAB_BITS=12 # # IPVS application helper # -CONFIG_IP_VS_NFCT=y +# CONFIG_IP_VS_NFCT is not set # # IP: Netfilter Configuration @@ -855,7 +845,7 @@ CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=m CONFIG_NET_ACT_PEDIT=m -# CONFIG_NET_ACT_SIMP is not set +CONFIG_NET_ACT_SIMP=m CONFIG_NET_ACT_SKBEDIT=m CONFIG_NET_ACT_CSUM=m CONFIG_NET_CLS_IND=y @@ -919,6 +909,7 @@ CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_CMTP=m CONFIG_BT_HIDP=m # @@ -964,7 +955,6 @@ CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m CONFIG_MAC80211_HAS_RC=y -# CONFIG_MAC80211_RC_PID is not set CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC80211_RC_MINSTREL_HT=y CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y @@ -976,11 +966,10 @@ CONFIG_MAC80211_LEDS=y CONFIG_RFKILL=m CONFIG_RFKILL_LEDS=y CONFIG_RFKILL_INPUT=y +CONFIG_RFKILL_REGULATOR=m CONFIG_RFKILL_GPIO=m # CONFIG_NET_9P is not set -CONFIG_CAIF=m -# CONFIG_CAIF_DEBUG is not set -CONFIG_CAIF_NETDEV=m +# CONFIG_CAIF is not set CONFIG_CEPH_LIB=m # CONFIG_CEPH_LIB_PRETTYDEBUG is not set # CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set @@ -1003,9 +992,11 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set +CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=m CONFIG_CONNECTOR=m CONFIG_MTD=m -# CONFIG_MTD_TESTS is not set +CONFIG_MTD_TESTS=m # CONFIG_MTD_REDBOOT_PARTS is not set # CONFIG_MTD_AFS_PARTS is not set CONFIG_MTD_OF_PARTS=m @@ -1025,7 +1016,7 @@ CONFIG_MTD_BLOCK=m # CONFIG_SSFDC is not set CONFIG_SM_FTL=m # CONFIG_MTD_OOPS is not set -CONFIG_MTD_SWAP=m +# CONFIG_MTD_SWAP is not set # # RAM/ROM/Flash chip drivers @@ -1057,9 +1048,6 @@ CONFIG_MTD_PHYSMAP=m # # Self-contained MTD device drivers # -# CONFIG_MTD_DATAFLASH is not set -# CONFIG_MTD_M25P80 is not set -# CONFIG_MTD_SST25L is not set # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set # CONFIG_MTD_MTDRAM is not set @@ -1074,7 +1062,17 @@ CONFIG_MTD_PHYSMAP=m # CONFIG_MTD_DOCG3 is not set CONFIG_MTD_NAND_ECC=m # CONFIG_MTD_NAND_ECC_SMC is not set -# CONFIG_MTD_NAND is not set +CONFIG_MTD_NAND=m +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_BCH is not set +# CONFIG_MTD_SM_COMMON is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +# CONFIG_MTD_NAND_GPIO is not set +CONFIG_MTD_NAND_IDS=m +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_NANDSIM is not set +CONFIG_MTD_NAND_PLATFORM=m +# CONFIG_MTD_ALAUDA is not set # CONFIG_MTD_ONENAND is not set # @@ -1100,11 +1098,15 @@ CONFIG_OF_ADDRESS=y CONFIG_OF_IRQ=y CONFIG_OF_DEVICE=y CONFIG_OF_GPIO=y -CONFIG_OF_I2C=m +CONFIG_OF_I2C=y CONFIG_OF_NET=y -CONFIG_OF_SPI=y CONFIG_OF_MDIO=y -# CONFIG_PARPORT is not set +CONFIG_PARPORT=m +# CONFIG_PARPORT_PC is not set +# CONFIG_PARPORT_GSC is not set +CONFIG_PARPORT_AX88796=m +CONFIG_PARPORT_1284=y +CONFIG_PARPORT_NOT_PC=y CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y @@ -1112,6 +1114,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 CONFIG_BLK_DEV_CRYPTOLOOP=m # CONFIG_BLK_DEV_DRBD is not set CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_OSD=m # CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=8 @@ -1121,36 +1124,33 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 CONFIG_ATA_OVER_ETH=m CONFIG_MG_DISK=m CONFIG_MG_DISK_RES=0 -# CONFIG_BLK_DEV_RBD is not set -# CONFIG_SENSORS_LIS3LV02D is not set +CONFIG_BLK_DEV_RBD=m +CONFIG_SENSORS_LIS3LV02D=m CONFIG_MISC_DEVICES=y # CONFIG_AD525X_DPOT is not set # CONFIG_ATMEL_PWM is not set -# CONFIG_ICS932S401 is not set +CONFIG_ICS932S401=m CONFIG_ENCLOSURE_SERVICES=m -# CONFIG_APDS9802ALS is not set -# CONFIG_ISL29003 is not set -# CONFIG_ISL29020 is not set -# CONFIG_SENSORS_TSL2550 is not set -# CONFIG_SENSORS_BH1780 is not set -# CONFIG_SENSORS_BH1770 is not set -# CONFIG_SENSORS_APDS990X is not set -# CONFIG_HMC6352 is not set -# CONFIG_DS1682 is not set -# CONFIG_TI_DAC7512 is not set -# CONFIG_BMP085 is not set -# CONFIG_USB_SWITCH_FSA9480 is not set -# CONFIG_C2PORT is not set +CONFIG_APDS9802ALS=m +CONFIG_ISL29003=m +CONFIG_ISL29020=m +CONFIG_SENSORS_TSL2550=m +CONFIG_SENSORS_BH1780=m +CONFIG_SENSORS_BH1770=m +CONFIG_SENSORS_APDS990X=m +CONFIG_HMC6352=m +CONFIG_DS1682=m +CONFIG_BMP085=m +CONFIG_USB_SWITCH_FSA9480=m +CONFIG_C2PORT=m # # EEPROM support # -# CONFIG_EEPROM_AT24 is not set -# CONFIG_EEPROM_AT25 is not set -# CONFIG_EEPROM_LEGACY is not set -# CONFIG_EEPROM_MAX6875 is not set +CONFIG_EEPROM_AT24=m +CONFIG_EEPROM_LEGACY=m +CONFIG_EEPROM_MAX6875=m CONFIG_EEPROM_93CX6=m -# CONFIG_EEPROM_93XX46 is not set CONFIG_IWMC3200TOP=m # CONFIG_IWMC3200TOP_DEBUG is not set # CONFIG_IWMC3200TOP_DEBUGFS is not set @@ -1159,8 +1159,7 @@ CONFIG_IWMC3200TOP=m # Texas Instruments shared transport line discipline # CONFIG_TI_ST=m -# CONFIG_SENSORS_LIS3_SPI is not set -# CONFIG_SENSORS_LIS3_I2C is not set +CONFIG_SENSORS_LIS3_I2C=m # # Altera FPGA firmware download module @@ -1172,7 +1171,7 @@ CONFIG_BCM2708_VCHIQ=y # SCSI device support # CONFIG_SCSI_MOD=y -# CONFIG_RAID_ATTRS is not set +CONFIG_RAID_ATTRS=m CONFIG_SCSI=y CONFIG_SCSI_DMA=y # CONFIG_SCSI_TGT is not set @@ -1218,7 +1217,10 @@ CONFIG_SCSI_DH_RDAC=m CONFIG_SCSI_DH_HP_SW=m CONFIG_SCSI_DH_EMC=m CONFIG_SCSI_DH_ALUA=m -# CONFIG_SCSI_OSD_INITIATOR is not set +CONFIG_SCSI_OSD_INITIATOR=m +CONFIG_SCSI_OSD_ULD=m +CONFIG_SCSI_OSD_DPRINT_SENSE=1 +# CONFIG_SCSI_OSD_DEBUG is not set CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_VERBOSE_ERROR=y @@ -1243,13 +1245,11 @@ CONFIG_SATA_MV=m # # PATA SFF controllers with BMDMA # -# CONFIG_PATA_ARASAN_CF is not set +CONFIG_PATA_ARASAN_CF=m # # PIO-only SFF controllers # -CONFIG_PATA_PLATFORM=m -CONFIG_PATA_OF_PLATFORM=m # # Generic fallback / legacy drivers @@ -1295,7 +1295,8 @@ CONFIG_IMQ_BEHAVIOR_AB=y # CONFIG_IMQ_BEHAVIOR_BB is not set CONFIG_IMQ_NUM_DEVS=2 CONFIG_MII=m -# CONFIG_IEEE802154_DRIVERS is not set +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKEHARD=m CONFIG_IFB=m CONFIG_MACVLAN=m CONFIG_MACVTAP=m @@ -1311,9 +1312,6 @@ CONFIG_ATM_TCP=m # # CAIF transport drivers # -# CONFIG_CAIF_TTY is not set -# CONFIG_CAIF_SPI_SLAVE is not set -# CONFIG_CAIF_HSI is not set CONFIG_ETHERNET=y CONFIG_NET_VENDOR_BROADCOM=y CONFIG_B44=m @@ -1321,6 +1319,9 @@ CONFIG_NET_VENDOR_CHELSIO=y CONFIG_DM9000=m # CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL is not set CONFIG_DNET=m +CONFIG_NET_VENDOR_DLINK=y +CONFIG_DE600=m +CONFIG_DE620=m CONFIG_NET_VENDOR_FARADAY=y # CONFIG_FTMAC100 is not set # CONFIG_FTGMAC100 is not set @@ -1328,15 +1329,12 @@ CONFIG_NET_VENDOR_INTEL=y CONFIG_NET_VENDOR_I825XX=y CONFIG_NET_VENDOR_MARVELL=y CONFIG_NET_VENDOR_MICREL=y -# CONFIG_KS8842 is not set -# CONFIG_KS8851 is not set +CONFIG_KS8842=m CONFIG_KS8851_MLL=m -CONFIG_NET_VENDOR_MICROCHIP=y -# CONFIG_ENC28J60 is not set CONFIG_NET_VENDOR_NATSEMI=y CONFIG_NET_VENDOR_8390=y CONFIG_AX88796=m -# CONFIG_AX88796_93CX6 is not set +CONFIG_AX88796_93CX6=y CONFIG_ETHOC=m CONFIG_NET_VENDOR_SEEQ=y CONFIG_SEEQ8005=m @@ -1371,7 +1369,8 @@ CONFIG_LSI_ET1011C_PHY=m CONFIG_MICREL_PHY=m # CONFIG_FIXED_PHY is not set CONFIG_MDIO_BITBANG=m -# CONFIG_MDIO_GPIO is not set +CONFIG_MDIO_GPIO=m +# CONFIG_PLIP is not set CONFIG_PPP=m CONFIG_PPP_BSDCOMP=m CONFIG_PPP_DEFLATE=m @@ -1415,14 +1414,14 @@ CONFIG_USB_ALI_M5632=y CONFIG_USB_AN2720=y CONFIG_USB_BELKIN=y CONFIG_USB_ARMLINUX=y -# CONFIG_USB_EPSON2888 is not set +CONFIG_USB_EPSON2888=y CONFIG_USB_KC2190=y CONFIG_USB_NET_ZAURUS=m CONFIG_USB_NET_CX82310_ETH=m CONFIG_USB_NET_KALMIA=m CONFIG_USB_HSO=m CONFIG_USB_NET_INT51X1=m -CONFIG_USB_IPHETH=m +# CONFIG_USB_IPHETH is not set CONFIG_USB_SIERRA_NET=m CONFIG_USB_VL600=m CONFIG_WLAN=y @@ -1447,7 +1446,7 @@ CONFIG_HOSTAP_FIRMWARE=y # CONFIG_WL12XX_MENU is not set # CONFIG_ZD1211RW is not set # CONFIG_MWIFIEX is not set -CONFIG_RTL8192CU=m +# CONFIG_RTL8192CU is not set # # Enable WiMAX (Networking options) to see the WiMAX drivers @@ -1466,10 +1465,87 @@ CONFIG_HDLC_PPP=m CONFIG_DLCI=m CONFIG_DLCI_MAX=8 CONFIG_ISDN=y -# CONFIG_ISDN_I4L is not set -# CONFIG_ISDN_CAPI is not set +CONFIG_ISDN_I4L=m +CONFIG_ISDN_PPP=y +CONFIG_ISDN_PPP_VJ=y +CONFIG_ISDN_MPP=y +CONFIG_IPPP_FILTER=y +CONFIG_ISDN_PPP_BSDCOMP=m +CONFIG_ISDN_AUDIO=y +CONFIG_ISDN_TTY_FAX=y + +# +# ISDN feature submodules +# +# CONFIG_ISDN_DRV_LOOP is not set +CONFIG_ISDN_DIVERSION=m + +# +# ISDN4Linux hardware drivers +# + +# +# Passive cards +# +CONFIG_ISDN_DRV_HISAX=m + +# +# D-channel protocol features +# +CONFIG_HISAX_EURO=y +CONFIG_DE_AOC=y +# CONFIG_HISAX_NO_SENDCOMPLETE is not set +# CONFIG_HISAX_NO_LLC is not set +# CONFIG_HISAX_NO_KEYPAD is not set +CONFIG_HISAX_1TR6=y +CONFIG_HISAX_NI1=y +CONFIG_HISAX_MAX_CARDS=8 + +# +# HiSax supported cards +# +CONFIG_HISAX_16_3=y +CONFIG_HISAX_S0BOX=y +CONFIG_HISAX_FRITZPCI=y +CONFIG_HISAX_AVM_A1_PCMCIA=y +CONFIG_HISAX_ELSA=y +CONFIG_HISAX_DIEHLDIVA=y +CONFIG_HISAX_SEDLBAUER=y +CONFIG_HISAX_NICCY=y +CONFIG_HISAX_GAZEL=y +CONFIG_HISAX_HFC_SX=y +CONFIG_HISAX_DEBUG=y + +# +# HiSax PCMCIA card service modules +# + +# +# HiSax sub driver modules +# +CONFIG_HISAX_ST5481=m +CONFIG_HISAX_HFCUSB=m +CONFIG_HISAX_HFC4S8S=m + +# +# Active cards +# +CONFIG_ISDN_CAPI=m +CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y +CONFIG_CAPI_TRACE=y +CONFIG_ISDN_CAPI_MIDDLEWARE=y +CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_CAPIDRV=m + +# +# CAPI hardware drivers +# +CONFIG_CAPI_AVM=y +CONFIG_CAPI_EICON=y CONFIG_ISDN_DRV_GIGASET=m -CONFIG_GIGASET_DUMMYLL=y +CONFIG_GIGASET_CAPI=y +# CONFIG_GIGASET_I4L is not set +# CONFIG_GIGASET_DUMMYLL is not set CONFIG_GIGASET_BASE=m CONFIG_GIGASET_M105=m CONFIG_GIGASET_M101=m @@ -1482,6 +1558,7 @@ CONFIG_MISDN_L1OIP=m # mISDN hardware drivers # CONFIG_MISDN_HFCUSB=m +CONFIG_ISDN_HDLC=m # CONFIG_PHONE is not set # @@ -1490,7 +1567,7 @@ CONFIG_MISDN_HFCUSB=m CONFIG_INPUT=y CONFIG_INPUT_FF_MEMLESS=m CONFIG_INPUT_POLLDEV=m -# CONFIG_INPUT_SPARSEKMAP is not set +CONFIG_INPUT_SPARSEKMAP=m # # Userland interfaces @@ -1499,21 +1576,41 @@ CONFIG_INPUT_MOUSEDEV=y # CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -CONFIG_INPUT_JOYDEV=m -CONFIG_INPUT_EVDEV=m +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_EVDEV is not set # CONFIG_INPUT_EVBUG is not set # # Input Device Drivers # -# CONFIG_INPUT_KEYBOARD is not set +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ADP5588=m +CONFIG_KEYBOARD_ADP5589=m +CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_QT1070=m +CONFIG_KEYBOARD_QT2160=m +CONFIG_KEYBOARD_LKKBD=m +CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_TCA6416=m +CONFIG_KEYBOARD_MATRIX=m +CONFIG_KEYBOARD_LM8323=m +CONFIG_KEYBOARD_MAX7359=m +CONFIG_KEYBOARD_MCS=m +CONFIG_KEYBOARD_MPR121=m +CONFIG_KEYBOARD_NEWTON=m +CONFIG_KEYBOARD_OPENCORES=m +CONFIG_KEYBOARD_STOWAWAY=m +CONFIG_KEYBOARD_SUNKBD=m +CONFIG_KEYBOARD_XTKBD=m # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y -# CONFIG_INPUT_AD714X is not set -# CONFIG_INPUT_BMA150 is not set +CONFIG_INPUT_88PM860X_ONKEY=m +CONFIG_INPUT_AD714X=m +CONFIG_INPUT_AD714X_I2C=m +CONFIG_INPUT_BMA150=m # CONFIG_INPUT_MMA8450 is not set # CONFIG_INPUT_MPU3050 is not set CONFIG_INPUT_ATI_REMOTE2=m @@ -1522,25 +1619,25 @@ CONFIG_INPUT_KEYSPAN_REMOTE=m CONFIG_INPUT_POWERMATE=m CONFIG_INPUT_YEALINK=m CONFIG_INPUT_CM109=m -CONFIG_INPUT_UINPUT=m -# CONFIG_INPUT_PCF8574 is not set -# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set +# CONFIG_INPUT_UINPUT is not set +CONFIG_INPUT_PCF50633_PMU=m +CONFIG_INPUT_PCF8574=m +CONFIG_INPUT_GPIO_ROTARY_ENCODER=m # CONFIG_INPUT_ADXL34X is not set # CONFIG_INPUT_CMA3000 is not set # # Hardware I/O ports # -CONFIG_SERIO=m -CONFIG_SERIO_SERPORT=m -# CONFIG_SERIO_AMBAKMI is not set -# CONFIG_SERIO_LIBPS2 is not set -CONFIG_SERIO_RAW=m -# CONFIG_SERIO_ALTERA_PS2 is not set -# CONFIG_SERIO_PS2MULT is not set -CONFIG_GAMEPORT=m -CONFIG_GAMEPORT_NS558=m -CONFIG_GAMEPORT_L4=m +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +# CONFIG_SERIO_PARKBD is not set +CONFIG_SERIO_AMBAKMI=m +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +CONFIG_SERIO_ALTERA_PS2=m +CONFIG_SERIO_PS2MULT=m +# CONFIG_GAMEPORT is not set # # Character devices @@ -1550,47 +1647,64 @@ CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_VT_CONSOLE_SLEEP=y CONFIG_HW_CONSOLE=y -CONFIG_VT_HW_CONSOLE_BINDING=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set CONFIG_UNIX98_PTYS=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set # CONFIG_LEGACY_PTYS is not set # CONFIG_SERIAL_NONSTANDARD is not set -CONFIG_N_GSM=y +CONFIG_N_GSM=m # CONFIG_TRACE_SINK is not set CONFIG_DEVKMEM=y # # Serial drivers # -# CONFIG_SERIAL_8250 is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_DETECT_IRQ=y +CONFIG_SERIAL_8250_RSA=y +CONFIG_SERIAL_8250_DW=m # # Non-8250 serial port support # -# CONFIG_SERIAL_AMBA_PL010 is not set +CONFIG_SERIAL_AMBA_PL010=y +CONFIG_SERIAL_AMBA_PL010_CONSOLE=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -# CONFIG_SERIAL_MAX3100 is not set -# CONFIG_SERIAL_MAX3107 is not set CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y -# CONFIG_SERIAL_TIMBERDALE is not set -# CONFIG_SERIAL_ALTERA_JTAGUART is not set -# CONFIG_SERIAL_ALTERA_UART is not set -# CONFIG_SERIAL_IFX6X60 is not set -# CONFIG_SERIAL_XILINX_PS_UART is not set -# CONFIG_TTY_PRINTK is not set +CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_SERIAL_TIMBERDALE=m +CONFIG_SERIAL_ALTERA_JTAGUART=m +CONFIG_SERIAL_ALTERA_UART=m +CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 +CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 +CONFIG_SERIAL_XILINX_PS_UART=m +CONFIG_PRINTER=m +# CONFIG_LP_CONSOLE is not set +CONFIG_PPDEV=m # CONFIG_HVC_DCC is not set -# CONFIG_IPMI_HANDLER is not set -CONFIG_HW_RANDOM=y +CONFIG_IPMI_HANDLER=m +CONFIG_IPMI_PANIC_EVENT=y +# CONFIG_IPMI_PANIC_STRING is not set +CONFIG_IPMI_DEVICE_INTERFACE=m +CONFIG_IPMI_SI=m +CONFIG_IPMI_WATCHDOG=m +CONFIG_IPMI_POWEROFF=m +CONFIG_HW_RANDOM=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_NVRAM=m # CONFIG_R3964 is not set -CONFIG_RAW_DRIVER=y -CONFIG_MAX_RAW_DEVS=256 +# CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set # CONFIG_RAMOOPS is not set -CONFIG_I2C=m +CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_COMPAT=y CONFIG_I2C_CHARDEV=m @@ -1603,6 +1717,7 @@ CONFIG_I2C_MUX_GPIO=m CONFIG_I2C_MUX_PCA9541=m CONFIG_I2C_MUX_PCA954x=m CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_SMBUS=m CONFIG_I2C_ALGOBIT=m CONFIG_I2C_ALGOPCA=m @@ -1615,7 +1730,8 @@ CONFIG_I2C_ALGOPCA=m # CONFIG_I2C_BCM2708=m CONFIG_I2C_BCM2708_BAUDRATE=100000 -# CONFIG_I2C_DESIGNWARE_PLATFORM is not set +CONFIG_I2C_DESIGNWARE_CORE=m +CONFIG_I2C_DESIGNWARE_PLATFORM=m CONFIG_I2C_GPIO=m CONFIG_I2C_OCORES=m CONFIG_I2C_PCA_PLATFORM=m @@ -1627,44 +1743,33 @@ CONFIG_I2C_XILINX=m # External I2C/SMBus adapter drivers # CONFIG_I2C_DIOLAN_U2C=m -# CONFIG_I2C_PARPORT_LIGHT is not set -# CONFIG_I2C_TAOS_EVM is not set +CONFIG_I2C_PARPORT=m +CONFIG_I2C_PARPORT_LIGHT=m +CONFIG_I2C_TAOS_EVM=m CONFIG_I2C_TINY_USB=m # # Other I2C/SMBus bus drivers # -# CONFIG_I2C_STUB is not set +CONFIG_I2C_STUB=m # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set -CONFIG_SPI=y -# CONFIG_SPI_DEBUG is not set -CONFIG_SPI_MASTER=y - -# -# SPI Master Controller Drivers -# -# CONFIG_SPI_ALTERA is not set -CONFIG_SPI_BCM2708=m -CONFIG_SPI_BITBANG=m -CONFIG_SPI_GPIO=m -# CONFIG_SPI_OC_TINY is not set -# CONFIG_SPI_PL022 is not set -# CONFIG_SPI_PXA2XX_PCI is not set -# CONFIG_SPI_XILINX is not set -# CONFIG_SPI_DESIGNWARE is not set +# CONFIG_SPI is not set # -# SPI Protocol Masters +# PPS support # -CONFIG_SPI_SPIDEV=m -# CONFIG_SPI_TLE62X0 is not set +CONFIG_PPS=m +# CONFIG_PPS_DEBUG is not set # -# PPS support +# PPS clients support # -# CONFIG_PPS is not set +# CONFIG_PPS_CLIENT_KTIMER is not set +# CONFIG_PPS_CLIENT_LDISC is not set +# CONFIG_PPS_CLIENT_PARPORT is not set +# CONFIG_PPS_CLIENT_GPIO is not set # # PPS generators support @@ -1673,29 +1778,30 @@ CONFIG_SPI_SPIDEV=m # # PTP clock support # - -# -# Enable Device Drivers -> PPS to see the PTP clock options. -# +CONFIG_PTP_1588_CLOCK=m +CONFIG_DP83640_PHY=m CONFIG_ARCH_REQUIRE_GPIOLIB=y CONFIG_GPIOLIB=y # CONFIG_DEBUG_GPIO is not set CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_GENERIC=m +CONFIG_GPIO_MAX730X=m # # Memory mapped GPIO drivers: # -# CONFIG_GPIO_GENERIC_PLATFORM is not set -# CONFIG_GPIO_IT8761E is not set -# CONFIG_GPIO_PL061 is not set +CONFIG_GPIO_GENERIC_PLATFORM=m +CONFIG_GPIO_IT8761E=m +CONFIG_GPIO_PL061=y # # I2C GPIO expanders: # -# CONFIG_GPIO_MAX7300 is not set -# CONFIG_GPIO_MAX732X is not set -# CONFIG_GPIO_PCF857X is not set -# CONFIG_GPIO_ADP5588 is not set +CONFIG_GPIO_MAX7300=m +CONFIG_GPIO_MAX732X=m +CONFIG_GPIO_PCF857X=m +# CONFIG_GPIO_SX150X is not set +CONFIG_GPIO_ADP5588=m # # PCI GPIO expanders: @@ -1704,14 +1810,12 @@ CONFIG_GPIO_SYSFS=y # # SPI GPIO expanders: # -# CONFIG_GPIO_MAX7301 is not set -# CONFIG_GPIO_MCP23S08 is not set -# CONFIG_GPIO_MC33880 is not set -# CONFIG_GPIO_74X164 is not set +CONFIG_GPIO_MCP23S08=m # # AC97 GPIO expanders: # +# CONFIG_GPIO_UCB1400 is not set # # MODULbus GPIO expanders: @@ -1724,7 +1828,7 @@ CONFIG_W1_CON=y # CONFIG_W1_MASTER_DS2490=m CONFIG_W1_MASTER_DS2482=m -# CONFIG_W1_MASTER_DS1WM is not set +CONFIG_W1_MASTER_DS1WM=m CONFIG_W1_MASTER_GPIO=m # @@ -1736,11 +1840,11 @@ CONFIG_W1_SLAVE_DS2408=m CONFIG_W1_SLAVE_DS2423=m CONFIG_W1_SLAVE_DS2431=m CONFIG_W1_SLAVE_DS2433=m -# CONFIG_W1_SLAVE_DS2433_CRC is not set +CONFIG_W1_SLAVE_DS2433_CRC=y CONFIG_W1_SLAVE_DS2760=m CONFIG_W1_SLAVE_DS2780=m CONFIG_W1_SLAVE_BQ27000=m -CONFIG_POWER_SUPPLY=m +CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set # CONFIG_PDA_POWER is not set # CONFIG_TEST_POWER is not set @@ -1751,19 +1855,19 @@ CONFIG_POWER_SUPPLY=m # CONFIG_BATTERY_BQ27x00 is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_CHARGER_PCF50633 is not set +# CONFIG_CHARGER_ISP1704 is not set # CONFIG_CHARGER_MAX8903 is not set # CONFIG_CHARGER_GPIO is not set -CONFIG_HWMON=y +CONFIG_HWMON=m CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set # # Native drivers # -CONFIG_SENSORS_AD7314=m CONFIG_SENSORS_AD7414=m CONFIG_SENSORS_AD7418=m -CONFIG_SENSORS_ADCXX=m CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m @@ -1785,11 +1889,12 @@ CONFIG_SENSORS_G760A=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m CONFIG_SENSORS_GPIO_FAN=m +CONFIG_SENSORS_IBMAEM=m +CONFIG_SENSORS_IBMPEX=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_JC42=m CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LM63=m -CONFIG_SENSORS_LM70=m CONFIG_SENSORS_LM73=m CONFIG_SENSORS_LM75=m CONFIG_SENSORS_LM77=m @@ -1807,7 +1912,6 @@ CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_LTC4261=m CONFIG_SENSORS_LM95241=m CONFIG_SENSORS_LM95245=m -CONFIG_SENSORS_MAX1111=m CONFIG_SENSORS_MAX16065=m CONFIG_SENSORS_MAX1619=m CONFIG_SENSORS_MAX1668=m @@ -1844,7 +1948,6 @@ CONFIG_SENSORS_SCH5627=m CONFIG_SENSORS_SCH5636=m CONFIG_SENSORS_ADS1015=m CONFIG_SENSORS_ADS7828=m -CONFIG_SENSORS_ADS7871=m CONFIG_SENSORS_AMC6821=m CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_TMP102=m @@ -1862,19 +1965,18 @@ CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m CONFIG_THERMAL=y -CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_BCM2835=y CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_CORE is not set +CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set # # Watchdog Device Drivers # CONFIG_SOFT_WATCHDOG=m -# CONFIG_ARM_SP805_WATCHDOG is not set -# CONFIG_DW_WATCHDOG is not set -# CONFIG_MAX63XX_WATCHDOG is not set +CONFIG_ARM_SP805_WATCHDOG=m +CONFIG_DW_WATCHDOG=m +CONFIG_MAX63XX_WATCHDOG=m CONFIG_BCM2708_WDT=m # @@ -1889,7 +1991,6 @@ CONFIG_SSB_POSSIBLE=y CONFIG_SSB=m CONFIG_SSB_SDIOHOST_POSSIBLE=y CONFIG_SSB_SDIOHOST=y -# CONFIG_SSB_SILENT is not set # CONFIG_SSB_DEBUG is not set CONFIG_BCMA_POSSIBLE=y @@ -1902,35 +2003,74 @@ CONFIG_BCMA=m # # Multifunction device drivers # -# CONFIG_MFD_CORE is not set -# CONFIG_MFD_SM501 is not set +CONFIG_MFD_CORE=y +CONFIG_MFD_88PM860X=y +CONFIG_MFD_SM501=m +# CONFIG_MFD_SM501_GPIO is not set # CONFIG_MFD_ASIC3 is not set # CONFIG_HTC_EGPIO is not set -# CONFIG_HTC_PASIC3 is not set -# CONFIG_TPS6105X is not set -# CONFIG_TPS65010 is not set -# CONFIG_TPS6507X is not set -# CONFIG_MFD_TPS65912_SPI is not set +CONFIG_HTC_PASIC3=m +# CONFIG_HTC_I2CPLD is not set +CONFIG_UCB1400_CORE=m +CONFIG_TPS6105X=m +CONFIG_TPS65010=m +CONFIG_TPS6507X=m +# CONFIG_MFD_TPS6586X is not set +# CONFIG_MFD_TPS65910 is not set +# CONFIG_MFD_TPS65912_I2C is not set +# CONFIG_TWL4030_CORE is not set +# CONFIG_MFD_STMPE is not set +# CONFIG_MFD_TC3589X is not set # CONFIG_MFD_TMIO is not set # CONFIG_MFD_T7L66XB is not set # CONFIG_MFD_TC6387XB is not set # CONFIG_MFD_TC6393XB is not set -# CONFIG_MFD_WM8400 is not set -# CONFIG_MFD_WM831X_SPI is not set -# CONFIG_MFD_PCF50633 is not set -# CONFIG_MFD_MC13XXX is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_MAX8925 is not set +# CONFIG_MFD_MAX8997 is not set +# CONFIG_MFD_MAX8998 is not set +CONFIG_MFD_WM8400=m +# CONFIG_MFD_WM831X_I2C is not set +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_WM8994 is not set +CONFIG_MFD_PCF50633=m +CONFIG_PCF50633_ADC=m +CONFIG_PCF50633_GPIO=m # CONFIG_ABX500_CORE is not set -# CONFIG_EZX_PCAP is not set -# CONFIG_MFD_WL1273_CORE is not set -# CONFIG_REGULATOR is not set +CONFIG_MFD_WL1273_CORE=m +# CONFIG_MFD_AAT2870_CORE is not set +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +# CONFIG_REGULATOR_DUMMY is not set +CONFIG_REGULATOR_FIXED_VOLTAGE=m +# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set +# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set +CONFIG_REGULATOR_GPIO=m +# CONFIG_REGULATOR_BQ24022 is not set +# CONFIG_REGULATOR_MAX1586 is not set +# CONFIG_REGULATOR_MAX8649 is not set +# CONFIG_REGULATOR_MAX8660 is not set +# CONFIG_REGULATOR_MAX8952 is not set +# CONFIG_REGULATOR_WM8400 is not set +# CONFIG_REGULATOR_PCF50633 is not set +# CONFIG_REGULATOR_LP3971 is not set +# CONFIG_REGULATOR_LP3972 is not set +# CONFIG_REGULATOR_TPS6105X is not set +# CONFIG_REGULATOR_TPS65023 is not set +# CONFIG_REGULATOR_TPS6507X is not set +# CONFIG_REGULATOR_88PM8607 is not set +# CONFIG_REGULATOR_ISL6271A is not set +# CONFIG_REGULATOR_AD5398 is not set CONFIG_MEDIA_SUPPORT=m # # Multimedia core support # -# CONFIG_MEDIA_CONTROLLER is not set +CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_DEV=m CONFIG_VIDEO_V4L2_COMMON=m +CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_DVB_CORE=m CONFIG_DVB_NET=y CONFIG_VIDEO_MEDIA=m @@ -1940,7 +2080,7 @@ CONFIG_VIDEO_MEDIA=m # CONFIG_RC_CORE=m CONFIG_LIRC=m -# CONFIG_RC_MAP is not set +CONFIG_RC_MAP=m # CONFIG_IR_NEC_DECODER is not set # CONFIG_IR_RC5_DECODER is not set # CONFIG_IR_RC6_DECODER is not set @@ -1989,11 +2129,11 @@ CONFIG_VIDEO_IR_I2C=m # CONFIG_VIDEO_TDA9840 is not set # CONFIG_VIDEO_TEA6415C is not set # CONFIG_VIDEO_TEA6420 is not set -CONFIG_VIDEO_MSP3400=m +# CONFIG_VIDEO_MSP3400 is not set # CONFIG_VIDEO_CS5345 is not set -CONFIG_VIDEO_CS53L32A=m +# CONFIG_VIDEO_CS53L32A is not set # CONFIG_VIDEO_TLV320AIC23B is not set -CONFIG_VIDEO_WM8775=m +# CONFIG_VIDEO_WM8775 is not set # CONFIG_VIDEO_WM8739 is not set # CONFIG_VIDEO_VP27SMPX is not set @@ -2005,13 +2145,13 @@ CONFIG_VIDEO_WM8775=m # # Video decoders # -CONFIG_VIDEO_ADV7180=m +# CONFIG_VIDEO_ADV7180 is not set # CONFIG_VIDEO_BT819 is not set # CONFIG_VIDEO_BT856 is not set # CONFIG_VIDEO_BT866 is not set # CONFIG_VIDEO_KS0127 is not set # CONFIG_VIDEO_SAA7110 is not set -CONFIG_VIDEO_SAA711X=m +# CONFIG_VIDEO_SAA711X is not set # CONFIG_VIDEO_SAA7191 is not set # CONFIG_VIDEO_TVP514X is not set # CONFIG_VIDEO_TVP5150 is not set @@ -2022,12 +2162,12 @@ CONFIG_VIDEO_SAA711X=m # Video and audio decoders # # CONFIG_VIDEO_SAA717X is not set -CONFIG_VIDEO_CX25840=m +# CONFIG_VIDEO_CX25840 is not set # # MPEG video encoders # -CONFIG_VIDEO_CX2341X=m +# CONFIG_VIDEO_CX2341X is not set # # Video encoders @@ -2043,13 +2183,20 @@ CONFIG_VIDEO_CX2341X=m # Camera sensor devices # # CONFIG_VIDEO_OV7670 is not set +# CONFIG_VIDEO_MT9P031 is not set +# CONFIG_VIDEO_MT9T001 is not set # CONFIG_VIDEO_MT9V011 is not set +# CONFIG_VIDEO_MT9V032 is not set # CONFIG_VIDEO_TCM825X is not set -CONFIG_VIDEO_SR030PC30=m +# CONFIG_VIDEO_SR030PC30 is not set +# CONFIG_VIDEO_NOON010PC30 is not set +# CONFIG_VIDEO_M5MOLS is not set +# CONFIG_VIDEO_S5K6AA is not set # # Flash devices # +# CONFIG_VIDEO_ADP1653 is not set # # Video improvement chips @@ -2063,13 +2210,46 @@ CONFIG_VIDEO_SR030PC30=m # CONFIG_VIDEO_THS7303 is not set # CONFIG_VIDEO_M52790 is not set # CONFIG_VIDEO_VIVI is not set +# CONFIG_VIDEO_BWQCAM is not set +# CONFIG_VIDEO_CQCAM is not set +# CONFIG_VIDEO_W9966 is not set # CONFIG_VIDEO_CPIA2 is not set # CONFIG_VIDEO_TIMBERDALE is not set # CONFIG_VIDEO_AU0828 is not set # CONFIG_SOC_CAMERA is not set -# CONFIG_V4L_USB_DRIVERS is not set +CONFIG_V4L_USB_DRIVERS=y +# CONFIG_USB_VIDEO_CLASS is not set +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +# CONFIG_USB_GSPCA is not set +# CONFIG_VIDEO_PVRUSB2 is not set +# CONFIG_VIDEO_HDPVR is not set +# CONFIG_VIDEO_EM28XX is not set +# CONFIG_VIDEO_TLG2300 is not set +# CONFIG_VIDEO_CX231XX is not set +# CONFIG_VIDEO_TM6000 is not set +# CONFIG_VIDEO_USBVISION is not set +# CONFIG_USB_ET61X251 is not set +# CONFIG_USB_SN9C102 is not set +# CONFIG_USB_PWC is not set +# CONFIG_USB_ZR364XX is not set +# CONFIG_USB_STKWEBCAM is not set +# CONFIG_USB_S2255 is not set # CONFIG_V4L_MEM2MEM_DRIVERS is not set -# CONFIG_RADIO_ADAPTERS is not set +CONFIG_RADIO_ADAPTERS=y +# CONFIG_I2C_SI4713 is not set +# CONFIG_RADIO_SI4713 is not set +# CONFIG_USB_DSBR is not set +# CONFIG_RADIO_SI470X is not set +# CONFIG_USB_MR800 is not set +# CONFIG_RADIO_TEA5764 is not set +# CONFIG_RADIO_SAA7706H is not set +# CONFIG_RADIO_TEF6862 is not set +# CONFIG_RADIO_WL1273 is not set + +# +# Texas Instruments WL128x FM driver (ST based) +# +# CONFIG_RADIO_WL128X is not set CONFIG_DVB_MAX_ADAPTERS=8 # CONFIG_DVB_DYNAMIC_MINORS is not set CONFIG_DVB_CAPTURE_DRIVERS=y @@ -2135,77 +2315,79 @@ CONFIG_DVB_CAPTURE_DRIVERS=y # # Graphics support # -# CONFIG_DRM is not set +CONFIG_DRM=m # CONFIG_VGASTATE is not set -# CONFIG_VIDEO_OUTPUT_CONTROL is not set +CONFIG_VIDEO_OUTPUT_CONTROL=m CONFIG_FB=y -# CONFIG_FIRMWARE_EDID is not set +CONFIG_FIRMWARE_EDID=y # CONFIG_FB_DDC is not set # CONFIG_FB_BOOT_VESA_SUPPORT is not set CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set -# CONFIG_FB_SYS_FILLRECT is not set -# CONFIG_FB_SYS_COPYAREA is not set -# CONFIG_FB_SYS_IMAGEBLIT is not set +CONFIG_FB_SYS_FILLRECT=m +CONFIG_FB_SYS_COPYAREA=m +CONFIG_FB_SYS_IMAGEBLIT=m # CONFIG_FB_FOREIGN_ENDIAN is not set -# CONFIG_FB_SYS_FOPS is not set +CONFIG_FB_SYS_FOPS=m # CONFIG_FB_WMT_GE_ROPS is not set +CONFIG_FB_DEFERRED_IO=y # CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set # CONFIG_FB_BACKLIGHT is not set -# CONFIG_FB_MODE_HELPERS is not set -# CONFIG_FB_TILEBLITTING is not set +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y # # Frame buffer hardware drivers # CONFIG_FB_BCM2708=y -# CONFIG_FB_ARMCLCD is not set -# CONFIG_FB_UVESA is not set +CONFIG_FB_ARMCLCD=y +CONFIG_FB_UVESA=m # CONFIG_FB_S1D13XXX is not set -# CONFIG_FB_SMSCUFX is not set +CONFIG_FB_TMIO=m +CONFIG_FB_TMIO_ACCELL=y +CONFIG_FB_SM501=m +CONFIG_FB_SMSCUFX=m # CONFIG_FB_UDL is not set # CONFIG_FB_VIRTUAL is not set -# CONFIG_FB_METRONOME is not set +CONFIG_FB_METRONOME=m # CONFIG_FB_BROADSHEET is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m -# CONFIG_LCD_L4F00242T03 is not set -# CONFIG_LCD_LMS283GF05 is not set -# CONFIG_LCD_LTV350QV is not set -# CONFIG_LCD_TDO24M is not set -# CONFIG_LCD_VGG2432A4 is not set -# CONFIG_LCD_PLATFORM is not set -# CONFIG_LCD_S6E63M0 is not set -# CONFIG_LCD_LD9040 is not set -# CONFIG_LCD_AMS369FG06 is not set -CONFIG_BACKLIGHT_CLASS_DEVICE=m +CONFIG_LCD_PLATFORM=m +CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_GENERIC=m -# CONFIG_BACKLIGHT_ADP8860 is not set -# CONFIG_BACKLIGHT_ADP8870 is not set +CONFIG_BACKLIGHT_ADP8860=m +CONFIG_BACKLIGHT_ADP8870=m +CONFIG_BACKLIGHT_88PM860X=m +CONFIG_BACKLIGHT_PCF50633=m # # Display device support # -# CONFIG_DISPLAY_SUPPORT is not set +CONFIG_DISPLAY_SUPPORT=y + +# +# Display hardware drivers +# # # Console display driver support # CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set # CONFIG_FONTS is not set CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y CONFIG_LOGO_LINUX_CLUT224=y -CONFIG_SOUND=y +CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE=y CONFIG_SOUND_OSS_CORE_PRECLAIM=y CONFIG_SND=m @@ -2213,6 +2395,7 @@ CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_JACK=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m CONFIG_SND_OSSEMUL=y @@ -2223,35 +2406,44 @@ CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_HRTIMER=m CONFIG_SND_SEQ_HRTIMER_DEFAULT=y CONFIG_SND_DYNAMIC_MINORS=y -CONFIG_SND_SUPPORT_OLD_API=y +# CONFIG_SND_SUPPORT_OLD_API is not set CONFIG_SND_VERBOSE_PROCFS=y # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set +CONFIG_SND_VMASTER=y CONFIG_SND_RAWMIDI_SEQ=m # CONFIG_SND_OPL3_LIB_SEQ is not set # CONFIG_SND_OPL4_LIB_SEQ is not set # CONFIG_SND_SBAWE_SEQ is not set # CONFIG_SND_EMU10K1_SEQ is not set CONFIG_SND_MPU401_UART=m +CONFIG_SND_AC97_CODEC=m CONFIG_SND_DRIVERS=y CONFIG_SND_DUMMY=m CONFIG_SND_ALOOP=m CONFIG_SND_VIRMIDI=m CONFIG_SND_MTPAV=m +CONFIG_SND_MTS64=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_MPU401=m +CONFIG_SND_PORTMAN2X4=m +CONFIG_SND_AC97_POWER_SAVE=y +CONFIG_SND_AC97_POWER_SAVE_DEFAULT=60 CONFIG_SND_ARM=y -# CONFIG_SND_ARMAACI is not set +CONFIG_SND_ARMAACI=m CONFIG_SND_BCM2835=m -CONFIG_SND_SPI=y CONFIG_SND_USB=y CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_UA101=m CONFIG_SND_USB_CAIAQ=m -# CONFIG_SND_USB_CAIAQ_INPUT is not set +CONFIG_SND_USB_CAIAQ_INPUT=y CONFIG_SND_USB_6FIRE=m -# CONFIG_SND_SOC is not set +CONFIG_SND_SOC=m +CONFIG_SND_SOC_CACHE_LZO=y +CONFIG_SND_SOC_I2C_AND_SPI=m +# CONFIG_SND_SOC_ALL_CODECS is not set # CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m CONFIG_HID_SUPPORT=y CONFIG_HID=y # CONFIG_HIDRAW is not set @@ -2259,8 +2451,8 @@ CONFIG_HID=y # # USB Input Devices # -CONFIG_USB_HID=y -CONFIG_HID_PID=y +CONFIG_USB_HID=m +# CONFIG_HID_PID is not set CONFIG_USB_HIDDEV=y # @@ -2273,11 +2465,11 @@ CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m -# CONFIG_HID_PRODIKEYS is not set +CONFIG_HID_PRODIKEYS=m CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m # CONFIG_DRAGONRISE_FF is not set -CONFIG_HID_EMS_FF=m +# CONFIG_HID_EMS_FF is not set CONFIG_HID_ELECOM=m CONFIG_HID_EZKEY=m CONFIG_HID_HOLTEK=m @@ -2306,19 +2498,19 @@ CONFIG_HID_PANTHERLORD=m # CONFIG_PANTHERLORD_FF is not set CONFIG_HID_PETALYNX=m CONFIG_HID_PICOLCD=m -# CONFIG_HID_PICOLCD_FB is not set -# CONFIG_HID_PICOLCD_BACKLIGHT is not set -# CONFIG_HID_PICOLCD_LCD is not set -# CONFIG_HID_PICOLCD_LEDS is not set +CONFIG_HID_PICOLCD_FB=y +CONFIG_HID_PICOLCD_BACKLIGHT=y +CONFIG_HID_PICOLCD_LCD=y +CONFIG_HID_PICOLCD_LEDS=y CONFIG_HID_PRIMAX=m CONFIG_HID_QUANTA=m CONFIG_HID_ROCCAT=m CONFIG_HID_ROCCAT_COMMON=m -# CONFIG_HID_ROCCAT_ARVO is not set -# CONFIG_HID_ROCCAT_KONE is not set -# CONFIG_HID_ROCCAT_KONEPLUS is not set -# CONFIG_HID_ROCCAT_KOVAPLUS is not set -# CONFIG_HID_ROCCAT_PYRA is not set +CONFIG_HID_ROCCAT_ARVO=m +CONFIG_HID_ROCCAT_KONE=m +CONFIG_HID_ROCCAT_KONEPLUS=m +CONFIG_HID_ROCCAT_KOVAPLUS=m +CONFIG_HID_ROCCAT_PYRA=m CONFIG_HID_SAMSUNG=m CONFIG_HID_SONY=m CONFIG_HID_SPEEDLINK=m @@ -2354,9 +2546,8 @@ CONFIG_USB_DEVICE_CLASS=y CONFIG_USB_DYNAMIC_MINORS=y CONFIG_USB_SUSPEND=y # CONFIG_USB_OTG is not set -# CONFIG_USB_OTG_WHITELIST is not set -# CONFIG_USB_OTG_BLACKLIST_HUB is not set -# CONFIG_USB_DWC3 is not set +CONFIG_USB_DWC3=m +# CONFIG_USB_DWC3_DEBUG is not set # CONFIG_USB_MON is not set # CONFIG_USB_WUSB is not set # CONFIG_USB_WUSB_CBAF is not set @@ -2365,13 +2556,14 @@ CONFIG_USB_SUSPEND=y # USB Host Controller Drivers # # CONFIG_USB_C67X00_HCD is not set -# CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_ISP116X_HCD is not set +CONFIG_USB_OXU210HP_HCD=m +CONFIG_USB_ISP116X_HCD=m # CONFIG_USB_ISP1760_HCD is not set -# CONFIG_USB_ISP1362_HCD is not set -# CONFIG_USB_U132_HCD is not set -# CONFIG_USB_SL811_HCD is not set -# CONFIG_USB_R8A66597_HCD is not set +CONFIG_USB_ISP1362_HCD=m +CONFIG_USB_U132_HCD=m +CONFIG_USB_SL811_HCD=m +# CONFIG_USB_SL811_HCD_ISO is not set +CONFIG_USB_R8A66597_HCD=m # CONFIG_USB_HWA_HCD is not set CONFIG_USB_DWCOTG=y @@ -2380,8 +2572,8 @@ CONFIG_USB_DWCOTG=y # CONFIG_USB_ACM=m CONFIG_USB_PRINTER=m -# CONFIG_USB_WDM is not set -# CONFIG_USB_TMC is not set +CONFIG_USB_WDM=m +CONFIG_USB_TMC=m # # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may @@ -2390,7 +2582,7 @@ CONFIG_USB_PRINTER=m # # also be needed; see USB_STORAGE Help for more info # -CONFIG_USB_STORAGE=y +CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_REALTEK=m CONFIG_REALTEK_AUTOPM=y @@ -2406,18 +2598,19 @@ CONFIG_USB_STORAGE_ONETOUCH=m CONFIG_USB_STORAGE_KARMA=m CONFIG_USB_STORAGE_CYPRESS_ATACB=m CONFIG_USB_STORAGE_ENE_UB6250=m -CONFIG_USB_UAS=y -CONFIG_USB_LIBUSUAL=y +CONFIG_USB_UAS=m +# CONFIG_USB_LIBUSUAL is not set # # USB Imaging devices # -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set # # USB port drivers # +CONFIG_USB_USS720=m CONFIG_USB_SERIAL=m CONFIG_USB_EZUSB=y CONFIG_USB_SERIAL_GENERIC=y @@ -2440,15 +2633,16 @@ CONFIG_USB_SERIAL_EDGEPORT_TI=m CONFIG_USB_SERIAL_GARMIN=m CONFIG_USB_SERIAL_IPW=m CONFIG_USB_SERIAL_IUU=m -CONFIG_USB_SERIAL_KEYSPAN_PDA=m -CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KLSI=m -CONFIG_USB_SERIAL_KOBIL_SCT=m +# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set +# CONFIG_USB_SERIAL_KEYSPAN is not set +# CONFIG_USB_SERIAL_KLSI is not set +# CONFIG_USB_SERIAL_KOBIL_SCT is not set CONFIG_USB_SERIAL_MCT_U232=m CONFIG_USB_SERIAL_MOS7720=m +# CONFIG_USB_SERIAL_MOS7715_PARPORT is not set CONFIG_USB_SERIAL_MOS7840=m CONFIG_USB_SERIAL_MOTOROLA=m -CONFIG_USB_SERIAL_NAVMAN=m +# CONFIG_USB_SERIAL_NAVMAN is not set CONFIG_USB_SERIAL_PL2303=m CONFIG_USB_SERIAL_OTI6858=m CONFIG_USB_SERIAL_QCAUX=m @@ -2461,37 +2655,37 @@ CONFIG_USB_SERIAL_SIEMENS_MPI=m CONFIG_USB_SERIAL_SIERRAWIRELESS=m CONFIG_USB_SERIAL_SYMBOL=m CONFIG_USB_SERIAL_TI=m -CONFIG_USB_SERIAL_CYBERJACK=m +# CONFIG_USB_SERIAL_CYBERJACK is not set CONFIG_USB_SERIAL_XIRCOM=m CONFIG_USB_SERIAL_WWAN=m CONFIG_USB_SERIAL_OPTION=m -CONFIG_USB_SERIAL_OMNINET=m +# CONFIG_USB_SERIAL_OMNINET is not set CONFIG_USB_SERIAL_OPTICON=m CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m CONFIG_USB_SERIAL_ZIO=m CONFIG_USB_SERIAL_SSU100=m -CONFIG_USB_SERIAL_DEBUG=m +# CONFIG_USB_SERIAL_DEBUG is not set # # USB Miscellaneous drivers # CONFIG_USB_EMI62=m CONFIG_USB_EMI26=m -CONFIG_USB_ADUTUX=m +# CONFIG_USB_ADUTUX is not set CONFIG_USB_SEVSEG=m -CONFIG_USB_RIO500=m -CONFIG_USB_LEGOTOWER=m +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set CONFIG_USB_LCD=m CONFIG_USB_LED=m CONFIG_USB_CYPRESS_CY7C63=m CONFIG_USB_CYTHERM=m -CONFIG_USB_IDMOUSE=m +# CONFIG_USB_IDMOUSE is not set CONFIG_USB_FTDI_ELAN=m -CONFIG_USB_APPLEDISPLAY=m -CONFIG_USB_LD=m -CONFIG_USB_TRANCEVIBRATOR=m +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set CONFIG_USB_IOWARRIOR=m -CONFIG_USB_TEST=m +# CONFIG_USB_TEST is not set CONFIG_USB_ISIGHTFW=m CONFIG_USB_YUREX=m CONFIG_USB_ATM=m @@ -2504,9 +2698,10 @@ CONFIG_USB_XUSBATM=m # # OTG and related infrastructure # -# CONFIG_USB_GPIO_VBUS is not set +CONFIG_USB_OTG_UTILS=y +CONFIG_USB_GPIO_VBUS=m # CONFIG_USB_ULPI is not set -# CONFIG_NOP_USB_XCEIV is not set +CONFIG_NOP_USB_XCEIV=m CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_UNSAFE_RESUME is not set @@ -2518,42 +2713,55 @@ CONFIG_MMC=y CONFIG_MMC_BLOCK=y CONFIG_MMC_BLOCK_MINORS=8 CONFIG_MMC_BLOCK_BOUNCE=y -# CONFIG_SDIO_UART is not set -# CONFIG_MMC_TEST is not set +CONFIG_SDIO_UART=m +CONFIG_MMC_TEST=m # # MMC/SD/SDIO Host Controller Drivers # -# CONFIG_MMC_ARMMMCI is not set +CONFIG_MMC_ARMMMCI=m CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_IO_ACCESSORS=y -CONFIG_MMC_SDHCI_PLTFM=y -# CONFIG_MMC_SDHCI_PXAV3 is not set -# CONFIG_MMC_SDHCI_PXAV2 is not set +CONFIG_MMC_SDHCI_PLTFM=m +CONFIG_MMC_SDHCI_PXAV3=m +CONFIG_MMC_SDHCI_PXAV2=m CONFIG_MMC_SDHCI_BCM2708=y CONFIG_MMC_SDHCI_BCM2708_DMA=y # CONFIG_MMC_BCM2708 is not set -# CONFIG_MMC_SPI is not set -# CONFIG_MMC_DW is not set -# CONFIG_MMC_VUB300 is not set -# CONFIG_MMC_USHC is not set -# CONFIG_MEMSTICK is not set +CONFIG_MMC_DW=m +# CONFIG_MMC_DW_IDMAC is not set +CONFIG_MMC_VUB300=m +CONFIG_MMC_USHC=m +CONFIG_MEMSTICK=m +# CONFIG_MEMSTICK_DEBUG is not set + +# +# MemoryStick drivers +# +# CONFIG_MEMSTICK_UNSAFE_RESUME is not set +CONFIG_MSPRO_BLOCK=m + +# +# MemoryStick Host Controller Drivers +# CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y # # LED drivers # -# CONFIG_LEDS_LM3530 is not set -# CONFIG_LEDS_PCA9532 is not set -CONFIG_LEDS_GPIO=y -# CONFIG_LEDS_LP3944 is not set -# CONFIG_LEDS_LP5521 is not set -# CONFIG_LEDS_LP5523 is not set -# CONFIG_LEDS_PCA955X is not set -# CONFIG_LEDS_DAC124S085 is not set -# CONFIG_LEDS_BD2802 is not set -# CONFIG_LEDS_LT3593 is not set +CONFIG_LEDS_88PM860X=m +CONFIG_LEDS_LM3530=m +CONFIG_LEDS_PCA9532=m +CONFIG_LEDS_PCA9532_GPIO=y +CONFIG_LEDS_GPIO=m +CONFIG_LEDS_LP3944=m +CONFIG_LEDS_LP5521=m +CONFIG_LEDS_LP5523=m +CONFIG_LEDS_PCA955X=m +CONFIG_LEDS_REGULATOR=m +CONFIG_LEDS_BD2802=m +CONFIG_LEDS_LT3593=m # CONFIG_LEDS_RENESAS_TPU is not set CONFIG_LEDS_TRIGGERS=y @@ -2564,7 +2772,7 @@ CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m CONFIG_LEDS_TRIGGER_GPIO=m -CONFIG_LEDS_TRIGGER_DEFAULT_ON=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y # # iptables trigger is under Netfilter config (LED target) @@ -2573,7 +2781,8 @@ CONFIG_LEDS_TRIGGER_NETDEV=m # CONFIG_ACCESSIBILITY is not set CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y -# CONFIG_RTC_HCTOSYS is not set +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set # @@ -2588,6 +2797,7 @@ CONFIG_RTC_INTF_DEV=y # # I2C RTC drivers # +CONFIG_RTC_DRV_88PM860X=y CONFIG_RTC_DRV_DS1307=m CONFIG_RTC_DRV_DS1374=m CONFIG_RTC_DRV_DS1672=m @@ -2612,15 +2822,6 @@ CONFIG_RTC_DRV_RV3029C2=m # # SPI RTC drivers # -CONFIG_RTC_DRV_M41T93=m -CONFIG_RTC_DRV_M41T94=m -CONFIG_RTC_DRV_DS1305=m -CONFIG_RTC_DRV_DS1390=m -CONFIG_RTC_DRV_MAX6902=m -CONFIG_RTC_DRV_R9701=m -CONFIG_RTC_DRV_RS5C348=m -CONFIG_RTC_DRV_DS3234=m -CONFIG_RTC_DRV_PCF2123=m # # Platform RTC drivers @@ -2638,6 +2839,7 @@ CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_RP5C01=m CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_PCF50633=m # # on-CPU RTC drivers @@ -2651,9 +2853,9 @@ CONFIG_DMADEVICES=y # DMA Devices # CONFIG_AMBA_PL08X=y -CONFIG_DW_DMAC=m -CONFIG_TIMB_DMA=m -CONFIG_PL330_DMA=m +CONFIG_DW_DMAC=y +# CONFIG_TIMB_DMA is not set +CONFIG_PL330_DMA=y CONFIG_DMA_ENGINE=y # @@ -2661,7 +2863,7 @@ CONFIG_DMA_ENGINE=y # CONFIG_NET_DMA=y CONFIG_ASYNC_TX_DMA=y -# CONFIG_DMATEST is not set +CONFIG_DMATEST=m # CONFIG_AUXDISPLAY is not set CONFIG_UIO=m CONFIG_UIO_PDRV=m @@ -2672,35 +2874,59 @@ CONFIG_UIO_PDRV_GENIRQ=m # # CONFIG_VIRTIO_BALLOON is not set # CONFIG_VIRTIO_MMIO is not set -# CONFIG_STAGING is not set +CONFIG_STAGING=y +CONFIG_USBIP_CORE=m +CONFIG_USBIP_VHCI_HCD=m +CONFIG_USBIP_HOST=m +# CONFIG_USBIP_DEBUG is not set +# CONFIG_W35UND is not set +# CONFIG_PRISM2_USB is not set +# CONFIG_ECHO is not set +# CONFIG_ASUS_OLED is not set +# CONFIG_PANEL is not set +# CONFIG_R8712U is not set +# CONFIG_RTS5139 is not set +# CONFIG_TRANZPORT is not set +# CONFIG_POHMELFS is not set +# CONFIG_LINE6_USB is not set +# CONFIG_USB_SERIAL_QUATECH2 is not set +# CONFIG_USB_SERIAL_QUATECH_USB2 is not set +# CONFIG_VT6656 is not set +# CONFIG_IIO is not set +# CONFIG_XVMALLOC is not set +# CONFIG_ZRAM is not set +# CONFIG_FB_SM7XX is not set +# CONFIG_USB_ENESTORAGE is not set +# CONFIG_BCM_WIMAX is not set +# CONFIG_FT1000 is not set + +# +# Speakup console speech +# +# CONFIG_SPEAKUP is not set +# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set +# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set +# CONFIG_STAGING_MEDIA is not set CONFIG_CLKDEV_LOOKUP=y # # Hardware Spinlock drivers # -# CONFIG_IOMMU_SUPPORT is not set +CONFIG_IOMMU_SUPPORT=y # CONFIG_VIRT_DRIVERS is not set # CONFIG_PM_DEVFREQ is not set # # File systems # -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -# CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_EXT3_FS_XATTR=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set CONFIG_EXT4_FS=y +CONFIG_EXT4_USE_FOR_EXT23=y CONFIG_EXT4_FS_XATTR=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y # CONFIG_EXT4_DEBUG is not set -CONFIG_JBD=y CONFIG_JBD2=y CONFIG_FS_MBCACHE=y CONFIG_REISERFS_FS=m @@ -2728,7 +2954,7 @@ CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y -# CONFIG_FANOTIFY is not set +CONFIG_FANOTIFY=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_PRINT_QUOTA_WARNING=y @@ -2781,7 +3007,7 @@ CONFIG_PROC_PAGE_MONITOR=y CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_TMPFS_POSIX_ACL is not set -# CONFIG_TMPFS_XATTR is not set +CONFIG_TMPFS_XATTR=y # CONFIG_HUGETLB_PAGE is not set # CONFIG_CONFIGFS_FS is not set CONFIG_MISC_FILESYSTEMS=y @@ -2803,7 +3029,7 @@ CONFIG_JFFS2_COMPRESSION_OPTIONS=y CONFIG_JFFS2_ZLIB=y # CONFIG_JFFS2_LZO is not set CONFIG_JFFS2_RTIME=y -# CONFIG_JFFS2_RUBIN is not set +CONFIG_JFFS2_RUBIN=y # CONFIG_JFFS2_CMODE_NONE is not set CONFIG_JFFS2_CMODE_PRIORITY=y # CONFIG_JFFS2_CMODE_SIZE is not set @@ -2823,6 +3049,7 @@ CONFIG_JFFS2_CMODE_PRIORITY=y CONFIG_UFS_FS=m # CONFIG_UFS_FS_WRITE is not set # CONFIG_UFS_DEBUG is not set +# CONFIG_EXOFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m CONFIG_NFS_V3=y @@ -2951,7 +3178,7 @@ CONFIG_SCHED_DEBUG=y CONFIG_TIMER_STATS=y # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_DEBUG_ON is not set -CONFIG_SLUB_STATS=y +# CONFIG_SLUB_STATS is not set # CONFIG_DEBUG_KMEMLEAK is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set @@ -3002,7 +3229,11 @@ CONFIG_HAVE_ARCH_KGDB=y # CONFIG_STRICT_DEVMEM is not set # CONFIG_ARM_UNWIND is not set # CONFIG_DEBUG_USER is not set -# CONFIG_DEBUG_LL is not set +CONFIG_DEBUG_LL=y +CONFIG_DEBUG_LL_UART_NONE=y +# CONFIG_DEBUG_ICEDCC is not set +# CONFIG_DEBUG_BCM2708_UART0 is not set +CONFIG_EARLY_PRINTK=y # CONFIG_OC_ETM is not set # @@ -3147,7 +3378,7 @@ CONFIG_CRC8=m CONFIG_AUDIT_GENERIC=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y -CONFIG_LZO_COMPRESS=m +CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_XZ_DEC=y CONFIG_XZ_DEC_X86=y diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index b881d16..85ae5eb 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1345,7 +1345,7 @@ CONFIG_IWMC3200TOP=m # Texas Instruments shared transport line discipline # CONFIG_TI_ST=m -# CONFIG_SENSORS_LIS3_I2C is not set +CONFIG_SENSORS_LIS3_I2C=m # # Altera FPGA firmware download module @@ -3640,7 +3640,8 @@ CONFIG_HID_DRAGONRISE=m # CONFIG_HID_EMS_FF is not set CONFIG_HID_ELECOM=m CONFIG_HID_EZKEY=m -# CONFIG_HID_HOLTEK is not set +CONFIG_HID_HOLTEK=m +# CONFIG_HOLTEK_FF is not set CONFIG_HID_KEYTOUCH=m CONFIG_HID_KYE=m CONFIG_HID_UCLOGIC=m diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index d30681a..038bee5 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1370,7 +1370,7 @@ CONFIG_IWMC3200TOP=m # Texas Instruments shared transport line discipline # CONFIG_TI_ST=m -# CONFIG_SENSORS_LIS3_I2C is not set +CONFIG_SENSORS_LIS3_I2C=m # # Altera FPGA firmware download module @@ -3672,7 +3672,8 @@ CONFIG_HID_DRAGONRISE=m # CONFIG_HID_EMS_FF is not set CONFIG_HID_ELECOM=m CONFIG_HID_EZKEY=m -# CONFIG_HID_HOLTEK is not set +CONFIG_HID_HOLTEK=m +# CONFIG_HOLTEK_FF is not set CONFIG_HID_KEYTOUCH=m CONFIG_HID_KYE=m CONFIG_HID_UCLOGIC=m diff --git a/config/rootfiles/common/armv5tel/linux-kirkwood b/config/rootfiles/common/armv5tel/linux-kirkwood index 87652a5..c24aebe 100644 --- a/config/rootfiles/common/armv5tel/linux-kirkwood +++ b/config/rootfiles/common/armv5tel/linux-kirkwood @@ -162,11 +162,16 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/bcma #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/bcma/bcma.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/block +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/block/DAC960.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/block/aoe #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/block/aoe/aoe.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/block/cciss.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/block/cpqarray.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/block/cryptoloop.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/block/mg_disk.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/block/nbd.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/block/osdblk.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/block/rbd.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/block/sx8.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/bluetooth #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/bluetooth/ath3k.ko @@ -187,7 +192,6 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/cdrom #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/cdrom/cdrom.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/char -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/char/apm-emulation.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/char/hw_random #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/char/hw_random/rng-core.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/char/hw_random/timeriomem-rng.ko @@ -198,6 +202,7 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/char/ipmi/ipmi_si.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/char/ipmi/ipmi_watchdog.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/char/lp.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/char/nvram.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/char/pcmcia #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/char/pcmcia/synclink_cs.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/char/ppdev.ko @@ -213,11 +218,11 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/firewire/firewire-net.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/firewire/firewire-ohci.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/firewire/firewire-sbp2.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/firewire/nosy.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpio #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpio/gpio-adp5588.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpio/gpio-generic.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpio/gpio-it8761e.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpio/gpio-janz-ttl.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpio/gpio-max7300.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpio/gpio-max730x.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpio/gpio-max732x.ko @@ -249,6 +254,7 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-a4tech.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-apple.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-axff.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-belkin.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-cherry.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-chicony.ko @@ -258,6 +264,7 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-ezkey.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-gaff.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-gyration.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-holtekff.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-kensington.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-keytouch.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-kye.ko @@ -274,6 +281,7 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-picolcd.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-pl.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-primax.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-prodikeys.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-quanta.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-roccat-arvo.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-roccat-common.ko @@ -309,10 +317,12 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/adm9240.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/ads1015.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/ads7828.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/adt7411.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/adt7462.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/adt7470.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/adt7475.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/amc6821.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/asc7621.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/atxp1.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/dme1737.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/ds1621.ko @@ -430,6 +440,7 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-sis630.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-sis96x.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-stub.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-taos-evm.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-tiny-usb.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-via.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-viapro.ko @@ -469,17 +480,10 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/88pm860x_onkey.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/ad714x-i2c.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/ad714x.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/adxl34x-i2c.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/adxl34x.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/ati_remote2.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/bma150.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/cm109.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/cma3000_d0x.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/cma3000_d0x_i2c.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/keyspan_remote.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/kxtj9.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/mma8450.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/mpu3050.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/pcf50633-input.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/pcf8574_keypad.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/powermate.ko @@ -559,6 +563,7 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/leds-lt3593.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/leds-pca9532.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/leds-pca955x.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/leds-regulator.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/ledtrig-backlight.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/ledtrig-gpio.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/ledtrig-heartbeat.ko @@ -612,14 +617,6 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb/dvb-core/dvb-core.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/media.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/ir-jvc-decoder.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/ir-lirc-codec.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/ir-mce_kbd-decoder.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/ir-nec-decoder.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/ir-rc5-decoder.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/ir-rc5-sz-decoder.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/ir-rc6-decoder.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/ir-sony-decoder.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-alink-dtu-m.ko @@ -726,6 +723,7 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/memstick/core/mspro_block.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/memstick/host #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/memstick/host/jmb38x_ms.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/memstick/host/r592.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/memstick/host/tifm_ms.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/message #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/message/fusion @@ -737,14 +735,20 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/message/fusion/mptspi.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/htc-pasic3.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/janz-cmodio.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/lpc_sch.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/pcf50633-adc.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/pcf50633-gpio.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/pcf50633.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/rdc321x-southbridge.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/sm501.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/timberdale.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/tps6105x.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/tps65010.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/tps6507x.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/ucb1400_core.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/vx855.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/wl1273-core.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/wm8400-core.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/apds9802als.ko @@ -789,13 +793,16 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/core/mmc_core.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host/cb710-mmc.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host/dw_mmc.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host/mvsdio.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host/sdhci-pci.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host/sdhci-pltfm.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host/sdhci.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host/sdricoh_cs.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host/tifm_sd.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host/ushc.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host/via-sdmmc.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host/vub300.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/ar7part.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/chips @@ -816,6 +823,7 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/nand/orion_nand.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/nand/plat_nand.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/ofpart.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/sm_ftl.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/tests #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/tests/mtd_nandecctest.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/tests/mtd_oobtest.ko @@ -830,10 +838,6 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/bonding #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/bonding/bonding.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/caif -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/caif/caif_hsi.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/caif/caif_serial.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/caif/cfspi_slave.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dummy.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/eql.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet @@ -1125,21 +1129,47 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/pcmcia/pcmcia_rsrc.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/pcmcia/pd6729.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/pcmcia/yenta_socket.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/power -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/power/bq27x00_battery.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/power/ds2782_battery.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/power/max17040_battery.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/power/pcf50633-charger.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/pps -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/pps/clients -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/pps/clients/pps-gpio.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/pps/clients/pps-ldisc.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/pps/clients/pps_parport.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/pps/pps_core.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ptp #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ptp/ptp.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/regulator +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/regulator/fixed.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/regulator/gpio-regulator.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc -#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-88pm860x.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-bq32k.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-bq4802.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-cmos.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-ds1286.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-ds1307.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-ds1374.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-ds1511.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-ds1553.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-ds1672.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-ds1742.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-ds3232.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-em3027.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-fm3130.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-isl12022.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-isl1208.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-m41t80.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-m48t35.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-m48t59.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-m48t86.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-max6900.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-msm6242.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-pcf50633.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-pcf8563.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-pcf8583.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-rp5c01.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-rs5c372.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-rv3029c2.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-rx8025.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-rx8581.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-s35390a.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-stk17ta8.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-v3020.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-x1205.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/3w-9xxx.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/3w-sas.ko @@ -1207,6 +1237,9 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/mvsas #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/mvsas/mvsas.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/mvumi.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/osd +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/osd/libosd.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/osd/osd.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/pcmcia #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/pcmcia/aha152x_cs.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/pcmcia/fdomain_cs.ko @@ -1252,6 +1285,7 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/ipwireless #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/ipwireless/ipwireless.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/n_gsm.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/nozomi.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/serial #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/serial/8250_dw.ko @@ -1261,11 +1295,13 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/serial/pch_uart.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/serial/serial_cs.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/serial/timbuart.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/serial/uartlite.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/serial/xilinx_uartps.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/uio #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/uio/uio.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/uio/uio_aec.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/uio/uio_cif.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/uio/uio_netx.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/uio/uio_pci_generic.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/uio/uio_pdrv.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/uio/uio_pdrv_genirq.ko @@ -1289,6 +1325,7 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/host #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/host/hwa-hc.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/host/isp116x-hcd.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/host/isp1362-hcd.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/host/oxu210hp-hcd.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/host/r8a66597-hcd.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/host/sl811-hcd.ko @@ -1324,10 +1361,14 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/digi_acceleport.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/empeg.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/ftdi_sio.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/funsoft.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/garmin_gps.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/hp4x.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/io_edgeport.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/io_ti.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/ipaq.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/ipw.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/ir-usb.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/iuu_phoenix.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/keyspan_pda.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/mct_u232.ko @@ -1344,16 +1385,20 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/siemens_mpi.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/sierra.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/spcp8x5.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/ssu100.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/symbolserial.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/ti_usb_3410_5052.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/usb_wwan.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/usbserial.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/visor.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/vivopay-serial.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/whiteheat.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/zio.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/storage #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/storage/uas.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/storage/ums-alauda.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/storage/ums-cypress.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/storage/ums-datafab.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/storage/ums-eneub6250.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/storage/ums-freecom.ko #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/storage/ums-isd200.ko @@ -1471,18 +1516,10 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/fs/cachefiles/cachefiles.ko #lib/modules/KVER-ipfire-kirkwood/kernel/fs/cifs #lib/modules/KVER-ipfire-kirkwood/kernel/fs/cifs/cifs.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/fs/configfs -#lib/modules/KVER-ipfire-kirkwood/kernel/fs/configfs/configfs.ko #lib/modules/KVER-ipfire-kirkwood/kernel/fs/ecryptfs #lib/modules/KVER-ipfire-kirkwood/kernel/fs/ecryptfs/ecryptfs.ko #lib/modules/KVER-ipfire-kirkwood/kernel/fs/exportfs #lib/modules/KVER-ipfire-kirkwood/kernel/fs/exportfs/exportfs.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/fs/ext2 -#lib/modules/KVER-ipfire-kirkwood/kernel/fs/ext2/ext2.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/fs/ext3 -#lib/modules/KVER-ipfire-kirkwood/kernel/fs/ext3/ext3.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/fs/ext4 -#lib/modules/KVER-ipfire-kirkwood/kernel/fs/ext4/ext4.ko #lib/modules/KVER-ipfire-kirkwood/kernel/fs/fat #lib/modules/KVER-ipfire-kirkwood/kernel/fs/fat/fat.ko #lib/modules/KVER-ipfire-kirkwood/kernel/fs/fat/vfat.ko @@ -1493,17 +1530,12 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/fs/fuse/fuse.ko #lib/modules/KVER-ipfire-kirkwood/kernel/fs/isofs #lib/modules/KVER-ipfire-kirkwood/kernel/fs/isofs/isofs.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/fs/jbd -#lib/modules/KVER-ipfire-kirkwood/kernel/fs/jbd/jbd.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/fs/jbd2 -#lib/modules/KVER-ipfire-kirkwood/kernel/fs/jbd2/jbd2.ko #lib/modules/KVER-ipfire-kirkwood/kernel/fs/jffs2 #lib/modules/KVER-ipfire-kirkwood/kernel/fs/jffs2/jffs2.ko #lib/modules/KVER-ipfire-kirkwood/kernel/fs/jfs #lib/modules/KVER-ipfire-kirkwood/kernel/fs/jfs/jfs.ko #lib/modules/KVER-ipfire-kirkwood/kernel/fs/lockd #lib/modules/KVER-ipfire-kirkwood/kernel/fs/lockd/lockd.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/fs/mbcache.ko #lib/modules/KVER-ipfire-kirkwood/kernel/fs/nfs #lib/modules/KVER-ipfire-kirkwood/kernel/fs/nfs/nfs.ko #lib/modules/KVER-ipfire-kirkwood/kernel/fs/nfs_common @@ -1527,7 +1559,6 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/lib/crc-ccitt.ko #lib/modules/KVER-ipfire-kirkwood/kernel/lib/crc-itu-t.ko #lib/modules/KVER-ipfire-kirkwood/kernel/lib/crc-t10dif.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/lib/crc16.ko #lib/modules/KVER-ipfire-kirkwood/kernel/lib/crc7.ko #lib/modules/KVER-ipfire-kirkwood/kernel/lib/crc8.ko #lib/modules/KVER-ipfire-kirkwood/kernel/lib/libcrc32c.ko @@ -1586,10 +1617,8 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/net/bridge/netfilter/ebtable_filter.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/bridge/netfilter/ebtable_nat.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/bridge/netfilter/ebtables.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/net/caif -#lib/modules/KVER-ipfire-kirkwood/kernel/net/caif/caif.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/net/caif/caif_socket.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/net/caif/chnl_net.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/net/ceph +#lib/modules/KVER-ipfire-kirkwood/kernel/net/ceph/libceph.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/ieee802154 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ieee802154/6lowpan.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/ieee802154/af_802154.ko @@ -1705,19 +1734,6 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/net/mac80211 #lib/modules/KVER-ipfire-kirkwood/kernel/net/mac80211/mac80211.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter -#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipset -#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipset/ip_set.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipset/ip_set_bitmap_ip.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipset/ip_set_bitmap_ipmac.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipset/ip_set_bitmap_port.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipset/ip_set_hash_ip.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipset/ip_set_hash_ipport.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipset/ip_set_hash_ipportip.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipset/ip_set_hash_ipportnet.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipset/ip_set_hash_net.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipset/ip_set_hash_netiface.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipset/ip_set_hash_netport.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipset/ip_set_list_set.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipvs #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipvs/ip_vs.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nf_conntrack.ko @@ -1793,7 +1809,6 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_realm.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_recent.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_sctp.ko -#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_set.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_socket.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_state.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_statistic.ko @@ -1803,6 +1818,7 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_time.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_u32.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/rfkill +#lib/modules/KVER-ipfire-kirkwood/kernel/net/rfkill/rfkill-regulator.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/rfkill/rfkill.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/rxrpc #lib/modules/KVER-ipfire-kirkwood/kernel/net/rxrpc/af-rxrpc.ko @@ -1815,6 +1831,7 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/act_nat.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/act_pedit.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/act_police.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/act_simple.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/act_skbedit.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/cls_basic.ko #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/cls_flow.ko @@ -1912,6 +1929,7 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/sound/i2c/other/snd-ak4117.ko #lib/modules/KVER-ipfire-kirkwood/kernel/sound/i2c/other/snd-ak4xxx-adda.ko #lib/modules/KVER-ipfire-kirkwood/kernel/sound/i2c/other/snd-pt2258.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/sound/i2c/other/snd-tea575x-tuner.ko #lib/modules/KVER-ipfire-kirkwood/kernel/sound/i2c/snd-cs8427.ko #lib/modules/KVER-ipfire-kirkwood/kernel/sound/i2c/snd-i2c.ko #lib/modules/KVER-ipfire-kirkwood/kernel/sound/pci @@ -1970,6 +1988,8 @@ lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/kernel/sound/pci/ice1712/snd-ice17xx-ak4xxx.ko #lib/modules/KVER-ipfire-kirkwood/kernel/sound/pci/korg1212 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/pci/korg1212/snd-korg1212.ko +#lib/modules/KVER-ipfire-kirkwood/kernel/sound/pci/lola +#lib/modules/KVER-ipfire-kirkwood/kernel/sound/pci/lola/snd-lola.ko #lib/modules/KVER-ipfire-kirkwood/kernel/sound/pci/lx6464es #lib/modules/KVER-ipfire-kirkwood/kernel/sound/pci/lx6464es/snd-lx6464es.ko #lib/modules/KVER-ipfire-kirkwood/kernel/sound/pci/mixart diff --git a/config/rootfiles/common/armv5tel/linux-omap b/config/rootfiles/common/armv5tel/linux-omap index 0d0007f..f3bf7c6 100644 --- a/config/rootfiles/common/armv5tel/linux-omap +++ b/config/rootfiles/common/armv5tel/linux-omap @@ -92,6 +92,8 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/drivers/block/cryptoloop.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/block/mg_disk.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/block/nbd.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/block/osdblk.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/block/rbd.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/bluetooth #lib/modules/KVER-ipfire-omap/kernel/drivers/bluetooth/ath3k.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/bluetooth/bcm203x.ko @@ -118,6 +120,7 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/drivers/char/ipmi/ipmi_si.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/char/ipmi/ipmi_watchdog.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/char/lp.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/char/nvram.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/char/ppdev.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/connector #lib/modules/KVER-ipfire-omap/kernel/drivers/connector/cn.ko @@ -125,6 +128,7 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/drivers/crypto/omap-aes.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/crypto/omap-sham.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/dma +#lib/modules/KVER-ipfire-omap/kernel/drivers/dma/dmatest.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/dma/dw_dmac.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/dma/timb_dma.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/gpio @@ -135,11 +139,16 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/drivers/gpio/gpio-max730x.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/gpio/gpio-max732x.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/gpio/gpio-mcp23s08.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/gpio/gpio-pca953x.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/gpio/gpio-pcf857x.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/gpio/gpio-twl4030.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/gpu +#lib/modules/KVER-ipfire-omap/kernel/drivers/gpu/drm +#lib/modules/KVER-ipfire-omap/kernel/drivers/gpu/drm/drm.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hid #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-a4tech.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-apple.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-axff.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-belkin.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-cherry.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-chicony.ko @@ -149,17 +158,32 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-ezkey.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-gaff.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-gyration.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-holtekff.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-kensington.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-keytouch.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-kye.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-lcpower.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-logitech-dj.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-logitech.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-magicmouse.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-microsoft.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-monterey.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-multitouch.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-ntrig.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-ortek.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-petalynx.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-picolcd.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-pl.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-primax.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-prodikeys.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-quanta.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-roccat-arvo.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-roccat-common.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-roccat-kone.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-roccat-koneplus.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-roccat-kovaplus.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-roccat-pyra.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-roccat.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-samsung.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-sjoy.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-sony.ko @@ -168,9 +192,12 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-tmff.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-topseed.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-twinhan.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-uclogic.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-wacom.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-waltop.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-wiimote.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-zpff.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/hid/hid-zydacron.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/usbhid #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/usbhid/usbhid.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hid/usbhid/usbkbd.ko @@ -186,13 +213,16 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/drivers/hwmon/adm9240.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hwmon/ads1015.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hwmon/ads7828.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/hwmon/adt7411.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hwmon/adt7462.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hwmon/adt7470.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hwmon/adt7475.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hwmon/amc6821.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/hwmon/asc7621.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hwmon/atxp1.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hwmon/dme1737.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hwmon/ds1621.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/hwmon/ds620.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hwmon/emc1403.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hwmon/emc2103.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/hwmon/emc6w201.ko @@ -290,6 +320,7 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/drivers/i2c/busses/i2c-pca-platform.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/i2c/busses/i2c-simtec.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/i2c/busses/i2c-stub.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/i2c/busses/i2c-taos-evm.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/i2c/busses/i2c-tiny-usb.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/i2c/busses/i2c-xiic.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/i2c/i2c-dev.ko @@ -308,6 +339,7 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/drivers/input/keyboard/adp5588-keys.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/input/keyboard/adp5589-keys.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/input/keyboard/gpio_keys.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/input/keyboard/gpio_keys_polled.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/input/keyboard/lkkbd.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/input/keyboard/lm8323.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/input/keyboard/matrix_keypad.ko @@ -326,7 +358,10 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/drivers/input/keyboard/twl4030_keypad.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/input/keyboard/xtkbd.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/input/misc +#lib/modules/KVER-ipfire-omap/kernel/drivers/input/misc/ad714x-i2c.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/input/misc/ad714x.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/input/misc/ati_remote2.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/input/misc/bma150.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/input/misc/cm109.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/input/misc/keyspan_remote.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/input/misc/pcf50633-input.ko @@ -373,9 +408,14 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/drivers/leds #lib/modules/KVER-ipfire-omap/kernel/drivers/leds/leds-bd2802.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/leds/leds-gpio.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/leds/leds-lm3530.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/leds/leds-lp3944.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/leds/leds-lp5521.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/leds/leds-lp5523.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/leds/leds-lt3593.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/leds/leds-pca9532.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/leds/leds-pca955x.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/leds/leds-regulator.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/leds/ledtrig-backlight.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/leds/ledtrig-default-on.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/leds/ledtrig-gpio.ko @@ -427,26 +467,111 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/drivers/media/dvb #lib/modules/KVER-ipfire-omap/kernel/drivers/media/dvb/dvb-core #lib/modules/KVER-ipfire-omap/kernel/drivers/media/dvb/dvb-core/dvb-core.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/media.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/media/radio #lib/modules/KVER-ipfire-omap/kernel/drivers/media/radio/wl128x #lib/modules/KVER-ipfire-omap/kernel/drivers/media/radio/wl128x/fm_drv.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-alink-dtu-m.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-anysee.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-apac-viewcomp.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-asus-pc39.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-ati-x10.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-avermedia-a16d.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-avermedia-cardbus.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-avermedia-dvbt.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-avermedia-m135a.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-avermedia-rm-ks.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-avermedia.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-avertv-303.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-azurewave-ad-tu700.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-behold-columbus.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-behold.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-budget-ci-old.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-cinergy-1400.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-cinergy.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-dib0700-nec.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-dib0700-rc5.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-digitalnow-tinytwin.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-digittrade.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-dm1105-nec.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-dntv-live-dvb-t.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-em-terratec.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-encore-enltv-fm53.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-encore-enltv.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-encore-enltv2.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-evga-indtube.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-eztv.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-flydvb.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-flyvideo.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-fusionhdtv-mce.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-gadmei-rm008z.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-gotview7135.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-hauppauge.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-imon-mce.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-imon-pad.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-iodata-bctv7e.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-kaiomy.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-kworld-315u.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-leadtek-y04g0051.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-lirc.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-lme2510.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-manli.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-medion-x10.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-msi-digivox-ii.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-msi-digivox-iii.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-msi-tvanywhere.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-nebula.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-nec-terratec-cinergy-xs.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-norwood.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-npgtech.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-pctv-sedna.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-pinnacle-color.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-pinnacle-grey.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-pixelview-002t.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-pixelview-mk12.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-pixelview-new.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-pixelview.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-powercolor-real-angel.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-proteus-2309.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-purpletv.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-pv951.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-rc6-mce.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-real-audio-220-32-keys.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-snapstream-firefly.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-streamzap.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-tbs-nec.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-technisat-usb2.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-terratec-cinergy-xs.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-terratec-slim-2.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-terratec-slim.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-tevii-nec.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-tivo.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-total-media-in-hand.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-trekstor.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-tt-1500.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-twinhan1027.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-videomate-m1f.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-videomate-s350.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-videomate-tv-pvr.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/keymaps/rc-winfast.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/lirc_dev.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/media/rc/rc-core.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/media/video -#lib/modules/KVER-ipfire-omap/kernel/drivers/media/video/adv7180.ko -#lib/modules/KVER-ipfire-omap/kernel/drivers/media/video/cs53l32a.ko -#lib/modules/KVER-ipfire-omap/kernel/drivers/media/video/cx2341x.ko -#lib/modules/KVER-ipfire-omap/kernel/drivers/media/video/cx25840 -#lib/modules/KVER-ipfire-omap/kernel/drivers/media/video/cx25840/cx25840.ko -#lib/modules/KVER-ipfire-omap/kernel/drivers/media/video/msp3400.ko -#lib/modules/KVER-ipfire-omap/kernel/drivers/media/video/saa7115.ko -#lib/modules/KVER-ipfire-omap/kernel/drivers/media/video/saa7191.ko -#lib/modules/KVER-ipfire-omap/kernel/drivers/media/video/sr030pc30.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/media/video/ir-kbd-i2c.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/media/video/v4l2-common.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/media/video/v4l2-int-device.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/media/video/videodev.ko -#lib/modules/KVER-ipfire-omap/kernel/drivers/media/video/wm8775.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/memstick #lib/modules/KVER-ipfire-omap/kernel/drivers/memstick/core #lib/modules/KVER-ipfire-omap/kernel/drivers/memstick/core/memstick.ko @@ -457,12 +582,19 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/drivers/mfd/pcf50633-gpio.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/mfd/pcf50633.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/mfd/sm501.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/mfd/tps6105x.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/mfd/tps65010.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/mfd/tps6507x.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/mfd/twl4030-madc.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/mfd/twl6030-pwm.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/mfd/wl1273-core.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/mfd/wm8400-core.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/misc +#lib/modules/KVER-ipfire-omap/kernel/drivers/misc/apds9802als.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/misc/apds990x.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/misc/bh1770glc.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/misc/bh1780gli.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/misc/bmp085.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/misc/c2port #lib/modules/KVER-ipfire-omap/kernel/drivers/misc/c2port/core.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/misc/ds1682.ko @@ -472,10 +604,16 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/drivers/misc/eeprom/eeprom_93cx6.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/misc/eeprom/max6875.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/misc/enclosure.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/misc/fsa9480.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/misc/hmc6352.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/misc/ics932s401.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/misc/isl29003.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/misc/isl29020.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/misc/iwmc3200top #lib/modules/KVER-ipfire-omap/kernel/drivers/misc/iwmc3200top/iwmc3200top.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/misc/lis3lv02d +#lib/modules/KVER-ipfire-omap/kernel/drivers/misc/lis3lv02d/lis3lv02d.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/misc/lis3lv02d/lis3lv02d_i2c.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/misc/ti-st #lib/modules/KVER-ipfire-omap/kernel/drivers/misc/ti-st/st_drv.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/misc/tsl2550.ko @@ -485,6 +623,7 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/drivers/mmc/card/mmc_test.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/mmc/card/sdio_uart.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/mmc/host +#lib/modules/KVER-ipfire-omap/kernel/drivers/mmc/host/dw_mmc.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/mmc/host/sdhci-pltfm.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/mmc/host/sdhci.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/mmc/host/ushc.ko @@ -502,7 +641,6 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/drivers/mtd/mtd_blkdevs.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/mtd/mtdblock.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/mtd/mtdchar.ko -#lib/modules/KVER-ipfire-omap/kernel/drivers/mtd/mtdswap.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/mtd/nand #lib/modules/KVER-ipfire-omap/kernel/drivers/mtd/nand/nand_ecc.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/mtd/ofpart.ko @@ -521,10 +659,6 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/drivers/net #lib/modules/KVER-ipfire-omap/kernel/drivers/net/bonding #lib/modules/KVER-ipfire-omap/kernel/drivers/net/bonding/bonding.ko -#lib/modules/KVER-ipfire-omap/kernel/drivers/net/caif -#lib/modules/KVER-ipfire-omap/kernel/drivers/net/caif/caif_hsi.ko -#lib/modules/KVER-ipfire-omap/kernel/drivers/net/caif/caif_serial.ko -#lib/modules/KVER-ipfire-omap/kernel/drivers/net/caif/cfspi_slave.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/net/dummy.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/net/eql.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/net/ethernet @@ -637,35 +771,51 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/drivers/net/wireless/hostap #lib/modules/KVER-ipfire-omap/kernel/drivers/net/wireless/hostap/hostap.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/net/wireless/rndis_wlan.ko -#lib/modules/KVER-ipfire-omap/kernel/drivers/net/wireless/rtlwifi -#lib/modules/KVER-ipfire-omap/kernel/drivers/net/wireless/rtlwifi/rtl8192c -#lib/modules/KVER-ipfire-omap/kernel/drivers/net/wireless/rtlwifi/rtl8192c/rtl8192c-common.ko -#lib/modules/KVER-ipfire-omap/kernel/drivers/net/wireless/rtlwifi/rtl8192cu -#lib/modules/KVER-ipfire-omap/kernel/drivers/net/wireless/rtlwifi/rtl8192cu/rtl8192cu.ko -#lib/modules/KVER-ipfire-omap/kernel/drivers/net/wireless/rtlwifi/rtlwifi.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/net/wireless/zd1201.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/parport #lib/modules/KVER-ipfire-omap/kernel/drivers/parport/parport.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/parport/parport_ax88796.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/power -#lib/modules/KVER-ipfire-omap/kernel/drivers/power/bq27x00_battery.ko -#lib/modules/KVER-ipfire-omap/kernel/drivers/power/ds2782_battery.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/power/gpio-charger.ko -#lib/modules/KVER-ipfire-omap/kernel/drivers/power/max17040_battery.ko -#lib/modules/KVER-ipfire-omap/kernel/drivers/power/pcf50633-charger.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/power/twl4030_charger.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/pps -#lib/modules/KVER-ipfire-omap/kernel/drivers/pps/clients -#lib/modules/KVER-ipfire-omap/kernel/drivers/pps/clients/pps-gpio.ko -#lib/modules/KVER-ipfire-omap/kernel/drivers/pps/clients/pps-ktimer.ko -#lib/modules/KVER-ipfire-omap/kernel/drivers/pps/clients/pps-ldisc.ko -#lib/modules/KVER-ipfire-omap/kernel/drivers/pps/clients/pps_parport.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/pps/pps_core.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/ptp #lib/modules/KVER-ipfire-omap/kernel/drivers/ptp/ptp.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/regulator -#lib/modules/KVER-ipfire-omap/kernel/drivers/regulator/tps65023-regulator.ko -#lib/modules/KVER-ipfire-omap/kernel/drivers/regulator/tps6507x-regulator.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/regulator/gpio-regulator.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-cmos.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-ds1286.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-ds1307.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-ds1374.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-ds1511.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-ds1553.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-ds1672.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-ds1742.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-ds3232.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-em3027.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-fm3130.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-isl12022.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-isl1208.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-m41t80.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-m48t35.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-m48t59.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-m48t86.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-max6900.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-msm6242.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-pcf50633.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-pcf8563.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-pcf8583.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-rp5c01.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-rs5c372.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-rv3029c2.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-rx8025.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-rx8581.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-s35390a.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-stk17ta8.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-v3020.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/rtc/rtc-x1205.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/scsi #lib/modules/KVER-ipfire-omap/kernel/drivers/scsi/ch.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/scsi/device_handler @@ -684,6 +834,9 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/drivers/scsi/libiscsi_tcp.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/scsi/libsas #lib/modules/KVER-ipfire-omap/kernel/drivers/scsi/libsas/libsas.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/scsi/osd +#lib/modules/KVER-ipfire-omap/kernel/drivers/scsi/osd/libosd.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/scsi/osd/osd.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/scsi/raid_class.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/scsi/scsi_mod.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/scsi/scsi_transport_fc.ko @@ -699,21 +852,16 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/drivers/ssb #lib/modules/KVER-ipfire-omap/kernel/drivers/ssb/ssb.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/staging -#lib/modules/KVER-ipfire-omap/kernel/drivers/staging/keucr -#lib/modules/KVER-ipfire-omap/kernel/drivers/staging/keucr/keucr.ko -#lib/modules/KVER-ipfire-omap/kernel/drivers/staging/rtl8712 -#lib/modules/KVER-ipfire-omap/kernel/drivers/staging/rtl8712/r8712u.ko -#lib/modules/KVER-ipfire-omap/kernel/drivers/staging/rts5139 -#lib/modules/KVER-ipfire-omap/kernel/drivers/staging/rts5139/rts5139.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/staging/usbip +#lib/modules/KVER-ipfire-omap/kernel/drivers/staging/usbip/usbip-core.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/staging/usbip/usbip-host.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/staging/usbip/vhci-hcd.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/tty #lib/modules/KVER-ipfire-omap/kernel/drivers/tty/n_gsm.ko -#lib/modules/KVER-ipfire-omap/kernel/drivers/tty/n_tracerouter.ko -#lib/modules/KVER-ipfire-omap/kernel/drivers/tty/n_tracesink.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/tty/serial #lib/modules/KVER-ipfire-omap/kernel/drivers/tty/serial/8250_dw.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/tty/serial/altera_jtaguart.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/tty/serial/altera_uart.ko -#lib/modules/KVER-ipfire-omap/kernel/drivers/tty/serial/of_serial.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/tty/serial/timbuart.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/tty/serial/xilinx_uartps.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/uio @@ -732,6 +880,16 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/drivers/usb/class/cdc-wdm.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/usb/class/usblp.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/usb/class/usbtmc.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/usb/dwc3 +#lib/modules/KVER-ipfire-omap/kernel/drivers/usb/dwc3/dwc3-omap.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/usb/dwc3/dwc3.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/usb/host +#lib/modules/KVER-ipfire-omap/kernel/drivers/usb/host/isp116x-hcd.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/usb/host/isp1362-hcd.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/usb/host/oxu210hp-hcd.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/usb/host/r8a66597-hcd.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/usb/host/sl811-hcd.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/usb/host/u132-hcd.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/usb/misc #lib/modules/KVER-ipfire-omap/kernel/drivers/usb/misc/cypress_cy7c63.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/usb/misc/cytherm.ko @@ -761,10 +919,14 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/drivers/usb/serial/digi_acceleport.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/usb/serial/empeg.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/usb/serial/ftdi_sio.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/usb/serial/funsoft.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/usb/serial/garmin_gps.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/usb/serial/hp4x.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/usb/serial/io_edgeport.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/usb/serial/io_ti.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/usb/serial/ipaq.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/usb/serial/ipw.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/usb/serial/ir-usb.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/usb/serial/iuu_phoenix.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/usb/serial/keyspan_pda.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/usb/serial/mct_u232.ko @@ -786,6 +948,7 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/drivers/usb/serial/ti_usb_3410_5052.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/usb/serial/usb_wwan.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/usb/serial/usbserial.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/usb/serial/visor.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/usb/serial/vivopay-serial.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/usb/serial/whiteheat.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/usb/serial/zio.ko @@ -793,6 +956,7 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/drivers/usb/storage/uas.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/usb/storage/ums-alauda.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/usb/storage/ums-cypress.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/usb/storage/ums-datafab.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/usb/storage/ums-eneub6250.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/usb/storage/ums-freecom.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/usb/storage/ums-isd200.ko @@ -812,6 +976,16 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/drivers/video/backlight/pcf50633-backlight.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/video/backlight/platform_lcd.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/video/backlight/pwm_bl.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/video/fb_sys_fops.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/video/metronomefb.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/video/output.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/video/sm501fb.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/video/smscufx.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/video/syscopyarea.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/video/sysfillrect.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/video/sysimgblt.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/video/tmiofb.ko +#lib/modules/KVER-ipfire-omap/kernel/drivers/video/uvesafb.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/w1 #lib/modules/KVER-ipfire-omap/kernel/drivers/w1/masters #lib/modules/KVER-ipfire-omap/kernel/drivers/w1/masters/ds1wm.ko @@ -831,6 +1005,7 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/drivers/w1/slaves/w1_therm.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/w1/wire.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/watchdog +#lib/modules/KVER-ipfire-omap/kernel/drivers/watchdog/dw_wdt.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/watchdog/max63xx_wdt.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/watchdog/mpcore_wdt.ko #lib/modules/KVER-ipfire-omap/kernel/drivers/watchdog/omap_wdt.ko @@ -848,12 +1023,6 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/fs/ecryptfs/ecryptfs.ko #lib/modules/KVER-ipfire-omap/kernel/fs/exportfs #lib/modules/KVER-ipfire-omap/kernel/fs/exportfs/exportfs.ko -#lib/modules/KVER-ipfire-omap/kernel/fs/ext2 -#lib/modules/KVER-ipfire-omap/kernel/fs/ext2/ext2.ko -#lib/modules/KVER-ipfire-omap/kernel/fs/ext3 -#lib/modules/KVER-ipfire-omap/kernel/fs/ext3/ext3.ko -#lib/modules/KVER-ipfire-omap/kernel/fs/ext4 -#lib/modules/KVER-ipfire-omap/kernel/fs/ext4/ext4.ko #lib/modules/KVER-ipfire-omap/kernel/fs/fat #lib/modules/KVER-ipfire-omap/kernel/fs/fat/fat.ko #lib/modules/KVER-ipfire-omap/kernel/fs/fat/vfat.ko @@ -864,17 +1033,12 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/fs/fuse/fuse.ko #lib/modules/KVER-ipfire-omap/kernel/fs/isofs #lib/modules/KVER-ipfire-omap/kernel/fs/isofs/isofs.ko -#lib/modules/KVER-ipfire-omap/kernel/fs/jbd -#lib/modules/KVER-ipfire-omap/kernel/fs/jbd/jbd.ko -#lib/modules/KVER-ipfire-omap/kernel/fs/jbd2 -#lib/modules/KVER-ipfire-omap/kernel/fs/jbd2/jbd2.ko #lib/modules/KVER-ipfire-omap/kernel/fs/jffs2 #lib/modules/KVER-ipfire-omap/kernel/fs/jffs2/jffs2.ko #lib/modules/KVER-ipfire-omap/kernel/fs/jfs #lib/modules/KVER-ipfire-omap/kernel/fs/jfs/jfs.ko #lib/modules/KVER-ipfire-omap/kernel/fs/lockd #lib/modules/KVER-ipfire-omap/kernel/fs/lockd/lockd.ko -#lib/modules/KVER-ipfire-omap/kernel/fs/mbcache.ko #lib/modules/KVER-ipfire-omap/kernel/fs/nfs #lib/modules/KVER-ipfire-omap/kernel/fs/nfs/nfs.ko #lib/modules/KVER-ipfire-omap/kernel/fs/nfs_common @@ -898,7 +1062,6 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/lib/crc-ccitt.ko #lib/modules/KVER-ipfire-omap/kernel/lib/crc-itu-t.ko #lib/modules/KVER-ipfire-omap/kernel/lib/crc-t10dif.ko -#lib/modules/KVER-ipfire-omap/kernel/lib/crc16.ko #lib/modules/KVER-ipfire-omap/kernel/lib/crc7.ko #lib/modules/KVER-ipfire-omap/kernel/lib/crc8.ko #lib/modules/KVER-ipfire-omap/kernel/lib/libcrc32c.ko @@ -957,10 +1120,6 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/net/bridge/netfilter/ebtable_filter.ko #lib/modules/KVER-ipfire-omap/kernel/net/bridge/netfilter/ebtable_nat.ko #lib/modules/KVER-ipfire-omap/kernel/net/bridge/netfilter/ebtables.ko -#lib/modules/KVER-ipfire-omap/kernel/net/caif -#lib/modules/KVER-ipfire-omap/kernel/net/caif/caif.ko -#lib/modules/KVER-ipfire-omap/kernel/net/caif/caif_socket.ko -#lib/modules/KVER-ipfire-omap/kernel/net/caif/chnl_net.ko #lib/modules/KVER-ipfire-omap/kernel/net/ceph #lib/modules/KVER-ipfire-omap/kernel/net/ceph/libceph.ko #lib/modules/KVER-ipfire-omap/kernel/net/ieee802154 @@ -1078,19 +1237,6 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/net/mac80211 #lib/modules/KVER-ipfire-omap/kernel/net/mac80211/mac80211.ko #lib/modules/KVER-ipfire-omap/kernel/net/netfilter -#lib/modules/KVER-ipfire-omap/kernel/net/netfilter/ipset -#lib/modules/KVER-ipfire-omap/kernel/net/netfilter/ipset/ip_set.ko -#lib/modules/KVER-ipfire-omap/kernel/net/netfilter/ipset/ip_set_bitmap_ip.ko -#lib/modules/KVER-ipfire-omap/kernel/net/netfilter/ipset/ip_set_bitmap_ipmac.ko -#lib/modules/KVER-ipfire-omap/kernel/net/netfilter/ipset/ip_set_bitmap_port.ko -#lib/modules/KVER-ipfire-omap/kernel/net/netfilter/ipset/ip_set_hash_ip.ko -#lib/modules/KVER-ipfire-omap/kernel/net/netfilter/ipset/ip_set_hash_ipport.ko -#lib/modules/KVER-ipfire-omap/kernel/net/netfilter/ipset/ip_set_hash_ipportip.ko -#lib/modules/KVER-ipfire-omap/kernel/net/netfilter/ipset/ip_set_hash_ipportnet.ko -#lib/modules/KVER-ipfire-omap/kernel/net/netfilter/ipset/ip_set_hash_net.ko -#lib/modules/KVER-ipfire-omap/kernel/net/netfilter/ipset/ip_set_hash_netiface.ko -#lib/modules/KVER-ipfire-omap/kernel/net/netfilter/ipset/ip_set_hash_netport.ko -#lib/modules/KVER-ipfire-omap/kernel/net/netfilter/ipset/ip_set_list_set.ko #lib/modules/KVER-ipfire-omap/kernel/net/netfilter/ipvs #lib/modules/KVER-ipfire-omap/kernel/net/netfilter/ipvs/ip_vs.ko #lib/modules/KVER-ipfire-omap/kernel/net/netfilter/nf_conntrack.ko @@ -1166,7 +1312,6 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/net/netfilter/xt_realm.ko #lib/modules/KVER-ipfire-omap/kernel/net/netfilter/xt_recent.ko #lib/modules/KVER-ipfire-omap/kernel/net/netfilter/xt_sctp.ko -#lib/modules/KVER-ipfire-omap/kernel/net/netfilter/xt_set.ko #lib/modules/KVER-ipfire-omap/kernel/net/netfilter/xt_socket.ko #lib/modules/KVER-ipfire-omap/kernel/net/netfilter/xt_state.ko #lib/modules/KVER-ipfire-omap/kernel/net/netfilter/xt_statistic.ko @@ -1190,6 +1335,7 @@ lib/modules/KVER-ipfire-omap #lib/modules/KVER-ipfire-omap/kernel/net/sched/act_nat.ko #lib/modules/KVER-ipfire-omap/kernel/net/sched/act_pedit.ko #lib/modules/KVER-ipfire-omap/kernel/net/sched/act_police.ko +#lib/modules/KVER-ipfire-omap/kernel/net/sched/act_simple.ko #lib/modules/KVER-ipfire-omap/kernel/net/sched/act_skbedit.ko #lib/modules/KVER-ipfire-omap/kernel/net/sched/cls_basic.ko #lib/modules/KVER-ipfire-omap/kernel/net/sched/cls_flow.ko diff --git a/config/rootfiles/common/armv5tel/linux-rpi b/config/rootfiles/common/armv5tel/linux-rpi index bfb4e8b..0b8c57c 100644 --- a/config/rootfiles/common/armv5tel/linux-rpi +++ b/config/rootfiles/common/armv5tel/linux-rpi @@ -79,11 +79,13 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/drivers/ata/ahci_platform.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/ata/libahci.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/ata/libata.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/ata/pata_of_platform.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/ata/pata_platform.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/ata/pata_arasan_cf.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/ata/sata_mv.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/atm #lib/modules/KVER-ipfire-rpi/kernel/drivers/atm/atmtcp.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/base +#lib/modules/KVER-ipfire-rpi/kernel/drivers/base/regmap +#lib/modules/KVER-ipfire-rpi/kernel/drivers/base/regmap/regmap-i2c.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/bcma #lib/modules/KVER-ipfire-rpi/kernel/drivers/bcma/bcma.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/block @@ -92,6 +94,8 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/drivers/block/cryptoloop.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/block/mg_disk.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/block/nbd.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/block/osdblk.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/block/rbd.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/bluetooth #lib/modules/KVER-ipfire-rpi/kernel/drivers/bluetooth/ath3k.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/bluetooth/bcm203x.ko @@ -108,19 +112,36 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/drivers/cdrom/cdrom.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/char #lib/modules/KVER-ipfire-rpi/kernel/drivers/char/hw_random +#lib/modules/KVER-ipfire-rpi/kernel/drivers/char/hw_random/rng-core.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/char/hw_random/timeriomem-rng.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/char/ipmi +#lib/modules/KVER-ipfire-rpi/kernel/drivers/char/ipmi/ipmi_devintf.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/char/ipmi/ipmi_msghandler.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/char/ipmi/ipmi_poweroff.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/char/ipmi/ipmi_si.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/char/ipmi/ipmi_watchdog.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/char/lp.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/char/nvram.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/char/ppdev.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/connector #lib/modules/KVER-ipfire-rpi/kernel/drivers/connector/cn.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/cpufreq -#lib/modules/KVER-ipfire-rpi/kernel/drivers/cpufreq/cpufreq_conservative.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/cpufreq/cpufreq_powersave.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/cpufreq/cpufreq_stats.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/cpufreq/cpufreq_userspace.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/dma -#lib/modules/KVER-ipfire-rpi/kernel/drivers/dma/dw_dmac.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/dma/pl330.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/dma/timb_dma.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/dma/dmatest.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/gpio +#lib/modules/KVER-ipfire-rpi/kernel/drivers/gpio/gpio-adp5588.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/gpio/gpio-generic.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/gpio/gpio-it8761e.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/gpio/gpio-max7300.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/gpio/gpio-max730x.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/gpio/gpio-max732x.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/gpio/gpio-mcp23s08.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/gpio/gpio-pca953x.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/gpio/gpio-pcf857x.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/gpu +#lib/modules/KVER-ipfire-rpi/kernel/drivers/gpu/drm +#lib/modules/KVER-ipfire-rpi/kernel/drivers/gpu/drm/drm.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-a4tech.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-apple.ko @@ -131,7 +152,6 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-cypress.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-dr.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-elecom.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-emsff.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-ezkey.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-gaff.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-gyration.ko @@ -152,8 +172,14 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-picolcd.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-pl.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-primax.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-prodikeys.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-quanta.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-roccat-arvo.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-roccat-common.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-roccat-kone.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-roccat-koneplus.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-roccat-kovaplus.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-roccat-pyra.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-roccat.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-samsung.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-sjoy.ko @@ -169,11 +195,11 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-wiimote.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-zpff.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-zydacron.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/usbhid +#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/usbhid/usbhid.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon -#lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/ad7314.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/ad7414.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/ad7418.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/adcxx.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/adm1021.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/adm1025.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/adm1026.ko @@ -182,7 +208,6 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/adm9240.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/ads1015.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/ads7828.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/ads7871.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/adt7411.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/adt7462.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/adt7470.ko @@ -204,11 +229,13 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/gl520sm.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/gpio-fan.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/hwmon-vid.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/hwmon.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/ibmaem.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/ibmpex.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/it87.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/jc42.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/lineage-pem.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/lm63.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/lm70.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/lm73.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/lm75.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/lm77.ko @@ -226,7 +253,6 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/ltc4215.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/ltc4245.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/ltc4261.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/max1111.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/max16065.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/max1619.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/max1668.ko @@ -278,41 +304,75 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/algos/i2c-algo-pca.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-bcm2708.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-designware-core.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-designware-platform.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-diolan-u2c.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-gpio.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-ocores.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-parport-light.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-parport.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-pca-platform.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-simtec.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-stub.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-taos-evm.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-tiny-usb.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-xiic.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/i2c-core.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/i2c-dev.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/i2c-mux.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/i2c-smbus.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/muxes #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/muxes/gpio-i2cmux.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/muxes/pca9541.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/muxes/pca954x.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/ieee802154 +#lib/modules/KVER-ipfire-rpi/kernel/drivers/ieee802154/fakehard.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/input -#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/evdev.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/ff-memless.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/gameport -#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/gameport/gameport.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/gameport/lightning.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/gameport/ns558.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/input-polldev.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/joydev.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/adp5588-keys.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/adp5589-keys.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/gpio_keys.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/gpio_keys_polled.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/lkkbd.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/lm8323.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/matrix_keypad.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/max7359_keypad.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/mcs_touchkey.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/mpr121_touchkey.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/newtonkbd.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/opencores-kbd.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/qt1070.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/qt2160.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/stowaway.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/sunkbd.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/tca6416-keypad.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/xtkbd.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/misc +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/misc/88pm860x_onkey.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/misc/ad714x-i2c.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/misc/ad714x.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/misc/ati_remote2.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/misc/bma150.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/misc/cm109.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/misc/keyspan_remote.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/misc/pcf50633-input.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/misc/pcf8574_keypad.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/misc/powermate.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/misc/uinput.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/misc/rotary_encoder.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/misc/yealink.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/serio -#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/serio/serio.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/serio/serio_raw.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/serio/serport.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/serio/altera_ps2.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/serio/ambakmi.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/serio/ps2mult.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/sparse-keymap.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn +#lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn/capi +#lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn/capi/capi.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn/capi/capidrv.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn/capi/kernelcapi.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn/divert +#lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn/divert/dss1_divert.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn/gigaset #lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn/gigaset/bas_gigaset.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn/gigaset/gigaset.ko @@ -321,13 +381,32 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn/hardware #lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn/hardware/mISDN #lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn/hardware/mISDN/hfcsusb.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn/hisax +#lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn/hisax/hfc4s8s_l1.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn/hisax/hfc_usb.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn/hisax/hisax.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn/hisax/hisax_st5481.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn/i4l +#lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn/i4l/isdn.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn/i4l/isdn_bsdcomp.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn/i4l/isdnhdlc.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn/mISDN #lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn/mISDN/l1oip.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn/mISDN/mISDN_core.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn/mISDN/mISDN_dsp.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/leds +#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-88pm860x.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-bd2802.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-gpio.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-lm3530.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-lp3944.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-lp5521.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-lp5523.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-lt3593.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-pca9532.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-pca955x.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-regulator.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/ledtrig-backlight.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/ledtrig-default-on.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/ledtrig-gpio.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/ledtrig-heartbeat.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/ledtrig-netdev.ko @@ -378,31 +457,164 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb/dvb-core #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb/dvb-core/dvb-core.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/media.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-alink-dtu-m.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-anysee.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-apac-viewcomp.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-asus-pc39.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-ati-x10.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-avermedia-a16d.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-avermedia-cardbus.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-avermedia-dvbt.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-avermedia-m135a.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-avermedia-rm-ks.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-avermedia.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-avertv-303.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-azurewave-ad-tu700.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-behold-columbus.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-behold.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-budget-ci-old.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-cinergy-1400.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-cinergy.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-dib0700-nec.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-dib0700-rc5.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-digitalnow-tinytwin.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-digittrade.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-dm1105-nec.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-dntv-live-dvb-t.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-em-terratec.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-encore-enltv-fm53.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-encore-enltv.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-encore-enltv2.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-evga-indtube.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-eztv.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-flydvb.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-flyvideo.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-fusionhdtv-mce.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-gadmei-rm008z.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-gotview7135.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-hauppauge.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-imon-mce.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-imon-pad.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-iodata-bctv7e.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-kaiomy.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-kworld-315u.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-leadtek-y04g0051.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-lirc.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-lme2510.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-manli.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-medion-x10.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-msi-digivox-ii.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-msi-digivox-iii.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-msi-tvanywhere.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-nebula.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-nec-terratec-cinergy-xs.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-norwood.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-npgtech.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-pctv-sedna.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-pinnacle-color.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-pinnacle-grey.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-pixelview-002t.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-pixelview-mk12.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-pixelview-new.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-pixelview.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-powercolor-real-angel.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-proteus-2309.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-purpletv.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-pv951.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-rc6-mce.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-real-audio-220-32-keys.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-snapstream-firefly.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-streamzap.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-tbs-nec.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-technisat-usb2.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-terratec-cinergy-xs.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-terratec-slim-2.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-terratec-slim.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-tevii-nec.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-tivo.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-total-media-in-hand.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-trekstor.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-tt-1500.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-twinhan1027.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-videomate-m1f.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-videomate-s350.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-videomate-tv-pvr.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-winfast.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/lirc_dev.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/rc-core.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/video -#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/video/adv7180.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/video/cs53l32a.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/video/cx2341x.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/video/cx25840 -#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/video/cx25840/cx25840.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/video/ir-kbd-i2c.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/video/msp3400.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/video/saa7115.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/video/sr030pc30.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/video/v4l2-common.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/video/v4l2-int-device.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/video/videodev.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/video/wm8775.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/memstick +#lib/modules/KVER-ipfire-rpi/kernel/drivers/memstick/core +#lib/modules/KVER-ipfire-rpi/kernel/drivers/memstick/core/memstick.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/memstick/core/mspro_block.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mfd +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mfd/htc-pasic3.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mfd/pcf50633-adc.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mfd/pcf50633-gpio.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mfd/pcf50633.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mfd/sm501.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mfd/tps6105x.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mfd/tps65010.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mfd/tps6507x.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mfd/ucb1400_core.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mfd/wl1273-core.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mfd/wm8400-core.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/misc +#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/apds9802als.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/apds990x.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/bh1770glc.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/bh1780gli.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/bmp085.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/c2port +#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/c2port/core.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/ds1682.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/eeprom +#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/eeprom/at24.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/eeprom/eeprom.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/eeprom/eeprom_93cx6.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/eeprom/max6875.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/enclosure.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/fsa9480.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/hmc6352.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/ics932s401.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/isl29003.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/isl29020.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/iwmc3200top #lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/iwmc3200top/iwmc3200top.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/lis3lv02d +#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/lis3lv02d/lis3lv02d.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/lis3lv02d/lis3lv02d_i2c.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/ti-st #lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/ti-st/st_drv.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/tsl2550.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mmc +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mmc/card +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mmc/card/mmc_test.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mmc/card/sdio_uart.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mmc/host +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mmc/host/dw_mmc.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mmc/host/mmci.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mmc/host/sdhci-pltfm.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mmc/host/sdhci-pxav2.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mmc/host/sdhci-pxav3.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mmc/host/ushc.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mmc/host/vub300.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/ar7part.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/chips @@ -416,11 +628,22 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/mtd_blkdevs.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/mtdblock.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/mtdchar.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/mtdswap.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/nand +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/nand/nand.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/nand/nand_ecc.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/nand/nand_ids.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/nand/plat_nand.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/ofpart.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/sm_ftl.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/tests +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/tests/mtd_nandecctest.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/tests/mtd_oobtest.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/tests/mtd_pagetest.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/tests/mtd_readtest.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/tests/mtd_speedtest.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/tests/mtd_stresstest.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/tests/mtd_subpagetest.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/tests/mtd_torturetest.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/ubi #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/ubi/ubi.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net @@ -435,9 +658,13 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/broadcom/b44.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/davicom #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/davicom/dm9000.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/dlink +#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/dlink/de600.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/dlink/de620.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/dnet.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/ethoc.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/micrel +#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/micrel/ks8842.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/micrel/ks8851_mll.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/seeq #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/seeq/seeq8005.ko @@ -466,11 +693,13 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/broadcom.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/cicada.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/davicom.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/dp83640.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/et1011c.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/icplus.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/lxt.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/marvell.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/mdio-bitbang.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/mdio-gpio.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/micrel.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/national.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/qsemi.ko @@ -504,7 +733,6 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/gl620a.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/hso.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/int51x1.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/ipheth.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/kalmia.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/kaweth.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/lg-vl600.ko @@ -533,49 +761,45 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/hostap #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/hostap/hostap.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/rndis_wlan.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/rtl8192cu -#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/rtl8192cu/8192cu.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/zd1201.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/of -#lib/modules/KVER-ipfire-rpi/kernel/drivers/of/of_i2c.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/power -#lib/modules/KVER-ipfire-rpi/kernel/drivers/power/power_supply.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/parport +#lib/modules/KVER-ipfire-rpi/kernel/drivers/parport/parport.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/parport/parport_ax88796.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/pps +#lib/modules/KVER-ipfire-rpi/kernel/drivers/pps/pps_core.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/ptp +#lib/modules/KVER-ipfire-rpi/kernel/drivers/ptp/ptp.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/regulator +#lib/modules/KVER-ipfire-rpi/kernel/drivers/regulator/fixed.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/regulator/gpio-regulator.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-bq32k.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-bq4802.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-cmos.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-ds1286.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-ds1305.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-ds1307.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-ds1374.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-ds1390.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-ds1511.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-ds1553.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-ds1672.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-ds1742.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-ds3232.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-ds3234.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-em3027.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-fm3130.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-isl12022.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-isl1208.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-m41t80.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-m41t93.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-m41t94.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-m48t35.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-m48t59.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-m48t86.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-max6900.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-max6902.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-msm6242.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-pcf2123.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-pcf50633.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-pcf8563.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-pcf8583.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-pl030.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-pl031.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-r9701.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-rp5c01.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-rs5c348.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-rs5c372.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-rv3029c2.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-rx8025.ko @@ -602,6 +826,10 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/drivers/scsi/libiscsi_tcp.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/scsi/libsas #lib/modules/KVER-ipfire-rpi/kernel/drivers/scsi/libsas/libsas.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/scsi/osd +#lib/modules/KVER-ipfire-rpi/kernel/drivers/scsi/osd/libosd.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/scsi/osd/osd.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/scsi/raid_class.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/scsi/scsi_transport_fc.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/scsi/scsi_transport_iscsi.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/scsi/scsi_transport_sas.ko @@ -611,13 +839,21 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/drivers/scsi/ses.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/scsi/sg.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/scsi/sr_mod.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/spi -#lib/modules/KVER-ipfire-rpi/kernel/drivers/spi/spi-bcm2708.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/spi/spi-bitbang.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/spi/spi-gpio.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/spi/spidev.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/ssb #lib/modules/KVER-ipfire-rpi/kernel/drivers/ssb/ssb.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/staging +#lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/usbip +#lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/usbip/usbip-core.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/usbip/usbip-host.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/usbip/vhci-hcd.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/tty +#lib/modules/KVER-ipfire-rpi/kernel/drivers/tty/n_gsm.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/tty/serial +#lib/modules/KVER-ipfire-rpi/kernel/drivers/tty/serial/8250_dw.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/tty/serial/altera_jtaguart.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/tty/serial/altera_uart.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/tty/serial/timbuart.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/tty/serial/xilinx_uartps.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/uio #lib/modules/KVER-ipfire-rpi/kernel/drivers/uio/uio.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/uio/uio_pdrv.ko @@ -631,37 +867,41 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/atm/xusbatm.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/class #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/class/cdc-acm.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/class/cdc-wdm.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/class/usblp.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/image -#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/image/mdc800.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/image/microtek.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/class/usbtmc.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/dwc3 +#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/dwc3/dwc3-omap.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/dwc3/dwc3.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/host +#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/host/isp116x-hcd.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/host/isp1362-hcd.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/host/oxu210hp-hcd.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/host/r8a66597-hcd.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/host/sl811-hcd.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/host/u132-hcd.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc -#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/adutux.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/appledisplay.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/cypress_cy7c63.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/cytherm.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/emi26.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/emi62.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/ftdi-elan.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/idmouse.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/iowarrior.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/isight_firmware.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/ldusb.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/legousbtower.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/rio500.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/trancevibrator.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/usblcd.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/usbled.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/usbsevseg.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/usbtest.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/uss720.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/yurex.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/otg +#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/otg/gpio_vbus.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/otg/nop-usb-xceiv.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/aircable.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/ark3116.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/belkin_sa.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/ch341.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/cp210x.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/cyberjack.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/cypress_m8.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/digi_acceleport.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/empeg.ko @@ -675,16 +915,11 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/ipw.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/ir-usb.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/iuu_phoenix.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/keyspan.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/keyspan_pda.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/kl5kusb105.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/kobil_sct.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/mct_u232.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/mos7720.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/mos7840.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/moto_modem.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/navman.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/omninet.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/opticon.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/option.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/oti6858.ko @@ -698,7 +933,6 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/ssu100.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/symbolserial.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/ti_usb_3410_5052.ko -#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/usb_debug.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/usb_wwan.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/usbserial.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/visor.ko @@ -706,6 +940,7 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/whiteheat.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/zio.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/storage +#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/storage/uas.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/storage/ums-alauda.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/storage/ums-cypress.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/storage/ums-datafab.ko @@ -719,13 +954,29 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/storage/ums-sddr09.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/storage/ums-sddr55.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/storage/ums-usbat.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/storage/usb-storage.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/video #lib/modules/KVER-ipfire-rpi/kernel/drivers/video/backlight -#lib/modules/KVER-ipfire-rpi/kernel/drivers/video/backlight/backlight.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/video/backlight/88pm860x_bl.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/video/backlight/adp8860_bl.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/video/backlight/adp8870_bl.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/video/backlight/generic_bl.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/video/backlight/lcd.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/video/backlight/pcf50633-backlight.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/video/backlight/platform_lcd.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/video/fb_sys_fops.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/video/metronomefb.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/video/output.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/video/sm501fb.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/video/smscufx.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/video/syscopyarea.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/video/sysfillrect.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/video/sysimgblt.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/video/tmiofb.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/video/uvesafb.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/w1 #lib/modules/KVER-ipfire-rpi/kernel/drivers/w1/masters +#lib/modules/KVER-ipfire-rpi/kernel/drivers/w1/masters/ds1wm.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/w1/masters/ds2482.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/w1/masters/ds2490.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/w1/masters/w1-gpio.ko @@ -742,8 +993,11 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/drivers/w1/wire.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/watchdog #lib/modules/KVER-ipfire-rpi/kernel/drivers/watchdog/bcm2708_wdog.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/watchdog/dw_wdt.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/watchdog/max63xx_wdt.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/watchdog/pcwd_usb.ko #lib/modules/KVER-ipfire-rpi/kernel/drivers/watchdog/softdog.ko +#lib/modules/KVER-ipfire-rpi/kernel/drivers/watchdog/sp805_wdt.ko #lib/modules/KVER-ipfire-rpi/kernel/fs #lib/modules/KVER-ipfire-rpi/kernel/fs/autofs4 #lib/modules/KVER-ipfire-rpi/kernel/fs/autofs4/autofs4.ko @@ -797,8 +1051,6 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/lib/crc7.ko #lib/modules/KVER-ipfire-rpi/kernel/lib/crc8.ko #lib/modules/KVER-ipfire-rpi/kernel/lib/libcrc32c.ko -#lib/modules/KVER-ipfire-rpi/kernel/lib/lzo -#lib/modules/KVER-ipfire-rpi/kernel/lib/lzo/lzo_compress.ko #lib/modules/KVER-ipfire-rpi/kernel/lib/raid6 #lib/modules/KVER-ipfire-rpi/kernel/lib/raid6/raid6_pq.ko #lib/modules/KVER-ipfire-rpi/kernel/lib/ts_bm.ko @@ -823,6 +1075,8 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/net/bluetooth/bluetooth.ko #lib/modules/KVER-ipfire-rpi/kernel/net/bluetooth/bnep #lib/modules/KVER-ipfire-rpi/kernel/net/bluetooth/bnep/bnep.ko +#lib/modules/KVER-ipfire-rpi/kernel/net/bluetooth/cmtp +#lib/modules/KVER-ipfire-rpi/kernel/net/bluetooth/cmtp/cmtp.ko #lib/modules/KVER-ipfire-rpi/kernel/net/bluetooth/hidp #lib/modules/KVER-ipfire-rpi/kernel/net/bluetooth/hidp/hidp.ko #lib/modules/KVER-ipfire-rpi/kernel/net/bluetooth/rfcomm @@ -852,10 +1106,6 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/net/bridge/netfilter/ebtable_filter.ko #lib/modules/KVER-ipfire-rpi/kernel/net/bridge/netfilter/ebtable_nat.ko #lib/modules/KVER-ipfire-rpi/kernel/net/bridge/netfilter/ebtables.ko -#lib/modules/KVER-ipfire-rpi/kernel/net/caif -#lib/modules/KVER-ipfire-rpi/kernel/net/caif/caif.ko -#lib/modules/KVER-ipfire-rpi/kernel/net/caif/caif_socket.ko -#lib/modules/KVER-ipfire-rpi/kernel/net/caif/chnl_net.ko #lib/modules/KVER-ipfire-rpi/kernel/net/ceph #lib/modules/KVER-ipfire-rpi/kernel/net/ceph/libceph.ko #lib/modules/KVER-ipfire-rpi/kernel/net/ieee802154 @@ -973,19 +1223,6 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/net/mac80211 #lib/modules/KVER-ipfire-rpi/kernel/net/mac80211/mac80211.ko #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter -#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/ipset -#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/ipset/ip_set.ko -#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/ipset/ip_set_bitmap_ip.ko -#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/ipset/ip_set_bitmap_ipmac.ko -#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/ipset/ip_set_bitmap_port.ko -#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/ipset/ip_set_hash_ip.ko -#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/ipset/ip_set_hash_ipport.ko -#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/ipset/ip_set_hash_ipportip.ko -#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/ipset/ip_set_hash_ipportnet.ko -#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/ipset/ip_set_hash_net.ko -#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/ipset/ip_set_hash_netiface.ko -#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/ipset/ip_set_hash_netport.ko -#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/ipset/ip_set_list_set.ko #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/ipvs #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/ipvs/ip_vs.ko #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/nf_conntrack.ko @@ -1061,7 +1298,6 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_realm.ko #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_recent.ko #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_sctp.ko -#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_set.ko #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_socket.ko #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_state.ko #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_statistic.ko @@ -1072,6 +1308,7 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_u32.ko #lib/modules/KVER-ipfire-rpi/kernel/net/rfkill #lib/modules/KVER-ipfire-rpi/kernel/net/rfkill/rfkill-gpio.ko +#lib/modules/KVER-ipfire-rpi/kernel/net/rfkill/rfkill-regulator.ko #lib/modules/KVER-ipfire-rpi/kernel/net/rfkill/rfkill.ko #lib/modules/KVER-ipfire-rpi/kernel/net/rxrpc #lib/modules/KVER-ipfire-rpi/kernel/net/rxrpc/af-rxrpc.ko @@ -1084,6 +1321,7 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/net/sched/act_nat.ko #lib/modules/KVER-ipfire-rpi/kernel/net/sched/act_pedit.ko #lib/modules/KVER-ipfire-rpi/kernel/net/sched/act_police.ko +#lib/modules/KVER-ipfire-rpi/kernel/net/sched/act_simple.ko #lib/modules/KVER-ipfire-rpi/kernel/net/sched/act_skbedit.ko #lib/modules/KVER-ipfire-rpi/kernel/net/sched/cls_basic.ko #lib/modules/KVER-ipfire-rpi/kernel/net/sched/cls_flow.ko @@ -1132,7 +1370,9 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/net/xfrm/xfrm_ipcomp.ko #lib/modules/KVER-ipfire-rpi/kernel/net/xfrm/xfrm_user.ko #lib/modules/KVER-ipfire-rpi/kernel/sound +#lib/modules/KVER-ipfire-rpi/kernel/sound/ac97_bus.ko #lib/modules/KVER-ipfire-rpi/kernel/sound/arm +#lib/modules/KVER-ipfire-rpi/kernel/sound/arm/snd-aaci.ko #lib/modules/KVER-ipfire-rpi/kernel/sound/arm/snd-bcm2835.ko #lib/modules/KVER-ipfire-rpi/kernel/sound/core #lib/modules/KVER-ipfire-rpi/kernel/sound/core/oss @@ -1161,8 +1401,16 @@ lib/modules/KVER-ipfire-rpi #lib/modules/KVER-ipfire-rpi/kernel/sound/drivers/snd-aloop.ko #lib/modules/KVER-ipfire-rpi/kernel/sound/drivers/snd-dummy.ko #lib/modules/KVER-ipfire-rpi/kernel/sound/drivers/snd-mtpav.ko +#lib/modules/KVER-ipfire-rpi/kernel/sound/drivers/snd-mts64.ko +#lib/modules/KVER-ipfire-rpi/kernel/sound/drivers/snd-portman2x4.ko #lib/modules/KVER-ipfire-rpi/kernel/sound/drivers/snd-serial-u16550.ko #lib/modules/KVER-ipfire-rpi/kernel/sound/drivers/snd-virmidi.ko +#lib/modules/KVER-ipfire-rpi/kernel/sound/pci +#lib/modules/KVER-ipfire-rpi/kernel/sound/pci/ac97 +#lib/modules/KVER-ipfire-rpi/kernel/sound/pci/ac97/snd-ac97-codec.ko +#lib/modules/KVER-ipfire-rpi/kernel/sound/soc +#lib/modules/KVER-ipfire-rpi/kernel/sound/soc/snd-soc-core.ko +#lib/modules/KVER-ipfire-rpi/kernel/sound/soundcore.ko #lib/modules/KVER-ipfire-rpi/kernel/sound/usb #lib/modules/KVER-ipfire-rpi/kernel/sound/usb/6fire #lib/modules/KVER-ipfire-rpi/kernel/sound/usb/6fire/snd-usb-6fire.ko diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux index 5ff2d8d..750b61e 100644 --- a/config/rootfiles/common/i586/linux +++ b/config/rootfiles/common/i586/linux @@ -1,4 +1,4 @@ -boot/System.map-3.2.35-ipfire +boot/System.map-KVER-ipfire boot/System.map-ipfire boot/config-KVER-ipfire boot/vmlinuz-KVER-ipfire @@ -384,6 +384,7 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/hid/hid-ezkey.ko #lib/modules/KVER-ipfire/kernel/drivers/hid/hid-gaff.ko #lib/modules/KVER-ipfire/kernel/drivers/hid/hid-gyration.ko +#lib/modules/KVER-ipfire/kernel/drivers/hid/hid-holtekff.ko #lib/modules/KVER-ipfire/kernel/drivers/hid/hid-kensington.ko #lib/modules/KVER-ipfire/kernel/drivers/hid/hid-keytouch.ko #lib/modules/KVER-ipfire/kernel/drivers/hid/hid-kye.ko @@ -940,6 +941,7 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/misc/iwmc3200top/iwmc3200top.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/lis3lv02d/lis3lv02d_i2c.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 diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/linux-pae index 5537af7..5a54f24 100644 --- a/config/rootfiles/packages/linux-pae +++ b/config/rootfiles/packages/linux-pae @@ -380,6 +380,7 @@ lib/modules/KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-ezkey.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-gaff.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-gyration.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-holtekff.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-kensington.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-keytouch.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/hid/hid-kye.ko @@ -937,6 +938,7 @@ lib/modules/KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/kernel/drivers/misc/iwmc3200top/iwmc3200top.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/lis3lv02d/lis3lv02d_i2c.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 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 51379603c8161d5ef6ede182251789d098a3d833
by git＠ipfire.org 16 Dec '12

16 Dec '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 51379603c8161d5ef6ede182251789d098a3d833 (commit) via f17d112c0480e951771bdca5f5eace7592ecd2c2 (commit) from f9f13c135b2c8d86a1861aec8f80985483843f52 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 51379603c8161d5ef6ede182251789d098a3d833 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Dec 16 21:06:40 2012 +0100 openvpn ccd: Multiple installation fixes. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/configroot | 4 ++++ config/rootfiles/common/daq | 6 +++--- config/rootfiles/common/snort | 4 +--- config/rootfiles/core/65/filelists/snort | 1 - html/cgi-bin/ids.cgi | 4 ++-- lfs/configroot | 4 ++-- lfs/daq | 4 ++-- lfs/snort | 4 ++-- src/scripts/ovpn-ccd-convert | 1 + 9 files changed, 17 insertions(+), 15 deletions(-) delete mode 120000 config/rootfiles/core/65/filelists/snort Difference in files: diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index e14f7e0..1d2fc9d 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -110,6 +110,10 @@ var/ipfire/outgoing/defaultservices #var/ipfire/outgoing/p2protocols #var/ipfire/outgoing/rules #var/ipfire/outgoing/settings +var/ipfire/ovpn +var/ipfire/ovpn/ccd.conf +var/ipfire/ovpn/ccdroute +var/ipfire/ovpn/ccdroute2 var/ipfire/pakfire #var/ipfire/pakfire/settings #var/ipfire/patches diff --git a/config/rootfiles/common/daq b/config/rootfiles/common/daq index 10ec777..b23fd19 100644 --- a/config/rootfiles/common/daq +++ b/config/rootfiles/common/daq @@ -1,4 +1,4 @@ -#usr/bin/daq-modules-config +usr/bin/daq-modules-config #usr/include/daq.h #usr/include/daq_api.h #usr/include/daq_common.h @@ -20,8 +20,8 @@ usr/lib/daq #usr/lib/libdaq.a #usr/lib/libdaq.la #usr/lib/libdaq.so -usr/lib/libdaq.so.2 -usr/lib/libdaq.so.2.0.0 +usr/lib/libdaq.so.1 +usr/lib/libdaq.so.1.0.0 #usr/lib/libdaq_static.a #usr/lib/libdaq_static.la #usr/lib/libdaq_static_modules.a diff --git a/config/rootfiles/common/snort b/config/rootfiles/common/snort index 8404486..90233a1 100644 --- a/config/rootfiles/common/snort +++ b/config/rootfiles/common/snort @@ -26,10 +26,9 @@ usr/bin/u2spewfoo #usr/include/snort/dynamic_output/snort_debug.h #usr/include/snort/dynamic_output/stream_api.h #usr/include/snort/dynamic_preproc +#usr/include/snort/dynamic_preproc/attribute_table_api.h #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 @@ -179,7 +178,6 @@ 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.filters #usr/share/doc/snort/README.flowbits #usr/share/doc/snort/README.frag3 diff --git a/config/rootfiles/core/65/filelists/snort b/config/rootfiles/core/65/filelists/snort deleted file mode 120000 index 9406ce0..0000000 --- a/config/rootfiles/core/65/filelists/snort +++ /dev/null @@ -1 +0,0 @@ -../../../common/snort \ No newline at end of file diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index c5fb4c6..efbc3de 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -263,9 +263,9 @@ if (-e "/etc/snort/snort.conf") { ####################### End added for snort rules control ################################# if ($snortsettings{'RULES'} eq 'subscripted') { - $url=" http://www.snort.org/reg-rules/snortrules-snapshot-294_s.tar.gz/$snortsetti…'OINKCODE'}"; + $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2931_s.tar.gz/$snortsett…'OINKCODE'}"; } elsif ($snortsettings{'RULES'} eq 'registered') { - $url=" http://www.snort.org/reg-rules/snortrules-snapshot-294.tar.gz/$snortsetting…'OINKCODE'}"; + $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2931.tar.gz/$snortsettin…'OINKCODE'}"; } else { $url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz"; } diff --git a/lfs/configroot b/lfs/configroot index 90f5afa..f8fe426 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -53,7 +53,7 @@ $(TARGET) : for i in addon-lang auth backup ca certs connscheduler crls ddns dhcp dhcpc dmzholes dns \ ethernet extrahd/bin fwlogs isdn key langs logging mac main menu.d modem net-traffic \ net-traffic/templates nfs optionsfw outgoing/bin outgoing/groups outgoing/groups/ipgroups \ - outgoing/groups/macgroups patches pakfire portfw ppp private proxy/advanced/cre \ + outgoing/groups/macgroups ovpn patches pakfire portfw ppp private proxy/advanced/cre \ proxy/calamaris/bin qos/bin red remote sensors snort time tripwire/report \ updatexlrator/bin updatexlrator/autocheck urlfilter/autoupdate urlfilter/bin upnp vpn \ wakeonlan wireless xtaccess ; do \ @@ -66,7 +66,7 @@ $(TARGET) : dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dmzholes/config dns/settings ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \ extrahd/scan extrahd/devices extrahd/partitions extrahd/settings fwlogs/ipsettings fwlogs/portsettings \ isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing main/settings net-traffic/settings optionsfw/settings outgoing/settings outgoing/rules \ - pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \ + ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \ ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \ qos/tosconfig snort/settings tripwire/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \ vpn/ipsec.secrets vpn/caconfig wakeonlan/clients.conf wireless/config wireless/settings; do \ diff --git a/lfs/daq b/lfs/daq index cac012b..a0f7b25 100644 --- a/lfs/daq +++ b/lfs/daq @@ -24,7 +24,7 @@ include Config -VER = 2.0.0 +VER = 1.1.1 THISAPP = daq-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a00855a153647df76d47f1ea454f74ae +$(DL_FILE)_MD5 = bc204ea09165b4ecbb1bb49c7c1a2ad4 install : $(TARGET) diff --git a/lfs/snort b/lfs/snort index 950b319..98c232d 100644 --- a/lfs/snort +++ b/lfs/snort @@ -24,7 +24,7 @@ include Config -VER = 2.9.4 +VER = 2.9.3.1 THISAPP = snort-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e79ee6b4fbb32edc5dfed2d7dfcc6813 +$(DL_FILE)_MD5 = b2102605a7ca023ad6a2429821061c29 install : $(TARGET) diff --git a/src/scripts/ovpn-ccd-convert b/src/scripts/ovpn-ccd-convert index c54e256..ac76435 100644 --- a/src/scripts/ovpn-ccd-convert +++ b/src/scripts/ovpn-ccd-convert @@ -48,3 +48,4 @@ if ($running eq 'on') { system('/usr/local/bin/openvpnctrl', '-s'); } +system ("chown nobody:nobody /var/ipfire/ovpn/ccd/*"); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 51379603c8161d5ef6ede182251789d098a3d833
by git＠ipfire.org 16 Dec '12

16 Dec '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 51379603c8161d5ef6ede182251789d098a3d833 (commit) from f17d112c0480e951771bdca5f5eace7592ecd2c2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 51379603c8161d5ef6ede182251789d098a3d833 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Dec 16 21:06:40 2012 +0100 openvpn ccd: Multiple installation fixes. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/configroot | 4 ++++ lfs/configroot | 4 ++-- src/scripts/ovpn-ccd-convert | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index e14f7e0..1d2fc9d 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -110,6 +110,10 @@ var/ipfire/outgoing/defaultservices #var/ipfire/outgoing/p2protocols #var/ipfire/outgoing/rules #var/ipfire/outgoing/settings +var/ipfire/ovpn +var/ipfire/ovpn/ccd.conf +var/ipfire/ovpn/ccdroute +var/ipfire/ovpn/ccdroute2 var/ipfire/pakfire #var/ipfire/pakfire/settings #var/ipfire/patches diff --git a/lfs/configroot b/lfs/configroot index 90f5afa..f8fe426 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -53,7 +53,7 @@ $(TARGET) : for i in addon-lang auth backup ca certs connscheduler crls ddns dhcp dhcpc dmzholes dns \ ethernet extrahd/bin fwlogs isdn key langs logging mac main menu.d modem net-traffic \ net-traffic/templates nfs optionsfw outgoing/bin outgoing/groups outgoing/groups/ipgroups \ - outgoing/groups/macgroups patches pakfire portfw ppp private proxy/advanced/cre \ + outgoing/groups/macgroups ovpn patches pakfire portfw ppp private proxy/advanced/cre \ proxy/calamaris/bin qos/bin red remote sensors snort time tripwire/report \ updatexlrator/bin updatexlrator/autocheck urlfilter/autoupdate urlfilter/bin upnp vpn \ wakeonlan wireless xtaccess ; do \ @@ -66,7 +66,7 @@ $(TARGET) : dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dmzholes/config dns/settings ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \ extrahd/scan extrahd/devices extrahd/partitions extrahd/settings fwlogs/ipsettings fwlogs/portsettings \ isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing main/settings net-traffic/settings optionsfw/settings outgoing/settings outgoing/rules \ - pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \ + ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \ ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \ qos/tosconfig snort/settings tripwire/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \ vpn/ipsec.secrets vpn/caconfig wakeonlan/clients.conf wireless/config wireless/settings; do \ diff --git a/src/scripts/ovpn-ccd-convert b/src/scripts/ovpn-ccd-convert index c54e256..ac76435 100644 --- a/src/scripts/ovpn-ccd-convert +++ b/src/scripts/ovpn-ccd-convert @@ -48,3 +48,4 @@ if ($running eq 'on') { system('/usr/local/bin/openvpnctrl', '-s'); } +system ("chown nobody:nobody /var/ipfire/ovpn/ccd/*"); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree tag, v2.11-core65, created. 95d87c3ed9ad39614a1c9449d96c9f4e5f066922
by git＠ipfire.org 16 Dec '12

16 Dec '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The tag, v2.11-core65 has been created at 95d87c3ed9ad39614a1c9449d96c9f4e5f066922 (commit) - Log ----------------------------------------------------------------- commit 95d87c3ed9ad39614a1c9449d96c9f4e5f066922 Merge: 145f358 f17d112 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Dec 16 10:13:57 2012 +0100 Merge branch 'master' into core65 ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core65, created. 95d87c3ed9ad39614a1c9449d96c9f4e5f066922
by git＠ipfire.org 16 Dec '12

16 Dec '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, core65 has been created at 95d87c3ed9ad39614a1c9449d96c9f4e5f066922 (commit) - Log ----------------------------------------------------------------- commit 95d87c3ed9ad39614a1c9449d96c9f4e5f066922 Merge: 145f358 f17d112 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Dec 16 10:13:57 2012 +0100 Merge branch 'master' into core65 ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. f17d112c0480e951771bdca5f5eace7592ecd2c2
by git＠ipfire.org 16 Dec '12

16 Dec '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via f17d112c0480e951771bdca5f5eace7592ecd2c2 (commit) via f9f13c135b2c8d86a1861aec8f80985483843f52 (commit) via 7c8301fb8a501d03e47923bf7eb321330b663736 (commit) via ff1ed674e01b7db0acd4a565dc74cca01b825f6b (commit) via 1d0fcb09edd3929dda72d23afd3a8d16f7713794 (commit) via 36e1dc20f4d763b8069a4c973ef8ff792786229e (commit) via 0965d98fe8050a4c98b1b4db1306d741d3855ad4 (commit) via 083c1258bf28023957d1b7204e4b05a5d4082998 (commit) via 82c809c7529a9cd7c9cdd6c96d5671d4e261a546 (commit) via 1075e0b5f0c08695a839462c5609e919d24b8a5c (commit) via 79d29f0082a0f97313c4cf8ec2696281785069bb (commit) via 7eb378428b21cc2dcaeee2d585da6be8950aca8a (commit) via f4819f1f76c38963382b5f9bb052a8fc366432d5 (commit) via 4cdf8b927a0e75e7046c315788bba4c3fcbc7df6 (commit) via bd54ff030eee920be813de64e8b4ffec8d57315b (commit) via e2429e8d3452e39128a8c8f2806b97314f9c9470 (commit) via ac87f37110a5cfb41ed65c1b2b83cd3d340ce125 (commit) via df9b48b753cb84e8bd5a338c593202e9aaf1d07f (commit) via 1e0419c8da24544cbadf03f7eadb320cec41e675 (commit) via 35c343da7a91824cb48b069a57594e533a2003b7 (commit) via d22cf0887658f2e0de04c24ec33f9afaa0e9f4ab (commit) via 1d8c30387e0637ac0f471e9c09d196e1d74a5de7 (commit) via 3fc50622e05bc50d9efbb72585b9e357553213da (commit) via f7fc17c38a0338a0c09e03ee34edb7823d398483 (commit) via 1870e7c50f29cae327d2db5f594a30f7b9e25d95 (commit) via 3ef99ad95a20b6cd3b99036a5f8c42dc25f763f4 (commit) via f87161948c0caad91720b4057201cf47143c6140 (commit) via 3aa175f78165640be41746b970802b5ea820ef7c (commit) via a000249ff98debdc5cd0c9a18a51beede1712d88 (commit) via fb6e700b40c070f32c68c65de5daff1c72888b8b (commit) via d46bec52993235a8b185a2f040846e9059c3f4e7 (commit) via c4e04122359ee5de775bb0f69a678b7ce28f5707 (commit) via 5068ac3822ac9afbee841ac417963b2c1343d809 (commit) via d41f9e6ee88320b8a5e0433326053e21b4b0ca49 (commit) via b368a2f84d7a99c37cf19194ffa167d30363a63d (commit) via 290007b3b07ef6bc69bc97d54825fcf96eeb9eb6 (commit) via 52d08bcbd2b5da9fbd3f002c6b686a0202e6fffe (commit) via 1647059d74d406c1b3a114b8e0578765223fd19f (commit) via 9e3b87569473bd8d63dad7175564d68707c5c881 (commit) via f2621c3190fa9f3a818a7a9b3eb1e6ff5ae6d38f (commit) via 83920cfcd52b40f718170f524287dc42b41d10ed (commit) via b228aaf09d2c769535157440430d08a0f26b0e30 (commit) via e81be1e1edb0df7e11c305938838caa6c776ae8c (commit) via a66e24bbfd09b2ab2345ece2079d7143348a3980 (commit) via 07cdb8f659667b4e03a2014febca940165e723f0 (commit) via 350f298025cf2f46ad9c25e4936e9aa9682ee452 (commit) via 7db34105f9ef59b269730e137f224e2848181ccf (commit) via 8c877a82f6a63e07e2dde8d55c6e0db4893bf73d (commit) via 2ee746be048e2667c3fd6537873eb1763aa8b7b7 (commit) via ce819132f353a4ae2103fa752ffddb3fae6f01a1 (commit) via cc8ac76307ebb11b010dd6cbc83ad14c0c0c3d83 (commit) from 6f8891ccc776e62448e1e08d3efbada21a8fd447 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f17d112c0480e951771bdca5f5eace7592ecd2c2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Dec 16 10:11:18 2012 +0100 Revert "snort: Update to 2.9.4." This reverts commit 7c8301fb8a501d03e47923bf7eb321330b663736. reverted because sourcefire has not released the rules for non-paying user yet. Will readded to IPFire 2.13 soon. ----------------------------------------------------------------------- Summary of changes: config/backup/include | 3 + config/cfgroot/general-functions.pl | 298 ++++- config/cron/crontab | 2 +- config/httpd/vhosts.d/ipfire-interface-ssl.conf | 10 + config/rootfiles/common/daq | 10 +- config/rootfiles/common/stage2 | 2 + config/rootfiles/core/{63 => 65}/exclude | 0 config/rootfiles/core/{61 => 65}/filelists/GeoIP | 0 config/rootfiles/core/{64 => 65}/filelists/daq | 0 config/rootfiles/core/65/filelists/files | 12 + config/rootfiles/core/{60 => 65}/meta | 0 config/rootfiles/core/{61 => 65}/update.sh | 18 +- config/rootfiles/packages/libstatgrab | 35 + config/rootfiles/packages/sarg | 48 + config/rootfiles/packages/stress | 3 + config/sarg/cron.daily | 5 + config/sarg/cron.hourly | 5 + config/sarg/cron.monthly | 5 + config/sarg/cron.weekly | 5 + config/sarg/sarg.conf | 696 +++++++++++ config/sarg/update-sarg-reports | 188 +++ doc/language_issues.de | 3 + doc/language_issues.en | 2 + doc/language_issues.es | 53 + doc/language_issues.fr | 49 + doc/language_issues.pl | 53 + doc/language_issues.ru | 49 + doc/language_missings | 217 ++++ html/cgi-bin/logs.cgi/calamaris.dat | 85 +- html/cgi-bin/ovpnmain.cgi | 1442 ++++++++++++++++++---- html/cgi-bin/routing.cgi | 4 +- html/cgi-bin/vpnmain.cgi | 8 + langs/de/cgi-bin/de.pl | 52 + langs/en/cgi-bin/en.pl | 53 +- lfs/GeoIP | 4 +- lfs/{iftop => libstatgrab} | 27 +- lfs/mediatomb | 4 +- lfs/{mediatomb => sarg} | 41 +- lfs/stage2 | 3 + lfs/{joe => stress} | 27 +- make.sh | 7 +- src/misc-progs/launch-ether-wake.c | 4 + src/paks/{motion => sarg}/install.sh | 9 +- src/paks/{motion => sarg}/uninstall.sh | 0 src/paks/{apcupsd => sarg}/update.sh | 0 src/scripts/ovpn-ccd-convert | 50 + src/scripts/update-lang-cache | 3 + 47 files changed, 3276 insertions(+), 318 deletions(-) copy config/rootfiles/core/{63 => 65}/exclude (100%) copy config/rootfiles/core/{61 => 65}/filelists/GeoIP (100%) copy config/rootfiles/core/{64 => 65}/filelists/daq (100%) create mode 100644 config/rootfiles/core/65/filelists/files copy config/rootfiles/core/{60 => 65}/meta (100%) copy config/rootfiles/core/{61 => 65}/update.sh (89%) create mode 100644 config/rootfiles/packages/libstatgrab create mode 100644 config/rootfiles/packages/sarg create mode 100644 config/rootfiles/packages/stress create mode 100644 config/sarg/cron.daily create mode 100644 config/sarg/cron.hourly create mode 100644 config/sarg/cron.monthly create mode 100644 config/sarg/cron.weekly create mode 100644 config/sarg/sarg.conf create mode 100644 config/sarg/update-sarg-reports mode change 100644 => 100755 html/cgi-bin/ovpnmain.cgi mode change 100644 => 100755 html/cgi-bin/vpnmain.cgi copy lfs/{iftop => libstatgrab} (54%) copy lfs/{mediatomb => sarg} (78%) copy lfs/{joe => stress} (54%) copy src/paks/{motion => sarg}/install.sh (91%) copy src/paks/{motion => sarg}/uninstall.sh (100%) copy src/paks/{apcupsd => sarg}/update.sh (100%) create mode 100644 src/scripts/ovpn-ccd-convert create mode 100644 src/scripts/update-lang-cache Difference in files: diff --git a/config/backup/include b/config/backup/include index 8806640..a1d1fbc 100644 --- a/config/backup/include +++ b/config/backup/include @@ -16,6 +16,7 @@ /var/ipfire/dhcp/* /var/ipfire/main/* /var/ipfire/outgoing/groups +/var/ipfire/outgoing/macgroups /var/ipfire/outgoing/rules /var/ipfire/outgoing/p2protocols /var/ipfire/ovpn @@ -28,6 +29,8 @@ /var/ipfire/vpn /var/log/ip-acct/* /var/log/rrd/* +/var/log/rrd/collectd +/var/log/rrd/vnstat /etc/sysconfig/firewall.local /etc/sysconfig/rc.local /root/.gitconfig diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 567f2e1..c14f990 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -18,8 +18,7 @@ use strict; use Socket; use IO::Socket; use Net::SSLeay; -use Net::IPv4Addr; - +use Net::IPv4Addr qw(:all); $|=1; # line buffering $General::version = 'VERSION'; @@ -212,21 +211,273 @@ sub validipormask return &validmask($mask); } +sub subtocidr +{ + #gets: Subnet in decimal (255.255.255.0) + #Gives: 24 (The cidr of network) + my ($byte1, $byte2, $byte3, $byte4) = split(/\./, $_[0].".0.0.0.0"); + my $num = ($byte1 * 16777216) + ($byte2 * 65536) + ($byte3 * 256) + $byte4; + my $bin = unpack("B*", pack("N", $num)); + my $count = ($bin =~ tr/1/1/); + return $count; +} + +sub cidrtosub +{ + #gets: Cidr of network (20-30 for ccd) + #Konverts 30 to 255.255.255.252 e.g + my $cidr=$_[0]; + my $netmask = &Net::IPv4Addr::ipv4_cidr2msk($cidr); + return "$netmask"; +} + +sub iporsubtodec +{ + #Gets: Ip address or subnetmask in decimal oder CIDR + #Gives: What it gets only in CIDR format + my $subnet=$_[0]; + my $net; + my $mask; + my $full=0; + if ($subnet =~ /^(.*?)\/(.*?)$/) { + ($net,$mask) = split (/\//,$subnet); + $full=1; + return "$subnet"; + }else{ + $mask=$subnet; + } + #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++){ + if (&General::cidrtosub($i) eq $mask){ + if ($full == 0){return $mask;}else{ + return $net."/".$mask; + } + } + } + } + #Subnet in binary format? + if ($mask=~/^(\d{1,2})$/ && (($1<=32 && $1>=8))){ + if($full == 0){ return &General::cidrtosub($mask);}else{ + return $net."/".&General::cidrtosub($mask); + } + }else{ + return 3; + } + return 3; +} + + +sub iporsubtocidr +{ + #gets: Ip Address or subnetmask in decimal oder CIDR + #Gives: What it gets only in CIDR format + my $subnet=$_[0]; + my $net; + my $mask; + my $full=0; + if ($subnet =~ /^(.*?)\/(.*?)$/) { + ($net,$mask) = split (/\//,$subnet); + $full=1; + }else{ + $mask=$subnet; + } + #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++){ + if (&General::cidrtosub($i) eq $mask){ + if ($full == 0){return &General::subtocidr($mask);}else{ + return $net."/".&General::subtocidr($mask); + } + } + } + } + #Subnet already in binary format? + if ($mask=~/^(\d{1,2})$/ && (($1<=32 && $1>=8))){ + if($full == 0){ return $mask;}else{ + return $net."/".$mask; + } + }else{ + return 3; + } + return 3; +} + +sub getnetworkip +{ + #Gets: IP, CIDR (10.10.10.0-255, 24) + #Gives: 10.10.10.0 + my ($ccdip,$ccdsubnet) = @_; + my $ip_address_binary = inet_aton( $ccdip ); + my $netmask_binary = ~pack("N", (2**(32-$ccdsubnet))-1); + my $network_address = inet_ntoa( $ip_address_binary & $netmask_binary ); + return $network_address; +} + +sub getccdbc +{ + #Gets: IP in Form ("192.168.0.0/24") + #Gives: Broadcastaddress of network + my $ccdnet=$_; + my ($ccdip,$ccdsubnet) = split "/",$ccdnet; + my $ip_address_binary = inet_aton( $ccdip ); + my $netmask_binary = ~pack("N", (2**(32-$ccdsubnet))-1); + my $broadcast_address = inet_ntoa( $ip_address_binary | ~$netmask_binary ); + return $broadcast_address; +} + +sub ip2dec +{ + my $ip_num; + my $ip=$_[0]; + if ( $ip =~ /(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})/ ) { + $ip_num = (($1*256**3) + ($2*256**2) + ($3*256) + $4); + } else { + $ip_num = -1; + } + $ip_num = (($1*256**3) + ($2*256**2) + ($3*256) + $4); + return($ip_num); +} + +sub dec2ip +{ + my $ip; + my $ip_num=$_[0]; + my $o1=$ip_num%256; + $ip_num=int($ip_num/256); + my $o2=$ip_num%256; + $ip_num=int($ip_num/256); + my $o3=$ip_num%256; + $ip_num=int($ip_num/256); + my $o4=$ip_num%256; + $ip="$o4.$o3.$o2.$o1"; + return ($ip); +} + +sub getnextip +{ + my $decip=&ip2dec($_[0]); + $decip=$decip+4; + return &dec2ip($decip); +} + +sub getlastip +{ + my $decip=&ip2dec($_[0]); + $decip--; + return &dec2ip($decip); +} + sub validipandmask { - my $ipandmask = $_[0]; + #Gets: Ip address in 192.168.0.0/24 or 192.168.0.0/255.255.255.0 and checks if subnet valid + #Gives: True bzw 0 if success or false + my $ccdnet=$_[0]; + my $subcidr; + + if (!($ccdnet =~ /^(.*?)\/(.*?)$/)) { + return 0; + } + my ($ccdip,$ccdsubnet)=split (/\//, $ccdnet); + #IP valid? + 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++){ + if (&General::cidrtosub($i) eq $ccdsubnet){ + return 1; + } + } + #Subnet already in binary format? + }elsif ($ccdsubnet=~/^(\d{1,2})$/ && (($1<=32 && $1>=8))){ + return 1; + }else{ + return 0; + } + + } + return 0; +} + +sub checksubnets +{ + + my %ccdconfhash=(); + my @ccdconf=(); + my $ccdname=$_[0]; + my $ccdnet=$_[1]; + my $errormessage; + my ($ip,$cidr)=split(/\//,$ccdnet); + $cidr=&iporsubtocidr($cidr); + + + #get OVPN-Subnet (dynamic range) + my %ovpnconf=(); + &readhash("${General::swroot}/ovpn/settings", \%ovpnconf); + my ($ovpnip,$ovpncidr)= split (/\//,$ovpnconf{'DOVPN_SUBNET'}); + $ovpncidr=&iporsubtocidr($ovpncidr); + + #check if we try to use same network as ovpn server + if ("$ip/$cidr" eq "$ovpnip/$ovpncidr") { + $errormessage=$errormessage.$Lang::tr{'ccd err isovpnnet'}."<br>"; + return $errormessage; + } + + #check if we use a network-name/subnet that already exists + &readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); + foreach my $key (keys %ccdconfhash) { + @ccdconf=split(/\//,$ccdconfhash{$key}[1]); + if ($ccdname eq $ccdconfhash{$key}[0]) + { + $errormessage=$errormessage.$Lang::tr{'ccd err nameexist'}."<br>"; + return $errormessage; + } + my ($newip,$newsub) = split(/\//,$ccdnet); + if (&IpInSubnet($newip,$ccdconf[0],&iporsubtodec($ccdconf[1]))) + { + $errormessage=$errormessage.$Lang::tr{'ccd err issubnet'}."<br>"; + return $errormessage; + } + + } + #check if we use a name which is already used by ovpn + + + + + + #check if we use a ipsec right network which is already defined + my %ipsecconf=(); + &General::readhasharray("${General::swroot}/vpn/config", \%ipsecconf); + foreach my $key (keys %ipsecconf){ + if ($ipsecconf{$key}[11] ne ''){ + #$errormessage="DRIN!"; + #return $errormessage; + + my ($ipsecip,$ipsecsub) = split (/\//, $ipsecconf{$key}[11]); + $ipsecsub=&iporsubtodec($ipsecsub); + + if ( &IpInSubnet ($ip,$ipsecip,$ipsecsub) ){ + $errormessage=$Lang::tr{'ccd err isipsecnet'}." Name: $ipsecconf{$key}[2]"; + return $errormessage; + } + } + } + + + #check if we use one of ipfire's networks (green,orange,blue) + my %ownnet=(); + &readhash("${General::swroot}/ethernet/settings", \%ownnet); + if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ownnet{'GREEN_NETADDRESS'},$ip,&iporsubtodec($cidr))){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;} + if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ownnet{'ORANGE_NETADDRESS'},$ip,&iporsubtodec($cidr))){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;} + if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ownnet{'BLUE_NETADDRESS'},$ip,&iporsubtodec($cidr))){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;} + if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &IpInSubnet($ownnet{'RED_NETADDRESS'},$ip,&iporsubtodec($cidr))){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;} + + - # split it into number and mask. - if (!($ipandmask =~ /^(.*?)\/(.*?)$/)) { - return 0; } - my $ip = $1; - my $mask = $2; - # first part not a ip? - if (!(&validip($ip))) { - return 0; } - return &validmask($mask); } + sub validport { $_ = $_[0]; @@ -276,7 +527,7 @@ sub validhostname if (length ($hostname) < 1 || length ($hostname) > 63) { return 0;} # Only valid characters are a-z, A-Z, 0-9 and - - if ($hostname !~ /^[a-zA-Z0-9-]*$/) { + if ($hostname !~ /^[a-zA-Z0-9-\s]*$/) { return 0;} # First character can only be a letter or a digit if (substr ($hostname, 0, 1) !~ /^[a-zA-Z0-9]*$/) { @@ -407,7 +658,12 @@ sub NextIP ) ); } - +sub NextIP2 +{ + return &Socket::inet_ntoa( pack("N", 4 + unpack('N', &Socket::inet_aton(shift)) + ) + ); +} sub ipcidr { my ($ip,$cidr) = &Net::IPv4Addr::ipv4_parse(shift); @@ -465,13 +721,13 @@ sub writehasharray { open(FILE, ">$filename") or die "Unable to write to file $filename"; foreach $key (keys %$hash) { - if ($key =~ /^[0-9]+$/) { - print FILE "$key"; - foreach $i (0 .. $#{$hash->{$key}}) { - print FILE ",$hash->{$key}[$i]"; - } - print FILE "\n"; - } + if ($key =~ /^[0-9]+$/) { + print FILE "$key"; + foreach $i (0 .. $#{$hash->{$key}}) { + print FILE ",$hash->{$key}[$i]"; + } + print FILE "\n"; + } } close FILE; return; diff --git a/config/cron/crontab b/config/cron/crontab index 5cca1fa..ad90b07 100644 --- a/config/cron/crontab +++ b/config/cron/crontab @@ -11,7 +11,7 @@ HOME=/ */5 * * * * test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.cyclic 01 * * * * test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.hourly &nice(10),bootrun 25 1 * * * test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.daily -&nice(10),bootrun 47 2 * * 0 test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.weekly +&nice(10),bootrun 47 2 * * 1 test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.weekly &nice(10),bootrun 52 3 1 * * test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.monthly # Log rotation diff --git a/config/httpd/vhosts.d/ipfire-interface-ssl.conf b/config/httpd/vhosts.d/ipfire-interface-ssl.conf index 7b10832..cc3cb1d 100644 --- a/config/httpd/vhosts.d/ipfire-interface-ssl.conf +++ b/config/httpd/vhosts.d/ipfire-interface-ssl.conf @@ -85,4 +85,14 @@ Order deny,allow Allow from all </Directory> + + Alias /proxy-reports/ /var/log/sarg/ + <Directory /var/log/sarg> + AllowOverride None + Options None + AuthName "IPFire - Restricted" + AuthType Basic + AuthUserFile /var/ipfire/auth/users + Require user admin + </Directory> </VirtualHost> diff --git a/config/rootfiles/common/daq b/config/rootfiles/common/daq index e68cee4..b23fd19 100644 --- a/config/rootfiles/common/daq +++ b/config/rootfiles/common/daq @@ -20,8 +20,8 @@ usr/lib/daq #usr/lib/libdaq.a #usr/lib/libdaq.la #usr/lib/libdaq.so -#usr/lib/libdaq.so.1 -#usr/lib/libdaq.so.1.0.0 +usr/lib/libdaq.so.1 +usr/lib/libdaq.so.1.0.0 #usr/lib/libdaq_static.a #usr/lib/libdaq_static.la #usr/lib/libdaq_static_modules.a @@ -29,7 +29,5 @@ usr/lib/daq #usr/lib/libsfbpf.a #usr/lib/libsfbpf.la #usr/lib/libsfbpf.so -#usr/lib/libsfbpf.so.0 -#usr/lib/libsfbpf.so.0.0.1 -#usr/lib/libdaq.so.0 -#usr/lib/libdaq.so.0.0.1 +usr/lib/libsfbpf.so.0 +usr/lib/libsfbpf.so.0.0.1 diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index 796e0f3..6871cc9 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -75,6 +75,7 @@ usr/local/bin/setddns.pl usr/local/bin/settime usr/local/bin/timecheck #usr/local/bin/uname +usr/local/bin/update-lang-cache usr/local/bin/vpn-watch #usr/local/include #usr/local/lib @@ -94,6 +95,7 @@ usr/local/bin/vpn-watch #usr/local/share/zoneinfo #usr/local/src #usr/sbin +usr/sbin/ovpn-ccd-convert #usr/share #usr/share/doc #usr/share/doc/licenses diff --git a/config/rootfiles/core/65/exclude b/config/rootfiles/core/65/exclude new file mode 100644 index 0000000..b6a8d1d --- /dev/null +++ b/config/rootfiles/core/65/exclude @@ -0,0 +1,13 @@ +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 +var/state/dhcp/dhcpd.leases diff --git a/config/rootfiles/core/65/filelists/GeoIP b/config/rootfiles/core/65/filelists/GeoIP new file mode 100644 index 0000000..0258236 --- /dev/null +++ b/config/rootfiles/core/65/filelists/GeoIP @@ -0,0 +1 @@ +usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/core/65/filelists/daq b/config/rootfiles/core/65/filelists/daq new file mode 120000 index 0000000..d0e0956 --- /dev/null +++ b/config/rootfiles/core/65/filelists/daq @@ -0,0 +1 @@ +../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/core/65/filelists/files new file mode 100644 index 0000000..13788f1 --- /dev/null +++ b/config/rootfiles/core/65/filelists/files @@ -0,0 +1,12 @@ +etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/logs.cgi/calamaris.dat +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/routing.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +usr/local/bin/launch-ether-wake +usr/sbin/ovpn-ccd-convert +var/ipfire/general-functions.pl +var/ipfire/langs +var/ipfire/backup/include diff --git a/config/rootfiles/core/65/meta b/config/rootfiles/core/65/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/65/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/65/update.sh b/config/rootfiles/core/65/update.sh new file mode 100644 index 0000000..88f5b36 --- /dev/null +++ b/config/rootfiles/core/65/update.sh @@ -0,0 +1,91 @@ +#!/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(a)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=65 +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" + +# Convert OpenVPN RW connections. +/usr/sbin/ovpn-ccd-convert + +# Update crontab. +sed -i /var/spool/cron/root.orig \ + -e 's@^.*fcron.weekly.*$@\&nice(10),bootrun 47 2 \* \* 1\ttest -x /usr/local/bin/run-parts \&\& /usr/local/bin/run-parts /etc/fcron.weekly@' +fcrontab -z &>/dev/null + +# Reload apache configuration. +/etc/init.d/apache reload &>/dev/null + +#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 diff --git a/config/rootfiles/packages/libstatgrab b/config/rootfiles/packages/libstatgrab new file mode 100644 index 0000000..2c61411 --- /dev/null +++ b/config/rootfiles/packages/libstatgrab @@ -0,0 +1,35 @@ +usr/bin/saidar +usr/bin/statgrab +#usr/bin/statgrab-make-mrtg-config +#usr/bin/statgrab-make-mrtg-index +#usr/include/statgrab.h +#usr/include/statgrab_deprecated.h +#usr/lib/libstatgrab.a +#usr/lib/libstatgrab.la +#usr/lib/libstatgrab.so +usr/lib/libstatgrab.so.6 +usr/lib/libstatgrab.so.6.2.3 +#usr/lib/pkgconfig/libstatgrab.pc +#usr/share/man/man1/saidar.1 +#usr/share/man/man1/statgrab-make-mrtg-config.1 +#usr/share/man/man1/statgrab-make-mrtg-index.1 +#usr/share/man/man1/statgrab.1 +#usr/share/man/man3/sg_get_cpu_percents.3 +#usr/share/man/man3/sg_get_cpu_stats.3 +#usr/share/man/man3/sg_get_cpu_stats_diff.3 +#usr/share/man/man3/sg_get_disk_io_stats.3 +#usr/share/man/man3/sg_get_disk_io_stats_diff.3 +#usr/share/man/man3/sg_get_fs_stats.3 +#usr/share/man/man3/sg_get_host_info.3 +#usr/share/man/man3/sg_get_load_stats.3 +#usr/share/man/man3/sg_get_mem_stats.3 +#usr/share/man/man3/sg_get_network_iface_stats.3 +#usr/share/man/man3/sg_get_network_io_stats.3 +#usr/share/man/man3/sg_get_network_io_stats_diff.3 +#usr/share/man/man3/sg_get_page_stats.3 +#usr/share/man/man3/sg_get_page_stats_diff.3 +#usr/share/man/man3/sg_get_process_count.3 +#usr/share/man/man3/sg_get_process_stats.3 +#usr/share/man/man3/sg_get_swap_stats.3 +#usr/share/man/man3/sg_get_user_stats.3 +#usr/share/man/man3/statgrab.3 diff --git a/config/rootfiles/packages/sarg b/config/rootfiles/packages/sarg new file mode 100644 index 0000000..9a0672c --- /dev/null +++ b/config/rootfiles/packages/sarg @@ -0,0 +1,48 @@ +etc/fcron.daily/sarg-reports +etc/fcron.hourly/sarg-reports +etc/fcron.monthly/sarg-reports +etc/fcron.weekly/sarg-reports +etc/sarg +etc/sarg/css.tpl +etc/sarg/exclude_codes +etc/sarg/sarg.conf +#etc/sarg/sarg.conf.default +etc/sarg/user_limit_block +usr/bin/sarg +usr/sbin/update-sarg-reports +usr/share/locale/bg/LC_MESSAGES/sarg.mo +usr/share/locale/ca/LC_MESSAGES/sarg.mo +usr/share/locale/cs/LC_MESSAGES/sarg.mo +usr/share/locale/da/LC_MESSAGES/sarg.mo +usr/share/locale/de/LC_MESSAGES/sarg.mo +usr/share/locale/el/LC_MESSAGES/sarg.mo +usr/share/locale/es/LC_MESSAGES/sarg.mo +usr/share/locale/fr/LC_MESSAGES/sarg.mo +usr/share/locale/hu/LC_MESSAGES/sarg.mo +usr/share/locale/id/LC_MESSAGES/sarg.mo +usr/share/locale/it/LC_MESSAGES/sarg.mo +usr/share/locale/ja/LC_MESSAGES/sarg.mo +usr/share/locale/lv/LC_MESSAGES/sarg.mo +usr/share/locale/nl/LC_MESSAGES/sarg.mo +usr/share/locale/pl/LC_MESSAGES/sarg.mo +usr/share/locale/pt/LC_MESSAGES/sarg.mo +usr/share/locale/pt_BR/LC_MESSAGES/sarg.mo +usr/share/locale/ro/LC_MESSAGES/sarg.mo +usr/share/locale/ru/LC_MESSAGES/sarg.mo +usr/share/locale/sk/LC_MESSAGES/sarg.mo +usr/share/locale/sr/LC_MESSAGES/sarg.mo +usr/share/locale/tr/LC_MESSAGES/sarg.mo +usr/share/locale/uk/LC_MESSAGES/sarg.mo +usr/share/locale/zh_CN/LC_MESSAGES/sarg.mo +#usr/share/man/man1/sarg.1 +usr/share/sarg +usr/share/sarg/fonts +usr/share/sarg/fonts/DejaVuSans.ttf +usr/share/sarg/fonts/FreeSans.ttf +usr/share/sarg/fonts/README +usr/share/sarg/fonts/license +usr/share/sarg/images +usr/share/sarg/images/datetime.png +usr/share/sarg/images/graph.png +usr/share/sarg/images/sarg-squidguard-block.png +usr/share/sarg/images/sarg.png diff --git a/config/rootfiles/packages/stress b/config/rootfiles/packages/stress new file mode 100644 index 0000000..2b0a000 --- /dev/null +++ b/config/rootfiles/packages/stress @@ -0,0 +1,3 @@ +usr/bin/stress +#usr/share/info/stress.info +#usr/share/man/man1/stress.1 \ No newline at end of file diff --git a/config/sarg/cron.daily b/config/sarg/cron.daily new file mode 100644 index 0000000..8ae1b1b --- /dev/null +++ b/config/sarg/cron.daily @@ -0,0 +1,5 @@ +#!/bin/bash + +/usr/sbin/update-sarg-reports daily >/dev/null 2>&1 + +exit 0 diff --git a/config/sarg/cron.hourly b/config/sarg/cron.hourly new file mode 100644 index 0000000..1e7b5ff --- /dev/null +++ b/config/sarg/cron.hourly @@ -0,0 +1,5 @@ +#!/bin/bash + +/usr/sbin/update-sarg-reports today >/dev/null 2>&1 + +exit 0 diff --git a/config/sarg/cron.monthly b/config/sarg/cron.monthly new file mode 100644 index 0000000..07b9efc --- /dev/null +++ b/config/sarg/cron.monthly @@ -0,0 +1,5 @@ +#!/bin/bash + +/usr/sbin/update-sarg-reports monthly >/dev/null 2>&1 + +exit 0 diff --git a/config/sarg/cron.weekly b/config/sarg/cron.weekly new file mode 100644 index 0000000..1f8287c --- /dev/null +++ b/config/sarg/cron.weekly @@ -0,0 +1,5 @@ +#!/bin/bash + +/usr/sbin/update-sarg-reports weekly >/dev/null 2>&1 + +exit 0 diff --git a/config/sarg/sarg.conf b/config/sarg/sarg.conf new file mode 100644 index 0000000..6331aaf --- /dev/null +++ b/config/sarg/sarg.conf @@ -0,0 +1,696 @@ +# sarg.conf +# +# TAG: access_log file +# Where is the access.log file +# sarg -l file +# +access_log /var/log/squid/access.log + +# TAG: graphs yes|no +# Use graphics where is possible. +# graph_days_bytes_bar_color blue|green|yellow|orange|brown|red +# +graphs yes +graph_days_bytes_bar_color orange + +# TAG: graph_font +# The full path to the TTF font file to use to create the graphs. It is required +# if graphs is set to yes. +# +graph_font /usr/share/sarg/fonts/DejaVuSans.ttf + +# TAG: title +# Especify the title for html page. +# +title "Squid User Access Reports" + +# TAG: font_face +# Especify the font for html page. +# +font_face Tahoma,Verdana,Arial + +# TAG: header_color +# Especify the header color +# +header_color darkblue + +# TAG: header_bgcolor +# Especify the header bgcolor +# +header_bgcolor blanchedalmond + +# TAG: font_size +# Especify the text font size +# +font_size 12px + +# TAG: header_font_size +# Especify the header font size +# +header_font_size 12px + +# TAG: title_font_size +# Especify the title font size +# +title_font_size 12px + +# TAG: background_color +# TAG: background_color +# Html page background color +# +# background_color white + +# TAG: text_color +# Html page text color +# +text_color #000000 + +# TAG: text_bgcolor +# Html page text background color +# +text_bgcolor lavender + +# TAG: title_color +# Html page title color +# +#title_color green + +# TAG: logo_image +# Html page logo. +# +#logo_image none + +# TAG: logo_text +# Html page logo text. +# +#logo_text "" + +# TAG: logo_text_color +# Html page logo texti color. +# +#logo_text_color #000000 + +# TAG: logo_image_size +# Html page logo image size. +# width height +# +#image_size 80 45 + +# TAG: background_image +# Html page background image +# +#background_image none + +# TAG: password +# User password file used by Squid authentication scheme +# If used, generate reports just for that users. +# +#password none + +# TAG: temporary_dir +# Temporary directory name for work files +# sarg -w dir +# +#temporary_dir /tmp + +# TAG: output_dir +# The reports will be saved in that directory +# sarg -o dir +# +output_dir /srv/web/ipfire/html/sarg + +# TAG: output_email +# Email address to send the reports. If you use this tag, no html reports will be generated. +# sarg -e email +# +#output_email none + +# TAG: resolve_ip yes/no +# Convert ip address to dns name +# sarg -n +resolve_ip no + +# TAG: user_ip yes/no +# Use Ip Address instead userid in reports. +# sarg -p +#user_ip no + +# TAG: topuser_sort_field field normal/reverse +# Sort field for the Topuser Report. +# Allowed fields: USER CONNECT BYTES TIME +# +#topuser_sort_field BYTES reverse + +# TAG: user_sort_field field normal/reverse +# Sort field for the User Report. +# Allowed fields: SITE CONNECT BYTES TIME +# +#user_sort_field BYTES reverse + +# TAG: exclude_users file +# users within the file will be excluded from reports. +# you can use indexonly to have only index.html file. +# +#exclude_users none + +# TAG: exclude_hosts file +# Hosts, domains or subnets will be excluded from reports. +# +# Eg.: 192.168.10.10 - exclude ip address only +# 192.168.10.0/24 - exclude full C class +# s1.acme.foo - exclude hostname only +# *.acme.foo - exclude full domain name +# +#exclude_hosts none + +# TAG: useragent_log file +# useragent.log file patch to generate useragent report. +# +#useragent_log /var/log/squid/user_agent.log + +# TAG: date_format +# Date format in reports: e (European=dd/mm/yy), u (American=mm/dd/yy), w (Weekly=yy.ww) +# +date_format e + +# TAG: per_user_limit file MB +# Saves userid on file if download exceed n MB. +# This option allow you to disable user access if user exceed a download limit. +# +#per_user_limit none + +# TAG: lastlog n +# How many reports files must be keept in reports directory. +# The oldest report file will be automatically removed. +# 0 - no limit. +# +#lastlog 0 + +# TAG: remove_temp_files yes +# Remove temporary files: geral, usuarios, top, periodo from root report directory. +# +#remove_temp_files yes + +# TAG: index yes|no|only +# Generate the main index.html. +# only - generate only the main index.html +# +#index yes + +# TAG: index_tree date|file +# How to generate the index. +# +#index_tree file + +# TAG: overwrite_report yes|no +# yes - if report date already exist then will be overwrited. +# no - if report date already exist then will be renamed to filename.n, filename.n+1 +# +overwrite_report yes + +# TAG: records_without_userid ignore|ip|everybody +# What can I do with records without user id (no authentication) in access.log file ? +# +# ignore - This record will be ignored. +# ip - Use ip address instead. (default) +# everybody - Use "everybody" instead. +# +#records_without_userid ip + +# TAG: use_comma no|yes +# Use comma instead point in reports. +# Eg.: use_comma yes => 23,450,110 +# use_comma no => 23.450.110 +# +#use_comma no + +# TAG: mail_utility +# Mail command to use to send reports via SMTP. Sarg calls it like this: +# mail_utility -s "SARG report, date" "output_email" <"mail_content" +# +# Therefore, it is possible to add more arguments to the command by specifying them +# here. +# +# If you need too, you can use a shell script to process the content of /dev/stdin +# (/dev/stdin is the mail_content passed by sarg to the script) and call whatever +# command you like. It is not limited to mailing the report via SMTP. +# +# Don't forget to quote the command if necessary (i.e. if the path contains +# characters that must be quoted). +# +#mail_utility mailx + +# TAG: topsites_num n +# How many sites in topsites report. +# +#topsites_num 100 + +# TAG: topsites_sort_order CONNECT|BYTES A|D +# Sort for topsites report, where A=Ascendent, D=Descendent +# +#topsites_sort_order CONNECT D + +# TAG: index_sort_order A/D +# Sort for index.html, where A=Ascendent, D=Descendent +# +#index_sort_order D + +# TAG: exclude_codes file +# Ignore records with these codes. Eg.: NONE/400 +# Write one code per line. Lines starting with a # are ignored. +# Only codes matching exactly one of the line is rejected. The +# comparison is not case sensitive. +# +#exclude_codes /usr/local/sarg/exclude_codes + +# TAG: replace_index string +# Replace "index.html" in the main index file with this string +# If null "index.html" is used +# +#replace_index <?php echo str_replace(".", "_", $REMOTE_ADDR); echo ".html"; ?> + +# TAG: max_elapsed milliseconds +# If elapsed time is recorded in log is greater than max_elapsed use 0 for elapsed time. +# Use 0 for no checking +# +#max_elapsed 28800000 +# 8 Hours + +# TAG: report_type type +# What kind of reports to generate. +# topusers - users, sites, times, bytes, connects, links to accessed sites, etc +# topsites - site, connect and bytes report +# sites_users - users and sites report +# users_sites - accessed sites by the user report +# date_time - bytes used per day and hour report +# denied - denied sites with full URL report +# auth_failures - autentication failures report +# site_user_time_date - sites, dates, times and bytes report +# downloads - downloads per user report +# +# Eg.: report_type topsites denied +# +report_type topusers topsites sites_users users_sites date_time denied auth_failures site_user_time_date downloads + +# TAG: usertab filename +# You can change the "userid" or the "ip address" to be a real user name on the reports. +# If resolve_ip is active, the ip address is resolved before being looked up into this +# file. That is, if you want to map the ip address, be sure to set resolv_ip to no or +# the resolved name will be looked into the file instead of the ip address. Note that +# it can be used to resolve any ip address known to the dns and then map the unresolved +# ip addresses to a name found in the usertab file. +# Table syntax: +# userid name or ip address name +# Eg: +# SirIsaac Isaac Newton +# vinci Leonardo da Vinci +# 192.168.10.1 Karol Wojtyla +# +# Each line must be terminated with '\n' +# If usertab have value "ldap" (case ignoring), user names +# will be taken from LDAP server. This method as approaches for reception +# of usernames from Active Didectory +# +#usertab none + +# TAG: LDAPHost hostname +# FQDN or IP address of host with LDAP service or AD DC +# default is '127.0.0.1' +#LDAPHost 127.0.0.1 + +# TAG: LDAPPort port +# LDAP service port number +# default is '389' +#LDAPPort 389 + +# TAG: LDAPBindDN CN=username,OU=group,DC=mydomain,DC=com +# DN of LDAP user, who is authorized to read user's names from LDAP base +# default is empty line +#LDAPBindDN cn=proxy,dc=mydomain,dc=local + +# TAG: LDAPBindPW secret +# Password of DN, who is authorized to read user's names from LDAP base +# default is empty line +#LDAPBindPW secret + +# TAG: LDAPBaseSearch OU=users,DC=mydomain,DC=com +# LDAP search base +# default is empty line +#LDAPBaseSearch ou=users,dc=mydomain,dc=local + +# TAG: LDAPFilterSearch (uid=%s) +# User search filter by user's logins in LDAP +# First founded record will be used +# %s - will be changed to userlogins from access.log file +# filter string can have up to 5 '%s' tags +# default value is '(uid=%s)' +#LDAPFilterSearch (uid=%s) + +# TAG: LDAPTargetAttr attributename +# Name of the attribute containing a name of the user +# default value is 'cn' +#LDAPTargetAttr cn + +# TAG: long_url yes|no +# If yes, the full url is showed in report. +# If no, only the site will be showed +# +# YES option generate very big sort files and reports. +# +#long_url no + +# TAG: date_time_by bytes|elap +# Date/Time reports show the downloaded volume or the elapsed time or both. +# +#date_time_by bytes + +# TAG: charset name +# ISO 8859 is a full series of 10 standardized multilingual single-byte coded (8bit) +# graphic character sets for writing in alphabetic languages +# You can use the following charsets: +# Latin1 - West European +# Latin2 - East European +# Latin3 - South European +# Latin4 - North European +# Cyrillic +# Arabic +# Greek +# Hebrew +# Latin5 - Turkish +# Latin6 +# Windows-1251 +# Japan +# Koi8-r +# UTF-8 +# +#charset Latin1 + +# TAG: user_invalid_char "&/" +# Records that contain invalid characters in userid will be ignored by Sarg. +# +#user_invalid_char "&/" + +# TAG: privacy yes|no +# privacy_string "***.***.***.***" +# privacy_string_color blue +# In some countries the sysadm cannot see the visited sites by a restrictive law. +# Using privacy yes the visited url will be changes by privacy_string and the link +# will be removed from reports. +# +#privacy no +#privacy_string "***.***.***.***" +#privacy_string_color blue + +# TAG: include_users "user1:user2:...:usern" +# Reports will be generated only for listed users. +# +#include_users none + +# TAG: exclude_string "string1:string2:...:stringn" +# Records from access.log file that contain one of listed strings will be ignored. +# +#exclude_string none + +# TAG: show_successful_message yes|no +# Shows "Successful report generated on dir" at end of process. +# +#show_successful_message yes + +# TAG: show_read_statistics yes|no +# Shows some reading statistics. +# +show_read_statistics yes + +# TAG: topuser_fields +# Which fields must be in Topuser report. +# +#topuser_fields NUM DATE_TIME USERID CONNECT BYTES %BYTES IN-CACHE-OUT USED_TIME MILISEC %TIME TOTAL AVERAGE + +# TAG: user_report_fields +# Which fields must be in User report. +# +#user_report_fields CONNECT BYTES %BYTES IN-CACHE-OUT USED_TIME MILISEC %TIME TOTAL AVERAGE + +# TAG: bytes_in_sites_users_report yes|no +# Bytes field must be in Site & Users Report ? +# +#bytes_in_sites_users_report no + +# TAG: topuser_num n +# How many users in topsites report. 0 = no limit +# +#topuser_num 0 + +# TAG: datafile file +# Save the report results in a file to populate some database +# +#datafile none + +# TAG: datafile_delimiter ";" +# ascii character to use as a field separator in datafile +# +#datafile_delimiter ";" + +# TAG: datafile_fields all +# Which data fields must be in datafile +# user;date;time;url;connect;bytes;in_cache;out_cache;elapsed +# +#datafile_fields user;date;time;url;connect;bytes;in_cache;out_cache;elapsed + +# TAG: datafile_url ip|name +# Saves the URL as ip or name in datafile +# +#datafile_url ip + +# TAG: weekdays +# The weekdays to take into account ( Sunday->0, Saturday->6 ) +# Example: +#weekdays 1-3,5 +# Default: +#weekdays 0-6 + +# TAG: hours +# The hours to take into account +# Example: +#hours 7-12,14,16,18-20 +# Default: +#hours 0-23 + +# TAG: dansguardian_conf file +# DansGuardian.conf file path +# Generate reports from DansGuardian logs. +# Use 'none' to disable it. +# dansguardian_conf /usr/dansguardian/dansguardian.conf +# +#dansguardian_conf none + +# TAG: dansguardian_filter_out_date on|off +# This option replaces dansguardian_ignore_date whose name was not appropriate with respect to its action. +# Note the change of parameter value compared with the old option. +# 'off' use the record even if its date is outside of the range found in the input log file. +# 'on' use the record only if its date is in the range found in the input log file. +# +#dansguardian_filter_out_date on + +# TAG: squidguard_conf file +# path to squidGuard.conf file +# Generate reports from SquidGuard logs. +# Use 'none' to disable. +# You can use sarg -L filename to use an alternate squidGuard log. +# squidguard_conf /usr/local/squidGuard/squidGuard.conf +# +#squidguard_conf none + +# TAG: redirector_log file +# the location of the web proxy redirector log such as one created by squidGuard or Rejik. The option +# may be repeated up to 64 times to read multiple files. +# If this option is specified, it takes precedence over squidguard_conf. +# The command line option -L override this option. +# +#redirector_log /usr/local/squidGuard/var/logs/urls.log + +# TAG: redirector_filter_out_date on|off +# This option replaces squidguard_ignore_date and redirector_ignore_date whose names were not +# appropriate with respect to their action. +# Note the change of parameter value compared with the old options. +# 'off' use the record even if its date is outside of the range found in the input log file. +# 'on' use the record only if its date is in the range found in the input log file. +# +#redirector_filter_out_date on + +# TAG: redirector_log_format +# Format string for web proxy redirector logs. +# This option was named squidguard_log_format before sarg 2.3. +# REJIK #year#-#mon#-#day# #hour# #list#:#tmp# #ip# #user# #tmp#/#tmp#/#url#/#end# +# SQUIDGUARD #year#-#mon#-#day# #hour# #tmp#/#list#/#tmp#/#tmp#/#url#/#tmp# #ip#/#tmp# #user# #end# +#redirector_log_format #year#-#mon#-#day# #hour# #tmp#/#list#/#tmp#/#tmp#/#url#/#tmp# #ip#/#tmp# #user# #end# + +# TAG: show_sarg_info yes|no +# shows sarg information and site path on each report bottom +# +#show_sarg_info yes + +# TAG: show_sarg_logo yes|no +# shows sarg logo +# +#show_sarg_logo yes + +# TAG: parsed_output_log directory +# Saves the processed log in a sarg format after parsing the squid log file. +# This is a way to dump all of the data structures out, after parsing from +# the logs (presumably this data will be much smaller than the log files themselves), +# and pull them back in for later processing and merging with data from previous logs. +# +#parsed_output_log none + +# TAG: parsed_output_log_compress /bin/gzip|/usr/bin/bzip2|nocompress +# Command to run to compress sarg parsed output log. It may contain +# options (such as -f to overwrite existing target file). The name of +# the file to compresse is provided at the end of this +# command line. Don't forget to quote things appropriately. +# +#parsed_output_log_compress /bin/gzip + +# TAG: displayed_values bytes|abbreviation +# how the values will be displayed in reports. +# eg. bytes - 209.526 +# abbreviation - 210K +# +#displayed_values bytes + +# Report limits +# TAG: authfail_report_limit n +# TAG: denied_report_limit n +# TAG: siteusers_report_limit n +# TAG: squidguard_report_limit n +# TAG: user_report_limit n +# TAG: dansguardian_report_limit n +# TAG: download_report_limit n +# report limits (lines). +# '0' no limit +# +#authfail_report_limit 10 +#denied_report_limit 10 +#siteusers_report_limit 0 +#squidguard_report_limit 10 +#dansguardian_report_limit 10 +#user_report_limit 10 +#user_report_limit 50 + +# TAG: www_document_root dir +# Where is your Web DocumentRoot +# Sarg will create sarg-php directory with some PHP modules: +# - sarg-squidguard-block.php - add urls from user reports to squidGuard DB +# +#www_document_root /var/www/html + +# TAG: block_it module_url +# This tag allow you to pass urls from user reports to a cgi or php module, +# to be blocked by some Squid acl +# +# Eg.: block_it /sarg-php/sarg-block-it.php +# sarg-block-it is a php that will append a url to a flat file. +# You must change /var/www/html/sarg-php/sarg-block-it to point to your file +# in $filename variable, and chown to a httpd owner. +# +# sarg will pass http://module_url?url=url +# +#block_it none + +# TAG: external_css_file path +# Provide the path to an external css file to link into the HTML reports instead of +# the inline css written by sarg when this option is not set. +# +# In versions prior to 2.3, this used to be an absolute file name to +# a file to include verbatim in each HTML page but, as it takes a lot of +# space, version 2.3 switched to a link to an external css file. +# Therefore, this option must contain the HTTP server path on which a client +# browser may find the css file. +# +# Sarg use theses style classes: +# .logo logo class +# .info sarg information class, align=center +# .title_c title class, align=center +# .header_c header class, align:center +# .header_l header class, align:left +# .header_r header class, align:right +# .text text class, align:right +# .data table text class, align:right +# .data2 table text class, align:left +# .data3 table text class, align:center +# .link link class +# +# Sarg can be instructed to output the internal css it inline +# into the reports with this command: +# +# sarg --css +# +# You can redirect the output to a file of your choice and edit +# it to your liking. +# +#external_css_file none + +# TAG: user_authentication yes|no +# Allow user authentication in User Reports using .htaccess +# Parameters: +# AuthUserTemplateFile - The template to use to create the +# .htaccess file. In the template, %u is replaced by the +# user's ID for which the report is generated. The path of the +# template is relative to the directory containing sarg +# configuration file. +# +# user_authentication no +# AuthUserTemplateFile sarg_htaccess + +# TAG: download_suffix "suffix,suffix,...,suffix" +# file suffix to be considered as "download" in Download report. +# Use 'none' to disable. +# +download_suffix "zip,arj,bzip,gz,ace,doc,iso,adt,bin,cab,com,dot,drv$,lha,lzh,mdb,mso,ppt,rtf,src,shs,sys,exe,dll,mp3,avi,mpg,mpeg" + +# TAG: ulimit n +# The maximum number of open file descriptors to avoid "Too many open files" error message. +# You need to run sarg as root to use ulimit tag. +# If you run sarg with a low privilege user, set to 'none' to disable ulimit +# +#ulimit 20000 + +# TAG: ntlm_user_format username|domainname+username +# NTLM users format. +# +#ntlm_user_format domainname+username + +# TAG: realtime_refresh_time num sec +# How many time to auto refresh the realtime report +# 0 = disable +# +# realtime_refresh_time 3 + +# TAG: realtime_access_log_lines num +# How many last lines to get from access.log file +# +# realtime_access_log_lines 1000 + +# TAG: realtime_types: GET,PUT,CONNECT,ICP_QUERY,POST +# Which records must be in realtime report. +# +# realtime_types GET,PUT,CONNECT + +# TAG: realtime_unauthenticated_records: ignore|show +# What to do with unauthenticated records in realtime report. +# +# realtime_unauthenticated_records: show + +# TAG: byte_cost value no_cost_limit +# Cost per byte. +# Eg. byte_cost 0.01 100000000 +# per byte cost = 0.01 +# bytes with no cost = 100 Mb +# 0 = disable +# +# byte_cost 0.01 50000000 + +# TAG: squid24 on|off +# Compatilibity with squid version <= 2.4 when using emulate_http_log on +# +# squid24 off diff --git a/config/sarg/update-sarg-reports b/config/sarg/update-sarg-reports new file mode 100644 index 0000000..9f2ab4c --- /dev/null +++ b/config/sarg/update-sarg-reports @@ -0,0 +1,188 @@ +#!/bin/bash +############################################################################### +# # +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) 2012 Michael Tremer # +# # +# 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/>. # +# # +############################################################################### + +export LC_ALL=C + +SARG_CONFIG="/etc/sarg/sarg.conf" +SQUID_LOG="/var/log/squid/access.log" +REPORTS_PATH="/var/log/sarg" + +function date_calc() { + local when + local range="false" + + case "${1}" in + month) + when="1 month ago" + range="true" + ;; + week) + when="1 week ago" + ;; + yesterday) + when="1 day ago" + ;; + today) + when="today" + ;; + *) + return 1 + ;; + esac + + if [ "${range}" = "true" ]; then + echo "$(date --date "${when}" +01/%m/%Y)-$(date --date "${when}" +31/%m/%Y)" + else + date --date "${when}" +%d/%m/%Y + fi + + return 0 +} + +function compile_report() { + local interval=${1} + + local date + case "${interval}" in + today) + date=$(date_calc today) + ;; + daily) + date=$(date_calc yesterday) + ;; + weekly) + date="$(date_calc week)-$(date_calc yesterday)" + ;; + monthly) + date="$(date_calc month)" + ;; + esac + [ -n "${date}" ] || return 1 + + # Determine max. number of archived log files to search. + local max_logs + case "${interval}" in + today|daily) + max_logs=3 + ;; + weekly) + max_logs=14 + ;; + monthly) + max_logs=40 + ;; + esac + + # Create reports_path, if not exists. + local reports_path="${REPORTS_PATH}/${interval}" + mkdir -p ${reports_path} + + # Remove already existant data on today's reports. + case "${interval}" in + today) + rm -rf ${reports_path}/* + ;; + esac + + # Run SARG. + get_logs ${max_logs} | sarg -f ${SARG_CONFIG} -l - -d ${date} -o ${reports_path} +} + +function get_logs() { + local max=${1} + + if [ -z "${max}" ]; then + max=10000 + fi + + local idx=0 + while [ ${idx} -le ${max} ]; do + file=$(search_log_file ${idx}) + + # If no log file could be opened, we are done. + [ -z "${file}" ] && break + + case "${file}" in + # Logs in plain text. + *.log) + cat ${file} + ;; + + # GZip compressed log files. + *.gz) + gzip -d < ${file} + ;; + + # XZ compressed log files. + *.xz) + xz -d < ${file} + ;; + + # Unhandled stuff. + *) + echo "Unhandled file type: ${file}" >&2 + ;; + esac + + idx=$(( ${idx} + 1 )) + done + + return 0 +} + +function search_log_file() { + local idx=${1} + + if [ "${idx}" = "0" ] && [ -e "${SQUID_LOG}" ]; then + echo "${SQUID_LOG}" + return 0 + fi + + local algo + for algo in gz xz; do + file="${SQUID_LOG}.${idx}.${algo}" + + if [ -e "${file}" ]; then + echo "${file}" + return 0 + fi + done + + return 1 +} + +# Main. + +case "${1}" in + today|daily|weekly|monthly) + compile_report ${1} + ;; + *) + echo "${0} - Squid proxy reports creation tool" + echo + echo "Usage: ${0} [interval]" + echo " interval: today, daily, weekly, monthly" + echo + exit 0 + ;; +esac + +exit 0 diff --git a/doc/language_issues.de b/doc/language_issues.de index 5a42ae5..137217c 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -68,6 +68,9 @@ WARNING: translation string unused: cache size WARNING: translation string unused: calamaris report interval (in minutes) WARNING: translation string unused: calc traffic all x minutes WARNING: translation string unused: capsinactive +WARNING: translation string unused: ccd err iroute +WARNING: translation string unused: ccd err netadr +WARNING: translation string unused: ccd maxclients WARNING: translation string unused: cfg restart WARNING: translation string unused: check for net traffic update WARNING: translation string unused: choose config diff --git a/doc/language_issues.en b/doc/language_issues.en index 6d6a2a6..68fef77 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -87,6 +87,8 @@ WARNING: translation string unused: cache size WARNING: translation string unused: calamaris report interval (in minutes) WARNING: translation string unused: calc traffic all x minutes WARNING: translation string unused: capsinactive +WARNING: translation string unused: ccd err iroute +WARNING: translation string unused: ccd err netadr WARNING: translation string unused: cfg restart WARNING: translation string unused: check for net traffic update WARNING: translation string unused: choose config diff --git a/doc/language_issues.es b/doc/language_issues.es index 6bcbf86..eca067d 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -500,7 +500,43 @@ WARNING: untranslated string: Async logging enabled WARNING: untranslated string: Scan for Songs WARNING: untranslated string: Set time on boot WARNING: untranslated string: advproxy errmsg invalid upstream proxy +WARNING: untranslated string: attention WARNING: untranslated string: bytes +WARNING: untranslated string: ccd add +WARNING: untranslated string: ccd choose net +WARNING: untranslated string: ccd client options +WARNING: untranslated string: ccd clientip +WARNING: untranslated string: ccd dynrange +WARNING: untranslated string: ccd err blue +WARNING: untranslated string: ccd err green +WARNING: untranslated string: ccd err hostinnet +WARNING: untranslated string: ccd err inuse +WARNING: untranslated string: ccd err invalidname +WARNING: untranslated string: ccd err invalidnet +WARNING: untranslated string: ccd err irouteexist +WARNING: untranslated string: ccd err isipsecnet +WARNING: untranslated string: ccd err isovpnnet +WARNING: untranslated string: ccd err issubnet +WARNING: untranslated string: ccd err name +WARNING: untranslated string: ccd err nameexist +WARNING: untranslated string: ccd err netadrexist +WARNING: untranslated string: ccd err orange +WARNING: untranslated string: ccd err red +WARNING: untranslated string: ccd err routeovpn +WARNING: untranslated string: ccd err routeovpn2 +WARNING: untranslated string: ccd hint +WARNING: untranslated string: ccd invalid +WARNING: untranslated string: ccd iroute +WARNING: untranslated string: ccd iroute2 +WARNING: untranslated string: ccd iroutehint +WARNING: untranslated string: ccd modify +WARNING: untranslated string: ccd name +WARNING: untranslated string: ccd net +WARNING: untranslated string: ccd noaddnet +WARNING: untranslated string: ccd none +WARNING: untranslated string: ccd routes +WARNING: untranslated string: ccd subnet +WARNING: untranslated string: ccd used WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled @@ -546,11 +582,28 @@ WARNING: untranslated string: outgoing firewall p2p description 2 WARNING: untranslated string: outgoing firewall p2p description 3 WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: outgoing firewall view group +WARNING: untranslated string: ovpn errmsg green already pushed +WARNING: untranslated string: ovpn errmsg invalid ip or mask +WARNING: untranslated string: ovpn mtu-disc +WARNING: untranslated string: ovpn mtu-disc and mtu not 1500 +WARNING: untranslated string: ovpn mtu-disc maybe +WARNING: untranslated string: ovpn mtu-disc no +WARNING: untranslated string: ovpn mtu-disc off +WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment +WARNING: untranslated string: ovpn mtu-disc yes +WARNING: untranslated string: ovpn routes push +WARNING: untranslated string: ovpn routes push options WARNING: untranslated string: pakfire ago +WARNING: untranslated string: proxy reports +WARNING: untranslated string: proxy reports daily +WARNING: untranslated string: proxy reports monthly +WARNING: untranslated string: proxy reports today +WARNING: untranslated string: proxy reports weekly WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: server restart WARNING: untranslated string: static routes WARNING: untranslated string: system information WARNING: untranslated string: visit us at diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 189932f..91beb6f 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -499,7 +499,43 @@ WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs WARNING: untranslated string: advproxy errmsg invalid upstream proxy +WARNING: untranslated string: attention WARNING: untranslated string: bytes +WARNING: untranslated string: ccd add +WARNING: untranslated string: ccd choose net +WARNING: untranslated string: ccd client options +WARNING: untranslated string: ccd clientip +WARNING: untranslated string: ccd dynrange +WARNING: untranslated string: ccd err blue +WARNING: untranslated string: ccd err green +WARNING: untranslated string: ccd err hostinnet +WARNING: untranslated string: ccd err inuse +WARNING: untranslated string: ccd err invalidname +WARNING: untranslated string: ccd err invalidnet +WARNING: untranslated string: ccd err irouteexist +WARNING: untranslated string: ccd err isipsecnet +WARNING: untranslated string: ccd err isovpnnet +WARNING: untranslated string: ccd err issubnet +WARNING: untranslated string: ccd err name +WARNING: untranslated string: ccd err nameexist +WARNING: untranslated string: ccd err netadrexist +WARNING: untranslated string: ccd err orange +WARNING: untranslated string: ccd err red +WARNING: untranslated string: ccd err routeovpn +WARNING: untranslated string: ccd err routeovpn2 +WARNING: untranslated string: ccd hint +WARNING: untranslated string: ccd invalid +WARNING: untranslated string: ccd iroute +WARNING: untranslated string: ccd iroute2 +WARNING: untranslated string: ccd iroutehint +WARNING: untranslated string: ccd modify +WARNING: untranslated string: ccd name +WARNING: untranslated string: ccd net +WARNING: untranslated string: ccd noaddnet +WARNING: untranslated string: ccd none +WARNING: untranslated string: ccd routes +WARNING: untranslated string: ccd subnet +WARNING: untranslated string: ccd used WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: dns address deleted txt WARNING: untranslated string: fireinfo ipfire version @@ -534,11 +570,24 @@ WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: other WARNING: untranslated string: our donors WARNING: untranslated string: outgoing firewall reserved groupname +WARNING: untranslated string: ovpn mtu-disc +WARNING: untranslated string: ovpn mtu-disc and mtu not 1500 +WARNING: untranslated string: ovpn mtu-disc maybe +WARNING: untranslated string: ovpn mtu-disc no +WARNING: untranslated string: ovpn mtu-disc off +WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment +WARNING: untranslated string: ovpn mtu-disc yes WARNING: untranslated string: pakfire ago +WARNING: untranslated string: proxy reports +WARNING: untranslated string: proxy reports daily +WARNING: untranslated string: proxy reports monthly +WARNING: untranslated string: proxy reports today +WARNING: untranslated string: proxy reports weekly WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: server restart WARNING: untranslated string: snort working WARNING: untranslated string: static routes WARNING: untranslated string: system information diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 6bcbf86..eca067d 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -500,7 +500,43 @@ WARNING: untranslated string: Async logging enabled WARNING: untranslated string: Scan for Songs WARNING: untranslated string: Set time on boot WARNING: untranslated string: advproxy errmsg invalid upstream proxy +WARNING: untranslated string: attention WARNING: untranslated string: bytes +WARNING: untranslated string: ccd add +WARNING: untranslated string: ccd choose net +WARNING: untranslated string: ccd client options +WARNING: untranslated string: ccd clientip +WARNING: untranslated string: ccd dynrange +WARNING: untranslated string: ccd err blue +WARNING: untranslated string: ccd err green +WARNING: untranslated string: ccd err hostinnet +WARNING: untranslated string: ccd err inuse +WARNING: untranslated string: ccd err invalidname +WARNING: untranslated string: ccd err invalidnet +WARNING: untranslated string: ccd err irouteexist +WARNING: untranslated string: ccd err isipsecnet +WARNING: untranslated string: ccd err isovpnnet +WARNING: untranslated string: ccd err issubnet +WARNING: untranslated string: ccd err name +WARNING: untranslated string: ccd err nameexist +WARNING: untranslated string: ccd err netadrexist +WARNING: untranslated string: ccd err orange +WARNING: untranslated string: ccd err red +WARNING: untranslated string: ccd err routeovpn +WARNING: untranslated string: ccd err routeovpn2 +WARNING: untranslated string: ccd hint +WARNING: untranslated string: ccd invalid +WARNING: untranslated string: ccd iroute +WARNING: untranslated string: ccd iroute2 +WARNING: untranslated string: ccd iroutehint +WARNING: untranslated string: ccd modify +WARNING: untranslated string: ccd name +WARNING: untranslated string: ccd net +WARNING: untranslated string: ccd noaddnet +WARNING: untranslated string: ccd none +WARNING: untranslated string: ccd routes +WARNING: untranslated string: ccd subnet +WARNING: untranslated string: ccd used WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled @@ -546,11 +582,28 @@ WARNING: untranslated string: outgoing firewall p2p description 2 WARNING: untranslated string: outgoing firewall p2p description 3 WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: outgoing firewall view group +WARNING: untranslated string: ovpn errmsg green already pushed +WARNING: untranslated string: ovpn errmsg invalid ip or mask +WARNING: untranslated string: ovpn mtu-disc +WARNING: untranslated string: ovpn mtu-disc and mtu not 1500 +WARNING: untranslated string: ovpn mtu-disc maybe +WARNING: untranslated string: ovpn mtu-disc no +WARNING: untranslated string: ovpn mtu-disc off +WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment +WARNING: untranslated string: ovpn mtu-disc yes +WARNING: untranslated string: ovpn routes push +WARNING: untranslated string: ovpn routes push options WARNING: untranslated string: pakfire ago +WARNING: untranslated string: proxy reports +WARNING: untranslated string: proxy reports daily +WARNING: untranslated string: proxy reports monthly +WARNING: untranslated string: proxy reports today +WARNING: untranslated string: proxy reports weekly WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: server restart WARNING: untranslated string: static routes WARNING: untranslated string: system information WARNING: untranslated string: visit us at diff --git a/doc/language_issues.ru b/doc/language_issues.ru index e25d81d..e36449a 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -491,7 +491,43 @@ WARNING: untranslated string: Add a route WARNING: untranslated string: Edit an existing route WARNING: untranslated string: Scan for Songs WARNING: untranslated string: advproxy errmsg invalid upstream proxy +WARNING: untranslated string: attention WARNING: untranslated string: bytes +WARNING: untranslated string: ccd add +WARNING: untranslated string: ccd choose net +WARNING: untranslated string: ccd client options +WARNING: untranslated string: ccd clientip +WARNING: untranslated string: ccd dynrange +WARNING: untranslated string: ccd err blue +WARNING: untranslated string: ccd err green +WARNING: untranslated string: ccd err hostinnet +WARNING: untranslated string: ccd err inuse +WARNING: untranslated string: ccd err invalidname +WARNING: untranslated string: ccd err invalidnet +WARNING: untranslated string: ccd err irouteexist +WARNING: untranslated string: ccd err isipsecnet +WARNING: untranslated string: ccd err isovpnnet +WARNING: untranslated string: ccd err issubnet +WARNING: untranslated string: ccd err name +WARNING: untranslated string: ccd err nameexist +WARNING: untranslated string: ccd err netadrexist +WARNING: untranslated string: ccd err orange +WARNING: untranslated string: ccd err red +WARNING: untranslated string: ccd err routeovpn +WARNING: untranslated string: ccd err routeovpn2 +WARNING: untranslated string: ccd hint +WARNING: untranslated string: ccd invalid +WARNING: untranslated string: ccd iroute +WARNING: untranslated string: ccd iroute2 +WARNING: untranslated string: ccd iroutehint +WARNING: untranslated string: ccd modify +WARNING: untranslated string: ccd name +WARNING: untranslated string: ccd net +WARNING: untranslated string: ccd noaddnet +WARNING: untranslated string: ccd none +WARNING: untranslated string: ccd routes +WARNING: untranslated string: ccd subnet +WARNING: untranslated string: ccd used WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: disk access per WARNING: untranslated string: extrahd because there is already a device mounted @@ -516,10 +552,23 @@ WARNING: untranslated string: other WARNING: untranslated string: our donors WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: outgoing traffic in bytes per second +WARNING: untranslated string: ovpn mtu-disc +WARNING: untranslated string: ovpn mtu-disc and mtu not 1500 +WARNING: untranslated string: ovpn mtu-disc maybe +WARNING: untranslated string: ovpn mtu-disc no +WARNING: untranslated string: ovpn mtu-disc off +WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment +WARNING: untranslated string: ovpn mtu-disc yes +WARNING: untranslated string: proxy reports +WARNING: untranslated string: proxy reports daily +WARNING: untranslated string: proxy reports monthly +WARNING: untranslated string: proxy reports today +WARNING: untranslated string: proxy reports weekly WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: server restart WARNING: untranslated string: static routes WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange diff --git a/doc/language_missings b/doc/language_missings index 55e0e40..83fbf90 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -4,6 +4,7 @@ ############################################################################ # Checking cgi-bin translations for language: en # ############################################################################ +< ccd maxclients ############################################################################ # Checking install/setup translations for language: fr # ############################################################################ @@ -11,6 +12,45 @@ # Checking cgi-bin translations for language: fr # ############################################################################ < advproxy errmsg invalid upstream proxy +< attention +< ccd add +< ccd choose net +< ccd clientip +< ccd client options +< ccd dynrange +< ccd err blue +< ccd err green +< ccd err hostinnet +< ccd err inuse +< ccd err invalidname +< ccd err invalidnet +< ccd err iroute +< ccd err irouteexist +< ccd err isipsecnet +< ccd err isovpnnet +< ccd err issubnet +< ccd err name +< ccd err nameexist +< ccd err netadr +< ccd err netadrexist +< ccd err orange +< ccd err red +< ccd err routeovpn +< ccd err routeovpn2 +< ccd hint +< ccd invalid +< ccd iroute +< ccd iroute2 +< ccd iroutehint +< ccd maxclients +< ccd modify +< ccd name +< ccd net +< ccd noaddnet +< ccd none +< ccd routes +< ccd subnet +< ccd used < deprecated fs warn < dns address deleted txt < fireinfo ipfire version @@ -45,6 +85,19 @@ < openvpn subnet is used < other < our donors +< ovpn mtu-disc +< ovpn mtu-disc and mtu not 1500 +< ovpn mtu-disc maybe +< ovpn mtu-disc no +< ovpn mtu-disc off +< ovpn mtu-disc with mssfix or fragment +< ovpn mtu-disc yes +< proxy reports +< proxy reports daily +< proxy reports monthly +< proxy reports today +< proxy reports weekly +< server restart < snort working < static routes < system information @@ -81,6 +134,45 @@ ############################################################################ < advproxy errmsg invalid upstream proxy < Async logging enabled +< attention +< ccd add +< ccd choose net +< ccd clientip +< ccd client options +< ccd dynrange +< ccd err blue +< ccd err green +< ccd err hostinnet +< ccd err inuse +< ccd err invalidname +< ccd err invalidnet +< ccd err iroute +< ccd err irouteexist +< ccd err isipsecnet +< ccd err isovpnnet +< ccd err issubnet +< ccd err name +< ccd err nameexist +< ccd err netadr +< ccd err netadrexist +< ccd err orange +< ccd err red +< ccd err routeovpn +< ccd err routeovpn2 +< ccd hint +< ccd invalid +< ccd iroute +< ccd iroute2 +< ccd iroutehint +< ccd maxclients +< ccd modify +< ccd name +< ccd net +< ccd noaddnet +< ccd none +< ccd routes +< ccd subnet +< ccd used < deprecated fs warn < fireinfo ipfire version < fireinfo is disabled @@ -126,6 +218,23 @@ < outgoing firewall p2p description 2 < outgoing firewall p2p description 3 < outgoing firewall view group +< ovpn errmsg green already pushed +< ovpn errmsg invalid ip or mask +< ovpn mtu-disc +< ovpn mtu-disc and mtu not 1500 +< ovpn mtu-disc maybe +< ovpn mtu-disc no +< ovpn mtu-disc off +< ovpn mtu-disc with mssfix or fragment +< ovpn mtu-disc yes +< ovpn routes push +< ovpn routes push options +< proxy reports +< proxy reports daily +< proxy reports monthly +< proxy reports today +< proxy reports weekly +< server restart < Set time on boot < static routes < system information @@ -138,6 +247,45 @@ # Checking cgi-bin translations for language: pl # ############################################################################ < advproxy errmsg invalid upstream proxy +< attention +< ccd add +< ccd choose net +< ccd clientip +< ccd client options +< ccd dynrange +< ccd err blue +< ccd err green +< ccd err hostinnet +< ccd err inuse +< ccd err invalidname +< ccd err invalidnet +< ccd err iroute +< ccd err irouteexist +< ccd err isipsecnet +< ccd err isovpnnet +< ccd err issubnet +< ccd err name +< ccd err nameexist +< ccd err netadr +< ccd err netadrexist +< ccd err orange +< ccd err red +< ccd err routeovpn +< ccd err routeovpn2 +< ccd hint +< ccd invalid +< ccd iroute +< ccd iroute2 +< ccd iroutehint +< ccd maxclients +< ccd modify +< ccd name +< ccd net +< ccd noaddnet +< ccd none +< ccd routes +< ccd subnet +< ccd used < deprecated fs warn < extrahd because there is already a device mounted < extrahd cant umount @@ -161,6 +309,23 @@ < openvpn subnet is used < other < our donors +< ovpn errmsg green already pushed +< ovpn errmsg invalid ip or mask +< ovpn mtu-disc +< ovpn mtu-disc and mtu not 1500 +< ovpn mtu-disc maybe +< ovpn mtu-disc no +< ovpn mtu-disc off +< ovpn mtu-disc with mssfix or fragment +< ovpn mtu-disc yes +< ovpn routes push +< ovpn routes push options +< proxy reports +< proxy reports daily +< proxy reports monthly +< proxy reports today +< proxy reports weekly +< server restart < static routes < visit us at < vpn keyexchange @@ -172,6 +337,45 @@ ############################################################################ < Add a route < advproxy errmsg invalid upstream proxy +< attention +< ccd add +< ccd choose net +< ccd clientip +< ccd client options +< ccd dynrange +< ccd err blue +< ccd err green +< ccd err hostinnet +< ccd err inuse +< ccd err invalidname +< ccd err invalidnet +< ccd err iroute +< ccd err irouteexist +< ccd err isipsecnet +< ccd err isovpnnet +< ccd err issubnet +< ccd err name +< ccd err nameexist +< ccd err netadr +< ccd err netadrexist +< ccd err orange +< ccd err red +< ccd err routeovpn +< ccd err routeovpn2 +< ccd hint +< ccd invalid +< ccd iroute +< ccd iroute2 +< ccd iroutehint +< ccd maxclients +< ccd modify +< ccd name +< ccd net +< ccd noaddnet +< ccd none +< ccd routes +< ccd subnet +< ccd used < day-graph < deprecated fs warn < disk access per @@ -203,6 +407,19 @@ < other < our donors < outgoing traffic in bytes per second +< ovpn mtu-disc +< ovpn mtu-disc and mtu not 1500 +< ovpn mtu-disc maybe +< ovpn mtu-disc no +< ovpn mtu-disc off +< ovpn mtu-disc with mssfix or fragment +< ovpn mtu-disc yes +< proxy reports +< proxy reports daily +< proxy reports monthly +< proxy reports today +< proxy reports weekly +< server restart < static routes < visit us at < vpn keyexchange diff --git a/html/cgi-bin/logs.cgi/calamaris.dat b/html/cgi-bin/logs.cgi/calamaris.dat index 19a3693..07fdf8a 100644 --- a/html/cgi-bin/logs.cgi/calamaris.dat +++ b/html/cgi-bin/logs.cgi/calamaris.dat @@ -24,6 +24,7 @@ my $unique=time; my $squidlogdir = "/var/log/squid"; my $reportdir = "${General::swroot}/proxy/calamaris/reports"; +my $sargdir = "/var/log/sarg"; unless (-e $reportdir) { mkdir($reportdir) } @@ -98,6 +99,7 @@ if ($reportsettings{'ACTION'} eq $Lang::tr{'calamaris create report'}) delete $reportsettings{'DAY_END'}; delete $reportsettings{'MONTH_END'}; delete $reportsettings{'YEAR_END'}; + delete $reportsettings{'REPORT'}; &General::writehash("${General::swroot}/proxy/calamaris/settings", \%reportsettings); @@ -240,6 +242,86 @@ if ($errormessage) { &Header::closebox(); } +# Link sarg reports. +if (-e $sargdir) { + &Header::openbox('100%', 'left', "$Lang::tr{'proxy reports'}:"); + + print <<END; + <table width="100%"> + <tr> +END + + # Today. + if (-e "$sargdir/today") { + print <<END; + <td width="25%" align="center"> + <a href="/proxy-reports/today" target="_blank">$Lang::tr{'proxy reports today'}</a> + </td> +END + } else { + print <<END; + <td width="25%" align="center"> + $Lang::tr{'proxy reports today'} + </td> +END + } + + # Daily. + if (-e "$sargdir/daily") { + print <<END; + <td width="25%" align="center"> + <a href="/proxy-reports/daily" target="_blank">$Lang::tr{'proxy reports daily'}</a> + </td> +END + } else { + print <<END; + <td width="25%" align="center"> + $Lang::tr{'proxy reports daily'} + </td> +END + } + + # Weekly. + if (-e "$sargdir/weekly") { + print <<END; + <td width="25%" align="center"> + <a href="/proxy-reports/weekly" target="_blank">$Lang::tr{'proxy reports weekly'}</a> + </td> +END + } else { + print <<END; + <td width="25%" align="center"> + $Lang::tr{'proxy reports weekly'} + </td> +END + } + + # Monthly. + if (-e "$sargdir/monthly") { + print <<END; + <td width="25%" align="center"> + <a href="/proxy-reports/monthly" target="_blank">$Lang::tr{'proxy reports monthly'}</a> + </td> +END + } else { + print <<END; + <td width="25%" align="center"> + $Lang::tr{'proxy reports monthly'} + </td> +END + } + + print <<END; + </tr> + </table> + + <br><br> +END + + &Header::closebox(); +} + + &Header::openbox('100%', 'left', "$Lang::tr{'settings'}:"); print <<END @@ -493,12 +575,11 @@ END if (@reports) { print "<td><select name='REPORT' size='5'>\n"; - my $n=0; foreach (@reports) { @reportdata=split(/#/); print "\t<option "; - if ($n eq '0') { print "selected "; $reportsettings{'REPORT'}=$reportdata[1]; $n++} + if ($reportsettings{'REPORT'} eq $reportdata[1]) { print "selected ";} print "value='$reportdata[1]'>$reportdata[2]  -  $reportdata[3]</option>\n"; } print "</select></td>\n"; diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi old mode 100644 new mode 100755 index 990fe66..2b0c4ba --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -36,10 +36,10 @@ require "${General::swroot}/header.pl"; require "${General::swroot}/countries.pl"; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; #workaround to suppress a warning when a variable is used only once -my @dummy = ( ${Header::colourgreen} ); +my @dummy = ( ${Header::colourgreen}, ${Header::colourblue} ); undef (@dummy); my %color = (); @@ -50,6 +50,9 @@ my %mainsettings = (); ### ### Initialize variables ### +my %ccdconfhash=(); +my %ccdroutehash=(); +my %ccdroute2hash=(); my %netsettings=(); my %cgiparams=(); my %vpnsettings=(); @@ -61,6 +64,10 @@ my $warnmessage = ''; my $errormessage = ''; my %settings=(); my $routes_push_file = ''; +my $confighost="${General::swroot}/fwhosts/customhosts"; +my $configgrp="${General::swroot}/fwhosts/customgroups"; +my $customnet="${General::swroot}/fwhosts/customnetworks"; +my $name; &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); $cgiparams{'ENABLED'} = 'off'; $cgiparams{'ENABLED_BLUE'} = 'off'; @@ -77,8 +84,13 @@ $cgiparams{'DHCP_WINS'} = ''; $cgiparams{'ROUTES_PUSH'} = ''; $cgiparams{'DCOMPLZO'} = 'off'; $cgiparams{'MSSFIX'} = ''; +$cgiparams{'number'} = ''; +$cgiparams{'PMTU_DISCOVERY'} = ''; $routes_push_file = "${General::swroot}/ovpn/routes_push"; unless (-e $routes_push_file) { system("touch $routes_push_file"); } +unless (-e "${General::swroot}/ovpn/ccd.conf") { system("touch ${General::swroot}/ovpn/ccd.conf"); } +unless (-e "${General::swroot}/ovpn/ccdroute") { system("touch ${General::swroot}/ovpn/ccdroute"); } +unless (-e "${General::swroot}/ovpn/ccdroute2") { system("touch ${General::swroot}/ovpn/ccdroute2"); } &Header::getcgihash(\%cgiparams, {'wantfile' => 1, 'filevar' => 'FH'}); @@ -313,7 +325,6 @@ sub disallowreserved return; } - sub writeserverconf { my %sovpnsettings = (); my @temp = (); @@ -329,7 +340,6 @@ sub writeserverconf { print CONF "#DAN prepare OpenVPN for listening on blue and orange\n"; print CONF ";local $sovpnsettings{'VPN_IP'}\n"; print CONF "dev $sovpnsettings{'DDEVICE'}\n"; - print CONF "$sovpnsettings{'DDEVICE'}-mtu $sovpnsettings{'DMTU'}\n"; print CONF "proto $sovpnsettings{'DPROTOCOL'}\n"; print CONF "port $sovpnsettings{'DDEST_PORT'}\n"; print CONF "script-security 3 system\n"; @@ -342,18 +352,48 @@ sub writeserverconf { print CONF "dh /var/ipfire/ovpn/ca/dh1024.pem\n"; my @tempovpnsubnet = split("\/",$sovpnsettings{'DOVPN_SUBNET'}); print CONF "server $tempovpnsubnet[0] $tempovpnsubnet[1]\n"; - print CONF "push \"route $netsettings{'GREEN_NETADDRESS'} $netsettings{'GREEN_NETMASK'}\"\n"; - + #print CONF "push \"route $netsettings{'GREEN_NETADDRESS'} $netsettings{'GREEN_NETMASK'}\"\n"; + + # Check if we are using mssfix, fragment or mtu-disc and set the corretct mtu of 1500. + # If we doesn't use one of them, we can use the configured mtu value. + if ($sovpnsettings{'MSSFIX'} eq 'on') + { print CONF "$sovpnsettings{'DDEVICE'}-mtu 1500\n"; } + elsif ($sovpnsettings{'FRAGMENT'} ne '' && $sovpnsettings{'DPROTOCOL'} ne 'tcp') + { print CONF "$sovpnsettings{'DDEVICE'}-mtu 1500\n"; } + elsif (($sovpnsettings{'PMTU_DISCOVERY'} eq 'yes') || + ($sovpnsettings{'PMTU_DISCOVERY'} eq 'maybe') || + ($sovpnsettings{'PMTU_DISCOVERY'} eq 'no' )) + { print CONF "$sovpnsettings{'DDEVICE'}-mtu 1500\n"; } + else + { print CONF "$sovpnsettings{'DDEVICE'}-mtu $sovpnsettings{'DMTU'}\n"; } + if ($vpnsettings{'ROUTES_PUSH'} ne '') { - @temp = split(/\n/,$vpnsettings{'ROUTES_PUSH'}); - foreach (@temp) - { - @tempovpnsubnet = split("\/",&General::ipcidr2msk($_)); - print CONF "push \"route " . $tempovpnsubnet[0]. " " . $tempovpnsubnet[1] . "\"\n"; + @temp = split(/\n/,$vpnsettings{'ROUTES_PUSH'}); + foreach (@temp) + { + @tempovpnsubnet = split("\/",&General::ipcidr2msk($_)); + print CONF "push \"route " . $tempovpnsubnet[0]. " " . $tempovpnsubnet[1] . "\"\n"; + } } - } +# a.marx ccd + my %ccdconfhash=(); + &General::readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); + foreach my $key (keys %ccdconfhash) { + my $a=$ccdconfhash{$key}[1]; + my ($b,$c) = split (/\//, $a); + print CONF "route $b ".&General::cidrtosub($c)."\n"; + } + my %ccdroutehash=(); + &General::readhasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); + foreach my $key (keys %ccdroutehash) { + foreach my $i ( 1 .. $#{$ccdroutehash{$key}}){ + my ($a,$b)=split (/\//,$ccdroutehash{$key}[$i]); + print CONF "route $a $b\n"; + } + } +# ccd end - if ($sovpnsettings{CLIENT2CLIENT} eq 'on') { + if ($sovpnsettings{CLIENT2CLIENT} eq 'on') { print CONF "client-to-client\n"; } if ($sovpnsettings{MSSFIX} eq 'on') { @@ -362,6 +402,14 @@ sub writeserverconf { if ($sovpnsettings{FRAGMENT} ne '' && $sovpnsettings{'DPROTOCOL'} ne 'tcp') { print CONF "fragment $sovpnsettings{'FRAGMENT'}\n"; } + + # Check if a valid operating mode has been choosen and use it. + if (($sovpnsettings{'PMTU_DISCOVERY'} eq 'yes') || + ($sovpnsettings{'PMTU_DISCOVERY'} eq 'maybe') || + ($sovpnsettings{'PMTU_DISCOVERY'} eq 'no' )) { + print CONF "mtu-disc $sovpnsettings{'PMTU_DISCOVERY'}\n"; + } + if ($sovpnsettings{KEEPALIVE_1} > 0 && $sovpnsettings{KEEPALIVE_2} > 0) { print CONF "keepalive $sovpnsettings{'KEEPALIVE_1'} $sovpnsettings{'KEEPALIVE_2'}\n"; } @@ -407,7 +455,7 @@ sub writeserverconf { close(CONF); } -# + sub emptyserverlog{ if (open(FILE, ">/var/log/ovpnserver.log")) { flock FILE, 2; @@ -417,6 +465,274 @@ sub emptyserverlog{ } +sub delccdnet +{ + my %ccdconfhash = (); + my %ccdhash = (); + my $ccdnetname=$_[0]; + if (-f "${General::swroot}/ovpn/ovpnconfig"){ + &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ccdhash); + foreach my $key (keys %ccdhash) { + if ($ccdhash{$key}[32] eq $ccdnetname) { + $errormessage=$Lang::tr{'ccd err hostinnet'}; + return; + } + } + } + &General::readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); + foreach my $key (keys %ccdconfhash) { + if ($ccdconfhash{$key}[0] eq $ccdnetname){ + delete $ccdconfhash{$key}; + } + } + &General::writehasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); + + &writeserverconf; + return 0; +} + +sub addccdnet +{ + my %ccdconfhash=(); + my @ccdconf=(); + my $ccdname=$_[0]; + my $ccdnet=$_[1]; + my $subcidr; + my @ip2=(); + my $checkup; + my $ccdip; + my $baseaddress; + + + #check name + if ($ccdname eq '') + { + $errormessage=$errormessage.$Lang::tr{'ccd err name'}."<br>"; + return + } + + if(!&General::validhostname($ccdname)) + { + $errormessage=$Lang::tr{'ccd err invalidname'}; + return; + } + + ($ccdip,$subcidr) = split (/\//,$ccdnet); + $subcidr=&General::iporsubtocidr($subcidr); + #check subnet + if ($subcidr > 30) + { + $errormessage=$Lang::tr{'ccd err invalidnet'}; + return; + } + #check ip + if (!&General::validipandmask($ccdnet)){ + $errormessage=$Lang::tr{'ccd err invalidnet'}; + return; + } + + $errormessage=&General::checksubnets($ccdname,$ccdnet); + + + if (!$errormessage) { + my %ccdconfhash=(); + $baseaddress=&General::getnetworkip($ccdip,$subcidr); + &General::readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); + my $key = &General::findhasharraykey (\%ccdconfhash); + foreach my $i (0 .. 1) { $ccdconfhash{$key}[$i] = "";} + $ccdconfhash{$key}[0] = $ccdname; + $ccdconfhash{$key}[1] = $baseaddress."/".$subcidr; + &General::writehasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); + &writeserverconf; + $cgiparams{'ccdname'}=''; + $cgiparams{'ccdsubnet'}=''; + return 1; + } +} + +sub modccdnet +{ + + my $newname=$_[0]; + my $oldname=$_[1]; + my %ccdconfhash=(); + my %ccdhash=(); + &General::readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); + foreach my $key (keys %ccdconfhash) { + if ($ccdconfhash{$key}[0] eq $oldname) { + foreach my $key1 (keys %ccdconfhash) { + if ($ccdconfhash{$key1}[0] eq $newname){ + $errormessage=$errormessage.$Lang::tr{'ccd err netadrexist'}; + return; + }else{ + $ccdconfhash{$key}[0]= $newname; + &General::writehasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); + last; + } + } + } + } + + &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ccdhash); + foreach my $key (keys %ccdhash) { + if ($ccdhash{$key}[32] eq $oldname) { + $ccdhash{$key}[32]=$newname; + &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%ccdhash); + last; + } + } + + return 0; +} +sub ccdmaxclients +{ + my $ccdnetwork=$_[0]; + my @octets=(); + my @subnet=(); + @octets=split("\/",$ccdnetwork); + @subnet= split /\./, &General::cidrtosub($octets[1]); + my ($a,$b,$c,$d,$e); + $a=256-$subnet[0]; + $b=256-$subnet[1]; + $c=256-$subnet[2]; + $d=256-$subnet[3]; + $e=($a*$b*$c*$d)/4; + return $e-1; +} + +sub getccdadresses +{ + my $ipin=$_[0]; + my ($ip1,$ip2,$ip3,$ip4)=split /\./, $ipin; + my $cidr=$_[1]; + chomp($cidr); + my $count=$_[2]; + my $hasip=$_[3]; + chomp($hasip); + my @iprange=(); + my %ccdhash=(); + &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ccdhash); + $iprange[0]=$ip1.".".$ip2.".".$ip3.".".2; + for (my $i=1;$i<=$count;$i++) { + my $tmpip=$iprange[$i-1]; + my $stepper=$i*4; + $iprange[$i]= &General::getnextip($tmpip,4); + } + my $r=0; + foreach my $key (keys %ccdhash) { + $r=0; + foreach my $tmp (@iprange){ + my ($net,$sub) = split (/\//,$ccdhash{$key}[33]); + if ($net eq $tmp) { + if ( $hasip ne $ccdhash{$key}[33] ){ + splice (@iprange,$r,1); + } + } + $r++; + } + } + return @iprange; +} + +sub fillselectbox +{ + my $boxname=$_[1]; + my ($ccdip,$subcidr) = split("/",$_[0]); + my $tz=$_[2]; + my @allccdips=&getccdadresses($ccdip,$subcidr,&ccdmaxclients($ccdip."/".$subcidr),$tz); + print"<select name='$boxname' STYLE='font-family : arial; font-size : 9pt; width:130px;' >"; + foreach (@allccdips) { + my $ip=$_."/30"; + chomp($ip); + print "<option value='$ip' "; + if ( $ip eq $cgiparams{$boxname} ){ + print"selected"; + } + print ">$ip</option>"; + } + print "</select>"; +} + +sub hostsinnet +{ + my $name=$_[0]; + my %ccdhash=(); + my $i=0; + &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ccdhash); + foreach my $key (keys %ccdhash) { + if ($ccdhash{$key}[32] eq $name){ $i++;} + } + return $i; +} + +sub check_routes_push +{ + my $val=$_[0]; + my ($ip,$cidr) = split (/\//, $val); + ##check for existing routes in routes_push + if (-e "${General::swroot}/ovpn/routes_push") { + open(FILE,"${General::swroot}/ovpn/routes_push"); + while (<FILE>) { + $_=~s/\s*$//g; + + my ($ip2,$cidr2) = split (/\//,"$_"); + my $val2=$ip2."/".&General::iporsubtodec($cidr2); + + if($val eq $val2){ + return 0; + } + #subnetcheck + if (&General::IpInSubnet ($ip,$ip2,&General::iporsubtodec($cidr2))){ + return 0; + } + }; + close(FILE); + } + return 1; +} + +sub check_ccdroute +{ + my %ccdroutehash=(); + my $val=$_[0]; + my ($ip,$cidr) = split (/\//, $val); + #check for existing routes in ccdroute + &General::readhasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); + foreach my $key (keys %ccdroutehash) { + foreach my $i (1 .. $#{$ccdroutehash{$key}}) { + if (&General::iporsubtodec($val) eq $ccdroutehash{$key}[$i] && $ccdroutehash{$key}[0] ne $cgiparams{'NAME'}){ + return 0; + } + my ($ip2,$cidr2) = split (/\//,$ccdroutehash{$key}[$i]); + #subnetcheck + if (&General::IpInSubnet ($ip,$ip2,$cidr2)&& $ccdroutehash{$key}[0] ne $cgiparams{'NAME'} ){ + return 0; + } + } + } + return 1; +} +sub check_ccdconf +{ + my %ccdconfhash=(); + my $val=$_[0]; + my ($ip,$cidr) = split (/\//, $val); + #check for existing routes in ccdroute + &General::readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); + foreach my $key (keys %ccdconfhash) { + if (&General::iporsubtocidr($val) eq $ccdconfhash{$key}[1]){ + return 0; + } + my ($ip2,$cidr2) = split (/\//,$ccdconfhash{$key}[1]); + #subnetcheck + if (&General::IpInSubnet ($ip,$ip2,&General::cidrtosub($cidr2))){ + return 0; + } + + } + return 1; +} + ### # m.a.d net2net ### @@ -451,6 +767,7 @@ sub read_routepushfile while (<FILE>) { $vpnsettings{'ROUTES_PUSH'} .= $_ }; close(FILE); $cgiparams{'ROUTES_PUSH'} = $vpnsettings{'ROUTES_PUSH'}; + } } @@ -490,11 +807,11 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'start ovpn server'} || &emptyserverlog(); } # #restart openvpn server - if ($cgiparams{'ACTION'} eq $Lang::tr{'restart ovpn server'}){ +# if ($cgiparams{'ACTION'} eq $Lang::tr{'restart ovpn server'}){ #workarund, till SIGHUP also works when running as nobody - system('/usr/local/bin/openvpnctrl', '-r'); - &emptyserverlog(); - } +# system('/usr/local/bin/openvpnctrl', '-r'); +# &emptyserverlog(); +# } } ### @@ -516,6 +833,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { $vpnsettings{'DHCP_DNS'} = $cgiparams{'DHCP_DNS'}; $vpnsettings{'DHCP_WINS'} = $cgiparams{'DHCP_WINS'}; $vpnsettings{'ROUTES_PUSH'} = $cgiparams{'ROUTES_PUSH'}; + $vpnsettings{'PMTU_DISCOVERY'} = $cgiparams{'PMTU_DISCOVERY'}; my @temp=(); if ($cgiparams{'FRAGMENT'} eq '') { @@ -533,6 +851,17 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { } else { $vpnsettings{'MSSFIX'} = $cgiparams{'MSSFIX'}; } + + if (($cgiparams{'PMTU_DISCOVERY'} eq 'yes') || + ($cgiparams{'PMTU_DISCOVERY'} eq 'maybe') || + ($cgiparams{'PMTU_DISCOVERY'} eq 'no' )) { + + if (($cgiparams{'MSSFIX'} eq 'on') || ($cgiparams{'FRAGMENT'} ne '')) { + $errormessage = $Lang::tr{'ovpn mtu-disc with mssfix or fragment'}; + goto ADV_ERROR; + } + } + if ($cgiparams{'DHCP_DOMAIN'} ne ''){ unless (&General::validfqdn($cgiparams{'DHCP_DOMAIN'}) || &General::validip($cgiparams{'DHCP_DOMAIN'})) { $errormessage = $Lang::tr{'invalid input for dhcp domain'}; @@ -554,24 +883,47 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { if ($cgiparams{'ROUTES_PUSH'} ne ''){ @temp = split(/\n/,$cgiparams{'ROUTES_PUSH'}); undef $vpnsettings{'ROUTES_PUSH'}; - foreach (@temp) + + foreach my $tmpip (@temp) { s/^\s+//g; s/\s+$//g; - if ($_) + + if ($tmpip) { - unless (&General::validipandmask($_)) { - $errormessage = $Lang::tr{'ovpn errmsg invalid ip or mask'}; - goto ADV_ERROR; + $tmpip=~s/\s*$//g; + unless (&General::validipandmask($tmpip)) { + $errormessage = "$tmpip ".$Lang::tr{'ovpn errmsg invalid ip or mask'}; + goto ADV_ERROR; } - my ($ip, $cidr) = split("\/",&General::ipcidr2msk($_)); + my ($ip, $cidr) = split("\/",&General::ipcidr2msk($tmpip)); + if ($ip eq $netsettings{'GREEN_NETADDRESS'} && $cidr eq $netsettings{'GREEN_NETMASK'}) { $errormessage = $Lang::tr{'ovpn errmsg green already pushed'}; - goto ADV_ERROR; + goto ADV_ERROR; } - $vpnsettings{'ROUTES_PUSH'} .= $_."\n"; +# a.marx ccd + my %ccdroutehash=(); + &General::readhasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); + foreach my $key (keys %ccdroutehash) { + foreach my $i (1 .. $#{$ccdroutehash{$key}}) { + if ( $ip."/".$cidr eq $ccdroutehash{$key}[$i] ){ + $errormessage="Route $ip\/$cidr ".$Lang::tr{'ccd err inuse'}." $ccdroutehash{$key}[0]" ; + goto ADV_ERROR; + } + my ($ip2,$cidr2) = split(/\//,$ccdroutehash{$key}[$i]); + if (&General::IpInSubnet ($ip,$ip2,$cidr2)){ + $errormessage="Route $ip\/$cidr ".$Lang::tr{'ccd err inuse'}." $ccdroutehash{$key}[0]" ; + goto ADV_ERROR; + } + } + } + +# ccd end + + $vpnsettings{'ROUTES_PUSH'} .= $tmpip."\n"; } - } - &write_routepushfile; + } + &write_routepushfile; undef $vpnsettings{'ROUTES_PUSH'}; } else { @@ -656,6 +1008,17 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General if ($cgiparams{'FRAGMENT'} ne '') {print SERVERCONF "fragment $cgiparams{'FRAGMENT'}\n";} if ($cgiparams{'MSSFIX'} eq 'on') {print SERVERCONF "mssfix\n"; }; } + + # Check if a valid operating mode has been choosen and use it. + if (($cgiparams{'PMTU_DISCOVERY'} eq 'yes') || + ($cgiparams{'PMTU_DISCOVERY'} eq 'maybe') || + ($cgiparams{'PMTU_DISCOVERY'} eq 'no' )) { + if(($cgiparams{'MSSFIX'} ne 'on') || ($cgiparams{'FRAGMENT'} eq '')) { + if($cgiparams{'MTU'} eq '1500') { + print SERVERCONF "mtu-disc $cgiparams{'PMTU_DISCOVERY'}\n"; + } + } + } print SERVERCONF "# Auth. Server\n"; print SERVERCONF "tls-server\n"; print SERVERCONF "ca ${General::swroot}/ovpn/ca/cacert.pem\n"; @@ -734,6 +1097,17 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General if ($cgiparams{'FRAGMENT'} ne '') {print CLIENTCONF "fragment $cgiparams{'FRAGMENT'}\n";} if ($cgiparams{'MSSFIX'} eq 'on') {print CLIENTCONF "mssfix\n"; }; } + + # Check if a valid operating mode has been choosen and use it. + if (($cgiparams{'PMTU_DISCOVERY'} eq 'yes') || + ($cgiparams{'PMTU_DISCOVERY'} eq 'maybe') || + ($cgiparams{'PMTU_DISCOVERY'} eq 'no' )) { + if(($cgiparams{'MSSFIX'} ne 'on') || ($cgiparams{'FRAGMENT'} eq '')) { + if ($cgiparams{'MTU'} eq '1500') { + print CLIENTCONF "mtu-disc $cgiparams{'PMTU_DISCOVERY'}\n"; + } + } + } print CLIENTCONF "ns-cert-type server\n"; print CLIENTCONF "# Auth. Client\n"; @@ -1571,29 +1945,26 @@ END my $n2nactive = `/bin/ps ax|grep $confighash{$cgiparams{'KEY'}}[1]|grep -v grep|awk \'{print \$1}\'`; if ($confighash{$cgiparams{'KEY'}}) { + if ($confighash{$cgiparams{'KEY'}}[0] eq 'off') { + $confighash{$cgiparams{'KEY'}}[0] = 'on'; + &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); - - if ($confighash{$cgiparams{'KEY'}}[0] eq 'off') { - $confighash{$cgiparams{'KEY'}}[0] = 'on'; - &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); - - if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ + if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ system('/usr/local/bin/openvpnctrl', '-sn2n', $confighash{$cgiparams{'KEY'}}[1]); - } - - } else { + } + } else { - $confighash{$cgiparams{'KEY'}}[0] = 'off'; - &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); + $confighash{$cgiparams{'KEY'}}[0] = 'off'; + &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); - if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ + if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ if ($n2nactive ne ''){ - system('/usr/local/bin/openvpnctrl', '-kn2n', $confighash{$cgiparams{'KEY'}}[1]); - } + system('/usr/local/bin/openvpnctrl', '-kn2n', $confighash{$cgiparams{'KEY'}}[1]); + } - } else { + } else { $errormessage = $Lang::tr{'invalid key'}; - } + } } } @@ -1665,6 +2036,15 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ if ($confighash{$cgiparams{'KEY'}}[24] ne '') {print CLIENTCONF "fragment $confighash{$cgiparams{'KEY'}}[24]\n";} if ($confighash{$cgiparams{'KEY'}}[23] eq 'on') {print CLIENTCONF "mssfix\n";} } + if (($confighash{$cgiparams{'KEY'}}[38] eq 'yes') || + ($confighash{$cgiparams{'KEY'}}[38] eq 'maybe') || + ($confighash{$cgiparams{'KEY'}}[38] eq 'no' )) { + if (($confighash{$cgiparams{'KEY'}}[23] ne 'on') || ($confighash{$cgiparams{'KEY'}}[24] eq '')) { + if ($tunmtu eq '1500' ) { + print CLIENTCONF "mtu-disc $confighash{$cgiparams{'KEY'}}[38]\n"; + } + } + } print CLIENTCONF "ns-cert-type server\n"; print CLIENTCONF "# Auth. Client\n"; print CLIENTCONF "tls-client\n"; @@ -1718,12 +2098,26 @@ else my $zip = Archive::Zip->new(); - print CLIENTCONF "#OpenVPN Server conf\r\n"; + print CLIENTCONF "#OpenVPN Client conf\r\n"; print CLIENTCONF "tls-client\r\n"; print CLIENTCONF "client\r\n"; + print CLIENTCONF "nobind\n"; print CLIENTCONF "dev $vpnsettings{'DDEVICE'}\r\n"; print CLIENTCONF "proto $vpnsettings{'DPROTOCOL'}\r\n"; - print CLIENTCONF "$vpnsettings{'DDEVICE'}-mtu $vpnsettings{'DMTU'}\r\n"; + + # Check if we are using fragment, mssfix or mtu-disc and set MTU to 1500 + # or use configured value. + if ($vpnsettings{FRAGMENT} ne '' && $vpnsettings{DPROTOCOL} ne 'tcp' ) + { print CLIENTCONF "$vpnsettings{'DDEVICE'}-mtu 1500\n"; } + elsif ($vpnsettings{MSSFIX} eq 'on') + { print CLIENTCONF "$vpnsettings{'DDEVICE'}-mtu 1500\n"; } + elsif (($vpnsettings{'PMTU_DISCOVERY'} eq 'yes') || + ($vpnsettings{'PMTU_DISCOVERY'} eq 'maybe') || + ($vpnsettings{'PMTU_DISCOVERY'} eq 'no' )) + { print CLIENTCONF "$vpnsettings{'DDEVICE'}-mtu 1500\n"; } + else + { print CLIENTCONF "$vpnsettings{'DDEVICE'}-mtu $vpnsettings{'DMTU'}\r\n"; } + if ( $vpnsettings{'ENABLED'} eq 'on'){ print CLIENTCONF "remote $vpnsettings{'VPN_IP'} $vpnsettings{'DDEST_PORT'}\r\n"; if ( $vpnsettings{'ENABLED_BLUE'} eq 'on' && (&haveBlueNet())){ @@ -1767,6 +2161,15 @@ else if ($vpnsettings{FRAGMENT} ne '' && $vpnsettings{DPROTOCOL} ne 'tcp' ) { print CLIENTCONF "fragment $vpnsettings{'FRAGMENT'}\r\n"; } + + # Check if a valid operating mode has been choosen and use it. + if (($vpnsettings{'PMTU_DISCOVERY'} eq 'yes') || + ($vpnsettings{'PMTU_DISCOVERY'} eq 'maybe') || + ($vpnsettings{'PMTU_DISCOVERY'} eq 'no' )) { + if(($vpnsettings{MSSFIX} ne 'on') || ($vpnsettings{FRAGMENT} eq '')) { + print CLIENTCONF "mtu-disc $vpnsettings{'PMTU_DISCOVERY'}\n"; + } + } close(CLIENTCONF); $zip->addFile( "$tempdir/$clientovpn", $clientovpn) or die "Can't add file $clientovpn\n"; @@ -1814,10 +2217,41 @@ else } unlink ("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem"); - unlink ("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12"); + unlink ("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12"); + +# A.Marx CCD delete ccd files and routes + + + if (-f "${General::swroot}/ovpn/ccd/$confighash{$cgiparams{'KEY'}}[2]") + { + unlink "${General::swroot}/ovpn/ccd/$confighash{$cgiparams{'KEY'}}[2]"; + } + + &General::readhasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); + foreach my $key (keys %ccdroutehash) { + if ($ccdroutehash{$key}[0] eq $confighash{$cgiparams{'KEY'}}[1]){ + delete $ccdroutehash{$key}; + } + } + &General::writehasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); + + &General::readhasharray("${General::swroot}/ovpn/ccdroute2", \%ccdroute2hash); + foreach my $key (keys %ccdroute2hash) { + if ($ccdroute2hash{$key}[0] eq $confighash{$cgiparams{'KEY'}}[1]){ + delete $ccdroute2hash{$key}; + } + } + &General::writehasharray("${General::swroot}/ovpn/ccdroute2", \%ccdroute2hash); + &writeserverconf; + + +# CCD end + + delete $confighash{$cgiparams{'KEY'}}; my $temp2 = `/usr/bin/openssl ca -gencrl -out ${General::swroot}/ovpn/crls/cacrl.pem -config ${General::swroot}/ovpn/openssl/ovpn.cnf`; &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); + #&writeserverconf(); } else { $errormessage = $Lang::tr{'invalid key'}; @@ -1884,9 +2318,11 @@ else %cgiparams = (); %cahash = (); %confighash = (); + my $disabled; &General::readhash("${General::swroot}/ovpn/settings", \%cgiparams); read_routepushfile; - + + # if ($cgiparams{'CLIENT2CLIENT'} eq '') { # $cgiparams{'CLIENT2CLIENT'} = 'on'; # } @@ -1913,6 +2349,7 @@ ADV_ERROR: $checked{'MSSFIX'}{'off'} = ''; $checked{'MSSFIX'}{'on'} = ''; $checked{'MSSFIX'}{$cgiparams{'MSSFIX'}} = 'CHECKED'; + $checked{'PMTU_DISCOVERY'}{$cgiparams{'PMTU_DISCOVERY'}} = 'checked=\'checked\''; $selected{'LOG_VERB'}{'1'} = ''; $selected{'LOG_VERB'}{'2'} = ''; $selected{'LOG_VERB'}{'3'} = ''; @@ -1926,9 +2363,7 @@ ADV_ERROR: $selected{'LOG_VERB'}{'11'} = ''; $selected{'LOG_VERB'}{'0'} = ''; $selected{'LOG_VERB'}{$cgiparams{'LOG_VERB'}} = 'SELECTED'; - - - + &Header::showhttpheaders(); &Header::openpage($Lang::tr{'status ovpn'}, 1, ''); &Header::openbigbox('100%', 'LEFT', '', $errormessage); @@ -1940,8 +2375,8 @@ ADV_ERROR: } &Header::openbox('100%', 'LEFT', $Lang::tr{'advanced server'}); print <<END - <form method='post' enctype='multipart/form-data'> - <table width='100%'> + <form method='post' enctype='multipart/form-data' disabled> + <table width='100%' border=0> <tr> <td colspan='4'><b>$Lang::tr{'dhcp-options'}</b></td> </tr> @@ -1950,7 +2385,7 @@ ADV_ERROR: </tr> <tr> <td class='base'>Domain</td> - <td><input type='TEXT' name='DHCP_DOMAIN' value='$cgiparams{'DHCP_DOMAIN'}' size='30' /></td> + <td><input type='TEXT' name='DHCP_DOMAIN' value='$cgiparams{'DHCP_DOMAIN'}' size='30' /></td> </tr> <tr> <td class='base'>DNS</td> @@ -1975,7 +2410,7 @@ if ($cgiparams{'ROUTES_PUSH'} ne '') print $cgiparams{'ROUTES_PUSH'}; } -print <<END +print <<END; </textarea></td> </tr> </tr> @@ -1986,7 +2421,7 @@ print <<END <td class'base'><b>$Lang::tr{'misc-options'}</b></td> </tr> <tr> - <td width='20%'></td> <td width='15%'> </td><td width='15%'> </td><td width='50%'></td> + <td width='20%'></td> <td width='15%'> </td><td width='15%'> </td><td width='15%'></td><td width='35%'></td> </tr> <tr> <td class='base'>Client-To-Client</td> @@ -2015,7 +2450,15 @@ print <<END <td class='base'>mssfix</td> <td><input type='checkbox' name='MSSFIX' $checked{'MSSFIX'}{'on'} /></td> <td>Default: on</td> - </tr> + </tr> + + <tr> + <td class='base'>$Lang::tr{'ovpn mtu-disc'}</td> + <td><input type='radio' name='PMTU_DISCOVERY' value='yes' $checked{'PMTU_DISCOVERY'}{'yes'} /> $Lang::tr{'ovpn mtu-disc yes'}</td> + <td><input type='radio' name='PMTU_DISCOVERY' value='maybe' $checked{'PMTU_DISCOVERY'}{'maybe'} /> $Lang::tr{'ovpn mtu-disc maybe'}</td> + <td><input type='radio' name='PMTU_DISCOVERY' value='no' $checked{'PMTU_DISCOVERY'}{'no'} /> $Lang::tr{'ovpn mtu-disc no'}</td> + <td><input type='radio' name='PMTU_DISCOVERY' value='off' $checked{'PMTU_DISCOVERY'}{'off'} /> $Lang::tr{'ovpn mtu-disc off'}</td> + </tr> </table> <!-- @@ -2057,8 +2500,30 @@ print <<END <option value='10' $selected{'LOG_VERB'}{'10'}>10</option> <option value='11' $selected{'LOG_VERB'}{'11'}>11</option> <option value='0' $selected{'LOG_VERB'}{'0'}>0</option></select></td> -</table> -<hr size='1'> +</table><hr> +END + +if ( -e "/var/run/openvpn.pid"){ +print" <br><b><font color='#990000'>$Lang::tr{'attention'}:</b></font><br> + $Lang::tr{'server restart'}<br><br> + <hr>"; + print<<END +<table width='100%'> +<tr> + <td> </td> + <td allign='center'><input type='submit' name='ACTION' value='$Lang::tr{'save-adv-options'}' disabled='disabled' /></td> + <td allign='center'><input type='submit' name='ACTION' value='$Lang::tr{'cancel-adv-options'}' /></td> + <td> </td> +</tr> +</table> +</form> +END +; + + +}else{ + +print<<END <table width='100%'> <tr> <td> </td> @@ -2070,13 +2535,135 @@ print <<END </form> END ; - +} &Header::closebox(); # print "<div align='center'><a href='/cgi-bin/ovpnmain.cgi'>$Lang::tr{'back'}</a></div>"; &Header::closebigbox(); &Header::closepage(); exit(0); + +# A.Marx CCD Add,delete or edit CCD net + +} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'ccd net'} || + $cgiparams{'ACTION'} eq $Lang::tr{'ccd add'} || + $cgiparams{'ACTION'} eq "kill" || + $cgiparams{'ACTION'} eq "edit" || + $cgiparams{'ACTION'} eq 'editsave'){ + &Header::showhttpheaders(); + &Header::openpage($Lang::tr{'ccd net'}, 1, ''); + &Header::openbigbox('100%', 'LEFT', '', ''); + + if ($cgiparams{'ACTION'} eq "kill"){ + &delccdnet($cgiparams{'net'}); + } + + if ($cgiparams{'ACTION'} eq 'editsave'){ + my ($a,$b) =split (/\|/,$cgiparams{'ccdname'}); + if ( $a ne $b){ &modccdnet($a,$b);} + $cgiparams{'ccdname'}=''; + $cgiparams{'ccdsubnet'}=''; + } + + if ($cgiparams{'ACTION'} eq $Lang::tr{'ccd add'}) { + &addccdnet($cgiparams{'ccdname'},$cgiparams{'ccdsubnet'}); + } + if ($errormessage) { + &Header::openbox('100%', 'LEFT', $Lang::tr{'error messages'}); + print "<class name='base'>$errormessage"; + print " </class>"; + &Header::closebox(); + } +if ($cgiparams{'ACTION'} eq "edit"){ + + &Header::openbox('100%', 'LEFT', $Lang::tr{'ccd modify'}); + + print <<END + <table width='100%' border=0> + <tr><form method='post'> + <td width='10%' nowrap='nowrap'>$Lang::tr{'ccd name'}:</td><td><input type='TEXT' name='ccdname' value='$cgiparams{'ccdname'}' /></td> + <td width='8%'>$Lang::tr{'ccd subnet'}:</td><td><input type='TEXT' name='ccdsubnet' value='$cgiparams{'ccdsubnet'}' readonly /></td></tr> + <tr><td colspan='4' align='right'><hr><input type='submit' value='$Lang::tr{'save'}' /><input type='hidden' name='ACTION' value='editsave'/> + <input type='hidden' name='ccdname' value='$cgiparams{'ccdname'}'/><input type='submit' value='$Lang::tr{'cancel'}' /> + </td></tr> + </table></form> +END +; + &Header::closebox(); + + &Header::openbox('100%', 'LEFT',$Lang::tr{'ccd net'} ); + print <<END + <table width='100%' border='0' cellpadding='0' cellspacing='1'> + <tr> + <td class='boldbase' align='center'><b>$Lang::tr{'ccd name'}</td><td class='boldbase' align='center'><b>$Lang::tr{'network'}</td><td class='boldbase' width='15%' align='center'><b>$Lang::tr{'ccd used'}</td><td width='3%'></td><td width='3%'></td></tr> +END +; +} +else{ + if (! -e "/var/run/openvpn.pid"){ + &Header::openbox('100%', 'LEFT', $Lang::tr{'ccd add'}); + print <<END; + <table width='100%' border='0'> + <tr><form method='post'> + <td colspan='4'>$Lang::tr{'ccd hint'}<br><br></td></tr> + <tr> + <td width='10%' nowrap='nwrap'>$Lang::tr{'ccd name'}:</td><td><input type='TEXT' name='ccdname' value='$cgiparams{'ccdname'}' /></td> + <td width='8%'>$Lang::tr{'ccd subnet'}:</td><td><input type='TEXT' name='ccdsubnet' value='$cgiparams{'ccdsubnet'}' /></td></tr> + <tr><td colspan=4><hr /></td></tr><tr> + <td colspan='4' align='right'><input type='hidden' name='ACTION' value='$Lang::tr{'ccd add'}' /><input type='submit' value='$Lang::tr{'add'}' /><input type='hidden' name='DOVPN_SUBNET' value='$cgiparams{'DOVPN_SUBNET'}'/></td></tr> + </table></form> +END + + &Header::closebox(); +} + &Header::openbox('100%', 'LEFT',$Lang::tr{'ccd net'} ); + if ( -e "/var/run/openvpn.pid"){ + print "<b>$Lang::tr{'attention'}:</b><br>"; + print "$Lang::tr{'ccd noaddnet'}<br><hr>"; + } + + print <<END + <table width='100%' border='0' cellpadding='0' cellspacing='1'> + <tr> + <td class='boldbase' align='center' nowrap='nowrap' width='20%'><b>$Lang::tr{'ccd name'}</td><td class='boldbase' align='center' width='8%'><b>$Lang::tr{'network'}</td><td class='boldbase' width='8%' align='center' nowrap='nowrap'><b>$Lang::tr{'ccd used'}</td><td width='1%' align='center'></td><td width='1%' align='center'></td></tr> +END +; +} + my %ccdconfhash=(); + &General::readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); + my @ccdconf=(); + my $count=0; + foreach my $key (sort { uc($ccdconfhash{$a}[0]) cmp uc($ccdconfhash{$b}[0]) } keys %ccdconfhash) { + @ccdconf=($ccdconfhash{$key}[0],$ccdconfhash{$key}[1]); + $count++; + my $ccdhosts = &hostsinnet($ccdconf[0]); + if ($count % 2){ print" <tr bgcolor='$color{'color22'}'>";} + else{ print" <tr bgcolor='$color{'color20'}'>";} + print"<td>$ccdconf[0]</td><td align='center'>$ccdconf[1]</td><td align='center'>$ccdhosts/".(&ccdmaxclients($ccdconf[1])+1)."</td><td>"; +print <<END + <form method='post' /> + <input type='image' src='/images/edit.gif' align='middle' alt=$Lang::tr{'edit'} title=$Lang::tr{'edit'} /> + <input type='hidden' name='ACTION' value='edit'/> + <input type='hidden' name='ccdname' value='$ccdconf[0]' /> + <input type='hidden' name='ccdsubnet' value='$ccdconf[1]' /> + </form></td> + <form method='post' /> + <td><input type='hidden' name='ACTION' value='kill'/> + <input type='hidden' name='number' value='$count' /> + <input type='hidden' name='net' value='$ccdconf[0]' /> + <input type='image' src='/images/delete.gif' align='middle' alt=$Lang::tr{'remove'} title=$Lang::tr{'remove'} /></form></td></tr> +END +; + } + print "</table></form>"; + &Header::closebox(); + print "<div align='center'><a href='/cgi-bin/ovpnmain.cgi'>$Lang::tr{'back'}</a></div>"; + &Header::closebigbox(); + &Header::closepage(); + exit(0); + +#END CCD + ### ### Openvpn Connections Statistics ### @@ -2284,7 +2871,7 @@ if ( -s "${General::swroot}/ovpn/settings") { print <<END <b>$Lang::tr{'connection type'}:</b><br /> - <table><form method='post' ENCTYPE="multipart/form-data"> + <table border='0' width='100%'><form method='post' ENCTYPE="multipart/form-data"> <tr><td><input type='radio' name='TYPE' value='host' checked /></td> <td class='base'>$Lang::tr{'host to net vpn'}</td></tr> <tr><td><input type='radio' name='TYPE' value='net' /></td> @@ -2293,21 +2880,21 @@ if ( -s "${General::swroot}/ovpn/settings") { <td class='base'>$Lang::tr{'net to net vpn'} (Upload Client Package)</td></tr> <tr><td> </td><td class='base'><input type='file' name='FH' size='30'></td></tr> <tr><td> </td><td>Import Connection Name <img src='/blob.gif' /></td></tr> - <tr><td> </td><td class='base'><input type='text' name='n2nname' size='30'><td class='base'>Default : Client Packagename</td></td></tr> + <tr><td> </td><td class='base'><input type='text' name='n2nname' size='30'>Default : Client Packagename</td></tr> <tr><td colspan='3'><hr /></td></tr> - <tr><td align='center'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td></tr> - <tr><td> </td></tr> + <tr><td align='right' colspan='3'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td></tr> <tr><td class='base' colspan='3' align='left'><img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td></tr> </form></table> END ; + } else { print <<END <b>$Lang::tr{'connection type'}:</b><br /> - <table><form method='post' ENCTYPE="multipart/form-data"> + <table border='0' width='100%'><form method='post' ENCTYPE="multipart/form-data"> <tr><td><input type='radio' name='TYPE' value='host' checked /></td> <td class='base'>$Lang::tr{'host to net vpn'}</td></tr> - <tr><td align='center'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td></tr> + <tr><td align='right' colspan'3'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td></tr> </form></table> END ; @@ -2450,6 +3037,7 @@ END my $complzoactive; my $mssfixactive; my $n2nfragment; +my @n2nmtudisc = split(/ /, (grep { /^mtu-disc/ } @firen2nconf)[0]);; my @n2nproto2 = split(/ /, (grep { /^proto/ } @firen2nconf)[0]); my @n2nproto = split(/-/, $n2nproto2[1]); my @n2nport = split(/ /, (grep { /^port/ } @firen2nconf)[0]); @@ -2484,6 +3072,7 @@ $n2nremsub[2] =~ s/\n|\r//g; $n2nlocalsub[2] =~ s/\n|\r//g; $n2nfragment[1] =~ s/\n|\r//g; $n2nmgmt[2] =~ s/\n|\r//g; +$n2nmtudisc[1] =~ s/\n|\r//g; chomp ($complzoactive); chomp ($mssfixactive); @@ -2537,26 +3126,28 @@ foreach my $dkey (keys %confighash) { $key = &General::findhasharraykey (\%confighash); - foreach my $i (0 .. 31) { $confighash{$key}[$i] = "";} + foreach my $i (0 .. 39) { $confighash{$key}[$i] = "";} + $confighash{$key}[0] = 'off'; $confighash{$key}[1] = $n2nname[0]; - $confighash{$key}[2] = $n2nname[0]; + $confighash{$key}[2] = $n2nname[0]; $confighash{$key}[3] = 'net'; $confighash{$key}[4] = 'cert'; $confighash{$key}[6] = 'client'; $confighash{$key}[8] = $n2nlocalsub[2]; - $confighash{$key}[10] = $n2nremote[1]; - $confighash{$key}[11] = "$n2nremsub[1]/$n2nremsub[2]"; + $confighash{$key}[10] = $n2nremote[1]; + $confighash{$key}[11] = "$n2nremsub[1]/$n2nremsub[2]"; $confighash{$key}[22] = $n2nmgmt[2]; - $confighash{$key}[23] = $mssfixactive; + $confighash{$key}[23] = $mssfixactive; $confighash{$key}[24] = $n2nfragment[1]; - $confighash{$key}[25] = 'IPFire n2n Client'; + $confighash{$key}[25] = 'IPFire n2n Client'; $confighash{$key}[26] = 'red'; - $confighash{$key}[27] = "$n2novpnsub[0].$n2novpnsub[1].$n2novpnsub[2].0/255.255.255.0"; - $confighash{$key}[28] = $n2nproto[0]; - $confighash{$key}[29] = $n2nport[1]; - $confighash{$key}[30] = $complzoactive; - $confighash{$key}[31] = $n2ntunmtu[1]; + $confighash{$key}[27] = "$n2novpnsub[0].$n2novpnsub[1].$n2novpnsub[2].0/255.255.255.0"; + $confighash{$key}[28] = $n2nproto[0]; + $confighash{$key}[29] = $n2nport[1]; + $confighash{$key}[30] = $complzoactive; + $confighash{$key}[31] = $n2ntunmtu[1]; + $confighash{$key}[38] = $n2nmtudisc[1]; &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); @@ -2594,6 +3185,7 @@ foreach my $dkey (keys %confighash) { <tr><td class='boldbase' nowrap='nowrap'>MSSFIX </td><td><b>$confighash{$key}[23]</b></td></tr> <tr><td class='boldbase' nowrap='nowrap'>Fragment </td><td><b>$confighash{$key}[24]</b></td></tr> <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'MTU'}</td><td><b>$confighash{$key}[31]</b></td></tr> + <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn mtu-disc'}</td><td><b>$confighash{$key}[38]</b></td></tr> <tr><td class='boldbase' nowrap='nowrap'>Management Port </td><td><b>$confighash{$key}[22]</b></td></tr> <tr><td> </td><td> </td></tr> </table> @@ -2655,45 +3247,216 @@ if ($confighash{$cgiparams{'KEY'}}) { } elsif (($cgiparams{'ACTION'} eq $Lang::tr{'add'}) || ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) || ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'ADVANCED'} eq '')) { - + &General::readhash("${General::swroot}/ovpn/settings", \%vpnsettings); &General::readhasharray("${General::swroot}/ovpn/caconfig", \%cahash); &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) { - if (! $confighash{$cgiparams{'KEY'}}[0]) { - $errormessage = $Lang::tr{'invalid key'}; - goto VPNCONF_END; - } - $cgiparams{'ENABLED'} = $confighash{$cgiparams{'KEY'}}[0]; - $cgiparams{'NAME'} = $confighash{$cgiparams{'KEY'}}[1]; - $cgiparams{'TYPE'} = $confighash{$cgiparams{'KEY'}}[3]; - $cgiparams{'AUTH'} = $confighash{$cgiparams{'KEY'}}[4]; - $cgiparams{'PSK'} = $confighash{$cgiparams{'KEY'}}[5]; - $cgiparams{'SIDE'} = $confighash{$cgiparams{'KEY'}}[6]; - $cgiparams{'LOCAL_SUBNET'} = $confighash{$cgiparams{'KEY'}}[8]; - $cgiparams{'REMOTE'} = $confighash{$cgiparams{'KEY'}}[10]; - $cgiparams{'REMOTE_SUBNET'} = $confighash{$cgiparams{'KEY'}}[11]; -# n2n m.a.d new fields - $cgiparams{'OVPN_MGMT'} = $confighash{$cgiparams{'KEY'}}[22]; - $cgiparams{'MSSFIX'} = $confighash{$cgiparams{'KEY'}}[23]; - $cgiparams{'FRAGMENT'} = $confighash{$cgiparams{'KEY'}}[24]; - $cgiparams{'REMARK'} = $confighash{$cgiparams{'KEY'}}[25]; - $cgiparams{'INTERFACE'} = $confighash{$cgiparams{'KEY'}}[26]; -#new fields - $cgiparams{'OVPN_SUBNET'} = $confighash{$cgiparams{'KEY'}}[27]; - $cgiparams{'PROTOCOL'} = $confighash{$cgiparams{'KEY'}}[28]; - $cgiparams{'DEST_PORT'} = $confighash{$cgiparams{'KEY'}}[29]; - $cgiparams{'COMPLZO'} = $confighash{$cgiparams{'KEY'}}[30]; - $cgiparams{'MTU'} = $confighash{$cgiparams{'KEY'}}[31]; - -#new fields -#ab hiere error uebernehmen - - } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) { + if (! $confighash{$cgiparams{'KEY'}}[0]) { + $errormessage = $Lang::tr{'invalid key'}; + goto VPNCONF_END; + } + $cgiparams{'ENABLED'} = $confighash{$cgiparams{'KEY'}}[0]; + $cgiparams{'NAME'} = $confighash{$cgiparams{'KEY'}}[1]; + $cgiparams{'TYPE'} = $confighash{$cgiparams{'KEY'}}[3]; + $cgiparams{'AUTH'} = $confighash{$cgiparams{'KEY'}}[4]; + $cgiparams{'PSK'} = $confighash{$cgiparams{'KEY'}}[5]; + $cgiparams{'SIDE'} = $confighash{$cgiparams{'KEY'}}[6]; + $cgiparams{'LOCAL_SUBNET'} = $confighash{$cgiparams{'KEY'}}[8]; + $cgiparams{'REMOTE'} = $confighash{$cgiparams{'KEY'}}[10]; + $cgiparams{'REMOTE_SUBNET'} = $confighash{$cgiparams{'KEY'}}[11]; + $cgiparams{'OVPN_MGMT'} = $confighash{$cgiparams{'KEY'}}[22]; + $cgiparams{'MSSFIX'} = $confighash{$cgiparams{'KEY'}}[23]; + $cgiparams{'FRAGMENT'} = $confighash{$cgiparams{'KEY'}}[24]; + $cgiparams{'REMARK'} = $confighash{$cgiparams{'KEY'}}[25]; + $cgiparams{'INTERFACE'} = $confighash{$cgiparams{'KEY'}}[26]; + $cgiparams{'OVPN_SUBNET'} = $confighash{$cgiparams{'KEY'}}[27]; + $cgiparams{'PROTOCOL'} = $confighash{$cgiparams{'KEY'}}[28]; + $cgiparams{'DEST_PORT'} = $confighash{$cgiparams{'KEY'}}[29]; + $cgiparams{'COMPLZO'} = $confighash{$cgiparams{'KEY'}}[30]; + $cgiparams{'MTU'} = $confighash{$cgiparams{'KEY'}}[31]; + $cgiparams{'CHECK1'} = $confighash{$cgiparams{'KEY'}}[32]; + $name=$cgiparams{'CHECK1'} ; + $cgiparams{$name} = $confighash{$cgiparams{'KEY'}}[33]; + $cgiparams{'RG'} = $confighash{$cgiparams{'KEY'}}[34]; + $cgiparams{'CCD_DNS1'} = $confighash{$cgiparams{'KEY'}}[35]; + $cgiparams{'CCD_DNS2'} = $confighash{$cgiparams{'KEY'}}[36]; + $cgiparams{'CCD_WINS'} = $confighash{$cgiparams{'KEY'}}[37]; + $cgiparams{'PMTU_DISCOVERY'} = $confighash{$cgiparams{'KEY'}}[38]; + } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) { $cgiparams{'REMARK'} = &Header::cleanhtml($cgiparams{'REMARK'}); - if ($cgiparams{'TYPE'} !~ /^(host|net)$/) { +#A.Marx CCD check iroute field and convert it to decimal +if ($cgiparams{'TYPE'} eq 'host') { + my @temp=(); + my %ccdroutehash=(); + my $keypoint=0; + my $ip; + my $cidr; + if ($cgiparams{'IR'} ne ''){ + @temp = split("\n",$cgiparams{'IR'}); + &General::readhasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); + #find key to use + foreach my $key (keys %ccdroutehash) { + if ($ccdroutehash{$key}[0] eq $cgiparams{'NAME'}) { + $keypoint=$key; + delete $ccdroutehash{$key}; + }else{ + $keypoint = &General::findhasharraykey (\%ccdroutehash); + } + } + $ccdroutehash{$keypoint}[0]=$cgiparams{'NAME'}; + my $i=1; + my $val=0; + foreach $val (@temp){ + chomp($val); + $val=~s/\s*$//g; + #check if iroute exists in ccdroute or if new iroute is part of an existing one + foreach my $key (keys %ccdroutehash) { + foreach my $oldiroute ( 1 .. $#{$ccdroutehash{$key}}){ + if ($ccdroutehash{$key}[$oldiroute] eq "$val") { + $errormessage=$errormessage.$Lang::tr{'ccd err irouteexist'}; + goto VPNCONF_ERROR; + } + my ($ip1,$cidr1) = split (/\//, $val); + $ip1 = &General::getnetworkip($ip1,&General::iporsubtocidr($cidr1)); + my ($ip2,$cidr2) = split (/\//, $ccdroutehash{$key}[$oldiroute]); + if (&General::IpInSubnet ($ip1,$ip2,$cidr2)){ + $errormessage=$errormessage.$Lang::tr{'ccd err irouteexist'}; + goto VPNCONF_ERROR; + } + + } + } + if (!&General::validipandmask($val)){ + $errormessage=$errormessage."Route ".$Lang::tr{'ccd invalid'}." ($val)"; + goto VPNCONF_ERROR; + }else{ + ($ip,$cidr) = split(/\//,$val); + $ip=&General::getnetworkip($ip,&General::iporsubtocidr($cidr)); + $cidr=&General::iporsubtodec($cidr); + $ccdroutehash{$keypoint}[$i] = $ip."/".$cidr; + + } + + #check for existing network IP's + if (&General::IpInSubnet ($ip,$netsettings{GREEN_NETADDRESS},$netsettings{GREEN_NETMASK}) && $netsettings{GREEN_NETADDRESS} ne '0.0.0.0') + { + $errormessage=$Lang::tr{'ccd err green'}; + goto VPNCONF_ERROR; + }elsif(&General::IpInSubnet ($ip,$netsettings{RED_NETADDRESS},$netsettings{RED_NETMASK}) && $netsettings{RED_NETADDRESS} ne '0.0.0.0') + { + $errormessage=$Lang::tr{'ccd err red'}; + goto VPNCONF_ERROR; + }elsif(&General::IpInSubnet ($ip,$netsettings{BLUE_NETADDRESS},$netsettings{BLUE_NETMASK}) && $netsettings{BLUE_NETADDRESS} ne '0.0.0.0' && $netsettings{BLUE_NETADDRESS} gt '') + { + $errormessage=$Lang::tr{'ccd err blue'}; + goto VPNCONF_ERROR; + }elsif(&General::IpInSubnet ($ip,$netsettings{ORANGE_NETADDRESS},$netsettings{ORANGE_NETMASK}) && $netsettings{ORANGE_NETADDRESS} ne '0.0.0.0' && $netsettings{ORANGE_NETADDRESS} gt '' ) + { + $errormessage=$Lang::tr{'ccd err orange'}; + goto VPNCONF_ERROR; + } + + if (&General::validipandmask($val)){ + $ccdroutehash{$keypoint}[$i] = $ip."/".$cidr; + }else{ + $errormessage=$errormessage."Route ".$Lang::tr{'ccd invalid'}." ($ip/$cidr)"; + goto VPNCONF_ERROR; + } + $i++; + } + &General::writehasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); + &writeserverconf; + }else{ + &General::readhasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); + foreach my $key (keys %ccdroutehash) { + if ($ccdroutehash{$key}[0] eq $cgiparams{'NAME'}) { + delete $ccdroutehash{$key}; + &General::writehasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); + &writeserverconf; + } + } + } + undef @temp; + #check route field and convert it to decimal + my $val=0; + my $i=1; + &General::readhasharray("${General::swroot}/ovpn/ccdroute2", \%ccdroute2hash); + #find key to use + foreach my $key (keys %ccdroute2hash) { + if ($ccdroute2hash{$key}[0] eq $cgiparams{'NAME'}) { + $keypoint=$key; + delete $ccdroute2hash{$key}; + }else{ + $keypoint = &General::findhasharraykey (\%ccdroute2hash); + &General::writehasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); + &writeserverconf; + } + } + $ccdroute2hash{$keypoint}[0]=$cgiparams{'NAME'}; + if ($cgiparams{'IFROUTE'} eq ''){$cgiparams{'IFROUTE'} = $Lang::tr{'ccd none'};} + @temp = split(/\|/,$cgiparams{'IFROUTE'}); + my %ownnet=(); + &General::readhash("${General::swroot}/ethernet/settings", \%ownnet); + foreach $val (@temp){ + chomp($val); + $val=~s/\s*$//g; + if ($val eq $Lang::tr{'green'}) + { + $val=$ownnet{GREEN_NETADDRESS}."/".$ownnet{GREEN_NETMASK}; + } + if ($val eq $Lang::tr{'blue'}) + { + $val=$ownnet{BLUE_NETADDRESS}."/".$ownnet{BLUE_NETMASK}; + } + if ($val eq $Lang::tr{'orange'}) + { + $val=$ownnet{ORANGE_NETADDRESS}."/".$ownnet{ORANGE_NETMASK}; + } + my ($ip,$cidr) = split (/\//, $val); + + if ($val ne $Lang::tr{'ccd none'}) + { + if (! &check_routes_push($val)){$errormessage=$errormessage."Route $val ".$Lang::tr{'ccd err routeovpn2'}." ($val)";goto VPNCONF_ERROR;} + if (! &check_ccdroute($val)){$errormessage=$errormessage."<br>Route $val ".$Lang::tr{'ccd err inuse'}." ($val)" ;goto VPNCONF_ERROR;} + if (! &check_ccdconf($val)){$errormessage=$errormessage."<br>Route $val ".$Lang::tr{'ccd err routeovpn'}." ($val)";goto VPNCONF_ERROR;} + if (&General::validipandmask($val)){ + $val=$ip."/".&General::iporsubtodec($cidr); + $ccdroute2hash{$keypoint}[$i] = $val; + }else{ + $errormessage=$errormessage."Route ".$Lang::tr{'ccd invalid'}." ($val)"; + goto VPNCONF_ERROR; + } + }else{ + $ccdroute2hash{$keypoint}[$i]=''; + } + $i++; + } + &General::writehasharray("${General::swroot}/ovpn/ccdroute2", \%ccdroute2hash); + + #check dns1 ip + if ($cgiparams{'CCD_DNS1'} ne '' && ! &General::validip($cgiparams{'CCD_DNS1'})) { + $errormessage=$errormessage."<br>".$Lang::tr{'invalid input for dhcp dns'}." 1"; + goto VPNCONF_ERROR; + } + #check dns2 ip + if ($cgiparams{'CCD_DNS2'} ne '' && ! &General::validip($cgiparams{'CCD_DNS2'})) { + $errormessage=$errormessage."<br>".$Lang::tr{'invalid input for dhcp dns'}." 2"; + goto VPNCONF_ERROR; + } + #check wins ip + if ($cgiparams{'CCD_WINS'} ne '' && ! &General::validip($cgiparams{'CCD_WINS'})) { + $errormessage=$errormessage."<br>".$Lang::tr{'invalid input for dhcp wins'}; + goto VPNCONF_ERROR; + } +} + +#CCD End + + + if ($cgiparams{'TYPE'} !~ /^(host|net)$/) { $errormessage = $Lang::tr{'connection type is invalid'}; if ($cgiparams{'TYPE'} eq 'net') { unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; @@ -2771,6 +3534,22 @@ if ($cgiparams{'TYPE'} eq 'net') { goto VPNCONF_ERROR; } + if ($cgiparams{'PMTU_DISCOVERY'} ne 'off') { + if (($cgiparams{'FRAGMENT'} ne '') || ($cgiparams{'MSSFIX'} eq 'on')) { + $errormessage = $Lang::tr{'ovpn mtu-disc with mssfix or fragment'}; + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + goto VPNCONF_ERROR; + } + } + + if (($cgiparams{'PMTU_DISCOVERY'} ne 'off') && ($cgiparams{'MTU'} ne '1500')) { + $errormessage = $Lang::tr{'ovpn mtu-disc and mtu not 1500'}; + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + goto VPNCONF_ERROR; + } + if ( &validdotmask ($cgiparams{'LOCAL_SUBNET'})) { $errormessage = $Lang::tr{'openvpn prefix local subnet'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; @@ -3143,45 +3922,124 @@ if ($cgiparams{'TYPE'} eq 'net') { # Save the config my $key = $cgiparams{'KEY'}; + if (! $key) { $key = &General::findhasharraykey (\%confighash); - foreach my $i (0 .. 31) { $confighash{$key}[$i] = "";} + foreach my $i (0 .. 38) { $confighash{$key}[$i] = "";} } - $confighash{$key}[0] = $cgiparams{'ENABLED'}; - $confighash{$key}[1] = $cgiparams{'NAME'}; + $confighash{$key}[0] = $cgiparams{'ENABLED'}; + $confighash{$key}[1] = $cgiparams{'NAME'}; if ((! $cgiparams{'KEY'}) && $cgiparams{'AUTH'} ne 'psk') { - $confighash{$key}[2] = $cgiparams{'CERT_NAME'}; + $confighash{$key}[2] = $cgiparams{'CERT_NAME'}; } - $confighash{$key}[3] = $cgiparams{'TYPE'}; + + $confighash{$key}[3] = $cgiparams{'TYPE'}; if ($cgiparams{'AUTH'} eq 'psk') { - $confighash{$key}[4] = 'psk'; - $confighash{$key}[5] = $cgiparams{'PSK'}; + $confighash{$key}[4] = 'psk'; + $confighash{$key}[5] = $cgiparams{'PSK'}; } else { - $confighash{$key}[4] = 'cert'; + $confighash{$key}[4] = 'cert'; } if ($cgiparams{'TYPE'} eq 'net') { - $confighash{$key}[6] = $cgiparams{'SIDE'}; - $confighash{$key}[11] = $cgiparams{'REMOTE_SUBNET'}; + $confighash{$key}[6] = $cgiparams{'SIDE'}; + $confighash{$key}[11] = $cgiparams{'REMOTE_SUBNET'}; } - $confighash{$key}[8] = $cgiparams{'LOCAL_SUBNET'}; - $confighash{$key}[10] = $cgiparams{'REMOTE'}; + $confighash{$key}[8] = $cgiparams{'LOCAL_SUBNET'}; + $confighash{$key}[10] = $cgiparams{'REMOTE'}; if ($cgiparams{'OVPN_MGMT'} eq '') { - $confighash{$key}[22] = $confighash{$key}[29]; + $confighash{$key}[22] = $confighash{$key}[29]; } else { - $confighash{$key}[22] = $cgiparams{'OVPN_MGMT'}; + $confighash{$key}[22] = $cgiparams{'OVPN_MGMT'}; } - $confighash{$key}[23] = $cgiparams{'MSSFIX'}; - $confighash{$key}[24] = $cgiparams{'FRAGMENT'}; - $confighash{$key}[25] = $cgiparams{'REMARK'}; - $confighash{$key}[26] = $cgiparams{'INTERFACE'}; + $confighash{$key}[23] = $cgiparams{'MSSFIX'}; + $confighash{$key}[24] = $cgiparams{'FRAGMENT'}; + $confighash{$key}[25] = $cgiparams{'REMARK'}; + $confighash{$key}[26] = $cgiparams{'INTERFACE'}; # new fields - $confighash{$key}[27] = $cgiparams{'OVPN_SUBNET'}; - $confighash{$key}[28] = $cgiparams{'PROTOCOL'}; - $confighash{$key}[29] = $cgiparams{'DEST_PORT'}; - $confighash{$key}[30] = $cgiparams{'COMPLZO'}; - $confighash{$key}[31] = $cgiparams{'MTU'}; -# new fileds + $confighash{$key}[27] = $cgiparams{'OVPN_SUBNET'}; + $confighash{$key}[28] = $cgiparams{'PROTOCOL'}; + $confighash{$key}[29] = $cgiparams{'DEST_PORT'}; + $confighash{$key}[30] = $cgiparams{'COMPLZO'}; + $confighash{$key}[31] = $cgiparams{'MTU'}; + $confighash{$key}[32] = $cgiparams{'CHECK1'}; + $name=$cgiparams{'CHECK1'}; + $confighash{$key}[33] = $cgiparams{$name}; + $confighash{$key}[34] = $cgiparams{'RG'}; + $confighash{$key}[35] = $cgiparams{'CCD_DNS1'}; + $confighash{$key}[36] = $cgiparams{'CCD_DNS2'}; + $confighash{$key}[37] = $cgiparams{'CCD_WINS'}; + $confighash{$key}[38] = $cgiparams{'PMTU_DISCOVERY'}; + + &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); + + if ($cgiparams{'CHECK1'} ){ + + my ($ccdip,$ccdsub)=split "/",$cgiparams{$name}; + my ($a,$b,$c,$d) = split (/\./,$ccdip); + if ( -e "${General::swroot}/ovpn/ccd/$confighash{$key}[2]"){ + unlink "${General::swroot}/ovpn/ccd/$cgiparams{'CERT_NAME'}"; + } + open ( CCDRWCONF,'>',"${General::swroot}/ovpn/ccd/$confighash{$key}[2]") or die "Unable to create clientconfigfile $!"; + print CCDRWCONF "# OpenVPN clientconfig from ccd extension by Copymaster#\n\n"; + if($cgiparams{'CHECK1'} eq 'dynamic'){ + print CCDRWCONF "#This client uses the dynamic pool\n"; + }else{ + print CCDRWCONF "#Ip address client and server\n"; + print CCDRWCONF "ifconfig-push $ccdip ".&General::getlastip($ccdip,1)."\n"; + } + if ($confighash{$key}[34] eq 'on'){ + print CCDRWCONF "\n#Redirect Gateway: \n#All IP traffic is redirected through the vpn \n"; + print CCDRWCONF "push redirect-gateway\n"; + } + &General::readhasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); + if ($cgiparams{'IR'} ne ''){ + print CCDRWCONF "\n#Client routes these networks (behind Client)\n"; + foreach my $key (keys %ccdroutehash){ + if ($ccdroutehash{$key}[0] eq $cgiparams{'NAME'}){ + foreach my $i ( 1 .. $#{$ccdroutehash{$key}}){ + my ($a,$b)=split (/\//,$ccdroutehash{$key}[$i]); + print CCDRWCONF "iroute $a $b\n"; + } + } + } + } + if ($cgiparams{'IFROUTE'} eq $Lang::tr{'ccd none'} ){$cgiparams{'IFROUTE'}='';} + if ($cgiparams{'IFROUTE'} ne ''){ + print CCDRWCONF "\n#Client gets routes to these networks (behind IPFire)\n"; + foreach my $key (keys %ccdroute2hash){ + if ($ccdroute2hash{$key}[0] eq $cgiparams{'NAME'}){ + foreach my $i ( 1 .. $#{$ccdroute2hash{$key}}){ + if($ccdroute2hash{$key}[$i] eq $Lang::tr{'blue'}){ + my %blue=(); + &General::readhash("${General::swroot}/ethernet/settings", \%blue); + print CCDRWCONF "push \"route $blue{BLUE_ADDRESS} $blue{BLUE_NETMASK}\n"; + }elsif($ccdroute2hash{$key}[$i] eq $Lang::tr{'orange'}){ + my %orange=(); + &General::readhash("${General::swroot}/ethernet/settings", \%orange); + print CCDRWCONF "push \"route $orange{ORANGE_ADDRESS} $orange{ORANGE_NETMASK}\n"; + }else{ + my ($a,$b)=split (/\//,$ccdroute2hash{$key}[$i]); + print CCDRWCONF "push \"route $a $b\"\n"; + } + } + } + } + } + if(($cgiparams{'CCD_DNS1'} eq '') && ($cgiparams{'CCD_DNS1'} ne '')){ $cgiparams{'CCD_DNS1'} = $cgiparams{'CCD_DNS2'};$cgiparams{'CCD_DNS2'}='';} + if($cgiparams{'CCD_DNS1'} ne ''){ + print CCDRWCONF "\n#Client gets these nameservers\n"; + print CCDRWCONF "push \"dhcp-option DNS $cgiparams{'CCD_DNS1'}\" \n"; + } + if($cgiparams{'CCD_DNS2'} ne ''){ + print CCDRWCONF "push \"dhcp-option DNS $cgiparams{'CCD_DNS2'}\" \n"; + } + if($cgiparams{'CCD_WINS'} ne ''){ + print CCDRWCONF "\n#Client gets this WINS server\n"; + print CCDRWCONF "push \"dhcp-option WINS $cgiparams{'CCD_WINS'}\" \n"; + } + close CCDRWCONF; + } ### # m.a.d n2n begin @@ -3221,6 +4079,7 @@ if ($cgiparams{'TYPE'} eq 'net') { ### $cgiparams{'MSSFIX'} = 'on'; $cgiparams{'FRAGMENT'} = '1300'; + $cgiparams{'PMTU_DISCOVERY'} = 'off'; ### # m.a.d n2n end ### @@ -3280,6 +4139,8 @@ if ($cgiparams{'TYPE'} eq 'net') { $checked{'MSSFIX'}{'on'} = ''; $checked{'MSSFIX'}{$cgiparams{'MSSFIX'}} = 'CHECKED'; + $checked{'PMTU_DISCOVERY'}{$cgiparams{'PMTU_DISCOVERY'}} = 'checked=\'checked\''; + if (1) { &Header::showhttpheaders(); @@ -3308,12 +4169,17 @@ if ($cgiparams{'TYPE'} eq 'net') { } &Header::openbox('100%', 'LEFT', "$Lang::tr{'connection'}:"); - print "<table width='100%'>\n"; - print "<tr><td width='25%' class='boldbase'>$Lang::tr{'name'}:</td>"; + print "<table width='100%' border='0'>\n"; + + + + print "<tr><td width='14%' class='boldbase'>$Lang::tr{'name'}: </td>"; + if ($cgiparams{'TYPE'} eq 'host') { if ($cgiparams{'KEY'}) { - print "<td width='35%' class='base'><input type='hidden' name='NAME' value='$cgiparams{'NAME'}' />$cgiparams{'NAME'}</td>\n"; + print "<td width='35%' class='base'><input type='hidden' name='NAME' value='$cgiparams{'NAME'}' />$cgiparams{'NAME'}</td>"; } else { + print "<td width='35%'><input type='text' name='NAME' value='$cgiparams{'NAME'}' maxlength='20' size='30' /></td>"; } # print "<tr><td>$Lang::tr{'interface'}</td>"; @@ -3333,6 +4199,9 @@ if ($cgiparams{'TYPE'} eq 'net') { } else { print "<td width='25%'><input type='text' name='NAME' value='$cgiparams{'NAME'}' maxlength='20' /></td>"; } + + + print <<END <td width='25%'> </td> <td width='25%'> </td></tr> @@ -3373,47 +4242,73 @@ if ($cgiparams{'TYPE'} eq 'net') { <td> <input type='TEXT' name='OVPN_MGMT' VALUE='$cgiparams{'OVPN_MGMT'}'size='5' /></td> <td colspan='2'>$Lang::tr{'openvpn default'}: <span class="base">$Lang::tr{'destination port'}</span></td> + <tr> + <td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn mtu-disc'}</td> + <td colspan='3'> + <input type='radio' name='PMTU_DISCOVERY' value='yes' $checked{'PMTU_DISCOVERY'}{'yes'} /> $Lang::tr{'ovpn mtu-disc yes'} + <input type='radio' name='PMTU_DISCOVERY' value='maybe' $checked{'PMTU_DISCOVERY'}{'maybe'} /> $Lang::tr{'ovpn mtu-disc maybe'} + <input type='radio' name='PMTU_DISCOVERY' value='no' $checked{'PMTU_DISCOVERY'}{'no'} /> $Lang::tr{'ovpn mtu-disc no'} + <input type='radio' name='PMTU_DISCOVERY' value='off' $checked{'PMTU_DISCOVERY'}{'off'} /> $Lang::tr{'ovpn mtu-disc off'} + </td> + </tr> + END - ; +; } - +#jumper print "<tr><td class='boldbase'>$Lang::tr{'remark title'} <img src='/blob.gif' /></td>"; - print "<td colspan='3'><input type='text' name='REMARK' value='$cgiparams{'REMARK'}' size='55' maxlength='50' /></td></tr>"; + print "<td colspan='3'><input type='text' name='REMARK' value='$cgiparams{'REMARK'}' size='55' maxlength='50' /></td></tr></table>"; if ($cgiparams{'TYPE'} eq 'host') { + print "<tr><td>$Lang::tr{'enabled'} <input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td>"; + } - print "<tr><td>$Lang::tr{'enabled'} <input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td>\n"; - } - -# if ($cgiparams{'KEY'}) { -# print "<td colspan='3'> </td></tr></table>"; -# } else { -# print "<td colspan='3'><input type='checkbox' name='EDIT_ADVANCED' $checked{'EDIT_ADVANCED'}{'on'} /> $Lang::tr{'edit advanced settings when done'}</tr></table>"; -# } -# }else{ - print "<td colspan='3'> </td></tr></table>"; -# } - - - + print"</tr></table><br><br>"; +#A.Marx CCD new client +if ($cgiparams{'TYPE'} eq 'host') { + print "<table border='0' width='100%' cellspacing='1' cellpadding='0'><tr><td colspan='3'><hr><br><b>$Lang::tr{'ccd choose net'}</td></tr><tr><td height='20' colspan='3'></td></tr>"; + my %vpnnet=(); + my $vpnip; + &General::readhash("${General::swroot}/ovpn/settings", \%vpnnet); + $vpnip=$vpnnet{'DOVPN_SUBNET'}; + &General::readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); + my @ccdconf=(); + my $count=0; + my $checked; + $checked{'check1'}{'off'} = ''; + $checked{'check1'}{'on'} = ''; + $checked{'check1'}{$cgiparams{'CHECK1'}} = 'CHECKED'; + print"<tr><td align='center' width='1%' valign='top'><input type='radio' name='CHECK1' value='dynamic' checked /></td><td align='left' valign='top' width='35%'>$Lang::tr{'ccd dynrange'} ($vpnip)</td><td width='30%'>"; + print"</td></tr></table><br><br>"; + my $name=$cgiparams{'CHECK1'}; + $checked{'RG'}{$cgiparams{'RG'}} = 'CHECKED'; + + if (! -z "${General::swroot}/ovpn/ccd.conf"){ + print"<table border='0' width='100%' cellspacing='1' cellpadding='0'><tr><td width='1%'></td><td width='30%' class='boldbase' align='center'><b>$Lang::tr{'ccd name'}</td><td width='15%' class='boldbase' align='center'><b>$Lang::tr{'network'}</td><td class='boldbase' align='center' width='18%'><b>$Lang::tr{'ccd clientip'}</td></tr>"; + foreach my $key (sort { uc($ccdconfhash{$a}[0]) cmp uc($ccdconfhash{$b}[0]) } keys %ccdconfhash) { + $count++; + @ccdconf=($ccdconfhash{$key}[0],$ccdconfhash{$key}[1]); + if ($count % 2){print"<tr bgcolor='$color{'color22'}'>";}else{print"<tr bgcolor='$color{'color20'}'>";} + print"<td align='center' width='1%'><input type='radio' name='CHECK1' value='$ccdconf[0]' $checked{'check1'}{$ccdconf[0]}/></td><td>$ccdconf[0]</td><td width='40%' align='center'>$ccdconf[1]</td><td align='left' width='10%'>"; + &fillselectbox($ccdconf[1],$ccdconf[0],$cgiparams{$name}); + print"</td></tr>"; + } + print "</table><br><br><hr><br><br>"; + } +} +# ccd end &Header::closebox(); - if ($cgiparams{'KEY'} && $cgiparams{'AUTH'} eq 'psk') { - # &Header::openbox('100%', 'LEFT', $Lang::tr{'authentication'}); - # print <<END - # <table width='100%' cellpadding='0' cellspacing='5' border='0'> - # <tr><td class='base' width='50%'>$Lang::tr{'use a pre-shared key'}</td> - # <td class='base' width='50%'><input type='text' name='PSK' size='30' value='$cgiparams{'PSK'}' /></td></tr> - # </table> -END - # ; - # &Header::closebox(); - } elsif (! $cgiparams{'KEY'}) { + + } elsif (! $cgiparams{'KEY'}) { + + my $disabled=''; my $cakeydisabled=''; my $cacrtdisabled=''; if ( ! -f "${General::swroot}/ovpn/ca/cakey.pem" ) { $cakeydisabled = "disabled='disabled'" } else { $cakeydisabled = "" }; if ( ! -f "${General::swroot}/ovpn/ca/cacert.pem" ) { $cacrtdisabled = "disabled='disabled'" } else { $cacrtdisabled = "" }; + &Header::openbox('100%', 'LEFT', $Lang::tr{'authentication'}); @@ -3510,8 +4405,127 @@ END ### ; &Header::closebox(); + } +#A.Marx CCD new client +if ($cgiparams{'TYPE'} eq 'host') { + print"<br><br>"; + &Header::openbox('100%', 'LEFT', "$Lang::tr{'ccd client options'}:"); + + + print <<END; + <table border='0' width='100%'> + <tr><td width='20%'>Redirect Gateway:</td><td colspan='3'><input type='checkbox' name='RG' $checked{'RG'}{'on'} /></td></tr> + <tr><td colspan='4'><b><br>$Lang::tr{'ccd routes'}</b></td></tr> + <tr><td colspan='4'>&nbsp</td></tr> + <tr><td valign='top'>$Lang::tr{'ccd iroute'}</td><td align='left' width='30%'><textarea name='IR' cols='26' rows='6' wrap='off'> +END + + if ($cgiparams{'IR'} ne ''){ + print $cgiparams{'IR'}; + }else{ + &General::readhasharray ("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); + foreach my $key (keys %ccdroutehash) { + if( $cgiparams{'NAME'} eq $ccdroutehash{$key}[0]){ + foreach my $i (1 .. $#{$ccdroutehash{$key}}) { + if ($ccdroutehash{$key}[$i] ne ''){ + print $ccdroutehash{$key}[$i]."\n"; + } + $cgiparams{'IR'} .= $ccdroutehash{$key}[$i]; + } + } + } + } + + print <<END; +</textarea></td><td valign='top' colspan='2'>$Lang::tr{'ccd iroutehint'}</td></tr> + <tr><td colspan='4'><br></td></tr> + <tr><td valign='top' rowspan='3'>$Lang::tr{'ccd iroute2'}</td><td align='left' valign='top' rowspan='3'><select name='IFROUTE' style="width: 205px"; size='6' multiple> +END + + my $set=0; + my $selorange=0; + my $selblue=0; + my $selgreen=0; + my $helpblue=0; + my $helporange=0; + my $other=0; + my $none=0; + my @temp=(); + + our @current = (); + open(FILE, "${General::swroot}/main/routing") ; + @current = <FILE>; + close (FILE); + &General::readhasharray ("${General::swroot}/ovpn/ccdroute2", \%ccdroute2hash); + #check for "none" + foreach my $key (keys %ccdroute2hash) { + if($ccdroute2hash{$key}[0] eq $cgiparams{'NAME'}){ + if ($ccdroute2hash{$key}[1] eq ''){ + $none=1; + last; + } + } + } + if ($none ne '1'){ + print"<option>$Lang::tr{'ccd none'}</option>"; + }else{ + print"<option selected>$Lang::tr{'ccd none'}</option>"; + } + #check if static routes are defined for client + foreach my $line (@current) { + chomp($line); + $line=~s/\s*$//g; # remove newline + @temp=split(/\,/,$line); + $temp[1] = '' unless defined $temp[1]; # not always populated + my ($a,$b) = split(/\//,$temp[1]); + $temp[1] = $a."/".&General::iporsubtocidr($b); + foreach my $key (keys %ccdroute2hash) { + if($ccdroute2hash{$key}[0] eq $cgiparams{'NAME'}){ + foreach my $i (1 .. $#{$ccdroute2hash{$key}}) { + if($ccdroute2hash{$key}[$i] eq $a."/".&General::iporsubtodec($b)){ + $set=1; + } + } + } + } + if ($set == '1' && $#temp != -1){ print"<option selected>$temp[1]</option>";$set=0;}elsif($set == '0' && $#temp != -1){print"<option>$temp[1]</option>";} + } + #check if green,blue,orange are defined for client + foreach my $key (keys %ccdroute2hash) { + if($ccdroute2hash{$key}[0] eq $cgiparams{'NAME'}){ + $other=1; + foreach my $i (1 .. $#{$ccdroute2hash{$key}}) { + if ($ccdroute2hash{$key}[$i] eq $netsettings{'GREEN_NETADDRESS'}."/".&General::iporsubtodec($netsettings{'GREEN_NETMASK'})){ + $selgreen=1; + } + if (&haveBlueNet()){ + if( $ccdroute2hash{$key}[$i] eq $netsettings{'BLUE_NETADDRESS'}."/".&General::iporsubtodec($netsettings{'BLUE_NETMASK'})) { + $selblue=1; + } + } + if (&haveOrangeNet()){ + if( $ccdroute2hash{$key}[$i] eq $netsettings{'ORANGE_NETADDRESS'}."/".&General::iporsubtodec($netsettings{'ORANGE_NETMASK'}) ) { + $selorange=1; + } + } + } + } + } + if (&haveBlueNet() && $selblue == '1'){ print"<option selected>$Lang::tr{'blue'}</option>";$selblue=0;}elsif(&haveBlueNet() && $selblue == '0'){print"<option>$Lang::tr{'blue'}</option>";} + if (&haveOrangeNet() && $selorange == '1'){ print"<option selected>$Lang::tr{'orange'}</option>";$selorange=0;}elsif(&haveOrangeNet() && $selorange == '0'){print"<option>$Lang::tr{'orange'}</option>";} + if ($selgreen == '1' || $other == '0'){ print"<option selected>$Lang::tr{'green'}</option>";$set=0;}else{print"<option>$Lang::tr{'green'}</option>";}; + + print<<END + </select></td><td valign='top'>DNS1:</td><td valign='top'><input type='TEXT' name='CCD_DNS1' value='$cgiparams{'CCD_DNS1'}' size='30' /></td></tr> + <tr valign='top'><td>DNS2:</td><td><input type='TEXT' name='CCD_DNS2' value='$cgiparams{'CCD_DNS2'}' size='30' /></td></tr> + <tr valign='top'><td valign='top'>WINS:</td><td><input type='TEXT' name='CCD_WINS' value='$cgiparams{'CCD_WINS'}' size='30' /></td></tr></table><br><hr> + +END +; + &Header::closebox(); +} print "<div align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' />"; if ($cgiparams{'KEY'}) { # print "<input type='submit' name='ACTION' value='$Lang::tr{'advanced'}' />"; @@ -3538,24 +4552,21 @@ END my @status = `/bin/cat /var/log/ovpnserver.log`; if ($cgiparams{'VPN_IP'} eq '' && -e "${General::swroot}/red/active") { - if (open(IPADDR, "${General::swroot}/red/local-ipaddress")) { - my $ipaddr = <IPADDR>; - close IPADDR; - chomp ($ipaddr); - $cgiparams{'VPN_IP'} = (gethostbyaddr(pack("C4", split(/\./, $ipaddr)), 2))[0]; - if ($cgiparams{'VPN_IP'} eq '') { - $cgiparams{'VPN_IP'} = $ipaddr; - } - } + if (open(IPADDR, "${General::swroot}/red/local-ipaddress")) { + my $ipaddr = <IPADDR>; + close IPADDR; + chomp ($ipaddr); + $cgiparams{'VPN_IP'} = (gethostbyaddr(pack("C4", split(/\./, $ipaddr)), 2))[0]; + if ($cgiparams{'VPN_IP'} eq '') { + $cgiparams{'VPN_IP'} = $ipaddr; + } + } } #default setzen if ($cgiparams{'DCIPHER'} eq '') { $cgiparams{'DCIPHER'} = 'BF-CBC'; } -# if ($cgiparams{'DCOMPLZO'} eq '') { -# $cgiparams{'DCOMPLZO'} = 'on'; -# } if ($cgiparams{'DDEST_PORT'} eq '') { $cgiparams{'DDEST_PORT'} = '1194'; } @@ -3565,8 +4576,7 @@ END if ($cgiparams{'DOVPN_SUBNET'} eq '') { $cgiparams{'DOVPN_SUBNET'} = '10.' . int(rand(256)) . '.' . int(rand(256)) . '.0/255.255.255.0'; } - - $checked{'ENABLED'}{'off'} = ''; + $checked{'ENABLED'}{'off'} = ''; $checked{'ENABLED'}{'on'} = ''; $checked{'ENABLED'}{$cgiparams{'ENABLED'}} = 'CHECKED'; $checked{'ENABLED_BLUE'}{'off'} = ''; @@ -3626,8 +4636,8 @@ END $activeonrun = "disabled='disabled'"; } &Header::openbox('100%', 'LEFT', $Lang::tr{'global settings'}); - print <<END - <table width='100%'> + print <<END + <table width='100%' border=0> <form method='post'> <td width='25%'> </td> <td width='25%'> </td> @@ -3635,7 +4645,7 @@ END <tr><td class='boldbase'>$Lang::tr{'ovpn server status'}</td> <td align='left'>$sactive</td> <tr><td class='boldbase'>$Lang::tr{'ovpn on red'}</td> - <td><input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td> + <td><input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td> END ; if (&haveBlueNet()) { @@ -3674,18 +4684,20 @@ END <option value='CAST5-CBC' $selected{'DCIPHER'}{'CAST5-CBC'}>CAST5-CBC</option> <option value='AES-128-CBC' $selected{'DCIPHER'}{'AES-128-CBC'}>AES-128-CBC</option> <option value='AES-192-CBC' $selected{'DCIPHER'}{'AES-192-CBC'}>AES-192-CBC</option> - <option value='AES-256-CBC' $selected{'DCIPHER'}{'AES-256-CBC'}>AES-256-CBC</option></select></td> + <option value='AES-256-CBC' $selected{'DCIPHER'}{'AES-256-CBC'}>AES-256-CBC</option></select></td></tr> + <tr><td colspan='4'><hr /></td></tr> END ; if ( $srunning eq "yes" ) { - print "<tr><td align='left'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' disabled='disabled' /></td>"; - print "<td><input type='submit' name='ACTION' value='$Lang::tr{'advanced server'}' disabled='disabled'/></td>"; - print "<td><input type='submit' name='ACTION' value='$Lang::tr{'stop ovpn server'}' /></td>"; - print "<td><input type='submit' name='ACTION' value='$Lang::tr{'restart ovpn server'}' /></td></tr>"; + print "<tr><td align='right' colspan='4'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' disabled='disabled' />"; + print "<input type='submit' name='ACTION' value='$Lang::tr{'ccd net'}' />"; + print "<input type='submit' name='ACTION' value='$Lang::tr{'advanced server'}' />"; + print "<input type='submit' name='ACTION' value='$Lang::tr{'stop ovpn server'}' /></td></tr>"; } else{ - print "<tr><td align='left'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>"; - print "<td><input type='submit' name='ACTION' value='$Lang::tr{'advanced server'}' /></td>"; + print "<tr><td align='right' colspan='4'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' />"; + print "<input type='submit' name='ACTION' value='$Lang::tr{'ccd net'}' />"; + print "<input type='submit' name='ACTION' value='$Lang::tr{'advanced server'}' />"; if (( -e "${General::swroot}/ovpn/ca/cacert.pem" && -e "${General::swroot}/ovpn/ca/dh1024.pem" && -e "${General::swroot}/ovpn/certs/servercert.pem" && @@ -3693,11 +4705,9 @@ END (( $cgiparams{'ENABLED'} eq 'on') || ( $cgiparams{'ENABLED_BLUE'} eq 'on') || ( $cgiparams{'ENABLED_ORANGE'} eq 'on'))){ - print "<td><input type='submit' name='ACTION' value='$Lang::tr{'start ovpn server'}' /></td>"; - print "<td><input type='submit' name='ACTION' value='$Lang::tr{'restart ovpn server'}' /></td></tr>"; + print "<input type='submit' name='ACTION' value='$Lang::tr{'start ovpn server'}' /></td></tr>"; } else { - print "<td><input type='submit' name='ACTION' value='$Lang::tr{'start ovpn server'}' disabled='disabled' /></td>"; - print "<td><input type='submit' name='ACTION' value='$Lang::tr{'restart ovpn server'}' disabled='disabled' /></td></tr>"; + print "<input type='submit' name='ACTION' value='$Lang::tr{'start ovpn server'}' disabled='disabled' /></td></tr>"; } } print "</form></table>"; @@ -3829,18 +4839,19 @@ END </tr> </table> END - ; +; } - print <<END - <form method='post' enctype='multipart/form-data'> - <table width='100%' border='0' cellspacing='1' cellpadding='0'> - <tr><td class='base' nowrap='nowrap'>$Lang::tr{'ca name'}:</td> - <td nowrap='nowrap'><input type='text' name='CA_NAME' value='$cgiparams{'CA_NAME'}' size='15' /> - <td nowrap='nowrap'><input type='file' name='FH' size='30' /></td> - <td nowrap='nowrap'><input type='submit' name='ACTION' value='$Lang::tr{'upload ca certificate'}' /><br /><input type='submit' name='ACTION' value='$Lang::tr{'show crl'}' /></td> - </tr></table></form> + +print <<END +<form method='post' enctype='multipart/form-data'> +<table width='100%' border='0'> +<tr><td class='base' nowrap='nowrap'>$Lang::tr{'ca name'}:</td><td nowrap='nowrap' width='8%'><input type='text' name='CA_NAME' value='$cgiparams{'CA_NAME'}' size='15' align='left'/></td><td nowrap='nowrap' align='right'><input type='file' name='FH' size='25' /><input type='submit' name='ACTION' value='$Lang::tr{'upload ca certificate'}' /></td></tr> +<tr><td colspan='4'><hr /></td></tr> +<tr align='right'><td colspan='4' align='right' width='80%'><input type='submit' name='ACTION' value='$Lang::tr{'show crl'}' /></td></tr> +</table> END - ; +; + &Header::closebox(); if ( $srunning eq "yes" ) { @@ -3863,8 +4874,7 @@ END <tr> <td width='10%' class='boldbase' align='center'><b>$Lang::tr{'name'}</b></td> <td width='15%' class='boldbase' align='center'><b>$Lang::tr{'type'}</b></td> - <td width='18%' class='boldbase' align='center'><b>$Lang::tr{'common name'}</b></td> - <td width='22%' class='boldbase' align='center'><b>$Lang::tr{'valid till'}</b></td> + <td width='22%' class='boldbase' align='center'><b>$Lang::tr{'network'}</b></td> <td width='20%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b></td> <td width='10%' class='boldbase' align='center'><b>$Lang::tr{'status'}</b></td> <td width='5%' class='boldbase' colspan='6' align='center'><b>$Lang::tr{'action'}</b></td> @@ -3883,15 +4893,17 @@ END } print "<td align='center' nowrap='nowrap'>$confighash{$key}[1]</td>"; print "<td align='center' nowrap='nowrap'>" . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")</td>"; - if ($confighash{$key}[4] eq 'cert') { - print "<td align='left' nowrap='nowrap'>$confighash{$key}[2]</td>"; - } else { - print "<td align='left'> </td>"; - } + #if ($confighash{$key}[4] eq 'cert') { + #print "<td align='left' nowrap='nowrap'>$confighash{$key}[2]</td>"; + #} else { + #print "<td align='left'> </td>"; + #} my $cavalid = `/usr/bin/openssl x509 -text -in ${General::swroot}/ovpn/certs/$confighash{$key}[1]cert.pem`; $cavalid =~ /Not After : (.*)[\n]/; $cavalid = $1; - print "<td align='center'>$cavalid</td>"; + if ($confighash{$key}[32] eq "" && $confighash{$key}[3] eq 'net' ){$confighash{$key}[32]="net-2-net";} + if ($confighash{$key}[32] eq "" && $confighash{$key}[3] eq 'host' ){$confighash{$key}[32]="dynamic";} + print "<td align='center'>$confighash{$key}[32]</td>"; print "<td align='center'>$confighash{$key}[25]</td>"; my $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>"; @@ -4029,7 +5041,7 @@ END # If the config file contains entries, print Key to action icons if ( $id ) { print <<END - <table> + <table border='0'> <tr> <td class='boldbase'>  <b>$Lang::tr{'legend'}:</b></td> <td>  <img src='/images/on.gif' alt='$Lang::tr{'click to disable'}' /></td> @@ -4050,7 +5062,7 @@ END <td> <img src='/images/openvpn.png' alt='?RELOAD'/></td> <td class='base'>$Lang::tr{'dl client arch'}</td> </tr> - </table> + </table><hr> END ; } @@ -4058,8 +5070,8 @@ END print <<END <table width='100%'> <form method='post'> - <tr><td width='50%' ><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td> - <td width='50%' ><input type='submit' name='ACTION' value='$Lang::tr{'ovpn con stat'}' $activeonrun /></td></tr> + <tr><td align='right'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /> + <input type='submit' name='ACTION' value='$Lang::tr{'ovpn con stat'}' $activeonrun /></td></tr> </form> </table> END diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi index 86e0429..afcd388 100644 --- a/html/cgi-bin/routing.cgi +++ b/html/cgi-bin/routing.cgi @@ -118,6 +118,8 @@ if ($settings{'ACTION'} eq $Lang::tr{'toggle enable disable'}) { } if ($settings{'ACTION'} eq $Lang::tr{'add'}) { + # Convert subnet masks to CIDR notation. + $settings{'IP'} = &General::iporsubtocidr($settings{'IP'}); # Validate inputs if (( !&General::validip($settings{'IP'})) and ( !&General::validipandmask($settings{'IP'}))){ @@ -443,4 +445,4 @@ sub SortDataFile # sub BuildConfiguration { system '/usr/local/bin/rebuildroutes'; -} \ No newline at end of file +} diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi old mode 100644 new mode 100755 index 0fb7c93..24aeb6d --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -1415,6 +1415,14 @@ END goto VPNCONF_ERROR; } + + if ($cgiparams{'TYPE'} eq 'net'){ + $errormessage=&General::checksubnets($cgiparams{'NAME'},$cgiparams{'REMOTE_SUBNET'}); + if ($errormessage ne ''){ + goto VPNCONF_ERROR; + } + + } if ($cgiparams{'AUTH'} eq 'psk') { if (! length($cgiparams{'PSK'}) ) { $errormessage = $Lang::tr{'pre-shared key is too short'}; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index f686c30..05e1d85 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -351,6 +351,7 @@ 'arp table entries' => 'Einträge der ARP-Tabelle:', 'artist' => 'Künstler', 'attemps' => 'Versuche', +'attention' => 'ACHTUNG', 'august' => 'August', 'authentication' => 'Authentifizierung:', 'automatic' => 'Automatisch', @@ -455,6 +456,44 @@ 'capsopen' => 'VERBUNDEN', 'capswarning' => 'WARNUNG', 'caption' => 'Legende', +'ccd add' => 'Netzwerk hinzufügen', +'ccd choose net' => 'Netzwerk auswählen', +'ccd client options' => 'Erweiterte Client-Optionen', +'ccd clientip' => 'Hostadresse', +'ccd dynrange' => 'Dynamischer OpenVPN IP-Addressen-Pool', +'ccd err blue' => 'Das ist das BLAUE Subnetz.', +'ccd err green' => 'Das ist das GRÜNE Subnetz.', +'ccd err hostinnet' => 'Das Netzwerk kann nicht gelöscht werden, da sich in ihm noch Clients befinden.', +'ccd err inuse' => 'Wird bereits von einem anderen Client genutzt.', +'ccd err invalidname' => 'Ungültiger Name. Erlaubte Zeichen: A-Z, a-z, Bindestrich und Leerzeichen.', +'ccd err invalidnet' => 'Ungültige IP-Addresse. Format: 192.168.0.0/24 oder 192.168.0.0/255.255.255.0.', +'ccd err iroute' => 'Netzadresse für Route ungültig.', +'ccd err irouteexist' => 'Diese Route wird bereits verwendet.', +'ccd err isipsecnet' => 'Diese Subnetzadresse wird bereits für ein IPsec-Netzwerk verwendet.', +'ccd err isovpnnet' => 'Subnetzadresse wird für bereits für den OpenVPN-Server verwendet!', +'ccd err issubnet' => 'Subnetzadresse wird bereits verwendet.', +'ccd err name' => 'Es muss ein Name angegeben werden.', +'ccd err nameexist' => 'Name existiert bereits.', +'ccd err netadr' => 'Subnetzadresse ist ungültig oder Bereich zu groß.', +'ccd err netadrexist' => 'Netwerk existiert bereits.', +'ccd err orange' => 'Das ist das ORANGE Subnetz.', +'ccd err red' => 'Das ist das ROTE Subnetz.', +'ccd err routeovpn' => 'Wird vom OpenVPN-Server genutzt.', +'ccd err routeovpn2' => 'Wird bereits vom OpenVPN-Server verteilt.', +'ccd hint' => 'Auf dieser Seite können statische Netzwerke definiert werden, von denen Roadwarrior-Clients feste Adressen zugewiesen bekommen können.', +'ccd invalid' => 'ist ungültig.', +'ccd iroute' => 'IPFire hat Zugriff auf diese Netzwerke auf Clientseite: ', +'ccd iroute2' => 'Client hat Zugriff auf diese Netzwerke auf IPFire-Seite: ', +'ccd iroutehint' => 'Achtung! Wenn Sie diese Einstellungen ändern, muss der OpenVPN Server neu gestartet werden!', +'ccd maxclients' => 'Mögliche Adressen', +'ccd modify' => 'Netzwerk ändern', +'ccd name' => 'Name', +'ccd net' => 'Statische IP-Adressen-Pools', +'ccd noaddnet' => 'Neue statische Netze können erst erstellt werden, wenn der openVPN Server gestoppt wurde.', +'ccd none' => 'Keine', +'ccd routes' => 'Routen:', +'ccd subnet' => 'Subnetz', +'ccd used' => 'Genutzte Adressen', 'cert' => 'Zertifikat', 'certificate' => 'Zertifikat', 'certificate authorities' => 'Zertifizierungsstellen (CAs)', @@ -1350,6 +1389,13 @@ 'ovpn errmsg green already pushed' => 'Route für grünes Netzwerk wird immer gesetzt', 'ovpn errmsg invalid ip or mask' => 'Ungültige Netzwerk-Adresse oder Subnetzmaske', 'ovpn log' => 'OVPN-Log', +'ovpn mtu-disc' => 'Path MTU Discovery', +'ovpn mtu-disc and mtu not 1500' => 'Path MTU Discovery benötigt eine MTU von 1500.', +'ovpn mtu-disc maybe' => 'Optional', +'ovpn mtu-disc no' => 'Niemals', +'ovpn mtu-disc off' => 'Deaktiviert', +'ovpn mtu-disc with mssfix or fragment' => 'Path MTU Discovery kann nicht gemeinsam mit mssfix oder fragment verwendet werden.', +'ovpn mtu-disc yes' => 'Forciert', 'ovpn on blue' => 'OpenVPN auf BLAU', 'ovpn on orange' => 'OpenVPN auf ORANGE', 'ovpn on red' => 'OpenVPN auf ROT', @@ -1468,6 +1514,11 @@ 'proxy no proxy local' => 'Lokalen Proxy auf blauen/grünen Netzwerken verhindern', 'proxy port' => 'Proxy-Port', 'proxy reconfigure' => 'Speichern und Laden', +'proxy reports' => 'Proxyberichte', +'proxy reports daily' => 'Tägliche Berichte', +'proxy reports monthly' => 'Monatliche Berichte', +'proxy reports today' => 'Heute', +'proxy reports weekly' => 'Wöchentliche Berichte', 'psk' => 'PSK', 'pulse' => 'Puls', 'pulse dial' => 'Pulswahl:', @@ -1568,6 +1619,7 @@ 'september' => 'September', 'serial' => 'serielle', 'server reserved' => 'The connection name server is reserved and not allowed', +'server restart' => 'Änderungen können nicht gespeichert werden, solange der OpenVPN-Server läuft.', 'server string' => 'Server String', 'service' => 'Dienst', 'service added' => 'Benutzerdefinierter Netzwerkdienst wurde hinzugefügt', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 5fe2391..f0fa2c2 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -353,6 +353,7 @@ 'arp table entries' => 'ARP Table Entries:', 'artist' => 'Artist', 'attemps' => 'Attempts', +'attention' => 'ATTENTION', 'august' => 'August', 'authentication' => 'Authentication:', 'automatic' => 'Automatic', @@ -474,6 +475,43 @@ 'capsopen' => 'CONNECTED', 'capswarning' => 'WARNING', 'caption' => 'Caption', +'ccd add' => 'Add network', +'ccd choose net' => 'Choose network', +'ccd client options' => 'Advanced client options', +'ccd clientip' => 'Host address', +'ccd dynrange' => 'Dynamic OpenVPN IP address pool', +'ccd err blue' => 'This is the BLUE subnet.', +'ccd err green' => 'This is the GREEN subnet.', +'ccd err hostinnet' => 'You are not able to delete this network, while it still contains clients.', +'ccd err inuse' => 'Already used by another client.', +'ccd err invalidname' => 'Invalid name. Allowed characters are A-Z, a-z, dash and space.', +'ccd err invalidnet' => 'Invalid IP address. Format: 192.168.0.0/24 or 192.168.0.0/255.255.255.0.', +'ccd err iroute' => 'Network address for route is invalid.', +'ccd err irouteexist' => 'This route is already in use.', +'ccd err isipsecnet' => 'The given subnet address already used by an IPsec network.', +'ccd err isovpnnet' => 'Subnet address already in use for OpenVPN Server.', +'ccd err issubnet' => 'Subnet address already in use.', +'ccd err name' => 'Please choose a name.', +'ccd err nameexist' => 'Name already exists.', +'ccd err netadr' => 'Subnet address is invalid or range is too large.', +'ccd err netadrexist' => 'Network already exists.', +'ccd err orange' => 'This is the ORANGE subnet.', +'ccd err red' => 'This is the RED subnet.', +'ccd err routeovpn' => 'Already used by OpenVPN server.', +'ccd err routeovpn2' => 'Already pushed from OpenVPN server.', +'ccd hint' => 'On this page you are able to define static networks from which the roadwarrior clients can get fixed IP address assignments.', +'ccd invalid' => 'Invalid.', +'ccd iroute' => 'IPFire has access to these networks on the client\'s site', +'ccd iroute2' => 'Client has access to these networks on IPFire\'s site', +'ccd iroutehint' => 'Attention! If you change these settings, you have to restart the OpenVPN server that the changes take effect!', +'ccd modify' => 'Change network', +'ccd name' => 'Name', +'ccd net' => 'Static IP address pools', +'ccd noaddnet' => 'You can only add new static networks when OpenVPN server is stopped.', +'ccd none' => 'None', +'ccd routes' => 'Routing:', +'ccd subnet' => 'Subnet', +'ccd used' => 'Used addresses', 'cert' => 'Certificate', 'certificate' => 'Certificate', 'certificate authorities' => 'Certificate Authorities', @@ -895,7 +933,7 @@ 'gpl unofficial translation of the general public license v3' => 'Unofficial translation of the General Public License v3', 'graph' => 'Graph', 'graph per' => 'per', -'green' => 'Green', +'green' => 'GREEN', 'green interface' => 'Green Interface', 'guaranteed bandwith' => 'Guaranteed bandwith', 'guardian alertfile' => 'Alertfile', @@ -1378,6 +1416,13 @@ 'ovpn errmsg green already pushed' => 'Route for green network is always set', 'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask', 'ovpn log' => 'OVPN-Log', +'ovpn mtu-disc' => 'Path MTU Discovery', +'ovpn mtu-disc and mtu not 1500' => 'Path MTU Discovery requires a MTU of 1500.', +'ovpn mtu-disc maybe' => 'Optionally', +'ovpn mtu-disc no' => 'Never', +'ovpn mtu-disc off' => 'Disabled', +'ovpn mtu-disc with mssfix or fragment' => 'Path MTU Discovery cannot be used with mssfix or fragment.', +'ovpn mtu-disc yes' => 'Forced', 'ovpn on blue' => 'OpenVPN on BLUE', 'ovpn on orange' => 'OpenVPN on ORANGE', 'ovpn on red' => 'OpenVPN on RED', @@ -1496,6 +1541,11 @@ 'proxy no proxy local' => 'Disallow local proxying on BLUE/GREEN networks', 'proxy port' => 'Proxy Port', 'proxy reconfigure' => 'Save and Reload', +'proxy reports' => 'Proxy Reports', +'proxy reports daily' => 'Daily reports', +'proxy reports monthly' => 'Monthly reports', +'proxy reports today' => 'Today', +'proxy reports weekly' => 'Weekly reports', 'psk' => 'PSK', 'pulse' => 'Pulse', 'pulse dial' => 'Pulse dial:', @@ -1598,6 +1648,7 @@ 'september' => 'September', 'serial' => 'Serial', 'server reserved' => 'The connection name server is reserved and not allowed', +'server restart' => 'You are not able to save any changes while the OpenVPN server is running.', 'server string' => 'Server String', 'service' => 'Service', 'service added' => 'Custom network service added', diff --git a/lfs/GeoIP b/lfs/GeoIP index 68254a7..7e1dc9a 100644 --- a/lfs/GeoIP +++ b/lfs/GeoIP @@ -25,7 +25,7 @@ include Config VER = 1.17 -DATVER = 06112012 +DATVER = 05122012 THISAPP = Geo-IP-PurePerl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,7 +43,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz $(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de -GeoIP.dat-$(DATVER).gz_MD5 = a8677695b0abecb69707ebe2444e64f9 +GeoIP.dat-$(DATVER).gz_MD5 = ab0f52a35128d1aced906ac4cbfbed9c install : $(TARGET) diff --git a/lfs/libstatgrab b/lfs/libstatgrab new file mode 100644 index 0000000..8bcb133 --- /dev/null +++ b/lfs/libstatgrab @@ -0,0 +1,69 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.17 + +THISAPP = libstatgrab-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = libstatgrab +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 58385c9392898be3b09ffc5e3ebe8717 + +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) \ No newline at end of file diff --git a/lfs/mediatomb b/lfs/mediatomb index 2bfde66..7de579e 100644 --- a/lfs/mediatomb +++ b/lfs/mediatomb @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # # # # 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 # @@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = mediatomb PAK_VER = 4 -DEPS = "sqlite taglib ffmpeg-libs" +DEPS = "ffmpeg-libs libexif sqlite taglib " ############################################################################### # Top-level Rules diff --git a/lfs/sarg b/lfs/sarg new file mode 100644 index 0000000..c8794fe --- /dev/null +++ b/lfs/sarg @@ -0,0 +1,100 @@ +############################################################################### +# # +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) 2012 Michael Tremer # +# # +# 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 = 2.3.3 + +THISAPP = sarg-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = sarg +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 09dba9a960d500acd7f17802de62512c + +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 axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc/sarg + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make $(EXTRA_INSTALL) install + + # Install configuration file. + cp -v $(DIR_SRC)/config/sarg/sarg.conf /etc/sarg/sarg.conf + + # Install helper script. + install -m 755 $(DIR_SRC)/config/sarg/update-sarg-reports \ + /usr/sbin/update-sarg-reports + + # Install cron job. + for i in hourly daily weekly monthly; do \ + install -m 754 -v $(DIR_SRC)/config/sarg/cron.$${i} \ + /etc/fcron.$${i}/sarg-reports; \ + done + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/stage2 b/lfs/stage2 index 5f038c3..5059923 100644 --- a/lfs/stage2 +++ b/lfs/stage2 @@ -89,6 +89,9 @@ $(TARGET) : chmod 755 /usr/local/bin/`basename $$i`; \ done + # Move script to correct place. + mv -vf /usr/local/bin/ovpn-ccd-convert /usr/sbin/ + # Nobody user -mkdir -p /home/nobody chown -R nobody:nobody /home/nobody diff --git a/lfs/stress b/lfs/stress new file mode 100644 index 0000000..166d840 --- /dev/null +++ b/lfs/stress @@ -0,0 +1,69 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.0.4 + +THISAPP = stress-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = stress +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = a607afa695a511765b40993a64c6e2f4 + +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) diff --git a/make.sh b/make.sh index ea908d9..6fb2d94 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.11" # Version number -CORE="64" # Core Level (Filename) -PAKFIRE_CORE="64" # Core Level (PAKFIRE) +CORE="65" # Core Level (Filename) +PAKFIRE_CORE="65" # 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 @@ -772,6 +772,9 @@ buildipfire() { ipfiremake minidlna ipfiremake fping ipfiremake telnet + ipfiremake stress + ipfiremake libstatgrab + ipfiremake sarg echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild diff --git a/src/misc-progs/launch-ether-wake.c b/src/misc-progs/launch-ether-wake.c index f487041..cac4d3c 100644 --- a/src/misc-progs/launch-ether-wake.c +++ b/src/misc-progs/launch-ether-wake.c @@ -29,5 +29,9 @@ int main(int argc, char *argv[]) snprintf(command, BUFFER_SIZE-1, "/usr/sbin/etherwake -i %s %s", argv[2], argv[1]); safe_system(command); + /* Send magic packet with broadcast flag set. */ + snprintf(command, BUFFER_SIZE-1, "/usr/sbin/etherwake -i %s -b %s", argv[2], argv[1]); + safe_system(command); + return(0); } diff --git a/src/paks/sarg/install.sh b/src/paks/sarg/install.sh new file mode 100644 index 0000000..d3b17a9 --- /dev/null +++ b/src/paks/sarg/install.sh @@ -0,0 +1,34 @@ +#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +restore_backup ${NAME} + +# Create data directory. +[ -d "/var/log/sarg" ] || mkdir /var/log/sarg + +# Create initial report. +/usr/sbin/update-sarg-reports today >/dev/null 2>&1 + +exit 0 diff --git a/src/paks/sarg/uninstall.sh b/src/paks/sarg/uninstall.sh new file mode 100644 index 0000000..66f4344 --- /dev/null +++ b/src/paks/sarg/uninstall.sh @@ -0,0 +1,26 @@ +#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +make_backup ${NAME} +remove_files diff --git a/src/paks/sarg/update.sh b/src/paks/sarg/update.sh new file mode 100644 index 0000000..89c40d0 --- /dev/null +++ b/src/paks/sarg/update.sh @@ -0,0 +1,26 @@ +#!/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 2 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) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh diff --git a/src/scripts/ovpn-ccd-convert b/src/scripts/ovpn-ccd-convert new file mode 100644 index 0000000..c54e256 --- /dev/null +++ b/src/scripts/ovpn-ccd-convert @@ -0,0 +1,50 @@ +#!/usr/bin/perl +# Converter script for old openvpn clients +my %net=(); +my %ovpnconfig=(); +my @serverconf=(); +my $greennet; +my $greensubnet; +my $running='off'; + +require '/var/ipfire/general-functions.pl'; +unless (-d "${General::swroot}/ovpn/ccd") { system("mkdir ${General::swroot}/ovpn/ccd"); } +system ("chown nobody.nobody ${General::swroot}/ovpn/ccd"); +if ( -e "/var/run/openvpn.pid"){ + $running='on'; + system('/usr/local/bin/openvpnctrl', '-k'); +} + +&General::readhash("/var/ipfire/ethernet/settings", \%net); + $greennet=$net{'GREEN_NETADDRESS'}; + $greensubnet=$net{'GREEN_NETMASK'}; +open(FILE,"/var/ipfire/ovpn/server.conf"); + while (<FILE>) { + $_=~s/\s*$//g; + if ($_ ne "route $greennet $greensubnet"){ + push (@serverconf,$_."\n"); + }else{ + print"\nFound ROUTE >>route $greennet $greensubnet<< in server.conf.. Deleted!"; + } + } + +&General::readhasharray("/var/ipfire/ovpn/ovpnconfig", \%ovpnconfig); +foreach my $key (keys %ovpnconfig){ + if($ovpnconfig{$key}[32] eq '' && $ovpnconfig{$key}[3] eq 'host'){ + open ( CCDRWCONF,'>',"/var/ipfire/ovpn/ccd/$ovpnconfig{$key}[2]") or die "Unable to create clientconfigfile $!"; + print CCDRWCONF "# OpenVPN Clientconfig from CCD extension by Copymaster#\n\n"; + print CCDRWCONF "#This client uses the dynamic pool\n\n"; + print CCDRWCONF "\n#Client gets routes to these Networks (behind IPFIRE)\n"; + print CCDRWCONF "push \"route $greennet $greensubnet\"\n"; + close CCDRWCONF; + print"Client $ovpnconfig{$key}[2] converted! \n"; + }else{ + print "Client $ovpnconfig{$key}[2] NOT converted!\n"; + } + $ovpnconfig{$key}[32] = 'dynamic'; +} +&General::writehasharray("/var/ipfire/ovpn/ovpnconfig", \%ovpnconfig); +if ($running eq 'on') +{ + system('/usr/local/bin/openvpnctrl', '-s'); +} diff --git a/src/scripts/update-lang-cache b/src/scripts/update-lang-cache new file mode 100644 index 0000000..971664e --- /dev/null +++ b/src/scripts/update-lang-cache @@ -0,0 +1,3 @@ +#!/bin/sh +perl -e "require '//var/ipfire/lang.pl'; &Lang::BuildCacheLang" + hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. f9805fbe54167cb7e2a2fceff36eef71fc3077df
by git＠ipfire.org 15 Dec '12

15 Dec '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via f9805fbe54167cb7e2a2fceff36eef71fc3077df (commit) via c79b39f9c0c3fb9ab01a28464de78d5bfa3429ed (commit) from b4bde197ee791e1d8b725f274a4f54593319a05f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f9805fbe54167cb7e2a2fceff36eef71fc3077df Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Dec 15 22:37:17 2012 +0100 bison: Update to 2.7. commit c79b39f9c0c3fb9ab01a28464de78d5bfa3429ed Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Dec 15 22:35:14 2012 +0100 zd1211-firmware: Fix permissions of the firmware files. The firmware files have been owned by some random user and group, which has been fixed. The firmware package will also be installed on the base system. ----------------------------------------------------------------------- Summary of changes: bison/bison.nm | 4 ++-- zd1211-firmware/zd1211-firmware.nm | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) Difference in files: diff --git a/bison/bison.nm b/bison/bison.nm index 1a1d7c9..dbb0e6b 100644 --- a/bison/bison.nm +++ b/bison/bison.nm @@ -4,7 +4,7 @@ ############################################################################### name = bison -version = 2.6.2 +version = 2.7 release = 1 groups = Development/Tools @@ -21,7 +21,7 @@ source_dl = http://ftp.gnu.org/gnu/bison/ build requires - m4 + m4 >= 1.4.16 perl end diff --git a/zd1211-firmware/zd1211-firmware.nm b/zd1211-firmware/zd1211-firmware.nm index 5ba916f..dd75da4 100644 --- a/zd1211-firmware/zd1211-firmware.nm +++ b/zd1211-firmware/zd1211-firmware.nm @@ -5,7 +5,7 @@ name = zd1211-firmware version = 1.4 -release = 1 +release = 2 arch = noarch maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> @@ -32,9 +32,13 @@ build mkdir -pv %{BUILDROOT}%{prefix}/lib/firmware/zd1211/ cp -prv zd1211_* %{BUILDROOT}%{prefix}/lib/firmware/zd1211/ cp -prv zd1211b_* %{BUILDROOT}%{prefix}/lib/firmware/zd1211/ + + chown -Rv root:root %{BUILDROOT}%{prefix}/lib/firmware end end packages package %{name} + groups += Base + end end hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. b4bde197ee791e1d8b725f274a4f54593319a05f
by git＠ipfire.org 12 Dec '12

12 Dec '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via b4bde197ee791e1d8b725f274a4f54593319a05f (commit) via 0ee6048f60fae9519265499e4a2dbfee9a44809d (commit) via 6514572f328020ffdbdb0fa8efb4f46ae6e3e028 (commit) from 5c16bb1ac0c13a057b26a8187a44178d4189416b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b4bde197ee791e1d8b725f274a4f54593319a05f Merge: 0ee6048 6514572 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Dec 12 22:20:12 2012 +0100 Merge remote-tracking branch 'stevee/hdparm-update' commit 0ee6048f60fae9519265499e4a2dbfee9a44809d Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Dec 12 20:51:46 2012 +0100 zd1211-firmware: New package. Fixes #10108. commit 6514572f328020ffdbdb0fa8efb4f46ae6e3e028 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Dec 12 19:30:00 2012 +0100 hdparm: Update to 9.43. Fixes #10257. ----------------------------------------------------------------------- Summary of changes: hdparm/hdparm.nm | 2 +- zd1211-firmware/zd1211-firmware.nm | 40 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 zd1211-firmware/zd1211-firmware.nm Difference in files: diff --git a/hdparm/hdparm.nm b/hdparm/hdparm.nm index 2f9b5fb..9e445b8 100644 --- a/hdparm/hdparm.nm +++ b/hdparm/hdparm.nm @@ -4,7 +4,7 @@ ############################################################################### name = hdparm -version = 9.39 +version = 9.43 release = 1 groups = Applications/Hardware diff --git a/zd1211-firmware/zd1211-firmware.nm b/zd1211-firmware/zd1211-firmware.nm new file mode 100644 index 0000000..5ba916f --- /dev/null +++ b/zd1211-firmware/zd1211-firmware.nm @@ -0,0 +1,40 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = zd1211-firmware +version = 1.4 +release = 1 +arch = noarch + +maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> +groups = System/Libraries +url = http://sourceforge.net/projects/zd1211/ +license = GPLv2 +summary = Firmware Binaries for ZyDAS ZD1211 WLAN USB devices. + +description + This package contains the firmware files needed for the zd1211 devices to work. +end + +source_dl = http://sourceforge.net/projects/zd1211/files/%{name}/%{version}/ +sources = %{thisapp}.tar.bz2 + +build + DIR_APP = %{DIR_SRC}/%{name} + + build + : # Nothing to do. + end + + install + mkdir -pv %{BUILDROOT}%{prefix}/lib/firmware/zd1211/ + cp -prv zd1211_* %{BUILDROOT}%{prefix}/lib/firmware/zd1211/ + cp -prv zd1211b_* %{BUILDROOT}%{prefix}/lib/firmware/zd1211/ + end +end + +packages + package %{name} +end hooks/post-receive -- IPFire 3.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM December 2012