diff options
127 files changed, 2244 insertions, 1291 deletions
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index f83cf4b51..afc2f917a 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -99,6 +99,38 @@ config BR2_TARGET_UBOOT_FORMAT_LDR endchoice +config BR2_TARGET_UBOOT_OMAP_IFT + depends on BR2_TARGET_UBOOT_FORMAT_BIN + depends on BR2_arm || BR2_armeb + select BR2_PACKAGE_HOST_OMAP_U_BOOT_UTILS + bool "produce a .ift signed image (OMAP)" + help + Use gpsign to produce an image of u-boot.bin signed with + a Configuration Header for booting on OMAP processors. + This allows U-Boot to boot without the need for an + intermediate bootloader (e.g. x-loader) if it is written + on the first sector of the boot medium. + This only works for some media, such as NAND. Check your + chip documentation for details. You might also want to + read the documentation of gpsign, the tool that generates + the .ift image, at: + https://github.com/nmenon/omap-u-boot-utils/blob/master/README + +if BR2_TARGET_UBOOT_OMAP_IFT + +config BR2_TARGET_UBOOT_OMAP_IFT_CONFIG + string "gpsign Configuration Header config file" + help + The Configuration Header (CH) config file defines the + desired content of the CH for the signed image. + It usually contains external RAM settings and + possibly other external devices initialization. + The omap-u-boot-utils software contains example + configuration files for some boards: + https://github.com/nmenon/omap-u-boot-utils/tree/master/configs + +endif + menuconfig BR2_TARGET_UBOOT_NETWORK bool "Custom Network Settings" help diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 31190922f..486773aa7 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -33,6 +33,7 @@ else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y) UBOOT_BIN = u-boot.img else UBOOT_BIN = u-boot.bin +UBOOT_BIN_IFT = $(UBOOT_BIN).ift endif UBOOT_ARCH=$(KERNEL_ARCH) @@ -88,12 +89,36 @@ define UBOOT_BUILD_CMDS $(UBOOT_MAKE_TARGET) endef +define UBOOT_BUILD_OMAP_IFT + $(HOST_DIR)/usr/bin/gpsign -f $(@D)/u-boot.bin \ + -c $(call qstrip,$(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG)) +endef + define UBOOT_INSTALL_IMAGES_CMDS cp -dpf $(@D)/$(UBOOT_BIN) $(BINARIES_DIR)/ $(if $(BR2_TARGET_UBOOT_SPL), cp -dpf $(@D)/$(BR2_TARGET_UBOOT_SPL_NAME) $(BINARIES_DIR)/) endef +define UBOOT_INSTALL_OMAP_IFT_IMAGE + cp -dpf $(@D)/$(UBOOT_BIN_IFT) $(BINARIES_DIR)/ +endef + +ifeq ($(BR2_TARGET_UBOOT_OMAP_IFT),y) +# we NEED a config file unless we're at make source +ifeq ($(filter source,$(MAKECMDGOALS)),) +ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG)),) +$(error No gpsign config file. Check your BR2_TARGET_UBOOT_OMAP_IFT_CONFIG setting) +endif +ifeq ($(wildcard $(call qstrip,$(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG))),) +$(error gpsign config file $(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG) not found. Check your BR2_TARGET_UBOOT_OMAP_IFT_CONFIG setting) +endif +endif +UBOOT_DEPENDENCIES += host-omap-u-boot-utils +UBOOT_POST_BUILD_HOOKS += UBOOT_BUILD_OMAP_IFT +UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_INSTALL_OMAP_IFT_IMAGE +endif + $(eval $(call GENTARGETS)) ifeq ($(BR2_TARGET_UBOOT),y) diff --git a/linux/linux.mk b/linux/linux.mk index 34f86236c..f165dda50 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -183,6 +183,15 @@ define LINUX_INSTALL_KERNEL_IMAGE_TO_TARGET endef endif + +define LINUX_INSTALL_HOST_TOOLS + # Installing dtc (device tree compiler) as host tool, if selected + if grep -q "CONFIG_DTC=y" $(@D)/.config; then \ + $(INSTALL) -D -m 0755 $(@D)/scripts/dtc/dtc $(HOST_DIR)/usr/bin/dtc ; \ + fi +endef + + define LINUX_INSTALL_IMAGES_CMDS cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR) endef @@ -197,6 +206,7 @@ define LINUX_INSTALL_TARGET_CMDS rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/build ; \ rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/source ; \ fi + $(LINUX_INSTALL_HOST_TOOLS) endef include linux/linux-ext-*.mk diff --git a/package/Config.in b/package/Config.in index fb1b08fc5..ca8fc962d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -112,6 +112,7 @@ source "package/fbgrab/Config.in" if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/fbset/Config.in" endif +source "package/fbterm/Config.in" source "package/fbv/Config.in" source "package/imagemagick/Config.in" source "package/linux-fusion/Config.in" @@ -206,6 +207,7 @@ source "package/memtester/Config.in" source "package/minicom/Config.in" source "package/mtd/Config.in" source "package/ntfs-3g/Config.in" +source "package/ofono/Config.in" source "package/open2300/Config.in" source "package/openocd/Config.in" source "package/parted/Config.in" @@ -255,6 +257,7 @@ source "package/python/Config.in" if BR2_PACKAGE_PYTHON menu "external python modules" source "package/python-dpkt/Config.in" +source "package/python-id3/Config.in" source "package/python-mad/Config.in" source "package/python-netifaces/Config.in" source "package/python-pygame/Config.in" @@ -286,6 +289,7 @@ source "package/portaudio/Config.in" source "package/speex/Config.in" source "package/taglib/Config.in" source "package/tremor/Config.in" +source "package/webrtc-audio-processing/Config.in" endmenu menu "Compression and decompression" @@ -360,6 +364,7 @@ source "package/tslib/Config.in" source "package/libftdi/Config.in" source "package/libhid/Config.in" source "package/libiqrf/Config.in" +source "package/libnfc/Config.in" source "package/libusb/Config.in" source "package/libusb-compat/Config.in" source "package/libv4l/Config.in" @@ -402,12 +407,15 @@ source "package/libmnl/Config.in" source "package/libmodbus/Config.in" source "package/libmbus/Config.in" source "package/libnetfilter_conntrack/Config.in" +source "package/libnetfilter_cttimeout/Config.in" source "package/libnfnetlink/Config.in" source "package/libnl/Config.in" +source "package/liboping/Config.in" source "package/libpcap/Config.in" source "package/libosip2/Config.in" source "package/librsync/Config.in" source "package/libsoup/Config.in" +source "package/libtorrent/Config.in" source "package/libupnp/Config.in" source "package/libvncserver/Config.in" source "package/zeromq/Config.in" @@ -470,7 +478,9 @@ endmenu endmenu menu "Miscellaneous" +source "package/collectd/Config.in" source "package/empty/Config.in" +source "package/mobile-broadband-provider-info/Config.in" source "package/shared-mime-info/Config.in" endmenu @@ -520,6 +530,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/lighttpd/Config.in" endif source "package/links/Config.in" +source "package/linphone/Config.in" source "package/lrzsz/Config.in" source "package/mii-diag/Config.in" source "package/mrouted/Config.in" @@ -558,6 +569,7 @@ source "package/radvd/Config.in" source "package/rp-pppoe/Config.in" source "package/rsh-redone/Config.in" source "package/rsync/Config.in" +source "package/rtorrent/Config.in" source "package/samba/Config.in" source "package/ser2net/Config.in" source "package/socat/Config.in" @@ -591,6 +603,7 @@ endmenu menu "Package managers" source "package/ipkg/Config.in" +source "package/opkg/Config.in" if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/rpm/Config.in" endif @@ -612,6 +625,7 @@ source "package/file/Config.in" source "package/inotify-tools/Config.in" source "package/lockfile-progs/Config.in" source "package/logrotate/Config.in" +source "package/logsurfer/Config.in" source "package/screen/Config.in" source "package/sudo/Config.in" if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS diff --git a/package/Config.in.host b/package/Config.in.host index 861b7367d..9fcfede00 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -1,6 +1,7 @@ menu "Host utilities" source "package/lpc3250loader/Config.in.host" +source "package/omap-u-boot-utils/Config.in.host" source "package/openocd/Config.in.host" source "package/sam-ba/Config.in.host" source "package/uboot-tools/Config.in.host" diff --git a/package/audiofile/audiofile.mk b/package/audiofile/audiofile.mk index a49cc3e64..5f09f9596 100644 --- a/package/audiofile/audiofile.mk +++ b/package/audiofile/audiofile.mk @@ -4,7 +4,7 @@ # ############################################################# -AUDIOFILE_VERSION = 0.3.3 +AUDIOFILE_VERSION = 0.3.4 AUDIOFILE_SITE = http://audiofile.68k.org AUDIOFILE_INSTALL_STAGING = YES AUDIOFILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 987bd4e1e..eb7b9c0d4 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ############################################################# -BIND_VERSION = 9.6-ESV-R6 +BIND_VERSION = 9.6-ESV-R7 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION) BIND_MAKE = $(MAKE1) BIND_TARGET_SBINS = lwresd named named-checkconf named-checkzone diff --git a/package/collectd/Config.in b/package/collectd/Config.in new file mode 100644 index 000000000..cb96fbd84 --- /dev/null +++ b/package/collectd/Config.in @@ -0,0 +1,382 @@ +config BR2_PACKAGE_COLLECTD + bool "collectd" + help + collectd is a daemon which collects system performance + statistics periodically and provides mechanisms to store + the values in a variety of ways, for example in RRD files. + + http://collectd.org/ + +if BR2_PACKAGE_COLLECTD + +menu "match plugins" + +config BR2_PACKAGE_COLLECTD_EMPTY_COUNTER + bool "empty counter" + help + Match counter values which are currently zero. + +config BR2_PACKAGE_COLLECTD_HASHED + bool "hashed" + help + Match values using a hash function of the hostname. + +config BR2_PACKAGE_COLLECTD_REGEX + bool "regex" + help + Match values by their identifier based on regular expressions. + +config BR2_PACKAGE_COLLECTD_TIMEDIFF + bool "timediff" + help + Match values with an invalid timestamp. + +config BR2_PACKAGE_COLLECTD_VALUE + bool "value" + help + Select values by their data sources' values. +endmenu + +menu "misc plugins" + +config BR2_PACKAGE_COLLECTD_LOGFILE + bool "logfile" + default y + help + Writes log messages to a file or STDOUT/STDERR. + +config BR2_PACKAGE_COLLECTD_SYSLOG + bool "syslog" + default y + help + Logs to the standard UNIX logging mechanism. + +config BR2_PACKAGE_THRESHOLD + bool "threshold" + help + Checks values against configured thresholds and creates notifications + if values are out of bounds. + +endmenu + +menu "read plugins" + +comment "Select at least one for collectd to be useful" + +config BR2_PACKAGE_COLLECTD_APACHE + bool "apache" + select BR2_PACKAGE_LIBCURL + help + Collects Apache's mod_status information. + +config BR2_PACKAGE_COLLECTD_APCUPS + bool "apcups" + help + Collects UPS statistics from apcupsd. + +config BR2_PACKAGE_COLLECTD_BATTERY + bool "battery" + help + Collects the battery's charge, the drawn current and voltage. + +config BR2_PACKAGE_COLLECTD_BIND + bool "bind" + select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_LIBXML2 + help + Collects BIND DNS statistics. + +config BR2_PACKAGE_COLLECTD_CONNTRACK + bool "conntrack" + help + Collects the number of entries in Linux's connection tracking table. + +config BR2_PACKAGE_COLLECTD_CONTEXTSWITCH + bool "contextswitch" + help + Collects the number of context switches done by the operating system. + +config BR2_PACKAGE_COLLECTD_CPU + bool "cpu" + help + Collects the amount of time spent by the CPU in various states. + +config BR2_PACKAGE_COLLECTD_CPUFREQ + bool "cpufreq" + help + Collects the current CPU's frequency. + +config BR2_PACKAGE_COLLECTD_CURL + bool "curl" + select BR2_PACKAGE_LIBCURL + help + Uses libcurl to read files and then parses them according + to the configuration. + +config BR2_PACKAGE_COLLECTD_CURL_JSON + bool "curl-json" + select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_YAJL + help + Queries JSON data using the cURL library and parses it + according to the user's configuration using YAJL. + +config BR2_PACKAGE_COLLECTD_CURL_XML + bool "curl-xml" + select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_LIBXML2 + help + Reads files using libcurl and parses it as XML. + +config BR2_PACKAGE_COLLECTD_DF + bool "df" + help + Collects file system usage information. + +config BR2_PACKAGE_COLLECTD_DISK + bool "disk" + help + Collects performance statistics of hard-disks and partitions. + +config BR2_PACKAGE_COLLECTD_DNS + bool "dns" + select BR2_PACKAGE_LIBPCAP + help + Collects statistics of DNS traffic using libpcap. + +config BR2_PACKAGE_COLLECTD_ENTROPY + bool "entropy" + help + Collects the available entropy on a system. + +config BR2_PACKAGE_COLLECTD_ETHSTAT + bool "ethstat" + help + Collects network interface card statistics. + +config BR2_PACKAGE_COLLECTD_EXEC + bool "exec" + help + Executes scripts and reads values back that are printed + to STDOUT by that program. + +config BR2_PACKAGE_COLLECTD_FILECOUNT + bool "filecount" + help + Counts the number of files in a directory and all its subdirectories. + +config BR2_PACKAGE_COLLECTD_FSCACHE + bool "fscache" + help + Collects information about the file-system based caching + infrastructure for network file-systems and other slow media. + +config BR2_PACKAGE_COLLECTD_INTERFACE + bool "interface" + help + Collects information about the traffic of network interfaces. + +config BR2_PACKAGE_COLLECTD_IPTABLES + bool "iptables" + select BR2_PACKAGE_IPTABLES + help + Gather statistics from iptables packet filter. + +config BR2_PACKAGE_COLLECTD_IRQ + bool "irq" + help + Collects the number of interrupts. + +config BR2_PACKAGE_COLLECTD_LOAD + bool "load" + help + Collects the system load. + +config BR2_PACKAGE_COLLECTD_MD + bool "md" + help + Collects software-RAID device information. + +config BR2_PACKAGE_COLLECTD_MEMCACHED + bool "memcached" + help + Collects statistics from a memcached daemon. + +config BR2_PACKAGE_COLLECTD_MEMORY + bool "memory" + help + Collects physical memory utilization. + +config BR2_PACKAGE_COLLECTD_MYSQL + bool "mysql" + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_MYSQL_CLIENT + help + Connects to a MySQL database and issues a "show status" command. + +config BR2_PACKAGE_COLLECTD_NFS + bool "nfs" + help + Collects information about the usage of the Network File System. + +config BR2_PACKAGE_COLLECTD_NTPD + bool "ntpd" + help + Queries an NTP server and extracts parameters. + +config BR2_PACKAGE_COLLECTD_OLSRD + bool "olsrd" + help + Reads information about meshed networks from olsrd. + +config BR2_PACKAGE_COLLECTD_OPENVPN + bool "openvpn" + help + Reads the status file of OpenVPN to collect statistics. + +config BR2_PACKAGE_COLLECTD_PING + bool "ping" + depends on BR2_INET_IPV6 + select BR2_PACKAGE_LIBOPING + help + Mesures network latency using ICMP "echo requests". + +config BR2_PACKAGE_COLLECTD_PROCESSES + bool "processes" + help + Collects the number of processes gruped by state. + +config BR2_PACKAGE_COLLECTD_PROTOCOLS + bool "protocols" + help + Collects information about the network protocols. + +config BR2_PACKAGE_COLLECTD_SERIAL + bool "serial" + help + Collects the traffic on serial interfaces. + +config BR2_PACKAGE_COLLECTD_SNMP + bool "snmp" + select BR2_PACKAGE_NETSNMP + help + Reads values from SNMP devices. + +config BR2_PACKAGE_COLLECTD_SWAP + bool "swap" + help + Collects the amount of memory currently written to disk. + +config BR2_PACKAGE_COLLECTD_TABLE + bool "table" + help + Parses table-like structured plain-text files. + +config BR2_PACKAGE_COLLECTD_TAIL + bool "tail" + help + Tails log files and each line is given to one or more matches + which test if the line is relevant for any statistics. + +config BR2_PACKAGE_COLLECTD_TCPCONNS + bool "tcpconns" + help + Counts the number of TCP connections to/from a specified port. + +config BR2_PACKAGE_COLLECTD_THERMAL + bool "thermal" + help + Reads ACPI thermal zone information. + +config BR2_PACKAGE_COLLECTD_UPTIME + bool "uptime" + help + Keeps track of the system uptime. + +config BR2_PACKAGE_COLLECTD_USERS + bool "users" + help + Counts the number of users currently logged in. + +config BR2_PACKAGE_COLLECTD_VMEM + bool "vmem" + help + Collects information about the virtual memory subsystem. + +config BR2_PACKAGE_COLLECTD_WIRELESS + bool "wireless" + help + Collects signal quality, power and noise ratio for WLAN cards. + +endmenu + +menu "target plugins" + +config BR2_PACKAGE_COLLECTD_NOTIFICATION + bool "notification" + help + Create and dispatch a notification. + +config BR2_PACKAGE_COLLECTD_REPLACE + bool "replace" + help + Replace parts of an identifier using regular expressions. + +config BR2_PACKAGE_COLLECTD_SCALE + bool "scale" + help + Scale (multiply) values by an arbitrary number. + +config BR2_PACKAGE_COLLECTD_SET + bool "set" + help + Set (overwrite) entire parts of an identifier. + +endmenu + +menu "write plugins" + +comment "Select at least one for collectd to be useful" + +config BR2_PACKAGE_COLLECTD_CSV + bool "csv" + help + Writes values to a plain-text file in Comma Separated Values format. + +config BR2_PACKAGE_COLLECTD_GRAPHITE + bool "graphite" + help + Writes data collected to Carbon (Graphite's) storage API. + http://graphite.wikidot.com/start + +config BR2_PACKAGE_COLLECTD_NETWORK + bool "network" + depends on BR2_INET_IPV6 + help + Send/receive values from other instances of collectd. + +config BR2_PACKAGE_COLLECTD_RRDTOOL + bool "rrdtool" + select BR2_PACKAGE_FREETYPE + select BR2_PACKAGE_LIBART + select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_RRDTOOL + select BR2_PACKAGE_ZLIB + help + Writes values to RRD-files. + +config BR2_PACKAGE_COLLECTD_UNIXSOCK + bool "unixsock" + help + Opens a UNIX domain socket and accepts connections. + One can send commands to the daemon and receive information. + +config BR2_PACKAGE_COLLECTD_WRITEHTTP + bool "writehttp" + select BR2_PACKAGE_LIBCURL + help + Sends values collected to a web-server using HTTP POST and PUTVAL. + +endmenu + +endif diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk new file mode 100644 index 000000000..0109f77b5 --- /dev/null +++ b/package/collectd/collectd.mk @@ -0,0 +1,127 @@ +############################################################# +# +# collectd +# +############################################################# + +COLLECTD_VERSION = 5.1.0 +COLLECTD_SITE = http://collectd.org/files +COLLECTD_MAKE_OPT = LDFLAGS="$(TARGET_LDFLAGS) -lm" +COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes + +# These require unmet dependencies, are fringe, pointless or deprecated +COLLECTD_PLUGINS_DISABLE = amqp apple_sensors ascent dbi email \ + gmond hddtemp ipmi ipvs java libvirt lpar madwifi mbmon \ + memcachec modbus multimeter netapp netlink nginx \ + notify_desktop notify_email numa nut onewire oracle perl \ + pinba postgresql powerdns python redis routeros rrdcached \ + sensors tape target_v5upgrade teamspeak2 ted tokyotyrant \ + uuid varnish vserver write_mongodb write_redis xmms zfs_arc + +COLLECTD_CONF_OPT += --with-nan-emulation --with-fp-layout=nothing \ + --localstatedir=/var --with-perl-bindings=no \ + $(foreach p, $(COLLECTD_PLUGINS_DISABLE), --disable-$(p)) \ + $(if $(BR2_PACKAGE_COLLECTD_APACHE),--enable-apache,--disable-apache) \ + $(if $(BR2_PACKAGE_COLLECTD_APCUPS),--enable-apcups,--disable-apcups) \ + $(if $(BR2_PACKAGE_COLLECTD_BATTERY),--enable-battery,--disable-battery) \ + $(if $(BR2_PACKAGE_COLLECTD_BIND),--enable-bind,--disable-bind) \ + $(if $(BR2_PACKAGE_COLLECTD_CONNTRACK),--enable-conntrack,--disable-conntrack) \ + $(if $(BR2_PACKAGE_COLLECTD_CONTEXTSWITCH),--enable-contextswitch,--disable-contextswitch) \ + $(if $(BR2_PACKAGE_COLLECTD_CPU),--enable-cpu,--disable-cpu) \ + $(if $(BR2_PACKAGE_COLLECTD_CPUFREQ),--enable-cpufreq,--disable-cpufreq) \ + $(if $(BR2_PACKAGE_COLLECTD_CSV),--enable-csv,--disable-csv) \ + $(if $(BR2_PACKAGE_COLLECTD_CURL),--enable-curl,--disable-curl) \ + $(if $(BR2_PACKAGE_COLLECTD_CURL_JSON),--enable-curl_json,--disable-curl_json) \ + $(if $(BR2_PACKAGE_COLLECTD_CURL_XML),--enable-curl_xml,--disable-curl_xml) \ + $(if $(BR2_PACKAGE_COLLECTD_DF),--enable-df,--disable-df) \ + $(if $(BR2_PACKAGE_COLLECTD_DISK),--enable-disk,--disable-disk) \ + $(if $(BR2_PACKAGE_COLLECTD_DNS),--enable-dns,--disable-dns) \ + $(if $(BR2_PACKAGE_COLLECTD_EMPTY_COUNTER),--enable-match_empty_counter,--disable-match_empty_counter) \ + $(if $(BR2_PACKAGE_COLLECTD_ENTROPY),--enable-entropy,--disable-entropy) \ + $(if $(BR2_PACKAGE_COLLECTD_ETHSTAT),--enable-ethstat,--disable-ethstat) \ + $(if $(BR2_PACKAGE_COLLECTD_EXEC),--enable-exec,--disable-exec) \ + $(if $(BR2_PACKAGE_COLLECTD_FILECOUNT),--enable-filecount,--disable-filecount) \ + $(if $(BR2_PACKAGE_COLLECTD_FSCACHE),--enable-fscache,--disable-fscache) \ + $(if $(BR2_PACKAGE_COLLECTD_GRAPHITE),--enable-write_graphite,--disable-write_graphite) \ + $(if $(BR2_PACKAGE_COLLECTD_HASHED),--enable-match_hashed,--disable-match_hashed) \ + $(if $(BR2_PACKAGE_COLLECTD_INTERFACE),--enable-interface,--disable-interface) \ + $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),--enable-iptables,--disable-iptables) \ + $(if $(BR2_PACKAGE_COLLECTD_IRQ),--enable-irq,--disable-irq) \ + $(if $(BR2_PACKAGE_COLLECTD_LOAD),--enable-load,--disable-load) \ + $(if $(BR2_PACKAGE_COLLECTD_LOGFILE),--enable-logfile,--disable-logfile) \ + $(if $(BR2_PACKAGE_COLLECTD_MD),--enable-md,--disable-md) \ + $(if $(BR2_PACKAGE_COLLECTD_MEMCACHED),--enable-memcached,--disable-memcached) \ + $(if $(BR2_PACKAGE_COLLECTD_MEMORY),--enable-memory,--disable-memory) \ + $(if $(BR2_PACKAGE_COLLECTD_MYSQL),--enable-mysql,--disable-mysql) \ + $(if $(BR2_PACKAGE_COLLECTD_NETWORK),--enable-network,--disable-network) \ + $(if $(BR2_PACKAGE_COLLECTD_NFS),--enable-nfs,--disable-nfs) \ + $(if $(BR2_PACKAGE_COLLECTD_NOTIFICATION),--enable-target_notification,--disable-target_notification) \ + $(if $(BR2_PACKAGE_COLLECTD_NTPD),--enable-ntpd,--disable-ntpd) \ + $(if $(BR2_PACKAGE_COLLECTD_OLSRD),--enable-olsrd,--disable-olsrd) \ + $(if $(BR2_PACKAGE_COLLECTD_OPENVPN),--enable-openvpn,--disable-openvpn) \ + $(if $(BR2_PACKAGE_COLLECTD_PING),--enable-ping,--disable-ping) \ + $(if $(BR2_PACKAGE_COLLECTD_PROCESSES),--enable-processes,--disable-processes) \ + $(if $(BR2_PACKAGE_COLLECTD_PROTOCOLS),--enable-protocols,--disable-protocols) \ + $(if $(BR2_PACKAGE_COLLECTD_REGEX),--enable-match_regex,--disable-match-regex) \ + $(if $(BR2_PACKAGE_COLLECTD_REPLACE),--enable-target_replace,--disable-target_replace) \ + $(if $(BR2_PACKAGE_COLLECTD_RRDTOOL),--enable-rrdtool,--disable-rrdtool) \ + $(if $(BR2_PACKAGE_COLLECTD_SCALE),--enable-target_scale,--disable-target_scale) \ + $(if $(BR2_PACKAGE_COLLECTD_SERIAL),--enable-serial,--disable-serial) \ + $(if $(BR2_PACKAGE_COLLECTD_SET),--enable-target_set,--disable-target_set) \ + $(if $(BR2_PACKAGE_COLLECTD_SNMP),--enable-snmp,--disable-snmp) \ + $(if $(BR2_PACKAGE_COLLECTD_SWAP),--enable-swap,--disable-swap) \ + $(if $(BR2_PACKAGE_COLLECTD_SYSLOG),--enable-syslog,--disable-syslog) \ + $(if $(BR2_PACKAGE_COLLECTD_TABLE),--enable-table,--disable-table) \ + $(if $(BR2_PACKAGE_COLLECTD_TAIL),--enable-tail,--disable-tail) \ + $(if $(BR2_PACKAGE_COLLECTD_TCPCONNS),--enable-tcpconns,--disable-tcpconns) \ + $(if $(BR2_PACKAGE_COLLECTD_THERMAL),--enable-thermal,--disable-thermal) \ + $(if $(BR2_PACKAGE_COLLECTD_THRESHOLD),--enable-threshold,--disable-threshold) \ + $(if $(BR2_PACKAGE_COLLECTD_TIMEDIFF),--enable-match_timediff,--disable-match_timediff) \ + $(if $(BR2_PACKAGE_COLLECTD_UNIXSOCK),--enable-unixsock,--disable-unixsock) \ + $(if $(BR2_PACKAGE_COLLECTD_UPTIME),--enable-uptime,--disable-uptime) \ + $(if $(BR2_PACKAGE_COLLECTD_USERS),--enable-users,--disable-users) \ + $(if $(BR2_PACKAGE_COLLECTD_VALUE),--enable-match_value,--disable-match_value) \ + $(if $(BR2_PACKAGE_COLLECTD_VMEM),--enable-vmem,--disable-vmem) \ + $(if $(BR2_PACKAGE_COLLECTD_WIRELESS),--enable-wireless,--disable-wireless) \ + $(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),--enable-write_http,--disable-write_http) + +COLLECTD_DEPENDENCIES = host-pkg-config \ + $(if $(BR2_PACKAGE_COLLECTD_APACHE),libcurl) \ + $(if $(BR2_PACKAGE_COLLECTD_CURL),libcurl) \ + $(if $(BR2_PACKAGE_COLLECTD_CURL_JSON),libcurl yajl) \ + $(if $(BR2_PACKAGE_COLLECTD_CURL_XML),libcurl libxml2) \ + $(if $(BR2_PACKAGE_COLLECTD_DNS),libpcap) \ + $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),iptables) \ + $(if $(BR2_PACKAGE_COLLECTD_MYSQL),mysql_client) \ + $(if $(BR2_PACKAGE_COLLECTD_PING),liboping) \ + $(if $(BR2_PACKAGE_COLLECTD_RRDTOOL),rrdtool) \ + $(if $(BR2_PACKAGE_COLLECTD_SNMP),netsnmp) \ + $(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),libcurl) + +# include/library fixups +ifeq ($(BR2_PACKAGE_LIBCURL),y) + COLLECTD_CONF_OPT += --with-libcurl=$(STAGING_DIR)/usr +endif +ifeq ($(BR2_PACKAGE_MYSQL_CLIENT),y) + COLLECTD_CONF_OPT += --with-libmysql=$(STAGING_DIR)/usr +endif +ifeq ($(BR2_PACKAGE_NETSNMP),y) + COLLECTD_CONF_OPT += --with-libnetsnmp=$(STAGING_DIR)/usr/bin/net-snmp-config +endif +ifeq ($(BR2_PACKAGE_YAJL),y) + COLLECTD_CONF_OPT += --with-yajl=$(STAGING_DIR)/usr +endif + +# network can use libgcrypt +ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) + COLLECTD_DEPENDENCIES += libgcrypt + COLLECTD_CONF_OPT += --with-libgcrypt=$(STAGING_DIR)/usr +endif + +define COLLECTD_INSTALL_TARGET_CMDS + $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install + rm -f $(TARGET_DIR)/usr/bin/collectd-nagios + rm -f $(TARGET_DIR)/usr/share/collectd/postgresql_default.conf +endef + +$(eval $(call AUTOTARGETS)) diff --git a/package/connman/Config.in b/package/connman/Config.in index 2801b87b0..3373ec1aa 100644 --- a/package/connman/Config.in +++ b/package/connman/Config.in @@ -3,7 +3,8 @@ config BR2_PACKAGE_CONNMAN select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_IPTABLES - depends on BR2_UCLIBC_VERSION_SNAPSHOT || BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_eglibc || BR2_TOOLCHAIN_CTNG_eglibc + select BR2_PACKAGE_GNUTLS + depends on !(BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32) help The Connection Manager (ConnMan) project provides a daemon for managing internet connections within embedded devices running @@ -44,4 +45,4 @@ config BR2_PACKAGE_CONNMAN_CLIENT endif # BR2_PACKAGE_CONNMAN comment "connman needs a toolchain with resolver support" - depends on !(BR2_UCLIBC_VERSION_SNAPSHOT || BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_eglibc || BR2_TOOLCHAIN_CTNG_eglibc) + depends on BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32 diff --git a/package/connman/connman-uclibc-backtrace.patch b/package/connman/connman-uclibc-backtrace.patch new file mode 100644 index 000000000..4b806c6dd --- /dev/null +++ b/package/connman/connman-uclibc-backtrace.patch @@ -0,0 +1,44 @@ +[PATCH] fix build on uClibc without UCLIBC_HAS_BACKTRACE + +Backtrace support is only used for logging on signal errors, which +isn't really critical, so simply remove backtrace info if not +available in uClibc. + +Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> +--- + src/log.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +Index: connman-0.78/src/log.c +=================================================================== +--- connman-0.78.orig/src/log.c ++++ connman-0.78/src/log.c +@@ -30,7 +30,12 @@ + #include <stdlib.h> + #include <string.h> + #include <syslog.h> ++#include <features.h> ++/* backtrace support is optional on uClibc */ ++#if !(defined(__UCLIBC__) && !defined (__UCLIBC_HAS_BACKTRACE__)) ++#define HAVE_BACKTRACE + #include <execinfo.h> ++#endif + #include <dlfcn.h> + + #include "connman.h" +@@ -112,6 +117,7 @@ + + static void print_backtrace(unsigned int offset) + { ++#ifdef HAVE_BACKTRACE + void *frames[99]; + size_t n_ptrs; + unsigned int i; +@@ -210,6 +216,7 @@ + + close(outfd[1]); + close(infd[0]); ++#endif /* HAVE_BACKTRACE */ + } + + static void signal_handler(int signo) diff --git a/package/connman/connman.mk b/package/connman/connman.mk index 6b9bbe67e..0aa7ec7b6 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -4,9 +4,9 @@ # ####################################################### -CONNMAN_VERSION = 0.78 -CONNMAN_SITE = git://git.kernel.org/pub/scm/network/connman/connman.git -CONNMAN_DEPENDENCIES = libglib2 dbus iptables +CONNMAN_VERSION = 1.0 +CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman/ +CONNMAN_DEPENDENCIES = libglib2 dbus iptables gnutls CONNMAN_INSTALL_STAGING = YES CONNMAN_CONF_OPT += --localstatedir=/var \ $(if $(BR2_PACKAGE_CONNMAN_THREADS),--enable-threads,--disable-threads) \ @@ -17,9 +17,6 @@ CONNMAN_CONF_OPT += --localstatedir=/var \ $(if $(BR2_PACKAGE_CONNMAN_LOOPBACK),--enable-loopback,--disable-loopback) \ $(if $(BR2_PACKAGE_CONNMAN_NTPD),--enable-ntpd,--disable-ntpd) -# as long as sources are obtained from git, we need to generate the autofoo stuff -CONNMAN_AUTORECONF = YES - define CONNMAN_INSTALL_INITSCRIPT $(INSTALL) -m 0755 -D package/connman/S45connman $(TARGET_DIR)/etc/init.d/S45connman endef diff --git a/package/conntrack-tools/Config.in b/package/conntrack-tools/Config.in index 12eb98852..be491e6fb 100644 --- a/package/conntrack-tools/Config.in +++ b/package/conntrack-tools/Config.in @@ -1,7 +1,9 @@ config BR2_PACKAGE_CONNTRACK_TOOLS bool "conntrack-tools" depends on BR2_INET_IPV6 + depends on BR2_LARGEFILE select BR2_PACKAGE_LIBNETFILTER_CONNTRACK + select BR2_PACKAGE_LIBNETFILTER_CTTIMEOUT help The conntrack-tools are a set of tools targeted at system administrators. @@ -10,5 +12,5 @@ config BR2_PACKAGE_CONNTRACK_TOOLS http://www.netfilter.org/projects/conntrack-tools/ -comment "conntrack-tools requires a toolchain with IPV6 support" - depends on !BR2_INET_IPV6 +comment "conntrack-tools requires a toolchain with IPV6 and LARGEFILE support" + depends on !BR2_INET_IPV6 || !BR2_LARGEFILE diff --git a/package/conntrack-tools/conntrack-tools.mk b/package/conntrack-tools/conntrack-tools.mk index 8b411279b..6b9ba52b1 100644 --- a/package/conntrack-tools/conntrack-tools.mk +++ b/package/conntrack-tools/conntrack-tools.mk @@ -4,9 +4,10 @@ # ############################################################# -CONNTRACK_TOOLS_VERSION = 1.0.1 +CONNTRACK_TOOLS_VERSION = 1.2.1 CONNTRACK_TOOLS_SOURCE = conntrack-tools-$(CONNTRACK_TOOLS_VERSION).tar.bz2 CONNTRACK_TOOLS_SITE = http://www.netfilter.org/projects/conntrack-tools/files -CONNTRACK_TOOLS_DEPENDENCIES = host-pkg-config libnetfilter_conntrack +CONNTRACK_TOOLS_DEPENDENCIES = host-pkg-config \ + libnetfilter_conntrack libnetfilter_cttimeout $(eval $(call AUTOTARGETS)) diff --git a/package/e2fsprogs/e2fsprogs-add-missing-dep-of-tst_uuid-o.patch b/package/e2fsprogs/e2fsprogs-add-missing-dep-of-tst_uuid-o.patch deleted file mode 100644 index 3a60e8946..000000000 --- a/package/e2fsprogs/e2fsprogs-add-missing-dep-of-tst_uuid-o.patch +++ /dev/null @@ -1,18 +0,0 @@ -Add missing dependency of tst_uuid.o on uuid.h - -The missing dependency used to break parallel builds. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> ---- -diff -Nrup e2fsprogs.orig//lib/uuid/Makefile.in e2fsprogs-1.41.14//lib/uuid/Makefile.in ---- e2fsprogs.orig//lib/uuid/Makefile.in 2010-06-14 05:07:36.000000000 +0200 -+++ e2fsprogs-1.41.14//lib/uuid/Makefile.in 2011-07-18 13:44:58.000000000 +0200 -@@ -76,7 +76,7 @@ uuid.h: $(srcdir)/uuid.h.in - $(top_builddir)/lib/uuid/uuid_types.h: $(srcdir)/uuid_types.h.in $(top_builddir)/config.status - cd $(top_builddir); CONFIG_FILES=$(my_dir)/uuid_types.h ./config.status - --tst_uuid.o: $(srcdir)/tst_uuid.c -+tst_uuid.o: $(srcdir)/tst_uuid.c uuid.h - $(E) " CC $@" - $(Q) $(CC) $(ALL_CFLAGS) -c $(srcdir)/tst_uuid.c -o tst_uuid.o - diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 5f87b4023..db666356a 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -4,7 +4,7 @@ # ############################################################# -E2FSPROGS_VERSION = 1.42.2 +E2FSPROGS_VERSION = 1.42.3 E2FSPROGS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/e2fsprogs E2FSPROGS_CONF_OPT = \ diff --git a/package/fbterm/Config.in b/package/fbterm/Config.in new file mode 100644 index 000000000..1e4ab4c0d --- /dev/null +++ b/package/fbterm/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_FBTERM + bool "fbterm" + depends on (BR2_INSTALL_LIBSTDCPP && BR2_ENABLE_LOCALE && BR2_USE_WCHAR) + select BR2_PACKAGE_FONTCONFIG + select BR2_PACKAGE_LIBERATION + help + fbterm is a fast terminal emulator for Linux with frame buffer + device or VESA video card. + + http://code.google.com/p/fbterm/ + +comment "fbterm requires a toolchain with C++, WCHAR and locale support" + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_ENABLE_LOCALE && BR2_USE_WCHAR) diff --git a/package/fbterm/fbterm.mk b/package/fbterm/fbterm.mk new file mode 100644 index 000000000..ddb5b2b31 --- /dev/null +++ b/package/fbterm/fbterm.mk @@ -0,0 +1,12 @@ +############################################ +# +# fbterm +# +############################################ + +FBTERM_VERSION = 1.7.0 +FBTERM_SITE = http://fbterm.googlecode.com/files/ + +FBTERM_DEPENDENCIES = fontconfig liberation + +$(eval $(call AUTOTARGETS)) diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk index 7899b71d9..7a17ebcc8 100644 --- a/package/gmp/gmp.mk +++ b/package/gmp/gmp.mk @@ -4,7 +4,7 @@ # ############################################################# -GMP_VERSION = 5.0.4 +GMP_VERSION = 5.0.5 GMP_SITE = $(BR2_GNU_MIRROR)/gmp GMP_SOURCE = gmp-$(GMP_VERSION).tar.bz2 GMP_INSTALL_STAGING = YES diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index ce570d5f1..f7238aaae 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -4,7 +4,7 @@ # ############################################################# -GNUTLS_VERSION = 2.12.18 +GNUTLS_VERSION = 2.12.19 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.bz2 GNUTLS_SITE = $(BR2_GNU_MIRROR)/gnutls GNUTLS_DEPENDENCIES = host-pkg-config libgcrypt diff --git a/package/grep/grep.mk b/package/grep/grep.mk index aa22910da..389aa3b78 100644 --- a/package/grep/grep.mk +++ b/package/grep/grep.mk @@ -4,7 +4,7 @@ # ############################################################# -GREP_VERSION = 2.11 +GREP_VERSION = 2.12 GREP_SITE = $(BR2_GNU_MIRROR)/grep GREP_SOURCE = grep-$(GREP_VERSION).tar.xz GREP_CONF_OPT = --disable-perl-regexp --without-included-regex diff --git a/package/hiawatha/hiawatha-support-for-external-polarssl.patch b/package/hiawatha/hiawatha-support-for-external-polarssl.patch index e6033b9da..edc774b7d 100644 --- a/package/hiawatha/hiawatha-support-for-external-polarssl.patch +++ b/package/hiawatha/hiawatha-support-for-external-polarssl.patch @@ -9,21 +9,22 @@ This patch adds a ENABLE_SSL_EXTERNAL option, which, when used in addition to ENABLE_SSL, tells Hiawatha's build system to link against the already existing PolarSSL library instead of building its own. +[Gustavo]: Update for version 8.3 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> -Index: hiawatha-8.1/CMakeLists.txt -=================================================================== ---- hiawatha-8.1.orig/CMakeLists.txt -+++ hiawatha-8.1/CMakeLists.txt -@@ -9,6 +9,7 @@ - option(ENABLE_IPV6 "Enable IPv6 support in Hiawatha." ON) - option(ENABLE_MONITOR "Enable support for the Hiawatha Monitor." OFF) - option(ENABLE_SSL "Enable SSL (PolarSSL) support in Hiawatha." ON) -+option(ENABLE_SSL_EXTERNAL "Enable SSL (PolarSSL) as an external library." OFF) - option(ENABLE_TOOLKIT "Enable the URL toolkit in Hiawatha" ON) - option(ENABLE_XSLT "Enable XSLT support in Hiawatha." ON) +diff -Nura hiawatha-8.3.orig//CMakeLists.txt hiawatha-8.3/CMakeLists.txt +--- hiawatha-8.3.orig//CMakeLists.txt 2012-05-23 14:22:26.000000000 -0300 ++++ hiawatha-8.3/CMakeLists.txt 2012-05-24 08:13:00.007107500 -0300 +@@ -10,6 +10,7 @@ + option(ENABLE_MONITOR "Enable support for the Hiawatha Monitor." off) + option(ENABLE_RPROXY "Enable reverse proxy support in Hiawatha." on) + option(ENABLE_SSL "Enable SSL (PolarSSL) support in Hiawatha." on) ++option(ENABLE_SSL_EXTERNAL "Enable SSL (PolarSSL) as an external library." off) + option(ENABLE_TOOLKIT "Enable the URL toolkit in Hiawatha" on) + option(ENABLE_XSLT "Enable XSLT support in Hiawatha." on) -@@ -86,19 +87,23 @@ +@@ -85,19 +86,23 @@ # PolarSSL if(ENABLE_SSL) @@ -48,7 +49,7 @@ Index: hiawatha-8.1/CMakeLists.txt # Configure files configure_file(config.h.in config.h) foreach (configfile ${config_files_in}) -@@ -119,7 +124,9 @@ +@@ -118,7 +123,9 @@ target_link_libraries(hiawatha ${CRYPT_LIBRARY} pthread ${Z_LIBRARY}) if(ENABLE_SSL) target_link_libraries(hiawatha ${POLARSSL_LIBRARY}) diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index aa245f380..647c1e16c 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -1,4 +1,4 @@ -HIAWATHA_VERSION = 8.1 +HIAWATHA_VERSION = 8.3 HIAWATHA_SITE = http://www.hiawatha-webserver.org/files/ ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y) @@ -8,6 +8,11 @@ endif HIAWATHA_CONF_OPT += \ -DENABLE_TOOLKIT=OFF \ - -DENABLE_XSLT=OFF + -DENABLE_XSLT=OFF \ + -DCONFIG_DIR=/etc/hiawatha \ + -DLOG_DIR=/var/log \ + -DPID_DIR=/var/run \ + -DWEBROOT_DIR=/var/www/hiawatha \ + -DWORK_DIR=/var/lib/hiawatha $(eval $(call CMAKETARGETS)) diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in index 376a087b4..4a474c37e 100644 --- a/package/hostapd/Config.in +++ b/package/hostapd/Config.in @@ -10,14 +10,16 @@ config BR2_PACKAGE_HOSTAPD http://hostap.epitest.fi/ +if BR2_PACKAGE_HOSTAPD + config BR2_PACKAGE_HOSTAPD_EAP bool "Enable EAP" - depends on BR2_PACKAGE_HOSTAPD help Enable support for EAP and RADIUS. config BR2_PACKAGE_HOSTAPD_WPS bool "Enable WPS" - depends on BR2_PACKAGE_HOSTAPD help Enable support for Wi-Fi Protected Setup. + +endif diff --git a/package/hostapd/hostapd-0.7.3-ht40-secondary.patch b/package/hostapd/hostapd-0.7.3-ht40-secondary.patch deleted file mode 100644 index 7664f0360..000000000 --- a/package/hostapd/hostapd-0.7.3-ht40-secondary.patch +++ /dev/null @@ -1,52 +0,0 @@ -From dea50507861b79f522c70500fe978072f143af8f Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <jouni.malinen@atheros.com> -Date: Fri, 12 Nov 2010 18:31:56 +0200 -Subject: [PATCH] AP: Verify that HT40 secondary channel is supported - -Refuse to enable HT40 mode AP unless both the primary and secondary -channels are enabled for AP use. -(cherry picked from commit 8ea3dd21d2e8b760612af0c7b6a3bb5b89ba7304) ---- - src/ap/hw_features.c | 26 ++++++++++++++++++++++++++ - 1 files changed, 26 insertions(+), 0 deletions(-) - -diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c -index 0159c72..7fc5b83 100644 ---- a/src/ap/hw_features.c -+++ b/src/ap/hw_features.c -@@ -642,6 +642,32 @@ int hostapd_select_hw_mode(struct hostapd_iface *iface) - break; - } - } -+ if (ok && iface->conf->secondary_channel) { -+ int sec_ok = 0; -+ int sec_chan = iface->conf->channel + -+ iface->conf->secondary_channel * 4; -+ for (j = 0; j < iface->current_mode->num_channels; j++) { -+ struct hostapd_channel_data *chan = -+ &iface->current_mode->channels[j]; -+ if (!(chan->flag & HOSTAPD_CHAN_DISABLED) && -+ (chan->chan == sec_chan)) { -+ sec_ok = 1; -+ break; -+ } -+ } -+ if (!sec_ok) { -+ hostapd_logger(iface->bss[0], NULL, -+ HOSTAPD_MODULE_IEEE80211, -+ HOSTAPD_LEVEL_WARNING, -+ "Configured HT40 secondary channel " -+ "(%d) not found from the channel list " -+ "of current mode (%d) %s", -+ sec_chan, iface->current_mode->mode, -+ hostapd_hw_mode_txt( -+ iface->current_mode->mode)); -+ ok = 0; -+ } -+ } - if (iface->conf->channel == 0) { - /* TODO: could request a scan of neighboring BSSes and select - * the channel automatically */ --- -1.7.4-rc1 - diff --git a/package/hostapd/hostapd-0.7.3-libnl3.patch b/package/hostapd/hostapd-0.7.3-libnl3.patch deleted file mode 100644 index e47da73dd..000000000 --- a/package/hostapd/hostapd-0.7.3-libnl3.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/drivers/drivers.mak 2011-11-29 19:09:23.889942913 +0100 -+++ b/src/drivers/drivers.mak 2011-11-29 19:09:40.637381428 +0100 -@@ -31,10 +31,10 @@ - NEED_AP_MLME=y - NEED_NETLINK=y - NEED_LINUX_IOCTL=y --DRV_LIBS += -lnl -+DRV_LIBS += -lnl-3 - - ifdef CONFIG_LIBNL20 --DRV_LIBS += -lnl-genl -+DRV_LIBS += -lnl-genl-3 - DRV_CFLAGS += -DCONFIG_LIBNL20 - endif - endif diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index 26ebf1de0..c7c59ecc3 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -4,11 +4,12 @@ # ############################################################# -HOSTAPD_VERSION = 0.7.3 +HOSTAPD_VERSION = 1.0 HOSTAPD_SITE = http://hostap.epitest.fi/releases HOSTAPD_SUBDIR = hostapd HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config HOSTAPD_DEPENDENCIES = libnl +HOSTAPD_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/ HOSTAPD_LDFLAGS = $(TARGET_LDFLAGS) # libnl needs -lm (for rint) if linking statically @@ -17,78 +18,73 @@ HOSTAPD_LDFLAGS += -lm endif define HOSTAPD_LIBNL_CONFIG - echo "CONFIG_LIBNL20=y" >>$(HOSTAPD_CONFIG) - echo "CFLAGS += -I$(STAGING_DIR)/usr/include/libnl3/" >>$(HOSTAPD_CONFIG) + echo 'CONFIG_LIBNL32=y' >>$(HOSTAPD_CONFIG) endef -define HOSTAPD_CRYPTO_CONFIG - echo "CONFIG_CRYPTO=internal" >>$(HOSTAPD_CONFIG) - echo "CONFIG_INTERNAL_LIBTOMMATH=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_INTERNAL_LIBTOMMATH_FAST=y" >>$(HOSTAPD_CONFIG) +define HOSTAPD_LIBTOMMATH_CONFIG + $(SED) 's/\(#\)\(CONFIG_INTERNAL_LIBTOMMATH.*\)/\2/' $(HOSTAPD_CONFIG) endef -# Try to use openssl for TLS if it's already available -# gnutls is also supported for TLS +# Try to use openssl or gnutls if it's already available ifeq ($(BR2_PACKAGE_OPENSSL),y) HOSTAPD_DEPENDENCIES += openssl define HOSTAPD_TLS_CONFIG - echo "CONFIG_TLS=openssl" >>$(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_TLS=openssl\)/\2/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_PWD.*\)/\2/' $(HOSTAPD_CONFIG) endef else +ifeq ($(BR2_PACKAGE_GNUTLS),y) + HOSTAPD_DEPENDENCIES += gnutls define HOSTAPD_TLS_CONFIG - echo "CONFIG_TLS=internal" >>$(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_TLS=\).*/\2gnutls/' $(HOSTAPD_CONFIG) endef +else +define HOSTAPD_TLS_CONFIG + $(SED) 's/\(#\)\(CONFIG_TLS=\).*/\2internal/' $(HOSTAPD_CONFIG) +endef +endif endif ifeq ($(BR2_PACKAGE_HOSTAPD_EAP),y) define HOSTAPD_EAP_CONFIG - $(SED) "s/CONFIG_EAP_MSCHAPV2=y//" $(HOSTAPD_CONFIG) - $(SED) "s/CONFIG_EAP_PEAP=y//" $(HOSTAPD_CONFIG) - $(SED) "s/CONFIG_EAP_TLS=y//" $(HOSTAPD_CONFIG) - $(SED) "s/CONFIG_EAP_TTLS=y//" $(HOSTAPD_CONFIG) - echo "CONFIG_EAP_AKA=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_EAP_AKA_PRIME=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_EAP_GPSK=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_EAP_GPSK_SHA256=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_EAP_PAX=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_EAP_PSK=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_EAP_SAKE=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_EAP_SIM=y" >>$(HOSTAPD_CONFIG) - echo "CONFIG_RADIUS_SERVER=y" >>$(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_AKA.*\)/\2/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_FAST.*\)/\2/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_GPSK.*\)/\2/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_IKEV2.*\)/\2/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_PAX.*\)/\2/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_PSK.*\)/\2/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_SAKE.*\)/\2/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_SIM.*\)/\2/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_TNC.*\)/\2/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_RADIUS_SERVER.*\)/\2/' $(HOSTAPD_CONFIG) endef -ifeq ($(BR2_INET_IPV6),y) +ifneq ($(BR2_INET_IPV6),y) define HOSTAPD_RADIUS_IPV6_CONFIG - $(SED) "s/^#CONFIG_IPV6/CONFIG_IPV6/" $(HOSTAPD_CONFIG) + $(SED) 's/\(CONFIG_IPV6.*\)/#\1/' $(HOSTAPD_CONFIG) endef endif else define HOSTAPD_EAP_CONFIG - $(SED) "s/^CONFIG_EAP/#CONFIG_EAP/g" $(HOSTAPD_CONFIG) - $(SED) "s/^#CONFIG_NO_ACCOUNTING/CONFIG_NO_ACCOUNTING/" $(HOSTAPD_CONFIG) - $(SED) "s/^#CONFIG_NO_RADIUS/CONFIG_NO_RADIUS/" $(HOSTAPD_CONFIG) + $(SED) 's/^\(CONFIG_EAP.*\)/#\1/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_NO_ACCOUNTING.*\)/\2/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_NO_RADIUS.*\)/\2/' $(HOSTAPD_CONFIG) endef endif ifeq ($(BR2_PACKAGE_HOSTAPD_WPS),y) define HOSTAPD_WPS_CONFIG - $(SED) "s/^#CONFIG_WPS/CONFIG_WPS/g" $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_WPS.*\)/\2/' $(HOSTAPD_CONFIG) endef endif define HOSTAPD_CONFIGURE_CMDS - cp $(@D)/$(HOSTAPD_SUBDIR)/defconfig $(HOSTAPD_CONFIG) - $(SED) "s/\/local//" $(@D)/$(HOSTAPD_SUBDIR)/Makefile - echo "CFLAGS += $(TARGET_CFLAGS)" >>$(HOSTAPD_CONFIG) - echo "LDFLAGS += $(HOSTAPD_LDFLAGS)" >>$(HOSTAPD_CONFIG) - echo "CC = $(TARGET_CC)" >>$(HOSTAPD_CONFIG) -# Drivers - $(SED) "s/^#CONFIG_DRIVER_WIRED/CONFIG_DRIVER_WIRED/" $(HOSTAPD_CONFIG) - $(SED) "s/^#CONFIG_DRIVER_NL80211/CONFIG_DRIVER_NL80211/" $(HOSTAPD_CONFIG) + cp $(@D)/hostapd/defconfig $(HOSTAPD_CONFIG) # Misc - $(SED) "s/^CONFIG_IPV6/#CONFIG_IPV6/" $(HOSTAPD_CONFIG) - $(SED) "s/^#CONFIG_IEEE80211N/CONFIG_IEEE80211N/" $(HOSTAPD_CONFIG) - $(SED) "s/^#CONFIG_IEEE80211R/CONFIG_IEEE80211R/" $(HOSTAPD_CONFIG) - $(HOSTAPD_CRYPTO_CONFIG) + $(SED) 's/\(#\)\(CONFIG_IEEE80211N.*\)/\2/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_IEEE80211R.*\)/\2/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_INTERWORKING.*\)/\2/' $(HOSTAPD_CONFIG) + $(SED) 's/\(#\)\(CONFIG_FULL_DYNAMIC_VLAN.*\)/\2/' $(HOSTAPD_CONFIG) + $(HOSTAPD_LIBTOMMATH_CONFIG) $(HOSTAPD_TLS_CONFIG) $(HOSTAPD_RADIUS_IPV6_CONFIG) $(HOSTAPD_EAP_CONFIG) @@ -96,6 +92,12 @@ define HOSTAPD_CONFIGURE_CMDS $(HOSTAPD_LIBNL_CONFIG) endef +define HOSTAPD_BUILD_CMDS + $(TARGET_MAKE_ENV) CFLAGS="$(HOSTAPD_CFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS)" \ + $(MAKE) CC="$(TARGET_CC)" -C $(@D)/$(HOSTAPD_SUBDIR) +endef + define HOSTAPD_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(@D)/$(HOSTAPD_SUBDIR)/hostapd \ $(TARGET_DIR)/usr/sbin/hostapd @@ -103,9 +105,4 @@ define HOSTAPD_INSTALL_TARGET_CMDS $(TARGET_DIR)/usr/bin/hostapd_cli endef -define HOSTAPD_UNINSTALL_TARGET_CMDS - rm -f $(TARGET_DIR)/usr/sbin/hostapd - rm -f $(TARGET_DIR)/usr/bin/hostapd -endef - -$(eval $(call AUTOTARGETS)) +$(eval $(call GENTARGETS)) diff --git a/package/icu/icu-arm.patch b/package/icu/icu-arm.patch deleted file mode 100644 index 53070d9d0..000000000 --- a/package/icu/icu-arm.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://bugs.icu-project.org/trac/ticket/7664 -https://bugs.icu-project.org/trac/changeset/28107 - ---- icu.orig/source/tools/toolutil/pkg_genc.c -+++ icu/source/tools/toolutil/pkg_genc.c -@@ -1,5 +1,5 @@ - /****************************************************************************** -- * Copyright (C) 2009, International Business Machines -+ * Copyright (C) 2009-2010, International Business Machines - * Corporation and others. All Rights Reserved. - ******************************************************************************* - */ -@@ -118,10 +118,10 @@ - } assemblyHeader[] = { - {"gcc", - ".globl %s\n" -- "\t.section .note.GNU-stack,\"\",@progbits\n" -+ "\t.section .note.GNU-stack,\"\",%%progbits\n" - "\t.section .rodata\n" - "\t.align 8\n" /* Either align 8 bytes or 2^8 (256) bytes. 8 bytes is needed. */ -- "\t.type %s,@object\n" -+ "\t.type %s,%%object\n" - "%s:\n\n", - - ".long ","",HEX_0X diff --git a/package/icu/icu-double-escape.patch b/package/icu/icu-double-escape.patch deleted file mode 100644 index 06c70cca9..000000000 --- a/package/icu/icu-double-escape.patch +++ /dev/null @@ -1,17 +0,0 @@ -We need to double-escape CC & CXX since we've got --sysroot and thus a space -when cross-compiling. - -Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> - -diff -Nura icu.orig/source/tools/icuinfo/Makefile.in icu/source/tools/icuinfo/Makefile.in ---- icu.orig/source/tools/icuinfo/Makefile.in 2010-09-29 15:37:26.000000000 -0300 -+++ icu/source/tools/icuinfo/Makefile.in 2010-12-21 13:36:45.393439756 -0300 -@@ -36,7 +36,7 @@ - - ICUINFO_OPTS=-i ../../data/out/build/$(ICUDATA_PLATFORM_NAME) - --CPPFLAGS+= -DU_PLATFORM=\"@platform@\" -DU_BUILD=\"@build@\" -DU_HOST=\"@host@\" -DU_CC=\"@CC@\" -DU_CXX=\"@CXX@\" -+CPPFLAGS+= -DU_PLATFORM=\"@platform@\" -DU_BUILD=\"@build@\" -DU_HOST=\"@host@\" -DU_CC=\""@CC@\"" -DU_CXX=\""@CXX@\"" - # -DENABLE_RELEASE=@ENABLE_RELEASE@ -DENABLE_DEBUG=@ENABLE_DEBUG@ " - - diff --git a/package/icu/icu-overflow.patch b/package/icu/icu-overflow.patch deleted file mode 100644 index 45beaa7ea..000000000 --- a/package/icu/icu-overflow.patch +++ /dev/null @@ -1,93 +0,0 @@ - -A combination of issue & patches from... - -https://bugs.icu-project.org/trac/ticket/7680 -https://bugs.icu-project.org/trac/changeset/28002 -https://bugs.icu-project.org/trac/changeset/28124 - -Enlarged buffers more since include files for pkgdata can grow -significantly when cross-compiling. -This ONLY affects building. - -Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> - -diff -Nura icu.orig/source/tools/pkgdata/pkgdata.cpp icu/source/tools/pkgdata/pkgdata.cpp ---- icu.orig/source/tools/pkgdata/pkgdata.cpp 2010-09-29 15:37:28.000000000 -0300 -+++ icu/source/tools/pkgdata/pkgdata.cpp 2010-12-21 15:53:30.252554924 -0300 -@@ -97,8 +97,9 @@ - #define PKGDATA_FILE_SEP_STRING U_FILE_SEP_STRING - #endif - --#define LARGE_BUFFER_MAX_SIZE 2048 --#define SMALL_BUFFER_MAX_SIZE 512 -+#define LARGE_BUFFER_MAX_SIZE 8192 -+#define MEDIUM_BUFFER_MAX_SIZE 4096 -+#define SMALL_BUFFER_MAX_SIZE 2048 - - static void loadLists(UPKGOptions *o, UErrorCode *status); - -@@ -472,29 +473,48 @@ - } - - static int runCommand(const char* command, UBool specialHandling) { -- char cmd[SMALL_BUFFER_MAX_SIZE]; -+ char *cmd = NULL; -+ char cmdBuffer[SMALL_BUFFER_MAX_SIZE]; -+ int32_t len = strlen(command); -+ -+ if (len == 0) { -+ return 0; -+ } - - if (!specialHandling) { -+#if defined(USING_CYGWIN) || defined(OS400) -+#define CMD_PADDING_SIZE 20 -+ if ((len + CMD_PADDING_SIZE) >= SMALL_BUFFER_MAX_SIZE) { -+ cmd = (char *)uprv_malloc(len + CMD_PADDING_SIZE); -+ } else { -+ cmd = cmdBuffer; -+ } - #ifdef USING_CYGWIN - sprintf(cmd, "bash -c \"%s\"", command); - - #elif defined(OS400) - sprintf(cmd, "QSH CMD('%s')", command); -+#endif - #else - goto normal_command_mode; - #endif - } else { - normal_command_mode: -- sprintf(cmd, "%s", command); -+ cmd = (char *)command; - } -- -+ - printf("pkgdata: %s\n", cmd); - int result = system(cmd); -- if (result != 0) { -- printf("-- return status = %d\n", result); -+ if (result != 0) { -+ printf("-- return status = %d\n", result); -+ } -+ -+ if (cmd != cmdBuffer && cmd != command) { -+ uprv_free(cmd); - } -- return result; --} -+ -+ return result; -+} - - #define LN_CMD "ln -s" - #define RM_CMD "rm -f" -@@ -586,7 +606,7 @@ - pkgDataFlags = (char**)uprv_malloc(sizeof(char*) * PKGDATA_FLAGS_SIZE); - if (pkgDataFlags != NULL) { - for (int32_t i = 0; i < PKGDATA_FLAGS_SIZE; i++) { -- pkgDataFlags[i] = (char*)uprv_malloc(sizeof(char) * SMALL_BUFFER_MAX_SIZE); -+ pkgDataFlags[i] = (char*)uprv_malloc(sizeof(char) * MEDIUM_BUFFER_MAX_SIZE); - if (pkgDataFlags[i] != NULL) { - pkgDataFlags[i][0] = 0; - } else { diff --git a/package/icu/icu.mk b/package/icu/icu.mk index d4c220bad..a2c24ca1e 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -4,7 +4,7 @@ # ############################################################# -ICU_VERSION = 4.4.2 +ICU_VERSION = 4.8.1.1 ICU_SOURCE = icu4c-$(subst .,_,$(ICU_VERSION))-src.tgz ICU_SITE = http://download.icu-project.org/files/icu4c/$(ICU_VERSION) ICU_DEPENDENCIES = host-icu diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index ee5c04aa8..e76637493 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -4,7 +4,7 @@ # ############################################################# -IPROUTE2_VERSION = 3.3.0 +IPROUTE2_VERSION = 3.4.0 IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_TARGET_SBINS = ctstat genl ifstat ip lnstat nstat routef routel rtacct rtmon rtpr rtstat ss tc diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk index 06393f4e9..3cd1263e4 100644 --- a/package/ipset/ipset.mk +++ b/package/ipset/ipset.mk @@ -4,10 +4,9 @@ # ############################################################# -IPSET_VERSION = 6.11 +IPSET_VERSION = 6.12.1 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2 IPSET_SITE = http://ipset.netfilter.org -IPSET_AUTORECONF = YES IPSET_DEPENDENCIES = libmnl host-pkg-config IPSET_CONF_OPT = --with-kmod=no diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk index 87578d54e..5c6a8a6b5 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -4,7 +4,7 @@ # ############################################################# -IPTABLES_VERSION = 1.4.13 +IPTABLES_VERSION = 1.4.14 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2 IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables IPTABLES_INSTALL_STAGING = YES diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index e094e31cd..e8f13bb4c 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ############################################################# -LIBCURL_VERSION = 7.24.0 +LIBCURL_VERSION = 7.25.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2 LIBCURL_SITE = http://curl.haxx.se/download LIBCURL_INSTALL_STAGING = YES diff --git a/package/libeXosip2/Config.in b/package/libeXosip2/Config.in index 8adca5a7d..755d28461 100644 --- a/package/libeXosip2/Config.in +++ b/package/libeXosip2/Config.in @@ -2,10 +2,12 @@ config BR2_PACKAGE_LIBEXOSIP2 bool "libeXosip2" select BR2_PACKAGE_LIBOSIP2 help - GNU Higher level SIP (Session Initiation Protocol) - This library aims to provide multimedia and telecom software - developers an easy and powerful interface to initiate and - control SIP based sessions in their applications. - SIP is a open standard replacement from IETF for H323. + eXosip is a library that hides the complexity of using the + SIP protocol for mutlimedia session establishement. + This protocol is mainly to be used by VoIP telephony + applications (endpoints or conference server) but might be + also usefull for any application that wish to establish + sessions like multiplayer games. + eXosip is based in libosip. - http://www.gnu.org/software/osip/ + http://savannah.nongnu.org/projects/exosip/ diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk index 4b778a98e..24ca7cede 100644 --- a/package/libeXosip2/libeXosip2.mk +++ b/package/libeXosip2/libeXosip2.mk @@ -5,7 +5,6 @@ ############################################################# LIBEXOSIP2_VERSION = 3.6.0 -LIBEXOSIP2_SOURCE = libeXosip2-$(LIBEXOSIP2_VERSION).tar.gz LIBEXOSIP2_SITE = http://download.savannah.gnu.org/releases/exosip/ LIBEXOSIP2_INSTALL_STAGING = YES diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk index 935240bd6..6d2bea6ca 100644 --- a/package/libidn/libidn.mk +++ b/package/libidn/libidn.mk @@ -4,7 +4,7 @@ # ############################################################# -LIBIDN_VERSION = 1.24 +LIBIDN_VERSION = 1.25 LIBIDN_SITE = $(BR2_GNU_MIRROR)/libidn LIBIDN_INSTALL_STAGING = YES LIBIDN_CONF_ENV = EMACS="no" diff --git a/package/libmbus/libmbus-0.6.1-bcopy.patch b/package/libmbus/libmbus-0.6.1-bcopy.patch deleted file mode 100644 index 8b8310c85..000000000 --- a/package/libmbus/libmbus-0.6.1-bcopy.patch +++ /dev/null @@ -1,15 +0,0 @@ -Drop bcopy since it's deprecated. - -Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> -diff -Nura libmbus-0.6.1/mbus/mbus-tcp.c libmbus-0.6.1-bcopy/mbus/mbus-tcp.c ---- libmbus-0.6.1/mbus/mbus-tcp.c 2011-11-06 02:34:28.000000000 -0300 -+++ libmbus-0.6.1-bcopy/mbus/mbus-tcp.c 2012-05-03 08:11:39.680346347 -0300 -@@ -78,7 +78,7 @@ - return NULL; - } - -- bcopy((void *)(host_addr->h_addr), (void *)(&s_addr.sin_addr), host_addr->h_length); -+ memmove((void *)(&s_addr.sin_addr), (void *)(host_addr->h_addr), host_addr->h_length); - - if (connect(handle->sock, (struct sockaddr *)&s_addr, sizeof(s_addr)) < 0) - { diff --git a/package/libmbus/libmbus-bcopy.patch b/package/libmbus/libmbus-bcopy.patch new file mode 100644 index 000000000..660cc3775 --- /dev/null +++ b/package/libmbus/libmbus-bcopy.patch @@ -0,0 +1,16 @@ +Drop bcopy since it's deprecated. + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> + +diff -Nura libmbus-0.7.0/mbus/mbus-tcp.c libmbus-0.7.0-bcopy/mbus/mbus-tcp.c +--- libmbus-0.7.0/mbus/mbus-tcp.c 2011-12-08 13:21:19.000000000 -0300 ++++ libmbus-0.7.0-bcopy/mbus/mbus-tcp.c 2012-05-03 09:08:36.987106612 -0300 +@@ -78,7 +78,7 @@ + return NULL; + } + +- bcopy((void *)(host_addr->h_addr), (void *)(&s.sin_addr), host_addr->h_length); ++ memmove((void *)(&s.sin_addr), (void *)(host_addr->h_addr), host_addr->h_length); + + if (connect(handle->sock, (struct sockaddr *)&s, sizeof(s)) < 0) + { diff --git a/package/libmbus/libmbus.mk b/package/libmbus/libmbus.mk index 9abb2bf8d..17954b9ef 100644 --- a/package/libmbus/libmbus.mk +++ b/package/libmbus/libmbus.mk @@ -4,8 +4,8 @@ # ############################################################# -LIBMBUS_VERSION = 0.6.1 -LIBMBUS_SITE = http://www.freescada.com/public-dist/ +LIBMBUS_VERSION = 0.7.0 +LIBMBUS_SITE = http://www.freescada.com/public-dist LIBMBUS_INSTALL_STAGING = YES # Without this the build yields an error: diff --git a/package/libmnl/libmnl.mk b/package/libmnl/libmnl.mk index 407ca52a5..52719cd03 100644 --- a/package/libmnl/libmnl.mk +++ b/package/libmnl/libmnl.mk @@ -4,7 +4,7 @@ # ############################################################# -LIBMNL_VERSION = 1.0.2 +LIBMNL_VERSION = 1.0.3 LIBMNL_SOURCE = libmnl-$(LIBMNL_VERSION).tar.bz2 LIBMNL_SITE = http://netfilter.org/projects/libmnl/files LIBMNL_INSTALL_STAGING = YES diff --git a/package/libnetfilter_conntrack/libnetfilter-conntrack.mk b/package/libnetfilter_conntrack/libnetfilter-conntrack.mk index 66f0f69a4..3313e23eb 100644 --- a/package/libnetfilter_conntrack/libnetfilter-conntrack.mk +++ b/package/libnetfilter_conntrack/libnetfilter-conntrack.mk @@ -4,7 +4,7 @@ # ############################################################# -LIBNETFILTER_CONNTRACK_VERSION = 1.0.0 +LIBNETFILTER_CONNTRACK_VERSION = 1.0.1 LIBNETFILTER_CONNTRACK_SOURCE = libnetfilter_conntrack-$(LIBNETFILTER_CONNTRACK_VERSION).tar.bz2 LIBNETFILTER_CONNTRACK_SITE = http://www.netfilter.org/projects/libnetfilter_conntrack/files LIBNETFILTER_CONNTRACK_INSTALL_STAGING = YES diff --git a/package/libnetfilter_cttimeout/Config.in b/package/libnetfilter_cttimeout/Config.in new file mode 100644 index 000000000..8e2f438af --- /dev/null +++ b/package/libnetfilter_cttimeout/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_LIBNETFILTER_CTTIMEOUT + bool "libnetfilter_cttimeout" + depends on BR2_LARGEFILE + select BR2_PACKAGE_LIBMNL + help + libnetfilter_cttimeout is the userspace library that provides + the programming interface to the fine-grain + connection tracking timeout infrastructure. + + http://www.netfilter.org/projects/libnetfilter_cttimeout/ + +comment "libnetfilter_cttimout requires a toolchain with LARGEFILE support" + depends on !BR2_LARGEFILE diff --git a/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk b/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk new file mode 100644 index 000000000..b3e1149dc --- /dev/null +++ b/package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk @@ -0,0 +1,13 @@ +############################################################# +# +# libnetfilter-cttimeout +# +############################################################# + +LIBNETFILTER_CTTIMEOUT_VERSION = 1.0.0 +LIBNETFILTER_CTTIMEOUT_SOURCE = libnetfilter_cttimeout-$(LIBNETFILTER_CTTIMEOUT_VERSION).tar.bz2 +LIBNETFILTER_CTTIMEOUT_SITE = http://www.netfilter.org/projects/libnetfilter_cttimeout/files +LIBNETFILTER_CTTIMEOUT_INSTALL_STAGING = YES +LIBNETFILTER_CTTIMEOUT_DEPENDENCIES = host-pkg-config libmnl + +$(eval $(call AUTOTARGETS)) diff --git a/package/libnfc/Config.in b/package/libnfc/Config.in new file mode 100644 index 000000000..42418e0da --- /dev/null +++ b/package/libnfc/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LIBNFC + bool "libnfc" + select BR2_PACKAGE_LIBUSB + select BR2_PACKAGE_LIBUSB_COMPAT + help + Public platform independent Near Field Communication (NFC) library. + + http://www.libnfc.org/ diff --git a/package/libnfc/libnfc.mk b/package/libnfc/libnfc.mk new file mode 100644 index 000000000..f1028b19e --- /dev/null +++ b/package/libnfc/libnfc.mk @@ -0,0 +1,16 @@ +############################################################# +# +# libnfc +# +############################################################# +LIBNFC_VERSION = 1.5.1 +LIBNFC_SITE = http://libnfc.googlecode.com/files/ +LIBNFC_SOURCE = libnfc-$(LIBNFC_VERSION).tar.gz +LIBNFC_INSTALL_STAGING = YES + +LIBNFC_DEPENDENCIES = host-pkg-config libusb libusb-compat + +# N.B. The acr122 driver requires pcsc-lite. +LIBNFC_CONF_OPT = --with-drivers=arygon,pn53x_usb + +$(eval $(call AUTOTARGETS)) diff --git a/package/libnl/Config.in b/package/libnl/Config.in index 24e481361..c7d435983 100644 --- a/package/libnl/Config.in +++ b/package/libnl/Config.in @@ -4,3 +4,9 @@ config BR2_PACKAGE_LIBNL A library for applications dealing with netlink socket. http://people.suug.ch/~tgr/libnl/ + +config BR2_PACKAGE_LIBNL_TOOLS + bool "install tools" + depends on BR2_PACKAGE_LIBNL + help + Install binary tools. diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk index 40aaf388e..a72370166 100644 --- a/package/libnl/libnl.mk +++ b/package/libnl/libnl.mk @@ -4,15 +4,26 @@ # ############################################################# -LIBNL_VERSION = 3.2.8 +LIBNL_VERSION = 3.2.9 LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files LIBNL_INSTALL_STAGING = YES LIBNL_DEPENDENCIES = host-bison LIBNL_MAKE = $(MAKE1) +LIBNL_BINARIES = class-add class-delete class-list classid-lookup cls-add \ + cls-delete cls-list link-list pktloc-lookup qdisc-add qdisc-delete \ + qdisc-list define LIBNL_UNINSTALL_TARGET_CMDS rm -r $(TARGET_DIR)/usr/lib/libnl.* $(TARGET_DIR)/usr/lib/libnl-*.* rm -rf $(TARGET_DIR)/usr/lib/libnl endef +define LIBNL_REMOVE_TOOLS + rm -rf $(addprefix $(TARGET_DIR)/usr/sbin/nl-, $(LIBNL_BINARIES)) +endef + +ifneq ($(BR2_PACKAGE_LIBNL_TOOLS),y) +LIBNL_POST_INSTALL_TARGET_HOOKS += LIBNL_REMOVE_TOOLS +endif + $(eval $(call AUTOTARGETS)) diff --git a/package/libogg/Config.in b/package/libogg/Config.in index effe74fb3..bf719ff4d 100644 --- a/package/libogg/Config.in +++ b/package/libogg/Config.in @@ -1,5 +1,9 @@ config BR2_PACKAGE_LIBOGG bool "libogg" help - Ogg is the name of Xiph.org's container format for audio, - video, and metadata + Ogg is a multimedia container format, and the native file + and stream format for the Xiph.org multimedia codecs. As + with all Xiph.org technology is it an open format free for + anyone to use. + + http://xiph.org/ogg/ diff --git a/package/libogg/libogg.mk b/package/libogg/libogg.mk index c40f04eac..c3d489746 100644 --- a/package/libogg/libogg.mk +++ b/package/libogg/libogg.mk @@ -4,7 +4,6 @@ # ############################################################# LIBOGG_VERSION = 1.3.0 -LIBOGG_SOURCE = libogg-$(LIBOGG_VERSION).tar.gz LIBOGG_SITE = http://downloads.xiph.org/releases/ogg LIBOGG_INSTALL_STAGING = YES diff --git a/package/liboping/Config.in b/package/liboping/Config.in new file mode 100644 index 000000000..04e0e0d9e --- /dev/null +++ b/package/liboping/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_LIBOPING + bool "liboping" + depends on BR2_INET_IPV6 + help + liboping is a C library to generate ICMP echo requests, + better known as "ping packets". + + http://verplant.org/liboping/ + +comment "liboping requires a toolchain with IPv6 support enabled" + depends on !BR2_INET_IPV6 diff --git a/package/liboping/liboping.mk b/package/liboping/liboping.mk new file mode 100644 index 000000000..e0d892b1c --- /dev/null +++ b/package/liboping/liboping.mk @@ -0,0 +1,13 @@ +############################################################# +# +# liboping +# +############################################################# + +LIBOPING_VERSION = 1.6.2 +LIBOPING_SITE = http://verplant.org/liboping/files +LIBOPING_INSTALL_STAGING = YES +LIBOPING_DEPENDENCIES = $(if $(BR2_PACKAGE_NCURSES),ncurses) +LIBOPING_CONF_OPT = --without-perl-bindings + +$(eval $(call AUTOTARGETS)) diff --git a/package/libosip2/Config.in b/package/libosip2/Config.in index 1b248a0c9..be5de2d36 100644 --- a/package/libosip2/Config.in +++ b/package/libosip2/Config.in @@ -7,3 +7,5 @@ config BR2_PACKAGE_LIBOSIP2 control SIP based sessions in their applications. SIP is a open standard replacement from IETF for H323. + http://www.gnu.org/software/osip/ + diff --git a/package/libosip2/libosip2.mk b/package/libosip2/libosip2.mk index 1d53f76b4..2cde27ff1 100644 --- a/package/libosip2/libosip2.mk +++ b/package/libosip2/libosip2.mk @@ -5,7 +5,6 @@ ############################################################# LIBOSIP2_VERSION = 3.6.0 -LIBOSIP2_SOURCE = libosip2-$(LIBOSIP2_VERSION).tar.gz LIBOSIP2_SITE = $(BR2_GNU_MIRROR)/osip LIBOSIP2_INSTALL_STAGING = YES diff --git a/package/libtorrent/Config.in b/package/libtorrent/Config.in new file mode 100644 index 000000000..f0315a4f3 --- /dev/null +++ b/package/libtorrent/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_LIBTORRENT + bool "libtorrent" + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_LIBSIGC + help + BitTorrent library written in C++ for *nix + + http://libtorrent.rakshasa.no/ + +comment "libtorrent requires a toolchain with C++ support enabled" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/libtorrent/libtorrent-cross_compile.patch b/package/libtorrent/libtorrent-cross_compile.patch new file mode 100644 index 000000000..39fe700dc --- /dev/null +++ b/package/libtorrent/libtorrent-cross_compile.patch @@ -0,0 +1,27 @@ +Fix cross compilation, based on OpenWRT patch. + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> + +diff -Nura libtorrent-0.13.2/configure.ac libtorrent-0.13.2-cross/configure.ac +--- libtorrent-0.13.2/configure.ac 2012-04-20 03:55:10.000000000 -0300 ++++ libtorrent-0.13.2-cross/configure.ac 2012-05-09 10:57:49.671175421 -0300 +@@ -17,7 +17,6 @@ + + AM_INIT_AUTOMAKE + AM_CONFIG_HEADER(config.h) +-AM_PATH_CPPUNIT(1.9.6) + AC_DISABLE_STATIC + + AM_DISABLE_STATIC +diff -Nura libtorrent-0.13.2/scripts/checks.m4 libtorrent-0.13.2-cross/scripts/checks.m4 +--- libtorrent-0.13.2/scripts/checks.m4 2012-04-12 06:44:23.000000000 -0300 ++++ libtorrent-0.13.2-cross/scripts/checks.m4 2012-05-09 10:42:32.642728917 -0300 +@@ -96,7 +96,7 @@ + AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [ + AC_MSG_CHECKING(whether kqueue supports pipes and ptys) + +- AC_RUN_IFELSE([AC_LANG_SOURCE([ ++ AC_LINK_IFELSE([AC_LANG_SOURCE([ + #include <fcntl.h> + #include <stdlib.h> + #include <unistd.h> diff --git a/package/libtorrent/libtorrent.mk b/package/libtorrent/libtorrent.mk new file mode 100644 index 000000000..100e68465 --- /dev/null +++ b/package/libtorrent/libtorrent.mk @@ -0,0 +1,16 @@ +############################################################# +# +# libtorrent +# +############################################################# + +LIBTORRENT_VERSION = 0.13.2 +LIBTORRENT_SITE = http://libtorrent.rakshasa.no/downloads +LIBTORRENT_DEPENDENCIES = host-pkg-config libsigc \ + $(if $(BR2_PACKAGE_OPENSSL),openssl) +LIBTORRENT_CONF_OPT = --enable-aligned \ + $(if $(BR2_PACKAGE_OPENSSL),--enable-openssl,--disable-openssl) +LIBTORRENT_INSTALL_STAGING = YES +LIBTORRENT_AUTORECONF = YES + +$(eval $(call AUTOTARGETS)) diff --git a/package/linphone/Config.in b/package/linphone/Config.in new file mode 100644 index 000000000..31c28d8b4 --- /dev/null +++ b/package/linphone/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_LINPHONE + bool "linphone" + select BR2_PACKAGE_LIBEXOSIP2 + select BR2_PACKAGE_SPEEX + help + Linphone is an internet phone or Voice Over IP phone (VoIP). + + With linphone you can communicate freely with people over + the internet, with voice, video, and text instant messaging. + Linphone makes use of the SIP protocol, an open standard + for internet telephony. You can use Linphone with any SIP + VoIP operator, including our free SIP audio/video service. + linphone is free-software (or open-source), you can download + and redistribute it freely. + Linphone is available for desktop computers: Linux, Windows, + MacOSX, and for mobile phones: Android, iPhone, Blackberry. + + Linphone support in Buildroot is limited to the commandline + client, linphonec, and video support is not enabled. + + http://www.linphone.org/ diff --git a/package/linphone/linphone.mk b/package/linphone/linphone.mk new file mode 100644 index 000000000..6ba6b5333 --- /dev/null +++ b/package/linphone/linphone.mk @@ -0,0 +1,12 @@ +############################################################# +# +# linphone +# +############################################################# + +LINPHONE_VERSION = 3.5.2 +LINPHONE_SITE = http://download-mirror.savannah.gnu.org/releases/linphone/3.5.x/sources/ +LINPHONE_CONF_OPT = --disable-video --disable-gtk_ui +LINPHONE_DEPENDENCIES = libeXosip2 speex + +$(eval $(call AUTOTARGETS)) diff --git a/package/logsurfer/Config.in b/package/logsurfer/Config.in new file mode 100644 index 000000000..27d18815c --- /dev/null +++ b/package/logsurfer/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_LOGSURFER + bool "logsurfer" + help + Logsurfer is a program for monitoring system logs in real-time, + and reporting on the occurrence of events. + + http://www.crypt.gen.nz/logsurfer/ diff --git a/package/logsurfer/logsurfer.mk b/package/logsurfer/logsurfer.mk new file mode 100644 index 000000000..89f6bbd63 --- /dev/null +++ b/package/logsurfer/logsurfer.mk @@ -0,0 +1,29 @@ +############################################################# +# +# logsurfer +# +############################################################# + +LOGSURFER_VERSION = 1.8 +LOGSURFER_SOURCE = logsurfer-$(LOGSURFER_VERSION).tar.gz +LOGSURFER_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/logsurfer/logsurfer/logsurfer-$(LOGSURFER_VERSION) + +define LOGSURFER_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/src/logsurfer \ + $(TARGET_DIR)/usr/bin/logsurfer +endef + +ifeq ($(BR2_HAVE_DOCUMENTATION),y) + +define LOGSURFER_INSTALL_TARGET_MAN + $(INSTALL) -D -m 0644 $(@D)/man/logsurfer.1 \ + $(TARGET_DIR)/usr/man/man1/logsurfer.1 + $(INSTALL) -D -m 0644 $(@D)/man/logsurfer.conf.4 \ + $(TARGET_DIR)/usr/man/man4/logsurfer.conf.4 +endef + +LOGSURFER_POST_INSTALL_TARGET_HOOKS += LOGSURFER_INSTALL_TARGET_MAN + +endif + +$(eval $(call AUTOTARGETS)) diff --git a/package/midori/Config.in b/package/midori/Config.in index 95a0afbd6..49867e427 100644 --- a/package/midori/Config.in +++ b/package/midori/Config.in @@ -2,6 +2,9 @@ config BR2_PACKAGE_MIDORI bool "midori" select BR2_PACKAGE_WEBKIT select BR2_PACKAGE_LIBSEXY + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE + select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE depends on BR2_PACKAGE_LIBGTK2 depends on BR2_INSTALL_LIBSTDCPP # webkit depends on BR2_USE_WCHAR # webkit diff --git a/package/midori/midori.mk b/package/midori/midori.mk index 3e46b1aba..0b3439c53 100644 --- a/package/midori/midori.mk +++ b/package/midori/midori.mk @@ -4,10 +4,18 @@ # ############################################################# -MIDORI_VERSION = 0.3.6 +MIDORI_VERSION = 0.4.6 MIDORI_SOURCE = midori-$(MIDORI_VERSION).tar.bz2 -MIDORI_SITE = http://archive.xfce.org/src/apps/midori/0.3/ -MIDORI_DEPENDENCIES = host-pkg-config host-intltool webkit libsexy libgtk2 +MIDORI_SITE = http://archive.xfce.org/src/apps/midori/0.4/ +MIDORI_DEPENDENCIES = \ + host-intltool \ + host-pkg-config \ + host-vala \ + libgtk2 \ + libsexy \ + webkit \ + $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) \ + $(if $(BR2_PACKAGE_LIBICONV),libiconv) ifneq ($(BR2_PACKAGE_XORG7),y) define MIDORI_WITHOUT_X11 @@ -21,7 +29,7 @@ define MIDORI_CONFIGURE_CMDS $(TARGET_CONFIGURE_OPTS) \ ./waf configure \ --prefix=/usr \ - --disable-vala \ + --disable-libnotify \ ) endef diff --git a/package/mobile-broadband-provider-info/Config.in b/package/mobile-broadband-provider-info/Config.in new file mode 100644 index 000000000..dda71056e --- /dev/null +++ b/package/mobile-broadband-provider-info/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO + bool "mobile-broadband-provider-info" + help + Mobile broadband provider database. + + http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders diff --git a/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk b/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk new file mode 100644 index 000000000..83f71d34a --- /dev/null +++ b/package/mobile-broadband-provider-info/mobile_broadband_provider_info.mk @@ -0,0 +1,11 @@ +############################################################# +# +# mobile broadband provider info +# +############################################################# +MOBILE_BROADBAND_PROVIDER_INFO_VERSION = 20110511 +MOBILE_BROADBAND_PROVIDER_INFO_SITE = http://ftp.gnome.org/pub/GNOME/sources/mobile-broadband-provider-info/$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION) +MOBILE_BROADBAND_PROVIDER_INFO_INSTALL_STAGING = YES +MOBILE_BROADBAND_PROVIDER_INFO_DEPENDENCIES = host-pkg-config + +$(eval $(call AUTOTARGETS)) diff --git a/package/mrouted/mrouted-3.9.4-bcopy.patch b/package/mrouted/mrouted-3.9.4-bcopy.patch deleted file mode 100644 index ea8f6dbf6..000000000 --- a/package/mrouted/mrouted-3.9.4-bcopy.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nura mrouted-3.9.4/mtrace.c mrouted-3.9.4-memmove/mtrace.c ---- mrouted-3.9.4/mtrace.c 2010-11-19 20:53:19.000000000 -0300 -+++ mrouted-3.9.4-memmove/mtrace.c 2012-05-03 08:27:33.895422455 -0300 -@@ -556,7 +556,7 @@ - save->rtime = ((tr.tv_sec + JAN_1970) << 16) + - (tr.tv_usec << 10) / 15625; - save->len = len; -- bcopy((char *)igmp, (char *)&save->igmp, ipdatalen); -+ memmove((char *)&save->igmp, (char *)igmp, ipdatalen); - } - return recvlen; - } -@@ -646,7 +646,7 @@ - base.rtime = ((tr.tv_sec + JAN_1970) << 16) + - (tr.tv_usec << 10) / 15625; - base.len = len; -- bcopy((char *)igmp, (char *)&base.igmp, ipdatalen); -+ memmove((char *)&base.igmp, (char *)igmp, ipdatalen); - /* - * If the user specified which traces to monitor, - * only accept traces that correspond to the diff --git a/package/mrouted/mrouted-3.9.4-makefile-flags.patch b/package/mrouted/mrouted-3.9.4-makefile-flags.patch deleted file mode 100644 index 932bec006..000000000 --- a/package/mrouted/mrouted-3.9.4-makefile-flags.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- - Makefile | 20 +++++++++----------- - 1 file changed, 9 insertions(+), 11 deletions(-) - -Index: mrouted-3.9.4/Makefile -=================================================================== ---- mrouted-3.9.4.orig/Makefile -+++ mrouted-3.9.4/Makefile -@@ -42,11 +42,9 @@ - #MSTAT_OBJS = mstat.o $(EXTRA_OBJS) - - ## Common --CFLAGS = $(MCAST_INCLUDE) $(SNMPDEF) $(RSRRDEF) $(INCLUDES) $(DEFS) $(USERCOMPILE) --CFLAGS += -O2 -W -Wall -Werror --#CFLAGS += -O -g --LDLIBS = $(SNMPLIBDIR) $(SNMPLIBS) $(EXTRA_LIBS) --LDFLAGS += -Wl,-Map,$@.map -+MROUTED_CFLAGS = $(MCAST_INCLUDE) $(SNMPDEF) $(RSRRDEF) $(INCLUDES) $(DEFS) $(USERCOMPILE) -+LDLIBS = $(SNMPLIBDIR) $(SNMPLIBS) $(EXTRA_LIBS) -+MROUTED_LDFLAGS += -Wl,-Map,$@.map - OBJS = $(IGMP_OBJS) $(ROUTER_OBJS) $(MAPPER_OBJS) $(MRINFO_OBJS) \ - $(MTRACE_OBJS) $(MSTAT_OBJS) - SRCS = $(OBJS:.o=.c) -@@ -65,7 +63,7 @@ - - .c.o: - @printf " CC $@\n" -- @$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< -+ @$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(CPPFLAGS) -c -o $@ $< - - install: $(EXECS) - @install -d $(DESTDIR)$(prefix)/sbin -@@ -95,26 +93,26 @@ - - mrouted: $(IGMP_OBJS) $(ROUTER_OBJS) $(CMULIBS) - @printf " LINK $@\n" -- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(ROUTER_OBJS) $(LDLIBS) -+ @$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(LDFLAGS) $(MROUTED_LDFLAGS) -o $@ $(IGMP_OBJS) $(ROUTER_OBJS) $(LDLIBS) - - vers.c: Makefile - @echo $(VERSION) | sed -e 's/.*/char todaysversion[]="&";/' > vers.c - - map-mbone: $(IGMP_OBJS) $(MAPPER_OBJS) - @printf " LINK $@\n" -- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(MAPPER_OBJS) $(LDLIBS) -+ @$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(LDFLAGS) $(MROUTED_LDFLAGS) -o $@ $(IGMP_OBJS) $(MAPPER_OBJS) $(LDLIBS) - - mrinfo: $(IGMP_OBJS) $(MRINFO_OBJS) - @printf " LINK $@\n" -- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(MRINFO_OBJS) $(LDLIBS) -+ @$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(LDFLAGS) $(MROUTED_LDFLAGS) -o $@ $(IGMP_OBJS) $(MRINFO_OBJS) $(LDLIBS) - - mtrace: $(IGMP_OBJS) $(MTRACE_OBJS) - @printf " LINK $@\n" -- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(MTRACE_OBJS) $(LDLIBS) -+ @$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(LDFLAGS) $(MROUTED_LDFLAGS) -o $@ $(IGMP_OBJS) $(MTRACE_OBJS) $(LDLIBS) - - mstat: $(MSTAT_OBJS) $(CMULIBS) - @printf " LINK $@\n" -- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MSTAT_OBJS) $(LDLIBS) -+ @$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(LDFLAGS) $(MROUTED_LDFLAGS) -o $@ $(MSTAT_OBJS) $(LDLIBS) - - clean: $(SNMPCLEAN) - -@$(RM) $(OBJS) $(EXECS) diff --git a/package/mrouted/mrouted-bcopy.patch b/package/mrouted/mrouted-bcopy.patch new file mode 100644 index 000000000..74af02df6 --- /dev/null +++ b/package/mrouted/mrouted-bcopy.patch @@ -0,0 +1,39 @@ +From 2d33110ee18fb59a1d6917d598fc1f4eb3c4cf83 Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias <gustavo@zacarias.com.ar> +Date: Mon, 7 May 2012 16:32:10 -0300 +Subject: [PATCH] Switch from bcopy to memmove + +The bcopy() function is marked as legacy per POSIX.1-2001 and removed by +POSIX-1.2008 thus shouldn't be used. +So switch over to memmove() + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> +--- + mtrace.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mtrace.c b/mtrace.c +index c982a67..64630bf 100644 +--- a/mtrace.c ++++ b/mtrace.c +@@ -556,7 +556,7 @@ int send_recv(u_int32_t dst, int type, int code, int tries, struct resp_buf *sav + save->rtime = ((tr.tv_sec + JAN_1970) << 16) + + (tr.tv_usec << 10) / 15625; + save->len = len; +- bcopy((char *)igmp, (char *)&save->igmp, ipdatalen); ++ memmove((char *)&save->igmp, (char *)igmp, ipdatalen); + } + return recvlen; + } +@@ -646,7 +646,7 @@ void passive_mode(void) + base.rtime = ((tr.tv_sec + JAN_1970) << 16) + + (tr.tv_usec << 10) / 15625; + base.len = len; +- bcopy((char *)igmp, (char *)&base.igmp, ipdatalen); ++ memmove((char *)&base.igmp, (char *)igmp, ipdatalen); + /* + * If the user specified which traces to monitor, + * only accept traces that correspond to the +-- +1.7.3.4 + diff --git a/package/mrouted/mrouted.mk b/package/mrouted/mrouted.mk index 99b54bcbd..7a3203aac 100644 --- a/package/mrouted/mrouted.mk +++ b/package/mrouted/mrouted.mk @@ -2,11 +2,11 @@ # # mrouted # -# ############################################################# -MROUTED_VERSION = 3.9.4 + +MROUTED_VERSION = 3.9.6 MROUTED_SOURCE = mrouted-$(MROUTED_VERSION).tar.bz2 -MROUTED_SITE = http://ftp.vmlinux.org/pub/People/jocke/mrouted +MROUTED_SITE = http://cloud.github.com/downloads/troglobit/mrouted define MROUTED_BUILD_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index b4d981d99..d7947b1cd 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -3,7 +3,7 @@ # mtd provides jffs2 utilities # ############################################################# -MTD_VERSION = 1.4.9 +MTD_VERSION = 1.5.0 MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2 MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils ifeq ($(BR2_PACKAGE_MTD_MKFSJFFS2),y) diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk index 65523f32b..793812f8f 100644 --- a/package/multimedia/mpg123/mpg123.mk +++ b/package/multimedia/mpg123/mpg123.mk @@ -4,9 +4,9 @@ # ############################################################# -MPG123_VERSION = 1.13.8 +MPG123_VERSION = 1.14.2 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2 -MPG123_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mpg123 +MPG123_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION) MPG123_CONF_OPT = --with-optimization=0 --disable-lfs-alias MPG123_INSTALL_STAGING = YES diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk index eefc497f7..175adfa4c 100644 --- a/package/multimedia/pulseaudio/pulseaudio.mk +++ b/package/multimedia/pulseaudio/pulseaudio.mk @@ -4,14 +4,15 @@ # ################################################################################ -PULSEAUDIO_VERSION = 1.1 +PULSEAUDIO_VERSION = 2.0 PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases/ PULSEAUDIO_INSTALL_STAGING = YES PULSEAUDIO_CONF_OPT = \ --localstatedir=/var \ --disable-default-build-tests \ --disable-legacy-runtime-dir \ - --disable-legacy-database-entry-format + --disable-legacy-database-entry-format \ + $(if $(BR2_HAVE_DOCUMENTATION),,--disable-manpages) PULSEAUDIO_DEPENDENCIES = \ host-pkg-config libtool json-c libsndfile speex host-intltool \ @@ -27,7 +28,9 @@ PULSEAUDIO_DEPENDENCIES = \ $(if $(BR2_PACKAGE_UDEV),udev) \ $(if $(BR2_PACKAGE_OPENSSL),openssl) \ $(if $(BR2_PACKAGE_FFTW),fftw) \ - $(if $(BR2_PACKAGE_ORC),orc) + $(if $(BR2_PACKAGE_ORC),orc) \ + $(if $(BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING),webrtc-audio-processing) \ + $(if $(BR2_PACKAGE_SYSTEMD),systemd) # pulseaudio alsa backend needs pcm/mixer apis ifneq ($(BR2_PACKAGE_ALSA_LIB_PCM)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy) diff --git a/package/mxml/mxml-2.6-fix-cross-target-installation.patch b/package/mxml/mxml-fix-cross-target-installation.patch index 62b6bbc8d..3a9fa0c0c 100644 --- a/package/mxml/mxml-2.6-fix-cross-target-installation.patch +++ b/package/mxml/mxml-fix-cross-target-installation.patch @@ -10,10 +10,10 @@ The added patch is a workaround for cross build as follows: Signed-off-by: Baruch Siach <baruch@tkos.co.il> --- -diff -Nuar mxml-2.6-dist//Makefile.in mxml-2.6/Makefile.in ---- mxml-2.6-dist//Makefile.in 2008-12-06 06:20:38.000000000 +0200 -+++ mxml-2.6/Makefile.in 2011-07-13 07:25:36.615999491 +0300 -@@ -59,7 +59,7 @@ +diff -Nuar mxml-2.7-orig/Makefile.in mxml-2.7/Makefile.in +--- mxml-2.7-orig/Makefile.in 2011-04-13 18:43:32.000000000 +0300 ++++ mxml-2.7/Makefile.in 2012-05-16 07:21:42.677220980 +0300 +@@ -57,7 +57,7 @@ # Install commands... # @@ -23,7 +23,7 @@ diff -Nuar mxml-2.6-dist//Makefile.in mxml-2.6/Makefile.in INSTALL_DIR = $(INSTALL) -d INSTALL_LIB = $(LIBTOOL) $(INSTALL) -m 755 @@ -88,7 +88,7 @@ - mxml-node.o mxml-search.o mxml-set.o + mxml-index.o mxml-node.o mxml-search.o mxml-set.o LIBOBJS = $(PUBLIBOBJS) mxml-private.o mxml-string.o OBJS = mxmldoc.o testmxml.o $(LIBOBJS) -TARGETS = $(LIBMXML) mxmldoc testmxml mxml.xml doc/mxml.man @@ -31,23 +31,25 @@ diff -Nuar mxml-2.6-dist//Makefile.in mxml-2.6/Makefile.in # -@@ -134,8 +134,6 @@ +@@ -140,9 +140,6 @@ # install: $(TARGETS) install-$(LIBMXML) install-libmxml.a +- echo Installing mxmldoc in $(BUILDROOT)$(bindir)... - $(INSTALL_DIR) $(BUILDROOT)$(bindir) -- $(INSTALL_BIN) mxmldoc $(BUILDROOT)$(bindir) +- $(INSTALL_BIN) mxmldoc $(BUILDROOT)$(bindir) + echo Installing documentation in $(BUILDROOT)$(docdir)... $(INSTALL_DIR) $(BUILDROOT)$(docdir) for file in $(DOCFILES); do \ - $(INSTALL_MAN) $$file $(BUILDROOT)$(docdir); \ -@@ -144,10 +142,6 @@ - $(INSTALL_DATA) mxml.h $(BUILDROOT)$(includedir) +@@ -154,11 +151,6 @@ + echo Installing pkgconfig files in $(BUILDROOT)$(libdir)/pkgconfig... $(INSTALL_DIR) $(BUILDROOT)$(libdir)/pkgconfig $(INSTALL_DATA) mxml.pc $(BUILDROOT)$(libdir)/pkgconfig +- echo Installing man pages in $(BUILDROOT)$(mandir)... - $(INSTALL_DIR) $(BUILDROOT)$(mandir)/man1 - $(INSTALL_MAN) doc/mxmldoc.man $(BUILDROOT)$(mandir)/man1/mxmldoc.1 - $(INSTALL_DIR) $(BUILDROOT)$(mandir)/man3 - $(INSTALL_MAN) doc/mxml.man $(BUILDROOT)$(mandir)/man3/mxml.3 install-libmxml.a: - $(INSTALL_DIR) $(BUILDROOT)$(libdir) + echo Installing libmxml.a to $(BUILDROOT)$(libdir)... diff --git a/package/mxml/mxml.mk b/package/mxml/mxml.mk index c05c3a706..ca54a54f7 100644 --- a/package/mxml/mxml.mk +++ b/package/mxml/mxml.mk @@ -3,8 +3,8 @@ # mxml # ############################################################# -MXML_VERSION = 2.6 -MXML_SITE = http://ftp.easysw.com/pub/mxml/2.6 +MXML_VERSION = 2.7 +MXML_SITE = http://ftp.easysw.com/pub/mxml/$(MXML_VERSION) MXML_INSTALL_STAGING = YES MXML_INSTALL_STAGING_OPT = DSTROOT=$(STAGING_DIR) install diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk index 62ae9be40..15997afd1 100644 --- a/package/nbd/nbd.mk +++ b/package/nbd/nbd.mk @@ -4,7 +4,7 @@ # ############################################################# -NBD_VERSION = 3.0 +NBD_VERSION = 3.1 NBD_SOURCE = nbd-$(NBD_VERSION).tar.bz2 NBD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/nbd/nbd/$(NBD_VERSION) NBD_CONF_OPT = $(if $(BR2_LARGEFILE),--enable-lfs,--disable-lfs) diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in index 774395b57..67d25a73d 100644 --- a/package/nfs-utils/Config.in +++ b/package/nfs-utils/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_NFS_UTILS bool "nfs-utils" depends on BR2_INET_RPC depends on BR2_LARGEFILE + select BR2_PACKAGE_PORTMAP help The NFS Linux kernel server. Warning: We do not force largefile support on here on purpose. diff --git a/package/nfs-utils/nfs-utils-1.2.3-susv3-legacy.patch b/package/nfs-utils/nfs-utils-1.2.3-susv3-legacy.patch deleted file mode 100644 index 3504e2d72..000000000 --- a/package/nfs-utils/nfs-utils-1.2.3-susv3-legacy.patch +++ /dev/null @@ -1,54 +0,0 @@ -Use the strchr() function instead of the legacy index() function. - -Signed-off-by: Frederik Pasch <fpasch@googlemail.com> ---- 1/utils/mountd/fsloc.c -+++ 2/utils/mountd/fsloc.c -@@ -126,7 +126,7 @@ - struct servers *rv=NULL; - - xlog(L_NOTICE, "method_list(%s)\n", data); -- for (ptr--, listsize=1; ptr; ptr=index(ptr, ':'), listsize++) -+ for (ptr--, listsize=1; ptr; ptr=strchr(ptr, ':'), listsize++) - ptr++; - list = malloc(listsize * sizeof(char *)); - copy = strdup(data); ---- 1/support/nfs/nfs_mntent.c -+++ 2/support/nfs/nfs_mntent.c -@@ -9,7 +9,7 @@ - */ - - #include <stdio.h> --#include <string.h> /* for index */ -+#include <string.h> /* for strchr */ - #include <ctype.h> /* for isdigit */ - #include <sys/stat.h> /* for umask */ - -@@ -163,7 +163,7 @@ - return NULL; - - mfp->mntent_lineno++; -- s = index (buf, '\n'); -+ s = strchr (buf, '\n'); - if (s == NULL) { - /* Missing final newline? Otherwise extremely */ - /* long line - assume file was corrupted */ -@@ -171,7 +171,7 @@ - fprintf(stderr, _("[mntent]: warning: no final " - "newline at the end of %s\n"), - mfp->mntent_file); -- s = index (buf, 0); -+ s = strchr (buf, 0); - } else { - mfp->mntent_errs = 1; - goto err; ---- 1/utils/mount/error.c -+++ 2/utils/mount/error.c -@@ -62,7 +62,7 @@ - char *tmp; - - if (estr) { -- if ((ptr = index(estr, ':'))) -+ if ((ptr = strchr(estr, ':'))) - estr = ++ptr; - - tmp = &errbuf[spos]; diff --git a/package/nfs-utils/nfs-utils-conditionals.patch b/package/nfs-utils/nfs-utils-conditionals.patch new file mode 100644 index 000000000..a2342b36b --- /dev/null +++ b/package/nfs-utils/nfs-utils-conditionals.patch @@ -0,0 +1,58 @@ +From 869d37a16d1e409cedd95b03cea29a6db65f9276 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu> +Date: Thu, 17 May 2012 16:26:44 -0700 +Subject: [nfs-utils PATCH] build: avoid AM_CONDITIONAL in conditional + execution. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Automake does not support conditional AM_CONDITIONAL calls; what that +means is that you always have to execute AM_CONDITIONAL one way or the +other. Both the libsqlite3.m4 file and the nfsdcld conditionals are +executed only when NFSv4 is enabled, which breaks building with +--disable-nfsv4. + +Remove the SQLite3 conditional altogether as it's never used, and move +the nfsdcld conditional outside of the conditional code. + +Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> +--- + aclocal/libsqlite3.m4 | 1 - + configure.ac | 3 +-- + 2 files changed, 1 insertions(+), 3 deletions(-) + +diff --git a/aclocal/libsqlite3.m4 b/aclocal/libsqlite3.m4 +index 73d1e46..8c38993 100644 +--- a/aclocal/libsqlite3.m4 ++++ b/aclocal/libsqlite3.m4 +@@ -29,5 +29,4 @@ AC_DEFUN([AC_SQLITE3_VERS], [ + LIBS="$saved_LIBS"]) + + AC_MSG_RESULT($libsqlite3_cv_is_recent) +- AM_CONDITIONAL(CONFIG_SQLITE3, [test "$libsqlite3_cv_is_recent" = "yes"]) + ])dnl +diff --git a/configure.ac b/configure.ac +index 9ba53e2..b408f1b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -278,8 +278,6 @@ if test "$enable_nfsv4" = yes; then + fi + fi + +- AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ]) +- + dnl librpcsecgss already has a dependency on libgssapi, + dnl but we need to make sure we get the right version + if test "$enable_gss" = yes; then +@@ -293,6 +291,7 @@ if test "$enable_nfsv41" = yes; then + fi + + dnl enable nfsidmap when its support by libnfsidmap ++AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ]) + AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"]) + + +-- +1.7.8.6 + diff --git a/package/nfs-utils/nfs-utils-cross-build.patch b/package/nfs-utils/nfs-utils-cross-build.patch new file mode 100644 index 000000000..43928bf50 --- /dev/null +++ b/package/nfs-utils/nfs-utils-cross-build.patch @@ -0,0 +1,68 @@ +Patch taken from Gentoo. + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> + +--- a/tools/locktest/Makefile.am ++++ b/tools/locktest/Makefile.am +@@ -1,12 +1,11 @@ + ## Process this file with automake to produce Makefile.in + + CC=$(CC_FOR_BUILD) +-LIBTOOL = @LIBTOOL@ --tag=CC ++CFLAGS=$(CFLAGS_FOR_BUILD) ++CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++LDFLAGS=$(LDFLAGS_FOR_BUILD) + + noinst_PROGRAMS = testlk + testlk_SOURCES = testlk.c +-testlk_CFLAGS=$(CFLAGS_FOR_BUILD) +-testlk_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) +-testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD) + + MAINTAINERCLEANFILES = Makefile.in +--- a/tools/rpcdebug/Makefile.am ++++ b/tools/rpcdebug/Makefile.am +@@ -1,15 +1,14 @@ + ## Process this file with automake to produce Makefile.in + + CC=$(CC_FOR_BUILD) +-LIBTOOL = @LIBTOOL@ --tag=CC ++CFLAGS=$(CFLAGS_FOR_BUILD) ++CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++LDFLAGS=$(LDFLAGS_FOR_BUILD) + + man8_MANS = rpcdebug.man + EXTRA_DIST = $(man8_MANS) + + sbin_PROGRAMS = rpcdebug + rpcdebug_SOURCES = rpcdebug.c +-rpcdebug_CFLAGS=$(CFLAGS_FOR_BUILD) +-rpcdebug_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -I$(top_srcdir)/support/include +-rpcdebug_LDFLAGS=$(LDFLAGS_FOR_BUILD) + + MAINTAINERCLEANFILES = Makefile.in +--- a/tools/rpcgen/Makefile.am ++++ b/tools/rpcgen/Makefile.am +@@ -1,7 +1,9 @@ + ## Process this file with automake to produce Makefile.in + + CC=$(CC_FOR_BUILD) +-LIBTOOL = @LIBTOOL@ --tag=CC ++CFLAGS=$(CFLAGS_FOR_BUILD) ++CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++LDFLAGS=$(LDFLAGS_FOR_BUILD) + + noinst_PROGRAMS = rpcgen + rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \ +@@ -9,10 +11,6 @@ + rpc_util.c rpc_sample.c rpc_output.h rpc_parse.h \ + rpc_scan.h rpc_util.h + +-rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD) +-rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD) +-rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD) +-rpcgen_LDADD=$(LIBTIRPC) + + MAINTAINERCLEANFILES = Makefile.in + + EXTRA_DIST = rpcgen.new.1 diff --git a/package/nfs-utils/nfs-utils-1.2.3-dont-mix-flags.patch b/package/nfs-utils/nfs-utils-dont-mix-flags.patch index b5ef5c717..b5ef5c717 100644 --- a/package/nfs-utils/nfs-utils-1.2.3-dont-mix-flags.patch +++ b/package/nfs-utils/nfs-utils-dont-mix-flags.patch diff --git a/package/nfs-utils/nfs-utils-susv3-legacy.patch b/package/nfs-utils/nfs-utils-susv3-legacy.patch new file mode 100644 index 000000000..66dd181db --- /dev/null +++ b/package/nfs-utils/nfs-utils-susv3-legacy.patch @@ -0,0 +1,59 @@ +Switch legacy index() in favour of strchr() +Updated for 1.2.6 from the previous patch by Frederik Pasch. + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> + +diff -Nura nfs-utils-1.2.6.orig/support/nfs/nfs_mntent.c nfs-utils-1.2.6/support/nfs/nfs_mntent.c +--- nfs-utils-1.2.6.orig/support/nfs/nfs_mntent.c 2012-05-29 10:06:37.901255998 -0300 ++++ nfs-utils-1.2.6/support/nfs/nfs_mntent.c 2012-05-29 10:06:45.726312410 -0300 +@@ -9,7 +9,7 @@ + */ + + #include <stdio.h> +-#include <string.h> /* for index */ ++#include <string.h> /* for strchr */ + #include <ctype.h> /* for isdigit */ + #include <sys/stat.h> /* for umask */ + #include <unistd.h> /* for ftruncate */ +@@ -172,7 +172,7 @@ + return NULL; + + mfp->mntent_lineno++; +- s = index (buf, '\n'); ++ s = strchr (buf, '\n'); + if (s == NULL) { + /* Missing final newline? Otherwise extremely */ + /* long line - assume file was corrupted */ +@@ -180,7 +180,7 @@ + fprintf(stderr, _("[mntent]: warning: no final " + "newline at the end of %s\n"), + mfp->mntent_file); +- s = index (buf, 0); ++ s = strchr (buf, 0); + } else { + mfp->mntent_errs = 1; + goto err; +diff -Nura nfs-utils-1.2.6.orig/utils/mount/error.c nfs-utils-1.2.6/utils/mount/error.c +--- nfs-utils-1.2.6.orig/utils/mount/error.c 2012-05-29 10:06:37.946256325 -0300 ++++ nfs-utils-1.2.6/utils/mount/error.c 2012-05-29 10:06:45.727312416 -0300 +@@ -62,7 +62,7 @@ + char *tmp; + + if (estr) { +- if ((ptr = index(estr, ':'))) ++ if ((ptr = strchr(estr, ':'))) + estr = ++ptr; + + tmp = &errbuf[spos]; +diff -Nura nfs-utils-1.2.6.orig/utils/mountd/fsloc.c nfs-utils-1.2.6/utils/mountd/fsloc.c +--- nfs-utils-1.2.6.orig/utils/mountd/fsloc.c 2012-05-29 10:06:37.911256072 -0300 ++++ nfs-utils-1.2.6/utils/mountd/fsloc.c 2012-05-29 10:07:11.140322564 -0300 +@@ -127,7 +127,7 @@ + bool v6esc = false; + + xlog(L_NOTICE, "method_list(%s)", data); +- for (ptr--, listsize=1; ptr; ptr=index(ptr, ':'), listsize++) ++ for (ptr--, listsize=1; ptr; ptr=strchr(ptr, ':'), listsize++) + ptr++; + list = malloc(listsize * sizeof(char *)); + copy = strdup(data); diff --git a/package/nfs-utils/nfs-utils-1.2.3-uclibc-libio.h.patch b/package/nfs-utils/nfs-utils-uclibc-libio.h.patch index 589b96f7a..589b96f7a 100644 --- a/package/nfs-utils/nfs-utils-1.2.3-uclibc-libio.h.patch +++ b/package/nfs-utils/nfs-utils-uclibc-libio.h.patch diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 557e7e8cc..87c136c3d 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -3,14 +3,17 @@ # nfs-utils # ############################################################# -NFS_UTILS_VERSION = 1.2.3 + +NFS_UTILS_VERSION = 1.2.6 NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.bz2 -NFS_UTILS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/nfs/ +NFS_UTILS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/nfs/nfs-utils/$(NFS_UTILS_VERSION) +NFS_UTILS_AUTORECONF = YES NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no NFS_UTILS_CONF_OPT = \ --disable-nfsv4 \ + --disable-nfsv41 \ --disable-gss \ --disable-tirpc \ --disable-uuid \ @@ -28,6 +31,13 @@ define NFS_UTILS_INSTALL_FIXUP rm -f $(NFS_UTILS_TARGETS_) endef +define NFS_UTILS_REMOVE_NFSIOSTAT + rm -f $(TARGET_DIR)/usr/sbin/nfsiostat +endef + NFS_UTILS_POST_INSTALL_TARGET_HOOKS += NFS_UTILS_INSTALL_FIXUP +# nfsiostat is interpreted python, so remove it unless it's in the target +NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON),,NFS_UTILS_REMOVE_NFSIOSTAT) + $(eval $(call AUTOTARGETS)) diff --git a/package/ofono/Config.in b/package/ofono/Config.in new file mode 100644 index 000000000..fc6c9c682 --- /dev/null +++ b/package/ofono/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_OFONO + bool "ofono" + depends on BR2_USE_WCHAR # gettext/libglib2 + select BR2_PACKAGE_LIBCAP_NG + select BR2_PACKAGE_DBUS + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO + help + oFono is a free, open source project for mobile telephony + (GSM/UMTS) applications. It uses high-level D-Bus API for + use by telephony applications. It uses 3GPP standard. + + http://ofono.org/ + +comment "ofono requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR diff --git a/package/ofono/ofono-uclibc-backtrace.patch b/package/ofono/ofono-uclibc-backtrace.patch new file mode 100644 index 000000000..8499bcfb9 --- /dev/null +++ b/package/ofono/ofono-uclibc-backtrace.patch @@ -0,0 +1,44 @@ +[PATCH] fix build on uClibc without UCLIBC_HAS_BACKTRACE + +Backtrace support is only used for logging on signal errors, which +isn't really critical, so simply remove backtrace info if not +available in uClibc. + +Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> +--- + src/log.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +Index: ofono-1.5/src/log.c +=================================================================== +--- ofono-1.5.orig/src/log.c ++++ ofono-1.5/src/log.c +@@ -30,7 +30,12 @@ + #include <stdlib.h> + #include <string.h> + #include <syslog.h> ++#include <features.h> ++/* backtrace support is optional on uClibc */ ++#if !(defined(__UCLIBC__) && !defined (__UCLIBC_HAS_BACKTRACE__)) ++#define HAVE_BACKTRACE + #include <execinfo.h> ++#endif + #include <dlfcn.h> + + #include "ofono.h" +@@ -115,6 +120,7 @@ + + static void print_backtrace(unsigned int offset) + { ++#ifdef HAVE_BACKTRACE + void *frames[99]; + size_t n_ptrs; + unsigned int i; +@@ -213,6 +219,7 @@ + + close(outfd[1]); + close(infd[0]); ++#endif /* HAVE_BACKTRACE */ + } + + static void signal_handler(int signo) diff --git a/package/ofono/ofono.mk b/package/ofono/ofono.mk new file mode 100644 index 000000000..c6ffb64cf --- /dev/null +++ b/package/ofono/ofono.mk @@ -0,0 +1,31 @@ +############################################################# +# +# ofono +# +############################################################# +OFONO_VERSION = 1.6 +OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono +OFONO_DEPENDENCIES = \ + host-pkg-config \ + dbus \ + libglib2 \ + libcap-ng \ + mobile-broadband-provider-info + +OFONO_CONF_OPT = --disable-test + +ifeq ($(BR2_PACKAGE_UDEV),y) + OFONO_CONF_OPT += --enable-udev + OFONO_DEPENDENCIES += udev +else + OFONO_CONF_OPT += --disable-udev +endif + +ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y) + OFONO_CONF_OPT += --enable-bluetooth + OFONO_DEPENDENCIES += bluez_utils +else + OFONO_CONF_OPT += --disable-bluetooth +endif + +$(eval $(call AUTOTARGETS)) diff --git a/package/omap-u-boot-utils/Config.in.host b/package/omap-u-boot-utils/Config.in.host new file mode 100644 index 000000000..63fbdf521 --- /dev/null +++ b/package/omap-u-boot-utils/Config.in.host @@ -0,0 +1,8 @@ +config BR2_PACKAGE_HOST_OMAP_U_BOOT_UTILS + bool "host omap-u-boot-utils" + help + U-Boot Utilities for Texas Instrument's OMAP platforms. + This is a set of tools to control U-Boot from scripts, generate + OMAP-specific signed image files and more. + + https://github.com/nmenon/omap-u-boot-utils diff --git a/package/omap-u-boot-utils/omap-u-boot-utils.mk b/package/omap-u-boot-utils/omap-u-boot-utils.mk new file mode 100644 index 000000000..e2da9a1bf --- /dev/null +++ b/package/omap-u-boot-utils/omap-u-boot-utils.mk @@ -0,0 +1,21 @@ +############################################################# +# +# omap-u-boot-utils +# +############################################################# + +OMAP_U_BOOT_UTILS_VERSION = 8aff852322 +OMAP_U_BOOT_UTILS_SITE = http://github.com/nmenon/omap-u-boot-utils.git +OMAP_U_BOOT_UTILS_SITE_METHOD = git + +define HOST_OMAP_U_BOOT_UTILS_BUILD_CMDS + $(MAKE) -C $(@D) +endef + +define HOST_OMAP_U_BOOT_UTILS_INSTALL_CMDS + for f in gpsign pserial tagger ucmd ukermit ; do \ + install -m 755 -D $(@D)/$$f $(HOST_DIR)/usr/bin/$$f ; \ + done +endef + +$(eval $(call GENTARGETS,host)) diff --git a/package/opkg/Config.in b/package/opkg/Config.in new file mode 100644 index 000000000..eb997a7d4 --- /dev/null +++ b/package/opkg/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_OPKG + bool "opkg" + help + Opkg is a lightweight package management system, based on ipkg. It is + written in C and resembles apt/dpkg in operation. It is intended for + use on embedded Linux devices. + Opkg is maintained, stable, robust and conservative in its memory + usage, despite its buggy ipkg ancestry. As best it can, opkg + maintains backwards compatibility with ipkg and conforms to a subset + of debian's policy manual regarding control files. + + http://code.google.com/p/opkg/ + diff --git a/package/opkg/opkg-build b/package/opkg/opkg-build new file mode 100755 index 000000000..7fd0d3fd2 --- /dev/null +++ b/package/opkg/opkg-build @@ -0,0 +1,127 @@ +#!/bin/sh + +# opkg-build -- construct a .opk from a directory +# Carl Worth <cworth@east.isi.edu> +# based on a script by Steve Redler IV, steve@sr-tech.com 5-21-2001 +set -e + +opkg_extract_value() { + sed -e "s/^[^:]*:[[:space:]]*//" +} + +required_field() { + field=$1 + + value=`grep "^$field:" < $CONTROL/control | opkg_extract_value` + if [ -z "$value" ]; then + echo "opkg-build: Error: $CONTROL/control is missing field $field" ; + PKG_ERROR=1 + fi + echo $value +} + +pkg_appears_sane() { + local pkg_dir=$1 + + local owd=`pwd` + cd $pkg_dir + + PKG_ERROR=0 + if [ ! -f "$CONTROL/control" ]; then + echo "opkg-build: Error: Control file $pkg_dir/$CONTROL/control not found." + cd $owd + return 1 + fi + + pkg=`required_field Package` + version=`required_field Version` + arch=`required_field Architecture` + required_field Maintainer >/dev/null + required_field Description >/dev/null + + if echo $pkg | grep '[^a-z0-9.+-]'; then + echo "opkg-build: Error: Package name $name contains illegal characters, (other than [a-z0-9.+-])" + PKG_ERROR=1; + fi + + local bad_fields=`sed -ne 's/^\([^[:space:]][^:[:space:]]\+[[:space:]]\+\)[^:].*/\1/p' < $CONTROL/control | sed -e 's/\\n//'` + if [ -n "$bad_fields" ]; then + bad_fields=`echo $bad_fields` + echo "opkg-build: Error: The following fields in $CONTROL/control are missing a ':'" + echo " $bad_fields" + echo "opkg-build: This may be due to a missing initial space for a multi-line field value" + PKG_ERROR=1 + fi + + for script in $CONTROL/preinst $CONTROL/postinst $CONTROL/prerm $CONTROL/postrm; do + if [ -f $script -a ! -x $script ]; then + echo "opkg-build: Error: package script $script is not executable" + PKG_ERROR=1 + fi + done + + if [ -f $CONTROL/conffiles ]; then + for cf in `cat $CONTROL/conffiles`; do + if [ ! -f ./$cf ]; then + echo "opkg-build: Error: $CONTROL/conffiles mentions conffile $cf which does not exist" + PKG_ERROR=1 + fi + done + fi + + cd $owd + return $PKG_ERROR +} + +### +# opkg-build "main" +### + +case $# in +1) + dest_dir=. + ;; +2) + dest_dir=$2 + ;; +*) + echo "Usage: opkg-build <pkg_directory> [<destination_directory>]" ; + exit 1 + ;; +esac + +pkg_dir=$1 + +if [ ! -d $pkg_dir ]; then + echo "opkg-build: Error: Directory $pkg_dir does not exist" + exit 1 +fi + +# CONTROL is second so that it takes precedence +CONTROL= +[ -d $pkg_dir/DEBIAN ] && CONTROL=DEBIAN +[ -d $pkg_dir/CONTROL ] && CONTROL=CONTROL +if [ -z "$CONTROL" ]; then + echo "opkg-build: Error: Directory $pkg_dir has no CONTROL subdirectory." + exit 1 +fi + +if ! pkg_appears_sane $pkg_dir; then + echo "Please fix the above errors and try again." + exit 1 +fi + +tmp_dir=$dest_dir/OPKG_BUILD.$$ +mkdir $tmp_dir + +tar -C $pkg_dir -czf $tmp_dir/data.tar.gz . --exclude=$CONTROL +tar -C $pkg_dir/$CONTROL -czf $tmp_dir/control.tar.gz . + +echo "2.0" > $tmp_dir/debian-binary + +pkg_file=$dest_dir/${pkg}_${version}_${arch}.opk +tar -C $tmp_dir -czf $pkg_file debian-binary data.tar.gz control.tar.gz +rm $tmp_dir/debian-binary $tmp_dir/data.tar.gz $tmp_dir/control.tar.gz +rmdir $tmp_dir + +echo "Packaged contents of $pkg_dir into $pkg_file" diff --git a/package/opkg/opkg.mk b/package/opkg/opkg.mk new file mode 100644 index 000000000..9cfaa26c1 --- /dev/null +++ b/package/opkg/opkg.mk @@ -0,0 +1,20 @@ +############################################################# +# +# opkg +# +############################################################# + +OPKG_VERSION = 0.1.8 +OPKG_SOURCE = opkg-$(OPKG_VERSION).tar.gz +OPKG_SITE = http://opkg.googlecode.com/files +OPKG_INSTALL_STAGING = YES +OPKG_CONF_OPT = --disable-curl --disable-gpg + +# Ensure directory for lockfile exists +define OPKG_CREATE_LOCKDIR + mkdir -p $(TARGET_DIR)/usr/lib/opkg +endef + +OPKG_POST_INSTALL_TARGET_HOOKS += OPKG_CREATE_LOCKDIR + +$(eval $(call AUTOTARGETS)) diff --git a/package/php/Config.ext b/package/php/Config.ext index bd630eeb6..fa73bb4de 100644 --- a/package/php/Config.ext +++ b/package/php/Config.ext @@ -1,28 +1,21 @@ -menu "PHP Extensions" +menu "Extensions" -config BR2_PACKAGE_PHP_CONFIG - string "PHP configuration file to use" - default "$(PHP_DIR)/php.ini-dist" - help - If you want to use a different php.ini file define it here. - Otherwise it'll just copy the default php.ini-dist from PHP. - -config BR2_PACKAGE_PHP_EXT_SOCKETS - bool "socket" +config BR2_PACKAGE_PHP_EXT_CALENDAR + bool "Calendar" help - Sockets support + Calendar and event support -config BR2_PACKAGE_PHP_EXT_POSIX - bool "posix" - default y +config BR2_PACKAGE_PHP_EXT_FILEINFO + bool "Fileinfo" help - POSIX support + File Information support -config BR2_PACKAGE_PHP_EXT_SPL - bool "SPL" - default y +config BR2_PACKAGE_PHP_EXT_READLINE + bool "Readline" + select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_READLINE help - Standard PHP library support + Readline support config BR2_PACKAGE_PHP_EXT_SESSION bool "Session" @@ -30,156 +23,320 @@ config BR2_PACKAGE_PHP_EXT_SESSION help Session support +comment "Compression extensions" + +config BR2_PACKAGE_PHP_EXT_BZIP2 + bool "bzip2" + select BR2_PACKAGE_BZIP2 + help + bzip2 read/write support + +config BR2_PACKAGE_PHP_EXT_ZIP + bool "zip" + select BR2_PACKAGE_ZLIB + help + Zip read/write support + +config BR2_PACKAGE_PHP_EXT_ZLIB + bool "zlib" + select BR2_PACKAGE_ZLIB + default y + help + zlib support + +comment "Cryptography extensions" + +config BR2_PACKAGE_PHP_EXT_HASH + bool "hash" + help + HASH message digest framework + config BR2_PACKAGE_PHP_EXT_OPENSSL bool "openssl" select BR2_PACKAGE_OPENSSL help openssl support -config BR2_PACKAGE_PHP_EXT_LIBXML2 - bool "xml2" - select BR2_PACKAGE_LIBXML2 +comment "Database extensions" + +config BR2_PACKAGE_PHP_EXT_DBA + bool "DBA" help - libxml2 support + Database Abstraction Layer -config BR2_PACKAGE_PHP_EXT_SIMPLEXML - bool "simplexml" - select BR2_PACKAGE_PHP_EXT_LIBXML2 +if BR2_PACKAGE_PHP_EXT_DBA + +config BR2_PACKAGE_PHP_EXT_DBA_CDB + bool "cdb" help - SimpleXML support + CDB handler -config BR2_PACKAGE_PHP_EXT_ZLIB - bool "zlib" - select BR2_PACKAGE_ZLIB - default y - help - zlib support +config BR2_PACKAGE_PHP_EXT_DBA_DB4 + bool "db4/5" + select BR2_PACKAGE_BERKELEYDB + help + BerkeleyDB version 4/5 handler -config BR2_PACKAGE_PHP_EXT_EXIF - bool "EXIF" +config BR2_PACKAGE_PHP_EXT_DBA_FLAT + bool "flat" + default y help - EXIF support + Flat file handler -config BR2_PACKAGE_PHP_EXT_FTP - bool "FTP" +config BR2_PACKAGE_PHP_EXT_DBA_INI + bool "ini" + default y + help + INI file handler + +endif + +config BR2_PACKAGE_PHP_EXT_SQLITE + bool "SQLite" + help + Legacy SQLite2 support + +config BR2_PACKAGE_PHP_EXT_SQLITE_UTF8 + bool "sqlite UTF8 support" + depends on BR2_PACKAGE_PHP_EXT_SQLITE + help + UTF8 support for sqlite + +config BR2_PACKAGE_PHP_EXT_MYSQL + bool "Mysql" + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_MYSQL_CLIENT + help + MySQL support + +config BR2_PACKAGE_PHP_EXT_MYSQLI + bool "Mysqli" + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_MYSQL_CLIENT + select BR2_PACKAGE_PHP_EXT_MYSQL + help + MySQL Improved extension support + +config BR2_PACKAGE_PHP_EXT_PDO + bool "PDO" + help + PHP Data Objects support + +if BR2_PACKAGE_PHP_EXT_PDO + +config BR2_PACKAGE_PHP_EXT_PDO_MYSQL + bool "MySQL" + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_MYSQL_CLIENT + help + PDO driver for MySQL + +comment "MySQL drivers require a toolchain with C++ support" + depends on !BR2_INSTALL_LIBSTDCPP + +config BR2_PACKAGE_PHP_EXT_PDO_SQLITE + bool "SQLite3" + select BR2_PACKAGE_SQLITE help - FTP Support + SQLite3 driver for PDO + +endif + +comment "Human language and character encoding support" config BR2_PACKAGE_PHP_EXT_GETTEXT - bool "gettext" + bool "Gettext" select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT depends on BR2_USE_WCHAR help - gettext support + Gettext support -comment "gettext support requires a toolchain with WCHAR support" +comment "Gettext support requires a toolchain with WCHAR support" depends on !BR2_USE_WCHAR +config BR2_PACKAGE_PHP_EXT_ICONV + bool "iconv" + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + help + iconv character set conversion support + +config BR2_PACKAGE_PHP_EXT_INTL + bool "intl" + select BR2_PACKAGE_ICU + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_WCHAR + help + Internationalization support + +comment "intl support requires a toolchain with C++ and WCHAR support" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR + +comment "Image processing" + +config BR2_PACKAGE_PHP_EXT_EXIF + bool "EXIF" + help + EXIF support + +comment "Mathematical extensions" + +config BR2_PACKAGE_PHP_EXT_BCMATH + bool "BC math" + help + BCMath arbitrary precision mathematics support + config BR2_PACKAGE_PHP_EXT_GMP - bool "gmp" + bool "GMP" select BR2_PACKAGE_GMP help - GMP support + GNU Multiple Precision support + +comment "Other basic extensions" config BR2_PACKAGE_PHP_EXT_JSON bool "JSON" help JavaScript Object Serialization support -config BR2_PACKAGE_PHP_EXT_READLINE - bool "readline" - depends on (BR2_PACKAGE_PHP_CLI || BR2_PACKAGE_PHP_CGI) && BR2_PACKAGE_READLINE +config BR2_PACKAGE_PHP_EXT_TOKENIZER + bool "Tokenizer" + help + Tokenizer functions support + +comment "Other services" + +config BR2_PACKAGE_PHP_EXT_CURL + bool "cURL" + select BR2_PACKAGE_LIBCURL + help + cURL for URL streams + +config BR2_PACKAGE_PHP_EXT_FTP + bool "FTP" help - readline support + FTP support -config BR2_PACKAGE_PHP_EXT_NCURSES - bool "ncurses" - depends on (BR2_PACKAGE_PHP_CLI || BR2_PACKAGE_PHP_CGI) && BR2_PACKAGE_NCURSES +config BR2_PACKAGE_PHP_EXT_SNMP + bool "SNMP" + select BR2_PACKAGE_NETSNMP help - ncurses support + SNMP support -config BR2_PACKAGE_PHP_EXT_PCRE - bool "PCRE" +config BR2_PACKAGE_PHP_EXT_SOCKETS + bool "sockets" help - Perl Compatible Regular Expressions support + Sockets support + +comment "Process Control" config BR2_PACKAGE_PHP_EXT_PCNTL bool "PCNTL" help - Process Control Support + Process control support + +config BR2_PACKAGE_PHP_EXT_POSIX + bool "Posix" + default y + help + POSIX.1 (IEEE 1003.1) function support + +config BR2_PACKAGE_PHP_EXT_SHMOP + bool "shmop" + help + Shared memory support config BR2_PACKAGE_PHP_EXT_SYSVMSG - bool "sysvmsg - System V Message queue" + bool "sysvmsg" help - System V Message queue support + System V message queue support config BR2_PACKAGE_PHP_EXT_SYSVSEM - bool "sysvsem - System V Semaphores" + bool "sysvsem" help - System V Sempahore support + System V semaphore support config BR2_PACKAGE_PHP_EXT_SYSVSHM - bool "sysvshm - System V Shared memory" + bool "sysvshm" help - System V Shared memory support + System V shared memory support -config BR2_PACKAGE_PHP_EXT_ZIP - bool "zip" - select BR2_PACKAGE_ZLIB +comment "Variable and Type related" + +config BR2_PACKAGE_PHP_EXT_CTYPE + bool "Ctype" help - Zip read/write support + Character type checking support config BR2_PACKAGE_PHP_EXT_FILTER - bool "filter" - select BR2_PACKAGE_PHP_EXT_PCRE + bool "Filter" help Input filter support -config BR2_PACKAGE_PHP_EXT_CALENDAR - bool "calendar" +comment "Web services" + +config BR2_PACKAGE_PHP_EXT_SOAP + bool "SOAP" + select BR2_PACKAGE_PHP_EXT_LIBXML2 help - Calendar and event support + SOAP support -comment "Database extensions" +config BR2_PACKAGE_PHP_EXT_XMLRPC + bool "XML-RPC" + select BR2_PACKAGE_PHP_EXT_LIBXML2 + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + help + XML-RPC support -config BR2_PACKAGE_PHP_EXT_SQLITE - bool "SQLite" +comment "XML manipulation" + +config BR2_PACKAGE_PHP_EXT_DOM + bool "DOM" + select BR2_PACKAGE_PHP_EXT_LIBXML2 help - Legacy SQLite2 support + Document Object Model support -config BR2_PACKAGE_PHP_EXT_SQLITE_UTF8 - bool "sqlite UTF8 support" - depends on BR2_PACKAGE_PHP_EXT_SQLITE +config BR2_PACKAGE_PHP_EXT_LIBXML2 + bool "libxml" + select BR2_PACKAGE_LIBXML2 + help + libxml2 support + +config BR2_PACKAGE_PHP_EXT_SIMPLEXML + bool "SimpleXML" + select BR2_PACKAGE_PHP_EXT_LIBXML2 help - UTF8 Support for sqlite + SimpleXML support -config BR2_PACKAGE_PHP_EXT_PDO - bool "PDO" +config BR2_PACKAGE_PHP_EXT_WDDX + bool "WDDX" + select BR2_PACKAGE_PHP_EXT_LIBXML2 help - PHP Data Objects support + WDDX support -config BR2_PACKAGE_PHP_EXT_PDO_SQLITE - bool "PDO_SQLite" - depends on BR2_PACKAGE_PHP_EXT_PDO +config BR2_PACKAGE_PHP_EXT_XML + bool "XML Parser" + select BR2_PACKAGE_PHP_EXT_LIBXML2 help - SQLite driver for PDO + XML Parser support -config BR2_PACKAGE_PHP_EXT_PDO_SQLITE_EXTERNAL - bool "PDO_SQLite external" - depends on BR2_PACKAGE_PHP_EXT_PDO_SQLITE - select BR2_PACKAGE_SQLITE +config BR2_PACKAGE_PHP_EXT_XMLREADER + bool "XMLReader" + select BR2_PACKAGE_PHP_EXT_LIBXML2 help - Use external sqlite3 library + XMLReader support -config BR2_PACKAGE_PHP_EXT_PDO_MYSQL - bool "PDO_MySQL" - depends on BR2_PACKAGE_PHP_EXT_PDO - depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_MYSQL_CLIENT +config BR2_PACKAGE_PHP_EXT_XMLWRITER + bool "XMLWriter" + select BR2_PACKAGE_PHP_EXT_LIBXML2 help - PDO driver for MySQL + XMLWriter support -comment "PDO_MySQL requires a toolchain with C++ support" - depends on !BR2_INSTALL_LIBSTDCPP && BR2_PACKAGE_PHP_EXT_PDO +config BR2_PACKAGE_PHP_EXT_XSL + bool "XSL" + select BR2_PACKAGE_PHP_EXT_DOM + select BR2_PACKAGE_PHP_EXT_LIBXML2 + select BR2_PACKAGE_LIBXSLT + help + XSL transformation support endmenu diff --git a/package/php/Config.in b/package/php/Config.in index 23d86e48e..c8c100cbd 100644 --- a/package/php/Config.in +++ b/package/php/Config.in @@ -9,6 +9,8 @@ config BR2_PACKAGE_PHP if BR2_PACKAGE_PHP +source "package/php/Config.ext" + config BR2_PACKAGE_PHP_CLI bool @@ -16,38 +18,30 @@ config BR2_PACKAGE_PHP_CGI bool choice - prompt "PHP interface" + prompt "Interface" default BR2_PACKAGE_PHP_SAPI_CGI help Select the PHP interface(s). +config BR2_PACKAGE_PHP_SAPI_CGI + bool "CGI" + select BR2_PACKAGE_PHP_CGI + help + Common Gateway Interface + config BR2_PACKAGE_PHP_SAPI_CLI - bool "cli interface" + bool "CLI" select BR2_PACKAGE_PHP_CLI help - Command line interface for PHP. - -config BR2_PACKAGE_PHP_SAPI_CGI - bool "cgi interface" - select BR2_PACKAGE_PHP_CGI - help - CGI interface for PHP. + Command Line Interface config BR2_PACKAGE_PHP_SAPI_CLI_CGI - bool "cli and cgi interfaces" + bool "CGI and CLI" select BR2_PACKAGE_PHP_CLI select BR2_PACKAGE_PHP_CGI help - Command line and CGI interfaces for PHP. + Command line and Common gateway interfaces endchoice -config BR2_PACKAGE_PHP_FASTCGI - bool "fastcgi" - depends on BR2_PACKAGE_PHP_CGI - default y - help - fast cgi interface for php - -source "package/php/Config.ext" endif diff --git a/package/php/php-5.2.16-fix-build-when-__GMP_BITS_PER_MP_LIMB-is-not-defined.patch b/package/php/php-5.2.16-fix-build-when-__GMP_BITS_PER_MP_LIMB-is-not-defined.patch deleted file mode 100644 index 221b3c00e..000000000 --- a/package/php/php-5.2.16-fix-build-when-__GMP_BITS_PER_MP_LIMB-is-not-defined.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e814fcac0599dbaae50ede1f9f78e20941e27877 Mon Sep 17 00:00:00 2001 -From: pajoye <pajoye@c90b9560-bf6c-de11-be94-00142212c4b1> -Date: Tue, 23 Feb 2010 11:07:39 +0000 -Subject: [PATCH] - fix build when __GMP_BITS_PER_MP_LIMB is not defined but GMP_LIMB_BITS (no trace of this change in gmp's changelog...) - -git-svn-id: http://svn.php.net/repository/php/php-src/branches/PHP_5_3@295402 c90b9560-bf6c-de11-be94-00142212c4b1 ---- - ext/gmp/gmp.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c -index a54ffe9..f53dcd6 100644 ---- a/ext/gmp/gmp.c -+++ b/ext/gmp/gmp.c -@@ -1374,8 +1374,11 @@ ZEND_FUNCTION(gmp_random) - - GMPG(rand_initialized) = 1; - } -+#ifdef GMP_LIMB_BITS -+ mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * GMP_LIMB_BITS); -+#else - mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * __GMP_BITS_PER_MP_LIMB); -- -+#endif - ZEND_REGISTER_RESOURCE(return_value, gmpnum_result, le_gmp); - } - /* }}} */ --- -1.7.1 - diff --git a/package/php/php-no-iconv-search.patch b/package/php/php-no-iconv-search.patch new file mode 100644 index 000000000..d1e924b1a --- /dev/null +++ b/package/php/php-no-iconv-search.patch @@ -0,0 +1,21 @@ +Don't push LDFLAGS/CFLAGS for iconv. +Just assume they're covered somewhere else. +Otherwise we get -L/usr/lib and -I/usr/include search paths with uClibc +internal iconv support, which breaks things. + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> + +diff -Nura php-5.3.13/configure php-5.3.13-iconv/configure +--- php-5.3.13/configure 2012-05-08 06:41:23.000000000 -0300 ++++ php-5.3.13-iconv/configure 2012-05-18 22:18:21.313975849 -0300 +@@ -47885,8 +47885,8 @@ + PHP_ICONV_PREFIX="$ICONV_DIR" + fi + +- CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS" +- LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS" ++ #CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS" ++ #LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS" + + if test -r "$PHP_ICONV_PREFIX/include/giconv.h"; then + PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h" diff --git a/package/php/php.mk b/package/php/php.mk index 6de6a9e83..e9bda447f 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,53 +4,59 @@ # ############################################################# -PHP_VERSION = 5.2.17 +PHP_VERSION = 5.3.13 PHP_SOURCE = php-$(PHP_VERSION).tar.bz2 PHP_SITE = http://www.php.net/distributions PHP_INSTALL_STAGING = YES PHP_INSTALL_STAGING_OPT = INSTALL_ROOT=$(STAGING_DIR) install PHP_INSTALL_TARGET_OPT = INSTALL_ROOT=$(TARGET_DIR) install -PHP_LIBTOOL_PATCH = NO PHP_CONF_OPT = --mandir=/usr/share/man \ --infodir=/usr/share/info \ --disable-all \ --without-pear \ --with-config-file-path=/etc \ --localstatedir=/var \ + --disable-rpath PHP_CFLAGS = $(TARGET_CFLAGS) -ifneq ($(BR2_PACKAGE_PHP_CLI),y) - PHP_CONF_OPT += --disable-cli -else - PHP_CONF_OPT += --enable-cli -endif - -ifneq ($(BR2_PACKAGE_PHP_CGI),y) - PHP_CONF_OPT += --disable-cgi -else - PHP_CONF_OPT += --enable-cgi - ifeq ($(BR2_PACKAGE_PHP_FASTCGI),y) - PHP_CONF_OPT += --enable-fastcgi - endif +# Workaround for non-IPv6 uClibc toolchain +ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y) +ifneq ($(BR2_INET_IPV6),y) + PHP_CFLAGS += -DHAVE_DEPRECATED_DNS_FUNCS endif - -### Extensions -ifeq ($(BR2_PACKAGE_PHP_EXT_SOCKETS),y) - PHP_CONF_OPT += --enable-sockets -endif - -ifeq ($(BR2_PACKAGE_PHP_EXT_POSIX),y) - PHP_CONF_OPT += --enable-posix endif -ifeq ($(BR2_PACKAGE_PHP_EXT_SPL),y) - PHP_CONF_OPT += --enable-spl -endif +PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_CLI),,--disable-cli) +PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_CGI),,--disable-cgi) -ifeq ($(BR2_PACKAGE_PHP_EXT_SESSION),y) - PHP_CONF_OPT += --enable-session -endif +### Extensions +PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_EXT_SOCKETS),--enable-sockets) \ + $(if $(BR2_PACKAGE_PHP_EXT_POSIX),--enable-posix) \ + $(if $(BR2_PACKAGE_PHP_EXT_SESSION),--enable-session) \ + $(if $(BR2_PACKAGE_PHP_EXT_HASH),--enable-hash) \ + $(if $(BR2_PACKAGE_PHP_EXT_DOM),--enable-dom) \ + $(if $(BR2_PACKAGE_PHP_EXT_SIMPLEXML),--enable-simplexml) \ + $(if $(BR2_PACKAGE_PHP_EXT_SOAP),--enable-soap) \ + $(if $(BR2_PACKAGE_PHP_EXT_WDDX),--enable-wddx) \ + $(if $(BR2_PACKAGE_PHP_EXT_XML),--enable-xml) \ + $(if $(BR2_PACKAGE_PHP_EXT_XMLREADER),--enable-xmlreader) \ + $(if $(BR2_PACKAGE_PHP_EXT_XMLWRITER),--enable-xmlwriter) \ + $(if $(BR2_PACKAGE_PHP_EXT_EXIF),--enable-exif) \ + $(if $(BR2_PACKAGE_PHP_EXT_FTP),--enable-ftp) \ + $(if $(BR2_PACKAGE_PHP_EXT_JSON),--enable-json) \ + $(if $(BR2_PACKAGE_PHP_EXT_TOKENIZER),--enable-tokenizer) \ + $(if $(BR2_PACKAGE_PHP_EXT_PCNTL),--enable-pcntl) \ + $(if $(BR2_PACKAGE_PHP_EXT_SHMOP),--enable-shmop) \ + $(if $(BR2_PACKAGE_PHP_EXT_SYSVMSG),--enable-sysvmsg) \ + $(if $(BR2_PACKAGE_PHP_EXT_SYSVSEM),--enable-sysvsem) \ + $(if $(BR2_PACKAGE_PHP_EXT_SYSVSHM),--enable-sysvshm) \ + $(if $(BR2_PACKAGE_PHP_EXT_ZIP),--enable-zip) \ + $(if $(BR2_PACKAGE_PHP_EXT_CTYPE),--enable-ctype) \ + $(if $(BR2_PACKAGE_PHP_EXT_FILTER),--enable-filter) \ + $(if $(BR2_PACKAGE_PHP_EXT_CALENDAR),--enable-calendar) \ + $(if $(BR2_PACKAGE_PHP_EXT_FILENIFO),--enable-fileinfo) \ + $(if $(BR2_PACKAGE_PHP_EXT_BCMATH),--enable-bcmath) ifeq ($(BR2_PACKAGE_PHP_EXT_OPENSSL),y) PHP_CONF_OPT += --with-openssl=$(STAGING_DIR)/usr @@ -58,16 +64,14 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_OPENSSL),y) endif ifeq ($(BR2_PACKAGE_PHP_EXT_LIBXML2),y) - PHP_CONF_OPT += --enable-libxml \ - --with-libxml-dir=${STAGING_DIR}/usr \ - --enable-xml \ - --enable-xmlreader \ - --enable-xmlwriter + PHP_CONF_OPT += --enable-libxml --with-libxml-dir=${STAGING_DIR}/usr PHP_DEPENDENCIES += libxml2 endif -ifeq ($(BR2_PACKAGE_PHP_EXT_SIMPLEXML),y) - PHP_CONF_OPT += --enable-simplexml +ifeq ($(BR2_PACKAGE_PHP_EXT_XMLRPC),y) + PHP_CONF_OPT += --with-xmlrpc \ + $(if $(BR2_PACKAGE_LIBICONV),--with-iconv-dir=$(STAGING_DIR)/usr) + PHP_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) endif ifneq ($(BR2_PACKAGE_PHP_EXT_ZLIB)$(BR2_PACKAGE_PHP_EXT_ZIP),) @@ -75,17 +79,23 @@ ifneq ($(BR2_PACKAGE_PHP_EXT_ZLIB)$(BR2_PACKAGE_PHP_EXT_ZIP),) PHP_DEPENDENCIES += zlib endif -ifeq ($(BR2_PACKAGE_PHP_EXT_EXIF),y) - PHP_CONF_OPT += --enable-exif +ifeq ($(BR2_PACKAGE_PHP_EXT_GETTEXT),y) + PHP_CONF_OPT += --with-gettext=$(STAGING_DIR)/usr + PHP_DEPENDENCIES += $(if $(BR2_NEEDS_GETTEXT),gettext) endif -ifeq ($(BR2_PACKAGE_PHP_EXT_FTP),y) - PHP_CONF_OPT += --enable-ftp +ifeq ($(BR2_PACKAGE_PHP_EXT_ICONV),y) +ifeq ($(BR2_PACKAGE_LIBICONV),y) + PHP_CONF_OPT += --with-iconv=$(STAGING_DIR)/usr + PHP_DEPENDENCIES += libiconv +else + PHP_CONF_OPT += --with-iconv +endif endif -ifeq ($(BR2_PACKAGE_PHP_EXT_GETTEXT),y) - PHP_CONF_OPT += --with-gettext=$(STAGING_DIR)/usr - PHP_DEPENDENCIES += $(if $(BR2_NEEDS_GETTEXT),gettext) +ifeq ($(BR2_PACKAGE_PHP_EXT_INTL),y) + PHP_CONF_OPT += --enable-intl --with-icu-dir=$(STAGING_DIR)/usr + PHP_DEPENDENCIES += icu endif ifeq ($(BR2_PACKAGE_PHP_EXT_GMP),y) @@ -93,52 +103,11 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_GMP),y) PHP_DEPENDENCIES += gmp endif -ifeq ($(BR2_PACKAGE_PHP_EXT_JSON),y) - PHP_CONF_OPT += --enable-json -endif - ifeq ($(BR2_PACKAGE_PHP_EXT_READLINE),y) PHP_CONF_OPT += --with-readline=$(STAGING_DIR)/usr PHP_DEPENDENCIES += readline endif -ifeq ($(BR2_PACKAGE_PHP_EXT_NCURSES),y) - PHP_CONF_OPT += --with-ncurses=$(STAGING_DIR)/usr - PHP_DEPENDENCIES += ncurses -endif - -ifeq ($(BR2_PACKAGE_PHP_EXT_PCNTL),y) - PHP_CONF_OPT += --enable-pcntl -endif - -ifeq ($(BR2_PACKAGE_PHP_EXT_SYSVMSG),y) - PHP_CONF_OPT += --enable-sysvmsg -endif - -ifeq ($(BR2_PACKAGE_PHP_EXT_SYSVSEM),y) - PHP_CONF_OPT += --enable-sysvsem -endif - -ifeq ($(BR2_PACKAGE_PHP_EXT_SYSVSHM),y) - PHP_CONF_OPT += --enable-sysvshm -endif - -ifeq ($(BR2_PACKAGE_PHP_EXT_ZIP),y) - PHP_CONF_OPT += --enable-zip -endif - -ifeq ($(BR2_PACKAGE_PHP_EXT_FILTER),y) - PHP_CONF_OPT += --enable-filter -endif - -ifeq ($(BR2_PACKAGE_PHP_EXT_CALENDAR),y) - PHP_CONF_OPT += --enable-calendar -endif - -ifeq ($(BR2_PACKAGE_PHP_EXT_PCRE),y) - PHP_CONF_OPT += --with-pcre-regex -endif - ### Legacy sqlite2 support ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE),y) PHP_CONF_OPT += --with-sqlite @@ -150,16 +119,22 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE_UTF8),y) endif endif +### Native MySQL extensions +ifeq ($(BR2_PACKAGE_PHP_EXT_MYSQL),y) + PHP_CONF_OPT += --with-mysql=$(STAGING_DIR)/usr + PHP_DEPENDENCIES += mysql_client +endif +ifeq ($(BR2_PACKAGE_PHP_EXT_MYSQLI),y) + PHP_CONF_OPT += --with-mysqli=$(STAGING_DIR)/usr/bin/mysql_config + PHP_DEPENDENCIES += mysql_client +endif + ### PDO ifeq ($(BR2_PACKAGE_PHP_EXT_PDO),y) PHP_CONF_OPT += --enable-pdo ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_SQLITE),y) -ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_SQLITE_EXTERNAL),y) PHP_CONF_OPT += --with-pdo-sqlite=$(STAGING_DIR)/usr PHP_DEPENDENCIES += sqlite -else - PHP_CONF_OPT += --with-pdo-sqlite -endif PHP_CFLAGS += -DSQLITE_OMIT_LOAD_EXTENSION ifneq ($(BR2_LARGEFILE),y) PHP_CFLAGS += -DSQLITE_DISABLE_LFS @@ -171,6 +146,50 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_MYSQL),y) endif endif +### Use external PCRE if it's available +ifeq ($(BR2_PACKAGE_PCRE),y) + PHP_CONF_OPT += --with-pcre-regex=$(STAGING_DIR)/usr + PHP_DEPENDENCIES += pcre +endif + +ifeq ($(BR2_PACKAGE_PHP_EXT_CURL),y) + PHP_CONF_OPT += --with-curl=$(STAGING_DIR)/usr + PHP_DEPENDENCIES += libcurl +endif + +ifeq ($(BR2_PACKAGE_PHP_EXT_XSL),y) + PHP_CONF_OPT += --with-xsl=$(STAGING_DIR)/usr + PHP_DEPENDENCIES += libxslt +endif + +ifeq ($(BR2_PACKAGE_PHP_EXT_BZIP2),y) + PHP_CONF_OPT += --with-bz2=$(STAGING_DIR)/usr + PHP_DEPENDENCIES += bzip2 +endif + +### DBA +ifeq ($(BR2_PACKAGE_PHP_EXT_DBA),y) + PHP_CONF_OPT += --enable-dba +ifneq ($(BR2_PACKAGE_PHP_EXT_DBA_CDB),y) + PHP_CONF_OPT += --without-cdb +endif +ifneq ($(BR2_PACKAGE_PHP_EXT_DBA_FLAT),y) + PHP_CONF_OPT += --without-flatfile +endif +ifneq ($(BR2_PACKAGE_PHP_EXT_DBA_INI),y) + PHP_CONF_OPT += --without-inifile +endif +ifeq ($(BR2_PACKAGE_PHP_EXT_DBA_DB4),y) + PHP_CONF_OPT += --with-db4=$(STAGING_DIR)/usr + PHP_DEPENDENCIES += berkeleydb +endif +endif + +ifeq ($(BR2_PACKAGE_PHP_EXT_SNMP),y) + PHP_CONF_OPT += --with-snmp=$(STAGING_DIR)/usr + PHP_DEPENDENCIES += netsnmp +endif + # Fixup prefix= and exec_prefix= in php-config define PHP_FIXUP_PHP_CONFIG $(SED) 's%^prefix="/usr"%prefix="$(STAGING_DIR)/usr"%' \ @@ -185,7 +204,9 @@ define PHP_INSTALL_FIXUP rm -f $(TARGET_DIR)/usr/bin/phpize rm -f $(TARGET_DIR)/usr/bin/php-config if [ ! -f $(TARGET_DIR)/etc/php.ini ]; then \ - $(INSTALL) -m 0755 $(BR2_PACKAGE_PHP_CONFIG) $(TARGET_DIR)/etc/php.ini; fi + $(INSTALL) -m 0755 $(PHP_DIR)/php.ini-production \ + $(TARGET_DIR)/etc/php.ini; \ + fi endef PHP_POST_INSTALL_TARGET_HOOKS += PHP_INSTALL_FIXUP diff --git a/package/python-id3/Config.in b/package/python-id3/Config.in new file mode 100644 index 000000000..829a65732 --- /dev/null +++ b/package/python-id3/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_ID3 + bool "python-id3" + depends on BR2_PACKAGE_PYTHON + help + This module allows one to read and manipulate so-called ID3 + informational tags on MP3 files through an object-oriented + Python interface. + + http://id3-py.sourceforge.net/ diff --git a/package/python-id3/python-id3.mk b/package/python-id3/python-id3.mk new file mode 100644 index 000000000..e1ed1b606 --- /dev/null +++ b/package/python-id3/python-id3.mk @@ -0,0 +1,21 @@ +############################################################# +# +# python-id3 +# +############################################################# + +PYTHON_ID3_VERSION = 1.2 +PYTHON_ID3_SOURCE = id3-py_$(PYTHON_ID3_VERSION).tar.gz +PYTHON_ID3_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/id3-py + +PYTHON_ID3_DEPENDENCIES = python + +define PYTHON_ID3_BUILD_CMDS + (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build) +endef + +define PYTHON_ID3_INSTALL_TARGET_CMDS + (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr) +endef + +$(eval $(call GENTARGETS)) diff --git a/package/quagga/Config.in b/package/quagga/Config.in index 9ca2f980e..5a01863ab 100644 --- a/package/quagga/Config.in +++ b/package/quagga/Config.in @@ -22,6 +22,11 @@ config BR2_PACKAGE_QUAGGA_TCP_ZEBRA You'll want this enabled if zebra and the protocol daemon(s) run on different hosts. +config BR2_PACKAGE_QUAGGA_BABELD + bool "BABEL protocol" + help + Build babeld daemon. + config BR2_PACKAGE_QUAGGA_BGPD bool "BPGv4+ protocol" help diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk index 107385283..349e0032c 100644 --- a/package/quagga/quagga.mk +++ b/package/quagga/quagga.mk @@ -4,86 +4,33 @@ # ############################################################# -QUAGGA_VERSION = 0.99.20.1 -QUAGGA_SITE = http://www.quagga.net/download +QUAGGA_VERSION = 0.99.21 +QUAGGA_SITE = http://download.savannah.gnu.org/releases/quagga QUAGGA_DEPENDENCIES = host-gawk QUAGGA_CONF_OPT = --program-transform-name='' --enable-netlink -ifeq ($(BR2_PACKAGE_QUAGGA_ZEBRA),y) -QUAGGA_CONF_OPT+=--enable-zebra -else -QUAGGA_CONF_OPT+=--disable-zebra -endif - -ifeq ($(BR2_PACKAGE_QUAGGA_BGPD),y) -QUAGGA_CONF_OPT+=--enable-bgpd -else -QUAGGA_CONF_OPT+=--disable-bgpd -endif - -ifeq ($(BR2_PACKAGE_QUAGGA_RIPD),y) -QUAGGA_CONF_OPT+=--enable-ripd -else -QUAGGA_CONF_OPT+=--disable-ripd -endif - -ifeq ($(BR2_PACKAGE_QUAGGA_RIPNGD),y) -QUAGGA_CONF_OPT+=--enable-ripngd -else -QUAGGA_CONF_OPT+=--disable-ripngd -endif - -ifeq ($(BR2_PACKAGE_QUAGGA_OSPFD),y) -QUAGGA_CONF_OPT+=--enable-ospfd -else -QUAGGA_CONF_OPT+=--disable-ospfd -endif - -ifeq ($(BR2_PACKAGE_QUAGGA_OSPF6D),y) -QUAGGA_CONF_OPT+=--enable-ospf6d -else -QUAGGA_CONF_OPT+=--disable-ospf6d -endif - -ifeq ($(BR2_PACKAGE_QUAGGA_WATCHQUAGGA),y) -QUAGGA_CONF_OPT+=--enable-watchquagga -else -QUAGGA_CONF_OPT+=--disable-watchquagga -endif - -ifeq ($(BR2_PACKAGE_QUAGGA_ISISD),y) -QUAGGA_CONF_OPT+=--enable-isisd -else -QUAGGA_CONF_OPT+=--disable-isisd -endif - -ifeq ($(BR2_PACKAGE_QUAGGA_BGP_ANNOUNCE),y) -QUAGGA_CONF_OPT+=--enable-bgp-announce -else -QUAGGA_CONF_OPT+=--disable-bgp-announce -endif +QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_ZEBRA),--enable-zebra,--disable-zebra) +QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_BABELD),--enable-babeld,--disable-babeld) +QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_BGPD),--enable-bgpd,--disable-bgpd) +QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_RIPD),--enable-ripd,--disable-ripd) +QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_RIPNGD),--enable-ripngd,--disable-ripngd) +QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_OSPFD),--enable-ospfd,--disable-ospfd) +QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_OSPF6D),--enable-ospf6d,--disable-ospf6d) +QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_WATCHQUAGGA),--enable-watchquagga,--disable-watchquagga) +QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_ISISD),--enable-isisd,--disable-isisd) +QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_BGP_ANNOUNCE),--enable-bgp-announce,--disable-bgp-announce) +QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_TCP_ZERBRA),--enable-tcp-zebra,--disable-tcp-zebra) +QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_OPAQUE_LSA),--enable-opaque-lsa,--disable-opaque-lsa) ifeq ($(BR2_PACKAGE_QUAGGA_SNMP),y) -QUAGGA_CONF_OPT+=--enable-snmp -QUAGGA_DEPENDENCIES+=netsnmp +QUAGGA_CONF_OPT += --enable-snmp +QUAGGA_DEPENDENCIES += netsnmp # SNMP support tries -lcrypto by default, disable it if we ain't got openssl ifneq ($(BR2_PACKAGE_OPENSSL),y) -QUAGGA_CONF_OPT+=--without-crypto -endif -else -QUAGGA_CONF_OPT+=--disable-snmp +QUAGGA_CONF_OPT +=--without-crypto endif - -ifeq ($(BR2_PACKAGE_QUAGGA_TCP_ZEBRA),y) -QUAGGA_CONF_OPT+=--enable-tcp-zebra -else -QUAGGA_CONF_OPT+=--disable-tcp-zebra -endif - -ifeq ($(BR2_PACKAGE_QUAGGA_OPAQUE_LSA),y) -QUAGGA_CONF_OPT+=--enable-opaque-lsa else -QUAGGA_CONF_OPT+=--disable-opaque-lsa +QUAGGA_CONF_OPT +=--disable-snmp endif $(eval $(call AUTOTARGETS)) diff --git a/package/rtorrent/Config.in b/package/rtorrent/Config.in new file mode 100644 index 000000000..142ff8b41 --- /dev/null +++ b/package/rtorrent/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_RTORRENT + bool "rtorrent" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_WCHAR + select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_LIBSIGC + select BR2_PACKAGE_LIBTORRENT + select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_OPENSSL + help + BitTorrent Client using libtorrent + + http://libtorrent.rakshasa.no/ + +comment "rtorrent requires a toolchain with C++ and WCHAR support" + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR) diff --git a/package/rtorrent/rtorrent-cross_compile.patch b/package/rtorrent/rtorrent-cross_compile.patch new file mode 100644 index 000000000..2be8d0607 --- /dev/null +++ b/package/rtorrent/rtorrent-cross_compile.patch @@ -0,0 +1,27 @@ +Fix cross compilation, based on OpenWRT patch. + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> + +diff -Nura rtorrent-0.9.2/configure.ac rtorrent-0.9.2-cross/configure.ac +--- rtorrent-0.9.2/configure.ac 2012-04-20 03:55:30.000000000 -0300 ++++ rtorrent-0.9.2-cross/configure.ac 2012-05-09 11:06:49.436474039 -0300 +@@ -4,7 +4,6 @@ + + AM_INIT_AUTOMAKE + AM_CONFIG_HEADER(config.h) +-AM_PATH_CPPUNIT(1.9.6) + + AC_PROG_CXX + AC_PROG_LIBTOOL +diff -Nura rtorrent-0.9.2/scripts/common.m4 rtorrent-0.9.2-cross/scripts/common.m4 +--- rtorrent-0.9.2/scripts/common.m4 2012-03-13 09:10:49.000000000 -0300 ++++ rtorrent-0.9.2-cross/scripts/common.m4 2012-05-09 11:05:56.620102678 -0300 +@@ -223,7 +223,7 @@ + AC_DEFUN([TORRENT_CHECK_EXECINFO], [ + AC_MSG_CHECKING(for execinfo.h) + +- AC_RUN_IFELSE([AC_LANG_SOURCE([ ++ AC_LINK_IFELSE([AC_LANG_SOURCE([ + #include <execinfo.h> + int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} + ])], diff --git a/package/rtorrent/rtorrent.mk b/package/rtorrent/rtorrent.mk new file mode 100644 index 000000000..f60bd4072 --- /dev/null +++ b/package/rtorrent/rtorrent.mk @@ -0,0 +1,12 @@ +############################################################# +# +# rtorrent +# +############################################################# + +RTORRENT_VERSION = 0.9.2 +RTORRENT_SITE = http://libtorrent.rakshasa.no/downloads +RTORRENT_DEPENDENCIES = host-pkg-config libcurl libsigc libtorrent ncurses +RTORRENT_AUTORECONF = YES + +$(eval $(call AUTOTARGETS)) diff --git a/package/samba/Config.in b/package/samba/Config.in index a5a5c295f..cebf7d939 100644 --- a/package/samba/Config.in +++ b/package/samba/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_SAMBA bool "samba" - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + select BR2_PACKAGE_POPT help Provides print services to all manner of SMB/CIFS clients, including the numerous versions of Microsoft Windows @@ -11,20 +11,23 @@ config BR2_PACKAGE_SAMBA NOTE: A complete Samba install takes over 50MB of space, so choose only the components you need. -menu "Samba tools selection" - depends on BR2_PACKAGE_SAMBA +if BR2_PACKAGE_SAMBA -config BR2_PACKAGE_SAMBA_CIFS - bool "cifs" - default y - depends on BR2_PACKAGE_SAMBA +config BR2_PACKAGE_SAMBA_LIBICONV + bool "extended encodings (libiconv)" + depends on !BR2_ENABLE_LOCALE + select BR2_PACKAGE_LIBICONV help - Support CIFS + Include libiconv support for extended conversion of filename + enconding. Samba has built-in support for UTF-8, ISO-8859-1 + and ASCII, so this is only required if you want to support + other encodings. + +menu "Samba tools selection" config BR2_PACKAGE_SAMBA_EVENTLOGADM bool "eventlogadm" default y - depends on BR2_PACKAGE_SAMBA help Write Eventlog records to a tdb or perform other eventlog functions @@ -43,14 +46,12 @@ comment "findsmb - disabled (requires nmblookup, smbclient and perl)" config BR2_PACKAGE_SAMBA_NET bool "net" default y - depends on BR2_PACKAGE_SAMBA help Distributed SMB/CIFS Server Management Utility config BR2_PACKAGE_SAMBA_NMBD bool "nmbd" default y - depends on BR2_PACKAGE_SAMBA help NetBIOS name server to provide NetBIOS over IP naming services to clients @@ -58,7 +59,6 @@ config BR2_PACKAGE_SAMBA_NMBD config BR2_PACKAGE_SAMBA_NMBLOOKUP bool "nmblookup" default y - depends on BR2_PACKAGE_SAMBA help Query NetBIOS names and map them to IP addresses in a network using NetBIOS over TCP/IP queries @@ -66,21 +66,18 @@ config BR2_PACKAGE_SAMBA_NMBLOOKUP config BR2_PACKAGE_SAMBA_NTLM_AUTH bool "ntlm_auth" default y - depends on BR2_PACKAGE_SAMBA help Helper utility that authenticates users using NT/LM authentication config BR2_PACKAGE_SAMBA_PDBEDIT bool "pdbedit" default y - depends on BR2_PACKAGE_SAMBA help Manage the SAM database (Database of Samba Users) config BR2_PACKAGE_SAMBA_PROFILES bool "profiles" default y - depends on BR2_PACKAGE_SAMBA help Utility that reports and changes SIDs in Windows NT registry files @@ -88,7 +85,6 @@ config BR2_PACKAGE_SAMBA_RPCCLIENT bool "rpcclient" select BR2_PACKAGE_READLINE default y - depends on BR2_PACKAGE_SAMBA help Tool for executing client side MS-RPC functions using RPC calls from a UNIX workstation. @@ -96,7 +92,6 @@ config BR2_PACKAGE_SAMBA_RPCCLIENT config BR2_PACKAGE_SAMBA_SMBCACLS bool "smbcacls" default y - depends on BR2_PACKAGE_SAMBA help Set or get ACLs on an NT file or directory names @@ -104,84 +99,72 @@ config BR2_PACKAGE_SAMBA_SMBCLIENT bool "smbclient" select BR2_PACKAGE_READLINE default y - depends on BR2_PACKAGE_SAMBA help ftp-like client to access SMB/CIFS resources on servers config BR2_PACKAGE_SAMBA_SMBCONTROL bool "smbcontrol" default y - depends on BR2_PACKAGE_SAMBA help Send messages to smbd, nmbd or winbindd processes config BR2_PACKAGE_SAMBA_SMBCQUOTAS bool "smbcquotas" default y - depends on BR2_PACKAGE_SAMBA help Set or get QUOTAs of NTFS 5 shares config BR2_PACKAGE_SAMBA_SMBD bool "smbd" default y - depends on BR2_PACKAGE_SAMBA help The server daemon that provides filesharing and printing services config BR2_PACKAGE_SAMBA_SMBGET bool "smbget" default y - depends on BR2_PACKAGE_SAMBA help wget-like utility for download files over SMB config BR2_PACKAGE_SAMBA_SMBLDBTOOLS bool "smbldbtools" default y - depends on BR2_PACKAGE_SAMBA help ldbadd ldbdel ldbedit ldbmodify ldbrename ldbsearch tools config BR2_PACKAGE_SAMBA_SMBPASSWD bool "smbpasswd" default y - depends on BR2_PACKAGE_SAMBA help Change a user's SMB passwd config BR2_PACKAGE_SAMBA_SMBSHARESEC bool "smbsharesec" default y - depends on BR2_PACKAGE_SAMBA help Manipulate share permissions on SMB file shares config BR2_PACKAGE_SAMBA_SMBSPOOL bool "smbspool" default y - depends on BR2_PACKAGE_SAMBA help Send a print file to an SMB printer config BR2_PACKAGE_SAMBA_SMBSTATUS bool "smbstatus" default y - depends on BR2_PACKAGE_SAMBA help Report on current Samba connections config BR2_PACKAGE_SAMBA_SMBTREE bool "smbtree" default y - depends on BR2_PACKAGE_SAMBA help A text based smb network browser config BR2_PACKAGE_SAMBA_SWAT bool "swat" default y - depends on BR2_PACKAGE_SAMBA help Samba Web Administration Tool @@ -198,21 +181,18 @@ comment "smbtar - disabled (requires smbclient)" config BR2_PACKAGE_SAMBA_TDB bool "tdb" default y - depends on BR2_PACKAGE_SAMBA help Tools to operate on the .tdb database files config BR2_PACKAGE_SAMBA_TESTPARM bool "testparm" default y - depends on BR2_PACKAGE_SAMBA help Check an smb.conf configuration file for internal correctness config BR2_PACKAGE_SAMBA_WINBINDD bool "winbindd" default y - depends on BR2_PACKAGE_SAMBA help Name Service Switch daemon for resolving names from NT servers @@ -227,11 +207,9 @@ endmenu menu "Samba libraries selection" - depends on BR2_PACKAGE_SAMBA config BR2_PACKAGE_SAMBA_LIBSMBCLIENT bool "libsmbclient" - depends on BR2_PACKAGE_SAMBA help libsmbclient is a library toolset that permits applications to manipulate CIFS/SMB network resources using many of the @@ -242,12 +220,10 @@ endmenu menu "Samba support selection" - depends on BR2_PACKAGE_SAMBA config BR2_PACKAGE_SAMBA_AVAHI bool "support avahi" default y - depends on BR2_PACKAGE_SAMBA depends on BR2_PACKAGE_AVAHI_DAEMON select BR2_PACKAGE_DBUS help @@ -259,7 +235,6 @@ comment "support avahi - disabled (requires avahi-daemon)" config BR2_PACKAGE_SAMBA_GAMIN bool "support gamin" default y - depends on BR2_PACKAGE_SAMBA depends on BR2_PACKAGE_GAMIN help Include support for gamin @@ -269,3 +244,4 @@ comment "support gamin - disabled (requires gamin)" endmenu +endif diff --git a/package/samba/samba-fix-mount.cifs.patch b/package/samba/samba-fix-mount.cifs.patch deleted file mode 100644 index 9c235ea7b..000000000 --- a/package/samba/samba-fix-mount.cifs.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/client/mount.cifs.c 2011-09-13 10:26:21.000000000 +0200 -+++ b/client/mount.cifs.c 2011-09-13 10:27:16.000000000 +0200 -@@ -39,7 +39,6 @@ - #include <mntent.h> - #include <fcntl.h> - #include <limits.h> --#include <fstab.h> - #include "mount.h" - - #define MOUNT_CIFS_VERSION_MAJOR "1" -@@ -255,6 +254,10 @@ - return 0; - } - #else /* CIFS_LEGACY_SETUID_CHECK */ -+ -+#ifndef _PATH_FSTAB -+#define _PATH_FSTAB "/etc/fstab" -+#endif - static int - check_fstab(const char *progname, char *mountpoint, char *devname, - char **options) diff --git a/package/samba/samba-getaddrinfo.patch b/package/samba/samba-getaddrinfo.patch new file mode 100644 index 000000000..af0129900 --- /dev/null +++ b/package/samba/samba-getaddrinfo.patch @@ -0,0 +1,19 @@ +Patch from OpenWRT. +Don't check for buggy getaddrinfo() assume it's safe if it's present. + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> + +--- a/source3/configure ++++ b/source3/configure +@@ -13285,10 +13285,7 @@ if test x"$libreplace_cv_HAVE_GETADDRINF + # see bug 5910, use our replacements if we detect + # a broken system. + if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } ++ $as_echo "assuming valid getaddrinfo without bug 5910" >&2 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ diff --git a/package/samba/samba-remove-legacy-index.patch b/package/samba/samba-remove-legacy-index.patch deleted file mode 100644 index 855bca77c..000000000 --- a/package/samba/samba-remove-legacy-index.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/source3/registry/reg_perfcount.c -+++ b/source3/registry/reg_perfcount.c -@@ -616,14 +616,14 @@ static bool _reg_perfcount_add_counter(P - obj = NULL; - memset(buf, 0, PERFCOUNT_MAX_LEN); - memcpy(buf, data.dptr, data.dsize); -- begin = index(buf, '['); -- end = index(buf, ']'); -+ begin = strchr(buf, '['); -+ end = strchr(buf, ']'); - if(begin == NULL || end == NULL) - return False; - start = begin+1; - - while(start < end) { -- stop = index(start, ','); -+ stop = strchr(start, ','); - if(stop == NULL) - stop = end; - *stop = '\0'; diff --git a/package/samba/samba.mk b/package/samba/samba.mk index 120369376..d7a15b3f2 100644 --- a/package/samba/samba.mk +++ b/package/samba/samba.mk @@ -4,21 +4,19 @@ # ############################################################# -SAMBA_VERSION = 3.5.15 +SAMBA_VERSION = 3.6.5 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable SAMBA_SUBDIR = source3 SAMBA_INSTALL_STAGING = YES - -SAMBA_DEPENDENCIES = \ - $(if $(BR2_ENABLE_LOCALE),,libiconv) \ +SAMBA_DEPENDENCIES = popt \ $(if $(BR2_PACKAGE_SAMBA_RPCCLIENT),readline) \ $(if $(BR2_PACKAGE_SAMBA_SMBCLIENT),readline) \ $(if $(BR2_PACKAGE_SAMBA_AVAHI),avahi) \ $(if $(BR2_PACKAGE_SAMBA_GAMIN),gamin) - SAMBA_CONF_ENV = \ + ac_cv_file__proc_sys_kernel_core_pattern=yes \ samba_cv_HAVE_GETTIMEOFDAY_TZ=yes \ samba_cv_USE_SETREUID=yes \ samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes \ @@ -31,7 +29,6 @@ SAMBA_CONF_ENV = \ libreplace_cv_HAVE_IPV6=$(if $(BR2_INET_IPV6),yes,no) \ $(if $(BR2_PACKAGE_SAMBA_AVAHI),AVAHI_LIBS=-pthread) - SAMBA_CONF_OPT = \ --localstatedir=/var \ --with-piddir=/var/run \ @@ -51,49 +48,38 @@ SAMBA_CONF_OPT = \ $(if $(BR2_PACKAGE_SAMBA_SWAT),--enable-swat,--disable-swat) \ \ --without-cluster-support \ - --without-cifsupcall \ + --without-dnsupdate \ + $(if $(BR2_INET_RPC),--with-sys-quotas,--without-sys-quotas) \ --without-ads \ --without-ldap \ - --with-included-popt \ --with-included-iniparser \ - --with-libiconv=$(STAGING_DIR) \ \ - $(if $(BR2_PACKAGE_SAMBA_CIFS),--with-cifsmount,--without-cifsmount) \ $(if $(BR2_PACKAGE_SAMBA_RPCCLIENT),--with-readline=$(STAGING_DIR)) \ $(if $(BR2_PACKAGE_SAMBA_SMBCLIENT),--with-readline=$(STAGING_DIR)) \ $(if $(BR2_PACKAGE_SAMBA_WINBINDD),--with-winbind,--without-winbind) - SAMBA_INSTALL_TARGET_OPT = \ DESTDIR=$(TARGET_DIR) -C $(SAMBA_DIR)/$(SAMBA_SUBDIR) \ installlibs installservers installbin installscripts \ - $(if $(BR2_PACKAGE_SAMBA_CIFS),installcifsmount) \ $(if $(BR2_PACKAGE_SAMBA_SWAT),installswat) - SAMBA_UNINSTALL_TARGET_OPT = \ DESTDIR=$(TARGET_DIR) -C $(SAMBA_DIR)/$(SAMBA_SUBDIR) \ uninstalllibs uninstallservers uninstallbin uninstallscripts \ - $(if $(BR2_PACKAGE_SAMBA_CIFS),uninstallcifsmount) \ $(if $(BR2_PACKAGE_SAMBA_SWAT),uninstallswat) - # binaries to keep SAMBA_BINTARGETS_y = \ usr/sbin/smbd \ usr/lib/libtalloc.so \ usr/lib/libtdb.so - # binaries to remove SAMBA_BINTARGETS_ = \ usr/lib/libnetapi.so* \ usr/lib/libsmbsharemodes.so* - # binaries to keep or remove -SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_CIFS) += usr/sbin/mount.cifs -SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_CIFS) += usr/sbin/umount.cifs SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_EVENTLOGADM) += usr/bin/eventlogadm SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_NET) += usr/bin/net SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_NMBD) += usr/sbin/nmbd @@ -131,7 +117,6 @@ SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_WBINFO) += usr/bin/wbinfo SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_WINBINDD) += usr/lib/libwbclient.so* SAMBA_BINTARGETS_$(BR2_PACKAGE_SAMBA_LIBSMBCLIENT) += usr/lib/libsmbclient.so* - # non-binaries to remove SAMBA_TXTTARGETS_ = \ usr/include/libsmbclient.h \ @@ -141,7 +126,6 @@ SAMBA_TXTTARGETS_ = \ usr/include/tdb.h \ usr/include/wbclient.h - # non-binaries to keep or remove SAMBA_TXTTARGETS_$(BR2_PACKAGE_SAMBA_FINDSMB) += usr/bin/findsmb SAMBA_TXTTARGETS_$(BR2_PACKAGE_SAMBA_SMBTAR) += usr/bin/smbtar @@ -163,6 +147,14 @@ define SAMBA_REMOVE_SWAT_DOCUMENTATION rm -rf $(TARGET_DIR)/usr/swat/help/welcome.html endef +# --with-libiconv="" is to avoid detecting host libiconv and build failure +ifeq ($(BR2_PACKAGE_SAMBA_LIBICONV),y) +SAMBA_DEPENDENCIES += libiconv +SAMBA_CONF_OPT += --with-libiconv=$(STAGING_DIR) +else +SAMBA_CONF_OPT += --with-libiconv="" +endif + ifeq ($(BR2_PACKAGE_SAMBA_SWAT),y) ifneq ($(BR2_HAVE_DOCUMENTATION),y) SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_REMOVE_SWAT_DOCUMENTATION diff --git a/package/speex/speex.mk b/package/speex/speex.mk index c9d9ed3ef..2d8a255d2 100644 --- a/package/speex/speex.mk +++ b/package/speex/speex.mk @@ -3,9 +3,8 @@ # speex # ############################################################# -SPEEX_VERSION=1.2rc1 -SPEEX_SOURCE=speex-$(SPEEX_VERSION).tar.gz -SPEEX_SITE=http://downloads.us.xiph.org/releases/speex +SPEEX_VERSION = 1.2rc1 +SPEEX_SITE = http://downloads.us.xiph.org/releases/speex SPEEX_INSTALL_STAGING = YES SPEEX_DEPENDENCIES = libogg SPEEX_CONF_OPT = --with-ogg-libraries=$(STAGING_DIR)/usr/lib \ diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 2065ce12b..165b99167 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,7 +4,7 @@ # ############################################################# -SQLITE_VERSION = 3071100 +SQLITE_VERSION = 3071200 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz SQLITE_SITE = http://www.sqlite.org SQLITE_INSTALL_STAGING = YES diff --git a/package/sudo/sudo-1.8.4p4-utmpx.patch b/package/sudo/sudo-1.8.4p4-utmpx.patch deleted file mode 100644 index 4e9740608..000000000 --- a/package/sudo/sudo-1.8.4p4-utmpx.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix incomplete setutxent/endutxent defines for when there's no utmpx -Upstream bug #551 - -Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> - -diff -Nura sudo-1.8.4p4.orig/src/utmp.c sudo-1.8.4p4/src/utmp.c ---- sudo-1.8.4p4.orig/src/utmp.c 2012-03-30 07:10:38.381706315 -0300 -+++ sudo-1.8.4p4/src/utmp.c 2012-03-30 07:10:52.605802501 -0300 -@@ -63,8 +63,8 @@ - #if !defined(HAVE_GETUTXID) && defined(HAVE_GETUTID) - # define getutxline(u) getutline(u) - # define pututxline(u) pututline(u) --# define setutxent setutent(u) --# define endutxent endutent(u) -+# define setutxent(u) setutent(u) -+# define endutxent(u) endutent(u) - #endif /* !HAVE_GETUTXID && HAVE_GETUTID */ - - #ifdef HAVE_GETUTXID diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 71d7a20a7..3629ad188 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -4,7 +4,7 @@ # ############################################################# -SUDO_VERSION = 1.8.4p4 +SUDO_VERSION = 1.8.5p1 SUDO_SITE = http://www.sudo.ws/sudo/dist SUDO_CONF_OPT = \ --without-lecture \ diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 717bdccf4..696a3a721 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -6,6 +6,7 @@ SYSTEMD_VERSION = 44 SYSTEMD_SITE = http://www.freedesktop.org/software/systemd/ SYSTEMD_SOURCE = systemd-$(SYSTEMD_VERSION).tar.xz +SYSTEMD_INSTALL_STAGING = YES SYSTEMD_DEPENDENCIES = \ host-intltool \ libcap \ diff --git a/package/webrtc-audio-processing/Config.in b/package/webrtc-audio-processing/Config.in new file mode 100644 index 000000000..e33fc57db --- /dev/null +++ b/package/webrtc-audio-processing/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING + bool "webrtc-audio-processing" + depends on BR2_INSTALL_LIBSTDCPP + help + AudioProcessing library based on Google's implementation of + WebRTC. + + http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/ + +comment "webrtc-audio-processing requires a toolchain with C++ support enabled" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/webrtc-audio-processing/webrtc-audio-processing.mk b/package/webrtc-audio-processing/webrtc-audio-processing.mk new file mode 100644 index 000000000..22ade1a77 --- /dev/null +++ b/package/webrtc-audio-processing/webrtc-audio-processing.mk @@ -0,0 +1,10 @@ +WEBRTC_AUDIO_PROCESSING_VERSION = 0.1 +WEBRTC_AUDIO_PROCESSING_SOURCE = webrtc-audio-processing-$(WEBRTC_AUDIO_PROCESSING_VERSION).tar.xz +WEBRTC_AUDIO_PROCESSING_SITE = http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/ +WEBRTC_AUDIO_PROCESSING_INSTALL_STAGING = YES + +ifeq ($(BR2_SOFT_FLOAT),y) +WEBRTC_AUDIO_PROCESSING_CONF_OPT += --with-ns-mode=fixed +endif + +$(eval $(call AUTOTARGETS)) diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in index 8ac2576f8..d7cefe3cb 100644 --- a/package/wpa_supplicant/Config.in +++ b/package/wpa_supplicant/Config.in @@ -5,27 +5,25 @@ config BR2_PACKAGE_WPA_SUPPLICANT http://hostap.epitest.fi/wpa_supplicant/ +if BR2_PACKAGE_WPA_SUPPLICANT + config BR2_PACKAGE_WPA_SUPPLICANT_EAP bool "Enable EAP" - depends on BR2_PACKAGE_WPA_SUPPLICANT help Enable support for EAP. config BR2_PACKAGE_WPA_SUPPLICANT_CLI bool "Install wpa_cli binary" - depends on BR2_PACKAGE_WPA_SUPPLICANT help Install wpa_cli command line utility config BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE bool "Install wpa_passphrase binary" - depends on BR2_PACKAGE_WPA_SUPPLICANT help Install wpa_passphrase command line utility config BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT bool "Enable support for soft AP" - depends on BR2_PACKAGE_WPA_SUPPLICANT help With this option enabled, wpa_supplicant can act as access point. This can be used for open and WPA2-Personal networks @@ -34,6 +32,7 @@ config BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT config BR2_PACKAGE_WPA_SUPPLICANT_WPS bool "Enable support for WPS" - depends on BR2_PACKAGE_WPA_SUPPLICANT help Enable support for Wi-Fi Protected Setup (WPS) + +endif diff --git a/package/wpa_supplicant/wpa_supplicant-0.7.3-dbus-emit-property.patch b/package/wpa_supplicant/wpa_supplicant-0.7.3-dbus-emit-property.patch deleted file mode 100644 index 4c5002003..000000000 --- a/package/wpa_supplicant/wpa_supplicant-0.7.3-dbus-emit-property.patch +++ /dev/null @@ -1,61 +0,0 @@ -From b80b5639935d37b95d00f86b57f2844a9c775f57 Mon Sep 17 00:00:00 2001 -From: Dan Williams <dcbw@redhat.com> -Date: Fri, 17 Dec 2010 15:56:01 +0200 -Subject: [PATCH] dbus: Emit property changed events when adding/removing BSSes - -The supplicant was not emitting property changed events when the BSSs -property changed. - -Signed-off-by: Dan Williams <dcbw@redhat.com> -(cherry picked from commit 1e6288df6b07a353a9246b77e0de2a840b5f2c72) ---- - wpa_supplicant/dbus/dbus_new.c | 6 ++++++ - wpa_supplicant/dbus/dbus_new.h | 1 + - 2 files changed, 7 insertions(+), 0 deletions(-) - -diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c -index bdfbbac..c66640a 100644 ---- a/wpa_supplicant/dbus/dbus_new.c -+++ b/wpa_supplicant/dbus/dbus_new.c -@@ -691,6 +691,10 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s, - wpas_dbus_getter_current_network; - prop = "CurrentNetwork"; - break; -+ case WPAS_DBUS_PROP_BSSS: -+ getter = (WPADBusPropertyAccessor) wpas_dbus_getter_bsss; -+ prop = "BSSs"; -+ break; - default: - wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d", - __func__, property); -@@ -1199,6 +1203,7 @@ int wpas_dbus_unregister_bss(struct wpa_supplicant *wpa_s, - } - - wpas_dbus_signal_bss_removed(wpa_s, bss_obj_path); -+ wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS); - - return 0; - } -@@ -1263,6 +1268,7 @@ int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s, - } - - wpas_dbus_signal_bss_added(wpa_s, bss_obj_path); -+ wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS); - - return 0; - -diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h -index 80ea98c..9cdefcb 100644 ---- a/wpa_supplicant/dbus/dbus_new.h -+++ b/wpa_supplicant/dbus/dbus_new.h -@@ -30,6 +30,7 @@ enum wpas_dbus_prop { - WPAS_DBUS_PROP_STATE, - WPAS_DBUS_PROP_CURRENT_BSS, - WPAS_DBUS_PROP_CURRENT_NETWORK, -+ WPAS_DBUS_PROP_BSSS, - }; - - enum wpas_dbus_bss_prop { --- -1.7.4-rc1 - diff --git a/package/wpa_supplicant/wpa_supplicant-0.7.3-ht40-secondary.patch b/package/wpa_supplicant/wpa_supplicant-0.7.3-ht40-secondary.patch deleted file mode 100644 index 7664f0360..000000000 --- a/package/wpa_supplicant/wpa_supplicant-0.7.3-ht40-secondary.patch +++ /dev/null @@ -1,52 +0,0 @@ -From dea50507861b79f522c70500fe978072f143af8f Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <jouni.malinen@atheros.com> -Date: Fri, 12 Nov 2010 18:31:56 +0200 -Subject: [PATCH] AP: Verify that HT40 secondary channel is supported - -Refuse to enable HT40 mode AP unless both the primary and secondary -channels are enabled for AP use. -(cherry picked from commit 8ea3dd21d2e8b760612af0c7b6a3bb5b89ba7304) ---- - src/ap/hw_features.c | 26 ++++++++++++++++++++++++++ - 1 files changed, 26 insertions(+), 0 deletions(-) - -diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c -index 0159c72..7fc5b83 100644 ---- a/src/ap/hw_features.c -+++ b/src/ap/hw_features.c -@@ -642,6 +642,32 @@ int hostapd_select_hw_mode(struct hostapd_iface *iface) - break; - } - } -+ if (ok && iface->conf->secondary_channel) { -+ int sec_ok = 0; -+ int sec_chan = iface->conf->channel + -+ iface->conf->secondary_channel * 4; -+ for (j = 0; j < iface->current_mode->num_channels; j++) { -+ struct hostapd_channel_data *chan = -+ &iface->current_mode->channels[j]; -+ if (!(chan->flag & HOSTAPD_CHAN_DISABLED) && -+ (chan->chan == sec_chan)) { -+ sec_ok = 1; -+ break; -+ } -+ } -+ if (!sec_ok) { -+ hostapd_logger(iface->bss[0], NULL, -+ HOSTAPD_MODULE_IEEE80211, -+ HOSTAPD_LEVEL_WARNING, -+ "Configured HT40 secondary channel " -+ "(%d) not found from the channel list " -+ "of current mode (%d) %s", -+ sec_chan, iface->current_mode->mode, -+ hostapd_hw_mode_txt( -+ iface->current_mode->mode)); -+ ok = 0; -+ } -+ } - if (iface->conf->channel == 0) { - /* TODO: could request a scan of neighboring BSSes and select - * the channel automatically */ --- -1.7.4-rc1 - diff --git a/package/wpa_supplicant/wpa_supplicant-0.7.3-libnl-3.patch b/package/wpa_supplicant/wpa_supplicant-0.7.3-libnl-3.patch deleted file mode 100644 index a460c2aba..000000000 --- a/package/wpa_supplicant/wpa_supplicant-0.7.3-libnl-3.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/drivers/drivers.mak 2011-11-29 19:19:56.684221050 +0100 -+++ b/src/drivers/drivers.mak 2011-11-29 19:20:12.199609246 +0100 -@@ -31,10 +31,10 @@ - NEED_AP_MLME=y - NEED_NETLINK=y - NEED_LINUX_IOCTL=y --DRV_LIBS += -lnl -+DRV_LIBS += -lnl-3 - - ifdef CONFIG_LIBNL20 --DRV_LIBS += -lnl-genl -+DRV_LIBS += -lnl-genl-3 - DRV_CFLAGS += -DCONFIG_LIBNL20 - endif - endif diff --git a/package/wpa_supplicant/wpa_supplicant-0.7.3-nl80211-cipher-suites.patch b/package/wpa_supplicant/wpa_supplicant-0.7.3-nl80211-cipher-suites.patch deleted file mode 100644 index 231498e99..000000000 --- a/package/wpa_supplicant/wpa_supplicant-0.7.3-nl80211-cipher-suites.patch +++ /dev/null @@ -1,89 +0,0 @@ -From d0f3f451f0002339ad75b43e79f1322f2e2e4ed1 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <jouni.malinen@atheros.com> -Date: Mon, 13 Dec 2010 21:08:53 +0200 -Subject: [PATCH] nl80211: Set cipher suites when using user space SME - -Previously, pairwise and group cipher suites were configured only -when kernel SME (nl80211 connect API) was used. However, mac80211 -needs this information even in the user space SME case for one -thing: to disable HT when TKIP/WEP is used. Add -NL80211_ATTR_CIPHER_SUITES_PAIRWISE to fix this special case with -user space SME. This allows mac80211 to disable HT properly when -the AP is configured with configuration that is not allowed. -(cherry picked from commit aca016054885c17d58c41888698761f2e1ce2b39) ---- - src/drivers/driver_nl80211.c | 44 ++++++++++++++++++++++++++++++++++++++++++ - wpa_supplicant/sme.c | 2 + - 2 files changed, 46 insertions(+), 0 deletions(-) - -diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c -index 364158c..fb75c2e 100644 ---- a/src/drivers/driver_nl80211.c -+++ b/src/drivers/driver_nl80211.c -@@ -3940,6 +3940,50 @@ static int wpa_driver_nl80211_associate( - NLA_PUT(msg, NL80211_ATTR_IE, params->wpa_ie_len, - params->wpa_ie); - -+ if (params->pairwise_suite != CIPHER_NONE) { -+ int cipher; -+ -+ switch (params->pairwise_suite) { -+ case CIPHER_WEP40: -+ cipher = WLAN_CIPHER_SUITE_WEP40; -+ break; -+ case CIPHER_WEP104: -+ cipher = WLAN_CIPHER_SUITE_WEP104; -+ break; -+ case CIPHER_CCMP: -+ cipher = WLAN_CIPHER_SUITE_CCMP; -+ break; -+ case CIPHER_TKIP: -+ default: -+ cipher = WLAN_CIPHER_SUITE_TKIP; -+ break; -+ } -+ wpa_printf(MSG_DEBUG, " * pairwise=0x%x\n", cipher); -+ NLA_PUT_U32(msg, NL80211_ATTR_CIPHER_SUITES_PAIRWISE, cipher); -+ } -+ -+ if (params->group_suite != CIPHER_NONE) { -+ int cipher; -+ -+ switch (params->group_suite) { -+ case CIPHER_WEP40: -+ cipher = WLAN_CIPHER_SUITE_WEP40; -+ break; -+ case CIPHER_WEP104: -+ cipher = WLAN_CIPHER_SUITE_WEP104; -+ break; -+ case CIPHER_CCMP: -+ cipher = WLAN_CIPHER_SUITE_CCMP; -+ break; -+ case CIPHER_TKIP: -+ default: -+ cipher = WLAN_CIPHER_SUITE_TKIP; -+ break; -+ } -+ wpa_printf(MSG_DEBUG, " * group=0x%x\n", cipher); -+ NLA_PUT_U32(msg, NL80211_ATTR_CIPHER_SUITE_GROUP, cipher); -+ } -+ - #ifdef CONFIG_IEEE80211W - if (params->mgmt_frame_protection == MGMT_FRAME_PROTECTION_REQUIRED) - NLA_PUT_U32(msg, NL80211_ATTR_USE_MFP, NL80211_MFP_REQUIRED); -diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c -index 5604e97..878bbf0 100644 ---- a/wpa_supplicant/sme.c -+++ b/wpa_supplicant/sme.c -@@ -333,6 +333,8 @@ void sme_associate(struct wpa_supplicant *wpa_s, enum wpas_mode mode, - params.wpa_ie = wpa_s->sme.assoc_req_ie_len ? - wpa_s->sme.assoc_req_ie : NULL; - params.wpa_ie_len = wpa_s->sme.assoc_req_ie_len; -+ params.pairwise_suite = cipher_suite2driver(wpa_s->pairwise_cipher); -+ params.group_suite = cipher_suite2driver(wpa_s->group_cipher); - #ifdef CONFIG_IEEE80211R - if (auth_type == WLAN_AUTH_FT && wpa_s->sme.ft_ies) { - params.wpa_ie = wpa_s->sme.ft_ies; --- -1.7.4-rc1 - diff --git a/package/wpa_supplicant/wpa_supplicant.conf b/package/wpa_supplicant/wpa_supplicant.conf index 1994a6c73..1994a6c73 100755..100644 --- a/package/wpa_supplicant/wpa_supplicant.conf +++ b/package/wpa_supplicant/wpa_supplicant.conf diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index 4a1baeaaa..5ca6de500 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -4,60 +4,77 @@ # ############################################################# -WPA_SUPPLICANT_VERSION = 0.7.3 +WPA_SUPPLICANT_VERSION = 1.0 WPA_SUPPLICANT_SITE = http://hostap.epitest.fi/releases WPA_SUPPLICANT_CONFIG = $(WPA_SUPPLICANT_DIR)/wpa_supplicant/.config WPA_SUPPLICANT_SUBDIR = wpa_supplicant -WPA_SUPPLICANT_TARGET_BINS = wpa_cli wpa_supplicant wpa_passphrase WPA_SUPPLICANT_DBUS_SERVICE = fi.epitest.hostap.WPASupplicant +WPA_SUPPLICANT_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/ +WPA_SUPPLICANT_LDFLAGS = $(TARGET_LDFLAGS) ifeq ($(BR2_PACKAGE_LIBNL),y) WPA_SUPPLICANT_DEPENDENCIES += libnl define WPA_SUPPLICANT_LIBNL_CONFIG - $(SED) "s/^#CONFIG_DRIVER_NL80211/CONFIG_DRIVER_NL80211/" $(WPA_SUPPLICANT_CONFIG) - echo "CONFIG_LIBNL20=y" >>$(WPA_SUPPLICANT_CONFIG) + echo 'CONFIG_LIBNL32=y' >>$(WPA_SUPPLICANT_CONFIG) +endef +else +define WPA_SUPPLICANT_LIBNL_CONFIG + $(SED) 's/^\(CONFIG_DRIVER_NL80211.*\)/#\1/' $(WPA_SUPPLICANT_CONFIG) endef endif -ifneq ($(BR2_PACKAGE_WPA_SUPPLICANT_EAP),y) +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_EAP),y) +define WPA_SUPPLICANT_EAP_CONFIG + $(SED) 's/\(#\)\(CONFIG_EAP_AKA.*\)/\2/' $(WPA_SUPPLICANT_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_FAST.*\)/\2/' $(WPA_SUPPLICANT_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_GPSK.*\)/\2/' $(WPA_SUPPLICANT_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_IKEV2.*\)/\2/' $(WPA_SUPPLICANT_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_PAX.*\)/\2/' $(WPA_SUPPLICANT_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_PSK.*\)/\2/' $(WPA_SUPPLICANT_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_SAKE.*\)/\2/' $(WPA_SUPPLICANT_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_SIM.*\)/\2/' $(WPA_SUPPLICANT_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_TNC.*\)/\2/' $(WPA_SUPPLICANT_CONFIG) +endef +else define WPA_SUPPLICANT_EAP_CONFIG - $(SED) "s/^CONFIG_EAP_*/#CONFIG_EAP_/g" $(WPA_SUPPLICANT_CONFIG) + $(SED) 's/^\(CONFIG_EAP.*\)/#\1/' $(WPA_SUPPLICANT_CONFIG) endef endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT),y) define WPA_SUPPLICANT_AP_CONFIG - echo "CONFIG_AP=y" >>$(WPA_SUPPLICANT_CONFIG) -endef -else -define WPA_SUPPLICANT_AP_CONFIG - $(SED) "s/^CONFIG_AP=y//" $(WPA_SUPPLICANT_CONFIG) + echo 'CONFIG_AP=y' >>$(WPA_SUPPLICANT_CONFIG) endef endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPS),y) define WPA_SUPPLICANT_WPS_CONFIG - echo "CONFIG_WPS=y" >>$(WPA_SUPPLICANT_CONFIG) + $(SED) 's/\(#\)\(CONFIG_WPS.*\)/\2/' $(WPA_SUPPLICANT_CONFIG) endef endif -define WPA_SUPPLICANT_CRYPTO_CONFIG - echo "CONFIG_CRYPTO=internal" >>$(WPA_SUPPLICANT_CONFIG) - echo "CONFIG_INTERNAL_LIBTOMMATH=y" >>$(WPA_SUPPLICANT_CONFIG) - echo "CONFIG_INTERNAL_LIBTOMMATH_FAST=y" >>$(WPA_SUPPLICANT_CONFIG) +define WPA_SUPPLICANT_LIBTOMMATH_CONFIG + $(SED) 's/\(#\)\(CONFIG_INTERNAL_LIBTOMMATH.*\)/\2/' $(WPA_SUPPLICANT_CONFIG) endef -# Try to use openssl for TLS if it's already available -# gnutls is also supported for TLS +# Try to use openssl or gnutls if it's already available ifeq ($(BR2_PACKAGE_OPENSSL),y) WPA_SUPPLICANT_DEPENDENCIES += openssl define WPA_SUPPLICANT_TLS_CONFIG - echo "CONFIG_TLS=openssl" >>$(WPA_SUPPLICANT_CONFIG) + $(SED) 's/\(#\)\(CONFIG_TLS=openssl\)/\2/' $(WPA_SUPPLICANT_CONFIG) + $(SED) 's/\(#\)\(CONFIG_EAP_PWD.*\)/\2/' $(WPA_SUPPLICANT_CONFIG) endef else +ifeq ($(BR2_PACKAGE_GNUTLS),y) + WPA_SUPPLICANT_DEPENDENCIES += gnutls define WPA_SUPPLICANT_TLS_CONFIG - echo "CONFIG_TLS=internal" >>$(WPA_SUPPLICANT_CONFIG) + $(SED) 's/\(#\)\(CONFIG_TLS=\).*/\2gnutls/' $(WPA_SUPPLICANT_CONFIG) endef +else +define WPA_SUPPLICANT_TLS_CONFIG + $(SED) 's/\(#\)\(CONFIG_TLS=\).*/\2internal/' $(WPA_SUPPLICANT_CONFIG) +endef +endif endif ifeq ($(BR2_PACKAGE_DBUS),y) @@ -66,21 +83,19 @@ ifeq ($(BR2_PACKAGE_DBUS),y) PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" define WPA_SUPPLICANT_DBUS_CONFIG - $(SED) "s/^#CONFIG_CTRL_IFACE_DBUS/CONFIG_CTRL_IFACE_DBUS/" $(WPA_SUPPLICANT_CONFIG) + $(SED) 's/\(#\)\(CONFIG_CTRL_IFACE_DBUS=\)/\2/' $(WPA_SUPPLICANT_CONFIG) endef endif define WPA_SUPPLICANT_CONFIGURE_CMDS cp $(@D)/wpa_supplicant/defconfig $(WPA_SUPPLICANT_CONFIG) - echo "CFLAGS += $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/" >>$(WPA_SUPPLICANT_CONFIG) - echo "LDFLAGS += $(TARGET_LDFLAGS)" >>$(WPA_SUPPLICANT_CONFIG) - echo "CC = $(TARGET_CC)" >>$(WPA_SUPPLICANT_CONFIG) - $(SED) "s/^#CONFIG_IEEE80211R/CONFIG_IEEE80211R/" $(WPA_SUPPLICANT_CONFIG) - $(SED) "s/^#CONFIG_DELAYED_MIC/CONFIG_DELAYED_MIC/" $(WPA_SUPPLICANT_CONFIG) - $(SED) "s/^CONFIG_DRIVER_ATMEL/#CONFIG_DRIVER_ATMEL/" $(WPA_SUPPLICANT_CONFIG) - $(SED) "s/^CONFIG_SMARTCARD/#CONFIG_SMARTCARD/" $(WPA_SUPPLICANT_CONFIG) - $(SED) "s/\/local//" $(@D)/wpa_supplicant/Makefile - $(WPA_SUPPLICANT_CRYPTO_CONFIG) + $(SED) 's/\(#\)\(CONFIG_IEEE80211N.*\)/\2/' $(WPA_SUPPLICANT_CONFIG) + $(SED) 's/\(#\)\(CONFIG_IEEE80211R.*\)/\2/' $(WPA_SUPPLICANT_CONFIG) + $(SED) 's/\(#\)\(CONFIG_INTERWORKING.*\)/\2/' $(WPA_SUPPLICANT_CONFIG) + $(SED) 's/\(#\)\(CONFIG_DELAYED_MIC.*\)/\2/' $(WPA_SUPPLICANT_CONFIG) + $(SED) 's/\(CONFIG_DRIVER_ATMEL\)/#\1/' $(WPA_SUPPLICANT_CONFIG) + $(SED) 's/\(CONFIG_SMARTCARD\)/#\1/' $(WPA_SUPPLICANT_CONFIG) + $(WPA_SUPPLICANT_LIBTOMMATH_CONFIG) $(WPA_SUPPLICANT_TLS_CONFIG) $(WPA_SUPPLICANT_EAP_CONFIG) $(WPA_SUPPLICANT_WPS_CONFIG) @@ -89,22 +104,27 @@ define WPA_SUPPLICANT_CONFIGURE_CMDS $(WPA_SUPPLICANT_AP_CONFIG) endef -define WPA_SUPPLICANT_REMOVE_CLI - rm -f $(TARGET_DIR)/usr/sbin/wpa_cli +define WPA_SUPPLICANT_BUILD_CMDS + $(TARGET_MAKE_ENV) CFLAGS="$(WPA_SUPPLICANT_CFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS)" \ + $(MAKE) CC="$(TARGET_CC)" -C $(@D)/$(WPA_SUPPLICANT_SUBDIR) endef -ifneq ($(BR2_PACKAGE_WPA_SUPPLICANT_CLI),y) -WPA_SUPPLICANT_POST_INSTALL_TARGET_HOOKS += WPA_SUPPLICANT_REMOVE_CLI +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_CLI),y) +define WPA_SUPPLICANT_INSTALL_CLI + $(INSTALL) -m 0755 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/wpa_cli \ + $(TARGET_DIR)/usr/sbin/wpa_cli +endef endif -define WPA_SUPPLICANT_REMOVE_PASSPHRASE - rm -f $(TARGET_DIR)/usr/sbin/wpa_passphrase +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE),y) +define WPA_SUPPLICANT_INSTALL_PASSPHRASE + $(INSTALL) -m 0755 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/wpa_passphrase \ + $(TARGET_DIR)/usr/sbin/wpa_passphrase endef - -ifneq ($(BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE),y) -WPA_SUPPLICANT_POST_INSTALL_TARGET_HOOKS += WPA_SUPPLICANT_REMOVE_PASSPHRASE endif +ifeq ($(BR2_PACKAGE_DBUS),y) define WPA_SUPPLICANT_INSTALL_DBUS $(INSTALL) -D \ $(@D)/wpa_supplicant/dbus/dbus-wpa_supplicant.conf \ @@ -113,23 +133,16 @@ define WPA_SUPPLICANT_INSTALL_DBUS $(@D)/wpa_supplicant/dbus/$(WPA_SUPPLICANT_DBUS_SERVICE).service \ $(TARGET_DIR)/usr/share/dbus-1/system-services/$(WPA_SUPPLICANT_DBUS_SERVICE).service endef - -ifeq ($(BR2_PACKAGE_DBUS),y) -WPA_SUPPLICANT_POST_INSTALL_TARGET_HOOKS += WPA_SUPPLICANT_INSTALL_DBUS endif -define WPA_SUPPLICANT_INSTALL_CONFIG - $(INSTALL) -m 644 \ - package/wpa_supplicant/wpa_supplicant.conf $(TARGET_DIR)/etc/wpa_supplicant.conf -endef - -WPA_SUPPLICANT_POST_INSTALL_TARGET_HOOKS += WPA_SUPPLICANT_INSTALL_CONFIG - -define WPA_SUPPLICANT_UNINSTALL_TARGET_CMDS - rm -f $(addprefix $(TARGET_DIR)/usr/sbin/, $(WPA_SUPPLICANT_TARGET_BINS)) - rm -f $(TARGET_DIR)/etc/dbus-1/system.d/wpa_supplicant.conf - rm -f $(TARGET_DIR)/usr/share/dbus-1/system-services/$(WPA_SUPPLICANT_DBUS_SERVICE).service - rm -f $(TARGET_DIR)/usr/etc/wpa_supplicant.conf +define WPA_SUPPLICANT_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/wpa_supplicant \ + $(TARGET_DIR)/usr/sbin/wpa_supplicant + $(INSTALL) -m 644 -D package/wpa_supplicant/wpa_supplicant.conf \ + $(TARGET_DIR)/etc/wpa_supplicant.conf + $(WPA_SUPPLICANT_INSTALL_CLI) + $(WPA_SUPPLICANT_INSTALL_PASSPHRASE) + $(WPA_SUPPLICANT_INSTALL_DBUS) endef -$(eval $(call AUTOTARGETS)) +$(eval $(call GENTARGETS)) diff --git a/target/Config.in.arch b/target/Config.in.arch index 6eaa95195..25ff7509b 100644 --- a/target/Config.in.arch +++ b/target/Config.in.arch @@ -172,7 +172,6 @@ config BR2_arm1176jz_s bool "arm1176jz-s" config BR2_arm1176jzf_s bool "arm1176jzf-s" -comment "cortex-A8/A9 needs gcc >= 4.4.x" config BR2_cortex_a8 bool "cortex-A8" config BR2_cortex_a9 @@ -361,7 +360,6 @@ config BR2_x86_core2 bool "core2" config BR2_x86_atom bool "atom" -comment "atom needs gcc >= 4.5.x" config BR2_x86_k6 bool "k6" config BR2_x86_k6_2 @@ -409,7 +407,6 @@ config BR2_x86_64_core2 bool "core2" config BR2_x86_64_atom bool "atom" -comment "atom needs gcc >= 4.5.x" endchoice choice @@ -425,7 +422,6 @@ config BR2_sparc_cypress bool "cypress" config BR2_sparc_v8 bool "v8" -comment "LEON SPARC needs gcc = 4.4.x" config BR2_sparc_sparchfleon bool "hfleon" config BR2_sparc_sparchfleonv8 @@ -549,13 +545,10 @@ config BR2_powerpc_8540 bool "8540 / e500v1" config BR2_powerpc_8548 bool "8548 / e500v2" -comment "e300c2 needs gcc >= 4.4.x" config BR2_powerpc_e300c2 bool "e300c2" -comment "e300c3 needs gcc >= 4.4.x" config BR2_powerpc_e300c3 bool "e300c3" -comment "e500mc needs gcc >= 4.4.x" config BR2_powerpc_e500mc bool "e500mc" endchoice diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index 4bff8855b..eb4d5ea20 100644 --- a/toolchain/gcc/Config.in +++ b/toolchain/gcc/Config.in @@ -15,11 +15,11 @@ choice bool "gcc 4.2.2-avr32-2.1.5" config BR2_GCC_VERSION_4_3_X - depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 + depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_x86_atom && !BR2_x86_64_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc bool "gcc 4.3.x" config BR2_GCC_VERSION_4_4_X - depends on !BR2_avr32 + depends on !BR2_avr32 && !BR2_x86_atom && !BR2_x86_64_atom bool "gcc 4.4.x" config BR2_GCC_VERSION_4_5_X @@ -45,7 +45,7 @@ config BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE config BR2_GCC_SNAP_DATE string "GCC snapshot date" - default "4.7-20110430" + default "4.8-20120429" depends on BR2_GCC_VERSION_SNAP help Enter snapshot date to use for gcc. diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in index 12535313f..17fe7978c 100644 --- a/toolchain/kernel-headers/Config.in +++ b/toolchain/kernel-headers/Config.in @@ -6,7 +6,7 @@ comment "Kernel Header Options" choice prompt "Kernel Headers" - default BR2_KERNEL_HEADERS_3_3 + default BR2_KERNEL_HEADERS_3_4 help Select the version of kernel header files you wish to use. You must select the correct set of header files to match @@ -15,14 +15,13 @@ choice For the snapshot, you have to provide the linux-2.6.tar.bz2 tarball in your download dir. - config BR2_KERNEL_HEADERS_2_6_35 - bool "Linux 2.6.35.x kernel headers" - config BR2_KERNEL_HEADERS_2_6_36 bool "Linux 2.6.36.x kernel headers" + depends on BR2_DEPRECATED config BR2_KERNEL_HEADERS_2_6_37 bool "Linux 2.6.37.x kernel headers" + depends on BR2_DEPRECATED config BR2_KERNEL_HEADERS_2_6_38 bool "Linux 2.6.38.x kernel headers" @@ -42,6 +41,9 @@ choice config BR2_KERNEL_HEADERS_3_3 bool "Linux 3.3.x kernel headers" + config BR2_KERNEL_HEADERS_3_4 + bool "Linux 3.4.x kernel headers" + config BR2_KERNEL_HEADERS_VERSION bool "Linux 2.6 (manually specified version)" @@ -58,7 +60,6 @@ config BR2_DEFAULT_KERNEL_VERSION config BR2_DEFAULT_KERNEL_HEADERS string - default "2.6.35.14" if BR2_KERNEL_HEADERS_2_6_35 default "2.6.36.4" if BR2_KERNEL_HEADERS_2_6_36 default "2.6.37.6" if BR2_KERNEL_HEADERS_2_6_37 default "2.6.38.8" if BR2_KERNEL_HEADERS_2_6_38 @@ -67,5 +68,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.1.10" if BR2_KERNEL_HEADERS_3_1 default "3.2.18" if BR2_KERNEL_HEADERS_3_2 default "3.3.7" if BR2_KERNEL_HEADERS_3_3 + default "3.4" if BR2_KERNEL_HEADERS_3_4 default "2.6" if BR2_KERNEL_HEADERS_SNAP default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION diff --git a/toolchain/kernel-headers/linux-2.6.35.14-scsi-use-__uX-types-for-headers-exported-to-user-space.patch b/toolchain/kernel-headers/linux-2.6.35.14-scsi-use-__uX-types-for-headers-exported-to-user-space.patch deleted file mode 100644 index 1089c7106..000000000 --- a/toolchain/kernel-headers/linux-2.6.35.14-scsi-use-__uX-types-for-headers-exported-to-user-space.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 877aa0313e7d22b88d04ebef76392e1688fffff9 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard <jacmet@sunsite.dk> -Date: Fri, 27 Nov 2009 11:20:54 +0100 -Subject: [PATCH] scsi: use __uX types for headers exported to user space -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit 9e4f5e29 (FC Pass Thru support) exported a number of header files -in include/scsi to user space, but didn't change the uX types to the -userspace-compatible __uX types. Without that you'll get compile errors -when including them - E.G.: - -/tmp/include/scsi/scsi.h:145: error: expected specifier-qualifier-list -before ‘u8’ - -Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> ---- - include/scsi/scsi.h | 8 ++++---- - include/scsi/scsi_netlink.h | 4 ++-- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h -index 8b4deca..ec3053e 100644 ---- a/include/scsi/scsi.h -+++ b/include/scsi/scsi.h -@@ -149,10 +149,10 @@ struct scsi_cmnd; - - /* defined in T10 SCSI Primary Commands-2 (SPC2) */ - struct scsi_varlen_cdb_hdr { -- u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */ -- u8 control; -- u8 misc[5]; -- u8 additional_cdb_length; /* total cdb length - 8 */ -+ __u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */ -+ __u8 control; -+ __u8 misc[5]; -+ __u8 additional_cdb_length; /* total cdb length - 8 */ - __be16 service_action; - /* service specific data follows */ - }; -diff --git a/include/scsi/scsi_netlink.h b/include/scsi/scsi_netlink.h -index 536752c..58ce8fe 100644 ---- a/include/scsi/scsi_netlink.h -+++ b/include/scsi/scsi_netlink.h -@@ -105,8 +105,8 @@ struct scsi_nl_host_vendor_msg { - * PCI : ID data is the 16 bit PCI Registered Vendor ID - */ - #define SCSI_NL_VID_TYPE_SHIFT 56 --#define SCSI_NL_VID_TYPE_MASK ((u64)0xFF << SCSI_NL_VID_TYPE_SHIFT) --#define SCSI_NL_VID_TYPE_PCI ((u64)0x01 << SCSI_NL_VID_TYPE_SHIFT) -+#define SCSI_NL_VID_TYPE_MASK ((__u64)0xFF << SCSI_NL_VID_TYPE_SHIFT) -+#define SCSI_NL_VID_TYPE_PCI ((__u64)0x01 << SCSI_NL_VID_TYPE_SHIFT) - #define SCSI_NL_VID_ID_MASK (~ SCSI_NL_VID_TYPE_MASK) - - --- -1.7.0 - |