Import buildroot 2016.02
This commit is contained in:
@@ -115,6 +115,10 @@ else
|
||||
AVAHI_CONF_OPTS += --disable-libdaemon
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCAP),y)
|
||||
AVAHI_DEPENDENCIES += libcap
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y)
|
||||
AVAHI_DEPENDENCIES += expat
|
||||
AVAHI_CONF_OPTS += --with-xml=expat
|
||||
|
||||
@@ -61,6 +61,10 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
|
||||
BINUTILS_DEPENDENCIES += busybox
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
||||
BINUTILS_DEPENDENCIES += zlib
|
||||
endif
|
||||
|
||||
# "host" binutils should actually be "cross"
|
||||
# We just keep the convention of "host utility" for now
|
||||
HOST_BINUTILS_CONF_OPTS = \
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
From 01d85fdf6a45150e82143803be3373d779d18522 Mon Sep 17 00:00:00 2001
|
||||
From: John Keeping <john@metanate.com>
|
||||
Date: Wed, 24 Feb 2016 13:57:38 +0000
|
||||
Subject: [PATCH] tools/avinfo: Fix big endian build
|
||||
|
||||
Commit 101b439 (tools/avinfo: Add partial support for Sony LDAC) added a
|
||||
new a2dp_ldac_t structure but only inside a little endian ifdef. Add
|
||||
the same structure in the big endian code.
|
||||
|
||||
The structure definition doesn't differ for the big/little endian cases
|
||||
but if the unknown fields are discovered in the future it might, so a
|
||||
copy is added rather than pulling the existing definition below the
|
||||
endif.
|
||||
|
||||
[John: backport from upstream commit 01d85fdf6a45150e82143803be3373d779d18522.]
|
||||
Signed-off-by: John Keeping <john@metanate.com>
|
||||
---
|
||||
profiles/audio/a2dp-codecs.h | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/profiles/audio/a2dp-codecs.h b/profiles/audio/a2dp-codecs.h
|
||||
index e9da0bf..4fb5c0c 100644
|
||||
--- a/profiles/audio/a2dp-codecs.h
|
||||
+++ b/profiles/audio/a2dp-codecs.h
|
||||
@@ -234,6 +234,11 @@ typedef struct {
|
||||
uint8_t channel_mode:4;
|
||||
} __attribute__ ((packed)) a2dp_aptx_t;
|
||||
|
||||
+typedef struct {
|
||||
+ a2dp_vendor_codec_t info;
|
||||
+ uint8_t unknown[2];
|
||||
+} __attribute__ ((packed)) a2dp_ldac_t;
|
||||
+
|
||||
#else
|
||||
#error "Unknown byte order"
|
||||
#endif
|
||||
--
|
||||
2.7.0.226.gfe986fe
|
||||
|
||||
@@ -93,6 +93,10 @@ else
|
||||
CAIRO_CONF_OPTS += --disable-vg
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LZO),y)
|
||||
CAIRO_DEPENDENCIES += lzo
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XORG7),y)
|
||||
CAIRO_CONF_OPTS += --enable-xlib --enable-xcb --with-x
|
||||
CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext
|
||||
|
||||
@@ -2,13 +2,16 @@ config BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS
|
||||
bool
|
||||
default y if BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm
|
||||
|
||||
comment "canfestival needs a toolchain w/ threads and dynamic library"
|
||||
comment "canfestival needs a (e)glibc or uClibc toolchain w/ threads and dynamic library"
|
||||
depends on BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_USES_MUSL || \
|
||||
!BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
BR2_STATIC_LIBS
|
||||
|
||||
config BR2_PACKAGE_CANFESTIVAL
|
||||
bool "canfestival"
|
||||
depends on BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS
|
||||
depends on !BR2_TOOLCHAIN_USES_MUSL
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_STATIC_LIBS
|
||||
help
|
||||
|
||||
@@ -16,6 +16,12 @@ CHRONY_CONF_OPTS = \
|
||||
--without-seccomp \
|
||||
--without-tomcrypt
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCAP),y)
|
||||
CHRONY_DEPENDENCIES += libcap
|
||||
else
|
||||
CHRONY_CONF_OPTS += --without-libcap
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBNSS),y)
|
||||
CHRONY_DEPENDENCIES += host-pkgconf libnss
|
||||
else
|
||||
|
||||
@@ -14,6 +14,10 @@ ifeq ($(BR2_STATIC_LIBS),y)
|
||||
CIFS_UTILS_CONF_OPTS += --disable-pie
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_KEYUTILS),y)
|
||||
CIFS_UTILS_DEPENDENCIES += keyutils
|
||||
endif
|
||||
|
||||
define CIFS_UTILS_NO_WERROR
|
||||
$(SED) 's/-Werror//' $(@D)/Makefile.in
|
||||
endef
|
||||
|
||||
@@ -55,6 +55,7 @@ config BR2_PACKAGE_CONNMAN_NEARD
|
||||
config BR2_PACKAGE_CONNMAN_OFONO
|
||||
bool "enable ofono support"
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII # libcap-ng
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # ofono
|
||||
select BR2_PACKAGE_OFONO
|
||||
|
||||
config BR2_PACKAGE_CONNMAN_DEBUG
|
||||
|
||||
@@ -11,7 +11,7 @@ DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)"
|
||||
DNSMASQ_MAKE_OPTS = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
|
||||
DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)"
|
||||
DNSMASQ_DEPENDENCIES = host-pkgconf
|
||||
DNSMASQ_LICENSE = Dual GPLv2/GPLv3
|
||||
DNSMASQ_LICENSE = GPLv2 or GPLv3
|
||||
DNSMASQ_LICENSE_FILES = COPYING COPYING-v3
|
||||
|
||||
ifneq ($(BR2_PACKAGE_DNSMASQ_DHCP),y)
|
||||
|
||||
@@ -34,6 +34,10 @@ ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
|
||||
DVDAUTHOR_DEPENDENCIES += fontconfig
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y)
|
||||
DVDAUTHOR_DEPENDENCIES += libfribidi
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_DVDAUTHOR_DVDUNAUTHOR),y)
|
||||
DVDAUTHOR_DEPENDENCIES += libdvdread
|
||||
DVDAUTHOR_CONF_OPTS += --enable-dvdunauthor
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
|
||||
config BR2_PACKAGE_E2FSPROGS
|
||||
bool "e2fsprogs"
|
||||
depends on BR2_USE_WCHAR # util-linux
|
||||
|
||||
@@ -2,7 +2,8 @@ config BR2_PACKAGE_EFL
|
||||
bool "efl"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_PACKAGE_HAS_UDEV # libudev
|
||||
depends on BR2_PACKAGE_LUA # lua 5.1 or better
|
||||
# https://phab.enlightenment.org/T2728
|
||||
depends on BR2_PACKAGE_LUA_5_1 # needs lua 5.1, broken with 5.2+
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # untested without threads
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_USE_WCHAR # use wchar_t
|
||||
@@ -185,6 +186,6 @@ comment "efl needs udev /dev management and a toolchain w/ C++, dynamic library,
|
||||
|| BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
|
||||
depends on BR2_USE_MMU
|
||||
|
||||
comment "efl needs lua"
|
||||
depends on !BR2_PACKAGE_LUA
|
||||
comment "efl needs lua 5.1"
|
||||
depends on !BR2_PACKAGE_LUA_5_1
|
||||
depends on BR2_USE_MMU
|
||||
|
||||
@@ -13,8 +13,8 @@ ERLANG_REBAR_SITE = $(call github,rebar,rebar,$(ERLANG_REBAR_VERSION))
|
||||
|
||||
# Although the file LICENSE state Apache-2.0, a lot (if not all) the files
|
||||
# in src/ bear the MIT licence.
|
||||
ERLANG_LICENSE = Apache-2.0, MIT
|
||||
ERLANG_LICENSE_FILES = LICENSE
|
||||
ERLANG_REBAR_LICENSE = Apache-2.0, MIT
|
||||
ERLANG_REBAR_LICENSE_FILES = LICENSE
|
||||
|
||||
# We do not have a target variant, so just define the dependencies,
|
||||
# configure and build commands for the host variant.
|
||||
|
||||
@@ -30,7 +30,7 @@ EUDEV_CONF_OPTS += --with-rootlibdir=/lib --enable-split-usr
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_EUDEV_RULES_GEN),y)
|
||||
EUDEV_CONF_OPTS += --enable-rule_generator
|
||||
EUDEV_CONF_OPTS += --enable-rule-generator
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_EUDEV_ENABLE_HWDB),y)
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
From a34dba99aff2994269ee347da67feb7ede9b1a67 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Thu, 18 Feb 2016 22:32:38 +0100
|
||||
Subject: [PATCH] mouse.cpp: fix musl compile
|
||||
|
||||
Add missing include, fixes:
|
||||
|
||||
mouse.cpp:58:37: error: 'memset' was not declared in this scope
|
||||
mouse.cpp:60:64: error: 'strncpy' was not declared in this scope
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
src/mouse.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/mouse.cpp b/src/mouse.cpp
|
||||
index 0435dd9..f173137 100644
|
||||
--- a/src/mouse.cpp
|
||||
+++ b/src/mouse.cpp
|
||||
@@ -27,6 +27,7 @@ DEFINE_INSTANCE(Mouse)
|
||||
#include <stddef.h>
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
+#include <string.h>
|
||||
#include <gpm.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/types.h>
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -16,4 +16,11 @@ ifeq ($(BR2_STATIC_LIBS)$(BR2_TOOLCHAIN_HAS_THREADS),yy)
|
||||
FBTERM_CONF_ENV += LIBS='-lpthread'
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GPM),y)
|
||||
FBTERM_DEPENDENCIES += gpm
|
||||
FBTERM_CONF_OPTS += --enable-gpm
|
||||
else
|
||||
FBTERM_CONF_OPTS += --disable-gpm
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
@@ -33,8 +33,9 @@ choice
|
||||
config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11
|
||||
bool "X11"
|
||||
depends on BR2_PACKAGE_XORG7
|
||||
select BR2_PACKAGE_XLIB_LIBXDAMAGE # Runtime dependency
|
||||
select BR2_PACKAGE_XLIB_LIBXEXT # Runtime dependency
|
||||
select BR2_PACKAGE_XLIB_LIBXDAMAGE
|
||||
select BR2_PACKAGE_XLIB_LIBXEXT
|
||||
select BR2_PACKAGE_XLIB_LIBXFIXES
|
||||
|
||||
comment "X11 backend needs Xorg package"
|
||||
depends on !BR2_PACKAGE_XORG7
|
||||
|
||||
@@ -22,6 +22,14 @@ IMX_GPU_VIV_REDISTRIBUTE = NO
|
||||
IMX_GPU_VIV_PROVIDES = libegl libgles libopenvg
|
||||
IMX_GPU_VIV_LIB_TARGET = $(call qstrip,$(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT))
|
||||
|
||||
ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11)
|
||||
# The libGAL.so library provided by imx-gpu-viv uses X functions. Packages
|
||||
# may want to link against libGAL.so (QT5 Base with OpenGL and X support
|
||||
# does so). For this to work we need build dependencies to libXdamage,
|
||||
# libXext and libXfixes so that X functions used in libGAL.so are referenced.
|
||||
IMX_GPU_VIV_DEPENDENCIES += xlib_libXdamage xlib_libXext xlib_libXfixes
|
||||
endif
|
||||
|
||||
define IMX_GPU_VIV_EXTRACT_CMDS
|
||||
$(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(IMX_GPU_VIV_SOURCE))
|
||||
endef
|
||||
|
||||
@@ -16,6 +16,10 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
|
||||
GAWK_DEPENDENCIES += busybox
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBSIGSEGV),y)
|
||||
GAWK_DEPENDENCIES += libsigsegv
|
||||
endif
|
||||
|
||||
# --with-mpfr requires an argument so just let
|
||||
# configure find it automatically
|
||||
ifeq ($(BR2_PACKAGE_MPFR),y)
|
||||
|
||||
@@ -38,6 +38,13 @@ else
|
||||
GNUPG2_CONF_OPTS += --disable-bzip2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y)
|
||||
GNUPG2_CONF_OPTS += --enable-ccid-driver
|
||||
GNUPG2_DEPENDENCIES += libusb-compat
|
||||
else
|
||||
GNUPG2_CONF_OPTS += --disable-ccid-driver
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_READLINE),y)
|
||||
GNUPG2_CONF_OPTS += --with-readline=$(STAGING_DIR)
|
||||
GNUPG2_DEPENDENCIES += readline
|
||||
|
||||
@@ -17,6 +17,10 @@ GNURADIO_DEPENDENCIES = \
|
||||
host-swig \
|
||||
boost
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ORC),y)
|
||||
GNURADIO_DEPENDENCIES += orc
|
||||
endif
|
||||
|
||||
GNURADIO_CONF_OPTS = \
|
||||
-DENABLE_DEFAULT=OFF \
|
||||
-DENABLE_VOLK=ON \
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
From 06b00d53d8bd513ad5d262dc94a016c6fbf2d3aa Mon Sep 17 00:00:00 2001
|
||||
From: Kamil Rytarowski <n54@gmx.com>
|
||||
Date: Sat, 4 May 2013 01:30:17 +0200
|
||||
Subject: [PATCH] Install unversioned solibrary
|
||||
|
||||
Unversioned solibraries are shipped with -devel packages in Linux
|
||||
distros. Generate and install it for the consistency.
|
||||
|
||||
[Upstream patch backported from the github repository,
|
||||
https://github.com/telmich/gpm/commit/06b00d53d8bd513ad5d262dc94a016c6fbf2d3aa]
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
src/Makefile.in | 7 +++----
|
||||
1 file changed, 3 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/Makefile.in b/src/Makefile.in
|
||||
index 6b60ad3..7e9e2ef 100644
|
||||
--- a/src/Makefile.in
|
||||
+++ b/src/Makefile.in
|
||||
@@ -79,7 +79,7 @@ prog/%: prog/%.o
|
||||
# | $(SED) '\''s/\($*\)\.o\([ :]*\)/\1.o \1.lo\2/g'\'' > $(DEPDIR)/$@'
|
||||
|
||||
# Do it all!
|
||||
-all: gpm lib/libgpm.so.@abi_lev@ @LIBGPM_A@ $(PROG)
|
||||
+all: gpm lib/libgpm.so.@abi_lev@ lib/libgpm.so @LIBGPM_A@ $(PROG)
|
||||
|
||||
gpm: $(GOBJ)
|
||||
$(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $(GOBJ) @LIBS@ $(LIBS) -lm
|
||||
@@ -168,9 +168,8 @@ lib/libgpm.so.@abi_full@: $(PICS)
|
||||
@LDFLAGS@ $(LDFLAGS) -o lib/libgpm.so.@abi_full@ $^ @LIBS@ @SHARED_LIBS@ $(LIBS)
|
||||
lib/libgpm.so.@abi_lev@: lib/libgpm.so.@abi_full@
|
||||
$(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so.@abi_lev@
|
||||
-# unneeded, isn't it?
|
||||
-#lib/libgpm.so: lib/libgpm.so.@abi_full@
|
||||
-# $(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so
|
||||
+lib/libgpm.so: lib/libgpm.so.@abi_full@
|
||||
+ $(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so
|
||||
|
||||
include $(DEPFILE)
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
From 445be05fba32c512fd87a0c98b4e9936629ef95e Mon Sep 17 00:00:00 2001
|
||||
From: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
Date: Sat, 20 Feb 2016 17:59:52 +0100
|
||||
Subject: [PATCH 1/1] src/Makefile.in: Really install unversioned solibrary
|
||||
|
||||
This commit is a follow-up to
|
||||
https://github.com/telmich/gpm/commit/06b00d53d8bd513ad5d262dc94a016c6fbf2d3aa
|
||||
which created libgpm.so but failed to include it in the install target.
|
||||
|
||||
Patch sent upstream: https://github.com/telmich/gpm/pull/11
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
src/Makefile.in | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/Makefile.in b/src/Makefile.in
|
||||
index 7e9e2ef..bca226f 100644
|
||||
--- a/src/Makefile.in
|
||||
+++ b/src/Makefile.in
|
||||
@@ -115,6 +115,7 @@ install: check
|
||||
if test "x@SHLIB@" != "x" ; then \
|
||||
$(INSTALL_DATA) -m 755 lib/libgpm.so.@abi_full@ $(libdir)/libgpm.so.@abi_full@ ; \
|
||||
cd $(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so.@abi_lev@ ; \
|
||||
+ cd $(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so ; \
|
||||
echo "WARNING: We installed a lib, you should now call ldconfig" ; \
|
||||
echo "f.i.: ldconfig -n -l $(libdir)/libgpm.so.@abi_full@" ; \
|
||||
echo "Or to update everything just type ldconfig" ; \
|
||||
--
|
||||
2.7.0
|
||||
|
||||
@@ -35,6 +35,13 @@ GST1_PLUGINS_GOOD_CONF_OPTS += \
|
||||
|
||||
GST1_PLUGINS_GOOD_DEPENDENCIES = gstreamer1 gst1-plugins-base
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBV4L),y)
|
||||
GST1_PLUGINS_GOOD_CONF_OPTS += --with-libv4l2
|
||||
GST1_PLUGINS_GOOD_DEPENDENCIES += libv4l
|
||||
else
|
||||
GST1_PLUGINS_GOOD_CONF_OPTS += --without-libv4l2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ORC),y)
|
||||
GST1_PLUGINS_GOOD_CONF_OPTS += --enable-orc
|
||||
GST1_PLUGINS_GOOD_DEPENDENCIES += orc
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
From: Hilko Bengen <bengen@debian.org>
|
||||
Date: Wed, 27 Apr 2011 00:18:42 +0200
|
||||
Subject: Patched out SSL2 support since it is no longer supported by OpenSSL.
|
||||
|
||||
Now that openssl has dropped SSLv2 support we need to patch it out.
|
||||
Patch picked up from debian patchseries 5.
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
---
|
||||
mailx.1 | 2 +-
|
||||
openssl.c | 4 +---
|
||||
2 files changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/mailx.1 b/mailx.1
|
||||
index 417ea04..a02e430 100644
|
||||
--- a/mailx.1
|
||||
+++ b/mailx.1
|
||||
@@ -3575,7 +3575,7 @@ Only applicable if SSL/TLS support is built using OpenSSL.
|
||||
.TP
|
||||
.B ssl-method
|
||||
Selects a SSL/TLS protocol version;
|
||||
-valid values are `ssl2', `ssl3', and `tls1'.
|
||||
+valid values are `ssl3', and `tls1'.
|
||||
If unset, the method is selected automatically,
|
||||
if possible.
|
||||
.TP
|
||||
diff --git a/openssl.c b/openssl.c
|
||||
index b4e33fc..44fe4e5 100644
|
||||
--- a/openssl.c
|
||||
+++ b/openssl.c
|
||||
@@ -216,9 +216,7 @@ ssl_select_method(const char *uhp)
|
||||
|
||||
cp = ssl_method_string(uhp);
|
||||
if (cp != NULL) {
|
||||
- if (equal(cp, "ssl2"))
|
||||
- method = SSLv2_client_method();
|
||||
- else if (equal(cp, "ssl3"))
|
||||
+ if (equal(cp, "ssl3"))
|
||||
method = SSLv3_client_method();
|
||||
else if (equal(cp, "tls1"))
|
||||
method = TLSv1_client_method();
|
||||
@@ -10,7 +10,7 @@ HOSTAPD_SUBDIR = hostapd
|
||||
HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config
|
||||
HOSTAPD_DEPENDENCIES = host-pkgconf libnl
|
||||
HOSTAPD_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/
|
||||
HOSTAPD_LICENSE = GPLv2/BSD-3c
|
||||
HOSTAPD_LICENSE = BSD-3c
|
||||
HOSTAPD_LICENSE_FILES = README
|
||||
HOSTAPD_CONFIG_SET =
|
||||
|
||||
|
||||
@@ -60,6 +60,13 @@ else
|
||||
IMAGEMAGICK_CONF_OPTS += --without-jpeg
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LCMS2),y)
|
||||
IMAGEMAGICK_CONF_OPTS += --with-lcms
|
||||
IMAGEMAGICK_DEPENDENCIES += lcms2
|
||||
else
|
||||
IMAGEMAGICK_CONF_OPTS += --without-lcms
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBPNG),y)
|
||||
IMAGEMAGICK_CONF_OPTS += --with-png
|
||||
IMAGEMAGICK_DEPENDENCIES += libpng
|
||||
@@ -98,6 +105,13 @@ else
|
||||
IMAGEMAGICK_CONF_OPTS += --without-fftw
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WEBP),y)
|
||||
IMAGEMAGICK_CONF_OPTS += --with-webp
|
||||
IMAGEMAGICK_DEPENDENCIES += webp
|
||||
else
|
||||
IMAGEMAGICK_CONF_OPTS += --without-webp
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
||||
IMAGEMAGICK_CONF_OPTS += --with-zlib
|
||||
IMAGEMAGICK_DEPENDENCIES += zlib
|
||||
|
||||
@@ -18,6 +18,10 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
|
||||
IPROUTE2_DEPENDENCIES += busybox
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ELFUTILS),y)
|
||||
IPROUTE2_DEPENDENCIES += elfutils
|
||||
endif
|
||||
|
||||
# If we've got iptables enable xtables support for tc
|
||||
ifeq ($(BR2_PACKAGE_IPTABLES)x$(BR2_STATIC_LIBS),yx)
|
||||
IPROUTE2_DEPENDENCIES += iptables
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
From 8d189e73e660a637ae3f5a604448103ea42e397d Mon Sep 17 00:00:00 2001
|
||||
From: Martin Bark <martin@barkynet.com>
|
||||
Date: Fri, 12 Feb 2016 16:52:19 +0000
|
||||
Subject: [PATCH] ping: link against libm
|
||||
|
||||
This commit links ping against libm because ping.c calls the math library
|
||||
function finite().
|
||||
|
||||
Signed-off-by: Martin Bark <martin@barkynet.com>
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 8b37c42..fb80f6f 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -156,7 +156,7 @@ LIB_clockdiff = $(LIB_CAP)
|
||||
DEF_ping_common = $(DEF_CAP) $(DEF_IDN)
|
||||
DEF_ping6_common = $(DEF_CAP) $(DEF_IDN)
|
||||
DEF_ping = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS)
|
||||
-LIB_ping = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV)
|
||||
+LIB_ping = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV) -lm
|
||||
|
||||
ping: ping_common.o ping6_common.o
|
||||
ping.o ping_common.o ping6_common.o: ping.h in6_flowlabel.h
|
||||
--
|
||||
2.7.0
|
||||
|
||||
@@ -10,6 +10,14 @@ JACK2_LICENSE = GPLv2+ (jack server), LGPLv2.1+ (jack library)
|
||||
JACK2_DEPENDENCIES = libsamplerate libsndfile alsa-lib host-python
|
||||
JACK2_INSTALL_STAGING = YES
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPUS),y)
|
||||
JACK2_DEPENDENCIES += opus
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_READLINE),y)
|
||||
JACK2_DEPENDENCIES += readline
|
||||
endif
|
||||
|
||||
define JACK2_CONFIGURE_CMDS
|
||||
(cd $(@D); \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# From https://www.kernel.org/pub/linux/utils/kernel/kexec/sha256sums.asc
|
||||
sha256 8ae34a9ceb76350954e1e1e3ca9ab51da15862bd5f2fd14392208e60fb454f71 kexec-tools-2.0.9.tar.xz
|
||||
sha256 b1097986ffdb928cf41a94e8a5dfddc981a8fa710cccf13298e7f8dd939a2ee3 kexec-tools-2.0.11.tar.xz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
KEXEC_VERSION = 2.0.9
|
||||
KEXEC_VERSION = 2.0.11
|
||||
KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz
|
||||
KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec
|
||||
KEXEC_LICENSE = GPLv2
|
||||
@@ -17,6 +17,13 @@ else
|
||||
KEXEC_CONF_OPTS += --without-zlib
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XZ),y)
|
||||
KEXEC_CONF_OPTS += --with-lzma
|
||||
KEXEC_DEPENDENCIES += xz
|
||||
else
|
||||
KEXEC_CONF_OPTS += --without-lzma
|
||||
endif
|
||||
|
||||
define KEXEC_REMOVE_LIB_TOOLS
|
||||
rm -rf $(TARGET_DIR)/usr/lib/kexec-tools
|
||||
endef
|
||||
|
||||
@@ -15,6 +15,10 @@ KISMET_LICENSE_FILES = debian/copyright
|
||||
# We touch configure.in:
|
||||
KISMET_AUTORECONF = YES
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCAP),y)
|
||||
KISMET_DEPENDENCIES += libcap
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PCRE),y)
|
||||
KISMET_DEPENDENCIES += pcre
|
||||
endif
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
From 2c15b3931410669f281cd7e183c81e550b7e7221 Mon Sep 17 00:00:00 2001
|
||||
From: Balint Reczey <balint@balintreczey.hu>
|
||||
Date: Wed, 23 Dec 2015 12:55:00 +0100
|
||||
Subject: [PATCH 01/19] Sync enum representation of char_class_e in struct
|
||||
traits with definition
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
[backport of upstream patch from master branch:
|
||||
https://github.com/kodi-pvr/pvr.argustv/commit/2c15b3931410669f281cd7e183c81e550b7e7221]
|
||||
---
|
||||
src/uri.h | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/uri.h b/src/uri.h
|
||||
index 0b2afcd..c20600f 100644
|
||||
--- a/src/uri.h
|
||||
+++ b/src/uri.h
|
||||
@@ -21,13 +21,13 @@
|
||||
namespace uri
|
||||
{
|
||||
/// Char class.
|
||||
- enum char_class_e
|
||||
+ typedef enum char_class_e : signed char
|
||||
{
|
||||
CINV = -2, ///< invalid
|
||||
CEND = -1, ///< end delimitor
|
||||
CVAL = 0, ///< valid any position
|
||||
CVA2 = 1, ///< valid anywhere but 1st position
|
||||
- };
|
||||
+ } char_class_e_type;
|
||||
|
||||
/// Traits used for parsing and encoding components.
|
||||
struct traits
|
||||
@@ -35,7 +35,7 @@ namespace uri
|
||||
char* begin_cstring; ///< begin cstring (or 0 if none)
|
||||
char begin_char; ///< begin char (or 0 if none)
|
||||
char end_char; ///< end char (or 0 if none)
|
||||
- char char_class[256]; ///< map of char to class
|
||||
+ char_class_e_type char_class[256]; ///< map of char to class
|
||||
};
|
||||
|
||||
/**
|
||||
--
|
||||
2.7.0
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
From 7b14e0657a1308e8e133991b778e2fdcb2eb6b9c Mon Sep 17 00:00:00 2001
|
||||
From: Balint Reczey <balint@balintreczey.hu>
|
||||
Date: Wed, 23 Dec 2015 12:55:00 +0100
|
||||
Subject: [PATCH] Sync enum representation of char_class_e in struct traits
|
||||
with definition
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
[backport of upstream patch from master branch:
|
||||
https://github.com/kodi-pvr/pvr.mediaportal.tvserver/commit/7b14e0657a1308e8e133991b778e2fdcb2eb6b9c]
|
||||
---
|
||||
src/uri.h | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/uri.h b/src/uri.h
|
||||
index d2cc949..415e917 100644
|
||||
--- a/src/uri.h
|
||||
+++ b/src/uri.h
|
||||
@@ -21,13 +21,13 @@
|
||||
namespace uri
|
||||
{
|
||||
/// Char class.
|
||||
- enum char_class_e
|
||||
+ typedef enum char_class_e : signed char
|
||||
{
|
||||
CINV = -2, ///< invalid
|
||||
CEND = -1, ///< end delimitor
|
||||
CVAL = 0, ///< valid any position
|
||||
CVA2 = 1, ///< valid anywhere but 1st position
|
||||
- };
|
||||
+ } char_class_e_type;
|
||||
|
||||
/// Traits used for parsing and encoding components.
|
||||
struct traits
|
||||
@@ -35,7 +35,7 @@ namespace uri
|
||||
const char* begin_cstring; ///< begin cstring (or 0 if none)
|
||||
const char begin_char; ///< begin char (or 0 if none)
|
||||
const char end_char; ///< end char (or 0 if none)
|
||||
- const char char_class[256]; ///< map of char to class
|
||||
+ const char_class_e_type char_class[256]; ///< map of char to class
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -0,0 +1,48 @@
|
||||
From 2698ac4eeca3a82967ff83386460c070ce387ead Mon Sep 17 00:00:00 2001
|
||||
From: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
Date: Sun, 28 Feb 2016 01:07:52 +0100
|
||||
Subject: [PATCH] Sync enum representation of char_class_e in struct traits
|
||||
with definition
|
||||
|
||||
Copied from
|
||||
https://github.com/kodi-pvr/pvr.mediaportal.tvserver/pull/28
|
||||
https://github.com/kodi-pvr/pvr.mediaportal.tvserver/pull/35
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
[Patch sent upstream: https://github.com/kodi-pvr/pvr.nextpvr/pull/42]
|
||||
---
|
||||
src/uri.h | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/uri.h b/src/uri.h
|
||||
index 2757cf0..3dbca88 100644
|
||||
--- a/src/uri.h
|
||||
+++ b/src/uri.h
|
||||
@@ -21,13 +21,13 @@
|
||||
namespace uri
|
||||
{
|
||||
/// Char class.
|
||||
- enum char_class_e
|
||||
+ typedef enum char_class_e : signed char
|
||||
{
|
||||
CINV = -2, ///< invalid
|
||||
CEND = -1, ///< end delimitor
|
||||
CVAL = 0, ///< valid any position
|
||||
CVA2 = 1, ///< valid anywhere but 1st position
|
||||
- };
|
||||
+ } char_class_e_type;
|
||||
|
||||
/// Traits used for parsing and encoding components.
|
||||
struct traits
|
||||
@@ -35,7 +35,7 @@ namespace uri
|
||||
const char* begin_cstring; ///< begin cstring (or 0 if none)
|
||||
const char begin_char; ///< begin char (or 0 if none)
|
||||
const char end_char; ///< end char (or 0 if none)
|
||||
- char char_class[256]; ///< map of char to class
|
||||
+ const char_class_e_type char_class[256]; ///< map of char to class
|
||||
};
|
||||
|
||||
/**
|
||||
--
|
||||
2.7.0
|
||||
|
||||
@@ -17,6 +17,10 @@ ifneq ($(BR2_STATIC_LIBS),y)
|
||||
LFTP_CONF_OPTS += --with-modules
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_EXPAT)$(BR2_PACKAGE_LFTP_PROTO_HTTP),yy)
|
||||
LFTP_DEPENDENCIES += expat
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GNUTLS),y)
|
||||
LFTP_DEPENDENCIES += gnutls
|
||||
LFTP_CONF_OPTS += --with-gnutls
|
||||
|
||||
@@ -42,6 +42,13 @@ else
|
||||
LIBARCHIVE_CONF_OPTS += --disable-xattr
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BZIP2),y)
|
||||
LIBARCHIVE_CONF_OPTS += --with-bz2lib
|
||||
LIBARCHIVE_DEPENDENCIES += bzip2
|
||||
else
|
||||
LIBARCHIVE_CONF_OPTS += --without-bz2lib
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_EXPAT),y)
|
||||
LIBARCHIVE_DEPENDENCIES += expat
|
||||
else
|
||||
|
||||
@@ -20,6 +20,10 @@ ifeq ($(BR2_arc),y)
|
||||
LIBEXOSIP2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -U__arc__"
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_C_ARES),y)
|
||||
LIBEXOSIP2_DEPENDENCIES += c-ares
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
LIBEXOSIP2_DEPENDENCIES += openssl
|
||||
LIBEXOSIP2_CONF_OPTS += --enable-openssl
|
||||
|
||||
104
firmware/buildroot/package/libfcgi/0006-fix-CVE-2012-6687.patch
Normal file
104
firmware/buildroot/package/libfcgi/0006-fix-CVE-2012-6687.patch
Normal file
@@ -0,0 +1,104 @@
|
||||
libfcgi:add security patch for CVE-2012-6687
|
||||
CVE-2012-6687 - remote attackers cause a denial of service (crash) via a large number
|
||||
of connections (http://www.cvedetails.com/cve/CVE-2012-6687/).
|
||||
Fix:use poll in os_unix.c instead of select to avoid problem with > 1024 connections.
|
||||
This patch libfcgi_2.4.0-8.3.debian.tar.xz is pulled from the below link:
|
||||
(https://launchpad.net/ubuntu/+source/libfcgi/2.4.0-8.3)
|
||||
The next release of libfcgi is 2.4.1 which may have this fix is yet to be released
|
||||
officially.
|
||||
|
||||
Signed-off-by: Anton Kortunov <toshic.toshic@gmail.com>
|
||||
Signed-off-by: Niranjan Reddy <niranjan.reddy@rockwellcollins.com>
|
||||
|
||||
Index: b/libfcgi/os_unix.c
|
||||
===================================================================
|
||||
--- a/libfcgi/os_unix.c
|
||||
+++ b/libfcgi/os_unix.c
|
||||
@@ -42,6 +42,7 @@
|
||||
#include <sys/time.h>
|
||||
#include <sys/un.h>
|
||||
#include <signal.h>
|
||||
+#include <poll.h>
|
||||
|
||||
#ifdef HAVE_NETDB_H
|
||||
#include <netdb.h>
|
||||
@@ -103,6 +104,9 @@
|
||||
static int shutdownPending = FALSE;
|
||||
static int shutdownNow = FALSE;
|
||||
|
||||
+static int libfcgiOsClosePollTimeout = 2000;
|
||||
+static int libfcgiIsAfUnixKeeperPollTimeout = 2000;
|
||||
+
|
||||
void OS_ShutdownPending()
|
||||
{
|
||||
shutdownPending = TRUE;
|
||||
@@ -168,6 +172,16 @@
|
||||
if(libInitialized)
|
||||
return 0;
|
||||
|
||||
+ char *libfcgiOsClosePollTimeoutStr = getenv( "LIBFCGI_OS_CLOSE_POLL_TIMEOUT" );
|
||||
+ if(libfcgiOsClosePollTimeoutStr) {
|
||||
+ libfcgiOsClosePollTimeout = atoi(libfcgiOsClosePollTimeoutStr);
|
||||
+ }
|
||||
+
|
||||
+ char *libfcgiIsAfUnixKeeperPollTimeoutStr = getenv( "LIBFCGI_IS_AF_UNIX_KEEPER_POLL_TIMEOUT" );
|
||||
+ if(libfcgiIsAfUnixKeeperPollTimeoutStr) {
|
||||
+ libfcgiIsAfUnixKeeperPollTimeout = atoi(libfcgiIsAfUnixKeeperPollTimeoutStr);
|
||||
+ }
|
||||
+
|
||||
asyncIoTable = (AioInfo *)malloc(asyncIoTableSize * sizeof(AioInfo));
|
||||
if(asyncIoTable == NULL) {
|
||||
errno = ENOMEM;
|
||||
@@ -755,19 +769,16 @@
|
||||
|
||||
if (shutdown(fd, 1) == 0)
|
||||
{
|
||||
- struct timeval tv;
|
||||
- fd_set rfds;
|
||||
+ struct pollfd pfd;
|
||||
int rv;
|
||||
char trash[1024];
|
||||
|
||||
- FD_ZERO(&rfds);
|
||||
+ pfd.fd = fd;
|
||||
+ pfd.events = POLLIN;
|
||||
|
||||
do
|
||||
{
|
||||
- FD_SET(fd, &rfds);
|
||||
- tv.tv_sec = 2;
|
||||
- tv.tv_usec = 0;
|
||||
- rv = select(fd + 1, &rfds, NULL, NULL, &tv);
|
||||
+ rv = poll(&pfd, 1, libfcgiOsClosePollTimeout);
|
||||
}
|
||||
while (rv > 0 && read(fd, trash, sizeof(trash)) > 0);
|
||||
}
|
||||
@@ -1116,13 +1127,11 @@
|
||||
*/
|
||||
static int is_af_unix_keeper(const int fd)
|
||||
{
|
||||
- struct timeval tval = { READABLE_UNIX_FD_DROP_DEAD_TIMEVAL };
|
||||
- fd_set read_fds;
|
||||
-
|
||||
- FD_ZERO(&read_fds);
|
||||
- FD_SET(fd, &read_fds);
|
||||
+ struct pollfd pfd;
|
||||
+ pfd.fd = fd;
|
||||
+ pfd.events = POLLIN;
|
||||
|
||||
- return select(fd + 1, &read_fds, NULL, NULL, &tval) >= 0 && FD_ISSET(fd, &read_fds);
|
||||
+ return poll(&pfd, 1, libfcgiIsAfUnixKeeperPollTimeout) >= 0 && (pfd.revents & POLLIN);
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
Index: b/examples/Makefile.am
|
||||
===================================================================
|
||||
--- a/examples/Makefile.am
|
||||
+++ b/examples/Makefile.am
|
||||
@@ -34,5 +34,5 @@ threaded_CFLAGS = @PTHREAD_CFLAGS@
|
||||
threaded_LDFLAGS = @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
|
||||
|
||||
echo_cpp_SOURCES = $(INCLUDE_FILES) $(INCLUDEDIR)/fcgio.h echo-cpp.cpp
|
||||
-echo_cpp_LDADD = $(LIBDIR)/libfcgi++.la
|
||||
+echo_cpp_LDADD = $(LIBDIR)/libfcgi++.la $(LIBDIR)/libfcgi.la
|
||||
@@ -12,4 +12,11 @@ LIBFM_LICENSE = GPLv2+, LGPLv2.1+
|
||||
LIBFM_LICENSE_FILES = COPYING src/extra/fm-xml-file.c
|
||||
LIBFM_INSTALL_STAGING = YES
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBEXIF),y)
|
||||
LIBFM_CONF_OPTS += --enable-exif
|
||||
LIBFM_DEPENDENCIES += libexif
|
||||
else
|
||||
LIBFM_CONF_OPTS += --disable-exif
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
@@ -107,6 +107,13 @@ ifneq ($(BR2_ENABLE_LOCALE),y)
|
||||
LIBGLIB2_DEPENDENCIES += libiconv
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ELFUTILS),y)
|
||||
LIBGLIB2_CONF_OPTS += --enable-libelf
|
||||
LIBGLIB2_DEPENDENCIES += elfutils
|
||||
else
|
||||
LIBGLIB2_CONF_OPTS += --disable-libelf
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBICONV),y)
|
||||
LIBGLIB2_CONF_OPTS += --with-libiconv=gnu
|
||||
LIBGLIB2_DEPENDENCIES += libiconv
|
||||
|
||||
@@ -18,6 +18,10 @@ define LIBSOIL_EXTRACT_CMDS
|
||||
mv $(@D)/Simple\ OpenGL\ Image\ Library/* $(@D)
|
||||
endef
|
||||
|
||||
# gnu patch < v2.5.9 doesn't correctly handle spaces in file names,
|
||||
# and we want to patch the 'alternate Makefile.txt' file, so rename
|
||||
# the file (and patch the renamed file) for compatibility with older
|
||||
# distributions
|
||||
define REMOVE_SPACE_FROM_FILENAME
|
||||
cd $(@D)/projects/makefile/ && \
|
||||
mv "alternate Makefile.txt" alternate_Makefile.txt
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# from https://red.libssh.org/projects/libssh/files/
|
||||
md5 5d7d468937649a6dfc6186edfff083db libssh-0.7.2.tar.xz
|
||||
# Locally calculated after checking signature on uncompressed libssh-0.7.2.tar
|
||||
sha256 a32c45b9674141cab4bde84ded7d53e931076c6b0f10b8fd627f3584faebae62 libssh-0.7.2.tar.xz
|
||||
md5 05465da8004f3258db946346213209de libssh-0.7.3.tar.xz
|
||||
# Locally calculated after checking signature on uncompressed libssh-0.7.3.tar
|
||||
sha256 26ef46be555da21112c01e4b9f5e3abba9194485c8822ab55ba3d6496222af98 libssh-0.7.3.tar.xz
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBSSH_VERSION = 0.7.2
|
||||
LIBSSH_VERSION = 0.7.3
|
||||
LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz
|
||||
LIBSSH_SITE = https://red.libssh.org/attachments/download/177
|
||||
LIBSSH_SITE = https://red.libssh.org/attachments/download/195
|
||||
LIBSSH_LICENSE = LGPLv2.1
|
||||
LIBSSH_LICENSE_FILES = COPYING
|
||||
LIBSSH_INSTALL_STAGING = YES
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 5a202943a34a1d82a1c31f74094f2453c207bf9936093867f41414968c8e8215 libssh2-1.6.0.tar.gz
|
||||
sha256 e4561fd43a50539a8c2ceb37841691baf03ecb7daf043766da1b112e4280d584 libssh2-1.7.0.tar.gz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBSSH2_VERSION = 1.6.0
|
||||
LIBSSH2_VERSION = 1.7.0
|
||||
LIBSSH2_SITE = http://www.libssh2.org/download
|
||||
LIBSSH2_LICENSE = BSD
|
||||
LIBSSH2_LICENSE_FILES = COPYING
|
||||
|
||||
@@ -13,7 +13,7 @@ LIBUCI_DEPENDENCIES = libubox
|
||||
ifeq ($(BR2_PACKAGE_LUA_5_1),y)
|
||||
LIBUCI_DEPENDENCIES += lua
|
||||
LIBUCI_CONF_OPTS += -DBUILD_LUA=ON \
|
||||
-DLUAPATH=$(STAGING_DIR)/usr/lib/lua/5.1 \
|
||||
-DLUAPATH=/usr/lib/lua/5.1 \
|
||||
-DLUA_CFLAGS=-I$(STAGING_DIR)/usr/include
|
||||
else
|
||||
LIBUCI_CONF_OPTS += -DBUILD_LUA=OFF
|
||||
|
||||
@@ -28,31 +28,67 @@ else
|
||||
LINKS_CONF_OPTS += --without-directfb
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_JPEG),y)
|
||||
LINKS_CONF_OPTS += --with-libjpeg
|
||||
LINKS_DEPENDENCIES += jpeg
|
||||
else
|
||||
LINKS_CONF_OPTS += --without-libjpeg
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_LIBRSVG),y)
|
||||
LINKS_CONF_OPTS += --with-librsvg
|
||||
LINKS_DEPENDENCIES += librsvg
|
||||
else
|
||||
LINKS_CONF_OPTS += --without-librsvg
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_TIFF),y)
|
||||
LINKS_CONF_OPTS += --with-libtiff
|
||||
LINKS_DEPENDENCIES += tiff
|
||||
else
|
||||
LINKS_CONF_OPTS += --without-libtiff
|
||||
endif
|
||||
else
|
||||
LINKS_CONF_OPTS += --disable-graphics
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BZIP2),y)
|
||||
LINKS_CONF_OPTS += --with-bzip2
|
||||
LINKS_DEPENDENCIES += bzip2
|
||||
else
|
||||
LINKS_CONF_OPTS += --without-bzip2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GPM),y)
|
||||
LINKS_CONF_OPTS += --with-gpm
|
||||
LINKS_DEPENDENCIES += gpm
|
||||
else
|
||||
LINKS_CONF_OPTS += --without-gpm
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBEVENT),y)
|
||||
LINKS_CONF_OPTS += --with-libevent
|
||||
LINKS_DEPENDENCIES += libevent
|
||||
else
|
||||
LINKS_CONF_OPTS += --without-libevent
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
LINKS_CONF_OPTS += --with-ssl --enable-ssl-pkgconfig
|
||||
LINKS_DEPENDENCIES += openssl
|
||||
else
|
||||
LINKS_CONF_OPTS += --without-ssl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XZ),y)
|
||||
LINKS_CONF_OPTS += --with-lzma
|
||||
LINKS_DEPENDENCIES += xz
|
||||
else
|
||||
LINKS_CONF_OPTS += --without-lzma
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
||||
LINKS_CONF_OPTS += --with-zlib
|
||||
LINKS_DEPENDENCIES += zlib
|
||||
else
|
||||
LINKS_CONF_OPTS += --without-zlib
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
@@ -207,17 +207,17 @@ endchoice
|
||||
|
||||
config BR2_DEFAULT_KERNEL_HEADERS
|
||||
string
|
||||
default "3.2.77" if BR2_KERNEL_HEADERS_3_2
|
||||
default "3.2.78" if BR2_KERNEL_HEADERS_3_2
|
||||
default "3.4.110" if BR2_KERNEL_HEADERS_3_4
|
||||
default "3.10.96" if BR2_KERNEL_HEADERS_3_10
|
||||
default "3.12.54" if BR2_KERNEL_HEADERS_3_12
|
||||
default "3.14.61" if BR2_KERNEL_HEADERS_3_14
|
||||
default "3.10.98" if BR2_KERNEL_HEADERS_3_10
|
||||
default "3.12.55" if BR2_KERNEL_HEADERS_3_12
|
||||
default "3.14.62" if BR2_KERNEL_HEADERS_3_14
|
||||
default "3.17.8" if BR2_KERNEL_HEADERS_3_17
|
||||
default "3.18.27" if BR2_KERNEL_HEADERS_3_18
|
||||
default "3.19.8" if BR2_KERNEL_HEADERS_3_19
|
||||
default "4.0.9" if BR2_KERNEL_HEADERS_4_0
|
||||
default "4.1.18" if BR2_KERNEL_HEADERS_4_1
|
||||
default "4.2.8" if BR2_KERNEL_HEADERS_4_2
|
||||
default "4.3.5" if BR2_KERNEL_HEADERS_4_3
|
||||
default "4.4.2" if BR2_KERNEL_HEADERS_4_4
|
||||
default "4.3.6" if BR2_KERNEL_HEADERS_4_3
|
||||
default "4.4.3" if BR2_KERNEL_HEADERS_4_4
|
||||
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
|
||||
|
||||
@@ -9,14 +9,67 @@
|
||||
|
||||
ifeq ($(BR2_KERNEL_HEADERS_AS_KERNEL),y)
|
||||
|
||||
LINUX_HEADERS_VERSION = none
|
||||
LINUX_HEADERS_SOURCE =
|
||||
LINUX_HEADERS_VERSION = $(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
|
||||
|
||||
LINUX_HEADERS_LICENSE = $(LINUX_LICENSE)
|
||||
LINUX_HEADERS_LICENSE_FILES = $(LINUX_LICENSE_FILES)
|
||||
# Compute LINUX_HEADERS_SOURCE and LINUX_HEADERS_SITE from the configuration
|
||||
ifeq ($(BR2_LINUX_KERNEL_CUSTOM_TARBALL),y)
|
||||
LINUX_HEADERS_TARBALL = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION))
|
||||
LINUX_HEADERS_SITE = $(patsubst %/,%,$(dir $(LINUX_HEADERS_TARBALL)))
|
||||
LINUX_HEADERS_SOURCE = $(notdir $(LINUX_HEADERS_TARBALL))
|
||||
BR_NO_CHECK_HASH_FOR += $(LINUX_HEADERS_SOURCE)
|
||||
else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_LOCAL),y)
|
||||
LINUX_HEADERS_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_LOCAL_PATH))
|
||||
LINUX_HEADERS_SITE_METHOD = local
|
||||
else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_GIT),y)
|
||||
LINUX_HEADERS_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL))
|
||||
LINUX_HEADERS_SITE_METHOD = git
|
||||
# use same git tarball as linux kernel
|
||||
LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz
|
||||
else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_HG),y)
|
||||
LINUX_HEADERS_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL))
|
||||
LINUX_HEADERS_SITE_METHOD = hg
|
||||
# use same hg tarball as linux kernel
|
||||
LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz
|
||||
else
|
||||
LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.xz
|
||||
ifeq ($(BR2_LINUX_KERNEL_CUSTOM_VERSION),y)
|
||||
BR_NO_CHECK_HASH_FOR += $(LINUX_HEADERS_SOURCE)
|
||||
endif
|
||||
# In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order
|
||||
# to use the $(word) function. We support versions such as 4.0, 3.1,
|
||||
# 2.6.32, 2.6.32-rc1, 3.0-rc6, etc.
|
||||
ifeq ($(findstring x2.6.,x$(LINUX_HEADERS_VERSION)),x2.6.)
|
||||
LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v2.6
|
||||
else ifeq ($(findstring x3.,x$(LINUX_HEADERS_VERSION)),x3.)
|
||||
LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v3.x
|
||||
else ifeq ($(findstring x4.,x$(LINUX_HEADERS_VERSION)),x4.)
|
||||
LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v4.x
|
||||
endif
|
||||
# release candidates are in testing/ subdir
|
||||
ifneq ($(findstring -rc,$(LINUX_HEADERS_VERSION)),)
|
||||
LINUX_HEADERS_SITE := $(LINUX_HEADERS_SITE)/testing
|
||||
endif # -rc
|
||||
endif
|
||||
|
||||
LINUX_HEADERS_PATCH_DEPENDENCIES = linux
|
||||
LINUX_HEADERS_REAL_DIR = $(LINUX_DIR)
|
||||
LINUX_HEADERS_PATCHES = $(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
|
||||
|
||||
# We rely on the generic package infrastructure to download and apply
|
||||
# remote patches (downloaded from ftp, http or https). For local
|
||||
# patches, we can't rely on that infrastructure, because there might
|
||||
# be directories in the patch list (unlike for other packages).
|
||||
LINUX_HEADERS_PATCH = $(filter ftp://% http://% https://%,$(LINUX_HEADERS_PATCHES))
|
||||
|
||||
define LINUX_HEADERS_APPLY_LOCAL_PATCHES
|
||||
for p in $(filter-out ftp://% http://% https://%,$(LINUX_HEADERS_PATCHES)) ; do \
|
||||
if test -d $$p ; then \
|
||||
$(APPLY_PATCHES) $(@D) $$p \*.patch || exit 1 ; \
|
||||
else \
|
||||
$(APPLY_PATCHES) $(@D) `dirname $$p` `basename $$p` || exit 1; \
|
||||
fi \
|
||||
done
|
||||
endef
|
||||
|
||||
LINUX_HEADERS_POST_PATCH_HOOKS += LINUX_HEADERS_APPLY_LOCAL_PATCHES
|
||||
|
||||
else # ! BR2_KERNEL_HEADERS_AS_KERNEL
|
||||
|
||||
@@ -30,13 +83,11 @@ LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v4.x
|
||||
endif
|
||||
LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.xz
|
||||
|
||||
endif # ! BR2_KERNEL_HEADERS_AS_KERNEL
|
||||
|
||||
LINUX_HEADERS_LICENSE = GPLv2
|
||||
LINUX_HEADERS_LICENSE_FILES = COPYING
|
||||
|
||||
LINUX_HEADERS_REAL_DIR = $(@D)
|
||||
|
||||
endif # ! BR2_KERNEL_HEADERS_AS_KERNEL
|
||||
|
||||
LINUX_HEADERS_INSTALL_STAGING = YES
|
||||
|
||||
# linux-headers is part of the toolchain so disable the toolchain dependency
|
||||
@@ -53,7 +104,7 @@ LINUX_HEADERS_ADD_TOOLCHAIN_DEPENDENCY = NO
|
||||
# uClibc building. This way uClibc doesn't modify linux headers on installation
|
||||
# of "its" headers
|
||||
define LINUX_HEADERS_CONFIGURE_CMDS
|
||||
(cd $(LINUX_HEADERS_REAL_DIR); \
|
||||
(cd $(@D); \
|
||||
$(TARGET_MAKE_ENV) $(MAKE) \
|
||||
ARCH=$(KERNEL_ARCH) \
|
||||
HOSTCC="$(HOSTCC)" \
|
||||
@@ -64,7 +115,7 @@ define LINUX_HEADERS_CONFIGURE_CMDS
|
||||
endef
|
||||
|
||||
define LINUX_HEADERS_INSTALL_STAGING_CMDS
|
||||
(cd $(LINUX_HEADERS_REAL_DIR); \
|
||||
(cd $(@D); \
|
||||
$(TARGET_MAKE_ENV) $(MAKE) \
|
||||
ARCH=$(KERNEL_ARCH) \
|
||||
HOSTCC="$(HOSTCC)" \
|
||||
|
||||
@@ -2,3 +2,4 @@
|
||||
sha256 eb9cc053fa0f1e78685cb695596e73931bfb55d2377e3bc3b8b94aff4c5a489c lshw-B.02.17.tar.gz
|
||||
sha256 2e5a3d63da8475db17fd90969bcb1930cf19d2b8da7be41edeea5c2a53878382 no-private-uint.patch
|
||||
sha256 c8365f7ac8fc7a751c78d89ab446111bb1a235bc977a1b21e1b826c2e62361d1 basename-limits-long-bits.patch
|
||||
sha256 9eba284061574e02a6b162ab20dff07c48693e00f781220ee974ba5c90d1cca9 988f5449791ebf869ab9fa7520463dab4eae3404.patch
|
||||
|
||||
@@ -8,7 +8,8 @@ LSHW_VERSION = B.02.17
|
||||
LSHW_SITE = http://ezix.org/software/files
|
||||
LSHW_PATCH = \
|
||||
http://git.alpinelinux.org/cgit/aports/plain/testing/lshw/basename-limits-long-bits.patch \
|
||||
http://git.alpinelinux.org/cgit/aports/plain/testing/lshw/no-private-uint.patch
|
||||
http://git.alpinelinux.org/cgit/aports/plain/testing/lshw/no-private-uint.patch \
|
||||
https://github.com/lyonel/lshw/commit/988f5449791ebf869ab9fa7520463dab4eae3404.patch
|
||||
LSHW_LICENSE = GPLv2
|
||||
LSHW_LICENSE_FILES = COPYING
|
||||
|
||||
|
||||
@@ -15,4 +15,11 @@ LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \
|
||||
--disable-lua --disable-python \
|
||||
$(if $(BR2_PACKAGE_BASH),,--disable-bash)
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
|
||||
LXC_CONF_OPTS += --enable-seccomp
|
||||
LXC_DEPENDENCIES += libseccomp
|
||||
else
|
||||
LXC_CONF_OPTS += --disable-seccomp
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
@@ -20,6 +20,27 @@ else
|
||||
MEDIASTREAMER_CONF_OPTS += --disable-alsa
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBUPNP),y)
|
||||
MEDIASTREAMER_CONF_OPTS += --enable-upnp
|
||||
MEDIASTREAMER_DEPENDENCIES += libupnp
|
||||
else
|
||||
MEDIASTREAMER_CONF_OPTS += --disable-upnp
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBVPX),y)
|
||||
MEDIASTREAMER_CONF_OPTS += --enable-vp8
|
||||
MEDIASTREAMER_DEPENDENCIES += libvpx
|
||||
else
|
||||
MEDIASTREAMER_CONF_OPTS += --disable-vp8
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPUS),y)
|
||||
MEDIASTREAMER_CONF_OPTS += --enable-opus
|
||||
MEDIASTREAMER_DEPENDENCIES += opus
|
||||
else
|
||||
MEDIASTREAMER_CONF_OPTS += --disable-opus
|
||||
endif
|
||||
|
||||
# portaudio backend needs speex as well
|
||||
ifeq ($(BR2_PACKAGE_PORTAUDIO)$(BR2_PACKAGE_SPEEX),yy)
|
||||
MEDIASTREAMER_CONF_OPTS += --enable-portaudio
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
From 76aa4fb62a433e61dc35eefcc3077f0463182d2f Mon Sep 17 00:00:00 2001
|
||||
From: Angelo Compagnucci <angelo.compagnucci@gmail.com>
|
||||
Date: Tue, 23 Feb 2016 22:43:39 +0100
|
||||
Subject: [PATCH] config.in: fixing wrong MonoPosixHelper location
|
||||
|
||||
This patch remove a wrong prefix for libMonoPosixHelper
|
||||
|
||||
Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
|
||||
---
|
||||
data/config.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/data/config.in b/data/config.in
|
||||
index b760176..41495b9 100644
|
||||
--- a/data/config.in
|
||||
+++ b/data/config.in
|
||||
@@ -10,7 +10,7 @@
|
||||
<dllmap dll="i:odbc32.dll" target="libiodbc.dylib" os="osx"/>
|
||||
<dllmap dll="oci" target="libclntsh@libsuffix@" os="!windows"/>
|
||||
<dllmap dll="db2cli" target="libdb2_36@libsuffix@" os="!windows"/>
|
||||
- <dllmap dll="MonoPosixHelper" target="@prefix@/@reloc_libdir@/libMonoPosixHelper@libsuffix@" os="!windows" />
|
||||
+ <dllmap dll="MonoPosixHelper" target="libMonoPosixHelper@libsuffix@" os="!windows" />
|
||||
<dllmap dll="i:msvcrt" target="@LIBC@" os="!windows"/>
|
||||
<dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/>
|
||||
<dllmap dll="sqlite" target="@SQLITE@" os="!windows"/>
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
From 18bba65adf58d54645398de26eac24081d48f793 Mon Sep 17 00:00:00 2001
|
||||
From: Angelo Compagnucci <angelo.compagnucci@gmail.com>
|
||||
Date: Thu, 25 Feb 2016 22:19:31 +0100
|
||||
Subject: [PATCH] mcs/class/monodoc/Makefile: Fixing wrong monodoc search path
|
||||
|
||||
mono_libdir actually leaks host compiler path, fixing
|
||||
by hardcoding correct path for our usecase.
|
||||
|
||||
Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
|
||||
---
|
||||
mcs/class/monodoc/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/mcs/class/monodoc/Makefile b/mcs/class/monodoc/Makefile
|
||||
index 3ebba80..ddc2098 100644
|
||||
--- a/mcs/class/monodoc/Makefile
|
||||
+++ b/mcs/class/monodoc/Makefile
|
||||
@@ -135,7 +135,7 @@ test-local: setup-doc-sources
|
||||
dist-local: Monodoc.Ecma/EcmaUrlParser.cs
|
||||
|
||||
$(the_lib).config: Makefile monodoc.dll.config.in
|
||||
- sed 's,@monodoc_refdir@,$(mono_libdir)/monodoc,g' monodoc.dll.config.in > $@
|
||||
+ sed 's,@monodoc_refdir@,/usr/lib/monodoc,g' monodoc.dll.config.in > $@
|
||||
|
||||
Monodoc.Ecma/EcmaUrlParser.cs: Monodoc.Ecma/EcmaUrlParser.jay $(topdir)/jay/skeleton.cs jay.sh
|
||||
$(topdir)/$(thisdir)/jay.sh $(topdir) $< $@ $(JAY_FLAGS)
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@@ -20,6 +20,6 @@ MRAA_CONF_OPTS += \
|
||||
-DIPK=OFF \
|
||||
-DRPM=OFF \
|
||||
-DENABLEEXAMPLES=OFF \
|
||||
-DTESTS=OFF
|
||||
-DBUILDTESTS=OFF
|
||||
|
||||
$(eval $(cmake-package))
|
||||
|
||||
@@ -17,6 +17,13 @@ MUTT_DEPENDENCIES += libiconv
|
||||
MUTT_CONF_OPTS += --enable-iconv
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBIDN),y)
|
||||
MUTT_DEPENDENCIES += libidn
|
||||
MUTT_CONF_OPTS += --with-idn
|
||||
else
|
||||
MUTT_CONF_OPTS += --without-idn
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_MUTT_IMAP),y)
|
||||
MUTT_CONF_OPTS += --enable-imap
|
||||
else
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
From 3c23b3ea7f5069e8fd4d5758704cd968504f1079 Mon Sep 17 00:00:00 2001
|
||||
From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
|
||||
Date: Tue, 2 Feb 2016 10:07:22 +0100
|
||||
Subject: [PATCH] mountd: Add check for 'struct file_handle'
|
||||
|
||||
The code to check if name_to_handle_at() is implemented generates only a
|
||||
warning but with some toolchain it doesn't fail to link (the function must be
|
||||
implemented somewhere).
|
||||
However the "struct file_handle" type is not available.
|
||||
|
||||
So, this patch adds a check for this struct.
|
||||
|
||||
Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
|
||||
---
|
||||
configure.ac | 1 +
|
||||
utils/mountd/cache.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 25d2ba4..913a86f 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -425,6 +425,7 @@ AC_TYPE_PID_T
|
||||
AC_TYPE_SIZE_T
|
||||
AC_HEADER_TIME
|
||||
AC_STRUCT_TM
|
||||
+AC_CHECK_TYPES([struct file_handle])
|
||||
|
||||
dnl *************************************************************
|
||||
dnl Check for functions
|
||||
diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
|
||||
index 7847446..dc64f6d 100644
|
||||
--- a/utils/mountd/cache.c
|
||||
+++ b/utils/mountd/cache.c
|
||||
@@ -424,7 +424,7 @@ static int same_path(char *child, char *parent, int len)
|
||||
if (count_slashes(p) != count_slashes(parent))
|
||||
return 0;
|
||||
|
||||
-#if HAVE_NAME_TO_HANDLE_AT
|
||||
+#if defined(HAVE_NAME_TO_HANDLE_AT) && defined(HAVE_STRUCT_FILE_HANDLE)
|
||||
struct {
|
||||
struct file_handle fh;
|
||||
unsigned char handle[128];
|
||||
--
|
||||
2.7.0
|
||||
|
||||
@@ -28,6 +28,13 @@ NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPCDEBUG) += usr/sbin/rpcdebug
|
||||
NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_LOCKD) += usr/sbin/rpc.lockd
|
||||
NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD) += usr/sbin/rpc.rquotad
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCAP),y)
|
||||
NFS_UTILS_CONF_OPTS += --enable-caps
|
||||
NFS_UTILS_DEPENDENCIES += libcap
|
||||
else
|
||||
NFS_UTILS_CONF_OPTS += --disable-caps
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
|
||||
NFS_UTILS_CONF_OPTS += --enable-tirpc
|
||||
NFS_UTILS_DEPENDENCIES += libtirpc
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
Use __GLIBC_PREREQ only when __GLIBC__ is defined
|
||||
|
||||
The way __GLIBC_PREREQ() is currently used means that it's evaluated
|
||||
even if __GLIBC__ is not defined. But obviously, __GLIBC_PREREQ will
|
||||
not exist if __GLIBC__ is not defined, causing build failures on C
|
||||
libraries not defining __GLIBC__ such as the musl C library.
|
||||
|
||||
Patch originally taken from:
|
||||
https://github.com/voidlinux/void-packages/blob/master/srcpkgs/numactl/patches/musl.patch
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
[Thomas: improve patch description.]
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
|
||||
--- a/syscall.c.orig 2014-10-20 16:12:53.000000000 +0200
|
||||
+++ b/syscall.c 2015-06-22 08:13:22.729034702 +0200
|
||||
@@ -115,14 +115,16 @@
|
||||
|
||||
#endif
|
||||
|
||||
-#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 11)
|
||||
+#if defined(__GLIBC__)
|
||||
+# if __GLIBC_PREREQ(2,11)
|
||||
|
||||
/* glibc 2.11 seems to have working 6 argument sycall. Use the
|
||||
glibc supplied syscall in this case.
|
||||
The version cut-off is rather arbitary and could be probably
|
||||
earlier. */
|
||||
|
||||
-#define syscall6 syscall
|
||||
+# define syscall6 syscall
|
||||
+#endif
|
||||
#elif defined(__x86_64__)
|
||||
/* 6 argument calls on x86-64 are often buggy in both glibc and
|
||||
asm/unistd.h. Add a working version here. */
|
||||
@@ -1,2 +1,4 @@
|
||||
# Locally calculated
|
||||
sha256 450c091235f891ee874a8651b179c30f57a1391ca5c4673354740ba65e527861 numactl-2.0.11.tar.gz
|
||||
sha256 1f4c813cc8c81fa4dfd0be959457a5c3de8fc3316bbc80de3aa1d9ef9992b2b6 3770bdc4fa7b9059db5cd2aa8bb09b50fa15e456.patch
|
||||
sha256 0c4cb6550b46976f2a21087490420b218e62ead7d9b178120ad782d53a7ad3a6 31dc2951c758698bff060aeae8ffd8854616183b.patch
|
||||
|
||||
@@ -6,6 +6,9 @@
|
||||
|
||||
NUMACTL_VERSION = 2.0.11
|
||||
NUMACTL_SITE = ftp://oss.sgi.com/www/projects/libnuma/download
|
||||
NUMACTL_PATCH = \
|
||||
https://github.com/numactl/numactl/commit/3770bdc4fa7b9059db5cd2aa8bb09b50fa15e456.patch \
|
||||
https://github.com/numactl/numactl/commit/31dc2951c758698bff060aeae8ffd8854616183b.patch
|
||||
NUMACTL_LICENSE = LGPLv2.1 (libnuma), GPLv2 (programs)
|
||||
NUMACTL_LICENSE_FILES = README
|
||||
NUMACTL_INSTALL_STAGING = YES
|
||||
|
||||
@@ -5,6 +5,7 @@ config BR2_PACKAGE_OFONO
|
||||
depends on BR2_USE_MMU # dbus, libglib2
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII # libcap-ng
|
||||
depends on !BR2_STATIC_LIBS # dlopen()
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
select BR2_PACKAGE_LIBCAP_NG
|
||||
select BR2_PACKAGE_DBUS
|
||||
select BR2_PACKAGE_LIBGLIB2
|
||||
@@ -18,5 +19,6 @@ config BR2_PACKAGE_OFONO
|
||||
|
||||
comment "ofono needs a toolchain w/ dynamic library, wchar, threads"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII
|
||||
|
||||
@@ -30,6 +30,17 @@ HOST_OMNIORB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python2
|
||||
OMNIORB_CONF_OPTS += --disable-longdouble
|
||||
HOST_OMNIORB_CONF_OPTS += --disable-longdouble
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
OMNIORB_CONF_OPTS += --with-openssl
|
||||
OMNIORB_DEPENDENCIES += openssl
|
||||
else
|
||||
OMNIORB_CONF_OPTS += --without-openssl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
||||
OMNIORB_DEPENDENCIES += zlib
|
||||
endif
|
||||
|
||||
# The EmbeddedSystem define (set below in OMNIORB_ADJUST_TOOLDIR)
|
||||
# enables building of just the lib and disables building of
|
||||
# tools/apps/services. In some cases the apps/services are still
|
||||
|
||||
@@ -23,6 +23,10 @@ OPENIPMI_CONF_OPTS = \
|
||||
--with-python=no \
|
||||
--with-swig=no
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GDBM),y)
|
||||
OPENIPMI_DEPENDENCIES += gdbm
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
OPENIPMI_DEPENDENCIES += openssl
|
||||
OPENIPMI_CONF_OPTS += --with-openssl=yes
|
||||
|
||||
@@ -22,8 +22,9 @@ comment "bluez support needs a toolchain w/ wchar, threads, dynamic library"
|
||||
|
||||
config BR2_PACKAGE_OPENOBEX_LIBUSB
|
||||
bool "enable libusb support"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
|
||||
select BR2_PACKAGE_LIBUSB
|
||||
select BR2_PACKAGE_LIBUSB_COMPAT
|
||||
|
||||
comment "libusb support needs a toolchain w/ threads"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
@@ -36,7 +36,7 @@ OPENOBEX_CONF_OPTS += --disable-bluetooth
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENOBEX_LIBUSB),y)
|
||||
OPENOBEX_DEPENDENCIES += libusb
|
||||
OPENOBEX_DEPENDENCIES += libusb-compat
|
||||
OPENOBEX_CONF_OPTS += --with-usb=$(STAGING_DIR)
|
||||
else
|
||||
OPENOBEX_CONF_OPTS += --disable-usb
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From https://www.openssl.org/source/openssl-1.0.2f.tar.gz.sha256
|
||||
sha256 932b4ee4def2b434f85435d9e3e19ca8ba99ce9a065a61524b429a9d5e9b2e9c openssl-1.0.2f.tar.gz
|
||||
# From https://www.openssl.org/source/openssl-1.0.2g.tar.gz.sha256
|
||||
sha256 b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33 openssl-1.0.2g.tar.gz
|
||||
# Locally computed
|
||||
sha256 eddd8a5123748052c598214487ac178e4bfa4e31ba2ec520c70d59c8c5bfa2e9 openssl-1.0.2a-parallel-install-dirs.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d
|
||||
sha256 147c3eeaad614c044749ea527cb433eae5e2d5cad34a78c6ba61cd967bfbe01f openssl-1.0.2a-parallel-obj-headers.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
OPENSSL_VERSION = 1.0.2f
|
||||
OPENSSL_VERSION = 1.0.2g
|
||||
OPENSSL_SITE = http://www.openssl.org/source
|
||||
OPENSSL_LICENSE = OpenSSL or SSLeay
|
||||
OPENSSL_LICENSE_FILES = LICENSE
|
||||
|
||||
@@ -10,4 +10,11 @@ PATCH_SITE = $(BR2_GNU_MIRROR)/patch
|
||||
PATCH_LICENSE = GPLv3+
|
||||
PATCH_LICENSE_FILES = COPYING
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ATTR),y)
|
||||
PATCH_CONF_OPTS += --enable-attr
|
||||
PATCH_DEPENDENCIES += attr
|
||||
else
|
||||
PATCH_CONF_OPTS += --disable-attr
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
config BR2_PACKAGE_PAX_UTILS
|
||||
bool "pax-utils"
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5 # needs PR_SET_NO_NEW_PRIVS
|
||||
help
|
||||
ELF related utils for ELF 32/64 binaries that can check files
|
||||
for security relevant properties.
|
||||
|
||||
http://www.gentoo.org/proj/en/hardened/pax-utils.xml
|
||||
|
||||
comment "pax-utils needs a toolchain w/ headers >= 3.5"
|
||||
depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
Makefile: Fix static linking
|
||||
|
||||
Since libsndfile uses funtions from libm, the -lm should be specified
|
||||
after libsndfile for static linking.
|
||||
|
||||
Signed-off-by: "Eric Limpens" <Limpens@gmail.com>
|
||||
|
||||
diff -purN pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2.orig/src/Makefile pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2/src/Makefile
|
||||
--- pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2.orig/src/Makefile 2016-02-26 08:06:43.102962592 +0100
|
||||
+++ pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2/src/Makefile 2016-02-26 08:27:11.069148203 +0100
|
||||
@@ -1,10 +1,10 @@
|
||||
CC = gcc
|
||||
|
||||
app: rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o
|
||||
- $(CC) $(LDFLAGS) -o pi_fm_rds rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o -lm -lsndfile
|
||||
+ $(CC) $(LDFLAGS) -o pi_fm_rds rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o -lsndfile -lm
|
||||
|
||||
rds_wav: rds.o waveforms.o rds_wav.o fm_mpx.o
|
||||
- $(CC) $(LDFLAGS) -o rds_wav rds_wav.o rds.o waveforms.o fm_mpx.o -lm -lsndfile
|
||||
+ $(CC) $(LDFLAGS) -o rds_wav rds_wav.o rds.o waveforms.o fm_mpx.o -lsndfile -lm
|
||||
|
||||
rds.o: rds.c waveforms.h
|
||||
$(CC) $(CFLAGS) rds.c
|
||||
@@ -84,8 +84,8 @@ suitable-extractor = $(INFLATE$(suffix $(1)))
|
||||
|
||||
# MESSAGE Macro -- display a message in bold type
|
||||
MESSAGE = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(call qstrip,$(1))$(TERM_RESET)"
|
||||
TERM_BOLD := $(shell tput smso)
|
||||
TERM_RESET := $(shell tput rmso)
|
||||
TERM_BOLD := $(shell tput smso 2>/dev/null)
|
||||
TERM_RESET := $(shell tput rmso 2>/dev/null)
|
||||
|
||||
# Utility functions for 'find'
|
||||
# findfileclauses(filelist) => -name 'X' -o -name 'Y'
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
comment "powerpc-utils tools needs a toolchain w/ dynamic library"
|
||||
depends on BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le
|
||||
depends on BR2_STATIC_LIBS
|
||||
|
||||
config BR2_PACKAGE_POWERPC_UTILS
|
||||
bool "powerpc-utils"
|
||||
depends on !BR2_STATIC_LIBS # dlfcn.h
|
||||
depends on BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le
|
||||
select BR2_PACKAGE_ZLIB
|
||||
help
|
||||
|
||||
@@ -29,12 +29,24 @@ PULSEAUDIO_DEPENDENCIES = \
|
||||
$(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) \
|
||||
$(if $(BR2_PACKAGE_DBUS),dbus) \
|
||||
$(if $(BR2_PACKAGE_BLUEZ_UTILS),bluez_utils) \
|
||||
$(if $(BR2_PACKAGE_HAS_UDEV),udev) \
|
||||
$(if $(BR2_PACKAGE_OPENSSL),openssl) \
|
||||
$(if $(BR2_PACKAGE_FFTW),fftw) \
|
||||
$(if $(BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING),webrtc-audio-processing) \
|
||||
$(if $(BR2_PACKAGE_SYSTEMD),systemd)
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GDBM),y)
|
||||
PULSEAUDIO_CONF_OPTS += --with-database=gdbm
|
||||
PULSEAUDIO_DEPENDENCIES += gdbm
|
||||
else
|
||||
PULSEAUDIO_CONF_OPTS += --with-database=simple
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_JACK2),y)
|
||||
PULSEAUDIO_CONF_OPTS += --enable-jack
|
||||
PULSEAUDIO_DEPENDENCIES += jack2
|
||||
else
|
||||
PULSEAUDIO_CONF_OPTS += --disable-jack
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ORC),y)
|
||||
PULSEAUDIO_DEPENDENCIES += orc
|
||||
@@ -59,6 +71,20 @@ else
|
||||
PULSEAUDIO_CONF_OPTS += --disable-gtk3
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBSOXR),y)
|
||||
PULSEAUDIO_CONF_OPTS += --with-soxr
|
||||
PULSEAUDIO_DEPENDENCIES += libsoxr
|
||||
else
|
||||
PULSEAUDIO_CONF_OPTS += --without-soxr
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
|
||||
PULSEAUDIO_CONF_OPTS += --enable-libudev
|
||||
PULSEAUDIO_DEPENDENCIES += udev
|
||||
else
|
||||
PULSEAUDIO_CONF_OPTS += --disable-libudev
|
||||
endif
|
||||
|
||||
ifneq ($(BR2_INSTALL_LIBSTDCPP),y)
|
||||
# The optional webrtc echo canceller is written in C++, causing auto* to want
|
||||
# to link module-echo-cancel.so with CXX even if webrtc ISN'T used.
|
||||
|
||||
@@ -16,6 +16,10 @@ PURE_FTPD_CONF_OPTS = \
|
||||
--with-puredb \
|
||||
--with-rfc2640
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ELFUTILS),y)
|
||||
PURE_FTPD_DEPENDENCIES += elfutils
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCAP),y)
|
||||
PURE_FTPD_CONF_OPTS += --with-capabilities
|
||||
PURE_FTPD_DEPENDENCIES += libcap
|
||||
@@ -23,6 +27,10 @@ else
|
||||
PURE_FTPD_CONF_OPTS += --without-capabilities
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBSODIUM),y)
|
||||
PURE_FTPD_DEPENDENCIES += libsodium
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
PURE_FTPD_CONF_OPTS += --with-tls
|
||||
PURE_FTPD_DEPENDENCIES += openssl
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
From ac01b38302474920288c1a9eb63fd35fa8d1db5b Mon Sep 17 00:00:00 2001
|
||||
From: Bosse Klykken <larkly@gmail.com>
|
||||
Date: Tue, 17 Jul 2012 15:55:00 +0200
|
||||
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20try=20to=20build=20with=20SSLv2?=
|
||||
=?UTF-8?q?=20when=20it=20is=20not=20available.?=
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The patch originally from http://stackoverflow.com/a/11072709/164233
|
||||
|
||||
Fixes #30
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
SWIG/_ssl.i | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/SWIG/_ssl.i b/SWIG/_ssl.i
|
||||
index 3f6bd61..89b1ad1 100644
|
||||
--- a/SWIG/_ssl.i
|
||||
+++ b/SWIG/_ssl.i
|
||||
@@ -52,8 +52,10 @@ extern const char *SSL_alert_desc_string(int);
|
||||
%rename(ssl_get_alert_desc_v) SSL_alert_desc_string_long;
|
||||
extern const char *SSL_alert_desc_string_long(int);
|
||||
|
||||
+#ifndef OPENSSL_NO_SSL2
|
||||
%rename(sslv2_method) SSLv2_method;
|
||||
extern SSL_METHOD *SSLv2_method(void);
|
||||
+#endif
|
||||
%rename(sslv3_method) SSLv3_method;
|
||||
extern SSL_METHOD *SSLv3_method(void);
|
||||
%rename(sslv23_method) SSLv23_method;
|
||||
--
|
||||
2.7.0
|
||||
|
||||
@@ -2,6 +2,7 @@ config BR2_PACKAGE_QHULL
|
||||
bool "qhull"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_4 # needs gcc >= 4.4
|
||||
help
|
||||
Qhull computes the convex hull, Delaunay triangulation,
|
||||
Voronoi diagram, halfspace intersection about a point,
|
||||
@@ -14,6 +15,5 @@ config BR2_PACKAGE_QHULL
|
||||
|
||||
http://www.qhull.org
|
||||
|
||||
comment "qhull needs a toolchain w/ C++, dynamic library"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_STATIC_LIBS
|
||||
comment "qhull needs a toolchain w/ C++, dynamic library, gcc >= 4.4"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_4
|
||||
|
||||
@@ -407,12 +407,13 @@ config BR2_PACKAGE_QT_NETWORK
|
||||
|
||||
config BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
|
||||
bool
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
# see src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
|
||||
# see http://lists.busybox.net/pipermail/buildroot/2014-November/112605.html
|
||||
default y if BR2_arc || BR2_arm || BR2_armeb || BR2_i386 || BR2_microblazeel || \
|
||||
BR2_microblazebe || BR2_mips || BR2_mipsel || \
|
||||
(BR2_mips64 || BR2_mips64el) && !BR2_MIPS_NABI32 || BR2_powerpc || \
|
||||
BR2_powerpc64 || BR2_powerpc64le || BR2_sparc || BR2_x86_64
|
||||
BR2_powerpc64 || BR2_powerpc64le || BR2_x86_64
|
||||
# The CodeSourcery SuperH toolchain fails to build Webkit,
|
||||
# with an assertion failure in binutils.
|
||||
default y if (BR2_sh4 || BR2_sh4eb || BR2_sh4a || BR2_sh4aeb) && \
|
||||
@@ -454,12 +455,13 @@ config BR2_PACKAGE_QT_OPENSSL
|
||||
|
||||
config BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT
|
||||
bool
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
# see http://lists.busybox.net/pipermail/buildroot/2014-November/112605.html
|
||||
default y if BR2_arc || BR2_arm || BR2_armeb || aarch64 || BR2_i386 || \
|
||||
default y if BR2_arc || BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || \
|
||||
BR2_microblazeel || BR2_microblazebe || BR2_mips || BR2_mipsel || \
|
||||
BR2_mips64 || BR2_mips64el || BR2_nios2 || BR2_powerpc || \
|
||||
BR2_powerpc64 || BR2_powerpc64le || BR2_sh4 || BR2_sh4eb || \
|
||||
BR2_sh4a || BR2_sh4aeb || BR2_sparc || BR2_x86_64
|
||||
BR2_sh4a || BR2_sh4aeb || BR2_x86_64
|
||||
|
||||
config BR2_PACKAGE_QT_SCRIPT
|
||||
bool "Script Module"
|
||||
|
||||
@@ -660,13 +660,30 @@ define QT_INSTALL_TARGET_FONTS
|
||||
mkdir -p $(TARGET_DIR)/usr/lib/fonts
|
||||
cp -dpf $(QT_FONTS) $(TARGET_DIR)/usr/lib/fonts
|
||||
endef
|
||||
ifneq ($(BR2_PACKAGE_QT_FONT_MICRO)$(BR2_PACKAGE_QT_FONT_FIXED),)
|
||||
# as stated in the font source src/3rdparty/fonts/micro.bdf
|
||||
# source src/3rdparty/fonts/5x7.bdf and source src/3rdparty/fonts/6x13.bdf
|
||||
QT_LICENSE += , Public Domain (Micro/Fixed font)
|
||||
endif
|
||||
ifneq ($(BR2_PACKAGE_QT_FONT_HELVETICA)$(BR2_PACKAGE_QT_FONT_JAPANESE),)
|
||||
QT_LICENSE += , Adobe Helvetica license (Helvetica/Japanese fonts)
|
||||
QT_LICENSE_FILES += src/3rdparty/fonts/COPYING.Helvetica
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_QT_FONT_UNIFONT),y)
|
||||
QT_LICENSE += , Freeware (Unifont font)
|
||||
QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.Unifont
|
||||
endif
|
||||
endif # QT_FONTS
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT_QTFREETYPE)$(BR2_PACKAGE_QT_SYSTEMFREETYPE),y)
|
||||
define QT_INSTALL_TARGET_FONTS_TTF
|
||||
mkdir -p $(TARGET_DIR)/usr/lib/fonts
|
||||
cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.ttf $(TARGET_DIR)/usr/lib/fonts
|
||||
endef
|
||||
QT_LICENSE += , Bitstream license (DejaVu/Vera TrueType fonts)
|
||||
QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.DejaVu \
|
||||
src/3rdparty/fonts/README.DejaVu \
|
||||
src/3rdparty/fonts/COPYRIGHT.Vera
|
||||
endif
|
||||
endif # BR2_PACKAGE_QT_EMBEDDED
|
||||
|
||||
|
||||
@@ -14,6 +14,13 @@ QUAGGA_CONF_OPTS = --program-transform-name=''
|
||||
# 0002-configure-fix-static-linking-with-readline.patch
|
||||
QUAGGA_AUTORECONF = YES
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCAP),y)
|
||||
QUAGGA_CONF_OPTS += --enable-capabilities
|
||||
QUAGGA_DEPENDENCIES += libcap
|
||||
else
|
||||
QUAGGA_CONF_OPTS += --disable-capabilities
|
||||
endif
|
||||
|
||||
QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_ZEBRA),--enable-zebra,--disable-zebra)
|
||||
QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_BABELD),--enable-babeld,--disable-babeld)
|
||||
QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_BGPD),--enable-bgpd,--disable-bgpd)
|
||||
|
||||
@@ -18,6 +18,13 @@ QUOTA_DEPENDENCIES += gettext
|
||||
QUOTA_LIBS += -lintl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_E2FSPROGS),y)
|
||||
QUOTA_DEPENDENCIES += e2fsprogs
|
||||
QUOTA_CONF_OPTS += --enable-ext2direct
|
||||
else
|
||||
QUOTA_CONF_OPTS += --disable-ext2direct
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
|
||||
QUOTA_DEPENDENCIES += libtirpc host-pkgconf
|
||||
QUOTA_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`
|
||||
|
||||
@@ -17,16 +17,32 @@ SDL_SOUND_DEPENDENCIES += libiconv
|
||||
endif
|
||||
|
||||
# optional dependencies
|
||||
ifeq ($(BR2_PACKAGE_FLAC),y)
|
||||
SDL_SOUND_DEPENDENCIES += flac # is only used if ogg is also enabled
|
||||
ifeq ($(BR2_PACKAGE_FLAC)$(BR2_PACKAGE_LIBOGG),yy)
|
||||
SDL_SOUND_CONF_OPTS += --enable-flac
|
||||
SDL_SOUND_DEPENDENCIES += flac libogg
|
||||
else
|
||||
SDL_SOUND_CONF_OPTS += --disable-flac
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBMODPLUG),y)
|
||||
SDL_SOUND_CONF_OPTS += --enable-modplug
|
||||
SDL_SOUND_DEPENDENCIES += libmodplug
|
||||
else
|
||||
SDL_SOUND_CONF_OPTS += --disable-modplug
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
|
||||
SDL_SOUND_CONF_OPTS += --enable-ogg
|
||||
SDL_SOUND_DEPENDENCIES += libvorbis
|
||||
else
|
||||
SDL_SOUND_CONF_OPTS += --disable-ogg
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SPEEX),y)
|
||||
SDL_SOUND_CONF_OPTS += --enable-speex
|
||||
SDL_SOUND_DEPENDENCIES += speex
|
||||
else
|
||||
SDL_SOUND_CONF_OPTS += --disable-speex
|
||||
endif
|
||||
|
||||
SDL_SOUND_CONF_OPTS = \
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 6f3535012ed25017e4f893f9bad5391c2ea23c64f398caac3f29d8dad5f9e987 shairport-sync-2.8.0.tar.gz
|
||||
sha256 e0c750f51c54611e564ddb1ee161aa57ba6be36d3bf54198d9a6435ad6bf1757 8e8a0ee7ab0db61dc46735a1206843fe943ffc61.patch
|
||||
|
||||
@@ -10,6 +10,7 @@ SHAIRPORT_SYNC_SITE = $(call github,mikebrady,shairport-sync,$(SHAIRPORT_SYNC_VE
|
||||
SHAIRPORT_SYNC_LICENSE = MIT, BSD-3c
|
||||
SHAIRPORT_SYNC_LICENSE_FILES = LICENSES
|
||||
SHAIRPORT_SYNC_DEPENDENCIES = alsa-lib libconfig libdaemon popt host-pkgconf
|
||||
SHAIRPORT_SYNC_PATCH = https://github.com/mikebrady/shairport-sync/commit/8e8a0ee7ab0db61dc46735a1206843fe943ffc61.patch
|
||||
|
||||
# git clone, no configure
|
||||
SHAIRPORT_SYNC_AUTORECONF = YES
|
||||
|
||||
@@ -40,6 +40,7 @@ endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NCURSES),y)
|
||||
SLANG_DEPENDENCIES += ncurses
|
||||
SLANG_CONF_ENV += ac_cv_path_nc5config=$(STAGING_DIR)/usr/bin/ncurses5-config
|
||||
else
|
||||
SLANG_CONF_OPTS += ac_cv_path_nc5config=no
|
||||
endif
|
||||
@@ -47,6 +48,9 @@ endif
|
||||
ifeq ($(BR2_PACKAGE_READLINE),y)
|
||||
SLANG_CONF_OPTS += --with-readline=gnu
|
||||
SLANG_DEPENDENCIES += readline
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
SLANG_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/ncurses5-config --libs`"
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
|
||||
@@ -13,6 +13,12 @@ SOX_CONF_OPTS = --with-distro="Buildroot" --without-ffmpeg --disable-gomp \
|
||||
SOX_LICENSE = GPLv2+ (sox binary), LGPLv2.1+ (libraries)
|
||||
SOX_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL
|
||||
|
||||
# MIPS Codescape toolchains don't support stack-smashing protection
|
||||
# despite of using glibc.
|
||||
ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS)$(BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS),y)
|
||||
SOX_CONF_OPTS += --disable-stack-protector
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ALSA_LIB_PCM),y)
|
||||
SOX_DEPENDENCIES += alsa-lib
|
||||
else
|
||||
|
||||
@@ -14,6 +14,7 @@ SPICE_DEPENDENCIES = \
|
||||
alsa-lib \
|
||||
celt051 \
|
||||
jpeg \
|
||||
libglib2 \
|
||||
openssl \
|
||||
pixman \
|
||||
python-pyparsing \
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# From http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.14.tar.bz2.asc
|
||||
md5 d589a2dd8ea8867170cef582e7334442 squid-3.5.14.tar.bz2
|
||||
sha1 f6a0262b09f7f463822cbdb50bac8f5dd1213d27 squid-3.5.14.tar.bz2
|
||||
# From http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.15.tar.bz2.asc
|
||||
md5 59d6732a4ebd3f63e2164d9847dc37c0 squid-3.5.15.tar.bz2
|
||||
sha1 72279380ea94aa731f5cf82f3fb50f9250f1692a squid-3.5.15.tar.bz2
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
SQUID_VERSION_MAJOR = 3.5
|
||||
SQUID_VERSION = $(SQUID_VERSION_MAJOR).14
|
||||
SQUID_VERSION = $(SQUID_VERSION_MAJOR).15
|
||||
SQUID_SOURCE = squid-$(SQUID_VERSION).tar.bz2
|
||||
SQUID_SITE = http://www.squid-cache.org/Versions/v3/$(SQUID_VERSION_MAJOR)
|
||||
SQUID_LICENSE = GPLv2+
|
||||
|
||||
@@ -14,16 +14,10 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
|
||||
SYSKLOGD_DEPENDENCIES = busybox
|
||||
endif
|
||||
|
||||
# CS PowerPC 2012.03 triggers compiler bug.
|
||||
ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC_E500V2),y)
|
||||
define SYSKLOGD_WORKAROUND_COMPILER_BUG
|
||||
$(SED) 's/-O3/-O2/' $(@D)/Makefile
|
||||
endef
|
||||
SYSKLOGD_POST_PATCH_HOOKS = SYSKLOGD_WORKAROUND_COMPILER_BUG
|
||||
endif
|
||||
|
||||
# Override SKFLAGS which is used as CFLAGS.
|
||||
define SYSKLOGD_BUILD_CMDS
|
||||
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
|
||||
$(MAKE) $(TARGET_CONFIGURE_OPTS) SKFLAGS="$(TARGET_CFLAGS) -DSYSV" \
|
||||
-C $(@D)
|
||||
endef
|
||||
|
||||
define SYSKLOGD_INSTALL_TARGET_CMDS
|
||||
|
||||
@@ -20,6 +20,20 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
|
||||
SYSLOG_NG_DEPENDENCIES += busybox
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GEOIP),y)
|
||||
SYSLOG_NG_DEPENDENCIES += geoip
|
||||
SYSLOG_NG_CONF_OPTS += --enable-geoip
|
||||
else
|
||||
SYSLOG_NG_CONF_OPTS += --disable-geoip
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCAP),y)
|
||||
SYSLOG_NG_DEPENDENCIES += libcap
|
||||
SYSLOG_NG_CONF_OPTS += --enable-linux-caps
|
||||
else
|
||||
SYSLOG_NG_CONF_OPTS += --disable-linux-caps
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PYTHON),y)
|
||||
SYSLOG_NG_DEPENDENCIES += python
|
||||
SYSLOG_NG_CONF_OPTS += \
|
||||
@@ -51,6 +65,10 @@ else
|
||||
SYSLOG_NG_CONF_OPTS += --disable-json
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y)
|
||||
SYSLOG_NG_DEPENDENCIES += util-linux
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_INIT_SYSTEMD),y)
|
||||
SYSLOG_NG_DEPENDENCIES += systemd
|
||||
SYSLOG_NG_CONF_OPTS += \
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
$OpenBSD: patch-lib5250_sslstream_c,v 1.1 2015/10/07 16:09:04 jca Exp $
|
||||
|
||||
Allow building against OpenSSL without SSLv2/SSLv3 support.
|
||||
|
||||
Download from:
|
||||
http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/tn5250/patches/patch-lib5250_sslstream_c
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
--- a/lib5250/sslstream.c.orig Fri Nov 21 09:12:21 2008
|
||||
+++ b/lib5250/sslstream.c Tue Oct 6 21:32:29 2015
|
||||
@@ -368,13 +368,19 @@ int tn5250_ssl_stream_init (Tn5250Stream *This)
|
||||
methstr[4] = '\0';
|
||||
}
|
||||
|
||||
+#ifndef OPENSSL_NO_SSL2
|
||||
if (!strcmp(methstr, "ssl2")) {
|
||||
meth = SSLv2_client_method();
|
||||
TN5250_LOG(("SSL Method = SSLv2_client_method()\n"));
|
||||
- } else if (!strcmp(methstr, "ssl3")) {
|
||||
+ } else
|
||||
+#endif
|
||||
+#ifndef OPENSSL_NO_SSL3
|
||||
+ if (!strcmp(methstr, "ssl3")) {
|
||||
meth = SSLv3_client_method();
|
||||
TN5250_LOG(("SSL Method = SSLv3_client_method()\n"));
|
||||
- } else {
|
||||
+ } else
|
||||
+#endif
|
||||
+ {
|
||||
meth = SSLv23_client_method();
|
||||
TN5250_LOG(("SSL Method = SSLv23_client_method()\n"));
|
||||
}
|
||||
@@ -13,6 +13,10 @@ TRACE_CMD_LICENSE_FILES = COPYING COPYING.LIB
|
||||
|
||||
TRACE_CMD_DEPENDENCIES = host-pkgconf
|
||||
|
||||
ifeq ($(BR2_PACKAGE_AUDIT),y)
|
||||
TRACE_CMD_DEPENDENCIES += audit
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PYTHON),y)
|
||||
TRACE_CMD_DEPENDENCIES += python host-swig
|
||||
TRACE_CMD_MAKE_OPTS = PYTHON_VERS=python
|
||||
|
||||
@@ -0,0 +1,215 @@
|
||||
From 9abda1bb380bdbef1affaec381742ced394ca118 Mon Sep 17 00:00:00 2001
|
||||
From: Lada Trimasova <ltrimas@synopsys.com>
|
||||
Date: Mon, 18 Jan 2016 15:58:19 +0300
|
||||
Subject: [PATCH] Check if the compiler understands pie and relro options
|
||||
|
||||
-pie and -fpie enable the building of position-independent
|
||||
executables, and -Wl,-z,relro turns on read-only relocation support in gcc.
|
||||
Add checks to ensure that the compiler and linker understand these options.
|
||||
|
||||
Signed-off-by: Lada Trimasova <ltrimas@synopsys.com>
|
||||
---
|
||||
configure.in | 5 +++
|
||||
m4/ax_check_compile_flag.m4 | 72 ++++++++++++++++++++++++++++++++++++
|
||||
m4/ax_check_link_flag.m4 | 71 +++++++++++++++++++++++++++++++++++
|
||||
src/tcsd/Makefile.am | 4 +-
|
||||
4 files changed, 150 insertions(+), 2 deletions(-)
|
||||
create mode 100644 m4/ax_check_compile_flag.m4
|
||||
create mode 100644 m4/ax_check_link_flag.m4
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index add23dc..9603353 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -12,6 +12,7 @@ TSS_VER_MINOR=3
|
||||
# compute $target
|
||||
AC_CANONICAL_TARGET
|
||||
AM_INIT_AUTOMAKE([foreign 1.6])
|
||||
+AC_CONFIG_MACRO_DIR([m4])
|
||||
|
||||
# Debugging support
|
||||
AC_ARG_ENABLE([debug],
|
||||
@@ -383,6 +384,10 @@ elif test x"${prefix}" = x"NONE"; then
|
||||
localstatedir="/usr/local/var"
|
||||
fi
|
||||
|
||||
+AX_CHECK_COMPILE_FLAG([-fPIE -DPIE], [PIE_CFLAGS="-fPIE -DPIE"])
|
||||
+AX_CHECK_LINK_FLAG([-pie], [PIE_LDFLAGS="$PIE_LDFLAGS -pie"])
|
||||
+AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS="$LDFLAGS -Wl,-z,relro"])
|
||||
+
|
||||
AC_OUTPUT(dist/tcsd.conf \
|
||||
dist/fedora/trousers.spec \
|
||||
dist/trousers.spec \
|
||||
diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4
|
||||
new file mode 100644
|
||||
index 0000000..c3a8d69
|
||||
--- /dev/null
|
||||
+++ b/m4/ax_check_compile_flag.m4
|
||||
@@ -0,0 +1,72 @@
|
||||
+# ===========================================================================
|
||||
+# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
|
||||
+# ===========================================================================
|
||||
+#
|
||||
+# SYNOPSIS
|
||||
+#
|
||||
+# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS])
|
||||
+#
|
||||
+# DESCRIPTION
|
||||
+#
|
||||
+# Check whether the given FLAG works with the current language's compiler
|
||||
+# or gives an error. (Warnings, however, are ignored)
|
||||
+#
|
||||
+# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
|
||||
+# success/failure.
|
||||
+#
|
||||
+# If EXTRA-FLAGS is defined, it is added to the current language's default
|
||||
+# flags (e.g. CFLAGS) when the check is done. The check is thus made with
|
||||
+# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to
|
||||
+# force the compiler to issue an error when a bad flag is given.
|
||||
+#
|
||||
+# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
|
||||
+# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
|
||||
+#
|
||||
+# LICENSE
|
||||
+#
|
||||
+# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
|
||||
+# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
|
||||
+#
|
||||
+# This program is free software: you can redistribute it and/or modify it
|
||||
+# under the terms of the GNU General Public License as published by the
|
||||
+# Free Software Foundation, either version 3 of the License, or (at your
|
||||
+# option) any later version.
|
||||
+#
|
||||
+# This program is distributed in the hope that it will be useful, but
|
||||
+# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
|
||||
+# Public License for more details.
|
||||
+#
|
||||
+# You should have received a copy of the GNU General Public License along
|
||||
+# with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
+#
|
||||
+# As a special exception, the respective Autoconf Macro's copyright owner
|
||||
+# gives unlimited permission to copy, distribute and modify the configure
|
||||
+# scripts that are the output of Autoconf when processing the Macro. You
|
||||
+# need not follow the terms of the GNU General Public License when using
|
||||
+# or distributing such scripts, even though portions of the text of the
|
||||
+# Macro appear in them. The GNU General Public License (GPL) does govern
|
||||
+# all other use of the material that constitutes the Autoconf Macro.
|
||||
+#
|
||||
+# This special exception to the GPL applies to versions of the Autoconf
|
||||
+# Macro released by the Autoconf Archive. When you make and distribute a
|
||||
+# modified version of the Autoconf Macro, you may extend this special
|
||||
+# exception to the GPL to apply to your modified version as well.
|
||||
+
|
||||
+#serial 2
|
||||
+
|
||||
+AC_DEFUN([AX_CHECK_COMPILE_FLAG],
|
||||
+[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
|
||||
+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
|
||||
+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
|
||||
+ ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
|
||||
+ _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
|
||||
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
|
||||
+ [AS_VAR_SET(CACHEVAR,[yes])],
|
||||
+ [AS_VAR_SET(CACHEVAR,[no])])
|
||||
+ _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
|
||||
+AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
|
||||
+ [m4_default([$2], :)],
|
||||
+ [m4_default([$3], :)])
|
||||
+AS_VAR_POPDEF([CACHEVAR])dnl
|
||||
+])dnl AX_CHECK_COMPILE_FLAGS
|
||||
diff --git a/m4/ax_check_link_flag.m4 b/m4/ax_check_link_flag.m4
|
||||
new file mode 100644
|
||||
index 0000000..e2d0d36
|
||||
--- /dev/null
|
||||
+++ b/m4/ax_check_link_flag.m4
|
||||
@@ -0,0 +1,71 @@
|
||||
+# ===========================================================================
|
||||
+# http://www.gnu.org/software/autoconf-archive/ax_check_link_flag.html
|
||||
+# ===========================================================================
|
||||
+#
|
||||
+# SYNOPSIS
|
||||
+#
|
||||
+# AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS])
|
||||
+#
|
||||
+# DESCRIPTION
|
||||
+#
|
||||
+# Check whether the given FLAG works with the linker or gives an error.
|
||||
+# (Warnings, however, are ignored)
|
||||
+#
|
||||
+# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
|
||||
+# success/failure.
|
||||
+#
|
||||
+# If EXTRA-FLAGS is defined, it is added to the linker's default flags
|
||||
+# when the check is done. The check is thus made with the flags: "LDFLAGS
|
||||
+# EXTRA-FLAGS FLAG". This can for example be used to force the linker to
|
||||
+# issue an error when a bad flag is given.
|
||||
+#
|
||||
+# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
|
||||
+# macro in sync with AX_CHECK_{PREPROC,COMPILE}_FLAG.
|
||||
+#
|
||||
+# LICENSE
|
||||
+#
|
||||
+# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
|
||||
+# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
|
||||
+#
|
||||
+# This program is free software: you can redistribute it and/or modify it
|
||||
+# under the terms of the GNU General Public License as published by the
|
||||
+# Free Software Foundation, either version 3 of the License, or (at your
|
||||
+# option) any later version.
|
||||
+#
|
||||
+# This program is distributed in the hope that it will be useful, but
|
||||
+# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
|
||||
+# Public License for more details.
|
||||
+#
|
||||
+# You should have received a copy of the GNU General Public License along
|
||||
+# with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
+#
|
||||
+# As a special exception, the respective Autoconf Macro's copyright owner
|
||||
+# gives unlimited permission to copy, distribute and modify the configure
|
||||
+# scripts that are the output of Autoconf when processing the Macro. You
|
||||
+# need not follow the terms of the GNU General Public License when using
|
||||
+# or distributing such scripts, even though portions of the text of the
|
||||
+# Macro appear in them. The GNU General Public License (GPL) does govern
|
||||
+# all other use of the material that constitutes the Autoconf Macro.
|
||||
+#
|
||||
+# This special exception to the GPL applies to versions of the Autoconf
|
||||
+# Macro released by the Autoconf Archive. When you make and distribute a
|
||||
+# modified version of the Autoconf Macro, you may extend this special
|
||||
+# exception to the GPL to apply to your modified version as well.
|
||||
+
|
||||
+#serial 2
|
||||
+
|
||||
+AC_DEFUN([AX_CHECK_LINK_FLAG],
|
||||
+[AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl
|
||||
+AC_CACHE_CHECK([whether the linker accepts $1], CACHEVAR, [
|
||||
+ ax_check_save_flags=$LDFLAGS
|
||||
+ LDFLAGS="$LDFLAGS $4 $1"
|
||||
+ AC_LINK_IFELSE([AC_LANG_PROGRAM()],
|
||||
+ [AS_VAR_SET(CACHEVAR,[yes])],
|
||||
+ [AS_VAR_SET(CACHEVAR,[no])])
|
||||
+ LDFLAGS=$ax_check_save_flags])
|
||||
+AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
|
||||
+ [m4_default([$2], :)],
|
||||
+ [m4_default([$3], :)])
|
||||
+AS_VAR_POPDEF([CACHEVAR])dnl
|
||||
+])dnl AX_CHECK_LINK_FLAGS
|
||||
diff --git a/src/tcsd/Makefile.am b/src/tcsd/Makefile.am
|
||||
index 2210734..6640ab2 100644
|
||||
--- a/src/tcsd/Makefile.am
|
||||
+++ b/src/tcsd/Makefile.am
|
||||
@@ -1,8 +1,8 @@
|
||||
sbin_PROGRAMS=tcsd
|
||||
|
||||
-tcsd_CFLAGS=-DAPPID=\"TCSD\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\" -I${top_srcdir}/src/include -fPIE -DPIE
|
||||
+tcsd_CFLAGS=-DAPPID=\"TCSD\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\" -I${top_srcdir}/src/include $(PIE_CFLAGS)
|
||||
tcsd_LDADD=${top_builddir}/src/tcs/libtcs.a ${top_builddir}/src/tddl/libtddl.a -lpthread @CRYPTOLIB@
|
||||
-tcsd_LDFLAGS=-pie -Wl,-z,relro -Wl,-z,now
|
||||
+tcsd_LDFLAGS=$(PIE_LDFLAGS) $(RELRO_LDFLAGS)
|
||||
|
||||
tcsd_SOURCES=svrside.c tcsd_conf.c tcsd_threads.c platform.c
|
||||
|
||||
--
|
||||
2.5.0
|
||||
|
||||
@@ -10,6 +10,8 @@ TROUSERS_SITE = http://downloads.sourceforge.net/project/trousers/trousers/$(TRO
|
||||
TROUSERS_LICENSE = BSD-3c
|
||||
TROUSERS_LICENSE_FILES = LICENSE
|
||||
TROUSERS_INSTALL_STAGING = YES
|
||||
# Need autoreconf because of a patch touching configure.in and Makefile.am
|
||||
TROUSERS_AUTORECONF = YES
|
||||
TROUSERS_DEPENDENCIES = openssl
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBICONV),y)
|
||||
@@ -21,4 +23,11 @@ endif
|
||||
# workaround.
|
||||
TROUSERS_CONF_OPTS += --disable-usercheck
|
||||
|
||||
# uClibc toolchain for ARC doesn't support PIE at the moment
|
||||
ifeq ($(BR2_arc),y)
|
||||
TROUSERS_CONF_ENV += \
|
||||
ax_cv_check_cflags___fPIE__DPIE=no \
|
||||
ax_cv_check_ldflags___pie=no
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
comment "tvheadend needs a toolchain w/ NPTL, headers >= 3.2, dynamic library"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
|
||||
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 || BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
|
||||
config BR2_PACKAGE_TVHEADEND
|
||||
bool "tvheadend"
|
||||
depends on !BR2_STATIC_LIBS # dladdr()
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
select BR2_PACKAGE_DTV_SCAN_TABLES
|
||||
select BR2_PACKAGE_FFMPEG_AVRESAMPLE if BR2_PACKAGE_FFMPEG
|
||||
select BR2_PACKAGE_FFMPEG_SWSCALE if BR2_PACKAGE_FFMPEG
|
||||
|
||||
@@ -27,6 +27,7 @@ config BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
|
||||
|
||||
config BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS
|
||||
bool "libsmartcols"
|
||||
depends on BR2_USE_MMU # fork
|
||||
help
|
||||
Install libsmartcols.
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user