Bump buildroot to version 2017-02
TG-3 #closed
This commit is contained in:
@@ -17,9 +17,9 @@
|
||||
4TH_CFLAGS = $(TARGET_CFLAGS) -DUNIX -fsigned-char
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
4TH_MAKE_ENV = STATIC=1
|
||||
4TH_MAKE_ENV = $(TARGET_MAKE_ENV) STATIC=1
|
||||
else
|
||||
4TH_MAKE_ENV = SHARED=1
|
||||
4TH_MAKE_ENV = $(TARGET_MAKE_ENV) SHARED=1
|
||||
4TH_CFLAGS += -fPIC
|
||||
endif
|
||||
|
||||
@@ -54,14 +54,14 @@ define 4TH_INSTALL_TARGET_CMDS
|
||||
endef
|
||||
|
||||
define HOST_4TH_BUILD_CMDS
|
||||
$(MAKE) -C $(@D)/sources all \
|
||||
$(HOST_MAKE_ENV) $(MAKE) -C $(@D)/sources all \
|
||||
CFLAGS="$(HOST_CFLAGS) -DUNIX -fsigned-char"
|
||||
endef
|
||||
|
||||
define HOST_4TH_INSTALL_CMDS
|
||||
mkdir -p $(HOST_DIR)/usr/bin
|
||||
mkdir -p $(HOST_DIR)/usr/lib
|
||||
$(MAKE) -C $(@D)/sources mostlyinstall \
|
||||
$(HOST_MAKE_ENV) $(MAKE) -C $(@D)/sources mostlyinstall \
|
||||
BINARIES=$(HOST_DIR)/usr/bin \
|
||||
LIBRARIES=$(HOST_DIR)/usr/lib
|
||||
endef
|
||||
|
||||
@@ -22,9 +22,11 @@ menu "Audio and video applications"
|
||||
source "package/kodi/Config.in"
|
||||
source "package/lame/Config.in"
|
||||
source "package/madplay/Config.in"
|
||||
source "package/mimic/Config.in"
|
||||
source "package/miraclecast/Config.in"
|
||||
source "package/mjpegtools/Config.in"
|
||||
source "package/modplugtools/Config.in"
|
||||
source "package/motion/Config.in"
|
||||
source "package/mpd/Config.in"
|
||||
source "package/mpd-mpc/Config.in"
|
||||
source "package/mpg123/Config.in"
|
||||
@@ -43,6 +45,7 @@ menu "Audio and video applications"
|
||||
source "package/tovid/Config.in"
|
||||
source "package/tstools/Config.in"
|
||||
source "package/twolame/Config.in"
|
||||
source "package/udpxy/Config.in"
|
||||
source "package/upmpdcli/Config.in"
|
||||
source "package/v4l2grab/Config.in"
|
||||
source "package/vlc/Config.in"
|
||||
@@ -76,12 +79,14 @@ menu "Debugging, profiling and benchmark"
|
||||
source "package/dt/Config.in"
|
||||
source "package/duma/Config.in"
|
||||
source "package/fio/Config.in"
|
||||
source "package/fwts/Config.in"
|
||||
source "package/gdb/Config.in"
|
||||
source "package/google-breakpad/Config.in"
|
||||
source "package/iozone/Config.in"
|
||||
source "package/kexec/Config.in"
|
||||
source "package/kexec-lite/Config.in"
|
||||
source "package/ktap/Config.in"
|
||||
source "package/kvm-unit-tests/Config.in"
|
||||
source "package/kyua/Config.in"
|
||||
source "package/latencytop/Config.in"
|
||||
source "package/lmbench/Config.in"
|
||||
@@ -95,6 +100,7 @@ menu "Debugging, profiling and benchmark"
|
||||
source "package/memstat/Config.in"
|
||||
source "package/netperf/Config.in"
|
||||
source "package/netsniff-ng/Config.in"
|
||||
source "package/nmon/Config.in"
|
||||
source "package/oprofile/Config.in"
|
||||
source "package/pax-utils/Config.in"
|
||||
source "package/pv/Config.in"
|
||||
@@ -111,6 +117,7 @@ menu "Debugging, profiling and benchmark"
|
||||
source "package/tinymembench/Config.in"
|
||||
source "package/trace-cmd/Config.in"
|
||||
source "package/trinity/Config.in"
|
||||
source "package/uclibc-ng-test/Config.in"
|
||||
source "package/valgrind/Config.in"
|
||||
source "package/whetstone/Config.in"
|
||||
endmenu
|
||||
@@ -131,22 +138,23 @@ menu "Development tools"
|
||||
source "package/gawk/Config.in"
|
||||
source "package/gettext/Config.in"
|
||||
source "package/git/Config.in"
|
||||
source "package/git-crypt/Config.in"
|
||||
source "package/gperf/Config.in"
|
||||
source "package/grep/Config.in"
|
||||
source "package/intltool/Config.in"
|
||||
source "package/jq/Config.in"
|
||||
source "package/libtool/Config.in"
|
||||
source "package/make/Config.in"
|
||||
source "package/patch/Config.in"
|
||||
source "package/pkgconf/Config.in"
|
||||
source "package/sed/Config.in"
|
||||
source "package/sstrip/Config.in"
|
||||
source "package/subversion/Config.in"
|
||||
source "package/tree/Config.in"
|
||||
source "package/yasm/Config.in"
|
||||
endmenu
|
||||
|
||||
menu "Filesystem and flash utilities"
|
||||
source "package/aufs/Config.in"
|
||||
source "package/aufs-util/Config.in"
|
||||
source "package/autofs/Config.in"
|
||||
source "package/btrfs-progs/Config.in"
|
||||
source "package/cifs-utils/Config.in"
|
||||
@@ -165,7 +173,6 @@ menu "Filesystem and flash utilities"
|
||||
source "package/genext2fs/Config.in"
|
||||
source "package/genpart/Config.in"
|
||||
source "package/genromfs/Config.in"
|
||||
source "package/makedevs/Config.in"
|
||||
source "package/mmc-utils/Config.in"
|
||||
source "package/mtd/Config.in"
|
||||
source "package/mtools/Config.in"
|
||||
@@ -241,7 +248,6 @@ comment "Graphic libraries"
|
||||
source "package/directfb/Config.in"
|
||||
source "package/directfb-examples/Config.in"
|
||||
source "package/efl/Config.in"
|
||||
source "package/elementary/Config.in"
|
||||
source "package/fbdump/Config.in"
|
||||
source "package/fbgrab/Config.in"
|
||||
source "package/fbset/Config.in"
|
||||
@@ -302,7 +308,6 @@ comment "X applications"
|
||||
source "package/qt-webkit-kiosk/Config.in"
|
||||
source "package/rdesktop/Config.in"
|
||||
source "package/synergy/Config.in"
|
||||
source "package/torsmo/Config.in"
|
||||
source "package/wmctrl/Config.in"
|
||||
source "package/x11vnc/Config.in"
|
||||
source "package/xdotool/Config.in"
|
||||
@@ -334,6 +339,7 @@ menu "Firmware"
|
||||
source "package/linux-firmware/Config.in"
|
||||
source "package/rpi-firmware/Config.in"
|
||||
source "package/sunxi-boards/Config.in"
|
||||
source "package/ts4900-fpga/Config.in"
|
||||
source "package/ux500-firmware/Config.in"
|
||||
source "package/wilc1000-firmware/Config.in"
|
||||
source "package/zd1211-firmware/Config.in"
|
||||
@@ -344,9 +350,11 @@ endmenu
|
||||
source "package/acpitool/Config.in"
|
||||
source "package/aer-inject/Config.in"
|
||||
source "package/am335x-pru-package/Config.in"
|
||||
source "package/amd-catalyst/Config.in"
|
||||
source "package/avrdude/Config.in"
|
||||
source "package/bcache-tools/Config.in"
|
||||
source "package/biosdevname/Config.in"
|
||||
source "package/cbootimage/Config.in"
|
||||
source "package/cc-tool/Config.in"
|
||||
source "package/cdrkit/Config.in"
|
||||
source "package/cryptsetup/Config.in"
|
||||
@@ -365,6 +373,7 @@ endmenu
|
||||
source "package/edid-decode/Config.in"
|
||||
source "package/eeprog/Config.in"
|
||||
source "package/eudev/Config.in"
|
||||
source "package/ev3dev-linux-drivers/Config.in"
|
||||
source "package/evemu/Config.in"
|
||||
source "package/evtest/Config.in"
|
||||
source "package/fan-ctrl/Config.in"
|
||||
@@ -432,6 +441,7 @@ endmenu
|
||||
source "package/pifmrds/Config.in"
|
||||
source "package/powertop/Config.in"
|
||||
source "package/pps-tools/Config.in"
|
||||
source "package/pru-software-support/Config.in"
|
||||
source "package/pulseview/Config.in"
|
||||
source "package/read-edid/Config.in"
|
||||
source "package/rfkill/Config.in"
|
||||
@@ -439,6 +449,7 @@ endmenu
|
||||
source "package/rpi-userland/Config.in"
|
||||
source "package/rs485conf/Config.in"
|
||||
source "package/rtl8188eu/Config.in"
|
||||
source "package/rtl8723bs/Config.in"
|
||||
source "package/rtl8821au/Config.in"
|
||||
source "package/sane-backends/Config.in"
|
||||
source "package/sdparm/Config.in"
|
||||
@@ -448,7 +459,6 @@ endmenu
|
||||
source "package/sispmctl/Config.in"
|
||||
source "package/smartmontools/Config.in"
|
||||
source "package/smstools3/Config.in"
|
||||
source "package/snowball-hdmiservice/Config.in"
|
||||
source "package/spi-tools/Config.in"
|
||||
source "package/sredird/Config.in"
|
||||
source "package/statserial/Config.in"
|
||||
@@ -465,9 +475,10 @@ endmenu
|
||||
source "package/ti-utils/Config.in"
|
||||
source "package/triggerhappy/Config.in"
|
||||
source "package/uboot-tools/Config.in"
|
||||
#source "package/ubus/Config.in"
|
||||
source "package/ubus/Config.in"
|
||||
source "package/udev/Config.in"
|
||||
source "package/udisks/Config.in"
|
||||
source "package/upower/Config.in"
|
||||
source "package/usb_modeswitch/Config.in"
|
||||
source "package/usb_modeswitch_data/Config.in"
|
||||
source "package/usbmount/Config.in"
|
||||
@@ -516,6 +527,7 @@ menu "Lua libraries/modules"
|
||||
source "package/cosmo/Config.in"
|
||||
source "package/coxpcall/Config.in"
|
||||
source "package/dado/Config.in"
|
||||
source "package/easydbus/Config.in"
|
||||
source "package/lbase64/Config.in"
|
||||
source "package/ljlinenoise/Config.in"
|
||||
source "package/ljsyscall/Config.in"
|
||||
@@ -572,7 +584,6 @@ menu "Perl libraries/modules"
|
||||
source "package/perl-crypt-openssl-random/Config.in"
|
||||
source "package/perl-crypt-openssl-rsa/Config.in"
|
||||
source "package/perl-datetime-tiny/Config.in"
|
||||
source "package/perl-db-file/Config.in"
|
||||
source "package/perl-digest-hmac/Config.in"
|
||||
source "package/perl-digest-sha1/Config.in"
|
||||
source "package/perl-encode-detect/Config.in"
|
||||
@@ -618,6 +629,7 @@ endif
|
||||
if BR2_PACKAGE_PHP
|
||||
if !BR2_STATIC_LIBS
|
||||
menu "External php extensions"
|
||||
source "package/php-amqp/Config.in"
|
||||
source "package/php-geoip/Config.in"
|
||||
source "package/php-gnupg/Config.in"
|
||||
source "package/php-imagick/Config.in"
|
||||
@@ -637,25 +649,34 @@ if BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
|
||||
menu "External python modules"
|
||||
source "package/python-alsaaudio/Config.in"
|
||||
source "package/python-argh/Config.in"
|
||||
source "package/python-arrow/Config.in"
|
||||
source "package/python-attrs/Config.in"
|
||||
source "package/python-autobahn/Config.in"
|
||||
source "package/python-babel/Config.in"
|
||||
source "package/python-backports-abc/Config.in"
|
||||
source "package/python-beautifulsoup4/Config.in"
|
||||
source "package/python-bitstring/Config.in"
|
||||
source "package/python-bottle/Config.in"
|
||||
source "package/python-can/Config.in"
|
||||
source "package/python-cbor/Config.in"
|
||||
source "package/python-certifi/Config.in"
|
||||
source "package/python-cffi/Config.in"
|
||||
source "package/python-characteristic/Config.in"
|
||||
source "package/python-chardet/Config.in"
|
||||
source "package/python-cheetah/Config.in"
|
||||
source "package/python-cherrypy/Config.in"
|
||||
source "package/python-click/Config.in"
|
||||
source "package/python-coherence/Config.in"
|
||||
source "package/python-configobj/Config.in"
|
||||
source "package/python-configshell-fb/Config.in"
|
||||
source "package/python-constantly/Config.in"
|
||||
source "package/python-couchdb/Config.in"
|
||||
source "package/python-crc16/Config.in"
|
||||
source "package/python-crcmod/Config.in"
|
||||
source "package/python-crossbar/Config.in"
|
||||
source "package/python-cryptography/Config.in"
|
||||
source "package/python-cssselect/Config.in"
|
||||
source "package/python-cssutils/Config.in"
|
||||
source "package/python-daemon/Config.in"
|
||||
source "package/python-dataproperty/Config.in"
|
||||
source "package/python-dateutil/Config.in"
|
||||
@@ -664,6 +685,7 @@ menu "External python modules"
|
||||
source "package/python-dicttoxml/Config.in"
|
||||
source "package/python-django/Config.in"
|
||||
source "package/python-docopt/Config.in"
|
||||
source "package/python-docutils/Config.in"
|
||||
source "package/python-dominate/Config.in"
|
||||
source "package/python-dpkt/Config.in"
|
||||
source "package/python-ecdsa/Config.in"
|
||||
@@ -671,15 +693,19 @@ menu "External python modules"
|
||||
source "package/python-enum/Config.in"
|
||||
source "package/python-enum34/Config.in"
|
||||
source "package/python-flask/Config.in"
|
||||
source "package/python-flask-babel/Config.in"
|
||||
source "package/python-flask-jsonrpc/Config.in"
|
||||
source "package/python-flask-login/Config.in"
|
||||
source "package/python-flup/Config.in"
|
||||
source "package/python-futures/Config.in"
|
||||
source "package/python-gobject/Config.in"
|
||||
source "package/python-gunicorn/Config.in"
|
||||
source "package/python-html5lib/Config.in"
|
||||
source "package/python-httplib2/Config.in"
|
||||
source "package/python-humanize/Config.in"
|
||||
source "package/python-id3/Config.in"
|
||||
source "package/python-idna/Config.in"
|
||||
source "package/python-incremental/Config.in"
|
||||
source "package/python-iniparse/Config.in"
|
||||
source "package/python-iowait/Config.in"
|
||||
source "package/python-ipaddr/Config.in"
|
||||
@@ -688,18 +714,26 @@ menu "External python modules"
|
||||
source "package/python-ipython/Config.in"
|
||||
source "package/python-itsdangerous/Config.in"
|
||||
source "package/python-jinja2/Config.in"
|
||||
source "package/python-jsonschema/Config.in"
|
||||
source "package/python-json-schema-validator/Config.in"
|
||||
source "package/python-keyring/Config.in"
|
||||
source "package/python-libconfig/Config.in"
|
||||
source "package/python-lmdb/Config.in"
|
||||
source "package/python-logbook/Config.in"
|
||||
source "package/python-lxml/Config.in"
|
||||
source "package/python-mad/Config.in"
|
||||
source "package/python-mako/Config.in"
|
||||
source "package/python-markdown/Config.in"
|
||||
source "package/python-markdown2/Config.in"
|
||||
source "package/python-markupsafe/Config.in"
|
||||
source "package/python-mbstrdecoder/Config.in"
|
||||
source "package/python-meld3/Config.in"
|
||||
source "package/python-mistune/Config.in"
|
||||
source "package/python-msgpack/Config.in"
|
||||
source "package/python-mutagen/Config.in"
|
||||
source "package/python-mwclient/Config.in"
|
||||
source "package/python-mwscrape/Config.in"
|
||||
source "package/python-mwscrape2slob/Config.in"
|
||||
source "package/python-netaddr/Config.in"
|
||||
source "package/python-netifaces/Config.in"
|
||||
source "package/python-networkmanager/Config.in"
|
||||
@@ -708,6 +742,7 @@ menu "External python modules"
|
||||
source "package/python-paho-mqtt/Config.in"
|
||||
source "package/python-pam/Config.in"
|
||||
source "package/python-paramiko/Config.in"
|
||||
source "package/python-pathpy/Config.in"
|
||||
source "package/python-pathtools/Config.in"
|
||||
source "package/python-pathvalidate/Config.in"
|
||||
source "package/python-pexpect/Config.in"
|
||||
@@ -717,23 +752,29 @@ menu "External python modules"
|
||||
source "package/python-protobuf/Config.in"
|
||||
source "package/python-psutil/Config.in"
|
||||
source "package/python-ptyprocess/Config.in"
|
||||
source "package/python-pudb/Config.in"
|
||||
source "package/python-pyasn/Config.in"
|
||||
source "package/python-pyasn-modules/Config.in"
|
||||
source "package/python-pycli/Config.in"
|
||||
source "package/python-pycparser/Config.in"
|
||||
source "package/python-pycrypto/Config.in"
|
||||
source "package/python-pydal/Config.in"
|
||||
source "package/python-pyelftools/Config.in"
|
||||
source "package/python-pyftpdlib/Config.in"
|
||||
source "package/python-pygame/Config.in"
|
||||
source "package/python-pygments/Config.in"
|
||||
source "package/python-pyicu/Config.in"
|
||||
source "package/python-pyinotify/Config.in"
|
||||
source "package/python-pylru/Config.in"
|
||||
source "package/python-pymysql/Config.in"
|
||||
source "package/python-pynacl/Config.in"
|
||||
source "package/python-pyopenssl/Config.in"
|
||||
source "package/python-pyparsing/Config.in"
|
||||
source "package/python-pyparted/Config.in"
|
||||
source "package/python-pypcap/Config.in"
|
||||
source "package/python-pyqrcode/Config.in"
|
||||
source "package/python-pyqt/Config.in"
|
||||
source "package/python-pyqt5/Config.in"
|
||||
source "package/python-pyratemp/Config.in"
|
||||
source "package/python-pyro/Config.in"
|
||||
source "package/python-pyroute2/Config.in"
|
||||
@@ -743,6 +784,7 @@ menu "External python modules"
|
||||
source "package/python-pysnmp-apps/Config.in"
|
||||
source "package/python-pysnmp-mibs/Config.in"
|
||||
source "package/python-pysocks/Config.in"
|
||||
source "package/python-pytablereader/Config.in"
|
||||
source "package/python-pytablewriter/Config.in"
|
||||
source "package/python-pytrie/Config.in"
|
||||
source "package/python-pytz/Config.in"
|
||||
@@ -752,6 +794,7 @@ menu "External python modules"
|
||||
source "package/python-pyyaml/Config.in"
|
||||
source "package/python-pyzmq/Config.in"
|
||||
source "package/python-requests/Config.in"
|
||||
source "package/python-requests-toolbelt/Config.in"
|
||||
source "package/python-rpi-gpio/Config.in"
|
||||
source "package/python-rtslib-fb/Config.in"
|
||||
source "package/python-scapy3k/Config.in"
|
||||
@@ -760,16 +803,20 @@ menu "External python modules"
|
||||
source "package/python-service-identity/Config.in"
|
||||
source "package/python-setproctitle/Config.in"
|
||||
source "package/python-setuptools/Config.in"
|
||||
source "package/python-sh/Config.in"
|
||||
source "package/python-shutilwhich/Config.in"
|
||||
source "package/python-simpleaudio/Config.in"
|
||||
source "package/python-simplejson/Config.in"
|
||||
source "package/python-singledispatch/Config.in"
|
||||
source "package/python-sip/Config.in"
|
||||
source "package/python-six/Config.in"
|
||||
source "package/python-slob/Config.in"
|
||||
source "package/python-smbus-cffi/Config.in"
|
||||
source "package/python-socketio/Config.in"
|
||||
source "package/python-spidev/Config.in"
|
||||
source "package/python-thrift/Config.in"
|
||||
source "package/python-tomako/Config.in"
|
||||
source "package/python-toml/Config.in"
|
||||
source "package/python-tornado/Config.in"
|
||||
source "package/python-treq/Config.in"
|
||||
source "package/python-twisted/Config.in"
|
||||
@@ -785,6 +832,7 @@ menu "External python modules"
|
||||
source "package/python-web2py/Config.in"
|
||||
source "package/python-webpy/Config.in"
|
||||
source "package/python-werkzeug/Config.in"
|
||||
source "package/python-whoosh/Config.in"
|
||||
source "package/python-ws4py/Config.in"
|
||||
source "package/python-wsaccel/Config.in"
|
||||
source "package/python-xlrd/Config.in"
|
||||
@@ -808,6 +856,7 @@ menu "Libraries"
|
||||
|
||||
menu "Audio/Sound"
|
||||
source "package/alsa-lib/Config.in"
|
||||
source "package/aubio/Config.in"
|
||||
source "package/audiofile/Config.in"
|
||||
source "package/celt051/Config.in"
|
||||
source "package/fdk-aac/Config.in"
|
||||
@@ -822,6 +871,7 @@ menu "Audio/Sound"
|
||||
source "package/libcuefile/Config.in"
|
||||
source "package/libebur128/Config.in"
|
||||
source "package/libg7221/Config.in"
|
||||
source "package/libgsm/Config.in"
|
||||
source "package/libid3tag/Config.in"
|
||||
source "package/libilbc/Config.in"
|
||||
source "package/liblo/Config.in"
|
||||
@@ -891,12 +941,14 @@ menu "Crypto"
|
||||
source "package/polarssl/Config.in"
|
||||
source "package/tinydtls/Config.in"
|
||||
source "package/trousers/Config.in"
|
||||
source "package/ustream-ssl/Config.in"
|
||||
endmenu
|
||||
|
||||
menu "Database"
|
||||
source "package/berkeleydb/Config.in"
|
||||
source "package/cppdb/Config.in"
|
||||
source "package/gdbm/Config.in"
|
||||
source "package/hiredis/Config.in"
|
||||
source "package/kompexsqlite/Config.in"
|
||||
source "package/leveldb/Config.in"
|
||||
source "package/libpqxx/Config.in"
|
||||
@@ -952,13 +1004,11 @@ menu "Graphics"
|
||||
source "package/libdri2/Config.in"
|
||||
source "package/libdrm/Config.in"
|
||||
source "package/libepoxy/Config.in"
|
||||
source "package/libevas-generic-loaders/Config.in"
|
||||
source "package/libexif/Config.in"
|
||||
source "package/libfm/Config.in"
|
||||
source "package/libfm-extra/Config.in"
|
||||
source "package/libfreeglut/Config.in"
|
||||
source "package/libfreeimage/Config.in"
|
||||
source "package/libgail/Config.in"
|
||||
source "package/libgdiplus/Config.in"
|
||||
source "package/libgeotiff/Config.in"
|
||||
source "package/libglade/Config.in"
|
||||
@@ -993,9 +1043,7 @@ menu "Graphics"
|
||||
source "package/tiff/Config.in"
|
||||
source "package/wayland/Config.in"
|
||||
source "package/wayland-protocols/Config.in"
|
||||
source "package/webkit/Config.in"
|
||||
source "package/webkitgtk/Config.in"
|
||||
source "package/webkitgtk24/Config.in"
|
||||
source "package/webp/Config.in"
|
||||
source "package/zbar/Config.in"
|
||||
source "package/zxing-cpp/Config.in"
|
||||
@@ -1016,6 +1064,7 @@ menu "Hardware handling"
|
||||
source "package/libfreefare/Config.in"
|
||||
source "package/libftdi/Config.in"
|
||||
source "package/libftdi1/Config.in"
|
||||
source "package/libgpiod/Config.in"
|
||||
source "package/libgudev/Config.in"
|
||||
source "package/libhid/Config.in"
|
||||
source "package/libiio/Config.in"
|
||||
@@ -1053,6 +1102,11 @@ endmenu
|
||||
|
||||
menu "Javascript"
|
||||
source "package/angularjs/Config.in"
|
||||
if BR2_PACKAGE_ANGULARJS
|
||||
menu "External AngularJS plugins"
|
||||
source "package/angular-websocket/Config.in"
|
||||
endmenu
|
||||
endif
|
||||
source "package/bootstrap/Config.in"
|
||||
source "package/explorercanvas/Config.in"
|
||||
source "package/flot/Config.in"
|
||||
@@ -1079,6 +1133,7 @@ menu "JSON/XML"
|
||||
source "package/expat/Config.in"
|
||||
source "package/ezxml/Config.in"
|
||||
source "package/jansson/Config.in"
|
||||
source "package/jsmn/Config.in"
|
||||
source "package/json-c/Config.in"
|
||||
source "package/json-glib/Config.in"
|
||||
source "package/jsoncpp/Config.in"
|
||||
@@ -1092,6 +1147,7 @@ menu "JSON/XML"
|
||||
source "package/libxslt/Config.in"
|
||||
source "package/libyaml/Config.in"
|
||||
source "package/mxml/Config.in"
|
||||
source "package/pugixml/Config.in"
|
||||
source "package/rapidjson/Config.in"
|
||||
source "package/rapidxml/Config.in"
|
||||
source "package/raptor/Config.in"
|
||||
@@ -1233,6 +1289,7 @@ menu "Networking"
|
||||
source "package/openpgm/Config.in"
|
||||
source "package/openzwave/Config.in"
|
||||
source "package/ortp/Config.in"
|
||||
source "package/paho-mqtt-c/Config.in"
|
||||
source "package/qdecoder/Config.in"
|
||||
source "package/qpid-proton/Config.in"
|
||||
source "package/rabbitmq-c/Config.in"
|
||||
@@ -1242,7 +1299,6 @@ menu "Networking"
|
||||
source "package/sofia-sip/Config.in"
|
||||
source "package/thrift/Config.in"
|
||||
source "package/usbredir/Config.in"
|
||||
source "package/wvstreams/Config.in"
|
||||
source "package/zeromq/Config.in"
|
||||
source "package/zmqpp/Config.in"
|
||||
source "package/zyre/Config.in"
|
||||
@@ -1254,6 +1310,7 @@ menu "Other"
|
||||
source "package/argp-standalone/Config.in"
|
||||
source "package/armadillo/Config.in"
|
||||
source "package/atf/Config.in"
|
||||
source "package/bctoolbox/Config.in"
|
||||
source "package/bdwgc/Config.in"
|
||||
source "package/boost/Config.in"
|
||||
source "package/clapack/Config.in"
|
||||
@@ -1291,7 +1348,9 @@ menu "Other"
|
||||
source "package/libffi/Config.in"
|
||||
source "package/libgee/Config.in"
|
||||
source "package/libglib2/Config.in"
|
||||
source "package/libglob/Config.in"
|
||||
source "package/libical/Config.in"
|
||||
source "package/libite/Config.in"
|
||||
source "package/liblinear/Config.in"
|
||||
source "package/libnspr/Config.in"
|
||||
source "package/libpfm4/Config.in"
|
||||
@@ -1305,7 +1364,7 @@ menu "Other"
|
||||
source "package/libtasn1/Config.in"
|
||||
source "package/libtommath/Config.in"
|
||||
source "package/libtpl/Config.in"
|
||||
#source "package/libubox/Config.in"
|
||||
source "package/libubox/Config.in"
|
||||
source "package/libuci/Config.in"
|
||||
source "package/libunwind/Config.in"
|
||||
source "package/liburcu/Config.in"
|
||||
@@ -1333,6 +1392,9 @@ endif
|
||||
source "package/protobuf-c/Config.in"
|
||||
source "package/qhull/Config.in"
|
||||
source "package/qlibc/Config.in"
|
||||
source "package/riemann-c-client/Config.in"
|
||||
source "package/shapelib/Config.in"
|
||||
source "package/skalibs/Config.in"
|
||||
source "package/sphinxbase/Config.in"
|
||||
source "package/startup-notification/Config.in"
|
||||
source "package/tinycbor/Config.in"
|
||||
@@ -1392,12 +1454,12 @@ menu "Miscellaneous"
|
||||
source "package/gr-osmosdr/Config.in"
|
||||
source "package/gsettings-desktop-schemas/Config.in"
|
||||
source "package/haveged/Config.in"
|
||||
source "package/linux-syscall-support/Config.in"
|
||||
source "package/mcrypt/Config.in"
|
||||
source "package/mobile-broadband-provider-info/Config.in"
|
||||
source "package/qemu/Config.in"
|
||||
source "package/qpdf/Config.in"
|
||||
source "package/shared-mime-info/Config.in"
|
||||
source "package/snowball-init/Config.in"
|
||||
source "package/taskd/Config.in"
|
||||
source "package/wine/Config.in"
|
||||
source "package/xutil_util-macros/Config.in"
|
||||
@@ -1437,6 +1499,7 @@ menu "Networking applications"
|
||||
source "package/ctorrent/Config.in"
|
||||
source "package/cups/Config.in"
|
||||
source "package/dante/Config.in"
|
||||
source "package/darkhttpd/Config.in"
|
||||
source "package/dhcp/Config.in"
|
||||
source "package/dhcpcd/Config.in"
|
||||
source "package/dhcpdump/Config.in"
|
||||
@@ -1453,8 +1516,8 @@ menu "Networking applications"
|
||||
source "package/fmc/Config.in"
|
||||
source "package/fping/Config.in"
|
||||
source "package/freeswitch/Config.in"
|
||||
source "package/gupnp-tools/Config.in"
|
||||
source "package/gesftpserver/Config.in"
|
||||
source "package/gupnp-tools/Config.in"
|
||||
source "package/gutenprint/Config.in"
|
||||
source "package/hans/Config.in"
|
||||
source "package/hiawatha/Config.in"
|
||||
@@ -1463,6 +1526,7 @@ menu "Networking applications"
|
||||
source "package/httping/Config.in"
|
||||
source "package/ibrdtn-tools/Config.in"
|
||||
source "package/ibrdtnd/Config.in"
|
||||
source "package/ifenslave/Config.in"
|
||||
source "package/ifplugd/Config.in"
|
||||
source "package/iftop/Config.in"
|
||||
source "package/ifupdown/Config.in"
|
||||
@@ -1523,6 +1587,7 @@ menu "Networking applications"
|
||||
source "package/nginx/Config.in"
|
||||
if BR2_PACKAGE_NGINX
|
||||
menu "External nginx modules"
|
||||
source "package/nginx-dav-ext/Config.in"
|
||||
source "package/nginx-naxsi/Config.in"
|
||||
source "package/nginx-upload/Config.in"
|
||||
endmenu
|
||||
@@ -1557,6 +1622,7 @@ endif
|
||||
source "package/pure-ftpd/Config.in"
|
||||
source "package/putty/Config.in"
|
||||
source "package/quagga/Config.in"
|
||||
source "package/rabbitmq-server/Config.in"
|
||||
source "package/radvd/Config.in"
|
||||
source "package/rp-pppoe/Config.in"
|
||||
source "package/rpcbind/Config.in"
|
||||
@@ -1570,6 +1636,7 @@ endif
|
||||
source "package/shairport-sync/Config.in"
|
||||
source "package/shellinabox/Config.in"
|
||||
source "package/smcroute/Config.in"
|
||||
source "package/sngrep/Config.in"
|
||||
source "package/socat/Config.in"
|
||||
source "package/socketcand/Config.in"
|
||||
source "package/softether/Config.in"
|
||||
@@ -1578,6 +1645,7 @@ endif
|
||||
source "package/spice-protocol/Config.in"
|
||||
source "package/squid/Config.in"
|
||||
source "package/sshpass/Config.in"
|
||||
source "package/sslh/Config.in"
|
||||
source "package/strongswan/Config.in"
|
||||
source "package/stunnel/Config.in"
|
||||
source "package/tcpdump/Config.in"
|
||||
@@ -1593,10 +1661,13 @@ endif
|
||||
source "package/tunctl/Config.in"
|
||||
source "package/tvheadend/Config.in"
|
||||
source "package/udpcast/Config.in"
|
||||
source "package/uhttpd/Config.in"
|
||||
source "package/ulogd/Config.in"
|
||||
source "package/ushare/Config.in"
|
||||
source "package/ussp-push/Config.in"
|
||||
source "package/vde2/Config.in"
|
||||
source "package/vdr/Config.in"
|
||||
source "package/vdr-plugin-vnsiserver/Config.in"
|
||||
source "package/vnstat/Config.in"
|
||||
source "package/vpnc/Config.in"
|
||||
source "package/vsftpd/Config.in"
|
||||
@@ -1609,7 +1680,6 @@ endif
|
||||
source "package/wireshark/Config.in"
|
||||
source "package/wpa_supplicant/Config.in"
|
||||
source "package/wpan-tools/Config.in"
|
||||
source "package/wvdial/Config.in"
|
||||
source "package/xinetd/Config.in"
|
||||
source "package/xl2tp/Config.in"
|
||||
source "package/xtables-addons/Config.in"
|
||||
@@ -1629,7 +1699,6 @@ comment "* "
|
||||
comment "See the manual: "
|
||||
comment "http://buildroot.org/manual.html#faq-no-binary-packages"
|
||||
comment "-------------------------------------------------------"
|
||||
source "package/ipkg/Config.in"
|
||||
source "package/opkg/Config.in"
|
||||
source "package/rpm/Config.in"
|
||||
endmenu
|
||||
@@ -1640,6 +1709,7 @@ menu "Real-Time"
|
||||
endmenu
|
||||
|
||||
menu "Security"
|
||||
source "package/policycoreutils/Config.in"
|
||||
source "package/setools/Config.in"
|
||||
endmenu
|
||||
|
||||
@@ -1647,6 +1717,7 @@ menu "Shell and utilities"
|
||||
comment "Shells"
|
||||
source "package/bash/Config.in"
|
||||
source "package/dash/Config.in"
|
||||
source "package/mksh/Config.in"
|
||||
source "package/zsh/Config.in"
|
||||
comment "Utilities"
|
||||
source "package/at/Config.in"
|
||||
@@ -1676,6 +1747,7 @@ endmenu
|
||||
menu "System tools"
|
||||
source "package/acl/Config.in"
|
||||
source "package/android-tools/Config.in"
|
||||
source "package/atop/Config.in"
|
||||
source "package/attr/Config.in"
|
||||
source "package/audit/Config.in"
|
||||
source "package/bootutils/Config.in"
|
||||
@@ -1684,6 +1756,7 @@ menu "System tools"
|
||||
source "package/coreutils/Config.in"
|
||||
source "package/cpuload/Config.in"
|
||||
source "package/dcron/Config.in"
|
||||
source "package/ddrescue/Config.in"
|
||||
source "package/debianutils/Config.in"
|
||||
source "package/docker-containerd/Config.in"
|
||||
source "package/docker-engine/Config.in"
|
||||
@@ -1732,6 +1805,7 @@ menu "System tools"
|
||||
source "package/unscd/Config.in"
|
||||
source "package/util-linux/Config.in"
|
||||
source "package/xen/Config.in"
|
||||
source "package/xvisor/Config.in"
|
||||
endmenu
|
||||
|
||||
menu "Text editors and viewers"
|
||||
|
||||
@@ -22,20 +22,27 @@ menu "Host utilities"
|
||||
source "package/jq/Config.in.host"
|
||||
source "package/jsmin/Config.in.host"
|
||||
source "package/lpc3250loader/Config.in.host"
|
||||
source "package/lttng-babeltrace/Config.in.host"
|
||||
source "package/mfgtools/Config.in.host"
|
||||
source "package/mke2img/Config.in.host"
|
||||
source "package/mkpasswd/Config.in.host"
|
||||
source "package/mtd/Config.in.host"
|
||||
source "package/mtools/Config.in.host"
|
||||
source "package/mxsldr/Config.in.host"
|
||||
source "package/omap-u-boot-utils/Config.in.host"
|
||||
source "package/openocd/Config.in.host"
|
||||
source "package/opkg-utils/Config.in.host"
|
||||
source "package/parted/Config.in.host"
|
||||
source "package/patchelf/Config.in.host"
|
||||
source "package/pru-software-support/Config.in.host"
|
||||
source "package/pwgen/Config.in.host"
|
||||
source "package/qemu/Config.in.host"
|
||||
source "package/raspberrypi-usbboot/Config.in.host"
|
||||
source "package/sam-ba/Config.in.host"
|
||||
source "package/squashfs/Config.in.host"
|
||||
source "package/sunxi-tools/Config.in.host"
|
||||
source "package/tegrarcm/Config.in.host"
|
||||
source "package/ti-cgt-pru/Config.in.host"
|
||||
source "package/uboot-tools/Config.in.host"
|
||||
source "package/util-linux/Config.in.host"
|
||||
source "package/vboot-utils/Config.in.host"
|
||||
|
||||
@@ -184,7 +184,7 @@ endif
|
||||
ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
|
||||
TARGET_CROSS = $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-
|
||||
else
|
||||
TARGET_CROSS = $(HOST_DIR)/usr/bin/$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))-
|
||||
TARGET_CROSS = $(HOST_DIR)/usr/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)-
|
||||
endif
|
||||
|
||||
# Define TARGET_xx variables for all common binutils/gcc
|
||||
@@ -203,24 +203,19 @@ TARGET_OBJDUMP = $(TARGET_CROSS)objdump
|
||||
|
||||
ifeq ($(BR2_STRIP_strip),y)
|
||||
STRIP_STRIP_DEBUG := --strip-debug
|
||||
STRIP_STRIP_UNNEEDED := --strip-unneeded
|
||||
STRIP_STRIP_ALL := --strip-all
|
||||
TARGET_STRIP = $(TARGET_CROSS)strip
|
||||
STRIPCMD = $(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note
|
||||
KSTRIPCMD = $(STRIPCMD) $(STRIP_STRIP_UNNEEDED)
|
||||
endif
|
||||
ifeq ($(BR2_STRIP_none),y)
|
||||
TARGET_STRIP = true
|
||||
STRIPCMD = $(TARGET_STRIP)
|
||||
KSTRIPCMD = $(TARGET_STRIP)
|
||||
endif
|
||||
INSTALL := $(shell which install || type -p install)
|
||||
FLEX := $(shell which flex || type -p flex)
|
||||
BISON := $(shell which bison || type -p bison)
|
||||
SED := $(shell which sed || type -p sed) -i -e
|
||||
UNZIP := $(shell which unzip || type -p unzip) -q
|
||||
|
||||
APPLY_PATCHES = support/scripts/apply-patches.sh $(if $(QUIET),-s)
|
||||
APPLY_PATCHES = PATH=$(HOST_DIR)/usr/bin:$$PATH support/scripts/apply-patches.sh $(if $(QUIET),-s)
|
||||
|
||||
HOST_CPPFLAGS = -I$(HOST_DIR)/usr/include
|
||||
HOST_CFLAGS ?= -O2
|
||||
@@ -239,8 +234,10 @@ export PERL=$(shell which perl)
|
||||
# finds this perl module by exporting the proper value for PERL5LIB.
|
||||
export PERL5LIB=$(HOST_DIR)/usr/lib/perl
|
||||
|
||||
TARGET_MAKE_ENV = PATH=$(BR_PATH)
|
||||
|
||||
TARGET_CONFIGURE_OPTS = \
|
||||
PATH=$(BR_PATH) \
|
||||
$(TARGET_MAKE_ENV) \
|
||||
AR="$(TARGET_AR)" \
|
||||
AS="$(TARGET_AS)" \
|
||||
LD="$(TARGET_LD)" \
|
||||
@@ -279,11 +276,17 @@ TARGET_CONFIGURE_OPTS = \
|
||||
STAGING_DIR="$(STAGING_DIR)" \
|
||||
INTLTOOL_PERL=$(PERL)
|
||||
|
||||
TARGET_MAKE_ENV = PATH=$(BR_PATH)
|
||||
|
||||
HOST_MAKE_ENV = \
|
||||
PATH=$(BR_PATH) \
|
||||
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
|
||||
PKG_CONFIG_SYSROOT_DIR="/" \
|
||||
PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
|
||||
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
|
||||
PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig:$(HOST_DIR)/usr/share/pkgconfig"
|
||||
|
||||
HOST_CONFIGURE_OPTS = \
|
||||
PATH=$(BR_PATH) \
|
||||
$(HOST_MAKE_ENV) \
|
||||
AR="$(HOSTAR)" \
|
||||
AS="$(HOSTAS)" \
|
||||
LD="$(HOSTLD)" \
|
||||
@@ -298,19 +301,8 @@ HOST_CONFIGURE_OPTS = \
|
||||
CFLAGS="$(HOST_CFLAGS)" \
|
||||
CXXFLAGS="$(HOST_CXXFLAGS)" \
|
||||
LDFLAGS="$(HOST_LDFLAGS)" \
|
||||
PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
|
||||
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
|
||||
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
|
||||
PKG_CONFIG_SYSROOT_DIR="/" \
|
||||
PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig:$(HOST_DIR)/usr/share/pkgconfig" \
|
||||
INTLTOOL_PERL=$(PERL)
|
||||
|
||||
HOST_MAKE_ENV = \
|
||||
PATH=$(BR_PATH) \
|
||||
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
|
||||
PKG_CONFIG_SYSROOT_DIR="/" \
|
||||
PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig"
|
||||
|
||||
# This is extra environment we can not export ourselves (eg. because some
|
||||
# packages use that variable internally, eg. uboot), so we have to
|
||||
# explicitly pass it to user-supplied external hooks (eg. post-build,
|
||||
@@ -318,8 +310,7 @@ HOST_MAKE_ENV = \
|
||||
EXTRA_ENV = \
|
||||
PATH=$(BR_PATH) \
|
||||
BR2_DL_DIR=$(BR2_DL_DIR) \
|
||||
BUILD_DIR=$(BUILD_DIR) \
|
||||
BR2_EXTERNAL=$(BR2_EXTERNAL)
|
||||
BUILD_DIR=$(BUILD_DIR)
|
||||
|
||||
################################################################################
|
||||
# settings we need to pass to configure
|
||||
@@ -406,3 +397,4 @@ include package/pkg-generic.mk
|
||||
include package/pkg-kconfig.mk
|
||||
include package/pkg-rebar.mk
|
||||
include package/pkg-kernel-module.mk
|
||||
include package/pkg-waf.mk
|
||||
|
||||
@@ -0,0 +1,292 @@
|
||||
From debbe4f7b591b3f35d0ed65c17fa81b196b2eb2d Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@gentoo.org>
|
||||
Date: Tue, 12 Aug 2014 08:37:25 -0400
|
||||
Subject: [PATCH] add __acl_ prefixes to internal symbols
|
||||
|
||||
When static linking libacl, people sometimes run into symbol collisions
|
||||
because their own code defines symbols like "quote". So for acl internal
|
||||
symbols, use an __acl_ prefix.
|
||||
|
||||
[Rahul Bedarkar: backported from upstream
|
||||
http://git.savannah.gnu.org/cgit/acl.git/commit/?id=a2c4d71c2e84419a49db503ed59de4d3d1dca7dd ]
|
||||
Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
|
||||
---
|
||||
exports | 12 ++----------
|
||||
getfacl/getfacl.c | 4 ++--
|
||||
include/misc.h | 8 ++++----
|
||||
libacl/__acl_to_any_text.c | 4 ++--
|
||||
libacl/acl_from_text.c | 4 ++--
|
||||
libmisc/high_water_alloc.c | 2 +-
|
||||
libmisc/next_line.c | 6 +++---
|
||||
libmisc/quote.c | 4 ++--
|
||||
libmisc/unquote.c | 2 +-
|
||||
setfacl/parse.c | 10 +++++-----
|
||||
setfacl/setfacl.c | 4 ++--
|
||||
11 files changed, 26 insertions(+), 34 deletions(-)
|
||||
|
||||
diff --git a/exports b/exports
|
||||
index 7d8e69e..bf15d84 100644
|
||||
--- a/exports
|
||||
+++ b/exports
|
||||
@@ -59,22 +59,14 @@ ACL_1.0 {
|
||||
acl_to_any_text;
|
||||
|
||||
local:
|
||||
- # Library internal stuff
|
||||
+ # Library internal stuff
|
||||
__new_var_obj_p;
|
||||
__new_obj_p_here;
|
||||
__free_obj_p;
|
||||
__check_obj_p;
|
||||
__ext2int_and_check;
|
||||
- __acl_reorder_entry_obj_p;
|
||||
- __acl_reorder_obj_p;
|
||||
- __acl_init_obj;
|
||||
- __acl_create_entry_obj;
|
||||
- __acl_free_acl_obj;
|
||||
- __acl_to_any_text;
|
||||
+ __acl_*;
|
||||
__apply_mask_to_mode;
|
||||
-
|
||||
- quote;
|
||||
- unquote;
|
||||
};
|
||||
|
||||
ACL_1.1 {
|
||||
diff --git a/getfacl/getfacl.c b/getfacl/getfacl.c
|
||||
index f8eaf25..af9e225 100644
|
||||
--- a/getfacl/getfacl.c
|
||||
+++ b/getfacl/getfacl.c
|
||||
@@ -90,7 +90,7 @@ int opt_numeric; /* don't convert id's to symbolic names */
|
||||
|
||||
static const char *xquote(const char *str, const char *quote_chars)
|
||||
{
|
||||
- const char *q = quote(str, quote_chars);
|
||||
+ const char *q = __acl_quote(str, quote_chars);
|
||||
if (q == NULL) {
|
||||
fprintf(stderr, "%s: %s\n", progname, strerror(errno));
|
||||
exit(1);
|
||||
@@ -718,7 +718,7 @@ int main(int argc, char *argv[])
|
||||
do {
|
||||
if (optind == argc ||
|
||||
strcmp(argv[optind], "-") == 0) {
|
||||
- while ((line = next_line(stdin)) != NULL) {
|
||||
+ while ((line = __acl_next_line(stdin)) != NULL) {
|
||||
if (*line == '\0')
|
||||
continue;
|
||||
|
||||
diff --git a/include/misc.h b/include/misc.h
|
||||
index 0c5fdcc..c25accf 100644
|
||||
--- a/include/misc.h
|
||||
+++ b/include/misc.h
|
||||
@@ -15,9 +15,9 @@
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
-extern int high_water_alloc(void **buf, size_t *bufsize, size_t newsize);
|
||||
+extern int __acl_high_water_alloc(void **buf, size_t *bufsize, size_t newsize);
|
||||
|
||||
-extern const char *quote(const char *str, const char *quote_chars);
|
||||
-extern char *unquote(char *str);
|
||||
+extern const char *__acl_quote(const char *str, const char *quote_chars);
|
||||
+extern char *__acl_unquote(char *str);
|
||||
|
||||
-extern char *next_line(FILE *file);
|
||||
+extern char *__acl_next_line(FILE *file);
|
||||
diff --git a/libacl/__acl_to_any_text.c b/libacl/__acl_to_any_text.c
|
||||
index a4f9c34..19f1ccc 100644
|
||||
--- a/libacl/__acl_to_any_text.c
|
||||
+++ b/libacl/__acl_to_any_text.c
|
||||
@@ -159,7 +159,7 @@ acl_entry_to_any_str(const acl_entry_t entry_d, char *text_p, ssize_t size,
|
||||
if (options & TEXT_NUMERIC_IDS)
|
||||
str = NULL;
|
||||
else
|
||||
- str = quote(user_name(
|
||||
+ str = __acl_quote(user_name(
|
||||
entry_obj_p->eid.qid), ":, \t\n\r");
|
||||
if (str != NULL) {
|
||||
strncpy(text_p, str, size);
|
||||
@@ -182,7 +182,7 @@ acl_entry_to_any_str(const acl_entry_t entry_d, char *text_p, ssize_t size,
|
||||
if (options & TEXT_NUMERIC_IDS)
|
||||
str = NULL;
|
||||
else
|
||||
- str = quote(group_name(
|
||||
+ str = __acl_quote(group_name(
|
||||
entry_obj_p->eid.qid), ":, \t\n\r");
|
||||
if (str != NULL) {
|
||||
strncpy(text_p, str, size);
|
||||
diff --git a/libacl/acl_from_text.c b/libacl/acl_from_text.c
|
||||
index 1e05322..f6165be 100644
|
||||
--- a/libacl/acl_from_text.c
|
||||
+++ b/libacl/acl_from_text.c
|
||||
@@ -206,7 +206,7 @@ parse_acl_entry(const char **text_p, acl_t *acl_p)
|
||||
str = get_token(text_p);
|
||||
if (str) {
|
||||
entry_obj.etag = ACL_USER;
|
||||
- error = get_uid(unquote(str),
|
||||
+ error = get_uid(__acl_unquote(str),
|
||||
&entry_obj.eid.qid);
|
||||
free(str);
|
||||
if (error) {
|
||||
@@ -225,7 +225,7 @@ parse_acl_entry(const char **text_p, acl_t *acl_p)
|
||||
str = get_token(text_p);
|
||||
if (str) {
|
||||
entry_obj.etag = ACL_GROUP;
|
||||
- error = get_gid(unquote(str),
|
||||
+ error = get_gid(__acl_unquote(str),
|
||||
&entry_obj.eid.qid);
|
||||
free(str);
|
||||
if (error) {
|
||||
diff --git a/libmisc/high_water_alloc.c b/libmisc/high_water_alloc.c
|
||||
index c127dc1..951f4bb 100644
|
||||
--- a/libmisc/high_water_alloc.c
|
||||
+++ b/libmisc/high_water_alloc.c
|
||||
@@ -21,7 +21,7 @@
|
||||
#include <stdlib.h>
|
||||
#include "misc.h"
|
||||
|
||||
-int high_water_alloc(void **buf, size_t *bufsize, size_t newsize)
|
||||
+int __acl_high_water_alloc(void **buf, size_t *bufsize, size_t newsize)
|
||||
{
|
||||
#define CHUNK_SIZE 256
|
||||
/*
|
||||
diff --git a/libmisc/next_line.c b/libmisc/next_line.c
|
||||
index 0566d7a..126a364 100644
|
||||
--- a/libmisc/next_line.c
|
||||
+++ b/libmisc/next_line.c
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
#define LINE_SIZE getpagesize()
|
||||
|
||||
-char *next_line(FILE *file)
|
||||
+char *__acl_next_line(FILE *file)
|
||||
{
|
||||
static char *line;
|
||||
static size_t line_size;
|
||||
@@ -31,7 +31,7 @@ char *next_line(FILE *file)
|
||||
int eol = 0;
|
||||
|
||||
if (!line) {
|
||||
- if (high_water_alloc((void **)&line, &line_size, LINE_SIZE))
|
||||
+ if (__acl_high_water_alloc((void **)&line, &line_size, LINE_SIZE))
|
||||
return NULL;
|
||||
}
|
||||
c = line;
|
||||
@@ -47,7 +47,7 @@ char *next_line(FILE *file)
|
||||
if (feof(file))
|
||||
break;
|
||||
if (!eol) {
|
||||
- if (high_water_alloc((void **)&line, &line_size,
|
||||
+ if (__acl_high_water_alloc((void **)&line, &line_size,
|
||||
2 * line_size))
|
||||
return NULL;
|
||||
c = strrchr(line, '\0');
|
||||
diff --git a/libmisc/quote.c b/libmisc/quote.c
|
||||
index bf8f9eb..a28800c 100644
|
||||
--- a/libmisc/quote.c
|
||||
+++ b/libmisc/quote.c
|
||||
@@ -23,7 +23,7 @@
|
||||
#include <string.h>
|
||||
#include "misc.h"
|
||||
|
||||
-const char *quote(const char *str, const char *quote_chars)
|
||||
+const char *__acl_quote(const char *str, const char *quote_chars)
|
||||
{
|
||||
static char *quoted_str;
|
||||
static size_t quoted_str_len;
|
||||
@@ -40,7 +40,7 @@ const char *quote(const char *str, const char *quote_chars)
|
||||
if (nonpr == 0)
|
||||
return str;
|
||||
|
||||
- if (high_water_alloc((void **)"ed_str, "ed_str_len,
|
||||
+ if (__acl_high_water_alloc((void **)"ed_str, "ed_str_len,
|
||||
(s - (unsigned char *)str) + nonpr * 3 + 1))
|
||||
return NULL;
|
||||
for (s = (unsigned char *)str, q = quoted_str; *s != '\0'; s++) {
|
||||
diff --git a/libmisc/unquote.c b/libmisc/unquote.c
|
||||
index bffebf9..4f4ce7c 100644
|
||||
--- a/libmisc/unquote.c
|
||||
+++ b/libmisc/unquote.c
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <ctype.h>
|
||||
#include "misc.h"
|
||||
|
||||
-char *unquote(char *str)
|
||||
+char *__acl_unquote(char *str)
|
||||
{
|
||||
unsigned char *s, *t;
|
||||
|
||||
diff --git a/setfacl/parse.c b/setfacl/parse.c
|
||||
index e7e6add..7433459 100644
|
||||
--- a/setfacl/parse.c
|
||||
+++ b/setfacl/parse.c
|
||||
@@ -226,7 +226,7 @@ user_entry:
|
||||
str = get_token(text_p);
|
||||
if (str) {
|
||||
cmd->c_tag = ACL_USER;
|
||||
- error = get_uid(unquote(str), &cmd->c_id);
|
||||
+ error = get_uid(__acl_unquote(str), &cmd->c_id);
|
||||
free(str);
|
||||
if (error) {
|
||||
*text_p = backup;
|
||||
@@ -245,7 +245,7 @@ user_entry:
|
||||
str = get_token(text_p);
|
||||
if (str) {
|
||||
cmd->c_tag = ACL_GROUP;
|
||||
- error = get_gid(unquote(str), &cmd->c_id);
|
||||
+ error = get_gid(__acl_unquote(str), &cmd->c_id);
|
||||
free(str);
|
||||
if (error) {
|
||||
*text_p = backup;
|
||||
@@ -466,7 +466,7 @@ read_acl_comments(
|
||||
if (strncmp(cp, "file:", 5) == 0) {
|
||||
cp += 5;
|
||||
SKIP_WS(cp);
|
||||
- cp = unquote(cp);
|
||||
+ cp = __acl_unquote(cp);
|
||||
|
||||
if (path_p) {
|
||||
if (*path_p)
|
||||
@@ -483,7 +483,7 @@ read_acl_comments(
|
||||
if (uid_p) {
|
||||
if (*uid_p != ACL_UNDEFINED_ID)
|
||||
goto fail;
|
||||
- if (get_uid(unquote(cp), uid_p) != 0)
|
||||
+ if (get_uid(__acl_unquote(cp), uid_p) != 0)
|
||||
continue;
|
||||
}
|
||||
} else if (strncmp(cp, "group:", 6) == 0) {
|
||||
@@ -493,7 +493,7 @@ read_acl_comments(
|
||||
if (gid_p) {
|
||||
if (*gid_p != ACL_UNDEFINED_ID)
|
||||
goto fail;
|
||||
- if (get_gid(unquote(cp), gid_p) != 0)
|
||||
+ if (get_gid(__acl_unquote(cp), gid_p) != 0)
|
||||
continue;
|
||||
}
|
||||
} else if (strncmp(cp, "flags:", 6) == 0) {
|
||||
diff --git a/setfacl/setfacl.c b/setfacl/setfacl.c
|
||||
index 81062a6..fb2d172 100644
|
||||
--- a/setfacl/setfacl.c
|
||||
+++ b/setfacl/setfacl.c
|
||||
@@ -92,7 +92,7 @@ int promote_warning;
|
||||
|
||||
static const char *xquote(const char *str, const char *quote_chars)
|
||||
{
|
||||
- const char *q = quote(str, quote_chars);
|
||||
+ const char *q = __acl_quote(str, quote_chars);
|
||||
if (q == NULL) {
|
||||
fprintf(stderr, "%s: %s\n", progname, strerror(errno));
|
||||
exit(1);
|
||||
@@ -311,7 +311,7 @@ int next_file(const char *arg, seq_t seq)
|
||||
args.seq = seq;
|
||||
|
||||
if (strcmp(arg, "-") == 0) {
|
||||
- while ((line = next_line(stdin)))
|
||||
+ while ((line = __acl_next_line(stdin)))
|
||||
errors = walk_tree(line, walk_flags, 0, do_set, &args);
|
||||
if (!feof(stdin)) {
|
||||
fprintf(stderr, _("%s: Standard input: %s\n"),
|
||||
--
|
||||
2.6.2
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
# locally computed hash
|
||||
sha256 4ac73a5887b643dcca483f0241cbb808a53326846928edad9a2f86cffcde5850 acpica-unix2-20160527.tar.gz
|
||||
sha256 dfb33db5599bd48134dbd6e50c8804099be0cf1c35d98975a6cb84dabca78b67 acpica-unix2-20161117.tar.gz
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ACPICA_VERSION = 20160527
|
||||
ACPICA_VERSION = 20161117
|
||||
ACPICA_SOURCE = acpica-unix2-$(ACPICA_VERSION).tar.gz
|
||||
ACPICA_SITE = https://acpica.org/sites/acpica/files
|
||||
ACPICA_LICENSE = BSD-3c or GPLv2
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# From https://sourceforge.net/projects/acpid2/files/
|
||||
md5 e41bdf628e122edb4342fca432ea7db9 acpid-2.0.27.tar.xz
|
||||
sha1 aabf129499f99b3c14e7a9f5b5ec717b0913e9c8 acpid-2.0.27.tar.xz
|
||||
md5 0432407b5ff75ae8e08afb43052fde2b acpid-2.0.28.tar.xz
|
||||
sha1 a5cb34d53eb6965293c436db23dc81550273975b acpid-2.0.28.tar.xz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ACPID_VERSION = 2.0.27
|
||||
ACPID_VERSION = 2.0.28
|
||||
ACPID_SOURCE = acpid-$(ACPID_VERSION).tar.xz
|
||||
ACPID_SITE = http://downloads.sourceforge.net/project/acpid2
|
||||
ACPID_LICENSE = GPLv2+
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
config BR2_PACKAGE_ACPITOOL
|
||||
bool "acpitool"
|
||||
depends on !BR2_bfin
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
help
|
||||
A small, convenient command-line ACPI client with a lot of
|
||||
@@ -7,5 +10,7 @@ config BR2_PACKAGE_ACPITOOL
|
||||
|
||||
http://acpitool.sourceforge.net
|
||||
|
||||
comment "acpitool needs a toolchain w/ C++"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP
|
||||
comment "acpitool needs a toolchain w/ threads, C++, dynamic library"
|
||||
depends on !BR2_bfin
|
||||
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \
|
||||
|| !BR2_INSTALL_LIBSTDCPP
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# From http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/3.20/adwaita-icon-theme-3.20.sha256sum
|
||||
sha256 7a0a887349f340dd644032f89d81264b694c4b006bd51af1c2c368d431e7ae35 adwaita-icon-theme-3.20.tar.xz
|
||||
# From http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/3.22/adwaita-icon-theme-3.22.0.sha256sum
|
||||
sha256 c18bf6e26087d9819a962c77288b291efab25d0419b73d909dd771716a45dcb7 adwaita-icon-theme-3.22.0.tar.xz
|
||||
|
||||
@@ -4,9 +4,11 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ADWAITA_ICON_THEME_VERSION = 3.20
|
||||
ADWAITA_ICON_THEME_SITE = http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/$(ADWAITA_ICON_THEME_VERSION)
|
||||
ADWAITA_ICON_THEME_VERSION_MAJOR = 3.22
|
||||
ADWAITA_ICON_THEME_VERSION = $(ADWAITA_ICON_THEME_VERSION_MAJOR).0
|
||||
ADWAITA_ICON_THEME_SITE = http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/$(ADWAITA_ICON_THEME_VERSION_MAJOR)
|
||||
ADWAITA_ICON_THEME_SOURCE = adwaita-icon-theme-$(ADWAITA_ICON_THEME_VERSION).tar.xz
|
||||
ADWAITA_ICON_THEME_INSTALL_STAGING = YES
|
||||
ADWAITA_ICON_THEME_LICENSE = LGPLv3 or CC-BY-SA-3.0
|
||||
ADWAITA_ICON_THEME_LICENSE_FILES = COPYING COPYING_LGPL COPYING_CCBYSA3
|
||||
ADWAITA_ICON_THEME_DEPENDENCIES = host-intltool host-libgtk3
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 260190beea911190a839e711f610ec3454a9b13985d35479775b7e26ad4c845e aespipe-v2.4c.tar.bz2
|
||||
sha256 c5ce656e0ade49b93e1163ec7b35450721d5743d8d804ad3a9e39add0389e50f aespipe-v2.4d.tar.bz2
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
AESPIPE_VERSION = 2.4c
|
||||
AESPIPE_VERSION = 2.4d
|
||||
AESPIPE_SOURCE = aespipe-v$(AESPIPE_VERSION).tar.bz2
|
||||
AESPIPE_SITE = http://loop-aes.sourceforge.net/aespipe
|
||||
AESPIPE_LICENSE = GPL
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 d473b98d5f08e572b474c375c11ff1c4c5323824eb721c3979b6c5258b72949d agent++-4.0.4.tar.gz
|
||||
sha256 6775fa2a038801edddedc148d7846427ddc4d438e3bb33362d9eec6074918a88 agent++-4.0.7.tar.gz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
AGENTPP_VERSION = 4.0.4
|
||||
AGENTPP_VERSION = 4.0.7
|
||||
AGENTPP_SOURCE = agent++-$(AGENTPP_VERSION).tar.gz
|
||||
AGENTPP_SITE = http://www.agentpp.com/download
|
||||
AGENTPP_LICENSE = Apache-2.0
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
|
||||
ALLJOYN_BASE_REV = 16.04
|
||||
ALLJOYN_BASE_VERSION = $(ALLJOYN_BASE_REV).00
|
||||
ALLJOYN_BASE_SOURCE = alljoyn-base-$(ALLJOYN_BASE_VERSION).tar.gz
|
||||
ALLJOYN_BASE_SITE = \
|
||||
https://mirrors.kernel.org/allseenalliance/alljoyn/$(ALLJOYN_BASE_REV)
|
||||
# See https://allseenalliance.org/alliance/ip-policy
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 ce6a05a67ff405ba6274e85fe750d98f40cbe7ab2c968218c7741a10bd86e21a ajtcl-16.04.00-src.tar.gz
|
||||
sha256 da13614a9db79067937b744a87328fed84d99ba62e3de19b0ddc4a83e4b2447e ajtcl-16.04.00a-src.tar.gz
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
ALLJOYN_TCL_REV = 16.04
|
||||
ALLJOYN_TCL_VERSION = $(ALLJOYN_TCL_REV).00
|
||||
ALLJOYN_TCL_VERSION = $(ALLJOYN_TCL_REV).00a
|
||||
ALLJOYN_TCL_SOURCE = ajtcl-$(ALLJOYN_TCL_VERSION)-src.tar.gz
|
||||
ALLJOYN_TCL_SITE = \
|
||||
https://mirrors.kernel.org/allseenalliance/alljoyn/$(ALLJOYN_TCL_REV)
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 41bd424d376d22dc2b48cc035400bd63595d19467eeb6a7ae81429f5a43ed2e2 alljoyn-16.04.00-src.tar.gz
|
||||
sha256 fc437d96cf1213f18048240b5d12a374b31894d21830a0a6ccf562ffa13425d5 alljoyn-16.04.00a-src.tar.gz
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
ALLJOYN_REV = 16.04
|
||||
ALLJOYN_VERSION = $(ALLJOYN_REV).00
|
||||
ALLJOYN_VERSION = $(ALLJOYN_REV).00a
|
||||
ALLJOYN_SOURCE = alljoyn-$(ALLJOYN_VERSION)-src.tar.gz
|
||||
ALLJOYN_SITE = https://mirrors.kernel.org/allseenalliance/alljoyn/$(ALLJOYN_REV)
|
||||
# See https://allseenalliance.org/alliance/ip-policy
|
||||
|
||||
@@ -36,10 +36,11 @@ diff --git a/modules/mixer/simple/sbasedl.c b/modules/mixer/simple/sbasedl.c
|
||||
#include <fcntl.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <math.h>
|
||||
+#ifdef HAVE_LIBDL
|
||||
+#include "config.h"
|
||||
+#ifdef HAVE_DLFCN
|
||||
#include <dlfcn.h>
|
||||
+#endif
|
||||
#include "config.h"
|
||||
-#include "config.h"
|
||||
#include "asoundlib.h"
|
||||
#include "mixer_abst.h"
|
||||
diff --git a/src/mixer/simple_abst.c b/src/mixer/simple_abst.c
|
||||
@@ -49,9 +50,10 @@ diff --git a/src/mixer/simple_abst.c b/src/mixer/simple_abst.c
|
||||
#include <fcntl.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <math.h>
|
||||
+#ifdef HAVE_LIBDL
|
||||
+#include "config.h"
|
||||
+#ifdef HAVE_DLFCN
|
||||
#include <dlfcn.h>
|
||||
+#endif
|
||||
#include "config.h"
|
||||
-#include "config.h"
|
||||
#include "asoundlib.h"
|
||||
#include "mixer_simple.h"
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
Linking currently fails on powerpc64 and powerpc64le when configured
|
||||
with --without-versioned, as follows:
|
||||
../src/.libs/libasound.so: undefined reference to `.__snd_pcm_hw_params_set_format_first'
|
||||
(And many similar messages.)
|
||||
|
||||
This appears to be due to a very old (2003) workaround for powerpc64,
|
||||
(introduced by commit 06221f86) in include/alsa-symbols.h which alters
|
||||
symbol names. While it was probably necessary at the time, it does not
|
||||
appear to be necessary now and removing it fixes the build.
|
||||
|
||||
Signed-off-by: Sam Bobroff <sam.bobroff@au1.ibm.com>
|
||||
---
|
||||
include/alsa-symbols.h | 25 ++++---------------------
|
||||
1 file changed, 4 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/include/alsa-symbols.h b/include/alsa-symbols.h
|
||||
index 51cb982..0cb0b9f 100644
|
||||
--- a/include/alsa-symbols.h
|
||||
+++ b/include/alsa-symbols.h
|
||||
@@ -29,19 +29,10 @@
|
||||
#define INTERNAL_CONCAT2_2(Pre, Post) Pre##Post
|
||||
#define INTERNAL(Name) INTERNAL_CONCAT2_2(__, Name)
|
||||
|
||||
-#ifdef __powerpc64__
|
||||
-# define symbol_version(real, name, version) \
|
||||
- __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@" #version); \
|
||||
- __asm__ (".symver ." ASM_NAME(#real) ",." ASM_NAME(#name) "@" #version)
|
||||
-# define default_symbol_version(real, name, version) \
|
||||
- __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@@" #version); \
|
||||
- __asm__ (".symver ." ASM_NAME(#real) ",." ASM_NAME(#name) "@@" #version)
|
||||
-#else
|
||||
-# define symbol_version(real, name, version) \
|
||||
- __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@" #version)
|
||||
-# define default_symbol_version(real, name, version) \
|
||||
- __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@@" #version)
|
||||
-#endif
|
||||
+#define symbol_version(real, name, version) \
|
||||
+__asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@" #version)
|
||||
+#define default_symbol_version(real, name, version) \
|
||||
+__asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@@" #version)
|
||||
|
||||
#ifdef USE_VERSIONED_SYMBOLS
|
||||
#define use_symbol_version(real, name, version) \
|
||||
@@ -50,13 +41,6 @@
|
||||
default_symbol_version(real, name, version)
|
||||
#else
|
||||
#define use_symbol_version(real, name, version) /* nothing */
|
||||
-#ifdef __powerpc64__
|
||||
-#define use_default_symbol_version(real, name, version) \
|
||||
- __asm__ (".weak " ASM_NAME(#name)); \
|
||||
- __asm__ (".weak ." ASM_NAME(#name)); \
|
||||
- __asm__ (".set " ASM_NAME(#name) "," ASM_NAME(#real)); \
|
||||
- __asm__ (".set ." ASM_NAME(#name) ",." ASM_NAME(#real))
|
||||
-#else
|
||||
#if defined(__alpha__) || defined(__mips__)
|
||||
#define use_default_symbol_version(real, name, version) \
|
||||
__asm__ (".weak " ASM_NAME(#name)); \
|
||||
@@ -67,6 +51,5 @@
|
||||
__asm__ (".set " ASM_NAME(#name) "," ASM_NAME(#real))
|
||||
#endif
|
||||
#endif
|
||||
-#endif
|
||||
|
||||
#endif /* __ALSA_SYMBOLS_H */
|
||||
--
|
||||
2.10.0.297.gf6727b0
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
From 13a796b4bd00defa9f9297fd23d508b430682aed Mon Sep 17 00:00:00 2001
|
||||
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
Date: Wed, 21 Dec 2016 19:41:26 -0300
|
||||
Subject: [PATCH] ucm: parser needs limits.h
|
||||
|
||||
It's using PATH_MAX which is defined there, otherwise the build fails on
|
||||
musl libc.
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
---
|
||||
Patch status: sent to alsa-devel ML.
|
||||
|
||||
src/ucm/parser.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/ucm/parser.c b/src/ucm/parser.c
|
||||
index c98373a..f520abc 100644
|
||||
--- a/src/ucm/parser.c
|
||||
+++ b/src/ucm/parser.c
|
||||
@@ -32,6 +32,7 @@
|
||||
|
||||
#include "ucm_local.h"
|
||||
#include <dirent.h>
|
||||
+#include <limits.h>
|
||||
|
||||
/** The name of the environment variable containing the UCM directory */
|
||||
#define ALSA_CONFIG_UCM_VAR "ALSA_CONFIG_UCM"
|
||||
--
|
||||
2.10.2
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 d38dacd9892b06b8bff04923c380b38fb2e379ee5538935ff37e45b395d861d6 alsa-lib-1.1.2.tar.bz2
|
||||
sha256 71282502184c592c1a008e256c22ed0ba5728ca65e05273ceb480c70f515969c alsa-lib-1.1.3.tar.bz2
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ALSA_LIB_VERSION = 1.1.2
|
||||
ALSA_LIB_VERSION = 1.1.3
|
||||
ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2
|
||||
ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib
|
||||
ALSA_LIB_LICENSE = LGPLv2.1+ (library), GPLv2+ (aserver)
|
||||
|
||||
@@ -34,9 +34,6 @@ config BR2_PACKAGE_ALSA_UTILS_ALSALOOP
|
||||
config BR2_PACKAGE_ALSA_UTILS_ALSAMIXER
|
||||
bool "alsamixer"
|
||||
select BR2_PACKAGE_NCURSES
|
||||
select BR2_PACKAGE_NCURSES_TARGET_PANEL
|
||||
select BR2_PACKAGE_NCURSES_TARGET_FORM
|
||||
select BR2_PACKAGE_NCURSES_TARGET_MENU
|
||||
select BR2_PACKAGE_ALSA_LIB_MIXER
|
||||
depends on BR2_USE_WCHAR
|
||||
default y
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 7af603c0877d1251599d65b4fbc372e63a54371b888f5c26c6a86ac1d0519071 alsa-utils-1.1.2.tar.bz2
|
||||
sha256 127217a54eea0f9a49700a2f239a2d4f5384aa094d68df04a8eb80132eb6167c alsa-utils-1.1.3.tar.bz2
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ALSA_UTILS_VERSION = 1.1.2
|
||||
ALSA_UTILS_VERSION = 1.1.3
|
||||
ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2
|
||||
ALSA_UTILS_SITE = ftp://ftp.alsa-project.org/pub/utils
|
||||
ALSA_UTILS_LICENSE = GPLv2
|
||||
@@ -23,6 +23,7 @@ ALSA_UTILS_CONF_ENV = \
|
||||
|
||||
ALSA_UTILS_CONF_OPTS = \
|
||||
--disable-xmlto \
|
||||
--disable-rst2man \
|
||||
--with-curses=$(if $(BR2_PACKAGE_NCURSES_WCHAR),ncursesw,ncurses)
|
||||
|
||||
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
|
||||
|
||||
@@ -19,19 +19,19 @@ AM335X_MAKE_TARGET = release $(if $(BR2_STATIC_LIBS),,sorelease)
|
||||
endif
|
||||
|
||||
define AM335X_PRU_PACKAGE_BUILD_CMDS
|
||||
$(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" \
|
||||
$(TARGET_MAKE_ENV) $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" \
|
||||
-C $(@D)/pru_sw/app_loader/interface $(AM335X_MAKE_TARGET)
|
||||
endef
|
||||
|
||||
# 'install' installs whatever was built, and our patch removes the dependency
|
||||
# on the release build, so we can use it to install whatever we built above.
|
||||
define AM335X_PRU_PACKAGE_INSTALL_STAGING_CMDS
|
||||
$(MAKE1) DESTDIR="$(STAGING_DIR)" PREFIX="/usr" \
|
||||
$(TARGET_MAKE_ENV) $(MAKE1) DESTDIR="$(STAGING_DIR)" PREFIX="/usr" \
|
||||
-C $(@D)/pru_sw/app_loader/interface install
|
||||
endef
|
||||
|
||||
define AM335X_PRU_PACKAGE_INSTALL_TARGET_CMDS
|
||||
$(MAKE1) DESTDIR="$(TARGET_DIR)" PREFIX="/usr" \
|
||||
$(TARGET_MAKE_ENV) $(MAKE1) DESTDIR="$(TARGET_DIR)" PREFIX="/usr" \
|
||||
-C $(@D)/pru_sw/app_loader/interface install
|
||||
endef
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ AM33X_CM3_LICENSE_FILES = License.txt
|
||||
# The build command below will use the standard cross-compiler (normally
|
||||
# build for Cortex-A8, to build the FW for the Cortex-M3.
|
||||
define AM33X_CM3_BUILD_CMDS
|
||||
$(MAKE) CC="$(TARGET_CC)" CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) all
|
||||
$(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) all
|
||||
endef
|
||||
|
||||
# Not all of the firmware files are used
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
From c35482bc0cc56b40263b74c3e58e42be867fd9f2 Mon Sep 17 00:00:00 2001
|
||||
From: Alberto Milone <alberto.milone@canonical.com>
|
||||
Date: Thu, 17 Sep 2015 15:41:46 +0200
|
||||
Subject: [PATCH] Add support for Linux 4.0
|
||||
|
||||
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
|
||||
---
|
||||
common/lib/modules/fglrx/build_mod/firegl_public.c | 5 +++++
|
||||
common/lib/modules/fglrx/build_mod/kcl_str.c | 4 ++++
|
||||
2 files changed, 9 insertions(+)
|
||||
|
||||
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
index 677565d..6017e89 100755
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
@@ -285,6 +285,11 @@ MODULE_DEVICE_TABLE(pci, fglrx_pci_table);
|
||||
|
||||
MODULE_INFO(supported, "external");
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
|
||||
+#define read_cr4() __read_cr4()
|
||||
+#define write_cr4(cr4) __write_cr4(cr4)
|
||||
+#endif
|
||||
+
|
||||
/* globals constants */
|
||||
const char* KCL_SYSINFO_OsVersionString = UTS_RELEASE;
|
||||
const unsigned int KCL_SYSINFO_PageSize = PAGE_SIZE;
|
||||
diff --git a/common/lib/modules/fglrx/build_mod/kcl_str.c b/common/lib/modules/fglrx/build_mod/kcl_str.c
|
||||
index 2d89eb0..bacdb69 100755
|
||||
--- a/common/lib/modules/fglrx/build_mod/kcl_str.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/kcl_str.c
|
||||
@@ -42,6 +42,10 @@
|
||||
#include "kcl_type.h"
|
||||
#include "kcl_str.h"
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
|
||||
+#define strnicmp strncasecmp
|
||||
+#endif
|
||||
+
|
||||
/** \brief Fill memory with a constant byte
|
||||
* \param s Pointer to memory
|
||||
* \param c Initializing value
|
||||
--
|
||||
2.8.1
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
From e9c8ccb4c8c842042542b792c51f9a7ec6c85e06 Mon Sep 17 00:00:00 2001
|
||||
From: Alberto Milone <alberto.milone@canonical.com>
|
||||
Date: Thu, 17 Sep 2015 15:44:59 +0200
|
||||
Subject: [PATCH] Add support for Linux 4.1
|
||||
|
||||
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
|
||||
---
|
||||
common/lib/modules/fglrx/build_mod/firegl_public.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
index 6017e89..94778f1 100755
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
@@ -3508,10 +3508,12 @@ int ATI_API_CALL KCL_InstallInterruptHandler(
|
||||
KCL_PUB_InterruptHandlerWrap,
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
|
||||
((useMSI) ? (SA_INTERRUPT) : (SA_SHIRQ)),
|
||||
-#else
|
||||
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0)
|
||||
//when MSI enabled. keep irq disabled when calling the action handler,
|
||||
//exclude this IRQ from irq balancing (only on one CPU)
|
||||
((useMSI) ? (IRQF_DISABLED) : (IRQF_SHARED)),
|
||||
+#else
|
||||
+ ((useMSI) ? (0x0) : (IRQF_SHARED)),
|
||||
#endif
|
||||
dev_name,
|
||||
context);
|
||||
--
|
||||
2.8.1
|
||||
|
||||
@@ -0,0 +1,121 @@
|
||||
From e2e6c2dac2a0311a022208dd289374b832538329 Mon Sep 17 00:00:00 2001
|
||||
From: Alberto Milone <alberto.milone@canonical.com>
|
||||
Date: Tue, 14 Jul 2015 12:56:37 +0200
|
||||
Subject: [PATCH] Add support for Linux 4.2
|
||||
|
||||
Deal with the FPU code renaming
|
||||
|
||||
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
|
||||
---
|
||||
common/lib/modules/fglrx/build_mod/firegl_public.c | 38 ++++++++++++++++++++++
|
||||
1 file changed, 38 insertions(+)
|
||||
|
||||
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
index 94778f1..749ea51 100755
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
@@ -191,9 +191,17 @@
|
||||
#include <linux/string.h>
|
||||
#include <linux/gfp.h>
|
||||
#include <linux/swap.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
|
||||
#include "asm/i387.h"
|
||||
+#else
|
||||
+#include <asm/fpu/api.h>
|
||||
+#endif
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
|
||||
#include <asm/fpu-internal.h>
|
||||
+#else
|
||||
+#include <asm/fpu/internal.h>
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
#include "firegl_public.h"
|
||||
@@ -1711,6 +1719,9 @@ void ATI_API_CALL KCL_SetCurrentProcessState(KCL_ENUM_ProcessState state)
|
||||
|
||||
#if defined(__i386__)
|
||||
#ifndef __HAVE_ARCH_CMPXCHG
|
||||
+#ifndef __xg
|
||||
+#define __xg(x) ((volatile long *)(x))
|
||||
+#endif
|
||||
static inline
|
||||
unsigned long __fgl_cmpxchg(volatile void *ptr, unsigned long old,
|
||||
unsigned long new, int size)
|
||||
@@ -1747,7 +1758,11 @@ unsigned long ATI_API_CALL kcl__cmpxchg(volatile void *ptr, unsigned long old,
|
||||
unsigned long new, int size)
|
||||
{
|
||||
#ifndef __HAVE_ARCH_CMPXCHG
|
||||
+#if defined(__i386__)
|
||||
return __fgl_cmpxchg(ptr,old,new,size);
|
||||
+#elif defined(__x86_64__)
|
||||
+ return cmpxchg((unsigned long*)ptr,old,new);
|
||||
+#endif
|
||||
#else
|
||||
/* On kernel version 2.6.34 passing a variable or unsupported size
|
||||
* argument to the __cmpxchg macro causes the default-clause of a
|
||||
@@ -6443,21 +6458,36 @@ static int KCL_fpu_save_init(struct task_struct *tsk)
|
||||
struct fpu *fpu = &tsk->thread.fpu;
|
||||
|
||||
if(static_cpu_has(X86_FEATURE_XSAVE)) {
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
|
||||
fpu_xsave(fpu);
|
||||
if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP))
|
||||
+#else
|
||||
+ copy_xregs_to_kernel(&fpu->state.xsave);
|
||||
+ if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP))
|
||||
+#endif
|
||||
return 1;
|
||||
} else if (static_cpu_has(X86_FEATURE_FXSR)) {
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
|
||||
fpu_fxsave(fpu);
|
||||
+#else
|
||||
+ copy_fxregs_to_kernel(fpu);
|
||||
+#endif
|
||||
} else {
|
||||
asm volatile("fnsave %[fx]; fwait"
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
|
||||
: [fx] "=m" (fpu->state->fsave));
|
||||
+#else
|
||||
+ : [fx] "=m" (fpu->state.fsave));
|
||||
+#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
|
||||
if (unlikely(fpu->state->fxsave.swd & X87_FSW_ES)) {
|
||||
asm volatile("fnclex");
|
||||
return 0;
|
||||
}
|
||||
+#endif
|
||||
return 1;
|
||||
}
|
||||
#endif
|
||||
@@ -6469,8 +6499,12 @@ static int KCL_fpu_save_init(struct task_struct *tsk)
|
||||
void ATI_API_CALL KCL_fpu_begin(void)
|
||||
{
|
||||
#ifdef CONFIG_X86_64
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
|
||||
kernel_fpu_begin();
|
||||
#else
|
||||
+ __kernel_fpu_begin();
|
||||
+#endif
|
||||
+#else
|
||||
#ifdef TS_USEDFPU
|
||||
struct thread_info *cur_thread = current_thread_info();
|
||||
struct task_struct *cur_task = get_current();
|
||||
@@ -6515,7 +6549,11 @@ void ATI_API_CALL KCL_fpu_begin(void)
|
||||
*/
|
||||
void ATI_API_CALL KCL_fpu_end(void)
|
||||
{
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
|
||||
kernel_fpu_end();
|
||||
+#else
|
||||
+ __kernel_fpu_end();
|
||||
+#endif
|
||||
}
|
||||
|
||||
/** Create new directory entry under "/proc/...."
|
||||
--
|
||||
2.8.1
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
From 7120f00015570a2e4d9b6532731960d509c71cba Mon Sep 17 00:00:00 2001
|
||||
From: Alberto Milone <alberto.milone@canonical.com>
|
||||
Date: Thu, 17 Sep 2015 15:48:30 +0200
|
||||
Subject: [PATCH] Use fpregs_active instead of has_fpu
|
||||
|
||||
This is for Linux 4.2
|
||||
|
||||
Thanks to Tim Gardner for the patch.
|
||||
|
||||
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
|
||||
---
|
||||
common/lib/modules/fglrx/build_mod/firegl_public.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
index 749ea51..4c1f9a5 100755
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
@@ -6528,7 +6528,11 @@ void ATI_API_CALL KCL_fpu_begin(void)
|
||||
/* The thread structure is changed with the commit below for kernel 3.3:
|
||||
* https://github.com/torvalds/linux/commit/7e16838d94b566a17b65231073d179bc04d590c8
|
||||
*/
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)
|
||||
+ if (cur_task->thread.fpu.fpregs_active)
|
||||
+#else
|
||||
if (cur_task->thread.fpu.has_fpu)
|
||||
+#endif
|
||||
#else
|
||||
if (cur_task->thread.has_fpu)
|
||||
#endif
|
||||
--
|
||||
2.8.1
|
||||
|
||||
@@ -0,0 +1,79 @@
|
||||
From eb703737be5c91c1a0817351db8ec152c523c85d Mon Sep 17 00:00:00 2001
|
||||
From: Alberto Milone <alberto.milone@canonical.com>
|
||||
Date: Thu, 17 Sep 2015 15:49:46 +0200
|
||||
Subject: [PATCH] Use a local copy of copy_xregs_to_kernel
|
||||
|
||||
This is needed for Linux 4.2.
|
||||
|
||||
Thanks to Tim Gardner for the patch.
|
||||
|
||||
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
|
||||
---
|
||||
common/lib/modules/fglrx/build_mod/firegl_public.c | 44 +++++++++++++++++++++-
|
||||
1 file changed, 43 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
index 4c1f9a5..bb67bba 100755
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
@@ -6443,6 +6443,48 @@ int ATI_API_CALL kcl_sscanf(const char * buf, const char * fmt, ...)
|
||||
return i;
|
||||
}
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)
|
||||
+/*
|
||||
+ * Save processor xstate to xsave area.
|
||||
+ */
|
||||
+static void _copy_xregs_to_kernel(struct xregs_state *xstate)
|
||||
+{
|
||||
+ u64 mask = -1;
|
||||
+ u32 lmask = mask;
|
||||
+ u32 hmask = mask >> 32;
|
||||
+ int err = 0;
|
||||
+
|
||||
+ /*WARN_ON(!alternatives_patched);*/
|
||||
+
|
||||
+ /*
|
||||
+ * If xsaves is enabled, xsaves replaces xsaveopt because
|
||||
+ * it supports compact format and supervisor states in addition to
|
||||
+ * modified optimization in xsaveopt.
|
||||
+ *
|
||||
+ * Otherwise, if xsaveopt is enabled, xsaveopt replaces xsave
|
||||
+ * because xsaveopt supports modified optimization which is not
|
||||
+ * supported by xsave.
|
||||
+ *
|
||||
+ * If none of xsaves and xsaveopt is enabled, use xsave.
|
||||
+ */
|
||||
+ alternative_input_2(
|
||||
+ "1:"XSAVE,
|
||||
+ XSAVEOPT,
|
||||
+ X86_FEATURE_XSAVEOPT,
|
||||
+ XSAVES,
|
||||
+ X86_FEATURE_XSAVES,
|
||||
+ [xstate] "D" (xstate), "a" (lmask), "d" (hmask) :
|
||||
+ "memory");
|
||||
+ asm volatile("2:\n\t"
|
||||
+ xstate_fault(err)
|
||||
+ : "0" (err)
|
||||
+ : "memory");
|
||||
+
|
||||
+ /* We should never fault when copying to a kernel buffer: */
|
||||
+ WARN_ON_FPU(err);
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
/** \brief Generate UUID
|
||||
* \param buf pointer to the generated UUID
|
||||
* \return None
|
||||
@@ -6462,7 +6504,7 @@ static int KCL_fpu_save_init(struct task_struct *tsk)
|
||||
fpu_xsave(fpu);
|
||||
if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP))
|
||||
#else
|
||||
- copy_xregs_to_kernel(&fpu->state.xsave);
|
||||
+ _copy_xregs_to_kernel(&fpu->state.xsave);
|
||||
if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP))
|
||||
#endif
|
||||
return 1;
|
||||
--
|
||||
2.8.1
|
||||
|
||||
@@ -0,0 +1,78 @@
|
||||
From 54b230e26a1889c08507e791ab043f8a4b4ff771 Mon Sep 17 00:00:00 2001
|
||||
From: Romain Perier <romain.perier@free-electrons.com>
|
||||
Date: Thu, 7 Jul 2016 14:40:53 +0200
|
||||
Subject: [PATCH] Add support for Linux 4.4
|
||||
|
||||
It fixes various things like the use of seq_printf because its API
|
||||
changed. It also replaces the call to mtrr_add and mtrr_del by
|
||||
arch_phys_wc_add and arch_phys_wc_del because these symbols are
|
||||
no longer exported for Linux >= 4.3.x.
|
||||
|
||||
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
|
||||
---
|
||||
common/lib/modules/fglrx/build_mod/firegl_public.c | 21 +++++++++++++++++++++
|
||||
1 file changed, 21 insertions(+)
|
||||
|
||||
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
index bb67bba..b4b2d30 100755
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
@@ -636,9 +636,16 @@ static int firegl_major_proc_read(struct seq_file *m, void* data)
|
||||
|
||||
len = snprintf(buf, request, "%d\n", major);
|
||||
#else
|
||||
+
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)
|
||||
+ seq_printf(m, "%d\n", major);
|
||||
+ len = 0;
|
||||
+#else
|
||||
len = seq_printf(m, "%d\n", major);
|
||||
#endif
|
||||
|
||||
+#endif
|
||||
+
|
||||
KCL_DEBUG1(FN_FIREGL_PROC, "return len=%i\n",len);
|
||||
|
||||
return len;
|
||||
@@ -3432,7 +3439,11 @@ int ATI_API_CALL KCL_MEM_MTRR_Support(void)
|
||||
int ATI_API_CALL KCL_MEM_MTRR_AddRegionWc(unsigned long base, unsigned long size)
|
||||
{
|
||||
#ifdef CONFIG_MTRR
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)
|
||||
+ return arch_phys_wc_add(base, size);
|
||||
+#else
|
||||
return mtrr_add(base, size, MTRR_TYPE_WRCOMB, 1);
|
||||
+#endif
|
||||
#else /* !CONFIG_MTRR */
|
||||
return -EPERM;
|
||||
#endif /* !CONFIG_MTRR */
|
||||
@@ -3441,7 +3452,12 @@ int ATI_API_CALL KCL_MEM_MTRR_AddRegionWc(unsigned long base, unsigned long size
|
||||
int ATI_API_CALL KCL_MEM_MTRR_DeleteRegion(int reg, unsigned long base, unsigned long size)
|
||||
{
|
||||
#ifdef CONFIG_MTRR
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)
|
||||
+ arch_phys_wc_del(reg);
|
||||
+ return 0;
|
||||
+#else
|
||||
return mtrr_del(reg, base, size);
|
||||
+#endif
|
||||
#else /* !CONFIG_MTRR */
|
||||
return -EPERM;
|
||||
#endif /* !CONFIG_MTRR */
|
||||
@@ -6505,8 +6521,13 @@ static int KCL_fpu_save_init(struct task_struct *tsk)
|
||||
if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP))
|
||||
#else
|
||||
_copy_xregs_to_kernel(&fpu->state.xsave);
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0)
|
||||
+ if (!(fpu->state.xsave.header.xfeatures & XFEATURE_MASK_FP))
|
||||
+#else
|
||||
if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP))
|
||||
#endif
|
||||
+
|
||||
+#endif
|
||||
return 1;
|
||||
} else if (static_cpu_has(X86_FEATURE_FXSR)) {
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
|
||||
--
|
||||
2.8.1
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
Author: Manuel Rüger <mrueg@gentoo.org>
|
||||
Date: Sat, 2 Jan 2016 17:24:30 +0100
|
||||
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/x11-drivers/ati-drivers/files?id=179aa11ed2f1bd79cf1b190263c3a7a07279fc50
|
||||
|
||||
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
|
||||
---
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-18 23:57:02.000000000 -0400
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-18 23:57:11.000000000 -0400
|
||||
@@ -136,7 +136,6 @@
|
||||
#include <asm/mman.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/processor.h>
|
||||
-#include <asm/tlbflush.h> // for flush_tlb_page
|
||||
#include <asm/cpufeature.h>
|
||||
#ifdef CONFIG_MTRR
|
||||
#include <asm/mtrr.h>
|
||||
@@ -251,6 +250,26 @@
|
||||
#define WRITE_CR4(x) write_cr4(x)
|
||||
#endif
|
||||
|
||||
+#define __flush_tlb_one(addr) asm volatile("invlpg (%0)" ::"r" (addr) : "memory")
|
||||
+#define __flush_tlb() native_write_cr3(native_read_cr3())
|
||||
+
|
||||
+static inline void __flush_tlb_all(void)
|
||||
+{
|
||||
+ if (cpu_has_pge)
|
||||
+ {
|
||||
+ unsigned long flags, cr4;
|
||||
+ raw_local_irq_save(flags);
|
||||
+ cr4 = native_read_cr4();
|
||||
+ native_write_cr4(cr4 & ~X86_CR4_PGE);
|
||||
+ native_write_cr4(cr4);
|
||||
+ raw_local_irq_restore(flags);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ __flush_tlb();
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
// ============================================================
|
||||
/* globals */
|
||||
|
||||
--- a/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2015-09-19 00:43:35.000000000 -0400
|
||||
+++ b/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2015-09-19 00:43:48.000000000 -0400
|
||||
@@ -868,7 +868,7 @@ void ATI_API_CALL KCL_ACPI_No_Hotplug(vo
|
||||
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
|
||||
if(pdev)
|
||||
{
|
||||
-#if (UTS_UBUNTU_RELEASE_ABI < 0 && LINUX_VERSION_CODE < KERNEL_VERSION(4,1,3)) || (UTS_UBUNTU_RELEASE_ABI >= 0 && UTS_UBUNTU_RELEASE_ABI < 26 && LINUX_VERSION_CODE <= KERNEL_VERSION(3,19,8))
|
||||
+#if 0 && (UTS_UBUNTU_RELEASE_ABI < 0 && LINUX_VERSION_CODE < KERNEL_VERSION(4,1,3)) || (UTS_UBUNTU_RELEASE_ABI >= 0 && UTS_UBUNTU_RELEASE_ABI < 26 && LINUX_VERSION_CODE <= KERNEL_VERSION(3,19,8))
|
||||
pci_ignore_hotplug(pdev);
|
||||
#else
|
||||
pdev->ignore_hotplug = 1;
|
||||
4
bsp/buildroot/package/amd-catalyst/20-fglrx.conf
Normal file
4
bsp/buildroot/package/amd-catalyst/20-fglrx.conf
Normal file
@@ -0,0 +1,4 @@
|
||||
Section "Device"
|
||||
Identifier "AMD Radeon GPU"
|
||||
Driver "fglrx"
|
||||
EndSection
|
||||
81
bsp/buildroot/package/amd-catalyst/Config.in
Normal file
81
bsp/buildroot/package/amd-catalyst/Config.in
Normal file
@@ -0,0 +1,81 @@
|
||||
comment "amd-catalyst needs a glibc toolchain"
|
||||
depends on BR2_i386 || BR2_x86_64
|
||||
depends on !BR2_TOOLCHAIN_USES_GLIBC
|
||||
|
||||
config BR2_PACKAGE_AMD_CATALYST
|
||||
bool "amd-catalyst"
|
||||
depends on BR2_i386 || BR2_x86_64
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC
|
||||
help
|
||||
The binary-only driver blob for AMD cards.
|
||||
This driver supports AMD Radeon HD 5xxx and newer graphics
|
||||
cards.
|
||||
|
||||
http://www.amd.com/
|
||||
|
||||
if BR2_PACKAGE_AMD_CATALYST
|
||||
|
||||
comment "amd-catalyst X.org drivers needs a modular Xorg server <= 1.17"
|
||||
depends on !BR2_PACKAGE_XORG7 \
|
||||
|| !BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR \
|
||||
|| !BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
|
||||
|
||||
config BR2_PACKAGE_AMD_CATALYST_XORG
|
||||
bool "X.org drivers"
|
||||
default y
|
||||
depends on BR2_PACKAGE_XORG7
|
||||
depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
|
||||
depends on BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
|
||||
select BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX
|
||||
select BR2_PACKAGE_ACPID # runtime
|
||||
select BR2_PACKAGE_XLIB_LIBX11 # runtime
|
||||
select BR2_PACKAGE_XLIB_LIBXEXT # runtime
|
||||
select BR2_PACKAGE_XLIB_LIBXCOMPOSITE # runtime
|
||||
# This package does not have standard GL headers
|
||||
select BR2_PACKAGE_MESA3D_HEADERS
|
||||
select BR2_PACKAGE_HAS_LIBGL
|
||||
|
||||
if BR2_PACKAGE_AMD_CATALYST_XORG
|
||||
|
||||
config BR2_PACKAGE_PROVIDES_LIBGL
|
||||
default "amd-catalyst"
|
||||
|
||||
config BR2_PACKAGE_AMD_CATALYST_CMDLINE_TOOLS
|
||||
bool "command-line configuration tools"
|
||||
help
|
||||
Build and install the AMD command line tools.
|
||||
|
||||
comment "Catalyst Control Center needs Qt4 with X11 and PNG support"
|
||||
depends on !BR2_PACKAGE_QT || !BR2_PACKAGE_QT_X11 \
|
||||
|| BR2_PACKAGE_QT_NOPNG
|
||||
|
||||
config BR2_PACKAGE_AMD_CATALYST_CCCLE
|
||||
bool "Catalyst Control Center"
|
||||
depends on BR2_PACKAGE_QT
|
||||
depends on BR2_PACKAGE_QT_X11
|
||||
depends on !BR2_PACKAGE_QT_NOPNG
|
||||
select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # procps-ng
|
||||
select BR2_PACKAGE_PROCPS_NG # runtime
|
||||
select BR2_PACKAGE_QT_ACCESSIBILITY
|
||||
help
|
||||
Installs the Catalyst Control Center, a Qt graphical tool to
|
||||
control AMD graphics accelerators.
|
||||
|
||||
endif
|
||||
|
||||
comment "amd-catalyst kernel module needs a kernel to be built"
|
||||
depends on !BR2_LINUX_KERNEL
|
||||
|
||||
config BR2_PACKAGE_AMD_CATALYST_MODULE
|
||||
bool "fglrx kernel module"
|
||||
depends on BR2_LINUX_KERNEL
|
||||
help
|
||||
Builds and install the fglrx kernel module
|
||||
|
||||
config BR2_PACKAGE_AMD_CATALYST_OPENCL
|
||||
bool "OpenCL support"
|
||||
help
|
||||
Installs the OpenCL binary blobs and the ICD profile
|
||||
for GPGPU computing.
|
||||
|
||||
endif # BR2_PACKAGE_AMD_CATALYST
|
||||
2
bsp/buildroot/package/amd-catalyst/amd-catalyst.hash
Normal file
2
bsp/buildroot/package/amd-catalyst/amd-catalyst.hash
Normal file
@@ -0,0 +1,2 @@
|
||||
# Locally computed
|
||||
sha256 bf3e6e7d5c51db3d075410a3f116f865b82823debc1d66698d187249feec6a91 amd-catalyst-15.9-linux-installer-15.201.1151-x86.x86_64.zip
|
||||
174
bsp/buildroot/package/amd-catalyst/amd-catalyst.mk
Normal file
174
bsp/buildroot/package/amd-catalyst/amd-catalyst.mk
Normal file
@@ -0,0 +1,174 @@
|
||||
################################################################################
|
||||
#
|
||||
# amd-catalyst
|
||||
#
|
||||
################################################################################
|
||||
|
||||
AMD_CATALYST_VERSION = 15.9
|
||||
AMD_CATALYST_VERBOSE_VER = 15.201.1151
|
||||
AMD_CATALYST_SITE = http://www2.ati.com/drivers/linux
|
||||
AMD_CATALYST_DL_OPTS = --referer='http://support.amd.com'
|
||||
AMD_CATALYST_SOURCE = amd-catalyst-$(AMD_CATALYST_VERSION)-linux-installer-$(AMD_CATALYST_VERBOSE_VER)-x86.x86_64.zip
|
||||
AMD_CATALYST_LICENSE = AMD Software License
|
||||
AMD_CATALYST_LICENSE_FILES = LICENSE.TXT
|
||||
AMD_CATALYST_INSTALL_STAGING = YES
|
||||
AMD_CATALYST_SUFFIX = $(if $(BR2_x86_64),_64)
|
||||
AMD_CATALYST_ARCH_DIR = $(@D)/arch/x86$(AMD_CATALYST_SUFFIX)
|
||||
AMD_CATALYST_LIB_SUFFIX = $(if $(BR2_x86_64),64)
|
||||
|
||||
|
||||
define AMD_CATALYST_EXTRACT_CMDS
|
||||
unzip -q $(DL_DIR)/$(AMD_CATALYST_SOURCE) -d $(@D)
|
||||
$(SHELL) $(@D)/AMD-Catalyst-$(AMD_CATALYST_VERSION)-Linux-installer-$(AMD_CATALYST_VERBOSE_VER)-x86.x86_64.run --extract $(@D)
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_PACKAGE_AMD_CATALYST_MODULE),y)
|
||||
AMD_CATALYST_MODULE_SUBDIRS = common/lib/modules/fglrx/build_mod/2.6.x
|
||||
AMD_CATALYST_MODULE_MAKE_OPTS = \
|
||||
CFLAGS_MODULE="-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
|
||||
|
||||
define AMD_CATALYST_PREPARE_MODULE
|
||||
# The Makefile expects to have source in the folder 2.6.x
|
||||
cp $(@D)/common/lib/modules/fglrx/build_mod/*.{c,h} \
|
||||
$(@D)/common/lib/modules/fglrx/build_mod/2.6.x
|
||||
# This static lib is required during the link
|
||||
cp $(@D)/arch/x86$(AMD_CATALYST_SUFFIX)/lib/modules/fglrx/build_mod/libfglrx_ip.a \
|
||||
$(@D)/common/lib/modules/fglrx/build_mod/2.6.x
|
||||
endef
|
||||
|
||||
AMD_CATALYST_POST_PATCH_HOOKS += AMD_CATALYST_PREPARE_MODULE
|
||||
|
||||
$(eval $(kernel-module))
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_AMD_CATALYST_OPENCL),y)
|
||||
|
||||
AMD_CATALYST_OCL_SUFFIX = $(if $(BR2_x86_64),64,32)
|
||||
AMD_CATALYST_OPENCL_FILES = \
|
||||
libOpenCL.so.1 \
|
||||
libaticalcl.so \
|
||||
libamdocl$(AMD_CATALYST_OCL_SUFFIX).so \
|
||||
libamdocl12cl$(AMD_CATALYST_OCL_SUFFIX).so
|
||||
|
||||
define AMD_CATALYST_INSTALL_OPENCL
|
||||
$(foreach f,$(AMD_CATALYST_OPENCL_FILES), \
|
||||
$(INSTALL) -D -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/lib$(AMD_CATALYST_LIB_SUFFIX)/$(f) $(TARGET_DIR)/usr/lib/$(f)
|
||||
)
|
||||
ln -sf libOpenCL.so.1 \
|
||||
$(TARGET_DIR)/usr/lib/libOpenCL.so
|
||||
$(INSTALL) -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/bin/clinfo \
|
||||
$(TARGET_DIR)/usr/bin/clinfo
|
||||
$(INSTALL) -D -m 0644 $(AMD_CATALYST_ARCH_DIR)/etc/OpenCL/vendors/amdocl$(AMD_CATALYST_OCL_SUFFIX).icd \
|
||||
$(TARGET_DIR)/etc/OpenCL/vendors/amdocl$(AMD_CATALYST_OCL_SUFFIX).icd
|
||||
endef
|
||||
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_AMD_CATALYST_XORG), y)
|
||||
|
||||
# GL headers are needed by any package that wants to use libgl, so they need to
|
||||
# be installed before any user of it. The only way to do so is to have this
|
||||
# package depends on mesa3d-headers.
|
||||
AMD_CATALYST_DEPENDENCIES += mesa3d-headers
|
||||
AMD_CATALYST_PROVIDES = libgl
|
||||
AMD_CATALYST_X11R6_LIB = $(@D)/xpic$(if $(BR2_x86_64),_64a)/usr/X11R6/lib$(AMD_CATALYST_LIB_SUFFIX)
|
||||
|
||||
define AMD_CATALYST_INSTALL_GL_LIBS
|
||||
$(INSTALL) -m 0644 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/lib$(AMD_CATALYST_LIB_SUFFIX)/fglrx/fglrx-libGL.so.1.2 \
|
||||
$(1)/usr/lib
|
||||
ln -sf fglrx-libGL.so.1.2 $(1)/usr/lib/libGL.so.1.2
|
||||
ln -sf fglrx-libGL.so.1.2 $(1)/usr/lib/libGL.so.1
|
||||
ln -sf fglrx-libGL.so.1.2 $(1)/usr/lib/libGL.so
|
||||
endef
|
||||
|
||||
define AMD_CATALYST_INSTALL_STAGING_XORG
|
||||
$(call AMD_CATALYST_INSTALL_GL_LIBS,$(STAGING_DIR))
|
||||
$(INSTALL) -D -m 0644 package/amd-catalyst/gl.pc \
|
||||
$(STAGING_DIR)/usr/lib/pkgconfig/gl.pc
|
||||
endef
|
||||
|
||||
AMD_CATALYST_XORG_DRIVERS_FILES = modules/amdxmm.so \
|
||||
modules/drivers/fglrx_drv.so \
|
||||
modules/linux/libfglrxdrm.so
|
||||
|
||||
define AMD_CATALYST_INSTALL_XORG
|
||||
# Xorg drivers
|
||||
$(foreach f,$(AMD_CATALYST_XORG_DRIVERS_FILES), \
|
||||
$(INSTALL) -D -m 0755 $(AMD_CATALYST_X11R6_LIB)/$(f) \
|
||||
$(TARGET_DIR)/usr/lib/xorg/$(f)
|
||||
)
|
||||
|
||||
# Xorg is not able to detect the driver automatically
|
||||
$(INSTALL) -D -m 0644 package/amd-catalyst/20-fglrx.conf \
|
||||
$(TARGET_DIR)/etc/X11/xorg.conf.d/20-fglrx.conf
|
||||
|
||||
|
||||
# Common files: containing binary profiles about GPUs,
|
||||
# required by the fglrx_drv xorg driver
|
||||
$(INSTALL) -d $(TARGET_DIR)/etc/ati
|
||||
$(INSTALL) -m 0644 $(@D)/common/etc/ati/* $(TARGET_DIR)/etc/ati/
|
||||
|
||||
# DRI and GLX xorg modules: by default DRI is activated,
|
||||
# these modules are required by the fglrx_drv.so xorg driver
|
||||
$(INSTALL) -D -m 0644 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/lib$(AMD_CATALYST_LIB_SUFFIX)/modules/dri/fglrx_dri.so \
|
||||
$(TARGET_DIR)/usr/lib/dri/fglrx_dri.so
|
||||
$(INSTALL) -D -m 0644 $(AMD_CATALYST_X11R6_LIB)/modules/extensions/fglrx/fglrx-libglx.so \
|
||||
$(TARGET_DIR)/usr/lib/xorg/modules/extensions/libglx.so
|
||||
$(INSTALL) -D -m 0644 $(AMD_CATALYST_X11R6_LIB)/modules/glesx.so \
|
||||
$(TARGET_DIR)/usr/lib/xorg/modules/glesx.so
|
||||
|
||||
# Userspace GL libraries, also runtime dependency of most of the cmdline
|
||||
# tools
|
||||
$(INSTALL) -m 0644 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/lib$(AMD_CATALYST_LIB_SUFFIX)/*.so \
|
||||
$(TARGET_DIR)/usr/lib/
|
||||
$(call AMD_CATALYST_INSTALL_GL_LIBS,$(TARGET_DIR))
|
||||
|
||||
# Runtime dependency required by libfglrxdrm.so
|
||||
$(INSTALL) -m 0644 $(AMD_CATALYST_ARCH_DIR)/usr/lib$(AMD_CATALYST_LIB_SUFFIX)/libatiuki.so.1.0 \
|
||||
$(TARGET_DIR)/usr/lib/
|
||||
ln -sf libatiuki.so.1.0 \
|
||||
$(TARGET_DIR)/usr/lib/libatiuki.so.1
|
||||
endef
|
||||
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_AMD_CATALYST_CMDLINE_TOOLS), y)
|
||||
AMD_CATALYST_CMDLINE_TOOLS_FILES = \
|
||||
atiode \
|
||||
atiodcli \
|
||||
fgl_glxgears \
|
||||
aticonfig \
|
||||
amd-console-helper \
|
||||
fglrxinfo
|
||||
|
||||
define AMD_CATALYST_INSTALL_CMDLINE_TOOLS
|
||||
$(INSTALL) -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/sbin/atieventsd \
|
||||
$(TARGET_DIR)/usr/sbin
|
||||
$(foreach f,$(AMD_CATALYST_CMDLINE_TOOLS_FILES), \
|
||||
$(INSTALL) -D -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/bin/$(f) \
|
||||
$(TARGET_DIR)/usr/bin/$(f)
|
||||
)
|
||||
endef
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_AMD_CATALYST_CCCLE), y)
|
||||
define AMD_CATALYST_INSTALL_CCCLE
|
||||
$(INSTALL) -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/bin/amdcccle \
|
||||
$(TARGET_DIR)/usr/bin/amdcccle
|
||||
$(INSTALL) -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/sbin/amdnotifyui \
|
||||
$(TARGET_DIR)/usr/sbin/amdnotifyui
|
||||
endef
|
||||
endif
|
||||
|
||||
define AMD_CATALYST_INSTALL_STAGING_CMDS
|
||||
$(call AMD_CATALYST_INSTALL_STAGING_XORG)
|
||||
endef
|
||||
|
||||
define AMD_CATALYST_INSTALL_TARGET_CMDS
|
||||
$(call AMD_CATALYST_INSTALL_XORG)
|
||||
$(call AMD_CATALYST_INSTALL_CMDLINE_TOOLS)
|
||||
$(call AMD_CATALYST_INSTALL_CCCLE)
|
||||
$(call AMD_CATALYST_INSTALL_OPENCL)
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
12
bsp/buildroot/package/amd-catalyst/gl.pc
Normal file
12
bsp/buildroot/package/amd-catalyst/gl.pc
Normal file
@@ -0,0 +1,12 @@
|
||||
prefix=/usr
|
||||
exec_prefix=${prefix}
|
||||
libdir=${exec_prefix}/lib
|
||||
includedir=${prefix}/include
|
||||
|
||||
Name: gl
|
||||
Description: AMD Catalyst OpenGL library
|
||||
Version: 15.9
|
||||
Libs: -L${libdir} -lGL -lm -lXext -lX11 -ldl
|
||||
Cflags: -I${includedir}
|
||||
glx_tls: no
|
||||
|
||||
7
bsp/buildroot/package/angular-websocket/Config.in
Normal file
7
bsp/buildroot/package/angular-websocket/Config.in
Normal file
@@ -0,0 +1,7 @@
|
||||
config BR2_PACKAGE_ANGULAR_WEBSOCKET
|
||||
bool "angular-websocket"
|
||||
help
|
||||
An AngularJS WebSocket service for connecting client
|
||||
applications to servers.
|
||||
|
||||
https://github.com/AngularClass/angular-websocket
|
||||
@@ -0,0 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 69d752896bc17c08750a2fda24b5eb3c6d653afc6f406dd90a6b7c920b22a14a angular-websocket-v2.0.0.tar.gz
|
||||
18
bsp/buildroot/package/angular-websocket/angular-websocket.mk
Normal file
18
bsp/buildroot/package/angular-websocket/angular-websocket.mk
Normal file
@@ -0,0 +1,18 @@
|
||||
################################################################################
|
||||
#
|
||||
# angular-websocket
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ANGULAR_WEBSOCKET_VERSION = v2.0.0
|
||||
ANGULAR_WEBSOCKET_SITE = $(call github,AngularClass,angular-websocket,$(ANGULAR_WEBSOCKET_VERSION))
|
||||
ANGULAR_WEBSOCKET_LICENSE = MIT
|
||||
ANGULAR_WEBSOCKET_LICENSE_FILES = LICENSE
|
||||
|
||||
# install .min.js as .js
|
||||
define ANGULAR_WEBSOCKET_INSTALL_TARGET_CMDS
|
||||
$(INSTALL) -m 0644 -D $(@D)/dist/angular-websocket.min.js \
|
||||
$(TARGET_DIR)/var/www/angular-websocket.js
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
@@ -14,6 +14,34 @@ config BR2_PACKAGE_APACHE
|
||||
|
||||
http://httpd.apache.org
|
||||
|
||||
if BR2_PACKAGE_APACHE
|
||||
|
||||
choice
|
||||
prompt "Multi-Processing Module (MPM)"
|
||||
default BR2_PACKAGE_APACHE_MPM_WORKER
|
||||
help
|
||||
Select the Multi-Processing Module (MPM).
|
||||
|
||||
config BR2_PACKAGE_APACHE_MPM_EVENT
|
||||
bool "event"
|
||||
help
|
||||
A variant of the worker MPM with the goal of consuming threads
|
||||
only for connections with active processing
|
||||
|
||||
config BR2_PACKAGE_APACHE_MPM_PREFORK
|
||||
bool "prefork"
|
||||
help
|
||||
Implements a non-threaded, pre-forking web server
|
||||
|
||||
config BR2_PACKAGE_APACHE_MPM_WORKER
|
||||
bool "worker"
|
||||
help
|
||||
Implements a hybrid multi-threaded multi-process web server
|
||||
|
||||
endchoice
|
||||
|
||||
endif
|
||||
|
||||
comment "apache needs a toolchain w/ dynamic library, threads"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# From http://www.apache.org/dist/httpd/httpd-2.4.23.tar.bz2.sha1
|
||||
sha1 5101be34ac4a509b245adb70a56690a84fcc4e7f httpd-2.4.23.tar.bz2
|
||||
sha1 bd6d138c31c109297da2346c6e7b93b9283993d2 httpd-2.4.25.tar.bz2
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
APACHE_VERSION = 2.4.23
|
||||
APACHE_VERSION = 2.4.25
|
||||
APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2
|
||||
APACHE_SITE = http://archive.apache.org/dist/httpd
|
||||
APACHE_LICENSE = Apache-2.0
|
||||
@@ -20,6 +20,14 @@ APACHE_CONF_ENV= \
|
||||
ap_cv_void_ptr_lt_long=no \
|
||||
PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config
|
||||
|
||||
ifeq ($(BR2_PACKAGE_APACHE_MPM_EVENT),y)
|
||||
APACHE_MPM = event
|
||||
else ifeq ($(BR2_PACKAGE_APACHE_MPM_PREFORK),y)
|
||||
APACHE_MPM = prefork
|
||||
else ifeq ($(BR2_PACKAGE_APACHE_MPM_WORKER),y)
|
||||
APACHE_MPM = worker
|
||||
endif
|
||||
|
||||
APACHE_CONF_OPTS = \
|
||||
--sysconfdir=/etc/apache2 \
|
||||
--with-apr=$(STAGING_DIR)/usr \
|
||||
@@ -31,7 +39,7 @@ APACHE_CONF_OPTS = \
|
||||
--enable-mime-magic \
|
||||
--without-suexec-bin \
|
||||
--enable-mods-shared=all \
|
||||
--with-mpm=worker \
|
||||
--with-mpm=$(APACHE_MPM) \
|
||||
--disable-lua \
|
||||
--disable-luajit
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ ARPTABLES_SITE = http://downloads.sourceforge.net/project/ebtables/arptables/arp
|
||||
ARPTABLES_LICENSE = GPLv2+
|
||||
|
||||
define ARPTABLES_BUILD_CMDS
|
||||
$(MAKE) -C $(@D) \
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
|
||||
CC="$(TARGET_CC)" COPT_FLAGS="$(TARGET_CFLAGS)"
|
||||
endef
|
||||
|
||||
|
||||
@@ -16,6 +16,15 @@ ifeq ($(BR2_m68k),y)
|
||||
ASSIMP_CXXFLAGS += -mxgot
|
||||
endif
|
||||
|
||||
ASSIMP_CONF_OPTS += -DASSIMP_BUILD_TESTS=OFF -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(ASSIMP_CXXFLAGS)"
|
||||
# workaround SuperH compiler failure when static linking (i.e -fPIC is
|
||||
# not passed) in gcc versions 5.x or older. The -Os optimization level
|
||||
# causes a "unable to find a register to spill in class
|
||||
# ‘GENERAL_REGS’" error. -O2 works fine.
|
||||
ifeq ($(BR2_sh):$(BR2_STATIC_LIBS):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:y:)
|
||||
ASSIMP_CXXFLAGS += -O2
|
||||
endif
|
||||
|
||||
ASSIMP_CONF_OPTS += -DASSIMP_BUILD_TESTS=OFF \
|
||||
-DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(ASSIMP_CXXFLAGS)"
|
||||
|
||||
$(eval $(cmake-package))
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# From http://ftp.gnome.org/pub/gnome/sources/atk/2.20/atk-2.20.0.sha256sum
|
||||
sha256 493a50f6c4a025f588d380a551ec277e070b28a82e63ef8e3c06b3ee7c1238f0 atk-2.20.0.tar.xz
|
||||
# From http://ftp.gnome.org/pub/gnome/sources/atk/2.22/atk-2.22.0.sha256sum
|
||||
sha256 d349f5ca4974c9c76a4963e5b254720523b0c78672cbc0e1a3475dbd9b3d44b6 atk-2.22.0.tar.xz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ATK_VERSION_MAJOR = 2.20
|
||||
ATK_VERSION_MAJOR = 2.22
|
||||
ATK_VERSION = $(ATK_VERSION_MAJOR).0
|
||||
ATK_SOURCE = atk-$(ATK_VERSION).tar.xz
|
||||
ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR)
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
remove unused include of termio.h
|
||||
|
||||
This header is not provided by musl, leading to build failures.
|
||||
|
||||
Patch status: accepted upstream.
|
||||
|
||||
Signed-off-by: Ricardo Martincoski <ricardo.martincoski@datacom.ind.br>
|
||||
---
|
||||
diff -purN atop-2.2-3.orig/showgeneric.c atop-2.2-3/showgeneric.c
|
||||
--- atop-2.2-3.orig/showgeneric.c 2016-07-19 22:07:43.275324499 -0300
|
||||
+++ atop-2.2-3/showgeneric.c 2016-07-19 22:08:16.171453283 -0300
|
||||
@@ -268,7 +268,6 @@ static const char rcsid[] = "$Id: showge
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <string.h>
|
||||
-#include <termio.h>
|
||||
#include <unistd.h>
|
||||
#include <stdarg.h>
|
||||
#include <curses.h>
|
||||
diff -purN atop-2.2-3.orig/showlinux.c atop-2.2-3/showlinux.c
|
||||
--- atop-2.2-3.orig/showlinux.c 2016-07-19 22:07:43.275324499 -0300
|
||||
+++ atop-2.2-3/showlinux.c 2016-07-19 22:08:20.979472459 -0300
|
||||
@@ -274,7 +274,6 @@ static const char rcsid[] = "$Id: showli
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
-#include <termio.h>
|
||||
#include <unistd.h>
|
||||
#include <stdarg.h>
|
||||
#include <curses.h>
|
||||
diff -purN atop-2.2-3.orig/showprocs.c atop-2.2-3/showprocs.c
|
||||
--- atop-2.2-3.orig/showprocs.c 2016-07-19 22:07:43.275324499 -0300
|
||||
+++ atop-2.2-3/showprocs.c 2016-07-19 22:08:25.083488900 -0300
|
||||
@@ -94,7 +94,6 @@ static const char rcsid[] = "$Id: showpr
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
-#include <termio.h>
|
||||
#include <unistd.h>
|
||||
#include <stdarg.h>
|
||||
#include <curses.h>
|
||||
diff -purN atop-2.2-3.orig/showsys.c atop-2.2-3/showsys.c
|
||||
--- atop-2.2-3.orig/showsys.c 2016-07-19 22:07:43.275324499 -0300
|
||||
+++ atop-2.2-3/showsys.c 2016-07-19 22:08:29.099505047 -0300
|
||||
@@ -80,7 +80,6 @@ static const char rcsid[] = "XXXXXX";
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
-#include <termio.h>
|
||||
#include <unistd.h>
|
||||
#include <stdarg.h>
|
||||
#include <curses.h>
|
||||
18
bsp/buildroot/package/atop/Config.in
Normal file
18
bsp/buildroot/package/atop/Config.in
Normal file
@@ -0,0 +1,18 @@
|
||||
config BR2_PACKAGE_ATOP
|
||||
bool "atop"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
select BR2_PACKAGE_NCURSES
|
||||
select BR2_PACKAGE_ZLIB
|
||||
help
|
||||
Atop is an ASCII full-screen performance monitor for Linux
|
||||
that is capable of reporting the activity of all processes
|
||||
(even if processes have finished during the interval), daily
|
||||
logging of system and process activity for long-term analysis,
|
||||
highlighting overloaded system resources by using colors, etc.
|
||||
At regular intervals, it shows system-level activity related
|
||||
to the CPU, memory, swap, disks (including LVM) and network
|
||||
layers, and for every process (and thread) it shows e.g. the
|
||||
CPU utilization, memory growth, disk utilization, priority,
|
||||
username, state, and exit code.
|
||||
|
||||
http://www.atoptool.nl
|
||||
2
bsp/buildroot/package/atop/atop.hash
Normal file
2
bsp/buildroot/package/atop/atop.hash
Normal file
@@ -0,0 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 c785b8a2355be28b3de6b58a8ea4c4fcab8fadeaa57a99afeb03c66fac8e055d atop-2.2-3.tar.gz
|
||||
21
bsp/buildroot/package/atop/atop.mk
Normal file
21
bsp/buildroot/package/atop/atop.mk
Normal file
@@ -0,0 +1,21 @@
|
||||
################################################################################
|
||||
#
|
||||
# atop
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ATOP_VERSION = 2.2-3
|
||||
ATOP_SITE = http://www.atoptool.nl/download
|
||||
ATOP_LICENSE = GPLv2+
|
||||
ATOP_LICENSE_FILES = COPYING
|
||||
ATOP_DEPENDENCIES = ncurses zlib
|
||||
|
||||
define ATOP_BUILD_CMDS
|
||||
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
|
||||
endef
|
||||
|
||||
define ATOP_INSTALL_TARGET_CMDS
|
||||
$(INSTALL) -D -m 0755 $(@D)/atop $(TARGET_DIR)/usr/bin/atop
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
21
bsp/buildroot/package/aubio/Config.in
Normal file
21
bsp/buildroot/package/aubio/Config.in
Normal file
@@ -0,0 +1,21 @@
|
||||
config BR2_PACKAGE_AUBIO
|
||||
bool "aubio"
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
help
|
||||
aubio is a tool designed for the extraction of annotations from
|
||||
audio signals. Its features include segmenting a sound file
|
||||
before each of its attacks, performing pitch detection, tapping
|
||||
the beat and producing midi streams from live audio.
|
||||
|
||||
Because these tasks are difficult, we thought it was important
|
||||
to gather them in a dedicated library. To increase the fun, we
|
||||
have made these algorithms work in a causal way, so as to be
|
||||
used in real time applications with as low delay as possible.
|
||||
Functions can be used offline in sound editors and software
|
||||
samplers, or online in audio effects and virtual instruments.
|
||||
|
||||
https://aubio.org
|
||||
|
||||
comment "aubio needs a toolchain w/ threads, dynamic library"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
|
||||
2
bsp/buildroot/package/aubio/aubio.hash
Normal file
2
bsp/buildroot/package/aubio/aubio.hash
Normal file
@@ -0,0 +1,2 @@
|
||||
# From https://aubio.org/pub/aubio-0.4.3.tar.bz2.sha256
|
||||
sha256 b62cdb073c0c64ae301917fa162969d42cba45e478bdf1e74490bd87e9cceaab aubio-0.4.3.tar.bz2
|
||||
62
bsp/buildroot/package/aubio/aubio.mk
Normal file
62
bsp/buildroot/package/aubio/aubio.mk
Normal file
@@ -0,0 +1,62 @@
|
||||
################################################################################
|
||||
#
|
||||
# aubio
|
||||
#
|
||||
################################################################################
|
||||
|
||||
AUBIO_VERSION = 0.4.3
|
||||
AUBIO_SITE = https://aubio.org/pub
|
||||
AUBIO_SOURCE = aubio-$(AUBIO_VERSION).tar.bz2
|
||||
AUBIO_LICENSE = GPLv3+
|
||||
AUBIO_LICENSE_FILES = COPYING
|
||||
AUBIO_INSTALL_STAGING = YES
|
||||
|
||||
AUBIO_CONF_OPTS = \
|
||||
--disable-docs \
|
||||
--disable-atlas
|
||||
|
||||
# Add --notests for each build step to avoid running unit tests on the
|
||||
# build machine.
|
||||
AUBIO_WAF_OPTS = --notests
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
|
||||
AUBIO_DEPENDENCIES += libsndfile
|
||||
AUBIO_CONF_OPTS += --enable-sndfile
|
||||
else
|
||||
AUBIO_CONF_OPTS += --disable-sndfile
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y)
|
||||
AUBIO_DEPENDENCIES += libsamplerate
|
||||
AUBIO_CONF_OPTS += --enable-samplerate
|
||||
else
|
||||
AUBIO_CONF_OPTS += --disable-samplerate
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_JACK2),y)
|
||||
AUBIO_DEPENDENCIES += jack2
|
||||
AUBIO_CONF_OPTS += --enable-jack
|
||||
else
|
||||
AUBIO_CONF_OPTS += --disable-jack
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_FFTW),y)
|
||||
AUBIO_DEPENDENCIES += fftw
|
||||
# fftw3 require double otherwise it will look for fftw3f
|
||||
ifeq ($(BR2_PACKAGE_FFTW_PRECISION_DOUBLE),y)
|
||||
AUBIO_CONF_OPTS += --enable-fftw3 --enable-double
|
||||
else ifeq ($(BR2_PACKAGE_FFTW_PRECISION_SINGLE),y)
|
||||
AUBIO_CONF_OPTS += --enable-fftw3f --disable-double
|
||||
endif
|
||||
else # !BR2_PACKAGE_FFTW
|
||||
AUBIO_CONF_OPTS += --disable-fftw3
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_FFMPEG_AVRESAMPLE),y)
|
||||
AUBIO_DEPENDENCIES += ffmpeg
|
||||
AUBIO_CONF_OPTS += --enable-avcodec
|
||||
else
|
||||
AUBIO_CONF_OPTS += --disable-avcodec
|
||||
endif
|
||||
|
||||
$(eval $(waf-package))
|
||||
@@ -2,14 +2,15 @@
|
||||
config BR2_PACKAGE_AUDIT_ARCH_SUPPORTS
|
||||
bool
|
||||
default y if BR2_aarch64 || BR2_arm || BR2_armeb || \
|
||||
BR2_i386 || BR2_powerpc || BR2_x86_64
|
||||
BR2_i386 || BR2_powerpc || BR2_powerpc64 || \
|
||||
BR2_x86_64
|
||||
|
||||
config BR2_PACKAGE_AUDIT
|
||||
bool "audit"
|
||||
depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on !BR2_TOOLCHAIN_USES_MUSL
|
||||
depends on !BR2_TOOLCHAIN_USES_MUSL # strndupa()
|
||||
help
|
||||
The audit package contains the user space utilities for
|
||||
storing and searching the audit records generated by
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
#Locally computed
|
||||
sha256 d99339a63fc6efaaee89efe7fa0e0c395f661392a4ae5056b2c9d10c67ca63a1 audit-2.6.5.tar.gz
|
||||
sha256 0441790794fd9375dbca598fa0ffb46c57ff37b3a24b94ffec0bbee3215cca09 audit-2.7.1.tar.gz
|
||||
|
||||
@@ -4,12 +4,10 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
AUDIT_VERSION = 2.6.5
|
||||
AUDIT_VERSION = 2.7.1
|
||||
AUDIT_SITE = http://people.redhat.com/sgrubb/audit
|
||||
AUDIT_LICENSE = GPLv2
|
||||
AUDIT_LICENSE = GPLv2+ (programs), unclear (libraries)
|
||||
AUDIT_LICENSE_FILES = COPYING
|
||||
# 0002-Fix-usage-of-audit_status.feature_bitmap.patch
|
||||
AUDIT_AUTORECONF = YES
|
||||
|
||||
AUDIT_INSTALL_STAGING = YES
|
||||
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
install: drop setting ownership
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -21,7 +21,7 @@
|
||||
override CPPFLAGS += -DAUFHSM_CMD=\"/usr/bin/aufhsm\"
|
||||
override CFLAGS += -O -Wall
|
||||
INSTALL ?= install
|
||||
-Install = ${INSTALL} -o root -g root -p
|
||||
+Install = ${INSTALL} -p
|
||||
ManDir = /usr/share/man
|
||||
|
||||
#
|
||||
24
bsp/buildroot/package/aufs-util/0002-no-check-ver.patch
Normal file
24
bsp/buildroot/package/aufs-util/0002-no-check-ver.patch
Normal file
@@ -0,0 +1,24 @@
|
||||
Makefile: do not check version
|
||||
|
||||
The aufs-util package tries to ensure that its version is compatible
|
||||
with the one in the running kernel. However, this test is flawed: the
|
||||
version string in the aufs4x branch for aufs-util is aufs3.x, so it does
|
||||
not match the version in the kernel when it is aufs4.x.
|
||||
|
||||
Disengage this check, ion the assumption the user knows what he is
|
||||
doing.
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -62,7 +62,7 @@
|
||||
$(foreach v, CPPFLAGS CFLAGS INSTALL Install ManDir LibUtilHdr, \
|
||||
$(eval MAKE += ${v}="$${${v}}"))
|
||||
|
||||
-all: ver_test ${Man} ${Bin} ${Etc}
|
||||
+all: ${Man} ${Bin} ${Etc}
|
||||
${MAKE} -C libau $@
|
||||
ln -sf ./libau/libau*.so .
|
||||
$(call MakeFHSM, $@)
|
||||
18
bsp/buildroot/package/aufs-util/0003-no-strip-lib.patch
Normal file
18
bsp/buildroot/package/aufs-util/0003-no-strip-lib.patch
Normal file
@@ -0,0 +1,18 @@
|
||||
install: do not strip libs when installing
|
||||
|
||||
We want unstripped binaries in staging; stripping is done by Buildroot
|
||||
as a whole in target-finalize if needed, anyway.
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
|
||||
diff --git a/libau/Makefile b/libau/Makefile
|
||||
--- a/libau/Makefile
|
||||
+++ b/libau/Makefile
|
||||
@@ -37,7 +37,6 @@
|
||||
ln -sf $< $@
|
||||
${LibSo}.${LibSoMajor}: ${LibSo}.${LibSoMajor}.${LibSoMinor}
|
||||
ln -sf $< $@
|
||||
-${LibSo}.${LibSoMajor}.${LibSoMinor}: override LDFLAGS += -s
|
||||
${LibSo}.${LibSoMajor}.${LibSoMinor}: override LDLIBS += -ldl -lpthread
|
||||
${LibSo}.${LibSoMajor}.${LibSoMinor}: ${LibSoObj}
|
||||
${CC} --shared -Wl,-soname,${LibSo}.${LibSoMajor} ${LDFLAGS} \
|
||||
35
bsp/buildroot/package/aufs-util/Config.in
Normal file
35
bsp/buildroot/package/aufs-util/Config.in
Normal file
@@ -0,0 +1,35 @@
|
||||
comment "aufs-util needs a linux kernel and a toolchain w/ threads"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_LINUX_KERNEL || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
config BR2_PACKAGE_AUFS_UTIL
|
||||
bool "aufs-util"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_LINUX_KERNEL
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
help
|
||||
Aufs command line utilities.
|
||||
|
||||
Needs a kernel with aufs support. A kernel
|
||||
extension package is available.
|
||||
|
||||
http://sourceforge.net/p/aufs/aufs-util/
|
||||
|
||||
if BR2_PACKAGE_AUFS_UTIL
|
||||
|
||||
config BR2_PACKAGE_AUFS_UTIL_VERSION
|
||||
string "aufs-util version"
|
||||
default ""
|
||||
help
|
||||
The version you choose must match that of the aufs support
|
||||
in your kernel. Usually, this is aufs3.x for 3.x kernels and
|
||||
aufs4.x for 4.x kernels.
|
||||
|
||||
Usually, the sha1 of the cset you want to use; avoid using a
|
||||
branch name as this yields non-reproducible builds.
|
||||
|
||||
See the following resources to see what versions are available:
|
||||
|
||||
https://sourceforge.net/p/aufs/aufs-util/ci/master/tree/
|
||||
|
||||
endif
|
||||
59
bsp/buildroot/package/aufs-util/aufs-util.mk
Normal file
59
bsp/buildroot/package/aufs-util/aufs-util.mk
Normal file
@@ -0,0 +1,59 @@
|
||||
################################################################################
|
||||
#
|
||||
# aufs-util
|
||||
#
|
||||
################################################################################
|
||||
|
||||
# linux-headers
|
||||
AUFS_UTIL_VERSION = $(call qstrip,$(BR2_PACKAGE_AUFS_UTIL_VERSION))
|
||||
AUFS_UTIL_SITE = http://git.code.sf.net/p/aufs/aufs-util
|
||||
AUFS_UTIL_SITE_METHOD = git
|
||||
AUFS_UTIL_LICENSE = GPLv2
|
||||
AUFS_UTIL_LICENSE_FILES = COPYING
|
||||
|
||||
AUFS_UTIL_DEPENDENCIES = linux
|
||||
|
||||
# Building aufs-util requires access to the kernel headers of aufs,
|
||||
# which are only available in the kernel build directory, which is why
|
||||
# we add -I$(LINUX_DIR)/include/uapi. These headers have not been
|
||||
# prepared for usage by userspace, so to workaround this we have to
|
||||
# defined the "__user" macro as empty.
|
||||
AUFS_UTIL_HOST_CPPFLAGS = \
|
||||
$(HOST_CPPFLAGS) \
|
||||
-I$(LINUX_DIR)/include/uapi \
|
||||
-D__user=
|
||||
|
||||
AUFS_UTIL_CPPFLAGS = \
|
||||
$(TARGET_CPPFLAGS) \
|
||||
-I$(LINUX_DIR)/include/uapi \
|
||||
-D__user=
|
||||
|
||||
# rdu64 is supposed to provide the LFS variant of readdir(),
|
||||
# readdir64(). However, because Buildroot is always LFS-enabled,
|
||||
# readdir() is always the LFS variant. Drop rdu64 from the build, as
|
||||
# it causes build failures due to multiple implementations of
|
||||
# readdir64().
|
||||
define AUFS_UTIL_REMOVE_RDU64
|
||||
$(SED) 's% rdu64.o%%' $(@D)/libau/Makefile
|
||||
endef
|
||||
|
||||
AUFS_UTIL_POST_PATCH_HOOKS += AUFS_UTIL_REMOVE_RDU64
|
||||
|
||||
# First, we build the host tools, needed to build the target tools.
|
||||
define AUFS_UTIL_BUILD_CMDS
|
||||
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) \
|
||||
$(HOST_CONFIGURE_OPTS) \
|
||||
CPPFLAGS="$(AUFS_UTIL_HOST_CPPFLAGS)" \
|
||||
HOSTCC="$(HOSTCC)" HOSTLD="$(HOSTLD)" \
|
||||
INSTALL="$(INSTALL)" c2sh c2tmac
|
||||
$(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
CPPFLAGS="$(AUFS_UTIL_CPPFLAGS)" \
|
||||
INSTALL="$(INSTALL)" all
|
||||
endef
|
||||
|
||||
define AUFS_UTIL_INSTALL_TARGET_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) INSTALL="$(INSTALL)" DESTDIR="$(TARGET_DIR)" install
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
16
bsp/buildroot/package/aufs/Config.in
Normal file
16
bsp/buildroot/package/aufs/Config.in
Normal file
@@ -0,0 +1,16 @@
|
||||
# Automatically selected by the corresponding linux extension
|
||||
config BR2_PACKAGE_AUFS
|
||||
bool
|
||||
|
||||
if BR2_PACKAGE_AUFS
|
||||
|
||||
# Both come from the selection of the linux extension.
|
||||
config BR2_PACKAGE_AUFS_SERIES
|
||||
int
|
||||
default BR2_LINUX_KERNEL_EXT_AUFS_SERIES
|
||||
|
||||
config BR2_PACKAGE_AUFS_VERSION
|
||||
string
|
||||
default BR2_LINUX_KERNEL_EXT_AUFS_VERSION
|
||||
|
||||
endif
|
||||
22
bsp/buildroot/package/aufs/aufs.mk
Normal file
22
bsp/buildroot/package/aufs/aufs.mk
Normal file
@@ -0,0 +1,22 @@
|
||||
################################################################################
|
||||
#
|
||||
# aufs
|
||||
#
|
||||
################################################################################
|
||||
|
||||
AUFS_VERSION = $(call qstrip,$(BR2_PACKAGE_AUFS_VERSION))
|
||||
AUFS_LICENSE = GPLv2
|
||||
AUFS_LICENSE_FILES = COPYING
|
||||
|
||||
ifeq ($(BR2_PACKAGE_AUFS_SERIES),3)
|
||||
AUFS_SITE = http://git.code.sf.net/p/aufs/aufs3-standalone
|
||||
AUFS_SITE_METHOD = git
|
||||
else ifeq ($(BR2_PACKAGE_AUFS_SERIES),4)
|
||||
AUFS_SITE = $(call github,sfjro,aufs4-standalone,$(AUFS_VERSION))
|
||||
endif
|
||||
|
||||
ifeq ($(BR_BUILDING):$(BR2_PACKAGE_AUFS):$(AUFS_VERSION),y:y:)
|
||||
$(error No aufs version specified)
|
||||
endif
|
||||
|
||||
$(eval $(generic-package))
|
||||
@@ -1,2 +1,2 @@
|
||||
# Computed locally
|
||||
sha256 7c0467a5dbd2340153bca5a477bd92fbc951d9ee3cbed92f16f6bf08ac0c350a autoconf-archive-2015.09.25.tar.xz
|
||||
sha256 88fb2efff640eddd28a52ae550ff5561bca3bd2bba09e1d7b0580e719875e437 autoconf-archive-2016.03.20.tar.xz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
AUTOCONF_ARCHIVE_VERSION = 2015.09.25
|
||||
AUTOCONF_ARCHIVE_VERSION = 2016.03.20
|
||||
AUTOCONF_ARCHIVE_SOURCE = autoconf-archive-$(AUTOCONF_ARCHIVE_VERSION).tar.xz
|
||||
AUTOCONF_ARCHIVE_SITE = $(BR2_GNU_MIRROR)/autoconf-archive
|
||||
AUTOCONF_ARCHIVE_LICENSE = GPLv3+ with exception
|
||||
|
||||
16
bsp/buildroot/package/autossh/0001-honour-LDFLAGS.patch
Normal file
16
bsp/buildroot/package/autossh/0001-honour-LDFLAGS.patch
Normal file
@@ -0,0 +1,16 @@
|
||||
Honour LDFLAGS, especially required when static linking
|
||||
|
||||
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
|
||||
|
||||
diff -Nur autossh-1.4e.orig/Makefile.in autossh-1.4e/Makefile.in
|
||||
--- autossh-1.4e.orig/Makefile.in 2015-02-10 05:41:58.000000000 +0100
|
||||
+++ autossh-1.4e/Makefile.in 2016-11-25 12:49:06.052122855 +0100
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
|
||||
$(TARGET): $(OFILES)
|
||||
- $(CC) $(CPPFLAGS) -o $(TARGET) $(OFILES) $(LIBS)
|
||||
+ $(CC) $(CPPFLAGS) $(LDFLAGS) -o $(TARGET) $(OFILES) $(LIBS)
|
||||
|
||||
clean:
|
||||
- /bin/rm -f *.o *.a *.core *~
|
||||
@@ -7,7 +7,7 @@
|
||||
AVRDUDE_VERSION = ad04c429a90f4c34f000ea4ae11db2705915a31f
|
||||
AVRDUDE_SITE = $(call github,kcuzner,avrdude,$(AVRDUDE_VERSION))
|
||||
AVRDUDE_LICENSE = GPLv2+
|
||||
AVRDUDR_LICENSE_FILES = avrdude/COPYING
|
||||
AVRDUDE_LICENSE_FILES = avrdude/COPYING
|
||||
AVRDUDE_SUBDIR = avrdude
|
||||
# Sources coming from git, without generated configure and Makefile.in
|
||||
# files.
|
||||
|
||||
@@ -31,12 +31,12 @@ define AXEL_CONFIGURE_CMDS
|
||||
endef
|
||||
|
||||
define AXEL_BUILD_CMDS
|
||||
$(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
|
||||
$(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
|
||||
LFLAGS="$(TARGET_LDFLAGS) $(AXEL_LDFLAGS)" -C $(@D)
|
||||
endef
|
||||
|
||||
define AXEL_INSTALL_TARGET_CMDS
|
||||
$(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
|
||||
$(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
|
||||
BABELD_VERSION = 1.7.1
|
||||
BABELD_SITE = http://www.pps.univ-paris-diderot.fr/~jch/software/files
|
||||
BALELD_LICENSE = MIT
|
||||
BALELD_LICENSE_FILES = LICENSE
|
||||
BABELD_LICENSE = MIT
|
||||
BABELD_LICENSE_FILES = LICENCE
|
||||
|
||||
define BABELD_BUILD_CMDS
|
||||
$(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS)
|
||||
|
||||
@@ -1,116 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-031
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-031
|
||||
|
||||
Bug-Reported-by: lolilolicon <lolilolicon@gmail.com>
|
||||
Bug-Reference-ID: <CAMtVo_Nz=32Oq=zWTb6=+8gUNXOo2rRvud1W4oPnA-cgVk_ZqQ@mail.gmail.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-08/msg00139.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
The new nameref assignment functionality introduced in bash-4.3 did not perform
|
||||
enough validation on the variable value and would create variables with
|
||||
invalid names.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.3-patched/subst.h 2014-01-11 21:02:27.000000000 -0500
|
||||
--- b/subst.h 2014-09-01 12:16:56.000000000 -0400
|
||||
***************
|
||||
*** 48,51 ****
|
||||
--- 48,52 ----
|
||||
#define ASS_MKGLOBAL 0x0008 /* force global assignment */
|
||||
#define ASS_NAMEREF 0x0010 /* assigning to nameref variable */
|
||||
+ #define ASS_FROMREF 0x0020 /* assigning from value of nameref variable */
|
||||
|
||||
/* Flags for the string extraction functions. */
|
||||
*** a/bash-4.3-patched/variables.c 2014-05-15 08:26:50.000000000 -0400
|
||||
--- b/variables.c 2014-09-01 14:37:44.000000000 -0400
|
||||
***************
|
||||
*** 2504,2511 ****
|
||||
int hflags, aflags;
|
||||
{
|
||||
! char *newval;
|
||||
SHELL_VAR *entry;
|
||||
|
||||
entry = (hflags & HASH_NOSRCH) ? (SHELL_VAR *)NULL : hash_lookup (name, table);
|
||||
/* Follow the nameref chain here if this is the global variables table */
|
||||
if (entry && nameref_p (entry) && (invisible_p (entry) == 0) && table == global_variables->table)
|
||||
--- 2566,2590 ----
|
||||
int hflags, aflags;
|
||||
{
|
||||
! char *newname, *newval;
|
||||
SHELL_VAR *entry;
|
||||
+ #if defined (ARRAY_VARS)
|
||||
+ arrayind_t ind;
|
||||
+ char *subp;
|
||||
+ int sublen;
|
||||
+ #endif
|
||||
|
||||
+ newname = 0;
|
||||
+ #if defined (ARRAY_VARS)
|
||||
+ if ((aflags & ASS_FROMREF) && (hflags & HASH_NOSRCH) == 0 && valid_array_reference (name))
|
||||
+ {
|
||||
+ newname = array_variable_name (name, &subp, &sublen);
|
||||
+ if (newname == 0)
|
||||
+ return (SHELL_VAR *)NULL; /* XXX */
|
||||
+ entry = hash_lookup (newname, table);
|
||||
+ }
|
||||
+ else
|
||||
+ #endif
|
||||
entry = (hflags & HASH_NOSRCH) ? (SHELL_VAR *)NULL : hash_lookup (name, table);
|
||||
+
|
||||
/* Follow the nameref chain here if this is the global variables table */
|
||||
if (entry && nameref_p (entry) && (invisible_p (entry) == 0) && table == global_variables->table)
|
||||
***************
|
||||
*** 2538,2541 ****
|
||||
--- 2617,2630 ----
|
||||
}
|
||||
}
|
||||
+ #if defined (ARRAY_VARS)
|
||||
+ else if (entry == 0 && newname)
|
||||
+ {
|
||||
+ entry = make_new_array_variable (newname); /* indexed array by default */
|
||||
+ if (entry == 0)
|
||||
+ return entry;
|
||||
+ ind = array_expand_index (name, subp, sublen);
|
||||
+ bind_array_element (entry, ind, value, aflags);
|
||||
+ }
|
||||
+ #endif
|
||||
else if (entry == 0)
|
||||
{
|
||||
***************
|
||||
*** 2658,2662 ****
|
||||
if (nameref_cell (nv) == 0)
|
||||
return (bind_variable_internal (nv->name, value, nvc->table, 0, flags));
|
||||
! return (bind_variable_internal (nameref_cell (nv), value, nvc->table, 0, flags));
|
||||
}
|
||||
else
|
||||
--- 2747,2752 ----
|
||||
if (nameref_cell (nv) == 0)
|
||||
return (bind_variable_internal (nv->name, value, nvc->table, 0, flags));
|
||||
! /* XXX - bug here with ref=array[index] */
|
||||
! return (bind_variable_internal (nameref_cell (nv), value, nvc->table, 0, flags|ASS_FROMREF));
|
||||
}
|
||||
else
|
||||
*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 30
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 31
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -1,55 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-032
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-032
|
||||
|
||||
Bug-Reported-by: crispusfairbairn@gmail.com
|
||||
Bug-Reference-ID: <b5e499f7-3b98-408d-9f94-c0387580e73a@googlegroups.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-09/msg00013.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
When bash is running in Posix mode, it allows signals -- including SIGCHLD --
|
||||
to interrupt the `wait' builtin, as Posix requires. However, the interrupt
|
||||
causes bash to not run a SIGCHLD trap for all exited children. This patch
|
||||
fixes the issue and restores the documented behavior in Posix mode.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.3-patched/jobs.c 2014-05-14 09:20:15.000000000 -0400
|
||||
--- b/jobs.c 2014-09-09 11:50:38.000000000 -0400
|
||||
***************
|
||||
*** 3340,3344 ****
|
||||
{
|
||||
interrupt_immediately = 0;
|
||||
! trap_handler (SIGCHLD); /* set pending_traps[SIGCHLD] */
|
||||
wait_signal_received = SIGCHLD;
|
||||
/* If we're in a signal handler, let CHECK_WAIT_INTR pick it up;
|
||||
--- 3346,3352 ----
|
||||
{
|
||||
interrupt_immediately = 0;
|
||||
! /* This was trap_handler (SIGCHLD) but that can lose traps if
|
||||
! children_exited > 1 */
|
||||
! queue_sigchld_trap (children_exited);
|
||||
wait_signal_received = SIGCHLD;
|
||||
/* If we're in a signal handler, let CHECK_WAIT_INTR pick it up;
|
||||
*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 31
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 32
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -1,229 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-033
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-033
|
||||
|
||||
Bug-Reported-by: mickael9@gmail.com, Jan Rome <jan.rome@gmail.com>
|
||||
Bug-Reference-ID: <20140907224046.382ED3610CC@mickael-laptop.localdomain>,
|
||||
<540D661D.50908@gmail.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-09/msg00029.html
|
||||
http://lists.gnu.org/archive/html/bug-bash/2014-09/msg00030.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Bash does not clean up the terminal state in all cases where bash or
|
||||
readline modifies it and bash is subsequently terminated by a fatal signal.
|
||||
This happens when the `read' builtin modifies the terminal settings, both
|
||||
when readline is active and when it is not. It occurs most often when a script
|
||||
installs a trap that exits on a signal without re-sending the signal to itself.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.3-patched/shell.c 2014-01-14 08:04:32.000000000 -0500
|
||||
--- b/shell.c 2014-12-22 10:27:50.000000000 -0500
|
||||
***************
|
||||
*** 74,77 ****
|
||||
--- 74,78 ----
|
||||
|
||||
#if defined (READLINE)
|
||||
+ # include <readline/readline.h>
|
||||
# include "bashline.h"
|
||||
#endif
|
||||
***************
|
||||
*** 910,913 ****
|
||||
--- 912,923 ----
|
||||
fflush (stderr);
|
||||
|
||||
+ /* Clean up the terminal if we are in a state where it's been modified. */
|
||||
+ #if defined (READLINE)
|
||||
+ if (RL_ISSTATE (RL_STATE_TERMPREPPED) && rl_deprep_term_function)
|
||||
+ (*rl_deprep_term_function) ();
|
||||
+ #endif
|
||||
+ if (read_tty_modified ())
|
||||
+ read_tty_cleanup ();
|
||||
+
|
||||
/* Do trap[0] if defined. Allow it to override the exit status
|
||||
passed to us. */
|
||||
*** a/bash-4.3-patched/builtins/read.def 2014-10-01 12:57:38.000000000 -0400
|
||||
--- b/builtins/read.def 2014-12-22 10:48:54.000000000 -0500
|
||||
***************
|
||||
*** 141,148 ****
|
||||
int sigalrm_seen;
|
||||
|
||||
! static int reading;
|
||||
static SigHandler *old_alrm;
|
||||
static unsigned char delim;
|
||||
|
||||
/* In all cases, SIGALRM just sets a flag that we check periodically. This
|
||||
avoids problems with the semi-tricky stuff we do with the xfree of
|
||||
--- 141,150 ----
|
||||
int sigalrm_seen;
|
||||
|
||||
! static int reading, tty_modified;
|
||||
static SigHandler *old_alrm;
|
||||
static unsigned char delim;
|
||||
|
||||
+ static struct ttsave termsave;
|
||||
+
|
||||
/* In all cases, SIGALRM just sets a flag that we check periodically. This
|
||||
avoids problems with the semi-tricky stuff we do with the xfree of
|
||||
***************
|
||||
*** 189,193 ****
|
||||
SHELL_VAR *var;
|
||||
TTYSTRUCT ttattrs, ttset;
|
||||
- struct ttsave termsave;
|
||||
#if defined (ARRAY_VARS)
|
||||
WORD_LIST *alist;
|
||||
--- 191,194 ----
|
||||
***************
|
||||
*** 222,226 ****
|
||||
USE_VAR(lastsig);
|
||||
|
||||
! sigalrm_seen = reading = 0;
|
||||
|
||||
i = 0; /* Index into the string that we are reading. */
|
||||
--- 223,227 ----
|
||||
USE_VAR(lastsig);
|
||||
|
||||
! sigalrm_seen = reading = tty_modified = 0;
|
||||
|
||||
i = 0; /* Index into the string that we are reading. */
|
||||
***************
|
||||
*** 439,442 ****
|
||||
--- 440,445 ----
|
||||
goto assign_vars;
|
||||
}
|
||||
+ if (interactive_shell == 0)
|
||||
+ initialize_terminating_signals ();
|
||||
old_alrm = set_signal_handler (SIGALRM, sigalrm);
|
||||
add_unwind_protect (reset_alarm, (char *)NULL);
|
||||
***************
|
||||
*** 483,487 ****
|
||||
--- 486,493 ----
|
||||
if (i < 0)
|
||||
sh_ttyerror (1);
|
||||
+ tty_modified = 1;
|
||||
add_unwind_protect ((Function *)ttyrestore, (char *)&termsave);
|
||||
+ if (interactive_shell == 0)
|
||||
+ initialize_terminating_signals ();
|
||||
}
|
||||
}
|
||||
***************
|
||||
*** 498,502 ****
|
||||
--- 504,511 ----
|
||||
sh_ttyerror (1);
|
||||
|
||||
+ tty_modified = 1;
|
||||
add_unwind_protect ((Function *)ttyrestore, (char *)&termsave);
|
||||
+ if (interactive_shell == 0)
|
||||
+ initialize_terminating_signals ();
|
||||
}
|
||||
|
||||
***************
|
||||
*** 589,592 ****
|
||||
--- 598,603 ----
|
||||
else
|
||||
lastsig = 0;
|
||||
+ if (terminating_signal && tty_modified)
|
||||
+ ttyrestore (&termsave); /* fix terminal before exiting */
|
||||
CHECK_TERMSIG;
|
||||
eof = 1;
|
||||
***************
|
||||
*** 979,982 ****
|
||||
--- 990,1007 ----
|
||||
{
|
||||
ttsetattr (ttp->fd, ttp->attrs);
|
||||
+ tty_modified = 0;
|
||||
+ }
|
||||
+
|
||||
+ void
|
||||
+ read_tty_cleanup ()
|
||||
+ {
|
||||
+ if (tty_modified)
|
||||
+ ttyrestore (&termsave);
|
||||
+ }
|
||||
+
|
||||
+ int
|
||||
+ read_tty_modified ()
|
||||
+ {
|
||||
+ return (tty_modified);
|
||||
}
|
||||
|
||||
*** ./bash-4.3-patched/builtins/common.h 2014-10-01 12:57:47.000000000 -0400
|
||||
--- b/builtins/common.h 2014-12-22 10:10:14.000000000 -0500
|
||||
***************
|
||||
*** 123,126 ****
|
||||
--- 141,148 ----
|
||||
extern void getopts_reset __P((int));
|
||||
|
||||
+ /* Functions from read.def */
|
||||
+ extern void read_tty_cleanup __P((void));
|
||||
+ extern int read_tty_modified __P((void));
|
||||
+
|
||||
/* Functions from set.def */
|
||||
extern int minus_o_option_value __P((char *));
|
||||
*** a/bash-4.3-patched/bashline.c 2014-05-14 09:22:39.000000000 -0400
|
||||
--- b/bashline.c 2014-09-08 11:28:56.000000000 -0400
|
||||
***************
|
||||
*** 203,206 ****
|
||||
--- 203,207 ----
|
||||
extern int array_needs_making;
|
||||
extern int posixly_correct, no_symbolic_links;
|
||||
+ extern int sigalrm_seen;
|
||||
extern char *current_prompt_string, *ps1_prompt;
|
||||
extern STRING_INT_ALIST word_token_alist[];
|
||||
***************
|
||||
*** 4209,4214 ****
|
||||
/* If we're going to longjmp to top_level, make sure we clean up readline.
|
||||
check_signals will call QUIT, which will eventually longjmp to top_level,
|
||||
! calling run_interrupt_trap along the way. */
|
||||
! if (interrupt_state)
|
||||
rl_cleanup_after_signal ();
|
||||
bashline_reset_event_hook ();
|
||||
--- 4262,4268 ----
|
||||
/* If we're going to longjmp to top_level, make sure we clean up readline.
|
||||
check_signals will call QUIT, which will eventually longjmp to top_level,
|
||||
! calling run_interrupt_trap along the way. The check for sigalrm_seen is
|
||||
! to clean up the read builtin's state. */
|
||||
! if (terminating_signal || interrupt_state || sigalrm_seen)
|
||||
rl_cleanup_after_signal ();
|
||||
bashline_reset_event_hook ();
|
||||
*** a/bash-4.3-patched/sig.c 2014-01-10 15:06:06.000000000 -0500
|
||||
--- b/sig.c 2014-09-08 11:26:33.000000000 -0400
|
||||
***************
|
||||
*** 533,538 ****
|
||||
/* Set the event hook so readline will call it after the signal handlers
|
||||
finish executing, so if this interrupted character input we can get
|
||||
! quick response. */
|
||||
! if (interactive_shell && interactive && no_line_editing == 0)
|
||||
bashline_set_event_hook ();
|
||||
#endif
|
||||
--- 533,540 ----
|
||||
/* Set the event hook so readline will call it after the signal handlers
|
||||
finish executing, so if this interrupted character input we can get
|
||||
! quick response. If readline is active or has modified the terminal we
|
||||
! need to set this no matter what the signal is, though the check for
|
||||
! RL_STATE_TERMPREPPED is possibly redundant. */
|
||||
! if (RL_ISSTATE (RL_STATE_SIGHANDLER) || RL_ISSTATE (RL_STATE_TERMPREPPED))
|
||||
bashline_set_event_hook ();
|
||||
#endif
|
||||
*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 32
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 33
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -1,94 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-034
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-034
|
||||
|
||||
Bug-Reported-by: Dreamcat4 <dreamcat4@gmail.com>
|
||||
Bug-Reference-ID: <CAN39uTpAEs2GFu4ebC_SfSVMRTh-DJ9YanrY4BZZ3OO+CCHjng@mail.gmail.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-05/msg00001.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
If neither the -f nor -v options is supplied to unset, and a name argument is
|
||||
found to be a function and unset, subsequent name arguments are not treated as
|
||||
variables before attempting to unset a function by that name.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.3-patched/builtins/set.def 2013-04-19 07:20:34.000000000 -0400
|
||||
--- b/builtins/set.def 2015-05-05 13:25:36.000000000 -0400
|
||||
***************
|
||||
*** 752,758 ****
|
||||
--- 797,805 ----
|
||||
{
|
||||
int unset_function, unset_variable, unset_array, opt, nameref, any_failed;
|
||||
+ int global_unset_func, global_unset_var;
|
||||
char *name;
|
||||
|
||||
unset_function = unset_variable = unset_array = nameref = any_failed = 0;
|
||||
+ global_unset_func = global_unset_var = 0;
|
||||
|
||||
reset_internal_getopt ();
|
||||
***************
|
||||
*** 762,769 ****
|
||||
{
|
||||
case 'f':
|
||||
! unset_function = 1;
|
||||
break;
|
||||
case 'v':
|
||||
! unset_variable = 1;
|
||||
break;
|
||||
case 'n':
|
||||
--- 809,816 ----
|
||||
{
|
||||
case 'f':
|
||||
! global_unset_func = 1;
|
||||
break;
|
||||
case 'v':
|
||||
! global_unset_var = 1;
|
||||
break;
|
||||
case 'n':
|
||||
***************
|
||||
*** 778,782 ****
|
||||
list = loptend;
|
||||
|
||||
! if (unset_function && unset_variable)
|
||||
{
|
||||
builtin_error (_("cannot simultaneously unset a function and a variable"));
|
||||
--- 825,829 ----
|
||||
list = loptend;
|
||||
|
||||
! if (global_unset_func && global_unset_var)
|
||||
{
|
||||
builtin_error (_("cannot simultaneously unset a function and a variable"));
|
||||
***************
|
||||
*** 796,799 ****
|
||||
--- 843,849 ----
|
||||
name = list->word->word;
|
||||
|
||||
+ unset_function = global_unset_func;
|
||||
+ unset_variable = global_unset_var;
|
||||
+
|
||||
#if defined (ARRAY_VARS)
|
||||
unset_array = 0;
|
||||
|
||||
*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 33
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 34
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -1,67 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-035
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-035
|
||||
|
||||
Bug-Reported-by: <romerox.adrian@gmail.com>
|
||||
Bug-Reference-ID: <CABV5r3zhPXmSKUe9uedeGc5YFBM2njJ1iVmY2h5neWdQpDBQug@mail.gmail.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-08/msg00045.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
A locale with a long name can trigger a buffer overflow and core dump. This
|
||||
applies on systems that do not have locale_charset in libc, are not using
|
||||
GNU libiconv, and are not using the libintl that ships with bash in lib/intl.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.3-patched/lib/sh/unicode.c 2014-01-30 16:47:19.000000000 -0500
|
||||
--- b/lib/sh/unicode.c 2015-05-01 08:58:30.000000000 -0400
|
||||
***************
|
||||
*** 79,83 ****
|
||||
if (s)
|
||||
{
|
||||
! strcpy (charsetbuf, s+1);
|
||||
t = strchr (charsetbuf, '@');
|
||||
if (t)
|
||||
--- 79,84 ----
|
||||
if (s)
|
||||
{
|
||||
! strncpy (charsetbuf, s+1, sizeof (charsetbuf) - 1);
|
||||
! charsetbuf[sizeof (charsetbuf) - 1] = '\0';
|
||||
t = strchr (charsetbuf, '@');
|
||||
if (t)
|
||||
***************
|
||||
*** 85,89 ****
|
||||
return charsetbuf;
|
||||
}
|
||||
! strcpy (charsetbuf, locale);
|
||||
return charsetbuf;
|
||||
}
|
||||
--- 86,91 ----
|
||||
return charsetbuf;
|
||||
}
|
||||
! strncpy (charsetbuf, locale, sizeof (charsetbuf) - 1);
|
||||
! charsetbuf[sizeof (charsetbuf) - 1] = '\0';
|
||||
return charsetbuf;
|
||||
}
|
||||
*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 34
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 35
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -1,61 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-036
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-036
|
||||
|
||||
Bug-Reported-by: emanuelczirai@cryptolab.net
|
||||
Bug-Reference-ID: <f962e4f556da5ebfadaf7afe9c78a8cb@cryptolab.net>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-02/msg00071.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
When evaluating and setting integer variables, and the assignment fails to
|
||||
create a variable (for example, when performing an operation on an array
|
||||
variable with an invalid subscript), bash attempts to dereference a null
|
||||
pointer, causing a segmentation violation.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-20150206/variables.c 2015-01-23 20:39:27.000000000 -0500
|
||||
--- b/variables.c 2015-02-19 13:56:12.000000000 -0500
|
||||
***************
|
||||
*** 2834,2841 ****
|
||||
v = bind_variable (lhs, rhs, 0);
|
||||
|
||||
! if (v && isint)
|
||||
! VSETATTR (v, att_integer);
|
||||
!
|
||||
! VUNSETATTR (v, att_invisible);
|
||||
|
||||
return (v);
|
||||
--- 2834,2843 ----
|
||||
v = bind_variable (lhs, rhs, 0);
|
||||
|
||||
! if (v)
|
||||
! {
|
||||
! if (isint)
|
||||
! VSETATTR (v, att_integer);
|
||||
! VUNSETATTR (v, att_invisible);
|
||||
! }
|
||||
|
||||
return (v);
|
||||
*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 35
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 36
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -1,47 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-037
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-037
|
||||
|
||||
Bug-Reported-by: Greg Wooledge <wooledg@eeg.ccf.org>
|
||||
Bug-Reference-ID: <20150204144240.GN13956@eeg.ccf.org>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-02/msg00007.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
If an associative array uses `@' or `*' as a subscript, `declare -p' produces
|
||||
output that cannot be reused as input.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.3-patched/assoc.c 2011-11-05 16:39:05.000000000 -0400
|
||||
--- b/assoc.c 2015-02-04 15:28:25.000000000 -0500
|
||||
***************
|
||||
*** 437,440 ****
|
||||
--- 440,445 ----
|
||||
if (sh_contains_shell_metas (tlist->key))
|
||||
istr = sh_double_quote (tlist->key);
|
||||
+ else if (ALL_ELEMENT_SUB (tlist->key[0]) && tlist->key[1] == '\0')
|
||||
+ istr = sh_double_quote (tlist->key);
|
||||
else
|
||||
istr = tlist->key;
|
||||
*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 36
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 37
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -1,92 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-038
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-038
|
||||
|
||||
Bug-Reported-by: worley@alum.mit.edu (Dale R. Worley)
|
||||
Bug-Reference-ID: <201406100051.s5A0pCeB014978@hobgoblin.ariadne.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00028.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
There are a number of instances where `time' is not recognized as a reserved
|
||||
word when the shell grammar says it should be.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.3-patched/parse.y 2014-04-07 11:56:12.000000000 -0400
|
||||
--- b/parse.y 2014-06-11 10:25:53.000000000 -0400
|
||||
***************
|
||||
*** 2819,2827 ****
|
||||
case OR_OR:
|
||||
case '&':
|
||||
case DO:
|
||||
case THEN:
|
||||
case ELSE:
|
||||
case '{': /* } */
|
||||
! case '(': /* ) */
|
||||
case BANG: /* ! time pipeline */
|
||||
case TIME: /* time time pipeline */
|
||||
--- 2819,2832 ----
|
||||
case OR_OR:
|
||||
case '&':
|
||||
+ case WHILE:
|
||||
case DO:
|
||||
+ case UNTIL:
|
||||
+ case IF:
|
||||
case THEN:
|
||||
+ case ELIF:
|
||||
case ELSE:
|
||||
case '{': /* } */
|
||||
! case '(': /* )( */
|
||||
! case ')': /* only valid in case statement */
|
||||
case BANG: /* ! time pipeline */
|
||||
case TIME: /* time time pipeline */
|
||||
*** a/bash-4.3-patched/y.tab.c 2014-10-05 13:52:50.000000000 -0400
|
||||
--- b/y.tab.c 2015-05-19 15:08:43.000000000 -0400
|
||||
***************
|
||||
*** 5131,5139 ****
|
||||
case OR_OR:
|
||||
case '&':
|
||||
case DO:
|
||||
case THEN:
|
||||
case ELSE:
|
||||
case '{': /* } */
|
||||
! case '(': /* ) */
|
||||
case BANG: /* ! time pipeline */
|
||||
case TIME: /* time time pipeline */
|
||||
--- 5131,5144 ----
|
||||
case OR_OR:
|
||||
case '&':
|
||||
+ case WHILE:
|
||||
case DO:
|
||||
+ case UNTIL:
|
||||
+ case IF:
|
||||
case THEN:
|
||||
+ case ELIF:
|
||||
case ELSE:
|
||||
case '{': /* } */
|
||||
! case '(': /* )( */
|
||||
! case ')': /* only valid in case statement */
|
||||
case BANG: /* ! time pipeline */
|
||||
case TIME: /* time time pipeline */
|
||||
*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 37
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 38
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -1,61 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-039
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-039
|
||||
|
||||
Bug-Reported-by: SN <poczta-sn@gazeta.pl>
|
||||
Bug-Reference-ID: <54E2554C.205@gazeta.pl>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-02/msg00060.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Using the output of `declare -p' when run in a function can result in variables
|
||||
that are invisible to `declare -p'. This problem occurs when an assignment
|
||||
builtin such as `declare' receives a quoted compound array assignment as one of
|
||||
its arguments.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.3-patched/arrayfunc.c 2014-10-01 13:08:48.000000000 -0400
|
||||
--- b/arrayfunc.c 2015-02-19 14:33:05.000000000 -0500
|
||||
***************
|
||||
*** 405,408 ****
|
||||
--- 405,411 ----
|
||||
else
|
||||
array_insert (a, i, l->word->word);
|
||||
+
|
||||
+ VUNSETATTR (var, att_invisible); /* no longer invisible */
|
||||
+
|
||||
return var;
|
||||
}
|
||||
***************
|
||||
*** 635,638 ****
|
||||
--- 638,645 ----
|
||||
if (nlist)
|
||||
dispose_words (nlist);
|
||||
+
|
||||
+ if (var)
|
||||
+ VUNSETATTR (var, att_invisible); /* no longer invisible */
|
||||
+
|
||||
return (var);
|
||||
}
|
||||
*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 38
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 39
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -1,51 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-040
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacrias.com.ar>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-040
|
||||
|
||||
Bug-Reported-by: Jean Delvare <jdelvare@suse.de>
|
||||
Bug-Reference-ID: <20150609180231.5f463695@endymion.delvare>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-06/msg00033.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
There is a memory leak that occurs when bash expands an array reference on
|
||||
the rhs of an assignment statement.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.3-patched/subst.c 2014-10-01 12:57:47.000000000 -0400
|
||||
--- b/subst.c 2015-06-22 09:16:53.000000000 -0400
|
||||
***************
|
||||
*** 5783,5787 ****
|
||||
if (pflags & PF_ASSIGNRHS)
|
||||
{
|
||||
! temp = array_variable_name (name, &tt, (int *)0);
|
||||
if (ALL_ELEMENT_SUB (tt[0]) && tt[1] == ']')
|
||||
temp = array_value (name, quoted|Q_DOUBLE_QUOTES, 0, &atype, &ind);
|
||||
--- 5783,5787 ----
|
||||
if (pflags & PF_ASSIGNRHS)
|
||||
{
|
||||
! var = array_variable_part (name, &tt, (int *)0);
|
||||
if (ALL_ELEMENT_SUB (tt[0]) && tt[1] == ']')
|
||||
temp = array_value (name, quoted|Q_DOUBLE_QUOTES, 0, &atype, &ind);
|
||||
*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 39
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 40
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -1,76 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-041
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-041
|
||||
|
||||
Bug-Reported-by: Hanno Böck <hanno@hboeck.de>
|
||||
Bug-Reference-ID: <20150623131106.6f111da9@pc1>, <20150707004640.0e61d2f9@pc1>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-06/msg00089.html,
|
||||
http://lists.gnu.org/archive/html/bug-bash/2015-07/msg00018.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
There are several out-of-bounds read errors that occur when completing command
|
||||
lines where assignment statements appear before the command name. The first
|
||||
two appear only when programmable completion is enabled; the last one only
|
||||
happens when listing possible completions.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.3.40/bashline.c 2014-12-29 14:39:43.000000000 -0500
|
||||
--- b/bashline.c 2015-08-12 10:21:58.000000000 -0400
|
||||
***************
|
||||
*** 1469,1476 ****
|
||||
--- 1469,1489 ----
|
||||
os = start;
|
||||
n = 0;
|
||||
+ was_assignment = 0;
|
||||
s = find_cmd_start (os);
|
||||
e = find_cmd_end (end);
|
||||
do
|
||||
{
|
||||
+ /* Don't read past the end of rl_line_buffer */
|
||||
+ if (s > rl_end)
|
||||
+ {
|
||||
+ s1 = s = e1;
|
||||
+ break;
|
||||
+ }
|
||||
+ /* Or past point if point is within an assignment statement */
|
||||
+ else if (was_assignment && s > rl_point)
|
||||
+ {
|
||||
+ s1 = s = e1;
|
||||
+ break;
|
||||
+ }
|
||||
/* Skip over assignment statements preceding a command name. If we
|
||||
don't find a command name at all, we can perform command name
|
||||
*** a/bash-4.3.40/lib/readline/complete.c 2013-10-14 09:27:10.000000000 -0400
|
||||
--- b/lib/readline/complete.c 2015-07-31 09:34:39.000000000 -0400
|
||||
***************
|
||||
*** 690,693 ****
|
||||
--- 690,695 ----
|
||||
if (temp == 0 || *temp == '\0')
|
||||
return (pathname);
|
||||
+ else if (temp[1] == 0 && temp == pathname)
|
||||
+ return (pathname);
|
||||
/* If the basename is NULL, we might have a pathname like '/usr/src/'.
|
||||
Look for a previous slash and, if one is found, return the portion
|
||||
*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 40
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 41
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -1,59 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-042
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-042
|
||||
|
||||
Bug-Reported-by: Nathan Neulinger <nneul@neulinger.org>
|
||||
Bug-Reference-ID: <558EFDF2.7060402@neulinger.org>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-06/msg00096.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
There is a problem when parsing command substitutions containing `case'
|
||||
commands within pipelines that causes the parser to not correctly identify
|
||||
the end of the command substitution.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.3-patched/parse.y 2015-05-18 19:27:05.000000000 -0400
|
||||
--- b/parse.y 2015-06-29 10:59:27.000000000 -0400
|
||||
***************
|
||||
*** 3709,3712 ****
|
||||
--- 3709,3714 ----
|
||||
tflags |= LEX_INWORD;
|
||||
lex_wlen = 0;
|
||||
+ if (tflags & LEX_RESWDOK)
|
||||
+ lex_rwlen = 0;
|
||||
}
|
||||
}
|
||||
*** a/bash-4.3-patched/y.tab.c 2015-05-18 19:27:05.000000000 -0400
|
||||
--- b/y.tab.c 2015-06-29 10:59:27.000000000 -0400
|
||||
***************
|
||||
*** 6021,6024 ****
|
||||
--- 6021,6026 ----
|
||||
tflags |= LEX_INWORD;
|
||||
lex_wlen = 0;
|
||||
+ if (tflags & LEX_RESWDOK)
|
||||
+ lex_rwlen = 0;
|
||||
}
|
||||
}
|
||||
*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 41
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 42
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -1,63 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-043
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-043
|
||||
|
||||
Bug-Reported-by: lolilolicon <lolilolicon@gmail.com>
|
||||
Bug-Reference-ID: <CAMtVo_MF16KWanCB4C8WxA88Qt26zWsvV6V7+_U2fM0E6tCDxw@mail.gmail.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-08/msg00040.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
When the lastpipe option is enabled, the last component can contain nested
|
||||
pipelines and cause a segmentation fault under certain circumestances.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/execute_cmd.c 2014-07-30 10:26:52.000000000 -0400
|
||||
--- b/execute_cmd.c 2014-08-15 08:55:24.000000000 -0400
|
||||
***************
|
||||
*** 2406,2412 ****
|
||||
{
|
||||
#if defined (JOB_CONTROL)
|
||||
! append_process (savestring (the_printed_command), dollar_dollar_pid, exec_result, lastpipe_jid);
|
||||
! #endif
|
||||
lstdin = wait_for (lastpid);
|
||||
#if defined (JOB_CONTROL)
|
||||
/* If wait_for removes the job from the jobs table, use result of last
|
||||
--- 2433,2447 ----
|
||||
{
|
||||
#if defined (JOB_CONTROL)
|
||||
! if (INVALID_JOB (lastpipe_jid) == 0)
|
||||
! {
|
||||
! append_process (savestring (the_printed_command_except_trap), dollar_dollar_pid, exec_result, lastpipe_jid);
|
||||
! lstdin = wait_for (lastpid);
|
||||
! }
|
||||
! else
|
||||
! lstdin = wait_for_single_pid (lastpid); /* checks bgpids list */
|
||||
! #else
|
||||
lstdin = wait_for (lastpid);
|
||||
+ #endif
|
||||
+
|
||||
#if defined (JOB_CONTROL)
|
||||
/* If wait_for removes the job from the jobs table, use result of last
|
||||
*** a/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 42
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 43
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -1,52 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-044
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-044
|
||||
|
||||
Bug-Reported-by: Ondrej Oprala <ooprala@redhat.com>
|
||||
Bug-Reference-ID: <539ED55B.2080103@redhat.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00046.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
A typo prevents the `compat42' shopt option from working as intended.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
diff -rC 2 bash-4.3.42/builtins/shopt.def bash-4.3.43/builtins/shopt.def
|
||||
*** a/builtins/shopt.def 2013-02-27 09:43:20.000000000 -0500
|
||||
--- b/builtins/shopt.def 2015-10-16 11:25:28.000000000 -0400
|
||||
***************
|
||||
*** 161,165 ****
|
||||
{ "compat40", &shopt_compat40, set_compatibility_level },
|
||||
{ "compat41", &shopt_compat41, set_compatibility_level },
|
||||
! { "compat42", &shopt_compat41, set_compatibility_level },
|
||||
#if defined (READLINE)
|
||||
{ "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL},
|
||||
--- 161,165 ----
|
||||
{ "compat40", &shopt_compat40, set_compatibility_level },
|
||||
{ "compat41", &shopt_compat41, set_compatibility_level },
|
||||
! { "compat42", &shopt_compat42, set_compatibility_level },
|
||||
#if defined (READLINE)
|
||||
{ "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL},
|
||||
|
||||
*** a/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 43
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 44
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -1,56 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-045
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-045
|
||||
|
||||
Bug-Reported-by: Basin Ilya <basinilya@gmail.com>
|
||||
Bug-Reference-ID: <5624C0AC.8070802@gmail.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-10/msg00141.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
If a file open attempted as part of a redirection fails because it is interrupted
|
||||
by a signal, the shell needs to process any pending traps to allow the redirection
|
||||
to be canceled.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/redir.c 2014-12-03 10:47:38.000000000 -0500
|
||||
--- b/redir.c 2015-01-16 10:15:47.000000000 -0500
|
||||
***************
|
||||
*** 672,676 ****
|
||||
e = errno;
|
||||
if (fd < 0 && e == EINTR)
|
||||
! QUIT;
|
||||
errno = e;
|
||||
}
|
||||
--- 672,679 ----
|
||||
e = errno;
|
||||
if (fd < 0 && e == EINTR)
|
||||
! {
|
||||
! QUIT;
|
||||
! run_pending_traps ();
|
||||
! }
|
||||
errno = e;
|
||||
}
|
||||
|
||||
*** a/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 44
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 45
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -1,59 +0,0 @@
|
||||
From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-046
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.3
|
||||
Patch-ID: bash43-046
|
||||
|
||||
Bug-Reported-by: Sergey Tselikh <stselikh@gmail.com>
|
||||
Bug-Reference-ID: <20150816110235.91f3e12e3f20d20cdaad963e@gmail.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-08/msg00080.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
An incorrect conversion from an indexed to associative array can result in a
|
||||
core dump.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/subst.c 2015-08-13 11:32:54.000000000 -0400
|
||||
--- b/subst.c 2015-08-18 10:13:59.000000000 -0400
|
||||
***************
|
||||
*** 9562,9566 ****
|
||||
opts[opti] = '\0';
|
||||
if (opti > 0)
|
||||
! make_internal_declare (tlist->word->word, opts);
|
||||
|
||||
t = do_word_assignment (tlist->word, 0);
|
||||
--- 9562,9573 ----
|
||||
opts[opti] = '\0';
|
||||
if (opti > 0)
|
||||
! {
|
||||
! t = make_internal_declare (tlist->word->word, opts);
|
||||
! if (t != EXECUTION_SUCCESS)
|
||||
! {
|
||||
! last_command_exit_value = t;
|
||||
! exp_jump_to_top_level (DISCARD);
|
||||
! }
|
||||
! }
|
||||
|
||||
t = do_word_assignment (tlist->word, 0);
|
||||
|
||||
*** a/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
|
||||
--- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 45
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 46
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 317881019bbf2262fb814b7dd8e40632d13c3608d2f237800a8828fbb8a640dd bash-4.3.30.tar.gz
|
||||
sha256 d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb bash-4.4.tar.gz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
BASH_VERSION = 4.3.30
|
||||
BASH_VERSION = 4.4
|
||||
BASH_SITE = $(BR2_GNU_MIRROR)/bash
|
||||
# Build after since bash is better than busybox shells
|
||||
BASH_DEPENDENCIES = ncurses readline host-bison \
|
||||
|
||||
64
bsp/buildroot/package/bash/bash44-001.patch
Normal file
64
bsp/buildroot/package/bash/bash44-001.patch
Normal file
@@ -0,0 +1,64 @@
|
||||
From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-001
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.4
|
||||
Patch-ID: bash44-001
|
||||
|
||||
Bug-Reported-by: Sean Zha <freeman_cha@hotmail.com>
|
||||
Bug-Reference-ID: <BN3PR01MB13657D9303EB94BF6E54216E8CCA0@BN3PR01MB1365.prod.exchangelabs.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-09/msg00107.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Bash-4.4 changed the way the history list is initially allocated to reduce
|
||||
the number of reallocations and copies. Users who set HISTSIZE to a very
|
||||
large number to essentially unlimit the size of the history list will get
|
||||
memory allocation errors
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.4/lib/readline/history.c 2015-12-28 13:50:31.000000000 -0500
|
||||
--- b/lib/readline/history.c 2016-09-30 14:28:40.000000000 -0400
|
||||
***************
|
||||
*** 58,61 ****
|
||||
--- 58,63 ----
|
||||
#define DEFAULT_HISTORY_INITIAL_SIZE 502
|
||||
|
||||
+ #define MAX_HISTORY_INITIAL_SIZE 8192
|
||||
+
|
||||
/* The number of slots to increase the_history by. */
|
||||
#define DEFAULT_HISTORY_GROW_SIZE 50
|
||||
***************
|
||||
*** 308,312 ****
|
||||
{
|
||||
if (history_stifled && history_max_entries > 0)
|
||||
! history_size = history_max_entries + 2;
|
||||
else
|
||||
history_size = DEFAULT_HISTORY_INITIAL_SIZE;
|
||||
--- 310,316 ----
|
||||
{
|
||||
if (history_stifled && history_max_entries > 0)
|
||||
! history_size = (history_max_entries > MAX_HISTORY_INITIAL_SIZE)
|
||||
! ? MAX_HISTORY_INITIAL_SIZE
|
||||
! : history_max_entries + 2;
|
||||
else
|
||||
history_size = DEFAULT_HISTORY_INITIAL_SIZE;
|
||||
*** a/bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||
--- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 0
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 1
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
73
bsp/buildroot/package/bash/bash44-002.patch
Normal file
73
bsp/buildroot/package/bash/bash44-002.patch
Normal file
@@ -0,0 +1,73 @@
|
||||
From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-002
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.4
|
||||
Patch-ID: bash44-002
|
||||
|
||||
Bug-Reported-by: Eric Pruitt <eric.pruitt@gmail.com>
|
||||
Bug-Reference-ID: <20160916055120.GA28272@sinister.codevat.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-09/msg00015.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Bash-4.4 warns when discarding NUL bytes in command substitution output
|
||||
instead of silently dropping them. This patch changes the warnings from
|
||||
one per NUL byte encountered to one warning per command substitution.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.4/subst.c 2016-08-30 16:46:38.000000000 -0400
|
||||
--- b/subst.c 2016-09-26 10:20:19.000000000 -0400
|
||||
***************
|
||||
*** 5932,5935 ****
|
||||
--- 5933,5937 ----
|
||||
int istring_index, istring_size, c, tflag, skip_ctlesc, skip_ctlnul;
|
||||
ssize_t bufn;
|
||||
+ int nullbyte;
|
||||
|
||||
istring = (char *)NULL;
|
||||
***************
|
||||
*** 5939,5942 ****
|
||||
--- 5941,5946 ----
|
||||
skip_ctlesc |= *s == CTLESC, skip_ctlnul |= *s == CTLNUL;
|
||||
|
||||
+ nullbyte = 0;
|
||||
+
|
||||
/* Read the output of the command through the pipe. This may need to be
|
||||
changed to understand multibyte characters in the future. */
|
||||
***************
|
||||
*** 5957,5961 ****
|
||||
{
|
||||
#if 1
|
||||
! internal_warning ("%s", _("command substitution: ignored null byte in input"));
|
||||
#endif
|
||||
continue;
|
||||
--- 5961,5969 ----
|
||||
{
|
||||
#if 1
|
||||
! if (nullbyte == 0)
|
||||
! {
|
||||
! internal_warning ("%s", _("command substitution: ignored null byte in input"));
|
||||
! nullbyte = 1;
|
||||
! }
|
||||
#endif
|
||||
continue;
|
||||
*** a/bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||
--- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 1
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 2
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
62
bsp/buildroot/package/bash/bash44-003.patch
Normal file
62
bsp/buildroot/package/bash/bash44-003.patch
Normal file
@@ -0,0 +1,62 @@
|
||||
From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-003
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.4
|
||||
Patch-ID: bash44-003
|
||||
|
||||
Bug-Reported-by: op7ic \x00 <op7ica@gmail.com>
|
||||
Bug-Reference-ID: <CAFHyJTopWC5Jx+U7WcvxSZKu+KrqSf+_3sHPiRWo=VzXSiPq=w@mail.gmail.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00005.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Specially-crafted input, in this case an incomplete pathname expansion
|
||||
bracket expression containing an invalid collating symbol, can cause the
|
||||
shell to crash.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.4/lib/glob/sm_loop.c 2016-04-10 11:23:21.000000000 -0400
|
||||
--- b/lib/glob/sm_loop.c 2016-11-02 14:03:34.000000000 -0400
|
||||
***************
|
||||
*** 331,334 ****
|
||||
--- 331,340 ----
|
||||
if (p[pc] == L('.') && p[pc+1] == L(']'))
|
||||
break;
|
||||
+ if (p[pc] == 0)
|
||||
+ {
|
||||
+ if (vp)
|
||||
+ *vp = INVALID;
|
||||
+ return (p + pc);
|
||||
+ }
|
||||
val = COLLSYM (p, pc);
|
||||
if (vp)
|
||||
***************
|
||||
*** 484,487 ****
|
||||
--- 490,496 ----
|
||||
c = FOLD (c);
|
||||
|
||||
+ if (c == L('\0'))
|
||||
+ return ((test == L('[')) ? savep : (CHAR *)0);
|
||||
+
|
||||
if ((flags & FNM_PATHNAME) && c == L('/'))
|
||||
/* [/] can never match when matching a pathname. */
|
||||
*** a/bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||
--- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 2
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 3
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
88
bsp/buildroot/package/bash/bash44-004.patch
Normal file
88
bsp/buildroot/package/bash/bash44-004.patch
Normal file
@@ -0,0 +1,88 @@
|
||||
From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-004
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.4
|
||||
Patch-ID: bash44-004
|
||||
|
||||
Bug-Reported-by: Christian Weisgerber <naddy@mips.inka.de>
|
||||
Bug-Reference-ID: <20161101160302.GB54856@lorvorc.mips.inka.de>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00004.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
There is a race condition that can result in bash referencing freed memory
|
||||
when freeing data associated with the last process substitution.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.4/jobs.c 2016-08-23 16:38:44.000000000 -0400
|
||||
--- b/jobs.c 2016-11-02 18:24:45.000000000 -0400
|
||||
***************
|
||||
*** 454,457 ****
|
||||
--- 454,472 ----
|
||||
}
|
||||
|
||||
+ void
|
||||
+ discard_last_procsub_child ()
|
||||
+ {
|
||||
+ PROCESS *disposer;
|
||||
+ sigset_t set, oset;
|
||||
+
|
||||
+ BLOCK_CHILD (set, oset);
|
||||
+ disposer = last_procsub_child;
|
||||
+ last_procsub_child = (PROCESS *)NULL;
|
||||
+ UNBLOCK_CHILD (oset);
|
||||
+
|
||||
+ if (disposer)
|
||||
+ discard_pipeline (disposer);
|
||||
+ }
|
||||
+
|
||||
struct pipeline_saver *
|
||||
alloc_pipeline_saver ()
|
||||
*** a/bash-4.4/jobs.h 2016-04-27 10:35:51.000000000 -0400
|
||||
--- b/jobs.h 2016-11-02 18:25:08.000000000 -0400
|
||||
***************
|
||||
*** 191,194 ****
|
||||
--- 191,195 ----
|
||||
extern void stop_making_children __P((void));
|
||||
extern void cleanup_the_pipeline __P((void));
|
||||
+ extern void discard_last_procsub_child __P((void));
|
||||
extern void save_pipeline __P((int));
|
||||
extern PROCESS *restore_pipeline __P((int));
|
||||
*** a/bash-4.4/subst.c 2016-08-30 16:46:38.000000000 -0400
|
||||
--- b/subst.c 2016-11-02 18:23:24.000000000 -0400
|
||||
***************
|
||||
*** 5809,5816 ****
|
||||
#if defined (JOB_CONTROL)
|
||||
if (last_procsub_child)
|
||||
! {
|
||||
! discard_pipeline (last_procsub_child);
|
||||
! last_procsub_child = (PROCESS *)NULL;
|
||||
! }
|
||||
last_procsub_child = restore_pipeline (0);
|
||||
#endif
|
||||
--- 5834,5838 ----
|
||||
#if defined (JOB_CONTROL)
|
||||
if (last_procsub_child)
|
||||
! discard_last_procsub_child ();
|
||||
last_procsub_child = restore_pipeline (0);
|
||||
#endif
|
||||
*** a/bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||
--- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 3
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 4
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
51
bsp/buildroot/package/bash/bash44-005.patch
Normal file
51
bsp/buildroot/package/bash/bash44-005.patch
Normal file
@@ -0,0 +1,51 @@
|
||||
From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-005
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.4
|
||||
Patch-ID: bash44-005
|
||||
|
||||
Bug-Reported-by: Dr. Werner Fink <werner@suse.de>
|
||||
Bug-Reference-ID: <20161107100936.ajnojd7dspirdflf@noether.suse.de>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00054.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Under certain circumstances, a simple command is optimized to eliminate a
|
||||
fork, resulting in an EXIT trap not being executed.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** a/bash-4.4/builtins/evalstring.c 2016-08-11 14:18:51.000000000 -0400
|
||||
--- b/builtins/evalstring.c 2016-11-08 15:05:07.000000000 -0500
|
||||
***************
|
||||
*** 105,114 ****
|
||||
*bash_input.location.string == '\0' &&
|
||||
command->type == cm_simple &&
|
||||
- #if 0
|
||||
signal_is_trapped (EXIT_TRAP) == 0 &&
|
||||
signal_is_trapped (ERROR_TRAP) == 0 &&
|
||||
- #else
|
||||
any_signals_trapped () < 0 &&
|
||||
- #endif
|
||||
command->redirects == 0 && command->value.Simple->redirects == 0 &&
|
||||
((command->flags & CMD_TIME_PIPELINE) == 0) &&
|
||||
--- 105,111 ----
|
||||
*** a/bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||
--- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 4
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 5
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
63
bsp/buildroot/package/bash/bash44-006.patch
Normal file
63
bsp/buildroot/package/bash/bash44-006.patch
Normal file
@@ -0,0 +1,63 @@
|
||||
From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-006
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.4
|
||||
Patch-ID: bash44-006
|
||||
|
||||
Bug-Reported-by: <fernando@null-life.com>
|
||||
Bug-Reference-ID: <CAEr-gPFPvqheiAeENmMkEwWRd4U=1iqCsYmR3sLdULOqL++_tQ@mail.gmail.com>
|
||||
Bug-Reference-URL:
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Out-of-range negative offsets to popd can cause the shell to crash attempting
|
||||
to free an invalid memory block.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** bash-4.4-patched/builtins/pushd.def 2016-01-25 13:31:49.000000000 -0500
|
||||
--- b/builtins/pushd.def 2016-10-28 10:46:49.000000000 -0400
|
||||
***************
|
||||
*** 366,370 ****
|
||||
}
|
||||
|
||||
! if (which > directory_list_offset || (directory_list_offset == 0 && which == 0))
|
||||
{
|
||||
pushd_error (directory_list_offset, which_word ? which_word : "");
|
||||
--- b/366,370 ----
|
||||
}
|
||||
|
||||
! if (which > directory_list_offset || (which < -directory_list_offset) || (directory_list_offset == 0 && which == 0))
|
||||
{
|
||||
pushd_error (directory_list_offset, which_word ? which_word : "");
|
||||
***************
|
||||
*** 388,391 ****
|
||||
--- b/388,396 ----
|
||||
of the list into place. */
|
||||
i = (direction == '+') ? directory_list_offset - which : which;
|
||||
+ if (i < 0 || i > directory_list_offset)
|
||||
+ {
|
||||
+ pushd_error (directory_list_offset, which_word ? which_word : "");
|
||||
+ return (EXECUTION_FAILURE);
|
||||
+ }
|
||||
free (pushd_directory_list[i]);
|
||||
directory_list_offset--;
|
||||
*** bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||
--- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 5
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- b/26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 6
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user