diff options
| -rw-r--r-- | package/fribidi/Makefile | 8 | ||||
| -rw-r--r-- | package/kbd/Makefile | 6 | ||||
| -rw-r--r-- | package/libcdio/Makefile | 10 | ||||
| -rw-r--r-- | package/libssh/Makefile | 7 | ||||
| -rw-r--r-- | package/libssh/patches/patch-CompilerChecks_cmake | 32 | ||||
| -rw-r--r-- | package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake | 14 | ||||
| -rw-r--r-- | package/libssh/patches/patch-include_libssh_libssh_h | 8 | ||||
| -rw-r--r-- | package/libx265/Makefile | 6 | ||||
| -rw-r--r-- | package/strace/Makefile | 6 | ||||
| -rw-r--r-- | package/util-linux/Makefile | 2 | 
10 files changed, 58 insertions, 41 deletions
| diff --git a/package/fribidi/Makefile b/package/fribidi/Makefile index 7a1834230..bef3bb69f 100644 --- a/package/fribidi/Makefile +++ b/package/fribidi/Makefile @@ -4,17 +4,15 @@  include $(ADK_TOPDIR)/rules.mk  PKG_NAME:=		fribidi -PKG_VERSION:=		0.19.7 +PKG_VERSION:=		1.0.9  PKG_RELEASE:=		1 -PKG_HASH:=		08222a6212bbc2276a2d55c3bf370109ae4a35b689acbc66571ad2a670595a8e +PKG_HASH:=		c5e47ea9026fb60da1944da9888b4e0a18854a0e2410bbfe7ad90a054d36e0c7  PKG_DESCR:=		unicode bidirectional algorithm  PKG_SECTION:=		libs/misc  PKG_URL:=		http://www.fribidi.org/ -PKG_SITES:=		http://fribidi.org/download/ +PKG_SITES:=		https://github.com/fribidi/fribidi/releases/download/v1.0.9/  PKG_OPTS:=		dev -DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2 -  include $(ADK_TOPDIR)/mk/package.mk  $(eval $(call PKG_template,FRIBIDI,fribidi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) diff --git a/package/kbd/Makefile b/package/kbd/Makefile index 72f6e0eb1..7c0b62efa 100644 --- a/package/kbd/Makefile +++ b/package/kbd/Makefile @@ -4,15 +4,15 @@  include $(ADK_TOPDIR)/rules.mk  PKG_NAME:=		kbd -PKG_VERSION:=		2.0.4 +PKG_VERSION:=		2.4.0  PKG_RELEASE:=		1 -PKG_HASH:=		5fd90af6beb225a9bb9b9fb414c090fba53c9a55793e172f508cd43652e59a88 +PKG_HASH:=		55f0740458cfd3a84e775e50d7e8b92dc01846db1edad8e2411ccc293ece9b9f  PKG_DESCR:=		keyboard and font utilities  PKG_SECTION:=		sys/hw  PKG_DEPENDS:=		libcheck  PKG_BUILDDEP:=		flex-host bison-host check  PKG_URL:=		http://kbd-project.org/ -PKG_SITES:=		http://kbd-project.org/download/ +PKG_SITES:=		https://mirrors.edge.kernel.org/pub/linux/utils/kbd/  PKG_CFLINE_KBD:=	default y if ADK_TARGET_WITH_INPUT diff --git a/package/libcdio/Makefile b/package/libcdio/Makefile index c5d43c600..fca3550aa 100644 --- a/package/libcdio/Makefile +++ b/package/libcdio/Makefile @@ -4,16 +4,16 @@  include $(ADK_TOPDIR)/rules.mk  PKG_NAME:=		libcdio -PKG_VERSION:=		0.92 -PKG_RELEASE:=		2 -PKG_HASH:=		3336bf352aff43b5023e41a6d23525172a3b4ee433c467bd0fab5b8becb33fad +PKG_VERSION:=		2.1.0 +PKG_RELEASE:=		1 +PKG_HASH:=		8550e9589dbd594bfac93b81ecf129b1dc9d0d51e90f9696f1b2f9b2af32712b  PKG_DESCR:=		library for cd-rom and cd image access  PKG_SECTION:=		libs/misc  PKG_URL:=		http://www.gnu.org/software/libcdio -PKG_SITES:=		${MASTER_SITE_GNU:=libcdio/} +PKG_SITES:=		http://ftp.gnu.org/gnu/libcdio/  PKG_OPTS:=		dev -DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz +DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2  include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/libssh/Makefile b/package/libssh/Makefile index d586d6617..231bae2c4 100644 --- a/package/libssh/Makefile +++ b/package/libssh/Makefile @@ -4,15 +4,15 @@  include $(ADK_TOPDIR)/rules.mk  PKG_NAME:=		libssh -PKG_VERSION:=		0.7.5 +PKG_VERSION:=		0.9.5  PKG_RELEASE:=		1 -PKG_HASH:=		54e86dd5dc20e5367e58f3caab337ce37675f863f80df85b6b1614966a337095 +PKG_HASH:=		acffef2da98e761fc1fd9c4fddde0f3af60ab44c4f5af05cd1b2d60a3fa08718  PKG_DESCR:=		secure shell library  PKG_SECTION:=		libs/crypto  PKG_DEPENDS:=		zlib libressl  PKG_BUILDDEP:=		cmake-host zlib libressl  PKG_URL:=		http://www.libssh.org/ -PKG_SITES:=		https://red.libssh.org/attachments/download/218/ +PKG_SITES:=		https://www.libssh.org/files/0.9/  PKG_OPTS:=		dev  include $(ADK_TOPDIR)/mk/package.mk @@ -26,6 +26,7 @@ CMAKE_FLAGS:=		-DOPENSSL_INCLUDE_DIRS='$(STAGING_TARGET_DIR)/usr/include' \  			-DZLIB_INCLUDE_DIR='$(STAGING_TARGET_DIR)/usr/include' \  			-DZLIB_LIBRARY='$(STAGING_TARGET_DIR)/usr/lib' \  			-DWITH_GSSAPI=off \ +			-DWITH_STACK_PROTECTOR=off \  			-DWITH_EXAMPLES=off  libssh-install: diff --git a/package/libssh/patches/patch-CompilerChecks_cmake b/package/libssh/patches/patch-CompilerChecks_cmake new file mode 100644 index 000000000..8f5d3d805 --- /dev/null +++ b/package/libssh/patches/patch-CompilerChecks_cmake @@ -0,0 +1,32 @@ +--- libssh-0.9.5.orig/CompilerChecks.cmake	2020-05-07 13:51:36.000000000 +0200 ++++ libssh-0.9.5/CompilerChecks.cmake	2021-03-01 23:53:39.370794233 +0100 +@@ -67,29 +67,6 @@ if (UNIX) +         endif() +     endif() +  +-    check_c_compiler_flag_ssp("-fstack-protector-strong" WITH_STACK_PROTECTOR_STRONG) +-    if (WITH_STACK_PROTECTOR_STRONG) +-        list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-protector-strong") +-        # This is needed as Solaris has a seperate libssp +-        if (SOLARIS) +-            list(APPEND SUPPORTED_LINKER_FLAGS "-fstack-protector-strong") +-        endif() +-    else (WITH_STACK_PROTECTOR_STRONG) +-        check_c_compiler_flag_ssp("-fstack-protector" WITH_STACK_PROTECTOR) +-        if (WITH_STACK_PROTECTOR) +-            list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-protector") +-            # This is needed as Solaris has a seperate libssp +-            if (SOLARIS) +-                list(APPEND SUPPORTED_LINKER_FLAGS "-fstack-protector") +-            endif() +-        endif() +-    endif (WITH_STACK_PROTECTOR_STRONG) +- +-    check_c_compiler_flag_ssp("-fstack-clash-protection" WITH_STACK_CLASH_PROTECTION) +-    if (WITH_STACK_CLASH_PROTECTION) +-        list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-clash-protection") +-    endif() +- +     if (PICKY_DEVELOPER) +         add_c_compiler_flag("-Wno-error=deprecated-declarations" SUPPORTED_COMPILER_FLAGS) +         add_c_compiler_flag("-Wno-error=tautological-compare" SUPPORTED_COMPILER_FLAGS) diff --git a/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake b/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake deleted file mode 100644 index b8e077b94..000000000 --- a/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake +++ /dev/null @@ -1,14 +0,0 @@ ---- libssh-0.6.3.orig/cmake/Modules/DefineCompilerFlags.cmake	2014-02-06 10:20:57.000000000 +0100 -+++ libssh-0.6.3/cmake/Modules/DefineCompilerFlags.cmake	2014-03-14 09:10:56.621673326 +0100 -@@ -21,11 +21,6 @@ if (UNIX AND NOT WIN32) -             set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") -         endif (WITH_FPIC) -  --        check_c_compiler_flag_ssp("-fstack-protector" WITH_STACK_PROTECTOR) --        if (WITH_STACK_PROTECTOR) --            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector") --        endif (WITH_STACK_PROTECTOR) -- -         if (CMAKE_BUILD_TYPE) -             string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER) -             if (CMAKE_BUILD_TYPE_LOWER MATCHES (release|relwithdebinfo|minsizerel)) diff --git a/package/libssh/patches/patch-include_libssh_libssh_h b/package/libssh/patches/patch-include_libssh_libssh_h index dc60939bf..39310ba16 100644 --- a/package/libssh/patches/patch-include_libssh_libssh_h +++ b/package/libssh/patches/patch-include_libssh_libssh_h @@ -1,10 +1,10 @@ ---- libssh-0.6.3.orig/include/libssh/libssh.h	2014-03-04 13:20:48.000000000 +0100 -+++ libssh-0.6.3/include/libssh/libssh.h	2014-03-14 09:07:03.304701842 +0100 -@@ -56,6 +56,7 @@ +--- libssh-0.9.5.orig/include/libssh/libssh.h	2020-09-10 14:43:02.000000000 +0200 ++++ libssh-0.9.5/include/libssh/libssh.h	2021-03-01 23:52:22.358253014 +0100 +@@ -58,6 +58,7 @@     typedef unsigned long long uint64_t;     typedef int mode_t;   #else /* _MSC_VER */  +  #include <sys/types.h>     #include <unistd.h>     #include <inttypes.h> - #endif /* _MSC_VER */ +   #include <sys/types.h> diff --git a/package/libx265/Makefile b/package/libx265/Makefile index 616bacd8f..bde8655cd 100644 --- a/package/libx265/Makefile +++ b/package/libx265/Makefile @@ -4,14 +4,14 @@  include $(ADK_TOPDIR)/rules.mk  PKG_NAME:=		libx265 -PKG_VERSION:=		2.7 -PKG_HASH:=		d5e75fa62ffe6ed49e691f8eb8ab8c1634ffcc0725dd553c6fdb4d5443b494a2 +PKG_VERSION:=		3.2 +PKG_HASH:=		364d79bcd56116a9e070fdeb1d9d2aaef1a786b4970163fb56ff0991a183133b  PKG_RELEASE:=		1  PKG_DESCR:=		h265 encoding library  PKG_SECTION:=		libs/video  PKG_BUILDDEP:=		cmake-host  PKG_URL:=		http://x265.org -PKG_SITES:=		https://bitbucket.org/multicoreware/x265/downloads/ +PKG_SITES:=		http://ftp.videolan.org/pub/videolan/x265/  PKG_OPTS:=		dev  DISTFILES:=		x265_${PKG_VERSION}.tar.gz diff --git a/package/strace/Makefile b/package/strace/Makefile index da20445ef..b386f634f 100644 --- a/package/strace/Makefile +++ b/package/strace/Makefile @@ -4,9 +4,9 @@  include ${ADK_TOPDIR}/rules.mk  PKG_NAME:=		strace -PKG_VERSION:=		5.9 +PKG_VERSION:=		5.11  PKG_RELEASE:=		1 -PKG_HASH:=		39473eb8465546c3e940fb663cb381eba5613160c7302794699d194a4d5d66d9 +PKG_HASH:=		ffe340b10c145a0f85734271e9cce56457d23f21a7ea5931ab32f8cf4e793879  PKG_DESCR:=		system call trace program  PKG_SECTION:=		app/debug  PKG_URL:=		https://strace.io @@ -38,6 +38,6 @@ INSTALL_STYLE:=		manual  do-install:  	${INSTALL_DIR} ${IDIR_STRACE}/usr/sbin -	${INSTALL_BIN} ${WRKBUILD}/strace ${IDIR_STRACE}/usr/sbin +	${INSTALL_BIN} ${WRKBUILD}/src/strace ${IDIR_STRACE}/usr/sbin  include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 5f7b8feaa..f69ca613c 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -110,7 +110,7 @@ TARGET_CFLAGS+=		-fPIC  FAKE_FLAGS+=		INSTALLSUID="install -m 4755"  HOST_CONFIGURE_ARGS+=	--enable-libblkid \  			--enable-libuuid \ -			--disable-libmount \ +			--enable-libmount \  			--disable-all-programs \  			--disable-use-tty-group  ifneq ($(OS_FOR_BUILD),Darwin) | 
