mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
Merge pull request #1612 from MilhouseVH/package_bumps_may17
Package updates: various minor bumps
This commit is contained in:
Lukas Rusak
GitHub
commit
cd76d64421
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libsndfile"
|
||||
PKG_VERSION="1.0.27"
|
||||
PKG_VERSION="1.0.28"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="LGPL"
|
||||
PKG_SITE="http://www.mega-nerd.com/libsndfile/"
|
||||
@ -29,6 +29,7 @@ PKG_LONGDESC="libsndfile is a C library for reading and writing sound files such
|
||||
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
PKG_USE_CMAKE="no"
|
||||
|
||||
# package specific configure options
|
||||
PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared \
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="lzo"
|
||||
PKG_VERSION="2.09"
|
||||
PKG_VERSION="2.10"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.oberhumer.com/opensource/lzo"
|
||||
@ -33,3 +33,7 @@ PKG_AUTORECONF="no"
|
||||
|
||||
PKG_CMAKE_OPTS_HOST="-DENABLE_SHARED=OFF -DENABLE_STATIC=ON"
|
||||
PKG_CMAKE_OPTS_TARGET="-DENABLE_SHARED=OFF -DENABLE_STATIC=ON"
|
||||
|
||||
post_makeinstall_target() {
|
||||
rm -rf $INSTALL/usr/libexec
|
||||
}
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="mysql"
|
||||
PKG_VERSION="5.7.17"
|
||||
PKG_VERSION="5.7.18"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="LGPL"
|
||||
PKG_SITE="http://www.mysql.com"
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
diff -Naur a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
|
||||
--- a/scripts/CMakeLists.txt 2016-09-21 23:16:59.461308398 -0700
|
||||
+++ b/scripts/CMakeLists.txt 2016-09-21 23:23:50.606510539 -0700
|
||||
@@ -14,11 +14,8 @@
|
||||
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
|
||||
index 1d0480b..425abb8 100644
|
||||
--- a/scripts/CMakeLists.txt
|
||||
+++ b/scripts/CMakeLists.txt
|
||||
@@ -14,10 +14,8 @@
|
||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
# Build comp_sql - used for embedding SQL in C or C++ programs
|
||||
@ -9,9 +10,8 @@ diff -Naur a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
|
||||
- ADD_EXECUTABLE(comp_sql comp_sql.c)
|
||||
- TARGET_LINK_LIBRARIES(comp_sql)
|
||||
-ENDIF()
|
||||
-
|
||||
+ADD_EXECUTABLE(comp_sql comp_sql.c)
|
||||
+TARGET_LINK_LIBRARIES(comp_sql)
|
||||
|
||||
# Build mysql_fix_privilege_tables.sql (concatenate 2 sql scripts)
|
||||
IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
|
||||
# Add compiler information, for easier debugging of output from mysql_config.
|
||||
SET(COMPILER_ID_AND_VERSION
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="ccache"
|
||||
PKG_VERSION="3.3.3"
|
||||
PKG_VERSION="3.3.4"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://ccache.samba.org/"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="elfutils"
|
||||
PKG_VERSION="0.167"
|
||||
PKG_VERSION="0.168"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://sourceware.org/elfutils/"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="gmp"
|
||||
PKG_VERSION="6.1.1"
|
||||
PKG_VERSION="6.1.2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="LGPLv3+"
|
||||
PKG_SITE="http://gmplib.org/"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libpthread-stubs"
|
||||
PKG_VERSION="0.3"
|
||||
PKG_VERSION="0.4"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://xcb.freedesktop.org/"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="m4"
|
||||
PKG_VERSION="1.4.17"
|
||||
PKG_VERSION="1.4.18"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.gnu.org/software/m4/"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pcre"
|
||||
PKG_VERSION="8.39"
|
||||
PKG_VERSION="8.40"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://www.pcre.org/"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pkg-config"
|
||||
PKG_VERSION="0.29.1"
|
||||
PKG_VERSION="0.29.2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.freedesktop.org/software/pkgconfig/"
|
||||
|
||||
@ -1,23 +1,36 @@
|
||||
diff -Naur a/pkg.c b/pkg.c
|
||||
--- a/pkg.c 2016-02-26 17:56:52.000000000 +0100
|
||||
+++ b/pkg.c 2017-01-02 19:48:34.000000000 +0100
|
||||
@@ -468,11 +468,14 @@
|
||||
From 35fe817168fe0bdb78777d2707ba0189a4ce19bc Mon Sep 17 00:00:00 2001
|
||||
From: MilhouseVH <milhouseVH.github@nmacleod.com>
|
||||
Date: Fri, 5 May 2017 08:23:25 +0100
|
||||
Subject: [PATCH] pkg-config: use sysroot path (see #1135)
|
||||
|
||||
---
|
||||
pkg.c | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/pkg.c b/pkg.c
|
||||
index f29ecc7..a7a1f2a 100644
|
||||
--- a/pkg.c
|
||||
+++ b/pkg.c
|
||||
@@ -433,7 +433,7 @@ flag_list_to_string (GList *list)
|
||||
Flag *flag = tmp->data;
|
||||
char *tmpstr = flag->arg;
|
||||
|
||||
- if (pcsysrootdir != NULL && flag->type & (CFLAGS_I | LIBS_L)) {
|
||||
+ if (pcsysrootdir != NULL && flag->type & (CFLAGS_I | LIBS_L) && strncmp(tmpstr+2, pcsysrootdir, strlen(pcsysrootdir)) != 0) {
|
||||
g_string_append_c (str, '-');
|
||||
g_string_append_c (str, tmpstr[1]);
|
||||
/* Handle non-I Cflags like -isystem */
|
||||
if (flag->type & CFLAGS_I && strncmp (tmpstr, "-I", 2) != 0) {
|
||||
char *space = strchr (tmpstr, ' ');
|
||||
@@ -449,6 +449,9 @@ flag_list_to_string (GList *list)
|
||||
g_string_append (str, pcsysrootdir);
|
||||
g_string_append (str, tmpstr+2);
|
||||
}
|
||||
+ } else if (pcsysrootdir != NULL && strncmp(tmpstr, "/usr", 4) == 0 && strncmp(tmpstr, pcsysrootdir, strlen(pcsysrootdir)) != 0) {
|
||||
+ g_string_append (str, pcsysrootdir);
|
||||
+ g_string_append (str, tmpstr);
|
||||
} else {
|
||||
g_string_append (str, tmpstr);
|
||||
}
|
||||
@@ -1087,6 +1090,8 @@
|
||||
@@ -1060,6 +1063,8 @@ packages_get_var (GList *pkgs,
|
||||
{
|
||||
if (str->len > 0)
|
||||
g_string_append_c (str, ' ');
|
||||
@ -26,3 +39,6 @@ diff -Naur a/pkg.c b/pkg.c
|
||||
g_string_append (str, var);
|
||||
g_free (var);
|
||||
}
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="swig"
|
||||
PKG_VERSION="3.0.10"
|
||||
PKG_VERSION="3.0.12"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.swig.org"
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
# in Xorg.log
|
||||
|
||||
PKG_NAME="libepoxy"
|
||||
PKG_VERSION="1.4.1"
|
||||
PKG_VERSION="1.4.2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://github.com/anholt/libepoxy"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libpng"
|
||||
PKG_VERSION="1.6.27"
|
||||
PKG_VERSION="1.6.29"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://www.libpng.org/"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libraw"
|
||||
PKG_VERSION="0.18.1"
|
||||
PKG_VERSION="0.18.2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="LGPL"
|
||||
PKG_SITE="http://www.libraw.org/"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="mesa"
|
||||
PKG_VERSION="17.0.3"
|
||||
PKG_VERSION="17.0.5"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://www.mesa3d.org/"
|
||||
|
||||
@ -0,0 +1,27 @@
|
||||
From b1a9fcaf87add539888bdb592d42262e770eda46 Mon Sep 17 00:00:00 2001
|
||||
From: MilhouseVH <milhouseVH.github@nmacleod.com>
|
||||
Date: Sat, 6 May 2017 04:25:16 +0100
|
||||
Subject: [PATCH] libmicrohttpd: use MHD_USE_INTERNAL_POLLING_THREAD with
|
||||
version >= 0.9.54
|
||||
|
||||
---
|
||||
xbmc/network/WebServer.cpp | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/xbmc/network/WebServer.cpp b/xbmc/network/WebServer.cpp
|
||||
index 6e70d3e..c35f009 100644
|
||||
--- a/xbmc/network/WebServer.cpp
|
||||
+++ b/xbmc/network/WebServer.cpp
|
||||
@@ -1130,6 +1130,9 @@ struct MHD_Daemon* CWebServer::StartMHD(unsigned int flags, int port)
|
||||
// WARNING: set MHD_OPTION_CONNECTION_TIMEOUT to something higher than 1
|
||||
// otherwise on libmicrohttpd 0.4.4-1 it spins a busy loop
|
||||
MHD_USE_THREAD_PER_CONNECTION
|
||||
+#if (MHD_VERSION >= 0x00095400)
|
||||
+ | MHD_USE_INTERNAL_POLLING_THREAD /* MHD_USE_THREAD_PER_CONNECTION must be used only with MHD_USE_INTERNAL_POLLING_THREAD since 0.9.54 */
|
||||
+#endif
|
||||
#endif
|
||||
#if (MHD_VERSION >= 0x00040001)
|
||||
| MHD_USE_DEBUG /* Print MHD error messages to log */
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libass"
|
||||
PKG_VERSION="0.13.5"
|
||||
PKG_VERSION="0.13.6"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="BSD"
|
||||
PKG_SITE="https://github.com/libass/libass"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="bluez"
|
||||
PKG_VERSION="5.44"
|
||||
PKG_VERSION="5.45"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.bluez.org/"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="iptables"
|
||||
PKG_VERSION="1.6.0"
|
||||
PKG_VERSION="1.6.1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.netfilter.org/"
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
diff -Naur iptables-1.6.0/extensions/GNUmakefile.in iptables-1.6.0.patch/extensions/GNUmakefile.in
|
||||
--- iptables-1.6.0/extensions/GNUmakefile.in 2015-12-09 13:55:06.000000000 +0100
|
||||
+++ iptables-1.6.0.patch/extensions/GNUmakefile.in 2015-12-21 07:57:44.698366669 +0100
|
||||
@@ -21,7 +21,7 @@
|
||||
kinclude_CPPFLAGS = @kinclude_CPPFLAGS@
|
||||
|
||||
AM_CFLAGS = ${regular_CFLAGS}
|
||||
-AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${CPPFLAGS} @libnetfilter_conntrack_CFLAGS@ @libnftnl_CFLAGS@
|
||||
+AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include -I${top_srcdir} ${kinclude_CPPFLAGS} ${CPPFLAGS} @libnetfilter_conntrack_CFLAGS@ @libnftnl_CFLAGS@
|
||||
AM_DEPFLAGS = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@
|
||||
AM_LDFLAGS = @noundef_LDFLAGS@
|
||||
|
||||
diff -Naur iptables-1.6.0/iptables/Makefile.am iptables-1.6.0.patch/iptables/Makefile.am
|
||||
--- iptables-1.6.0/iptables/Makefile.am 2015-12-09 13:55:06.000000000 +0100
|
||||
+++ iptables-1.6.0.patch/iptables/Makefile.am 2015-12-21 08:03:22.245954635 +0100
|
||||
@@ -1,7 +1,7 @@
|
||||
# -*- Makefile -*-
|
||||
|
||||
AM_CFLAGS = ${regular_CFLAGS}
|
||||
-AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${libmnl_CFLAGS} ${libnftnl_CFLAGS} ${libnetfilter_conntrack_CFLAGS}
|
||||
+AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include -I${top_srcdir} ${kinclude_CPPFLAGS} ${libmnl_CFLAGS} ${libnftnl_CFLAGS} ${libnetfilter_conntrack_CFLAGS}
|
||||
AM_YFLAGS = -d
|
||||
|
||||
xtables_multi_SOURCES = xtables-multi.c iptables-xml.c
|
||||
@ -1,39 +0,0 @@
|
||||
From 4dc8e2aa91bd4151f7e5cd56d88d3731b4c1525e Mon Sep 17 00:00:00 2001
|
||||
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
Date: Wed, 30 Dec 2015 14:39:35 -0300
|
||||
Subject: [PATCH] iptables: add xtables-config-parser.h to BUILT_SOURCES
|
||||
|
||||
Otherwise other sources that use it might be built before it's ready leading
|
||||
to build failure, for example by iptables/nft.c
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
---
|
||||
Status: sent upstream (mailing list, no link yet)
|
||||
|
||||
iptables/Makefile.am | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/iptables/Makefile.am b/iptables/Makefile.am
|
||||
index 3c0faa5..c3eb8a8 100644
|
||||
--- a/iptables/Makefile.am
|
||||
+++ b/iptables/Makefile.am
|
||||
@@ -4,6 +4,8 @@ AM_CFLAGS = ${regular_CFLAGS}
|
||||
AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${libmnl_CFLAGS} ${libnftnl_CFLAGS} ${libnetfilter_conntrack_CFLAGS}
|
||||
AM_YFLAGS = -d
|
||||
|
||||
+BUILT_SOURCES =
|
||||
+
|
||||
xtables_multi_SOURCES = xtables-multi.c iptables-xml.c
|
||||
xtables_multi_CFLAGS = ${AM_CFLAGS}
|
||||
xtables_multi_LDADD = ../extensions/libext.a
|
||||
@@ -27,6 +29,7 @@ xtables_multi_LDADD += ../libxtables/libxtables.la -lm
|
||||
|
||||
# nftables compatibility layer
|
||||
if ENABLE_NFTABLES
|
||||
+BUILT_SOURCES += xtables-config-parser.h
|
||||
xtables_compat_multi_SOURCES = xtables-compat-multi.c iptables-xml.c
|
||||
xtables_compat_multi_CFLAGS = ${AM_CFLAGS}
|
||||
xtables_compat_multi_LDADD = ../extensions/libext.a ../extensions/libext_ebt.a
|
||||
--
|
||||
2.4.10
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libnftnl"
|
||||
PKG_VERSION="1.0.6"
|
||||
PKG_VERSION="1.0.7"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://netfilter.org/projects/libnftnl"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libssh"
|
||||
PKG_VERSION="0.7.3"
|
||||
PKG_VERSION="0.7.5"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OpenSource"
|
||||
PKG_SITE="http://www.libssh.org/"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="openssh"
|
||||
PKG_VERSION="7.4p1"
|
||||
PKG_VERSION="7.5p1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://www.openssh.com/"
|
||||
@ -41,6 +41,7 @@ PKG_CONFIGURE_OPTS_TARGET="--sysconfdir=/etc/ssh \
|
||||
--disable-wtmpx \
|
||||
--without-rpath \
|
||||
--with-ssl-engine \
|
||||
--with-privsep-user=nobody \
|
||||
--disable-pututline \
|
||||
--disable-pututxline \
|
||||
--disable-etc-default-login \
|
||||
@ -64,7 +65,6 @@ post_makeinstall_target() {
|
||||
|
||||
sed -e "s|^#PermitRootLogin.*|PermitRootLogin yes|g" \
|
||||
-e "s|^#StrictModes.*|StrictModes no|g" \
|
||||
-e "s|^#UsePrivilegeSeparation.*|UsePrivilegeSeparation no|g" \
|
||||
-i $INSTALL/etc/ssh/sshd_config
|
||||
|
||||
echo "PubkeyAcceptedKeyTypes +ssh-dss" >> $INSTALL/etc/ssh/sshd_config
|
||||
|
||||
@ -16,5 +16,6 @@
|
||||
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
|
||||
################################################################################
|
||||
|
||||
d /var/empty 0600 root root - -
|
||||
d /storage/.cache/ssh 0755 root root - -
|
||||
d /storage/.ssh 0700 root root - -
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="openvpn"
|
||||
PKG_VERSION="2.4.0"
|
||||
PKG_VERSION="2.4.1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://openvpn.net"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libgcrypt"
|
||||
PKG_VERSION="1.7.5"
|
||||
PKG_VERSION="1.7.6"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="https://www.gnupg.org/"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libgpg-error"
|
||||
PKG_VERSION="1.25"
|
||||
PKG_VERSION="1.27"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="https://www.gnupg.org"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="dbus"
|
||||
PKG_VERSION="1.10.16"
|
||||
PKG_VERSION="1.11.12"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://dbus.freedesktop.org"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="e2fsprogs"
|
||||
PKG_VERSION="1.43.3"
|
||||
PKG_VERSION="1.43.4"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://e2fsprogs.sourceforge.net/"
|
||||
@ -35,9 +35,9 @@ if [ "$HFSTOOLS" = "yes" ]; then
|
||||
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET diskdev_cmds"
|
||||
fi
|
||||
|
||||
PKG_CONFIGURE_OPTS_HOST="--prefix=/usr \
|
||||
--bindir=/bin \
|
||||
--sbindir=/sbin"
|
||||
PKG_CONFIGURE_OPTS_HOST="--prefix=$TOOLCHAIN/ \
|
||||
--bindir=$TOOLCHAIN/bin \
|
||||
--sbindir=$TOOLCHAIN/sbin"
|
||||
|
||||
PKG_CONFIGURE_OPTS_TARGET="BUILD_CC=$HOST_CC \
|
||||
--enable-verbose-makecmds \
|
||||
@ -72,6 +72,8 @@ pre_make_host() {
|
||||
}
|
||||
|
||||
post_makeinstall_target() {
|
||||
make -C lib/et DESTDIR=$SYSROOT_PREFIX install
|
||||
|
||||
rm -rf $INSTALL/usr/sbin/badblocks
|
||||
rm -rf $INSTALL/usr/sbin/blkid
|
||||
rm -rf $INSTALL/usr/sbin/dumpe2fs
|
||||
@ -107,15 +109,7 @@ make_host() {
|
||||
}
|
||||
|
||||
makeinstall_host() {
|
||||
make -C lib/et DESTDIR=$(pwd)/.install install
|
||||
make -C lib/ext2fs DESTDIR=$(pwd)/.install install
|
||||
|
||||
rm -fr $(pwd)/.install/bin
|
||||
rm -fr $(pwd)/.install/usr/share
|
||||
|
||||
# Ensure installed files are writeable and not read-only, otherwise future package bumps will fail to overwrite toolchain
|
||||
chmod -R +w $(pwd)/.install/usr/*
|
||||
|
||||
cp -Pa $(pwd)/.install/usr/* $TOOLCHAIN
|
||||
make -C lib/et install
|
||||
make -C lib/ext2fs install
|
||||
}
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="fuse-exfat"
|
||||
PKG_VERSION="1.2.4"
|
||||
PKG_VERSION="1.2.6"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPLv2+"
|
||||
PKG_SITE="https://github.com/relan/exfat"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="keyutils"
|
||||
PKG_VERSION="1.5.9"
|
||||
PKG_VERSION="1.5.10"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://people.redhat.com/~dhowells/keyutils/"
|
||||
|
||||
@ -1,104 +0,0 @@
|
||||
keyutils: Allow building of the shared library to be suppressed
|
||||
|
||||
Upstream patch:
|
||||
https://kernel.googlesource.com/pub/scm/linux/kernel/git/dhowells/keyutils/+/a4deb71ddc05e951c8be8d46615beed9d408a5c8
|
||||
|
||||
Signed-off-by: Vicente Olivert Riera <vincent.riera@imgtec.com>
|
||||
|
||||
LIB: Allow building of the shared library to be suppressed
|
||||
|
||||
Allow building of the shared library to be suppressed by passing NO_SOLIB=1 to
|
||||
the Makefile.
|
||||
|
||||
Reported-and-tested-by: Vicente Olivert Riera <vincent.riera@imgtec.com>
|
||||
Signed-off-by: David Howells <dhowells@redhat.com>
|
||||
diff --git a/Makefile b/Makefile
|
||||
index c904eaf..5dd2113 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -5,6 +5,7 @@
|
||||
SPECFILE := keyutils.spec
|
||||
NO_GLIBC_KEYERR := 0
|
||||
NO_ARLIB := 0
|
||||
+NO_SOLIB := 0
|
||||
ETCDIR := /etc
|
||||
BINDIR := /bin
|
||||
SBINDIR := /sbin
|
||||
@@ -95,7 +96,7 @@
|
||||
# Normal build rule
|
||||
#
|
||||
###############################################################################
|
||||
-all: $(DEVELLIB) keyctl request-key key.dns_resolver
|
||||
+all: keyctl request-key key.dns_resolver
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
@@ -104,20 +105,23 @@
|
||||
###############################################################################
|
||||
#RPATH = -Wl,-rpath,$(LIBDIR)
|
||||
|
||||
-ifeq ($(NO_ARLIB),0)
|
||||
-all: $(ARLIB)
|
||||
-$(ARLIB): keyutils.o
|
||||
- $(AR) rcs $@ $<
|
||||
-endif
|
||||
-
|
||||
VCPPFLAGS := -DPKGBUILD="\"$(shell date -u +%F)\""
|
||||
VCPPFLAGS += -DPKGVERSION="\"keyutils-$(VERSION)\""
|
||||
VCPPFLAGS += -DAPIVERSION="\"libkeyutils-$(APIVERSION)\""
|
||||
|
||||
+ifeq ($(NO_ARLIB),0)
|
||||
+all: $(ARLIB)
|
||||
+$(ARLIB): keyutils.o
|
||||
+ $(AR) rcs $@ $<
|
||||
+
|
||||
keyutils.o: keyutils.c keyutils.h Makefile
|
||||
$(CC) $(CPPFLAGS) $(VCPPFLAGS) $(CFLAGS) -UNO_GLIBC_KEYERR -o $@ -c $<
|
||||
+LIB_DEPENDENCY := libkeyutils.a
|
||||
+endif
|
||||
|
||||
|
||||
+ifeq ($(NO_SOLIB),0)
|
||||
+all: $(DEVELLIB)
|
||||
$(DEVELLIB): $(SONAME)
|
||||
ln -sf $< $@
|
||||
|
||||
@@ -131,6 +135,8 @@
|
||||
|
||||
keyutils.os: keyutils.c keyutils.h Makefile
|
||||
$(CC) $(CPPFLAGS) $(VCPPFLAGS) $(CFLAGS) -fPIC -o $@ -c $<
|
||||
+LIB_DEPENDENCY := $(DEVELLIB)
|
||||
+endif
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
@@ -140,13 +146,13 @@
|
||||
%.o: %.c keyutils.h Makefile
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
-keyctl: keyctl.o $(DEVELLIB)
|
||||
+keyctl: keyctl.o $(LIB_DEPENDENCY)
|
||||
$(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils
|
||||
|
||||
-request-key: request-key.o $(DEVELLIB)
|
||||
+request-key: request-key.o $(LIB_DEPENDENCY)
|
||||
$(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils
|
||||
|
||||
-key.dns_resolver: key.dns_resolver.o $(DEVELLIB)
|
||||
+key.dns_resolver: key.dns_resolver.o $(LIB_DEPENDENCY)
|
||||
$(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils -lresolv
|
||||
|
||||
###############################################################################
|
||||
@@ -158,10 +164,12 @@
|
||||
ifeq ($(NO_ARLIB),0)
|
||||
$(INSTALL) -D -m 0644 $(ARLIB) $(DESTDIR)$(USRLIBDIR)/$(ARLIB)
|
||||
endif
|
||||
+ifeq ($(NO_SOLIB),0)
|
||||
$(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
|
||||
$(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
|
||||
mkdir -p $(DESTDIR)$(USRLIBDIR)
|
||||
$(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
|
||||
+endif
|
||||
$(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl
|
||||
$(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key
|
||||
$(INSTALL) -D request-key-debug.sh $(DESTDIR)$(SHAREDIR)/request-key-debug.sh
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libevdev"
|
||||
PKG_VERSION="1.5.5"
|
||||
PKG_VERSION="1.5.7"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.freedesktop.org/wiki/Software/libevdev/"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libusb"
|
||||
PKG_VERSION="1.0.20"
|
||||
PKG_VERSION="1.0.21"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="LGPLv2.1"
|
||||
PKG_SITE="http://libusb.info/"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pciutils"
|
||||
PKG_VERSION="3.5.2"
|
||||
PKG_VERSION="3.5.4"
|
||||
PKG_ARCH="x86_64"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://mj.ucw.cz/pciutils.shtml"
|
||||
|
||||
@ -36,7 +36,6 @@ UTILLINUX_CONFIG_DEFAULT="--disable-gtk-doc \
|
||||
--enable-tls \
|
||||
--disable-all-programs \
|
||||
--enable-chsh-only-listed \
|
||||
--enable-libmount-force-mountinfo \
|
||||
--disable-bash-completion \
|
||||
--disable-colors-default \
|
||||
--disable-pylibmount \
|
||||
@ -51,7 +50,6 @@ UTILLINUX_CONFIG_DEFAULT="--disable-gtk-doc \
|
||||
--without-ncurses \
|
||||
--without-readline \
|
||||
--without-slang \
|
||||
--without-termcap \
|
||||
--without-tinfo \
|
||||
--without-utempter \
|
||||
--without-util \
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
# with 1.0.0 repeat delay is broken. test on upgrade
|
||||
|
||||
PKG_NAME="v4l-utils"
|
||||
PKG_VERSION="1.12.2"
|
||||
PKG_VERSION="1.12.3"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://linuxtv.org/"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="hdparm"
|
||||
PKG_VERSION="9.49"
|
||||
PKG_VERSION="9.52"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="BSD"
|
||||
PKG_SITE="http://sourceforge.net/projects/hdparm/"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="newt"
|
||||
PKG_VERSION="0.52.19"
|
||||
PKG_VERSION="0.52.20"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://pagure.io/newt"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="qemu"
|
||||
PKG_VERSION="2.7.0"
|
||||
PKG_VERSION="2.8.1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://wiki.qemu.org"
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
# there: http://forum.xbmc.org/showthread.php?tid=177557
|
||||
|
||||
PKG_NAME="curl"
|
||||
PKG_VERSION="7.53.1"
|
||||
PKG_VERSION="7.54.0"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="MIT"
|
||||
PKG_SITE="http://curl.haxx.se"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libmicrohttpd"
|
||||
PKG_VERSION="0.9.52"
|
||||
PKG_VERSION="0.9.54"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="LGPLv2.1"
|
||||
PKG_SITE="http://www.gnu.org/software/libmicrohttpd/"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xkbcomp"
|
||||
PKG_VERSION="1.3.1"
|
||||
PKG_VERSION="1.4.0"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://www.X.org"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xkeyboard-config"
|
||||
PKG_VERSION="2.19"
|
||||
PKG_VERSION="2.20"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://www.X.org"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xf86-input-libinput"
|
||||
PKG_VERSION="0.25.0"
|
||||
PKG_VERSION="0.25.1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.freedesktop.org/wiki/Software/libinput/"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libXi"
|
||||
PKG_VERSION="1.7.8"
|
||||
PKG_VERSION="1.7.9"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://www.x.org/"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libpciaccess"
|
||||
PKG_VERSION="0.13.4"
|
||||
PKG_VERSION="0.13.5"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://freedesktop.org"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="presentproto"
|
||||
PKG_VERSION="1.0"
|
||||
PKG_VERSION="1.1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://www.X.org"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="util-macros"
|
||||
PKG_VERSION="1.19.0"
|
||||
PKG_VERSION="1.19.1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://www.X.org"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user