From 61d0d586f2bb0b11a338c192368050d16440a650 Mon Sep 17 00:00:00 2001 From: ms Date: Wed, 18 Jul 2007 15:55:47 +0000 Subject: [PATCH] n gaaaanz frischer Asterisk und n gut aufgemotzter Kernel git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@705 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/asterisk/addons.makeopts | 1 + config/asterisk/asterisk.makeopts | 34 ++++++ config/asterisk/zaptel.makeopts | 4 + config/kernel/kernel.config.i586 | 173 +++++++++++++++++++++------ config/kernel/kernel.config.i586.smp | 162 +++++++++++++++++++------ doc/packages-list.txt | 3 + lfs/asterisk | 63 +++++----- lfs/clamav | 2 +- lfs/libpri | 8 +- lfs/zaptel | 36 +++--- 10 files changed, 356 insertions(+), 130 deletions(-) create mode 100644 config/asterisk/addons.makeopts create mode 100644 config/asterisk/asterisk.makeopts create mode 100644 config/asterisk/zaptel.makeopts diff --git a/config/asterisk/addons.makeopts b/config/asterisk/addons.makeopts new file mode 100644 index 000000000..53e58f41d --- /dev/null +++ b/config/asterisk/addons.makeopts @@ -0,0 +1 @@ +MENUSELECT_ADDONS= diff --git a/config/asterisk/asterisk.makeopts b/config/asterisk/asterisk.makeopts new file mode 100644 index 000000000..283f34d4b --- /dev/null +++ b/config/asterisk/asterisk.makeopts @@ -0,0 +1,34 @@ +MENUSELECT_APPS=app_ivrdemo app_osplookup app_rpt app_skel +MENUSELECT_CDR=cdr_odbc cdr_pgsql cdr_radius cdr_sqlite cdr_tds +MENUSELECT_CHANNELS=chan_gtalk chan_h323 chan_nbs chan_vpb chan_zap +MENUSELECT_CODECS=codec_speex codec_zap +MENUSELECT_FORMATS= +MENUSELECT_FUNCS=func_odbc +MENUSELECT_PBX=pbx_gtkconsole pbx_kdeconsole +MENUSELECT_RES=res_config_odbc res_config_pgsql res_jabber res_odbc res_snmp +MENUSELECT_OPTS_app_voicemail= +MENUSELECT_CFLAGS=LOADABLE_MODULES +MENUSELECT_EMBED= +MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-ALAW +MENUSELECT_MOH=MOH-FREEPLAY-WAV +MENUSELECT_EXTRA_SOUNDS=EXTRA-SOUNDS-EN-ALAW +MENUSELECT_BUILD_DEPS=res_adsi app_meetme res_smdi +MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_osplookup +MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_odbc +MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_pgsql +MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_radius +MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_sqlite +MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_tds +MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_gtalk +MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_h323 +MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_nbs +MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_vpb +MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_zap +MENUSELECT_DEPSFAILED=MENUSELECT_CODECS=codec_speex +MENUSELECT_DEPSFAILED=MENUSELECT_CODECS=codec_zap +MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_odbc +MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_odbc +MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_pgsql +MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_jabber +MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_odbc +MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_snmp diff --git a/config/asterisk/zaptel.makeopts b/config/asterisk/zaptel.makeopts new file mode 100644 index 000000000..c8ffd84c3 --- /dev/null +++ b/config/asterisk/zaptel.makeopts @@ -0,0 +1,4 @@ +MENUSELECT_MODULES= +MENUSELECT_UTILS=sethdlc-new +MENUSELECT_FIRMWARE= +MENUSELECT_BUILD_DEPS=zttranscode ztdynamic wct4xxp wctc4xxp diff --git a/config/kernel/kernel.config.i586 b/config/kernel/kernel.config.i586 index f7752a1f4..33edca760 100644 --- a/config/kernel/kernel.config.i586 +++ b/config/kernel/kernel.config.i586 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16.50-ipfire -# Sun Jul 15 23:14:46 2007 +# Wed Jul 18 11:24:55 2007 # CONFIG_X86_32=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -61,9 +61,9 @@ CONFIG_BASE_SMALL=0 # CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y -# CONFIG_MODULE_FORCE_UNLOAD is not set +CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_OBSOLETE_MODPARM=y -CONFIG_MODVERSIONS=y +# CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_KMOD=y @@ -1024,7 +1024,34 @@ CONFIG_FUSION_CTL=m # # IEEE 1394 (FireWire) support # -# CONFIG_IEEE1394 is not set +CONFIG_IEEE1394=m + +# +# Subsystem Options +# +# CONFIG_IEEE1394_VERBOSEDEBUG is not set +# CONFIG_IEEE1394_OUI_DB is not set +CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y +CONFIG_IEEE1394_CONFIG_ROM_IP1394=y +# CONFIG_IEEE1394_EXPORT_FULL_API is not set + +# +# Device Drivers +# + +# +# Texas Instruments PCILynx requires I2C +# +CONFIG_IEEE1394_OHCI1394=m + +# +# Protocol Drivers +# +# CONFIG_IEEE1394_VIDEO1394 is not set +# CONFIG_IEEE1394_SBP2 is not set +CONFIG_IEEE1394_ETH1394=m +# CONFIG_IEEE1394_DV1394 is not set +# CONFIG_IEEE1394_RAWIO is not set # # I2O device support @@ -1161,7 +1188,10 @@ CONFIG_SUNDANCE_MMIO=y CONFIG_TLAN=m CONFIG_VIA_RHINE=m CONFIG_VIA_RHINE_MMIO=y -# CONFIG_NET_POCKET is not set +CONFIG_NET_POCKET=y +CONFIG_ATP=m +CONFIG_DE600=m +CONFIG_DE620=m # # Ethernet (1000 Mbit) @@ -1396,10 +1426,10 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y -CONFIG_KEYBOARD_SUNKBD=y -CONFIG_KEYBOARD_LKKBD=y -CONFIG_KEYBOARD_XTKBD=y -CONFIG_KEYBOARD_NEWTON=y +CONFIG_KEYBOARD_SUNKBD=m +CONFIG_KEYBOARD_LKKBD=m +CONFIG_KEYBOARD_XTKBD=m +CONFIG_KEYBOARD_NEWTON=m # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TOUCHSCREEN is not set @@ -1473,8 +1503,53 @@ CONFIG_IPMI_POWEROFF=m # # Watchdog Cards # -# CONFIG_WATCHDOG is not set -# CONFIG_HW_RANDOM is not set +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_ACQUIRE_WDT=m +CONFIG_ADVANTECH_WDT=m +CONFIG_ALIM1535_WDT=m +CONFIG_ALIM7101_WDT=m +CONFIG_SC520_WDT=m +CONFIG_EUROTECH_WDT=m +CONFIG_IB700_WDT=m +CONFIG_IBMASR=m +CONFIG_WAFER_WDT=m +CONFIG_I6300ESB_WDT=m +CONFIG_I8XX_TCO=m +CONFIG_SC1200_WDT=m +CONFIG_60XX_WDT=m +CONFIG_SBC8360_WDT=m +CONFIG_CPU5_WDT=m +CONFIG_W83627HF_WDT=m +CONFIG_W83877F_WDT=m +CONFIG_W83977F_WDT=m +CONFIG_MACHZ_WDT=m +CONFIG_SBC_EPX_C3_WATCHDOG=m + +# +# ISA-based Watchdog Cards +# +# CONFIG_PCWATCHDOG is not set +# CONFIG_MIXCOMWD is not set +# CONFIG_WDT is not set + +# +# PCI-based Watchdog Cards +# +CONFIG_PCIPCWATCHDOG=m +CONFIG_WDTPCI=m +CONFIG_WDT_501_PCI=y + +# +# USB-based Watchdog Cards +# +CONFIG_USBPCWATCHDOG=m +CONFIG_HW_RANDOM=m # CONFIG_NVRAM is not set CONFIG_RTC=y # CONFIG_DTLK is not set @@ -1489,12 +1564,12 @@ CONFIG_RTC=y # CONFIG_AGP is not set # CONFIG_DRM is not set CONFIG_MWAVE=m -# CONFIG_CS5535_GPIO is not set +CONFIG_CS5535_GPIO=m # CONFIG_RAW_DRIVER is not set CONFIG_HPET=y # CONFIG_HPET_RTC_IRQ is not set CONFIG_HPET_MMAP=y -# CONFIG_HANGCHECK_TIMER is not set +CONFIG_HANGCHECK_TIMER=m # # TPM devices @@ -1528,12 +1603,12 @@ CONFIG_W1_DS2433_CRC=y # # Hardware Monitoring support # -CONFIG_HWMON=y +CONFIG_HWMON=m # CONFIG_HWMON_VID is not set -CONFIG_SENSORS_K8TEMP=y -# CONFIG_SENSORS_F71805F is not set -# CONFIG_SENSORS_PC87427 is not set -# CONFIG_SENSORS_HDAPS is not set +CONFIG_SENSORS_K8TEMP=m +CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_HDAPS=m # CONFIG_HWMON_DEBUG_CHIP is not set # @@ -1630,11 +1705,14 @@ CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m -# CONFIG_SND_SEQUENCER is not set +CONFIG_SND_SEQUENCER=m +# CONFIG_SND_SEQ_DUMMY is not set CONFIG_SND_OSSEMUL=y CONFIG_SND_MIXER_OSS=m CONFIG_SND_PCM_OSS=m +# CONFIG_SND_SEQUENCER_OSS is not set CONFIG_SND_RTCTIMER=m +CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y # CONFIG_SND_DYNAMIC_MINORS is not set # CONFIG_SND_SUPPORT_OLD_API is not set # CONFIG_SND_VERBOSE_PRINTK is not set @@ -1649,6 +1727,7 @@ CONFIG_SND_VX_LIB=m CONFIG_SND_AC97_CODEC=m CONFIG_SND_AC97_BUS=m CONFIG_SND_DUMMY=m +# CONFIG_SND_VIRMIDI is not set CONFIG_SND_MTPAV=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_MPU401=m @@ -1804,14 +1883,14 @@ CONFIG_USB_PRINTER=m CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set # CONFIG_USB_STORAGE_DATAFAB is not set -# CONFIG_USB_STORAGE_FREECOM is not set -# CONFIG_USB_STORAGE_ISD200 is not set -# CONFIG_USB_STORAGE_DPCM is not set -# CONFIG_USB_STORAGE_USBAT is not set -# CONFIG_USB_STORAGE_SDDR09 is not set -# CONFIG_USB_STORAGE_SDDR55 is not set -# CONFIG_USB_STORAGE_JUMPSHOT is not set -# CONFIG_USB_STORAGE_ALAUDA is not set +CONFIG_USB_STORAGE_FREECOM=y +CONFIG_USB_STORAGE_ISD200=y +CONFIG_USB_STORAGE_DPCM=y +CONFIG_USB_STORAGE_USBAT=y +CONFIG_USB_STORAGE_SDDR09=y +CONFIG_USB_STORAGE_SDDR55=y +CONFIG_USB_STORAGE_JUMPSHOT=y +CONFIG_USB_STORAGE_ALAUDA=y # CONFIG_USB_LIBUSUAL is not set # @@ -1895,13 +1974,13 @@ CONFIG_USB_ZD1201=m # # USB Miscellaneous drivers # -# CONFIG_USB_EMI62 is not set -# CONFIG_USB_EMI26 is not set +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m # CONFIG_USB_AUERSWALD is not set # CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set -# CONFIG_USB_LCD is not set -# CONFIG_USB_LED is not set +CONFIG_USB_LCD=m +CONFIG_USB_LED=m # CONFIG_USB_CYTHERM is not set # CONFIG_USB_PHIDGETKIT is not set # CONFIG_USB_PHIDGETSERVO is not set @@ -1916,18 +1995,32 @@ CONFIG_USB_ZD1201=m CONFIG_USB_ATM=m CONFIG_USB_SPEEDTOUCH=m CONFIG_USB_CXACRU=m -# CONFIG_USB_UEAGLEATM is not set +CONFIG_USB_UEAGLEATM=m CONFIG_USB_XUSBATM=m # # USB Gadget Support # # CONFIG_USB_GADGET is not set +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_PXA2XX is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +# CONFIG_USB_ZERO is not set +# CONFIG_USB_ETH is not set +# CONFIG_USB_GADGETFS is not set +# CONFIG_USB_FILE_STORAGE is not set +# CONFIG_USB_G_SERIAL is not set # # MMC/SD Card support # -# CONFIG_MMC is not set +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=m +CONFIG_MMC_WBSD=m # # InfiniBand support @@ -1942,7 +2035,7 @@ CONFIG_USB_XUSBATM=m # # File systems # -CONFIG_EXT2_FS=y +CONFIG_EXT2_FS=m CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT2_FS_SECURITY=y @@ -1953,7 +2046,7 @@ CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set -CONFIG_FS_MBCACHE=y +CONFIG_FS_MBCACHE=m CONFIG_REISER4_FS=m # CONFIG_REISER4_DEBUG is not set CONFIG_REISERFS_FS=m @@ -2069,8 +2162,14 @@ CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPCSEC_GSS_SPKM3 is not set -# CONFIG_SMB_FS is not set -# CONFIG_CIFS is not set +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set +CONFIG_CIFS=m +CONFIG_CIFS_STATS=y +CONFIG_CIFS_STATS2=y +CONFIG_CIFS_XATTR=y +# CONFIG_CIFS_POSIX is not set +# CONFIG_CIFS_EXPERIMENTAL is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/config/kernel/kernel.config.i586.smp b/config/kernel/kernel.config.i586.smp index 43d0ff11f..aa3e5b40c 100644 --- a/config/kernel/kernel.config.i586.smp +++ b/config/kernel/kernel.config.i586.smp @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16.50-ipfire -# Sun Jul 15 23:15:28 2007 +# Wed Jul 18 11:25:20 2007 # CONFIG_X86_32=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -62,9 +62,9 @@ CONFIG_BASE_SMALL=0 # CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y -# CONFIG_MODULE_FORCE_UNLOAD is not set +CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_OBSOLETE_MODPARM=y -CONFIG_MODVERSIONS=y +# CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_KMOD=y CONFIG_STOP_MACHINE=y @@ -1029,7 +1029,34 @@ CONFIG_FUSION_CTL=m # # IEEE 1394 (FireWire) support # -# CONFIG_IEEE1394 is not set +CONFIG_IEEE1394=m + +# +# Subsystem Options +# +# CONFIG_IEEE1394_VERBOSEDEBUG is not set +# CONFIG_IEEE1394_OUI_DB is not set +CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y +CONFIG_IEEE1394_CONFIG_ROM_IP1394=y +# CONFIG_IEEE1394_EXPORT_FULL_API is not set + +# +# Device Drivers +# + +# +# Texas Instruments PCILynx requires I2C +# +CONFIG_IEEE1394_OHCI1394=m + +# +# Protocol Drivers +# +# CONFIG_IEEE1394_VIDEO1394 is not set +# CONFIG_IEEE1394_SBP2 is not set +CONFIG_IEEE1394_ETH1394=m +# CONFIG_IEEE1394_DV1394 is not set +# CONFIG_IEEE1394_RAWIO is not set # # I2O device support @@ -1165,7 +1192,10 @@ CONFIG_SUNDANCE_MMIO=y CONFIG_TLAN=m CONFIG_VIA_RHINE=m CONFIG_VIA_RHINE_MMIO=y -# CONFIG_NET_POCKET is not set +CONFIG_NET_POCKET=y +CONFIG_ATP=m +CONFIG_DE600=m +CONFIG_DE620=m # # Ethernet (1000 Mbit) @@ -1400,10 +1430,10 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y -CONFIG_KEYBOARD_SUNKBD=y -CONFIG_KEYBOARD_LKKBD=y -CONFIG_KEYBOARD_XTKBD=y -CONFIG_KEYBOARD_NEWTON=y +CONFIG_KEYBOARD_SUNKBD=m +CONFIG_KEYBOARD_LKKBD=m +CONFIG_KEYBOARD_XTKBD=m +CONFIG_KEYBOARD_NEWTON=m # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TOUCHSCREEN is not set @@ -1477,8 +1507,53 @@ CONFIG_IPMI_POWEROFF=m # # Watchdog Cards # -# CONFIG_WATCHDOG is not set -# CONFIG_HW_RANDOM is not set +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_ACQUIRE_WDT=m +CONFIG_ADVANTECH_WDT=m +CONFIG_ALIM1535_WDT=m +CONFIG_ALIM7101_WDT=m +CONFIG_SC520_WDT=m +CONFIG_EUROTECH_WDT=m +CONFIG_IB700_WDT=m +CONFIG_IBMASR=m +CONFIG_WAFER_WDT=m +CONFIG_I6300ESB_WDT=m +CONFIG_I8XX_TCO=m +CONFIG_SC1200_WDT=m +CONFIG_60XX_WDT=m +CONFIG_SBC8360_WDT=m +CONFIG_CPU5_WDT=m +CONFIG_W83627HF_WDT=m +CONFIG_W83877F_WDT=m +CONFIG_W83977F_WDT=m +CONFIG_MACHZ_WDT=m +CONFIG_SBC_EPX_C3_WATCHDOG=m + +# +# ISA-based Watchdog Cards +# +# CONFIG_PCWATCHDOG is not set +# CONFIG_MIXCOMWD is not set +# CONFIG_WDT is not set + +# +# PCI-based Watchdog Cards +# +CONFIG_PCIPCWATCHDOG=m +CONFIG_WDTPCI=m +CONFIG_WDT_501_PCI=y + +# +# USB-based Watchdog Cards +# +CONFIG_USBPCWATCHDOG=m +CONFIG_HW_RANDOM=m # CONFIG_NVRAM is not set CONFIG_RTC=y # CONFIG_DTLK is not set @@ -1492,12 +1567,12 @@ CONFIG_RTC=y # CONFIG_AGP is not set # CONFIG_DRM is not set CONFIG_MWAVE=m -# CONFIG_CS5535_GPIO is not set +CONFIG_CS5535_GPIO=m # CONFIG_RAW_DRIVER is not set CONFIG_HPET=y # CONFIG_HPET_RTC_IRQ is not set CONFIG_HPET_MMAP=y -# CONFIG_HANGCHECK_TIMER is not set +CONFIG_HANGCHECK_TIMER=m # # TPM devices @@ -1531,12 +1606,12 @@ CONFIG_W1_DS2433_CRC=y # # Hardware Monitoring support # -CONFIG_HWMON=y +CONFIG_HWMON=m # CONFIG_HWMON_VID is not set -CONFIG_SENSORS_K8TEMP=y -# CONFIG_SENSORS_F71805F is not set -# CONFIG_SENSORS_PC87427 is not set -# CONFIG_SENSORS_HDAPS is not set +CONFIG_SENSORS_K8TEMP=m +CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_HDAPS=m # CONFIG_HWMON_DEBUG_CHIP is not set # @@ -1633,11 +1708,14 @@ CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m -# CONFIG_SND_SEQUENCER is not set +CONFIG_SND_SEQUENCER=m +# CONFIG_SND_SEQ_DUMMY is not set CONFIG_SND_OSSEMUL=y CONFIG_SND_MIXER_OSS=m CONFIG_SND_PCM_OSS=m +# CONFIG_SND_SEQUENCER_OSS is not set CONFIG_SND_RTCTIMER=m +CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y # CONFIG_SND_DYNAMIC_MINORS is not set # CONFIG_SND_SUPPORT_OLD_API is not set # CONFIG_SND_VERBOSE_PRINTK is not set @@ -1652,6 +1730,7 @@ CONFIG_SND_VX_LIB=m CONFIG_SND_AC97_CODEC=m CONFIG_SND_AC97_BUS=m CONFIG_SND_DUMMY=m +# CONFIG_SND_VIRMIDI is not set CONFIG_SND_MTPAV=m CONFIG_SND_SERIAL_U16550=m CONFIG_SND_MPU401=m @@ -1807,14 +1886,14 @@ CONFIG_USB_PRINTER=m CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set # CONFIG_USB_STORAGE_DATAFAB is not set -# CONFIG_USB_STORAGE_FREECOM is not set -# CONFIG_USB_STORAGE_ISD200 is not set -# CONFIG_USB_STORAGE_DPCM is not set -# CONFIG_USB_STORAGE_USBAT is not set -# CONFIG_USB_STORAGE_SDDR09 is not set -# CONFIG_USB_STORAGE_SDDR55 is not set -# CONFIG_USB_STORAGE_JUMPSHOT is not set -# CONFIG_USB_STORAGE_ALAUDA is not set +CONFIG_USB_STORAGE_FREECOM=y +CONFIG_USB_STORAGE_ISD200=y +CONFIG_USB_STORAGE_DPCM=y +CONFIG_USB_STORAGE_USBAT=y +CONFIG_USB_STORAGE_SDDR09=y +CONFIG_USB_STORAGE_SDDR55=y +CONFIG_USB_STORAGE_JUMPSHOT=y +CONFIG_USB_STORAGE_ALAUDA=y # CONFIG_USB_LIBUSUAL is not set # @@ -1898,13 +1977,13 @@ CONFIG_USB_ZD1201=m # # USB Miscellaneous drivers # -# CONFIG_USB_EMI62 is not set -# CONFIG_USB_EMI26 is not set +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m # CONFIG_USB_AUERSWALD is not set # CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set -# CONFIG_USB_LCD is not set -# CONFIG_USB_LED is not set +CONFIG_USB_LCD=m +CONFIG_USB_LED=m # CONFIG_USB_CYTHERM is not set # CONFIG_USB_PHIDGETKIT is not set # CONFIG_USB_PHIDGETSERVO is not set @@ -1919,7 +1998,7 @@ CONFIG_USB_ZD1201=m CONFIG_USB_ATM=m CONFIG_USB_SPEEDTOUCH=m CONFIG_USB_CXACRU=m -# CONFIG_USB_UEAGLEATM is not set +CONFIG_USB_UEAGLEATM=m CONFIG_USB_XUSBATM=m # @@ -1930,7 +2009,10 @@ CONFIG_USB_XUSBATM=m # # MMC/SD Card support # -# CONFIG_MMC is not set +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=m +CONFIG_MMC_WBSD=m # # InfiniBand support @@ -1945,7 +2027,7 @@ CONFIG_USB_XUSBATM=m # # File systems # -CONFIG_EXT2_FS=y +CONFIG_EXT2_FS=m CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT2_FS_SECURITY=y @@ -1956,7 +2038,7 @@ CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set -CONFIG_FS_MBCACHE=y +CONFIG_FS_MBCACHE=m CONFIG_REISER4_FS=m # CONFIG_REISER4_DEBUG is not set CONFIG_REISERFS_FS=m @@ -2072,8 +2154,14 @@ CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPCSEC_GSS_SPKM3 is not set -# CONFIG_SMB_FS is not set -# CONFIG_CIFS is not set +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set +CONFIG_CIFS=m +CONFIG_CIFS_STATS=y +CONFIG_CIFS_STATS2=y +CONFIG_CIFS_XATTR=y +# CONFIG_CIFS_POSIX is not set +# CONFIG_CIFS_EXPERIMENTAL is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 838f8a4ba..1479e9d88 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -38,6 +38,7 @@ * arping-2.05 * as86-0.16.17 * asterisk-1.4.0 +* asterisk-1.4.8 * autoconf-2.59 * automake-1.9.6 * backup-ipfire @@ -142,6 +143,7 @@ * libpcap-0.8.3 * libpng-1.2.12 * libpri-1.4.0 +* libpri-1.4.1 * libsafe_2.0-16 * libsigc++-2.0.17 * libtool-1.5.22 @@ -266,4 +268,5 @@ * wireless_tools.28 * xmbmon205 * zaptel-1.4.0 +* zaptel-1.4.4 * zlib-1.2.3 diff --git a/lfs/asterisk b/lfs/asterisk index 040b3c568..905640d3b 100644 --- a/lfs/asterisk +++ b/lfs/asterisk @@ -26,7 +26,7 @@ include Config -VER = 1.4.0 +VER = 1.4.8 THISAPP = asterisk-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -41,22 +41,22 @@ PAK_VER = 1 ############################################################################### objects = $(DL_FILE) \ - asterisk-sounds-de-1.2.5.tar.gz \ - asterisk-sounds-1.2.1.tar.gz \ - asterisk-addons-1.4.0.tar.gz \ - asterisk-perl-0.08.tar.gz + asterisk-1.4-de-prompts.tar.gz \ + asterisk-core-sounds-en-alaw-current.tar.gz \ + asterisk-extra-sounds-en-alaw-current.tar.gz \ + asterisk-addons-1.4.2.tar.gz $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -asterisk-sounds-de-1.2.5.tar.gz = $(URL_IPFIRE)/asterisk-sounds-de-1.2.5.tar.gz -asterisk-sounds-1.2.1.tar.gz = $(URL_IPFIRE)/asterisk-sounds-1.2.1.tar.gz -asterisk-addons-1.4.0.tar.gz = $(URL_IPFIRE)/asterisk-addons-1.4.0.tar.gz -asterisk-perl-0.08.tar.gz = $(URL_IPFIRE)/asterisk-perl-0.08.tar.gz +asterisk-core-sounds-en-alaw-current.tar.gz = $(URL_IPFIRE)/asterisk-core-sounds-en-alaw-current.tar.gz +asterisk-extra-sounds-en-alaw-current.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds-en-alaw-current.tar.gz +asterisk-1.4-de-prompts.tar.gz = $(URL_IPFIRE)/asterisk-1.4-de-prompts.tar.gz +asterisk-addons-1.4.2.tar.gz = $(URL_IPFIRE)/asterisk-addons-1.4.2.tar.gz -$(DL_FILE)_MD5 = b4586be9bf00d438d6a53d408ba247d4 -asterisk-sounds-1.2.1.tar.gz_MD5 = bed4259905a7d7bc070c6319142b2075 -asterisk-sounds-de-1.2.5.tar.gz_MD5 = 3793735c44de899dbacb8c192501aa14 -asterisk-addons-1.4.0.tar.gz_MD5 = 603de356bc330bf117c765ced6ede746 -asterisk-perl-0.08.tar.gz_MD5 = 73a47caaff8cafbf78053692f408ceb6 +$(DL_FILE)_MD5 = 7263ff56ad93cbb5efb971a536ee6a51 +asterisk-core-sounds-en-alaw-current.tar.gz_MD5 = e9446bee485d1b4fca6e8b05457dda25 +asterisk-extra-sounds-en-alaw-current.tar.gz_MD5 = 89bca77c9bb91abd9e87447b3a9d3b07 +asterisk-1.4-de-prompts.tar.gz_MD5 = 626a2b95071a5505851e43874dfbfd5c +asterisk-addons-1.4.2.tar.gz_MD5 = c080b02e6ddc81dab6a64691af890805 install : $(TARGET) @@ -67,7 +67,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) dist: - @$(PAK) + $(PAK) ############################################################################### # Downloading, checking, md5sum @@ -88,26 +88,25 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -###### We have to wait for a new bristuff ###### -###### cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/asterisk.patch + @rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-* && \ + cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire + cd $(DIR_APP) && cp -fv $(DIR_SRC)/config/asterisk/asterisk.makeopts \ + menuselect.makeopts + cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-core-sounds-en-alaw-current.tar.gz \ + $(DIR_APP)/sounds/asterisk-core-sounds-en-alaw-1.4.7.tar.gz + cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-extra-sounds-en-alaw-current.tar.gz \ + $(DIR_APP)/sounds/asterisk-extra-sounds-en-alaw-1.4.6.tar.gz cd $(DIR_APP) && make $(MAKETUNING) all cd $(DIR_APP) && make install cd $(DIR_APP) && make samples - tar xfz $(DIR_DL)/asterisk-sounds-de-1.2.5.tar.gz -C /var/lib/asterisk/sounds/ - rm -f /var/lib/asterisk/sounds/README.txt - cd $(DIR_SRC) && tar zxf $(DIR_DL)/asterisk-sounds-1.2.1.tar.gz - cd $(DIR_SRC)/asterisk-sounds-1.2.1/ && make all install - rm -rf $(DIR_SRC)/asterisk-sounds-1.2.1 - cd $(DIR_SRC) && tar zxf $(DIR_DL)/asterisk-addons-1.4.0.tar.gz - cd $(DIR_SRC)/asterisk-addons-* && ./configure --prefix=/usr --sysconfdir=/var/ipfire + cd $(DIR_SRC) && tar zxf $(DIR_DL)/asterisk-addons-1.4.2.tar.gz + cd $(DIR_SRC)/asterisk-addons-* && ./configure --prefix=/usr \ + --sysconfdir=/var/ipfire + cd $(DIR_SRC)/asterisk-addons-* && cp -f $(DIR_SRC)/config/asterisk/addons.makeopts \ + menuselect.makeopts cd $(DIR_SRC)/asterisk-addons-* && make $(MAKETUNING) all install - rm -rf $(DIR_SRC)/asterisk-addons-* - cd $(DIR_SRC) && tar zxf $(DIR_DL)/asterisk-perl-0.08.tar.gz - cd $(DIR_SRC)/asterisk-perl-0.08/ && perl Makefile.PL - cd $(DIR_SRC)/asterisk-perl-0.08/ && make $(MAKETUNING) - cd $(DIR_SRC)/asterisk-perl-0.08/ && make install - rm -rf $(DIR_SRC)/asterisk-perl-0.08 - @rm -rf $(DIR_APP) + tar xfz $(DIR_DL)/asterisk-1.4-de-prompts.tar.gz -C /var/lib/asterisk/sounds/ + -rm -f /var/lib/asterisk/sounds/README.txt + @rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-* @$(POSTBUILD) diff --git a/lfs/clamav b/lfs/clamav index b52577afe..2fbb1ccc4 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 2 +PAK_VER = 1 ############################################################################### # Top-level Rules diff --git a/lfs/libpri b/lfs/libpri index b3c597129..5be2f5f8c 100644 --- a/lfs/libpri +++ b/lfs/libpri @@ -26,7 +26,7 @@ include Config -VER = 1.4.0 +VER = 1.4.1 THISAPP = libpri-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 09b039226e43a810d523bc076823c6a9 +$(DL_FILE)_MD5 = 9e5da1f2267711d9aaaf91ffa925b219 install : $(TARGET) @@ -52,9 +52,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: - @$(PAK) - ############################################################################### # Downloading, checking, md5sum ############################################################################### @@ -75,7 +72,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libpri.patch cd $(DIR_APP) && make $(MAKETUNING) clean all KVERS=$(KVER) cd $(DIR_APP) && make install KVERS=$(KVER) @rm -rf $(DIR_APP) diff --git a/lfs/zaptel b/lfs/zaptel index 42bf6160c..852e3c73b 100644 --- a/lfs/zaptel +++ b/lfs/zaptel @@ -26,7 +26,7 @@ include Config -VER = 1.4.0 +VER = 1.4.4 THISAPP = zaptel-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 27b43dfa3f1629f063a20779300f68c8 +$(DL_FILE)_MD5 = 46c0b34dc9279265a54cbbee827bae7c install : $(TARGET) @@ -59,7 +59,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) dist: - @$(PAK) + $(PAK) ############################################################################### # Downloading, checking, md5sum @@ -81,26 +81,28 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - # Build Zaptel -# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/zaptel.patch ifeq "$(SMP)" "1" cd $(DIR_APP) && ./configure --prefix=/usr - cd $(DIR_APP) && make linux26 KVERS=$(KVER)-ipfire-smp + cd $(DIR_APP) && cp -f $(DIR_SRC)/config/asterisk/zaptel.makeopts \ + menuselect.makeopts + cd $(DIR_APP) && make KVERS=$(KVER)-ipfire-smp cd $(DIR_APP) && make install KVERS=$(KVER)-ipfire-smp else cd $(DIR_APP) && ./configure --prefix=/usr - cd $(DIR_APP) && make linux26 KVERS=$(KVER)-ipfire + cd $(DIR_APP) && cp -f $(DIR_SRC)/config/asterisk/zaptel.makeopts \ + menuselect.makeopts + cd $(DIR_APP) && make KVERS=$(KVER)-ipfire cd $(DIR_APP) && make install KVERS=$(KVER)-ipfire endif - cd $(DIR_APP) && install -D -m 644 zaptel.h /usr/include/zaptel.h - cd $(DIR_APP) && install -D -m 644 zconfig.h /usr/include/zconfig.h - cd $(DIR_APP) && install -D -m 644 ecdis.h /usr/include/ecdis.h - cd $(DIR_APP) && install -D -m 644 fasthdlc.h /usr/include/fasthdlc.h - cd $(DIR_APP) && install -D -m 644 kb1ec.h /usr/include/kb1ec.h - cd $(DIR_APP) && install -D -m 644 kb1ec_const.h /usr/include/kb1ec_const.h - cd $(DIR_APP) && install -D -m 644 biquad.h /usr/include/biquad.h - cd $(DIR_APP) && install -D -m 644 arith.h /usr/include/arith.h - cd $(DIR_APP) && install -D -m 644 mg2ec.h /usr/include/mg2ec.h - cd $(DIR_APP) && install -D -m 644 mg2ec_const.h /usr/include/mg2ec_const.h + #cd $(DIR_APP) && install -D -m 644 zaptel.h /usr/include/zaptel.h + #cd $(DIR_APP) && install -D -m 644 zconfig.h /usr/include/zconfig.h + #cd $(DIR_APP) && install -D -m 644 ecdis.h /usr/include/ecdis.h + #cd $(DIR_APP) && install -D -m 644 fasthdlc.h /usr/include/fasthdlc.h + #cd $(DIR_APP) && install -D -m 644 kb1ec.h /usr/include/kb1ec.h + #cd $(DIR_APP) && install -D -m 644 kb1ec_const.h /usr/include/kb1ec_const.h + #cd $(DIR_APP) && install -D -m 644 biquad.h /usr/include/biquad.h + #cd $(DIR_APP) && install -D -m 644 arith.h /usr/include/arith.h + #cd $(DIR_APP) && install -D -m 644 mg2ec.h /usr/include/mg2ec.h + #cd $(DIR_APP) && install -D -m 644 mg2ec_const.h /usr/include/mg2ec_const.h @rm -rf $(DIR_APP) @$(POSTBUILD) -- 2.39.2