summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/e2fsprogs/Makefile11
-rw-r--r--package/e2fsprogs/patches/patch-e2fsck_Makefile_in11
-rw-r--r--package/liblzo/Makefile4
-rw-r--r--package/lvm/Makefile4
-rw-r--r--package/lvm/patches/patch-lib_commands_toolcontext_c74
-rw-r--r--package/lz4/Makefile14
-rw-r--r--package/lz4/patches/patch-lib_Makefile11
-rw-r--r--package/lz4/patches/patch-programs_Makefile20
-rw-r--r--package/openssh/Makefile4
-rw-r--r--package/openvpn/Makefile15
-rw-r--r--package/samba/Makefile4
-rw-r--r--package/samba/patches/patch-lib_replace_wscript11
-rw-r--r--package/u-boot/Makefile4
-rw-r--r--package/u-boot/patches/patch-include_configs_clearfog_h20
14 files changed, 34 insertions, 173 deletions
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 692c8ded8..f7ca2fd35 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= e2fsprogs
-PKG_VERSION:= 1.43.3
+PKG_VERSION:= 1.43.4
PKG_RELEASE:= 1
-PKG_HASH:= 744ca4e9a8e6c943601b2744d1ae658e5f37d35b5ea5b1dea86985320bd87f37
+PKG_HASH:= 54b3f21123a531a6a536b9cdcc21344b0122a72790dbe4dacc98e64db25e4a24
PKG_DESCR:= ext2/3/4 filesystem utilities
PKG_SECTION:= sys/fs
PKG_BUILDDEP:= util-linux
@@ -27,9 +27,9 @@ PKGSD_LIBCOM_ERR:= common error library
PKGSC_LIBCOM_ERR:= libs/misc
PKGSD_LIBSS:= subsystem command parsing library
PKGSC_LIBSS:= libs/misc
-PKGSD_E2FSCK_STATIC:= Static build of e2fsck
+PKGSD_E2FSCK_STATIC:= static build of e2fsck
PKGSC_E2FSCK_STATIC:= sys/fs
-PKGSD_TUNE2FS_STATIC:= Static build of tune2fs
+PKGSD_TUNE2FS_STATIC:= static build of tune2fs
PKGSC_TUNE2FS_STATIC:= sys/fs
PKGSD_RESIZE2FS:= ext2/3/4 resize utility
PKGSC_RESIZE2FS:= sys/fs
@@ -76,8 +76,7 @@ CONFIGURE_ARGS+= --disable-rpath \
--disable-defrag \
--disable-libblkid \
--disable-libuuid \
- --disable-debugfs \
- --enable-verbose-makecmds
+ --disable-debugfs
TARGET_CFLAGS+= $(TARGET_CPPFLAGS) -I$(STAGING_TARGET_DIR)/usr/include
MAKE_FLAGS+= BUILD_CC="$(HOST_CC)" \
BUILD_CFLAGS="$(HOST_CFLAGS) $(HOST_CPPFLAGS) -I$(WRKSRC)/lib -I." \
diff --git a/package/e2fsprogs/patches/patch-e2fsck_Makefile_in b/package/e2fsprogs/patches/patch-e2fsck_Makefile_in
deleted file mode 100644
index 8e1efb15e..000000000
--- a/package/e2fsprogs/patches/patch-e2fsck_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- e2fsprogs-1.43.2.orig/e2fsck/Makefile.in 2016-06-07 07:01:19.000000000 +0200
-+++ e2fsprogs-1.43.2/e2fsck/Makefile.in 2016-09-19 13:19:14.000000000 +0200
-@@ -115,7 +115,7 @@ e2fsck: $(OBJS) $(DEPLIBS)
-
- e2fsck.static: $(OBJS) $(STATIC_DEPLIBS)
- $(E) " LD $@"
-- $(Q) $(LD) $(LDFLAGS_STATIC) -o e2fsck.static $(OBJS) $(STATIC_LIBS)
-+ $(LD) $(LDFLAGS_STATIC) -o e2fsck.static $(OBJS) $(STATIC_LIBS)
-
- e2fsck.profiled: $(OBJS) $(PROFILED_DEPLIBS)
- $(E) " LD $@"
diff --git a/package/liblzo/Makefile b/package/liblzo/Makefile
index 54b258bc3..0d148db73 100644
--- a/package/liblzo/Makefile
+++ b/package/liblzo/Makefile
@@ -4,9 +4,9 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= lzo
-PKG_VERSION:= 2.08
+PKG_VERSION:= 2.10
PKG_RELEASE:= 1
-PKG_HASH:= ac1b3e4dee46febe9fd28737eb7f5692d3232ef1a01da10444394c3d47536614
+PKG_HASH:= c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072
PKG_DESCR:= real-time data compression library
PKG_SECTION:= libs/comp
PKG_URL:= http://www.oberhumer.com/opensource/lzo
diff --git a/package/lvm/Makefile b/package/lvm/Makefile
index 8a63931b8..a2f63f7d4 100644
--- a/package/lvm/Makefile
+++ b/package/lvm/Makefile
@@ -4,9 +4,9 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= lvm
-PKG_VERSION:= 2.02.155
+PKG_VERSION:= 2.02.168
PKG_RELEASE:= 1
-PKG_HASH:= e8e6ede6034e45d432e5ccdfd60632f7e71c59bb6a7270a5990f4101841b156e
+PKG_HASH:= 23a3d1cddd41b3ef51812ebf83e9fa491f502fe74130d4263be327a91914660d
PKG_DESCR:= logical volume management
PKG_SECTION:= sys/fs
PKG_DEPENDS:= libdevmapper libncurses
diff --git a/package/lvm/patches/patch-lib_commands_toolcontext_c b/package/lvm/patches/patch-lib_commands_toolcontext_c
deleted file mode 100644
index 7a4bbd7cd..000000000
--- a/package/lvm/patches/patch-lib_commands_toolcontext_c
+++ /dev/null
@@ -1,74 +0,0 @@
---- LVM2.2.02.114.orig/lib/commands/toolcontext.c 2014-11-29 00:07:42.000000000 +0100
-+++ LVM2.2.02.114/lib/commands/toolcontext.c 2015-02-28 09:27:09.000000000 +0100
-@@ -1433,6 +1433,8 @@ struct cmd_context *create_toolcontext(u
- {
- struct cmd_context *cmd;
- FILE *new_stream;
-+ FILE *stdin_stream = stdin;
-+ FILE *stdout_stream = stdout;
- int flags;
-
- #ifdef M_MMAP_MAX
-@@ -1482,10 +1484,10 @@ struct cmd_context *create_toolcontext(u
- if (is_valid_fd(STDIN_FILENO) &&
- ((flags = fcntl(STDIN_FILENO, F_GETFL)) > 0) &&
- (flags & O_ACCMODE) != O_WRONLY) {
-- if (!_reopen_stream(stdin, STDIN_FILENO, "r", "stdin", &new_stream))
-+ if (!_reopen_stream(stdin_stream, STDIN_FILENO, "r", "stdin", &new_stream))
- goto_out;
-- stdin = new_stream;
-- if (setvbuf(stdin, cmd->linebuffer, _IOLBF, linebuffer_size)) {
-+ stdin_stream = new_stream;
-+ if (setvbuf(stdin_stream, cmd->linebuffer, _IOLBF, linebuffer_size)) {
- log_sys_error("setvbuf", "");
- goto out;
- }
-@@ -1494,10 +1496,10 @@ struct cmd_context *create_toolcontext(u
- if (is_valid_fd(STDOUT_FILENO) &&
- ((flags = fcntl(STDOUT_FILENO, F_GETFL)) > 0) &&
- (flags & O_ACCMODE) != O_RDONLY) {
-- if (!_reopen_stream(stdout, STDOUT_FILENO, "w", "stdout", &new_stream))
-+ if (!_reopen_stream(stdout_stream, STDOUT_FILENO, "w", "stdout", &new_stream))
- goto_out;
-- stdout = new_stream;
-- if (setvbuf(stdout, cmd->linebuffer + linebuffer_size,
-+ stdout_stream = new_stream;
-+ if (setvbuf(stdout_stream, cmd->linebuffer + linebuffer_size,
- _IOLBF, linebuffer_size)) {
- log_sys_error("setvbuf", "");
- goto out;
-@@ -1805,6 +1807,8 @@ void destroy_toolcontext(struct cmd_cont
- {
- struct dm_config_tree *cft_cmdline;
- FILE *new_stream;
-+ FILE *stdin_stream = stdin;
-+ FILE *stdout_stream = stdout;
- int flags;
-
- if (cmd->dump_filter && cmd->filter && cmd->filter->dump &&
-@@ -1840,9 +1844,9 @@ void destroy_toolcontext(struct cmd_cont
- if (is_valid_fd(STDIN_FILENO) &&
- ((flags = fcntl(STDIN_FILENO, F_GETFL)) > 0) &&
- (flags & O_ACCMODE) != O_WRONLY) {
-- if (_reopen_stream(stdin, STDIN_FILENO, "r", "stdin", &new_stream)) {
-- stdin = new_stream;
-- setlinebuf(stdin);
-+ if (_reopen_stream(stdin_stream, STDIN_FILENO, "r", "stdin", &new_stream)) {
-+ stdin_stream = new_stream;
-+ setlinebuf(stdin_stream);
- } else
- cmd->linebuffer = NULL; /* Leave buffer in place (deliberate leak) */
- }
-@@ -1850,9 +1854,9 @@ void destroy_toolcontext(struct cmd_cont
- if (is_valid_fd(STDOUT_FILENO) &&
- ((flags = fcntl(STDOUT_FILENO, F_GETFL)) > 0) &&
- (flags & O_ACCMODE) != O_RDONLY) {
-- if (_reopen_stream(stdout, STDOUT_FILENO, "w", "stdout", &new_stream)) {
-- stdout = new_stream;
-- setlinebuf(stdout);
-+ if (_reopen_stream(stdout_stream, STDOUT_FILENO, "w", "stdout", &new_stream)) {
-+ stdout_stream = new_stream;
-+ setlinebuf(stdout_stream);
- } else
- cmd->linebuffer = NULL; /* Leave buffer in place (deliberate leak) */
- }
diff --git a/package/lz4/Makefile b/package/lz4/Makefile
index 712fed62b..e26116eee 100644
--- a/package/lz4/Makefile
+++ b/package/lz4/Makefile
@@ -4,20 +4,18 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= lz4
-PKG_VERSION:= 131
+PKG_VERSION:= 1.7.5
PKG_RELEASE:= 1
-PKG_HASH:= 9d4d00614d6b9dec3114b33d1224b6262b99ace24434c53487a0c8fd0b18cfed
+PKG_HASH:= 0190cacd63022ccb86f44fa5041dc6c3804407ad61550ca21c382827319e7e7e
PKG_DESCR:= compression utility
PKG_SECTION:= app/archive
PKG_DEPENDS:= liblz4
-PKG_URL:= https://code.google.com/p/lz4/
-PKG_SITES:= https://github.com/Cyan4973/lz4/archive/
+PKG_URL:= http://lz4.github.io/lz4/
+PKG_SITES:= https://github.com/lz4/lz4/archive/
PKG_OPTS:= dev
PKG_LIBNAME:= liblz4
-PKG_OPTS:= dev
-DISTFILES:= r${PKG_VERSION}.tar.gz
-WRKDIST= ${WRKDIR}/${PKG_NAME}-r${PKG_VERSION}
+DISTFILES:= v$(PKG_VERSION).tar.gz
PKG_SUBPKGS:= LZ4 LIBLZ4
PKGSD_LIBLZ4:= lz4 compression library
@@ -32,6 +30,8 @@ $(eval $(call PKG_template,LIBLZ4,liblz4,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_L
HOST_STYLE:= manual
CONFIG_STYLE:= manual
+XAKE_FLAGS+= PREFIX=/usr
+HOST_XAKE_FLAGS+= PREFIX=/usr
host-build:
(cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
diff --git a/package/lz4/patches/patch-lib_Makefile b/package/lz4/patches/patch-lib_Makefile
deleted file mode 100644
index 168b1870c..000000000
--- a/package/lz4/patches/patch-lib_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lz4-r131.orig/lib/Makefile 2015-06-29 11:48:37.000000000 +0200
-+++ lz4-r131/lib/Makefile 2016-09-24 02:53:43.222879939 +0200
-@@ -38,7 +38,7 @@ LIBVER_PATCH=`sed -n '/define LZ4_VERSIO
- LIBVER=$(LIBVER_MAJOR).$(LIBVER_MINOR).$(LIBVER_PATCH)
-
- DESTDIR?=
--PREFIX ?= /usr/local
-+PREFIX ?= /usr
- CFLAGS ?= -O3
- CFLAGS += -I. -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Wcast-qual -Wstrict-prototypes -pedantic -DXXH_NAMESPACE=LZ4_
-
diff --git a/package/lz4/patches/patch-programs_Makefile b/package/lz4/patches/patch-programs_Makefile
deleted file mode 100644
index ce43646da..000000000
--- a/package/lz4/patches/patch-programs_Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- lz4-r131.orig/programs/Makefile 2015-06-29 11:48:37.000000000 +0200
-+++ lz4-r131/programs/Makefile 2016-09-24 02:52:44.112577985 +0200
-@@ -37,7 +37,7 @@
- RELEASE?= r131
-
- DESTDIR?=
--PREFIX ?= /usr/local
-+PREFIX ?= /usr
- CFLAGS ?= -O3
- CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -pedantic -DLZ4_VERSION=\"$(RELEASE)\"
- FLAGS := -I../lib $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
-@@ -70,7 +70,7 @@ m32: lz4c32 fullbench32 fuzzer32 framete
-
- bins: lz4 lz4c fullbench fuzzer frametest datagen
-
--all: bins m32
-+all: bins
-
- lz4: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4frame.c $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c
- $(CC) $(FLAGS) $^ -o $@$(EXT)
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index ef98a0ca6..c47f36e66 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -4,9 +4,9 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= openssh
-PKG_VERSION:= 7.4p1
+PKG_VERSION:= 7.5p1
PKG_RELEASE:= 1
-PKG_HASH:= 1b1fc4a14e2024293181924ed24872e6f2e06293f3e8926a376b8aec481f19d1
+PKG_HASH:= 9846e3c5fab9f0547400b4d2c017992f914222b3fd1f8eee6c7dc6bc5e59f9f0
PKG_DESCR:= secure shell implementation
PKG_SECTION:= net/security
PKG_BUILDDEP:= zlib libressl
diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile
index c7efaf1f5..e3a89e1b8 100644
--- a/package/openvpn/Makefile
+++ b/package/openvpn/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= openvpn
-PKG_VERSION:= 2.4.0
+PKG_VERSION:= 2.4.1
PKG_RELEASE:= 1
-PKG_HASH:= 6f23ba49a1dbeb658f49c7ae17d9ea979de6d92c7357de3d55cd4525e1b2f87e
+PKG_HASH:= fde9e22c6df7a335d2d58c6a4d5967be76df173c766a5c51ece57fd044c76ee5
PKG_DESCR:= vpn solution using ssl/tls
PKG_DEPENDS:= libressl
PKG_BUILDDEP:= libressl
@@ -15,10 +15,13 @@ PKG_SECTION:= net/security
PKG_URL:= http://openvpn.net/
PKG_SITES:= http://swupdate.openvpn.org/community/releases/
-PKG_FLAVOURS_OPENVPN:= WITH_LZO WITH_MANAGEMENT WITH_HTTPPROXY WITH_SOCKS WITH_SMALL
+PKG_FLAVOURS_OPENVPN:= WITH_LZO WITH_LZ4 WITH_MANAGEMENT WITH_HTTPPROXY WITH_SOCKS WITH_SMALL
PKGFD_WITH_LZO:= enable lzo compression support
PKGFS_WITH_LZO:= liblzo
PKGFB_WITH_LZO:= liblzo
+PKGFD_WITH_LZ4:= enable lz4 compression support
+PKGFS_WITH_LZ4:= liblz4
+PKGFB_WITH_LZ4:= lz4
PKGFD_WITH_MANAGEMENT:= enable management server support
PKGFD_WITH_HTTPPROXY:= enable http proxy support
PKGFD_WITH_SOCKS:= enable socks proxy support
@@ -30,6 +33,12 @@ $(eval $(call PKG_template,OPENVPN,openvpn,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D
CONFIGURE_ENV+= ac_cv_lib_nsl_inet_ntoa=no
+ifneq ($(ADK_PACKAGE_OPENVPN_WITH_LZ4),)
+CONFIGURE_ARGS+= --enable-lz4
+else
+CONFIGURE_ARGS+= --disable-lz4
+endif
+
ifneq ($(ADK_PACKAGE_OPENVPN_WITH_LZO),)
CONFIGURE_ARGS+= --enable-lzo
else
diff --git a/package/samba/Makefile b/package/samba/Makefile
index e1167faad..14bf63b92 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= samba
-PKG_VERSION:= 4.5.4
+PKG_VERSION:= 4.5.6
PKG_RELEASE:= 1
-PKG_HASH:= 1800d10ea14cabef67c83cc56a0f37f4f30ba5df218b3a1e7c874069a08c0f40
+PKG_HASH:= 0d8ff81ef034344d09c9614fae7a2ad19cf7b175eb080e8548aa7783040ade70
PKG_DESCR:= file and print server
PKG_SECTION:= net/fs
PKG_DEPENDS:= libuuid libpopt libgnutls libtirpc
diff --git a/package/samba/patches/patch-lib_replace_wscript b/package/samba/patches/patch-lib_replace_wscript
deleted file mode 100644
index a24dc099e..000000000
--- a/package/samba/patches/patch-lib_replace_wscript
+++ /dev/null
@@ -1,11 +0,0 @@
---- samba-4.2.1.orig/lib/replace/wscript 2015-04-15 20:00:13.000000000 +0200
-+++ samba-4.2.1/lib/replace/wscript 2015-04-26 10:41:27.000000000 +0200
-@@ -66,8 +66,6 @@ def configure(conf):
- conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h')
- conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h')
-
-- conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H')
--
- conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h')
- conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h')
- conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h')
diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile
index 6025ccb92..c9bcee7c0 100644
--- a/package/u-boot/Makefile
+++ b/package/u-boot/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= u-boot
-PKG_VERSION:= 2017.01
+PKG_VERSION:= 2017.03
PKG_RELEASE:= 1
-PKG_HASH:= 6c425175f93a4bcf2ec9faf5658ef279633dbd7856a293d95bd1ff516528ecf2
+PKG_HASH:= f54baf3f9325bf444c7905f3a5b6f83680edb1e6e1a4d5f8a5ad80abe885113f
PKG_DESCR:= portable bootloader
PKG_SECTION:= base/boot
HOST_BUILDDEP:= libressl-host dtc-host
diff --git a/package/u-boot/patches/patch-include_configs_clearfog_h b/package/u-boot/patches/patch-include_configs_clearfog_h
deleted file mode 100644
index ba8b83a55..000000000
--- a/package/u-boot/patches/patch-include_configs_clearfog_h
+++ /dev/null
@@ -1,20 +0,0 @@
---- u-boot-2016.09.orig/include/configs/clearfog.h 2016-09-12 16:05:51.000000000 +0200
-+++ u-boot-2016.09/include/configs/clearfog.h 2016-11-08 05:49:59.000000000 +0100
-@@ -7,6 +7,8 @@
- #ifndef _CONFIG_CLEARFOG_H
- #define _CONFIG_CLEARFOG_H
-
-+#include <config_distro_defaults.h>
-+
- /*
- * High Level Configuration Options (easy to change)
- */
-@@ -151,6 +153,8 @@
- #endif
- #endif
-
-+#include <config_distro_bootcmd.h>
-+
- /*
- * mv-common.h should be defined after CMD configs since it used them
- * to enable certain macros
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 06:58:42 +0000