Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
commit
cfc70a4802
@ -1,92 +0,0 @@
|
||||
CONFIG_SYSVIPC=y
|
||||
CONFIG_NO_HZ=y
|
||||
CONFIG_HIGH_RES_TIMERS=y
|
||||
CONFIG_LOG_BUF_SHIFT=14
|
||||
CONFIG_BLK_DEV_INITRD=y
|
||||
CONFIG_EXPERT=y
|
||||
# CONFIG_KALLSYMS is not set
|
||||
CONFIG_MODULES=y
|
||||
CONFIG_MODULE_UNLOAD=y
|
||||
# CONFIG_BLK_DEV_BSG is not set
|
||||
CONFIG_PARTITION_ADVANCED=y
|
||||
# CONFIG_PPC_CHRP is not set
|
||||
# CONFIG_PPC_PMAC is not set
|
||||
CONFIG_PPC_83xx=y
|
||||
CONFIG_MPC831x_RDB=y
|
||||
CONFIG_PCI=y
|
||||
CONFIG_NET=y
|
||||
CONFIG_PACKET=y
|
||||
CONFIG_UNIX=y
|
||||
CONFIG_INET=y
|
||||
CONFIG_IP_MULTICAST=y
|
||||
CONFIG_IP_PNP=y
|
||||
CONFIG_IP_PNP_DHCP=y
|
||||
CONFIG_IP_PNP_BOOTP=y
|
||||
CONFIG_SYN_COOKIES=y
|
||||
# CONFIG_INET_LRO is not set
|
||||
# CONFIG_IPV6 is not set
|
||||
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
|
||||
# CONFIG_FW_LOADER is not set
|
||||
CONFIG_MTD=y
|
||||
CONFIG_MTD_CMDLINE_PARTS=y
|
||||
CONFIG_MTD_BLOCK=y
|
||||
CONFIG_MTD_CFI=y
|
||||
CONFIG_MTD_CFI_AMDSTD=y
|
||||
CONFIG_MTD_PHYSMAP_OF=y
|
||||
CONFIG_MTD_NAND=y
|
||||
CONFIG_MTD_NAND_FSL_ELBC=y
|
||||
CONFIG_BLK_DEV_LOOP=y
|
||||
CONFIG_BLK_DEV_RAM=y
|
||||
CONFIG_BLK_DEV_RAM_SIZE=32768
|
||||
CONFIG_CHR_DEV_SG=y
|
||||
CONFIG_SCSI_SPI_ATTRS=y
|
||||
CONFIG_ATA=y
|
||||
CONFIG_SATA_FSL=y
|
||||
CONFIG_MD=y
|
||||
CONFIG_BLK_DEV_MD=y
|
||||
CONFIG_MD_LINEAR=y
|
||||
CONFIG_MD_RAID0=y
|
||||
CONFIG_MD_RAID1=y
|
||||
CONFIG_NETDEVICES=y
|
||||
CONFIG_GIANFAR=y
|
||||
CONFIG_E100=y
|
||||
# CONFIG_INPUT_MOUSEDEV is not set
|
||||
# CONFIG_INPUT_KEYBOARD is not set
|
||||
# CONFIG_INPUT_MOUSE is not set
|
||||
# CONFIG_SERIO is not set
|
||||
# CONFIG_VT is not set
|
||||
CONFIG_SERIAL_8250=y
|
||||
CONFIG_SERIAL_8250_CONSOLE=y
|
||||
CONFIG_HW_RANDOM=y
|
||||
CONFIG_I2C=y
|
||||
CONFIG_I2C_CHARDEV=y
|
||||
CONFIG_I2C_MPC=y
|
||||
CONFIG_SPI=y
|
||||
CONFIG_SPI_BITBANG=y
|
||||
CONFIG_WATCHDOG=y
|
||||
# CONFIG_USB_HID is not set
|
||||
CONFIG_USB=y
|
||||
CONFIG_USB_MON=y
|
||||
CONFIG_USB_EHCI_HCD=y
|
||||
CONFIG_USB_EHCI_FSL=y
|
||||
CONFIG_USB_OHCI_HCD=y
|
||||
CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
|
||||
CONFIG_USB_UHCI_HCD=y
|
||||
CONFIG_USB_STORAGE=y
|
||||
CONFIG_USB_GADGET=y
|
||||
CONFIG_USB_ETH=m
|
||||
CONFIG_RTC_CLASS=y
|
||||
CONFIG_RTC_INTF_DEV_UIE_EMUL=y
|
||||
CONFIG_RTC_DRV_DS1307=y
|
||||
CONFIG_EXT2_FS=y
|
||||
CONFIG_EXT3_FS=y
|
||||
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
|
||||
CONFIG_PROC_KCORE=y
|
||||
CONFIG_TMPFS=y
|
||||
CONFIG_JFFS2_FS=y
|
||||
CONFIG_NFS_FS=y
|
||||
CONFIG_NFS_V4=y
|
||||
CONFIG_ROOT_NFS=y
|
||||
CONFIG_DETECT_HUNG_TASK=y
|
||||
CONFIG_CRYPTO_PCBC=m
|
||||
# CONFIG_CRYPTO_ANSI_CPRNG is not set
|
48
board/freescale/mpc8315erdb/linux-4.1.config
Normal file
48
board/freescale/mpc8315erdb/linux-4.1.config
Normal file
@ -0,0 +1,48 @@
|
||||
CONFIG_SYSVIPC=y
|
||||
CONFIG_NO_HZ=y
|
||||
CONFIG_HIGH_RES_TIMERS=y
|
||||
CONFIG_LOG_BUF_SHIFT=14
|
||||
CONFIG_EXPERT=y
|
||||
CONFIG_MODULES=y
|
||||
# CONFIG_PPC_CHRP is not set
|
||||
# CONFIG_PPC_PMAC is not set
|
||||
CONFIG_PPC_83xx=y
|
||||
CONFIG_MPC831x_RDB=y
|
||||
CONFIG_PCI=y
|
||||
CONFIG_NET=y
|
||||
CONFIG_PACKET=y
|
||||
CONFIG_UNIX=y
|
||||
CONFIG_INET=y
|
||||
CONFIG_MTD=y
|
||||
CONFIG_MTD_CMDLINE_PARTS=y
|
||||
CONFIG_MTD_BLOCK=y
|
||||
CONFIG_MTD_CFI=y
|
||||
CONFIG_MTD_CFI_AMDSTD=y
|
||||
CONFIG_MTD_PHYSMAP_OF=y
|
||||
CONFIG_MTD_NAND=y
|
||||
CONFIG_MTD_NAND_FSL_ELBC=y
|
||||
CONFIG_MD=y
|
||||
CONFIG_BLK_DEV_MD=y
|
||||
CONFIG_MD_LINEAR=y
|
||||
CONFIG_MD_RAID0=y
|
||||
CONFIG_MD_RAID1=y
|
||||
CONFIG_NETDEVICES=y
|
||||
CONFIG_GIANFAR=y
|
||||
CONFIG_E100=y
|
||||
CONFIG_SERIAL_8250=y
|
||||
CONFIG_SERIAL_8250_CONSOLE=y
|
||||
CONFIG_I2C=y
|
||||
CONFIG_I2C_CHARDEV=y
|
||||
CONFIG_I2C_MPC=y
|
||||
CONFIG_SPI=y
|
||||
CONFIG_SPI_BITBANG=y
|
||||
CONFIG_WATCHDOG=y
|
||||
CONFIG_USB=y
|
||||
CONFIG_USB_EHCI_HCD=y
|
||||
CONFIG_USB_EHCI_FSL=y
|
||||
CONFIG_RTC_CLASS=y
|
||||
CONFIG_RTC_INTF_DEV_UIE_EMUL=y
|
||||
CONFIG_RTC_DRV_DS1307=y
|
||||
CONFIG_TMPFS=y
|
||||
CONFIG_JFFS2_FS=y
|
||||
CONFIG_CRYPTO_DEV_TALITOS=y
|
@ -1,23 +1,11 @@
|
||||
CONFIG_PPC_85xx=y
|
||||
CONFIG_PHYS_64BIT=y
|
||||
CONFIG_SYSVIPC=y
|
||||
CONFIG_POSIX_MQUEUE=y
|
||||
CONFIG_AUDIT=y
|
||||
CONFIG_IRQ_DOMAIN_DEBUG=y
|
||||
CONFIG_NO_HZ=y
|
||||
CONFIG_HIGH_RES_TIMERS=y
|
||||
CONFIG_BSD_PROCESS_ACCT=y
|
||||
CONFIG_IKCONFIG=y
|
||||
CONFIG_IKCONFIG_PROC=y
|
||||
CONFIG_LOG_BUF_SHIFT=14
|
||||
CONFIG_BLK_DEV_INITRD=y
|
||||
CONFIG_EXPERT=y
|
||||
CONFIG_KALLSYMS_ALL=y
|
||||
CONFIG_MODULES=y
|
||||
CONFIG_MODULE_UNLOAD=y
|
||||
CONFIG_MODULE_FORCE_UNLOAD=y
|
||||
CONFIG_MODVERSIONS=y
|
||||
# CONFIG_BLK_DEV_BSG is not set
|
||||
CONFIG_P1010_RDB=y
|
||||
CONFIG_HIGHMEM=y
|
||||
CONFIG_SWIOTLB=y
|
||||
@ -28,26 +16,7 @@ CONFIG_RAPIDIO=y
|
||||
CONFIG_NET=y
|
||||
CONFIG_PACKET=y
|
||||
CONFIG_UNIX=y
|
||||
CONFIG_XFRM_USER=y
|
||||
CONFIG_NET_KEY=y
|
||||
CONFIG_INET=y
|
||||
CONFIG_IP_MULTICAST=y
|
||||
CONFIG_IP_ADVANCED_ROUTER=y
|
||||
CONFIG_IP_MULTIPLE_TABLES=y
|
||||
CONFIG_IP_ROUTE_MULTIPATH=y
|
||||
CONFIG_IP_ROUTE_VERBOSE=y
|
||||
CONFIG_IP_PNP=y
|
||||
CONFIG_IP_PNP_DHCP=y
|
||||
CONFIG_IP_PNP_BOOTP=y
|
||||
CONFIG_IP_PNP_RARP=y
|
||||
CONFIG_NET_IPIP=y
|
||||
CONFIG_IP_MROUTE=y
|
||||
CONFIG_IP_PIMSM_V1=y
|
||||
CONFIG_IP_PIMSM_V2=y
|
||||
CONFIG_INET_ESP=y
|
||||
# CONFIG_INET_XFRM_MODE_BEET is not set
|
||||
CONFIG_IPV6=y
|
||||
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
|
||||
CONFIG_DEVTMPFS=y
|
||||
CONFIG_MTD=y
|
||||
CONFIG_MTD_CMDLINE_PARTS=y
|
||||
@ -60,20 +29,11 @@ CONFIG_MTD_PHYSMAP_OF=y
|
||||
CONFIG_MTD_NAND=y
|
||||
CONFIG_MTD_NAND_FSL_ELBC=y
|
||||
CONFIG_MTD_NAND_FSL_IFC=y
|
||||
CONFIG_BLK_DEV_LOOP=y
|
||||
CONFIG_BLK_DEV_NBD=y
|
||||
CONFIG_BLK_DEV_RAM=y
|
||||
CONFIG_BLK_DEV_RAM_SIZE=131072
|
||||
CONFIG_EEPROM_LEGACY=y
|
||||
CONFIG_BLK_DEV_SD=y
|
||||
CONFIG_CHR_DEV_ST=y
|
||||
CONFIG_BLK_DEV_SR=y
|
||||
CONFIG_CHR_DEV_SG=y
|
||||
CONFIG_SCSI_LOGGING=y
|
||||
CONFIG_ATA=y
|
||||
CONFIG_SATA_FSL=y
|
||||
CONFIG_NETDEVICES=y
|
||||
CONFIG_DUMMY=y
|
||||
CONFIG_GIANFAR=y
|
||||
CONFIG_VITESSE_PHY=y
|
||||
CONFIG_FIXED_PHY=y
|
||||
@ -91,9 +51,7 @@ CONFIG_I2C_MPC=y
|
||||
CONFIG_SPI=y
|
||||
CONFIG_SPI_FSL_SPI=y
|
||||
CONFIG_SPI_FSL_ESPI=y
|
||||
# CONFIG_HWMON is not set
|
||||
CONFIG_USB=y
|
||||
CONFIG_USB_MON=y
|
||||
CONFIG_USB_EHCI_HCD=y
|
||||
CONFIG_USB_EHCI_FSL=y
|
||||
CONFIG_USB_STORAGE=y
|
||||
@ -101,29 +59,12 @@ CONFIG_MMC=y
|
||||
CONFIG_MMC_SDHCI=y
|
||||
CONFIG_MMC_SDHCI_PLTFM=y
|
||||
CONFIG_MMC_SDHCI_OF_ESDHC=y
|
||||
CONFIG_EDAC=y
|
||||
CONFIG_EDAC_MM_EDAC=y
|
||||
CONFIG_RTC_CLASS=y
|
||||
CONFIG_RTC_DRV_CMOS=y
|
||||
CONFIG_DMADEVICES=y
|
||||
CONFIG_FSL_DMA=y
|
||||
CONFIG_EXT4_FS=y
|
||||
CONFIG_MSDOS_FS=m
|
||||
CONFIG_VFAT_FS=y
|
||||
CONFIG_PROC_KCORE=y
|
||||
CONFIG_TMPFS=y
|
||||
CONFIG_JFFS2_FS=y
|
||||
CONFIG_SQUASHFS=y
|
||||
CONFIG_NFS_FS=y
|
||||
CONFIG_NFS_V4=y
|
||||
CONFIG_ROOT_NFS=y
|
||||
CONFIG_NFSD=y
|
||||
CONFIG_CRC_T10DIF=y
|
||||
CONFIG_DEBUG_INFO=y
|
||||
CONFIG_DEBUG_FS=y
|
||||
CONFIG_DETECT_HUNG_TASK=y
|
||||
CONFIG_CRYPTO_PCBC=m
|
||||
CONFIG_CRYPTO_SHA256=y
|
||||
CONFIG_CRYPTO_SHA512=y
|
||||
# CONFIG_CRYPTO_ANSI_CPRNG is not set
|
||||
CONFIG_CRYPTO_DEV_FSL_CAAM=y
|
@ -12,15 +12,15 @@ BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER=y
|
||||
|
||||
# Lock headers version to match and avoid breakage
|
||||
BR2_KERNEL_HEADERS_VERSION=y
|
||||
BR2_DEFAULT_KERNEL_VERSION="3.18.1"
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
|
||||
BR2_DEFAULT_KERNEL_VERSION="4.1.4"
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
|
||||
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.1"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.1.4"
|
||||
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/mpc8315erdb/linux-3.18.config"
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/mpc8315erdb/linux-4.1.config"
|
||||
BR2_LINUX_KERNEL_UIMAGE=y
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="mpc8315erdb"
|
||||
|
@ -11,15 +11,15 @@ BR2_TARGET_ROOTFS_JFFS2_CUSTOM_EBSIZE=0x20000
|
||||
|
||||
# Lock headers version to match and avoid breakage
|
||||
BR2_KERNEL_HEADERS_VERSION=y
|
||||
BR2_DEFAULT_KERNEL_VERSION="3.18.1"
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
|
||||
BR2_DEFAULT_KERNEL_VERSION="4.1.4"
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
|
||||
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.1"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.1.4"
|
||||
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/p1010rdb/linux-3.18.config"
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/p1010rdb/linux-4.1.config"
|
||||
BR2_LINUX_KERNEL_UIMAGE=y
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="p1010rdb-pa"
|
||||
|
@ -7,16 +7,16 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
|
||||
|
||||
BR2_TARGET_GENERIC_GETTY_PORT="tty1"
|
||||
|
||||
# Lock to 4.0 headers as the RPi kernel stable tree is
|
||||
# based off the 4.0 branch
|
||||
# Lock to 4.1 headers as the RPi kernel stable tree is
|
||||
# based off the 4.1 branch
|
||||
BR2_KERNEL_HEADERS_VERSION=y
|
||||
BR2_DEFAULT_KERNEL_VERSION="4.0.6"
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_0=y
|
||||
BR2_DEFAULT_KERNEL_VERSION="4.1.5"
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
|
||||
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_GIT=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git"
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f90f981770e3ac8506dc84c9cd01471faaa0b0c2"
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="592503752b6951972f161f04280683c5af38d173"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
|
||||
BR2_LINUX_KERNEL_ZIMAGE=y
|
||||
|
||||
|
@ -3,19 +3,18 @@ BR2_arm1176jzf_s=y
|
||||
|
||||
BR2_TARGET_GENERIC_GETTY_PORT="tty1"
|
||||
|
||||
# Lock to 4.0 headers as the RPi kernel stable tree is
|
||||
# based off the 4.0 branch
|
||||
# Lock to 4.1 headers as the RPi kernel stable tree is
|
||||
# based off the 4.1 branch
|
||||
BR2_KERNEL_HEADERS_VERSION=y
|
||||
BR2_DEFAULT_KERNEL_VERSION="4.0.6"
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_0=y
|
||||
BR2_DEFAULT_KERNEL_VERSION="4.1.5"
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
|
||||
|
||||
BR2_TOOLCHAIN_BUILDROOT_CXX=y
|
||||
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_GIT=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git"
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f90f981770e3ac8506dc84c9cd01471faaa0b0c2"
|
||||
BR2_LINUX_KERNEL_USE_DEFCONFIG=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="592503752b6951972f161f04280683c5af38d173"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
|
||||
BR2_LINUX_KERNEL_ZIMAGE=y
|
||||
|
||||
|
@ -21,7 +21,7 @@ choice
|
||||
prompt "Kernel version"
|
||||
|
||||
config BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
bool "4.1.4"
|
||||
bool "4.1.5"
|
||||
|
||||
config BR2_LINUX_KERNEL_SAME_AS_HEADERS
|
||||
bool "Same as toolchain kernel headers"
|
||||
@ -109,7 +109,7 @@ config BR2_LINUX_KERNEL_CUSTOM_LOCAL_PATH
|
||||
|
||||
config BR2_LINUX_KERNEL_VERSION
|
||||
string
|
||||
default "4.1.4" if BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
default "4.1.5" if BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
|
||||
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
|
||||
if BR2_LINUX_KERNEL_CUSTOM_VERSION
|
||||
|
@ -173,6 +173,7 @@ menu "Filesystem and flash utilities"
|
||||
source "package/ntfs-3g/Config.in"
|
||||
source "package/simicsfs/Config.in"
|
||||
source "package/squashfs/Config.in"
|
||||
source "package/sp-oops-extract/Config.in"
|
||||
source "package/sshfs/Config.in"
|
||||
source "package/sunxi-tools/Config.in"
|
||||
source "package/unionfs/Config.in"
|
||||
@ -646,6 +647,7 @@ menu "external python modules"
|
||||
source "package/python-pypcap/Config.in"
|
||||
source "package/python-pyqt/Config.in"
|
||||
source "package/python-pyro/Config.in"
|
||||
source "package/python-pyroute2/Config.in"
|
||||
source "package/python-pysendfile/Config.in"
|
||||
source "package/python-pysnmp/Config.in"
|
||||
source "package/python-pysnmp-apps/Config.in"
|
||||
@ -693,11 +695,15 @@ menu "Audio/Sound"
|
||||
source "package/celt051/Config.in"
|
||||
source "package/fdk-aac/Config.in"
|
||||
source "package/libao/Config.in"
|
||||
source "package/libbroadvoice/Config.in"
|
||||
source "package/libcdaudio/Config.in"
|
||||
source "package/libcdio/Config.in"
|
||||
source "package/libcodec2/Config.in"
|
||||
source "package/libcue/Config.in"
|
||||
source "package/libcuefile/Config.in"
|
||||
source "package/libg7221/Config.in"
|
||||
source "package/libid3tag/Config.in"
|
||||
source "package/libilbc/Config.in"
|
||||
source "package/liblo/Config.in"
|
||||
source "package/libmad/Config.in"
|
||||
source "package/libmodplug/Config.in"
|
||||
@ -706,7 +712,9 @@ menu "Audio/Sound"
|
||||
source "package/libreplaygain/Config.in"
|
||||
source "package/libsamplerate/Config.in"
|
||||
source "package/libsidplay2/Config.in"
|
||||
source "package/libsilk/Config.in"
|
||||
source "package/libsndfile/Config.in"
|
||||
source "package/libsoundtouch/Config.in"
|
||||
source "package/libsoxr/Config.in"
|
||||
source "package/libvorbis/Config.in"
|
||||
source "package/mp4v2/Config.in"
|
||||
@ -749,6 +757,7 @@ menu "Crypto"
|
||||
source "package/libsecret/Config.in"
|
||||
source "package/libsha1/Config.in"
|
||||
source "package/libsodium/Config.in"
|
||||
source "package/libssh/Config.in"
|
||||
source "package/libssh2/Config.in"
|
||||
source "package/nettle/Config.in"
|
||||
source "package/openssl/Config.in"
|
||||
@ -920,6 +929,7 @@ menu "JSON/XML"
|
||||
source "package/libyaml/Config.in"
|
||||
source "package/mxml/Config.in"
|
||||
source "package/rapidjson/Config.in"
|
||||
source "package/rapidxml/Config.in"
|
||||
source "package/tinyxml/Config.in"
|
||||
source "package/tinyxml2/Config.in"
|
||||
source "package/xerces/Config.in"
|
||||
@ -952,8 +962,10 @@ menu "Multimedia"
|
||||
source "package/libmms/Config.in"
|
||||
source "package/libmpeg2/Config.in"
|
||||
source "package/libogg/Config.in"
|
||||
source "package/libopenh264/Config.in"
|
||||
source "package/libplayer/Config.in"
|
||||
source "package/libtheora/Config.in"
|
||||
source "package/libyuv/Config.in"
|
||||
source "package/live555/Config.in"
|
||||
source "package/mediastreamer/Config.in"
|
||||
source "package/x264/Config.in"
|
||||
@ -972,6 +984,8 @@ menu "Networking"
|
||||
source "package/fmlib/Config.in"
|
||||
source "package/geoip/Config.in"
|
||||
source "package/glib-networking/Config.in"
|
||||
source "package/ibrcommon/Config.in"
|
||||
source "package/ibrdtn/Config.in"
|
||||
source "package/libcgi/Config.in"
|
||||
source "package/libcgicc/Config.in"
|
||||
source "package/libcurl/Config.in"
|
||||
@ -979,8 +993,10 @@ menu "Networking"
|
||||
source "package/libeXosip2/Config.in"
|
||||
source "package/libfcgi/Config.in"
|
||||
source "package/libgsasl/Config.in"
|
||||
source "package/libhttpparser/Config.in"
|
||||
source "package/libidn/Config.in"
|
||||
source "package/libiscsi/Config.in"
|
||||
source "package/libldns/Config.in"
|
||||
source "package/libmbus/Config.in"
|
||||
source "package/libmemcached/Config.in"
|
||||
source "package/libmicrohttpd/Config.in"
|
||||
@ -1093,6 +1109,11 @@ menu "Other"
|
||||
source "package/libuv/Config.in"
|
||||
source "package/lightning/Config.in"
|
||||
source "package/linux-pam/Config.in"
|
||||
if BR2_PACKAGE_LINUX_PAM
|
||||
comment "linux-pam plugins"
|
||||
source "package/libpam-radius-auth/Config.in"
|
||||
source "package/libpam-tacplus/Config.in"
|
||||
endif
|
||||
source "package/lttng-libust/Config.in"
|
||||
source "package/mpc/Config.in"
|
||||
source "package/mpdecimal/Config.in"
|
||||
@ -1223,6 +1244,8 @@ endif
|
||||
source "package/hostapd/Config.in"
|
||||
source "package/hplip/Config.in"
|
||||
source "package/httping/Config.in"
|
||||
source "package/ibrdtn-tools/Config.in"
|
||||
source "package/ibrdtnd/Config.in"
|
||||
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
|
||||
source "package/ifplugd/Config.in"
|
||||
endif
|
||||
@ -1473,6 +1496,7 @@ endif
|
||||
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
|
||||
source "package/rsyslog/Config.in"
|
||||
endif
|
||||
source "package/scrypt/Config.in"
|
||||
source "package/smack/Config.in"
|
||||
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
|
||||
source "package/start-stop-daemon/Config.in"
|
||||
|
@ -1,192 +0,0 @@
|
||||
musl does not allow including netinet/* and linux/* headers together.
|
||||
batctl includes netinet/if_ether.h indirectly via net/ethernet.h,
|
||||
so netinet/if_ether.h must be used instead of linux/if_ether.h.
|
||||
|
||||
__be16 and __be32 are linux-specific typedefs for uint16_t and
|
||||
uint32_t with __attribute__((bitwise)) that has no effect
|
||||
outside of the kernel.
|
||||
|
||||
Signed-off-by: Alex Suykov <alex.suykov@gmail.com>
|
||||
|
||||
--- batctl-2014.4.0/ping.c
|
||||
+++ batctl-2014.4.0/ping.c
|
||||
@@ -34,7 +34,7 @@
|
||||
#include <stdint.h>
|
||||
#include <sys/select.h>
|
||||
#include <sys/time.h>
|
||||
-#include <linux/if_ether.h>
|
||||
+#include <netinet/if_ether.h>
|
||||
|
||||
#include "main.h"
|
||||
#include "ping.h"
|
||||
--- batctl-2014.4.0/tcpdump.h
|
||||
+++ batctl-2014.4.0/tcpdump.h
|
||||
@@ -23,7 +23,7 @@
|
||||
#define _BATCTL_TCPDUMP_H
|
||||
|
||||
#include <netpacket/packet.h>
|
||||
-#include <linux/if_ether.h>
|
||||
+#include <netinet/if_ether.h>
|
||||
#include <net/if_arp.h>
|
||||
#include <sys/types.h>
|
||||
#include "main.h"
|
||||
--- batctl-2014.4.0/traceroute.c
|
||||
+++ batctl-2014.4.0/traceroute.c
|
||||
@@ -28,7 +28,7 @@
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <string.h>
|
||||
-#include <linux/if_ether.h>
|
||||
+#include <netinet/if_ether.h>
|
||||
#include <stddef.h>
|
||||
#include <sys/select.h>
|
||||
#include <sys/time.h>
|
||||
--- batctl-2014.4.0/packet.h
|
||||
+++ batctl-2014.4.0/packet.h
|
||||
@@ -196,7 +196,7 @@
|
||||
struct batadv_bla_claim_dst {
|
||||
uint8_t magic[3]; /* FF:43:05 */
|
||||
uint8_t type; /* bla_claimframe */
|
||||
- __be16 group; /* group id */
|
||||
+ uint16_t group; /* group id */
|
||||
};
|
||||
#pragma pack()
|
||||
|
||||
@@ -213,12 +213,12 @@
|
||||
uint8_t version;
|
||||
uint8_t ttl;
|
||||
uint8_t flags;
|
||||
- __be32 seqno;
|
||||
+ uint32_t seqno;
|
||||
uint8_t orig[ETH_ALEN];
|
||||
uint8_t prev_sender[ETH_ALEN];
|
||||
uint8_t reserved;
|
||||
uint8_t tq;
|
||||
- __be16 tvlv_len;
|
||||
+ uint16_t tvlv_len;
|
||||
/* __packed is not needed as the struct size is divisible by 4,
|
||||
* and the largest data type in this struct has a size of 4.
|
||||
*/
|
||||
@@ -273,7 +273,7 @@
|
||||
uint8_t orig[ETH_ALEN];
|
||||
uint8_t uid;
|
||||
uint8_t reserved;
|
||||
- __be16 seqno;
|
||||
+ uint16_t seqno;
|
||||
};
|
||||
|
||||
#define BATADV_RR_LEN 16
|
||||
@@ -300,7 +300,7 @@
|
||||
uint8_t orig[ETH_ALEN];
|
||||
uint8_t uid;
|
||||
uint8_t rr_cur;
|
||||
- __be16 seqno;
|
||||
+ uint16_t seqno;
|
||||
uint8_t rr[BATADV_RR_LEN][ETH_ALEN];
|
||||
};
|
||||
|
||||
@@ -380,8 +380,8 @@
|
||||
#endif
|
||||
uint8_t dest[ETH_ALEN];
|
||||
uint8_t orig[ETH_ALEN];
|
||||
- __be16 seqno;
|
||||
- __be16 total_size;
|
||||
+ uint16_t seqno;
|
||||
+ uint16_t total_size;
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -398,7 +398,7 @@
|
||||
uint8_t version; /* batman version field */
|
||||
uint8_t ttl;
|
||||
uint8_t reserved;
|
||||
- __be32 seqno;
|
||||
+ uint32_t seqno;
|
||||
uint8_t orig[ETH_ALEN];
|
||||
/* "4 bytes boundary + 2 bytes" long to make the payload after the
|
||||
* following ethernet header again 4 bytes boundary aligned
|
||||
@@ -431,14 +431,14 @@
|
||||
/* uint8_t first_dest[ETH_ALEN]; - saved in mac header destination */
|
||||
uint8_t first_source[ETH_ALEN];
|
||||
uint8_t first_orig_dest[ETH_ALEN];
|
||||
- __be32 first_crc;
|
||||
+ uint32_t first_crc;
|
||||
uint8_t second_ttl;
|
||||
uint8_t second_ttvn;
|
||||
uint8_t second_dest[ETH_ALEN];
|
||||
uint8_t second_source[ETH_ALEN];
|
||||
uint8_t second_orig_dest[ETH_ALEN];
|
||||
- __be32 second_crc;
|
||||
- __be16 coded_len;
|
||||
+ uint32_t second_crc;
|
||||
+ uint16_t coded_len;
|
||||
};
|
||||
|
||||
#pragma pack()
|
||||
@@ -461,7 +461,7 @@
|
||||
uint8_t reserved;
|
||||
uint8_t dst[ETH_ALEN];
|
||||
uint8_t src[ETH_ALEN];
|
||||
- __be16 tvlv_len;
|
||||
+ uint16_t tvlv_len;
|
||||
uint16_t align;
|
||||
};
|
||||
|
||||
@@ -474,7 +474,7 @@
|
||||
struct batadv_tvlv_hdr {
|
||||
uint8_t type;
|
||||
uint8_t version;
|
||||
- __be16 len;
|
||||
+ uint16_t len;
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -484,8 +484,8 @@
|
||||
* @bandwidth_up: advertised uplink upload bandwidth
|
||||
*/
|
||||
struct batadv_tvlv_gateway_data {
|
||||
- __be32 bandwidth_down;
|
||||
- __be32 bandwidth_up;
|
||||
+ uint32_t bandwidth_down;
|
||||
+ uint32_t bandwidth_up;
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -498,7 +498,7 @@
|
||||
struct batadv_tvlv_tt_data {
|
||||
uint8_t flags;
|
||||
uint8_t ttvn;
|
||||
- __be16 num_vlan;
|
||||
+ uint16_t num_vlan;
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -509,8 +509,8 @@
|
||||
* @reserved: unused, useful for alignment purposes
|
||||
*/
|
||||
struct batadv_tvlv_tt_vlan_data {
|
||||
- __be32 crc;
|
||||
- __be16 vid;
|
||||
+ uint32_t crc;
|
||||
+ uint16_t vid;
|
||||
uint16_t reserved;
|
||||
};
|
||||
|
||||
@@ -526,7 +526,7 @@
|
||||
uint8_t flags;
|
||||
uint8_t reserved[3];
|
||||
uint8_t addr[ETH_ALEN];
|
||||
- __be16 vid;
|
||||
+ uint16_t vid;
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -536,7 +536,7 @@
|
||||
*/
|
||||
struct batadv_tvlv_roam_adv {
|
||||
uint8_t client[ETH_ALEN];
|
||||
- __be16 vid;
|
||||
+ uint16_t vid;
|
||||
};
|
||||
|
||||
/**
|
@ -1,2 +1,4 @@
|
||||
# http://downloads.open-mesh.org/batman/releases/batman-adv-2015.1/batctl-2015.1.tar.gz.sha1
|
||||
sha1 ae086f334ff912ab2a8116caedf0a2a1816acf1a batctl-2015.1.tar.gz
|
||||
# Locally calculated
|
||||
sha256 77509ed70232ebc0b73e2fa9471ae13b12d6547d167dda0a82f7a7fad7252c36 batctl-2014.4.0.tar.gz
|
||||
sha256 ea67ee22785e6fcd5149472bdf2df4e9f21716968e025e7dd41556a010a8d14a batctl-2015.1.tar.gz
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
BATCTL_VERSION = 2014.4.0
|
||||
BATCTL_VERSION = 2015.1
|
||||
BATCTL_SITE = http://downloads.open-mesh.org/batman/releases/batman-adv-$(BATCTL_VERSION)
|
||||
BATCTL_LICENSE = GPLv2
|
||||
BATCTL_DEPENDENCIES = libnl host-pkgconf
|
||||
|
@ -4,8 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
# version 3.2
|
||||
EIGEN_VERSION = ffa86ffb5570
|
||||
EIGEN_VERSION = 3.2.5
|
||||
EIGEN_SITE = https://bitbucket.org/eigen/eigen
|
||||
EIGEN_SITE_METHOD = hg
|
||||
EIGEN_LICENSE = MPL2, BSD-3c, LGPLv2.1
|
||||
|
@ -1,2 +1,2 @@
|
||||
# Hash from http://lists.freedesktop.org/archives/input-tools/2014-November/001125.html
|
||||
sha256 0c87360882751356e9f977ebf7438c00fe97deb232ac725dd86e5ba78203ee97 evemu-2.1.0.tar.xz
|
||||
# Hash from http://lists.freedesktop.org/archives/input-tools/2015-August/001190.html
|
||||
sha256 e0f79808959d1b1f307a3d5add8ee9e5786d926e9aeb0045dadb85c7350d0a3c evemu-2.2.0.tar.xz
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
EVEMU_VERSION = 2.1.0
|
||||
EVEMU_VERSION = 2.2.0
|
||||
EVEMU_SITE = http://www.freedesktop.org/software/evemu
|
||||
EVEMU_SOURCE = evemu-$(EVEMU_VERSION).tar.xz
|
||||
EVEMU_LICENSE = LGPLv3 (library), GPLv3 (tools)
|
||||
|
@ -27,7 +27,7 @@ choice
|
||||
prompt "GDB debugger Version"
|
||||
depends on !BR2_arc
|
||||
depends on !BR2_microblaze
|
||||
default BR2_GDB_VERSION_7_8
|
||||
default BR2_GDB_VERSION_7_9
|
||||
help
|
||||
Select the version of gdb you wish to use.
|
||||
|
||||
@ -41,6 +41,9 @@ choice
|
||||
config BR2_GDB_VERSION_7_9
|
||||
bool "gdb 7.9.x"
|
||||
|
||||
config BR2_GDB_VERSION_7_10
|
||||
bool "gdb 7.10.x"
|
||||
|
||||
endchoice
|
||||
|
||||
endif
|
||||
@ -52,5 +55,6 @@ config BR2_GDB_VERSION
|
||||
default "arc-2015.06-gdb" if BR2_arc
|
||||
default "6be65fb56ea6694a9260733a536a023a1e2d4d57" if BR2_microblaze
|
||||
default "7.7.1" if BR2_GDB_VERSION_7_7
|
||||
default "7.8.2" if BR2_GDB_VERSION_7_8 || !BR2_PACKAGE_HOST_GDB
|
||||
default "7.9.1" if BR2_GDB_VERSION_7_9
|
||||
default "7.8.2" if BR2_GDB_VERSION_7_8
|
||||
default "7.9.1" if BR2_GDB_VERSION_7_9 || !BR2_PACKAGE_HOST_GDB
|
||||
default "7.10" if BR2_GDB_VERSION_7_10
|
||||
|
@ -2,6 +2,7 @@
|
||||
sha512 887b9b726dae8f6e3e5e41574460a67e4f9002b0d47bc985dcf63bdf3518397a90b6a208cb5b19e5ed2341715ad75cfeed4df4fb423f39f74218e36bc87f1cab gdb-7.7.1.tar.bz2
|
||||
sha512 face5bf1b4ce144fc8604fc84620beed956177a11fd632b4e41906fc7f632910b2b43a50e6cfdfd6cbd876ee527c813bddab8df29dc560a6c36694cdb8edc4e4 gdb-7.8.2.tar.xz
|
||||
sha512 eebdf88b24e52e792b8a4b89ea85790de72b462a7810b44975fdf4232c068f353b15506071f450102a9d4bcecdde8e93dc3748a10699b7f73f3e04fb2d9d8414 gdb-7.9.1.tar.xz
|
||||
sha512 4d9d7b536ad46f881689fca9f3f0b60268ff413c7900115fed5030d81d1d794793cc51d51510584ea1a63fe5891d006a9867ba36981b86b50806d469b717457d gdb-7.10.tar.xz
|
||||
# No hash for the ARC & microblaze variants, comes from the github-helper:
|
||||
none xxx gdb-arc-2015.06-gdb.tar.gz
|
||||
none xxx gdb-6be65fb56ea6694a9260733a536a023a1e2d4d57.tar.gz
|
||||
|
@ -1,173 +0,0 @@
|
||||
Patch from https://bugzilla.redhat.com/show_bug.cgi?id=1157689
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
WARNING !!! WARNING !!! WARNING !!! WARNING !!! WARNING !!! WARNING !!!
|
||||
EMBARGOED !!! EMBARGOED !!! EMARGOED !!! EMBARGOED !!! EMBARGOED !!!
|
||||
SECURITY !!! SECURITY !!! SECURITY !!! SECURITY !!! SECURITY !!!
|
||||
|
||||
CVE-2014-7817:
|
||||
|
||||
The function wordexp() fails to properly handle the WRDE_NOCMD
|
||||
flag when processing arithmetic inputs in the form of "$((... ``))"
|
||||
where "..." can be anything valid. The backticks in the arithmetic
|
||||
epxression are evaluated by in a shell even if WRDE_NOCMD forbade
|
||||
command substitution. This allows an attacker to attempt to pass
|
||||
dangerous commands via constructs of the above form, and bypass
|
||||
the WRDE_NOCMD flag. This patch fixes this by checking for WRDE_NOCMD
|
||||
in parse_arith(). The patch also hardens parse_backticks() and
|
||||
parse_comm() to check for WRDE_NOCMD flag and return an error instead
|
||||
of ever running a shell.
|
||||
|
||||
We expand the testsuite and add 3 new regression tests of roughtly
|
||||
the same form but with a couple of nested levels.
|
||||
|
||||
On top of the 3 new tests we add fork validation to the WRDE_NOCMD
|
||||
testing. If any forks are detected during the execution of a wordexp()
|
||||
call with WRDE_NOCMD, the test is marked as failed. This is slightly
|
||||
heuristic since vfork might be used, but it provides a higher level
|
||||
of assurance that no shells were executed as part of command substitution
|
||||
with WRDE_NOCMD in effect. In addition it doesn't require libpthread or
|
||||
libdl, instead we use the public implementation namespace function
|
||||
__register_atfork (already part of the public ABI for libpthread).
|
||||
|
||||
Tested on x86_64 with no regressions.
|
||||
|
||||
2014-10-27 Carlos O'Donell <carlos@redhat.com>
|
||||
|
||||
* wordexp-test.c (__dso_handle): Add prototype.
|
||||
(__register_atfork): Likewise.
|
||||
(__app_register_atfork): New function.
|
||||
(registered_forks): New global.
|
||||
(register_fork): New function.
|
||||
(test_case): Add 3 new tests for WRDE_CMDSUB.
|
||||
(main): Call __app_register_atfork.
|
||||
(testit): If WRDE_NOCMD set registered_forks to zero, run test, and
|
||||
if fork count is non-zero fail the test.
|
||||
* posix/wordexp.c (parse_arith): Return WRDE_NOCMD if WRDE_NOCMD flag
|
||||
is set and parsing '`'.
|
||||
(parse_comm): Return WRDE_NOCMD if WRDE_NOCMD flag is set.
|
||||
(parse_backtick): Return WRDE_NOCMD if WRDE_NOCMD flag is set and
|
||||
parsing '`'.
|
||||
|
||||
diff --git a/posix/wordexp-test.c b/posix/wordexp-test.c
|
||||
index 4957006..5ce2a1b 100644
|
||||
--- a/posix/wordexp-test.c
|
||||
+++ b/posix/wordexp-test.c
|
||||
@@ -27,6 +27,25 @@
|
||||
|
||||
#define IFS " \n\t"
|
||||
|
||||
+extern void *__dso_handle __attribute__ ((__weak__, __visibility__ ("hidden")));
|
||||
+extern int __register_atfork (void (*) (void), void (*) (void), void (*) (void), void *);
|
||||
+
|
||||
+static int __app_register_atfork (void (*prepare) (void), void (*parent) (void), void (*child) (void))
|
||||
+{
|
||||
+ return __register_atfork (prepare, parent, child,
|
||||
+ &__dso_handle == NULL ? NULL : __dso_handle);
|
||||
+}
|
||||
+
|
||||
+/* Number of forks seen. */
|
||||
+static int registered_forks;
|
||||
+
|
||||
+/* For each fork increment the fork count. */
|
||||
+static void
|
||||
+register_fork (void)
|
||||
+{
|
||||
+ registered_forks++;
|
||||
+}
|
||||
+
|
||||
struct test_case_struct
|
||||
{
|
||||
int retval;
|
||||
@@ -206,6 +225,12 @@ struct test_case_struct
|
||||
{ WRDE_SYNTAX, NULL, "$((2+))", 0, 0, { NULL, }, IFS },
|
||||
{ WRDE_SYNTAX, NULL, "`", 0, 0, { NULL, }, IFS },
|
||||
{ WRDE_SYNTAX, NULL, "$((010+4+))", 0, 0, { NULL }, IFS },
|
||||
+ /* Test for CVE-2014-7817. We test 3 combinations of command
|
||||
+ substitution inside an arithmetic expression to make sure that
|
||||
+ no commands are executed and error is returned. */
|
||||
+ { WRDE_CMDSUB, NULL, "$((`echo 1`))", WRDE_NOCMD, 0, { NULL, }, IFS },
|
||||
+ { WRDE_CMDSUB, NULL, "$((1+`echo 1`))", WRDE_NOCMD, 0, { NULL, }, IFS },
|
||||
+ { WRDE_CMDSUB, NULL, "$((1+$((`echo 1`))))", WRDE_NOCMD, 0, { NULL, }, IFS },
|
||||
|
||||
{ -1, NULL, NULL, 0, 0, { NULL, }, IFS },
|
||||
};
|
||||
@@ -258,6 +283,15 @@ main (int argc, char *argv[])
|
||||
return -1;
|
||||
}
|
||||
|
||||
+ /* If we are not allowed to do command substitution, we install
|
||||
+ fork handlers to verify that no forks happened. No forks should
|
||||
+ happen at all if command substitution is disabled. */
|
||||
+ if (__app_register_atfork (register_fork, NULL, NULL) != 0)
|
||||
+ {
|
||||
+ printf ("Failed to register fork handler.\n");
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
for (test = 0; test_case[test].retval != -1; test++)
|
||||
if (testit (&test_case[test]))
|
||||
++fail;
|
||||
@@ -367,6 +401,9 @@ testit (struct test_case_struct *tc)
|
||||
|
||||
printf ("Test %d (%s): ", ++tests, tc->words);
|
||||
|
||||
+ if (tc->flags & WRDE_NOCMD)
|
||||
+ registered_forks = 0;
|
||||
+
|
||||
if (tc->flags & WRDE_APPEND)
|
||||
{
|
||||
/* initial wordexp() call, to be appended to */
|
||||
@@ -378,6 +415,13 @@ testit (struct test_case_struct *tc)
|
||||
}
|
||||
retval = wordexp (tc->words, &we, tc->flags);
|
||||
|
||||
+ if ((tc->flags & WRDE_NOCMD)
|
||||
+ && (registered_forks > 0))
|
||||
+ {
|
||||
+ printf ("FAILED fork called for WRDE_NOCMD\n");
|
||||
+ return 1;
|
||||
+ }
|
||||
+
|
||||
if (tc->flags & WRDE_DOOFFS)
|
||||
start_offs = sav_we.we_offs;
|
||||
|
||||
diff --git a/posix/wordexp.c b/posix/wordexp.c
|
||||
index b6b65dd..d6a158f 100644
|
||||
--- a/posix/wordexp.c
|
||||
+++ b/posix/wordexp.c
|
||||
@@ -693,6 +693,12 @@ parse_arith (char **word, size_t *word_length, size_t *max_length,
|
||||
break;
|
||||
|
||||
case '`':
|
||||
+ if (flags & WRDE_NOCMD)
|
||||
+ {
|
||||
+ free (expr);
|
||||
+ return WRDE_NOCMD;
|
||||
+ }
|
||||
+
|
||||
(*offset)++;
|
||||
error = parse_backtick (&expr, &expr_length, &expr_maxlen,
|
||||
words, offset, flags, NULL, NULL, NULL);
|
||||
@@ -1144,6 +1150,10 @@ parse_comm (char **word, size_t *word_length, size_t *max_length,
|
||||
size_t comm_maxlen;
|
||||
char *comm = w_newword (&comm_length, &comm_maxlen);
|
||||
|
||||
+ /* Do nothing if command substitution should not succeed. */
|
||||
+ if (flags & WRDE_NOCMD)
|
||||
+ return WRDE_CMDSUB;
|
||||
+
|
||||
for (; words[*offset]; ++(*offset))
|
||||
{
|
||||
switch (words[*offset])
|
||||
@@ -2121,6 +2131,9 @@ parse_backtick (char **word, size_t *word_length, size_t *max_length,
|
||||
switch (words[*offset])
|
||||
{
|
||||
case '`':
|
||||
+ if (flags & WRDE_NOCMD)
|
||||
+ return WRDE_NOCMD;
|
||||
+
|
||||
/* Go -- give the script to the shell */
|
||||
error = exec_comm (comm, word, word_length, max_length, flags,
|
||||
pwordexp, ifs, ifs_white);
|
@ -1,24 +0,0 @@
|
||||
Fix CVE-2014-9402 - denial of service in getnetbyname function.
|
||||
Backport from https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=11e3417af6e354f1942c68a271ae51e892b2814d
|
||||
See https://bugzilla.redhat.com/show_bug.cgi?id=1175369
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c
|
||||
index 0a77c8b..08cf0a6 100644
|
||||
--- a/resolv/nss_dns/dns-network.c
|
||||
+++ b/resolv/nss_dns/dns-network.c
|
||||
@@ -398,8 +398,8 @@ getanswer_r (const querybuf *answer, int anslen, struct netent *result,
|
||||
|
||||
case BYNAME:
|
||||
{
|
||||
- char **ap = result->n_aliases++;
|
||||
- while (*ap != NULL)
|
||||
+ char **ap;
|
||||
+ for (ap = result->n_aliases; *ap != NULL; ++ap)
|
||||
{
|
||||
/* Check each alias name for being of the forms:
|
||||
4.3.2.1.in-addr.arpa = net 1.2.3.4
|
||||
--
|
||||
1.7.1
|
||||
|
@ -1,88 +0,0 @@
|
||||
Fix CVE-2015-1472 - heap buffer overflow in wscanf
|
||||
Backport from upstream:
|
||||
https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=5bd80bfe9ca0d955bfbbc002781bc7b01b6bcb06
|
||||
See: https://bugzilla.redhat.com/show_bug.cgi?id=1188235
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
diff --git a/stdio-common/tst-sscanf.c b/stdio-common/tst-sscanf.c
|
||||
index aece3f2..8a2eb9e 100644
|
||||
--- a/stdio-common/tst-sscanf.c
|
||||
+++ b/stdio-common/tst-sscanf.c
|
||||
@@ -233,5 +233,38 @@ main (void)
|
||||
}
|
||||
}
|
||||
|
||||
+ /* BZ #16618
|
||||
+ The test will segfault during SSCANF if the buffer overflow
|
||||
+ is not fixed. The size of `s` is such that it forces the use
|
||||
+ of malloc internally and this triggers the incorrect computation.
|
||||
+ Thus the value for SIZE is arbitrariy high enough that malloc
|
||||
+ is used. */
|
||||
+ {
|
||||
+#define SIZE 131072
|
||||
+ CHAR *s = malloc ((SIZE + 1) * sizeof (*s));
|
||||
+ if (s == NULL)
|
||||
+ abort ();
|
||||
+ for (size_t i = 0; i < SIZE; i++)
|
||||
+ s[i] = L('0');
|
||||
+ s[SIZE] = L('\0');
|
||||
+ int i = 42;
|
||||
+ /* Scan multi-digit zero into `i`. */
|
||||
+ if (SSCANF (s, L("%d"), &i) != 1)
|
||||
+ {
|
||||
+ printf ("FAIL: bug16618: SSCANF did not read one input item.\n");
|
||||
+ result = 1;
|
||||
+ }
|
||||
+ if (i != 0)
|
||||
+ {
|
||||
+ printf ("FAIL: bug16618: Value of `i` was not zero as expected.\n");
|
||||
+ result = 1;
|
||||
+ }
|
||||
+ free (s);
|
||||
+ if (result != 1)
|
||||
+ printf ("PASS: bug16618: Did not crash.\n");
|
||||
+#undef SIZE
|
||||
+ }
|
||||
+
|
||||
+
|
||||
return result;
|
||||
}
|
||||
diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
|
||||
index cd129a8..0e204e7 100644
|
||||
--- a/stdio-common/vfscanf.c
|
||||
+++ b/stdio-common/vfscanf.c
|
||||
@@ -272,9 +272,10 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
|
||||
if (__glibc_unlikely (wpsize == wpmax)) \
|
||||
{ \
|
||||
CHAR_T *old = wp; \
|
||||
- size_t newsize = (UCHAR_MAX + 1 > 2 * wpmax \
|
||||
- ? UCHAR_MAX + 1 : 2 * wpmax); \
|
||||
- if (use_malloc || !__libc_use_alloca (newsize)) \
|
||||
+ bool fits = __glibc_likely (wpmax <= SIZE_MAX / sizeof (CHAR_T) / 2); \
|
||||
+ size_t wpneed = MAX (UCHAR_MAX + 1, 2 * wpmax); \
|
||||
+ size_t newsize = fits ? wpneed * sizeof (CHAR_T) : SIZE_MAX; \
|
||||
+ if (!__libc_use_alloca (newsize)) \
|
||||
{ \
|
||||
wp = realloc (use_malloc ? wp : NULL, newsize); \
|
||||
if (wp == NULL) \
|
||||
@@ -286,14 +287,13 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
|
||||
} \
|
||||
if (! use_malloc) \
|
||||
MEMCPY (wp, old, wpsize); \
|
||||
- wpmax = newsize; \
|
||||
+ wpmax = wpneed; \
|
||||
use_malloc = true; \
|
||||
} \
|
||||
else \
|
||||
{ \
|
||||
size_t s = wpmax * sizeof (CHAR_T); \
|
||||
- wp = (CHAR_T *) extend_alloca (wp, s, \
|
||||
- newsize * sizeof (CHAR_T)); \
|
||||
+ wp = (CHAR_T *) extend_alloca (wp, s, newsize); \
|
||||
wpmax = s / sizeof (CHAR_T); \
|
||||
if (old != NULL) \
|
||||
MEMCPY (wp, old, wpsize); \
|
||||
--
|
||||
1.9.4
|
||||
|
@ -32,17 +32,15 @@ config BR2_PACKAGE_GLIBC
|
||||
|
||||
choice
|
||||
prompt "glibc version"
|
||||
default BR2_GLIBC_VERSION_2_20
|
||||
|
||||
config BR2_GLIBC_VERSION_2_20
|
||||
depends on !BR2_nios2
|
||||
# Broken see https://bugs.busybox.net/show_bug.cgi?id=7941
|
||||
depends on !BR2_sparc
|
||||
bool "2.20"
|
||||
default BR2_GLIBC_VERSION_2_21
|
||||
|
||||
config BR2_GLIBC_VERSION_2_21
|
||||
bool "2.21"
|
||||
|
||||
config BR2_GLIBC_VERSION_2_22
|
||||
bool "2.22"
|
||||
depends on !BR2_sparc # broken
|
||||
|
||||
endchoice
|
||||
|
||||
endif
|
||||
@ -51,5 +49,5 @@ config BR2_GLIBC_VERSION_STRING
|
||||
string
|
||||
default "2.18-svnr23787" if BR2_EGLIBC_VERSION_2_18
|
||||
default "2.19-svnr25243" if BR2_EGLIBC_VERSION_2_19
|
||||
default "2.20" if BR2_GLIBC_VERSION_2_20
|
||||
default "2.21" if BR2_GLIBC_VERSION_2_21
|
||||
default "2.22" if BR2_GLIBC_VERSION_2_22
|
||||
|
@ -4,5 +4,5 @@ md5 b395b021422a027d89884992e91734fc eglibc-2.18-svnr23787.tar.bz2
|
||||
sha1 224d9e655e8f0ad04ffde47b97a11c64e2255b56 eglibc-2.18-svnr23787.tar.bz2
|
||||
md5 197836c2ba42fb146e971222647198dd eglibc-2.19-svnr25243.tar.bz2
|
||||
sha1 8013c1935b46fd50d2d1fbfad3b0af362b75fb28 eglibc-2.19-svnr25243.tar.bz2
|
||||
sha256 f84b6d42aecc288d593c397b0a3d02260a33ee686bce0c634eb9b32798f36ba5 glibc-2.20.tar.xz
|
||||
sha256 aeeb362437965a5d3f40b151094ca79def04a115bd363fdd4a9a0c69482923b8 glibc-2.21.tar.xz
|
||||
sha256 eb731406903befef1d8f878a46be75ef862b9056ab0cde1626d08a7a05328948 glibc-2.22.tar.xz
|
||||
|
13
package/ibrcommon/Config.in
Normal file
13
package/ibrcommon/Config.in
Normal file
@ -0,0 +1,13 @@
|
||||
config BR2_PACKAGE_IBRCOMMON
|
||||
bool "ibrcommon"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
help
|
||||
IBR-DTN is a small dtn application that supports:
|
||||
Bundle Protocol RFC 5050
|
||||
Bundle Security Protocol RFC 6257
|
||||
|
||||
http://trac.ibr.cs.tu-bs.de/project-cm-2012-ibrdtn
|
||||
|
||||
comment "ibrcommon needs a toolchain w/ C++, threads"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
|
2
package/ibrcommon/ibrcommon.hash
Normal file
2
package/ibrcommon/ibrcommon.hash
Normal file
@ -0,0 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 9c457c1ebc01e6216524636628c647bef34ab11bd96f0e0788be8749374fdc20 ibrcommon-1.0.1.tar.gz
|
36
package/ibrcommon/ibrcommon.mk
Normal file
36
package/ibrcommon/ibrcommon.mk
Normal file
@ -0,0 +1,36 @@
|
||||
################################################################################
|
||||
#
|
||||
# ibrcommon
|
||||
#
|
||||
################################################################################
|
||||
|
||||
IBRCOMMON_VERSION = 1.0.1
|
||||
IBRCOMMON_SOURCE = ibrcommon-$(IBRCOMMON_VERSION).tar.gz
|
||||
IBRCOMMON_SITE = https://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases/
|
||||
IBRCOMMON_INSTALL_STAGING = YES
|
||||
IBRCOMMON_LICENSE = Apache-2.0
|
||||
IBRCOMMON_LICENSE_FILES = COPYING README
|
||||
IBRCOMMON_DEPENDENCIES = host-pkgconf
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
IBRCOMMON_DEPENDENCIES += openssl
|
||||
IBRCOMMON_CONF_OPTS += --with-openssl
|
||||
else
|
||||
IBRCOMMON_CONF_OPTS += --without-openssl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBNL),y)
|
||||
IBRCOMMON_DEPENDENCIES += libnl
|
||||
IBRCOMMON_CONF_OPTS += --with-lowpan
|
||||
else
|
||||
IBRCOMMON_CONF_OPTS += --without-lowpan
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBXML2),y)
|
||||
IBRCOMMON_DEPENDENCIES += libxml2
|
||||
IBRCOMMON_CONF_OPTS += --with-xml
|
||||
else
|
||||
IBRCOMMON_CONF_OPTS += --without-xml
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
15
package/ibrdtn-tools/Config.in
Normal file
15
package/ibrdtn-tools/Config.in
Normal file
@ -0,0 +1,15 @@
|
||||
config BR2_PACKAGE_IBRDTN_TOOLS
|
||||
bool "ibrdtn-tools"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
select BR2_PACKAGE_IBRCOMMON
|
||||
select BR2_PACKAGE_IBRDTN
|
||||
help
|
||||
IBR-DTN is a small dtn application that supports:
|
||||
Bundle Protocol RFC 5050
|
||||
Bundle Security Protocol RFC 6257
|
||||
|
||||
http://trac.ibr.cs.tu-bs.de/project-cm-2012-ibrdtn
|
||||
|
||||
comment "ibrdtn-tools needs a toolchain w/ C++, threads"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
|
2
package/ibrdtn-tools/ibrdtn-tools.hash
Normal file
2
package/ibrdtn-tools/ibrdtn-tools.hash
Normal file
@ -0,0 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 eab066cf15f9c322d769c6c9c58adfb474cba7d446fd12e8de5ff6344376795b ibrdtn-tools-1.0.1.tar.gz
|
27
package/ibrdtn-tools/ibrdtn-tools.mk
Normal file
27
package/ibrdtn-tools/ibrdtn-tools.mk
Normal file
@ -0,0 +1,27 @@
|
||||
################################################################################
|
||||
#
|
||||
# ibrdtn-tools
|
||||
#
|
||||
################################################################################
|
||||
|
||||
IBRDTN_TOOLS_VERSION = 1.0.1
|
||||
IBRDTN_TOOLS_SITE = https://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases/
|
||||
IBRDTN_TOOLS_LICENSE = Apache-2.0
|
||||
IBRDTN_TOOLS_LICENSE_FILES = COPYING
|
||||
IBRDTN_TOOLS_DEPENDENCIES = ibrcommon ibrdtn host-pkgconf
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBDAEMON),y)
|
||||
IBRDTN_TOOLS_CONF_OPTS += --with-libdaemon
|
||||
IBRDTN_TOOLS_DEPENDENCIES += libdaemon
|
||||
else
|
||||
IBRDTN_TOOLS_CONF_OPTS += --without-libdaemon
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBARCHIVE),y)
|
||||
IBRDTN_TOOLS_CONF_OPTS += --with-libarchive
|
||||
IBRDTN_TOOLS_DEPENDENCIES += libarchive
|
||||
else
|
||||
IBRDTN_TOOLS_CONF_OPTS += --without-libarchive
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
16
package/ibrdtn/Config.in
Normal file
16
package/ibrdtn/Config.in
Normal file
@ -0,0 +1,16 @@
|
||||
config BR2_PACKAGE_IBRDTN
|
||||
bool "ibrdtn"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
select BR2_PACKAGE_IBRCOMMON
|
||||
help
|
||||
IBR-DTN is a small dtn application that supports:
|
||||
Bundle Protocol RFC 5050
|
||||
Bundle Security Protocol RFC 6257
|
||||
|
||||
This package contains the ibrdtn library.
|
||||
|
||||
http://trac.ibr.cs.tu-bs.de/project-cm-2012-ibrdtn
|
||||
|
||||
comment "ibrdtn needs a toolchain w/ C++, threads"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
|
2
package/ibrdtn/ibrdtn.hash
Normal file
2
package/ibrdtn/ibrdtn.hash
Normal file
@ -0,0 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 288b14ccbaefb5e3234065c2778c247797ccb3c7afbb6746bb37dc12c620d360 ibrdtn-1.0.1.tar.gz
|
29
package/ibrdtn/ibrdtn.mk
Normal file
29
package/ibrdtn/ibrdtn.mk
Normal file
@ -0,0 +1,29 @@
|
||||
################################################################################
|
||||
#
|
||||
# ibrdtn
|
||||
#
|
||||
################################################################################
|
||||
|
||||
IBRDTN_VERSION = 1.0.1
|
||||
IBRDTN_SOURCE = ibrdtn-$(IBRDTN_VERSION).tar.gz
|
||||
IBRDTN_SITE = https://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases/
|
||||
IBRDTN_INSTALL_STAGING = YES
|
||||
IBRDTN_LICENSE = Apache-2.0
|
||||
IBRDTN_LICENSE_FILES = COPYING
|
||||
IBRDTN_DEPENDENCIES = ibrcommon host-pkgconf
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
||||
IBRDTN_CONF_OPTS += --with-compression
|
||||
IBRDTN_DEPENDENCIES += zlib
|
||||
else
|
||||
IBRDTN_CONF_OPTS += --without-compression
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
|
||||
IBRDTN_CONF_OPTS += --with-glib
|
||||
IBRDTN_DEPENDENCIES += libglib2
|
||||
else
|
||||
IBRDTN_CONF_OPTS += --without-glib
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
15
package/ibrdtnd/Config.in
Normal file
15
package/ibrdtnd/Config.in
Normal file
@ -0,0 +1,15 @@
|
||||
config BR2_PACKAGE_IBRDTND
|
||||
bool "ibrdtnd"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
select BR2_PACKAGE_IBRDTN
|
||||
select BR2_PACKAGE_IBRCOMMON
|
||||
help
|
||||
IBR-DTN is a small dtn application that supports:
|
||||
Bundle Protocol RFC 5050
|
||||
Bundle Security Protocol RFC 6257
|
||||
|
||||
http://trac.ibr.cs.tu-bs.de/project-cm-2012-ibrdtn
|
||||
|
||||
comment "ibrdtnd needs a toolchain w/ C++, threads"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
|
2
package/ibrdtnd/ibrdtnd.hash
Normal file
2
package/ibrdtnd/ibrdtnd.hash
Normal file
@ -0,0 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 9bd79636154093ab6bf4fd10d6c62d67c6db45141460847b19def327c93771ed ibrdtnd-1.0.1.tar.gz
|
49
package/ibrdtnd/ibrdtnd.mk
Normal file
49
package/ibrdtnd/ibrdtnd.mk
Normal file
@ -0,0 +1,49 @@
|
||||
################################################################################
|
||||
#
|
||||
# ibrdtnd
|
||||
#
|
||||
################################################################################
|
||||
|
||||
IBRDTND_VERSION = 1.0.1
|
||||
IBRDTND_SOURCE = ibrdtnd-$(IBRDTND_VERSION).tar.gz
|
||||
IBRDTND_SITE = https://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases/
|
||||
IBRDTND_LICENSE = Apache-2.0
|
||||
IBRDTND_LICENSE_FILES = COPYING
|
||||
IBRDTND_DEPENDENCIES = ibrdtn ibrcommon
|
||||
|
||||
# Disable features that don't have the necessary dependencies in
|
||||
# Buildroot
|
||||
IBRDTND_CONF_OPTS = \
|
||||
--disable-dtndht \
|
||||
--without-wifip2p \
|
||||
--without-vmime
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBDAEMON),y)
|
||||
IBRDTND_CONF_OPTS += --enable-libdaemon
|
||||
IBRDTND_DEPENDENCIES += libdaemon
|
||||
else
|
||||
IBRDTND_CONF_OPTS += --disable-libdaemon
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCURL),y)
|
||||
IBRDTND_CONF_OPTS += --with-curl
|
||||
IBRDTND_DEPENDENCIES += libcurl
|
||||
else
|
||||
IBRDTND_CONF_OPTS += --without-curl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SQLITE),y)
|
||||
IBRDTND_CONF_OPTS += --with-sqlite
|
||||
IBRDTND_DEPENDENCIES += sqlite
|
||||
else
|
||||
IBRDTND_CONF_OPTS += --without-sqlite
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
IBRDTND_CONF_OPTS += --with-tls
|
||||
IBRDTND_DEPENDENCIES += openssl
|
||||
else
|
||||
IBRDTND_CONF_OPTS += --without-tls
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
@ -1,3 +1,5 @@
|
||||
# From http://sourceforge.net/projects/libjpeg-turbo/files/1.4.0/
|
||||
sha1 a9ed7a99a6090e0848836c5df8e836f300a098b9 libjpeg-turbo-1.4.0.tar.gz
|
||||
md5 039153dabe61e1ac8d9323b5522b56b0 libjpeg-turbo-1.4.0.tar.gz
|
||||
# From http://sourceforge.net/projects/libjpeg-turbo/files/1.4.1/
|
||||
sha1 363a149f644211462c45138a19674f38100036d3 libjpeg-turbo-1.4.1.tar.gz
|
||||
md5 b1f6b84859a16b8ebdcda951fa07c3f2 libjpeg-turbo-1.4.1.tar.gz
|
||||
# Locally computed
|
||||
sha256 4bf5bad4ce85625bffbbd9912211e06790e00fb982b77724af7211034efafb08 libjpeg-turbo-1.4.1.tar.gz
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
JPEG_TURBO_VERSION = 1.4.0
|
||||
JPEG_TURBO_VERSION = 1.4.1
|
||||
JPEG_TURBO_SOURCE = libjpeg-turbo-$(JPEG_TURBO_VERSION).tar.gz
|
||||
JPEG_TURBO_SITE = http://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_TURBO_VERSION)
|
||||
JPEG_TURBO_LICENSE = jpeg-license (BSD-3c-like)
|
||||
|
39
package/jsoncpp/0001-Remove-Werror.patch
Normal file
39
package/jsoncpp/0001-Remove-Werror.patch
Normal file
@ -0,0 +1,39 @@
|
||||
From d7b84f69c5e92178e110552cce27f900744e1779 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
|
||||
Date: Thu, 30 Jul 2015 23:47:05 +0200
|
||||
Subject: [PATCH 1/1] Remove Werror
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
-Werror shouldn't be used in released code since it can cause random build
|
||||
failures on moderate warnings. It also depends on the used toolchain since
|
||||
different toolchains may or may not print the same warnings.
|
||||
|
||||
Backported from: d7b84f69c5e92178e110552cce27f900744e1779
|
||||
|
||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||
---
|
||||
CMakeLists.txt | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index cab0de8..62bf203 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -97,10 +97,10 @@ endif( MSVC )
|
||||
|
||||
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||
# using regular Clang or AppleClang
|
||||
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror -Wall -Wconversion -Wshadow -Wno-sign-conversion")
|
||||
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wconversion -Wshadow -Wno-sign-conversion")
|
||||
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
||||
# using GCC
|
||||
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror -Wall -Wconversion -Wshadow -Wextra -pedantic")
|
||||
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wconversion -Wshadow -Wextra -pedantic")
|
||||
# not yet ready for -Wsign-conversion
|
||||
endif()
|
||||
|
||||
--
|
||||
2.5.0
|
||||
|
@ -1,39 +0,0 @@
|
||||
From 29bfb6ac06b7304d326e3b70fc0209a702b89d83 Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Subject: [PATCH] Revert "Use std namespace for snprintf."
|
||||
|
||||
This reverts commit 1c58876185d2a4ed87dac4a54b82f607e74f55fd.
|
||||
|
||||
std::snprintf() is only available in C++11, which is not provided by
|
||||
all compilers. Since the C library snprintf() can easily be used as a
|
||||
replacement on Linux systems, this patch changes jsoncpp to use the C
|
||||
library snprintf() instead of C++11 std::snprintf(), fixing the build error
|
||||
below:
|
||||
|
||||
src/lib_json/json_writer.cpp:33:18: error: 'snprintf' is not a member of 'std'
|
||||
|
||||
Upstream status: sent upstream
|
||||
package/jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
|
||||
src/lib_json/json_writer.cpp | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
|
||||
index 83102fd2bb86..f7ad1e21bbc0 100644
|
||||
--- a/src/lib_json/json_writer.cpp
|
||||
+++ b/src/lib_json/json_writer.cpp
|
||||
@@ -29,8 +29,6 @@
|
||||
|
||||
#if defined(_MSC_VER) && _MSC_VER < 1500 // VC++ 8.0 and below
|
||||
#define snprintf _snprintf
|
||||
-#elif __cplusplus >= 201103L
|
||||
-#define snprintf std::snprintf
|
||||
#endif
|
||||
|
||||
#if defined(_MSC_VER) && _MSC_VER >= 1400 // VC++ 8.0
|
||||
--
|
||||
2.1.4
|
||||
|
@ -1,4 +1,5 @@
|
||||
config BR2_PACKAGE_JSONCPP
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
bool "jsoncpp"
|
||||
help
|
||||
@ -10,5 +11,5 @@ config BR2_PACKAGE_JSONCPP
|
||||
|
||||
https://github.com/open-source-parsers/jsoncpp
|
||||
|
||||
comment "jsoncpp needs a toolchain w/ C++"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP
|
||||
comment "jsoncpp needs a toolchain w/ C++, gcc >= 4.7"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
JSONCPP_VERSION = 1.6.1
|
||||
JSONCPP_VERSION = 1.6.5
|
||||
JSONCPP_SITE = $(call github,open-source-parsers,jsoncpp,$(JSONCPP_VERSION))
|
||||
JSONCPP_LICENSE = Public Domain or MIT
|
||||
JSONCPP_LICENSE_FILES = LICENSE
|
||||
|
@ -1,26 +0,0 @@
|
||||
From d80b2dfeab475b066004d831c0d28c0dab064ca6 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Thu, 30 Jul 2015 10:24:53 +0200
|
||||
Subject: [PATCH] Adapt xbmc_vis_dll.h header path
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
src/Main_gles.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/Main_gles.cpp b/src/Main_gles.cpp
|
||||
index 3c22bf8..f5666e9 100644
|
||||
--- a/src/Main_gles.cpp
|
||||
+++ b/src/Main_gles.cpp
|
||||
@@ -38,7 +38,7 @@
|
||||
#include <GLES2/gl2ext.h>
|
||||
#endif
|
||||
|
||||
-#include "addons/include/xbmc_vis_dll.h"
|
||||
+#include "kodi/xbmc_vis_dll.h"
|
||||
#include "VisGUIShader.h"
|
||||
|
||||
//th
|
||||
--
|
||||
2.5.0
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
KODI_VISUALISATION_WAVEFORHUE_VERSION = 330b5d0432a976993d8ea3e13f01ec9bd3d8b02e
|
||||
KODI_VISUALISATION_WAVEFORHUE_VERSION = e87d5c7d7e7504036b80af8bc89f4cf6489085fe
|
||||
KODI_VISUALISATION_WAVEFORHUE_SITE = $(call github,notspiff,visualization.waveforhue,$(KODI_VISUALISATION_WAVEFORHUE_VERSION))
|
||||
KODI_VISUALISATION_WAVEFORHUE_LICENSE = GPLv2+
|
||||
KODI_VISUALISATION_WAVEFORHUE_LICENSE_FILES = COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
KODI_VERSION = 15.0-Isengard
|
||||
KODI_VERSION = 15.1-Isengard
|
||||
KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION))
|
||||
KODI_LICENSE = GPLv2
|
||||
KODI_LICENSE_FILES = LICENSE.GPL
|
||||
|
7
package/libbroadvoice/Config.in
Normal file
7
package/libbroadvoice/Config.in
Normal file
@ -0,0 +1,7 @@
|
||||
config BR2_PACKAGE_LIBBROADVOICE
|
||||
bool "libbroadvoice"
|
||||
help
|
||||
broadvoice - a library for the BroadVoice 16 and 32 speech
|
||||
codecs
|
||||
|
||||
https://www.broadcom.com/support/broadvoice
|
19
package/libbroadvoice/libbroadvoice.mk
Normal file
19
package/libbroadvoice/libbroadvoice.mk
Normal file
@ -0,0 +1,19 @@
|
||||
################################################################################
|
||||
#
|
||||
# libbroadvoice
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBBROADVOICE_VERSION = f65b0f50c8c767229fbf1758370880abc0d78564
|
||||
# we use the FreeSwitch fork because (quoting README):
|
||||
# "This library is based on the Broadcom reference code, but has been
|
||||
# heavily modified so that it builds into a proper library, with a clean
|
||||
# usable interface, on a range of platforms."
|
||||
LIBBROADVOICE_SITE = https://freeswitch.org/stash/scm/sd/libbroadvoice.git
|
||||
LIBBROADVOICE_SITE_METHOD = git
|
||||
LIBBROADVOICE_LICENSE = LGPLv2.1
|
||||
LIBBROADVOICE_LICENSE_FILES = COPYING
|
||||
LIBBROADVOICE_AUTORECONF = YES
|
||||
LIBBROADVOICE_INSTALL_STAGING = YES
|
||||
|
||||
$(eval $(autotools-package))
|
@ -9,5 +9,14 @@ config BR2_PACKAGE_LIBCGROUP
|
||||
|
||||
http://libcg.sourceforge.net/
|
||||
|
||||
if BR2_PACKAGE_LIBCGROUP
|
||||
|
||||
config BR2_PACKAGE_LIBCGROUP_TOOLS
|
||||
bool "install tools"
|
||||
help
|
||||
Include a set of command-line tools for managing cgroups.
|
||||
|
||||
endif
|
||||
|
||||
comment "libcgroup needs an (e)glibc toolchain w/ C++"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC
|
||||
|
@ -20,10 +20,15 @@ LIBCGROUP_CONF_ENV = \
|
||||
CFLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS"
|
||||
|
||||
LIBCGROUP_CONF_OPTS = \
|
||||
--disable-tools \
|
||||
--disable-daemon \
|
||||
--disable-initscript-install
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCGROUP_TOOLS),y)
|
||||
LIBCGROUP_CONF_OPTS += --enable-tools
|
||||
else
|
||||
LIBCGROUP_CONF_OPTS += --disable-tools
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
|
||||
LIBCGROUP_DEPENDENCIES += linux-pam
|
||||
LIBCGROUP_CONF_OPTS += --enable-pam
|
||||
|
@ -0,0 +1,153 @@
|
||||
From c7c769990bca3049bc389dcbd9985adaec134946 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Sat, 29 Aug 2015 11:59:18 +0200
|
||||
Subject: [PATCH] Use the native compiler to build generate_cookbook
|
||||
|
||||
The generate_cookbook binary needs to be executed at build time. When
|
||||
cross-compiling, this means that it should be built with the native
|
||||
compiler rather than the cross-compiler.
|
||||
|
||||
To achieve this, this commit imports the AX_CC_FOR_BUILD autoconf
|
||||
macro from the GNU Autoconf Archive project, and adjusts
|
||||
src/Makefile.am to use CC_FOR_BUILD to build generate_cookbook.
|
||||
|
||||
Based on initial work by Bernd Kuhls.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
Makefile.am | 1 +
|
||||
configure.ac | 2 ++
|
||||
m4/ax_cc_for_build.m4 | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
src/Makefile.am | 3 ++
|
||||
4 files changed, 83 insertions(+)
|
||||
create mode 100644 m4/ax_cc_for_build.m4
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 4468bca..bd3ce01 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -2,6 +2,7 @@ AM_CFLAGS = -Isrc -fPIC -Wall -O3 -lm
|
||||
AUTOMAKE_OPTIONS = gnu
|
||||
NAME = codec2
|
||||
AM_CPPFLAGS = $(AM_CFLAGS)
|
||||
+ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = codec2.pc
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 493c517..7520af6 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -4,10 +4,12 @@
|
||||
AC_PREREQ([2.59])
|
||||
AC_INIT(codec2, 0.2, david@rowetel.com)
|
||||
AM_INIT_AUTOMAKE
|
||||
+AC_CONFIG_MACRO_DIR([m4])
|
||||
|
||||
# Checks for programs.
|
||||
AC_PROG_CC
|
||||
AC_PROG_LIBTOOL
|
||||
+AX_CC_FOR_BUILD
|
||||
|
||||
# Checks for libraries.
|
||||
# FIXME: Replace `main' with a function in `-lm':
|
||||
diff --git a/m4/ax_cc_for_build.m4 b/m4/ax_cc_for_build.m4
|
||||
new file mode 100644
|
||||
index 0000000..c880fd0
|
||||
--- /dev/null
|
||||
+++ b/m4/ax_cc_for_build.m4
|
||||
@@ -0,0 +1,77 @@
|
||||
+# ===========================================================================
|
||||
+# http://www.gnu.org/software/autoconf-archive/ax_cc_for_build.html
|
||||
+# ===========================================================================
|
||||
+#
|
||||
+# SYNOPSIS
|
||||
+#
|
||||
+# AX_CC_FOR_BUILD
|
||||
+#
|
||||
+# DESCRIPTION
|
||||
+#
|
||||
+# Find a build-time compiler. Sets CC_FOR_BUILD and EXEEXT_FOR_BUILD.
|
||||
+#
|
||||
+# LICENSE
|
||||
+#
|
||||
+# Copyright (c) 2010 Reuben Thomas <rrt@sc3d.org>
|
||||
+# Copyright (c) 1999 Richard Henderson <rth@redhat.com>
|
||||
+#
|
||||
+# 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/>.
|
||||
+#
|
||||
+# As a special exception, the respective Autoconf Macro's copyright owner
|
||||
+# gives unlimited permission to copy, distribute and modify the configure
|
||||
+# scripts that are the output of Autoconf when processing the Macro. You
|
||||
+# need not follow the terms of the GNU General Public License when using
|
||||
+# or distributing such scripts, even though portions of the text of the
|
||||
+# Macro appear in them. The GNU General Public License (GPL) does govern
|
||||
+# all other use of the material that constitutes the Autoconf Macro.
|
||||
+#
|
||||
+# This special exception to the GPL applies to versions of the Autoconf
|
||||
+# Macro released by the Autoconf Archive. When you make and distribute a
|
||||
+# modified version of the Autoconf Macro, you may extend this special
|
||||
+# exception to the GPL to apply to your modified version as well.
|
||||
+
|
||||
+#serial 2
|
||||
+
|
||||
+dnl Get a default for CC_FOR_BUILD to put into Makefile.
|
||||
+AC_DEFUN([AX_CC_FOR_BUILD],
|
||||
+[# Put a plausible default for CC_FOR_BUILD in Makefile.
|
||||
+if test -z "$CC_FOR_BUILD"; then
|
||||
+ if test "x$cross_compiling" = "xno"; then
|
||||
+ CC_FOR_BUILD='$(CC)'
|
||||
+ else
|
||||
+ CC_FOR_BUILD=gcc
|
||||
+ fi
|
||||
+fi
|
||||
+AC_SUBST(CC_FOR_BUILD)
|
||||
+# Also set EXEEXT_FOR_BUILD.
|
||||
+if test "x$cross_compiling" = "xno"; then
|
||||
+ EXEEXT_FOR_BUILD='$(EXEEXT)'
|
||||
+else
|
||||
+ AC_CACHE_CHECK([for build system executable suffix], bfd_cv_build_exeext,
|
||||
+ [rm -f conftest*
|
||||
+ echo 'int main () { return 0; }' > conftest.c
|
||||
+ bfd_cv_build_exeext=
|
||||
+ ${CC_FOR_BUILD} -o conftest conftest.c 1>&5 2>&5
|
||||
+ for file in conftest.*; do
|
||||
+ case $file in
|
||||
+ *.c | *.o | *.obj | *.ilk | *.pdb) ;;
|
||||
+ *) bfd_cv_build_exeext=`echo $file | sed -e s/conftest//` ;;
|
||||
+ esac
|
||||
+ done
|
||||
+ rm -f conftest*
|
||||
+ test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no])
|
||||
+ EXEEXT_FOR_BUILD=""
|
||||
+ test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext}
|
||||
+fi
|
||||
+AC_SUBST(EXEEXT_FOR_BUILD)])dnl
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index 1153b3c..719088d 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -77,6 +77,9 @@ CODEBOOKSGE= \
|
||||
|
||||
noinst_PROGRAMS = generate_codebook genlspdtcb
|
||||
|
||||
+generate_codebook$(EXEEXT_FOR_BUILD): generate_codebook.c
|
||||
+ $(CC_FOR_BUILD) -o $@ generate_codebook.c -lm
|
||||
+
|
||||
codebook.$(OBJEXT): codebook.c
|
||||
codebookd.$(OBJEXT): codebookd.c
|
||||
codebookdt.$(OBJEXT): codebookdt.c
|
||||
--
|
||||
2.5.0
|
||||
|
@ -0,0 +1,50 @@
|
||||
From 19db6244200b870317382294f14b7d561d55a64e Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Sat, 29 Aug 2015 12:05:53 +0200
|
||||
Subject: [PATCH] Add option to disable unit tests
|
||||
|
||||
The unittests require C++, while the rest of the library does not, so
|
||||
this commit implements a --{enable,disable}-unittests option to
|
||||
selectively enable the build of the unit tests. When not provided, the
|
||||
option defaults to yes so that the existing behavior is preserved.
|
||||
|
||||
Based on initial work by Bernd Kuhls.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
Makefile.am | 6 +++++-
|
||||
configure.ac | 5 +++++
|
||||
2 files changed, 10 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index bd3ce01..1da250b 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -95,4 +95,8 @@ src/codebook/lsp8.txt \
|
||||
src/codebook/lsp9.txt \
|
||||
src/codebook/lsp10.txt
|
||||
|
||||
-SUBDIRS = src unittest
|
||||
+SUBDIRS = src
|
||||
+
|
||||
+if UNITTESTS
|
||||
+SUBDIRS += unittest
|
||||
+endif
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 7520af6..55b7215 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -24,5 +24,10 @@ AC_CHECK_HEADERS([stdlib.h string.h])
|
||||
AC_FUNC_MALLOC
|
||||
AC_CHECK_FUNCS([floor pow sqrt])
|
||||
|
||||
+AC_ARG_ENABLE([unittests],
|
||||
+ AS_HELP_STRING([--disable-unittests], [Disable unittests]),
|
||||
+ [], [enable_unittests=yes])
|
||||
+AM_CONDITIONAL([UNITTESTS], [test "${enable_unittests}" = "yes"])
|
||||
+
|
||||
AC_CONFIG_FILES([Makefile src/Makefile unittest/Makefile codec2.pc])
|
||||
AC_OUTPUT
|
||||
--
|
||||
2.5.0
|
||||
|
7
package/libcodec2/Config.in
Normal file
7
package/libcodec2/Config.in
Normal file
@ -0,0 +1,7 @@
|
||||
config BR2_PACKAGE_LIBCODEC2
|
||||
bool "libcodec2"
|
||||
help
|
||||
Codec2 is an open source low bit rate speech codec designed
|
||||
for communications quality speech between 1200 and 3200 bit/s.
|
||||
|
||||
http://rowetel.com/codec2.html
|
16
package/libcodec2/libcodec2.mk
Normal file
16
package/libcodec2/libcodec2.mk
Normal file
@ -0,0 +1,16 @@
|
||||
################################################################################
|
||||
#
|
||||
# libcodec2
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBCODEC2_VERSION = 392a55b4f3f8ad30d845ac6ae35e8b27343bb944
|
||||
LIBCODEC2_SITE = https://freeswitch.org/stash/scm/sd/libcodec2.git
|
||||
LIBCODEC2_SITE_METHOD = git
|
||||
LIBCODEC2_LICENSE = LGPLv2.1
|
||||
LIBCODEC2_LICENSE_FILES = COPYING
|
||||
LIBCODEC2_AUTORECONF = YES
|
||||
LIBCODEC2_INSTALL_STAGING = YES
|
||||
LIBCODEC2_CONF_OPTS = --disable-unittests
|
||||
|
||||
$(eval $(autotools-package))
|
@ -1,2 +1,2 @@
|
||||
# From http://lists.freedesktop.org/archives/dri-devel/2015-June/085375.html
|
||||
sha256 906c294bdbe1c94c3ca084305d61a6e5a8367f3b4986e6cc13b1e9b3f75931dc libdrm-2.4.62.tar.bz2
|
||||
# From http://lists.freedesktop.org/archives/dri-devel/2015-August/088677.html
|
||||
sha256 b60786fe7d6e42adb3966ce1a658f63fec528d537396381cbda93bcc99a934b6 libdrm-2.4.64.tar.bz2
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBDRM_VERSION = 2.4.62
|
||||
LIBDRM_VERSION = 2.4.64
|
||||
LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2
|
||||
LIBDRM_SITE = http://dri.freedesktop.org/libdrm
|
||||
LIBDRM_LICENSE = MIT
|
||||
|
7
package/libg7221/Config.in
Normal file
7
package/libg7221/Config.in
Normal file
@ -0,0 +1,7 @@
|
||||
config BR2_PACKAGE_LIBG7221
|
||||
bool "libg7221"
|
||||
help
|
||||
libg722_1 is a library for the ITU G.722.1 and Annex C
|
||||
wideband speech codecs.
|
||||
|
||||
http://www.soft-switch.org
|
16
package/libg7221/libg7221.mk
Normal file
16
package/libg7221/libg7221.mk
Normal file
@ -0,0 +1,16 @@
|
||||
################################################################################
|
||||
#
|
||||
# libg7221
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBG7221_VERSION = dbfc29d4806ecdace50379a2f4d68a992a6fec34
|
||||
# we use the FreeSwitch fork because it contains pkgconf support
|
||||
LIBG7221_SITE = https://freeswitch.org/stash/scm/sd/libg7221.git
|
||||
LIBG7221_SITE_METHOD = git
|
||||
LIBG7221_LICENSE = Polycom
|
||||
LIBG7221_LICENSE_FILES = COPYING
|
||||
LIBG7221_AUTORECONF = YES
|
||||
LIBG7221_INSTALL_STAGING = YES
|
||||
|
||||
$(eval $(autotools-package))
|
@ -1,2 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 99c41320b63f6860869b5fb9af9a1854b15582796c64ee3dfd7096dc0c89f307 glew-1.10.0.tgz
|
||||
sha256 af58103f4824b443e7fa4ed3af593b8edac6f3a7be3b30911edbc7344f48e4bf glew-1.12.0.tgz
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBGLEW_VERSION = 1.10.0
|
||||
LIBGLEW_VERSION = 1.12.0
|
||||
LIBGLEW_SOURCE = glew-$(LIBGLEW_VERSION).tgz
|
||||
LIBGLEW_SITE = http://sourceforge.net/projects/glew/files/glew/$(LIBGLEW_VERSION)
|
||||
LIBGLEW_LICENSE = BSD-3c, MIT
|
||||
|
@ -0,0 +1,34 @@
|
||||
From d9dfeca8736318eaad5cd4554cbae059469decde Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Fri, 28 Aug 2015 19:02:11 +0200
|
||||
Subject: [PATCH] Use -f option when calling ln at install time
|
||||
|
||||
This allows "make install; make install" to work properly.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
Makefile | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 373709c..6206b09 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -113,12 +113,12 @@ tags: http_parser.c http_parser.h test.c
|
||||
install: library
|
||||
$(INSTALL) -D http_parser.h $(INCLUDEDIR)/http_parser.h
|
||||
$(INSTALL) -D $(SONAME) $(LIBDIR)/$(SONAME)
|
||||
- ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.so
|
||||
+ ln -sf $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.so
|
||||
|
||||
install-strip: library
|
||||
$(INSTALL) -D http_parser.h $(INCLUDEDIR)/http_parser.h
|
||||
$(INSTALL) -D -s $(SONAME) $(LIBDIR)/$(SONAME)
|
||||
- ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.so
|
||||
+ ln -sf $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.so
|
||||
|
||||
uninstall:
|
||||
rm $(INCLUDEDIR)/http_parser.h
|
||||
--
|
||||
2.5.0
|
||||
|
17
package/libhttpparser/Config.in
Normal file
17
package/libhttpparser/Config.in
Normal file
@ -0,0 +1,17 @@
|
||||
config BR2_PACKAGE_LIBHTTPPARSER
|
||||
bool "libhttpparser"
|
||||
depends on !BR2_STATIC_LIBS
|
||||
help
|
||||
This is a parser for HTTP messages written in C. It
|
||||
parses both requests and responses. The parser is
|
||||
designed to be used in performance HTTP applications.
|
||||
It does not make any syscalls nor allocations, it does
|
||||
not buffer data, it can be interrupted at anytime.
|
||||
Depending on your architecture, it only requires about
|
||||
40 bytes of data per message stream (in a web server
|
||||
that is per connection).
|
||||
|
||||
https://github.com/joyent/http-parser
|
||||
|
||||
comment "libhttpparser needs a toolchain w/ dynamic library"
|
||||
depends on BR2_STATIC_LIBS
|
26
package/libhttpparser/libhttpparser.mk
Normal file
26
package/libhttpparser/libhttpparser.mk
Normal file
@ -0,0 +1,26 @@
|
||||
################################################################################
|
||||
#
|
||||
# libhttpparser
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBHTTPPARSER_VERSION = v2.5.0
|
||||
LIBHTTPPARSER_SITE = $(call github,joyent,http-parser,$(LIBHTTPPARSER_VERSION))
|
||||
LIBHTTPPARSER_INSTALL_STAGING = YES
|
||||
LIBHTTPPARSER_LICENSE = MIT
|
||||
LIBHTTPPARSER_LICENSE_FILES = LICENSE-MIT
|
||||
|
||||
define LIBHTTPPARSER_BUILD_CMDS
|
||||
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) library package
|
||||
endef
|
||||
|
||||
define LIBHTTPPARSER_INSTALL_STAGING_CMDS
|
||||
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) PREFIX=$(STAGING_DIR)/usr install
|
||||
$(INSTALL) -D -m 0644 $(@D)/libhttp_parser.a $(STAGING_DIR)/usr/lib/libhttp_parser.a
|
||||
endef
|
||||
|
||||
define LIBHTTPPARSER_INSTALL_TARGET_CMDS
|
||||
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) PREFIX=$(TARGET_DIR)/usr install
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
@ -1,2 +1,2 @@
|
||||
# From http://lists.gnu.org/archive/html/help-libidn/2015-07/msg00011.html
|
||||
sha1 0bb34003a0fe05a91e60d346803401f16c82a1fb libidn-1.31.tar.gz
|
||||
# From http://lists.nongnu.org/archive/html/help-libidn/2015-08/msg00001.html
|
||||
sha1 ddd018611b98af7c67d434aa42d15d39f45129f5 libidn-1.32.tar.gz
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBIDN_VERSION = 1.31
|
||||
LIBIDN_VERSION = 1.32
|
||||
LIBIDN_SITE = $(BR2_GNU_MIRROR)/libidn
|
||||
LIBIDN_INSTALL_STAGING = YES
|
||||
LIBIDN_CONF_ENV = EMACS="no"
|
||||
|
7
package/libilbc/Config.in
Normal file
7
package/libilbc/Config.in
Normal file
@ -0,0 +1,7 @@
|
||||
config BR2_PACKAGE_LIBILBC
|
||||
bool "libilbc"
|
||||
help
|
||||
iLBC (internet Low Bitrate Codec) is a FREE speech codec
|
||||
suitable for robust voice communication over IP.
|
||||
|
||||
http://www.webrtc.org/license-rights/ilbc-freeware
|
15
package/libilbc/libilbc.mk
Normal file
15
package/libilbc/libilbc.mk
Normal file
@ -0,0 +1,15 @@
|
||||
################################################################################
|
||||
#
|
||||
# libilbc
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBILBC_VERSION = 829b08c7902ceb87a261279fabb36b6d523c6e07
|
||||
LIBILBC_SITE = https://freeswitch.org/stash/scm/sd/libilbc.git
|
||||
LIBILBC_SITE_METHOD = git
|
||||
LIBILBC_LICENSE = Global IP Sound iLBC Public License v2.0
|
||||
LIBILBC_LICENSE_FILES = gips_iLBClicense.pdf
|
||||
LIBILBC_AUTORECONF = YES
|
||||
LIBILBC_INSTALL_STAGING = YES
|
||||
|
||||
$(eval $(autotools-package))
|
@ -0,0 +1,25 @@
|
||||
Downloaded from
|
||||
http://anonscm.debian.org/cgit/pkg-nlnetlabs/ldns.git/plain/debian/patches/fix-double-free-for-answers-bigger-than-4096.patch
|
||||
|
||||
which is a backport from upstream
|
||||
http://git.nlnetlabs.nl/ldns/commit/?h=develop&id=2853eb352b4461e98f2926ace4ea3810cedf4167
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
From 2853eb352b4461e98f2926ace4ea3810cedf4167 Mon Sep 17 00:00:00 2001
|
||||
From: Willem Toorop <willem@nlnetlabs.nl>
|
||||
Date: Tue, 28 Jan 2014 11:06:38 +0100
|
||||
Subject: bugfix #548: Double free for answers > 4096
|
||||
|
||||
in ldns_resolver_send_pkt. Thank you sunthought@gmail.com
|
||||
---
|
||||
--- ldns.orig/resolver.c
|
||||
+++ ldns/resolver.c
|
||||
@@ -1117,6 +1117,7 @@ ldns_resolver_send_pkt(ldns_pkt **answer
|
||||
ldns_pkt_set_edns_udp_size(query_pkt
|
||||
, 4096);
|
||||
ldns_pkt_free(answer_pkt);
|
||||
+ answer_pkt = NULL;
|
||||
/* Nameservers should not become
|
||||
* unreachable because fragments are
|
||||
* dropped (network error). We might
|
@ -0,0 +1,45 @@
|
||||
Dwonloaded from
|
||||
http://anonscm.debian.org/cgit/pkg-nlnetlabs/ldns.git/tree/debian/patches/fix-whitespace-bug-in-ldns-read-zone.patch
|
||||
|
||||
which is a backport from
|
||||
http://git.nlnetlabs.nl/ldns/commit/?h=develop&id=d6037a22fbedb8ef3a22de4107e4eaa36840865b
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
From d6037a22fbedb8ef3a22de4107e4eaa36840865b Mon Sep 17 00:00:00 2001
|
||||
From: Matthijs Mekking <matthijs@nlnetlabs.nl>
|
||||
Date: Wed, 18 Jun 2014 09:55:17 +0200
|
||||
Subject: whitespace bug in ldns-read-zone
|
||||
|
||||
---
|
||||
--- ldns.orig/rr.c
|
||||
+++ ldns/rr.c
|
||||
@@ -670,6 +670,18 @@ ldns_rr_new_question_frm_str(ldns_rr **n
|
||||
true);
|
||||
}
|
||||
|
||||
+static int
|
||||
+ldns_rr_is_whitespace_line(char* line, int line_len)
|
||||
+{
|
||||
+ int i;
|
||||
+ for (i = 0; i < line_len; i++) {
|
||||
+ if (!isspace((int)line[i])) {
|
||||
+ return 0;
|
||||
+ }
|
||||
+ }
|
||||
+ return 1;
|
||||
+}
|
||||
+
|
||||
ldns_status
|
||||
ldns_rr_new_frm_fp(ldns_rr **newrr, FILE *fp, uint32_t *ttl, ldns_rdf **origin, ldns_rdf **prev)
|
||||
{
|
||||
@@ -745,6 +757,9 @@ ldns_rr_new_frm_fp_l(ldns_rr **newrr, FI
|
||||
s = LDNS_STATUS_SYNTAX_TTL;
|
||||
} else if (strncmp(line, "$INCLUDE", 8) == 0) {
|
||||
s = LDNS_STATUS_SYNTAX_INCLUDE;
|
||||
+ } else if (ldns_rr_is_whitespace_line(line, size)) {
|
||||
+ LDNS_FREE(line);
|
||||
+ return LDNS_STATUS_SYNTAX_EMPTY;
|
||||
} else {
|
||||
if (origin && *origin) {
|
||||
s = ldns_rr_new_frm_str(&rr, (const char*) line, ttl, *origin, prev);
|
9
package/libldns/Config.in
Normal file
9
package/libldns/Config.in
Normal file
@ -0,0 +1,9 @@
|
||||
config BR2_PACKAGE_LIBLDNS
|
||||
bool "libldns"
|
||||
help
|
||||
The goal of ldns is to simplify DNS programming, it supports
|
||||
recent RFCs like the DNSSEC documents, and allows developers
|
||||
to easily create software conforming to current RFCs, and
|
||||
experimental software for current Internet Drafts.
|
||||
|
||||
http://www.nlnetlabs.nl/projects/ldns
|
4
package/libldns/libldns.hash
Normal file
4
package/libldns/libldns.hash
Normal file
@ -0,0 +1,4 @@
|
||||
# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.6.17.tar.gz.sha1
|
||||
sha1 4218897b3c002aadfc7280b3f40cda829e05c9a4 ldns-1.6.17.tar.gz
|
||||
# Locally calculated
|
||||
sha256 8b88e059452118e8949a2752a55ce59bc71fa5bc414103e17f5b6b06f9bcc8cd ldns-1.6.17.tar.gz
|
36
package/libldns/libldns.mk
Normal file
36
package/libldns/libldns.mk
Normal file
@ -0,0 +1,36 @@
|
||||
################################################################################
|
||||
#
|
||||
# libldns
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBLDNS_VERSION = 1.6.17
|
||||
LIBLDNS_SOURCE = ldns-$(LIBLDNS_VERSION).tar.gz
|
||||
LIBLDNS_SITE = http://www.nlnetlabs.nl/downloads/ldns
|
||||
LIBLDNS_LICENSE = BSD-3c
|
||||
LIBLDNS_LICENSE_FILES = LICENSE
|
||||
LIBLDNS_INSTALL_STAGING = YES
|
||||
LIBLDNS_CONF_OPTS = \
|
||||
--without-examples \
|
||||
--without-p5-dns-ldns \
|
||||
--without-pyldns \
|
||||
--without-pyldnsx
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
LIBLDNS_DEPENDENCIES += host-pkgconf openssl
|
||||
LIBLDNS_CONF_OPTS += \
|
||||
--with-ssl=$(STAGING_DIR)/usr \
|
||||
--enable-dane \
|
||||
--enable-ecdsa \
|
||||
--enable-gost \
|
||||
--enable-sha2
|
||||
else
|
||||
LIBLDNS_CONF_OPTS += \
|
||||
--without-ssl \
|
||||
--disable-dane \
|
||||
--disable-ecdsa \
|
||||
--disable-gost \
|
||||
--disable-sha2
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
22
package/libopenh264/Config.in
Normal file
22
package/libopenh264/Config.in
Normal file
@ -0,0 +1,22 @@
|
||||
config BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS
|
||||
bool
|
||||
default y if BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || \
|
||||
BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \
|
||||
BR2_x86_64
|
||||
|
||||
config BR2_PACKAGE_LIBOPENH264
|
||||
bool "libopenh264"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS
|
||||
help
|
||||
OpenH264 is a codec library which supports H.264 encoding and
|
||||
decoding.
|
||||
|
||||
http://www.openh264.org
|
||||
|
||||
comment "libopenh264 needs a toolchain w/ C++, dynamic library, threads"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
BR2_STATIC_LIBS
|
||||
depends on BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS
|
52
package/libopenh264/libopenh264.mk
Normal file
52
package/libopenh264/libopenh264.mk
Normal file
@ -0,0 +1,52 @@
|
||||
################################################################################
|
||||
#
|
||||
# libopenh264
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBOPENH264_VERSION = v1.4.0
|
||||
LIBOPENH264_SITE = $(call github,cisco,openh264,$(LIBOPENH264_VERSION))
|
||||
LIBOPENH264_LICENSE = BSD-2c
|
||||
LIBOPENH264_LICENSE_FILES = LICENSE
|
||||
LIBOPENH264_INSTALL_STAGING = YES
|
||||
|
||||
ifeq ($(BR2_aarch64),y)
|
||||
LIBOPENH264_ARCH = aarch64
|
||||
else ifeq ($(BR2_arm)$(BR2_armeb),y)
|
||||
LIBOPENH264_ARCH = arm
|
||||
else ifeq ($(BR2_i386),y)
|
||||
LIBOPENH264_ARCH = x86
|
||||
LIBOPENH264_DEPENDENCIES += host-nasm
|
||||
else ifeq ($(BR2_mips)$(BR2_mipsel),y)
|
||||
LIBOPENH264_ARCH = mips
|
||||
else ifeq ($(BR2_mips64)$(BR2_mips64el),y)
|
||||
LIBOPENH264_ARCH = mips64
|
||||
else ifeq ($(BR2_x86_64),y)
|
||||
LIBOPENH264_ARCH = x86_64
|
||||
LIBOPENH264_DEPENDENCIES += host-nasm
|
||||
endif
|
||||
|
||||
# ENABLE64BIT is really only used for x86-64, other 64 bits
|
||||
# architecture don't need it.
|
||||
LIBOPENH264_MAKE_OPTS = \
|
||||
ARCH=$(LIBOPENH264_ARCH) \
|
||||
ENABLE64BIT=$(if $(BR2_x86_64),Yes,No)
|
||||
|
||||
define LIBOPENH264_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
|
||||
$(LIBOPENH264_MAKE_OPTS)
|
||||
endef
|
||||
|
||||
define LIBOPENH264_INSTALL_STAGING_CMDS
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
|
||||
$(LIBOPENH264_MAKE_OPTS) \
|
||||
DESTDIR=$(STAGING_DIR) PREFIX=/usr install
|
||||
endef
|
||||
|
||||
define LIBOPENH264_INSTALL_TARGET_CMDS
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
|
||||
$(LIBOPENH264_MAKE_OPTS) \
|
||||
DESTDIR=$(TARGET_DIR) PREFIX=/usr install
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
9
package/libpam-radius-auth/Config.in
Normal file
9
package/libpam-radius-auth/Config.in
Normal file
@ -0,0 +1,9 @@
|
||||
config BR2_PACKAGE_LIBPAM_RADIUS_AUTH
|
||||
bool "libpam-radius-auth"
|
||||
help
|
||||
This is the PAM to RADIUS authentication module. It allows
|
||||
any PAM-capable machine to become a RADIUS client for
|
||||
authentication and accounting requests. You will need a
|
||||
RADIUS server to perform the actual authentication.
|
||||
|
||||
http://freeradius.org/pam_radius_auth/
|
2
package/libpam-radius-auth/libpam-radius-auth.hash
Normal file
2
package/libpam-radius-auth/libpam-radius-auth.hash
Normal file
@ -0,0 +1,2 @@
|
||||
# Locally calculated after checking PGP signature
|
||||
sha256 742d79fc39824726c098e746bd3dc3484f983f5ee082c621c1e848b2c3725305 pam_radius-1.4.0.tar.gz
|
28
package/libpam-radius-auth/libpam-radius-auth.mk
Normal file
28
package/libpam-radius-auth/libpam-radius-auth.mk
Normal file
@ -0,0 +1,28 @@
|
||||
################################################################################
|
||||
#
|
||||
# libpam-radius-auth
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBPAM_RADIUS_AUTH_VERSION = 1.4.0
|
||||
LIBPAM_RADIUS_AUTH_SITE = ftp://ftp.freeradius.org/pub/radius/
|
||||
LIBPAM_RADIUS_AUTH_SOURCE = pam_radius-$(LIBPAM_RADIUS_AUTH_VERSION).tar.gz
|
||||
LIBPAM_RADIUS_AUTH_DEPENDENCIES = linux-pam
|
||||
LIBPAM_RADIUS_AUTH_INSTALL_STAGING = YES
|
||||
LIBPAM_RADIUS_AUTH_LICENSE = GPLv2+
|
||||
LIBPAM_RADIUS_AUTH_LICENSE_FILES = LICENSE
|
||||
# While autoconf is used for configuration, the Makefile is
|
||||
# hand-written, so we need to pass CC, LD, CFLAGS at build time.
|
||||
LIBPAM_RADIUS_AUTH_MAKE_ENV = $(TARGET_CONFIGURE_OPTS)
|
||||
|
||||
define LIBPAM_RADIUS_AUTH_INSTALL_STAGING_CMDS
|
||||
mkdir -p $(STAGING_DIR)/lib/security/
|
||||
cp -dpfr $(@D)/pam_radius_auth.so* $(STAGING_DIR)/lib/security/
|
||||
endef
|
||||
|
||||
define LIBPAM_RADIUS_AUTH_INSTALL_TARGET_CMDS
|
||||
mkdir -p $(TARGET_DIR)/lib/security/
|
||||
cp -dpfr $(@D)/pam_radius_auth.so* $(TARGET_DIR)/lib/security/
|
||||
endef
|
||||
|
||||
$(eval $(autotools-package))
|
9
package/libpam-tacplus/Config.in
Normal file
9
package/libpam-tacplus/Config.in
Normal file
@ -0,0 +1,9 @@
|
||||
config BR2_PACKAGE_LIBPAM_TACPLUS
|
||||
bool "libpam-tacplus"
|
||||
help
|
||||
TACACS+ protocol client library and PAM module in C. This
|
||||
PAM module support authentication, authorization (account
|
||||
management) and accounting (session management)performed
|
||||
using TACACS+ protocol designed by Cisco.
|
||||
|
||||
https://github.com/jeroennijhof/pam_tacplus
|
21
package/libpam-tacplus/libpam-tacplus.mk
Normal file
21
package/libpam-tacplus/libpam-tacplus.mk
Normal file
@ -0,0 +1,21 @@
|
||||
################################################################################
|
||||
#
|
||||
# libpam-tacplus
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBPAM_TACPLUS_VERSION = 1.3.9
|
||||
LIBPAM_TACPLUS_SITE = $(call github,jeroennijhof,pam_tacplus,$(LIBPAM_TACPLUS_VERSION))
|
||||
LIBPAM_TACPLUS_LICENSE = GPLv2+
|
||||
LIBPAM_TACPLUS_LICENSE_FILES = COPYING
|
||||
LIBPAM_TACPLUS_DEPENDENCIES = linux-pam
|
||||
# Fetching from github, we need to generate the configure script
|
||||
LIBPAM_TACPLUS_AUTORECONF = YES
|
||||
LIBPAM_TACPLUS_AUTORECONF_OPTS = -I m4
|
||||
LIBPAM_TACPLUS_INSTALL_STAGING = YES
|
||||
LIBPAM_TACPLUS_CONF_ENV = \
|
||||
ax_cv_check_cflags___fstack_protector_all=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no)
|
||||
LIBPAM_TACPLUS_CONF_OPTS = \
|
||||
--enable-pamdir=/lib/security
|
||||
|
||||
$(eval $(autotools-package))
|
@ -1,2 +1,5 @@
|
||||
# Locally computed:
|
||||
sha256 a23eb9affbff279e13563a39317c0ad71c4de28908d4243c8bc109138430cc3b libpfm-4.3.0.tar.gz
|
||||
# From http://sourceforge.net/projects/perfmon2/files/libpfm4/:
|
||||
sha1 2ed06d6e746f7b1cd4b70e9736e621052f60d625 libpfm-4.6.0.tar.gz
|
||||
md5 5077b9022440e4951d96f2d0e73bd487 libpfm-4.6.0.tar.gz
|
||||
# Locally calculated
|
||||
sha256 5ab1e5b0472550f9037a8800834f6bc3b927690070f69fac0b67284b4b05fd5f libpfm-4.6.0.tar.gz
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBPFM4_VERSION = 4.3.0
|
||||
LIBPFM4_VERSION = 4.6.0
|
||||
LIBPFM4_SOURCE = libpfm-$(LIBPFM4_VERSION).tar.gz
|
||||
LIBPFM4_SITE = http://downloads.sourceforge.net/project/perfmon2/libpfm4
|
||||
LIBPFM4_LICENSE = libpfm4 license
|
||||
|
@ -1,25 +1,26 @@
|
||||
Disable build of Python bindings, which requires the sipconfig module.
|
||||
|
||||
Signed-off-by: Simon Dawson <spdawson@gmail.com>
|
||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||
|
||||
diff -Nurp a/Makefile.am b/Makefile.am
|
||||
--- a/Makefile.am 2008-11-12 01:27:31.000000000 +0000
|
||||
+++ b/Makefile.am 2013-04-16 09:41:13.476002178 +0100
|
||||
diff -purN libserial-0.6.0rc2.orig/Makefile.am libserial-0.6.0rc2/Makefile.am
|
||||
--- libserial-0.6.0rc2.orig/Makefile.am 2014-06-05 18:37:25.000000000 +0200
|
||||
+++ libserial-0.6.0rc2/Makefile.am 2015-07-30 20:59:28.828429011 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-SUBDIRS=src doc examples sip
|
||||
+SUBDIRS=src doc examples
|
||||
ACLOCAL_AMFLAGS=-I m4
|
||||
|
||||
EXTRA_DIST = doxygen.conf.in Makefile.dist libserial.spec libserial.pc
|
||||
|
||||
diff -Nurp a/Makefile.in b/Makefile.in
|
||||
--- a/Makefile.in 2008-11-12 01:28:14.000000000 +0000
|
||||
+++ b/Makefile.in 2013-04-16 09:41:05.628013626 +0100
|
||||
@@ -197,7 +197,7 @@ sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
diff -purN libserial-0.6.0rc2.orig/Makefile.in libserial-0.6.0rc2/Makefile.in
|
||||
--- libserial-0.6.0rc2.orig/Makefile.in 2014-06-05 18:40:09.000000000 +0200
|
||||
+++ libserial-0.6.0rc2/Makefile.in 2015-07-30 21:00:09.215188376 +0200
|
||||
@@ -348,7 +348,7 @@ target_alias = @target_alias@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
-SUBDIRS = src doc examples sip
|
||||
+SUBDIRS = src doc examples
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
EXTRA_DIST = doxygen.conf.in Makefile.dist libserial.spec libserial.pc
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = libserial.pc
|
||||
|
@ -1,15 +0,0 @@
|
||||
Add a missing header include, to fix a build error.
|
||||
|
||||
Signed-off-by: Simon Dawson <spdawson@gmail.com>
|
||||
|
||||
diff -Nurp a/src/SerialPort.cpp b/src/SerialPort.cpp
|
||||
--- a/src/SerialPort.cpp 2008-11-12 01:27:30.000000000 +0000
|
||||
+++ b/src/SerialPort.cpp 2013-04-23 15:43:41.537495852 +0100
|
||||
@@ -27,6 +27,7 @@
|
||||
#include <cassert>
|
||||
#include <termios.h>
|
||||
#include <fcntl.h>
|
||||
+#include <unistd.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/time.h>
|
||||
#include <signal.h>
|
@ -1,11 +1,16 @@
|
||||
config BR2_PACKAGE_LIBSERIAL
|
||||
bool "libserial"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS # boost
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # boost
|
||||
depends on BR2_USE_WCHAR # boost
|
||||
select BR2_PACKAGE_BOOST
|
||||
help
|
||||
Simplified serial port programming in C++ under POSIX operating
|
||||
systems.
|
||||
|
||||
http://libserial.sourceforge.net/
|
||||
|
||||
comment "libserial needs a toolchain w/ C++"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP
|
||||
comment "libserial needs a toolchain w/ C++, threads, wchar"
|
||||
depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
|
||||
|
@ -1,2 +1,5 @@
|
||||
# Locally computed:
|
||||
sha256 60d8aebf5f262c12baf94ce61d61198fc9b79da2432c735c200decd08ead1fb4 libserial-0.6.0rc1.tar.gz
|
||||
# From http://sourceforge.net/projects/libserial/files/libserial/0.6.0rc2/
|
||||
sha1 e09113be3ba595135e95e853003ff96feea0da63 libserial-0.6.0rc2.tar.gz
|
||||
md5 7787679b22901e4810bc53ecccdf8266 libserial-0.6.0rc2.tar.gz
|
||||
# Locally calculated
|
||||
sha256 35ee29eb1369d52ffb8658237577692f991eb508320d0abbb71c53e6494a1c23 libserial-0.6.0rc2.tar.gz
|
||||
|
@ -4,11 +4,12 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBSERIAL_VERSION = 0.6.0rc1
|
||||
LIBSERIAL_VERSION = 0.6.0rc2
|
||||
LIBSERIAL_SITE = http://downloads.sourceforge.net/libserial
|
||||
LIBSERIAL_INSTALL_STAGING = YES
|
||||
LIBSERIAL_LICENSE = GPLv2+
|
||||
LIBSERIAL_LICENSE_FILES = COPYING
|
||||
LIBSERIAL_DEPENDENCIES = boost
|
||||
|
||||
LIBSERIAL_CONF_ENV = ac_cv_prog_DOCBOOK2PDF=no
|
||||
|
||||
|
6
package/libsilk/Config.in
Normal file
6
package/libsilk/Config.in
Normal file
@ -0,0 +1,6 @@
|
||||
config BR2_PACKAGE_LIBSILK
|
||||
bool "libsilk"
|
||||
help
|
||||
SILK is an audio compression format and audio codec.
|
||||
|
||||
http://tools.ietf.org/html/draft-vos-silk-01
|
16
package/libsilk/libsilk.mk
Normal file
16
package/libsilk/libsilk.mk
Normal file
@ -0,0 +1,16 @@
|
||||
################################################################################
|
||||
#
|
||||
# libsilk
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBSILK_VERSION = 4268a02240c35c6055b0f237c46b09b2dcf79e45
|
||||
# we use the FreeSwitch fork because it contains pkgconf support
|
||||
LIBSILK_SITE = https://freeswitch.org/stash/scm/sd/libsilk.git
|
||||
LIBSILK_SITE_METHOD = git
|
||||
LIBSILK_LICENSE = BSD-3c
|
||||
LIBSILK_LICENSE_FILES = COPYING
|
||||
LIBSILK_AUTORECONF = YES
|
||||
LIBSILK_INSTALL_STAGING = YES
|
||||
|
||||
$(eval $(autotools-package))
|
8
package/libsoundtouch/Config.in
Normal file
8
package/libsoundtouch/Config.in
Normal file
@ -0,0 +1,8 @@
|
||||
config BR2_PACKAGE_LIBSOUNDTOUCH
|
||||
bool "libsoundtouch"
|
||||
help
|
||||
SoundTouch is an open-source audio processing library for
|
||||
changing the Tempo, Pitch and Playback Rates of audio streams
|
||||
or audio files.
|
||||
|
||||
http://www.surina.net/soundtouch
|
20
package/libsoundtouch/libsoundtouch.mk
Normal file
20
package/libsoundtouch/libsoundtouch.mk
Normal file
@ -0,0 +1,20 @@
|
||||
################################################################################
|
||||
#
|
||||
# libsoundtouch
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBSOUNDTOUCH_VERSION = 010a91a59071c7fefd316fca62c0d980ec85b4b1
|
||||
LIBSOUNDTOUCH_SITE = https://freeswitch.org/stash/scm/sd/libsoundtouch.git
|
||||
LIBSOUNDTOUCH_SITE_METHOD = git
|
||||
LIBSOUNDTOUCH_LICENSE = LGPLv2.1+
|
||||
LIBSOUNDTOUCH_LICENSE_FILES = COPYING.TXT
|
||||
LIBSOUNDTOUCH_AUTORECONF = YES
|
||||
LIBSOUNDTOUCH_INSTALL_STAGING = YES
|
||||
|
||||
define LIBSOUNDTOUCH_CREATE_CONFIG_M4
|
||||
mkdir -p $(@D)/config/m4
|
||||
endef
|
||||
LIBSOUNDTOUCH_POST_PATCH_HOOKS += LIBSOUNDTOUCH_CREATE_CONFIG_M4
|
||||
|
||||
$(eval $(autotools-package))
|
11
package/libssh/Config.in
Normal file
11
package/libssh/Config.in
Normal file
@ -0,0 +1,11 @@
|
||||
config BR2_PACKAGE_LIBSSH
|
||||
bool "libssh"
|
||||
# Either OpenSSL or libgcrypt are mandatory
|
||||
select BR2_PACKAGE_LIBGCRYPT if !BR2_PACKAGE_OPENSSL
|
||||
help
|
||||
libssh is a multiplatform C library implementing the SSHv2
|
||||
and SSHv1 protocol on client and server side. With libssh,
|
||||
you can remotely execute programs, transfer files, use a
|
||||
secure and transparent tunnel for your remote applications.
|
||||
|
||||
http://www.libssh.org/
|
4
package/libssh/libssh.hash
Normal file
4
package/libssh/libssh.hash
Normal file
@ -0,0 +1,4 @@
|
||||
# from https://red.libssh.org/projects/libssh/files/
|
||||
md5 bffc9dc548c3bae3a3afc5ac1654b272 libssh-0.7.1.tar.xz
|
||||
# Locally calculated
|
||||
sha256 2fc7ccf96d3263cbd8ab520118cb94d9a2e11714c61e22b3f761fc5352fd046d libssh-0.7.1.tar.xz
|
36
package/libssh/libssh.mk
Normal file
36
package/libssh/libssh.mk
Normal file
@ -0,0 +1,36 @@
|
||||
################################################################################
|
||||
#
|
||||
## libssh
|
||||
#
|
||||
#################################################################################
|
||||
|
||||
LIBSSH_VERSION = 0.7.1
|
||||
LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz
|
||||
LIBSSH_SITE = https://red.libssh.org/attachments/download/154
|
||||
LIBSSH_LICENSE = LGPLv2.1
|
||||
LIBSSH_LICENSE_FILES = COPYING
|
||||
LIBSSH_INSTALL_STAGING = YES
|
||||
LIBSSH_SUPPORTS_IN_SOURCE_BUILD = NO
|
||||
LIBSSH_CONF_OPTS = \
|
||||
-DWITH_STACK_PROTECTOR=OFF \
|
||||
-DWITH_SERVER=OFF \
|
||||
-DWITH_EXAMPLES=OFF
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
||||
LIBSSH_CONF_OPTS += -DWITH_ZLIB=ON
|
||||
LIBSSH_DEPENDENCIES += zlib
|
||||
else
|
||||
LIBSSH_CONF_OPTS += -DWITH_ZLIB=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
|
||||
LIBSSH_CONF_OPTS += -DWITH_GCRYPT=ON
|
||||
LIBSSH_DEPENDENCIES += libgcrypt
|
||||
else
|
||||
LIBSSH_CONF_OPTS += -DWITH_GCRYPT=OFF
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
LIBSSH_DEPENDENCIES += openssl
|
||||
endif
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBUV_VERSION = v1.6.1
|
||||
LIBUV_VERSION = v1.7.0
|
||||
LIBUV_SITE = $(call github,libuv,libuv,$(LIBUV_VERSION))
|
||||
LIBUV_DEPENDENCIES = host-pkgconf
|
||||
LIBUV_INSTALL_STAGING = YES
|
||||
|
16
package/libyuv/0001-i386-sse2.patch
Normal file
16
package/libyuv/0001-i386-sse2.patch
Normal file
@ -0,0 +1,16 @@
|
||||
Fix compilation on non-sse2 platforms
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
diff -uNr libyuv-1411.org/include/libyuv/scale_row.h libyuv-1411/include/libyuv/scale_row.h
|
||||
--- libyuv-1411.org/include/libyuv/scale_row.h 2015-05-22 23:39:21.000000000 +0200
|
||||
+++ libyuv-1411/include/libyuv/scale_row.h 2015-05-25 12:35:17.000000000 +0200
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
// The following are available on all x86 platforms:
|
||||
#if !defined(LIBYUV_DISABLE_X86) && \
|
||||
- (defined(_M_IX86) || defined(__x86_64__) || defined(__i386__))
|
||||
+ (defined(_M_IX86) || defined(__x86_64__) || (defined(__i386__) && defined(__SSE2__)))
|
||||
#define HAS_FIXEDDIV1_X86
|
||||
#define HAS_FIXEDDIV_X86
|
||||
#define HAS_SCALEADDROWS_SSE2
|
12
package/libyuv/Config.in
Normal file
12
package/libyuv/Config.in
Normal file
@ -0,0 +1,12 @@
|
||||
config BR2_PACKAGE_LIBYUV
|
||||
bool "libyuv"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on !BR2_STATIC_LIBS
|
||||
help
|
||||
libyuv is an open source project that includes YUV scaling
|
||||
and conversion functionality.
|
||||
|
||||
https://code.google.com/p/libyuv
|
||||
|
||||
comment "libyuv needs a toolchain w/ C++, dynamic library"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS
|
18
package/libyuv/libyuv.mk
Normal file
18
package/libyuv/libyuv.mk
Normal file
@ -0,0 +1,18 @@
|
||||
################################################################################
|
||||
#
|
||||
# libyuv
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBYUV_VERSION = 1ebf86795cb213a37f06eb1ef3713cff080568ea
|
||||
# we use the FreeSwitch fork because there is currently no alternative
|
||||
# for https://chromium.googlesource.com/libyuv/libyuv which will be
|
||||
# deactivated in 2015.
|
||||
LIBYUV_SITE = https://freeswitch.org/stash/scm/sd/libyuv.git
|
||||
LIBYUV_SITE_METHOD = git
|
||||
LIBYUV_LICENSE = BSD-3c
|
||||
LIBYUV_LICENSE_FILES = LICENSE
|
||||
LIBYUV_INSTALL_STAGING = YES
|
||||
LIBYUV_DEPENDENCIES = $(if $(BR2_PACKAGE_JPEG),jpeg)
|
||||
|
||||
$(eval $(cmake-package))
|
@ -208,18 +208,18 @@ endchoice
|
||||
config BR2_DEFAULT_KERNEL_HEADERS
|
||||
string
|
||||
default "3.0.101" if BR2_KERNEL_HEADERS_3_0
|
||||
default "3.2.69" if BR2_KERNEL_HEADERS_3_2
|
||||
default "3.2.70" if BR2_KERNEL_HEADERS_3_2
|
||||
default "3.4.108" if BR2_KERNEL_HEADERS_3_4
|
||||
default "3.10.85" if BR2_KERNEL_HEADERS_3_10
|
||||
default "3.10.86" if BR2_KERNEL_HEADERS_3_10
|
||||
default "3.11.10" if BR2_KERNEL_HEADERS_3_11
|
||||
default "3.12.45" if BR2_KERNEL_HEADERS_3_12
|
||||
default "3.12.46" if BR2_KERNEL_HEADERS_3_12
|
||||
default "3.13.11" if BR2_KERNEL_HEADERS_3_13
|
||||
default "3.14.49" if BR2_KERNEL_HEADERS_3_14
|
||||
default "3.14.50" if BR2_KERNEL_HEADERS_3_14
|
||||
default "3.15.10" if BR2_KERNEL_HEADERS_3_15
|
||||
default "3.16.7" if BR2_KERNEL_HEADERS_3_16
|
||||
default "3.17.8" if BR2_KERNEL_HEADERS_3_17
|
||||
default "3.18.19" if BR2_KERNEL_HEADERS_3_18
|
||||
default "3.18.20" if BR2_KERNEL_HEADERS_3_18
|
||||
default "3.19.8" if BR2_KERNEL_HEADERS_3_19
|
||||
default "4.0.9" if BR2_KERNEL_HEADERS_4_0
|
||||
default "4.1.4" if BR2_KERNEL_HEADERS_4_1
|
||||
default "4.1.5" if BR2_KERNEL_HEADERS_4_1
|
||||
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
|
||||
|
@ -12,7 +12,7 @@ endif
|
||||
|
||||
# Not possible to directly refer to mesa3d variables, because of
|
||||
# first/second expansion trickery...
|
||||
MESA3D_HEADERS_VERSION = 10.6.3
|
||||
MESA3D_HEADERS_VERSION = 10.6.4
|
||||
MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz
|
||||
MESA3D_HEADERS_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_HEADERS_VERSION)
|
||||
MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos
|
||||
|
@ -1,2 +1,2 @@
|
||||
# From http://lists.freedesktop.org/archives/mesa-announce/2015-July/000165.html
|
||||
sha256 58592e07c350cd2e8969b73fa83048c657a39fe2f13f3b88f5e5818fe2e4676d mesa-10.6.3.tar.xz
|
||||
# From http://lists.freedesktop.org/archives/mesa-announce/2015-August/000166.html
|
||||
sha256 8f5ac103f0f503de2f7a985b0df349bd4ecdfe7f51c714be146fa5a9a3c07b77 mesa-10.6.4.tar.xz
|
||||
|
@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
# When updating the version, please also update mesa3d-headers
|
||||
MESA3D_VERSION = 10.6.3
|
||||
MESA3D_VERSION = 10.6.4
|
||||
MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
|
||||
MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)
|
||||
MESA3D_LICENSE = MIT, SGI, Khronos
|
||||
|
@ -1,2 +1,2 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 5ebc3800a0018bfbec62dcc3748fb29f628df068acd39c62c4ef651d9276647e mosquitto-1.4.2.tar.gz
|
||||
sha256 773d7436f729b5a6088035708c9277a9c6ba5651e127b63c8f29fe39e152479c mosquitto-1.4.3.tar.gz
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MOSQUITTO_VERSION = 1.4.2
|
||||
MOSQUITTO_VERSION = 1.4.3
|
||||
MOSQUITTO_SITE = http://mosquitto.org/files/source
|
||||
MOSQUITTO_LICENSE = EPLv1.0 or EDLv1.0
|
||||
MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v10 edl-v10
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user