aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/meson/Makefile4
-rw-r--r--devel/meson/meson.mk1
-rw-r--r--devel/meson/src/openwrt-cross.txt.in8
-rw-r--r--devel/meson/src/openwrt-native.txt.in2
-rw-r--r--libs/libcap-ng/Makefile4
-rw-r--r--libs/libpam/Makefile4
-rw-r--r--libs/libpam/patches/010-crypt.patch35
-rw-r--r--libs/libpam/patches/020-fgetpwent_r.patch110
-rw-r--r--libs/libusb-compat/Makefile59
-rw-r--r--libs/nghttp2/Makefile9
-rw-r--r--libs/oniguruma/Makefile13
-rw-r--r--net/curl/Makefile6
-rw-r--r--net/curl/patches/100-configure-fix-pkg-config-detecting-wolfssl.patch31
-rw-r--r--net/curl/patches/200-no_docs_tests.patch4
-rw-r--r--net/mtr/Makefile7
-rw-r--r--utils/fio/Makefile4
-rw-r--r--utils/hdparm/Makefile11
-rw-r--r--utils/hdparm/patches/010-cflags.patch (renamed from utils/hdparm/patches/010-ldflags.patch)4
18 files changed, 101 insertions, 215 deletions
diff --git a/devel/meson/Makefile b/devel/meson/Makefile
index 6a26da73b..68b8093c3 100644
--- a/devel/meson/Makefile
+++ b/devel/meson/Makefile
@@ -1,11 +1,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=meson
-PKG_VERSION:=0.55.3
+PKG_VERSION:=0.56.0
PKG_RELEASE:=1
PYPI_NAME:=meson
-PKG_HASH:=6bed2a25a128bbabe97cf40f63165ebe800e4fcb46db8ab7ef5c2b5789f092a5
+PKG_HASH:=291dd38ff1cd55fcfca8fc985181dd39be0d3e5826e5f0013bf867be40117213
PKG_MAINTAINER:=Andre Heider <a.heider@gmail.com>
PKG_LICENSE:=Apache-2.0
diff --git a/devel/meson/meson.mk b/devel/meson/meson.mk
index b3364a19e..b855e267d 100644
--- a/devel/meson/meson.mk
+++ b/devel/meson/meson.mk
@@ -76,7 +76,6 @@ define Meson/CreateCrossFile
-e "s|@AR@|$(TARGET_AR)|" \
-e "s|@STRIP@|$(TARGET_CROSS)strip|" \
-e "s|@NM@|$(TARGET_NM)|" \
- -e "s|@LD@|$(TARGET_CROSS)ld|" \
-e "s|@PKGCONFIG@|$(PKG_CONFIG)|" \
-e "s|@CFLAGS@|$(foreach FLAG,$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS),'$(FLAG)',)|" \
-e "s|@CXXFLAGS@|$(foreach FLAG,$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS),'$(FLAG)',)|" \
diff --git a/devel/meson/src/openwrt-cross.txt.in b/devel/meson/src/openwrt-cross.txt.in
index f8c2db9dc..32e4ca48d 100644
--- a/devel/meson/src/openwrt-cross.txt.in
+++ b/devel/meson/src/openwrt-cross.txt.in
@@ -4,15 +4,13 @@ cpp = [@CXX@]
ar = '@AR@'
strip = '@STRIP@'
nm = '@NM@'
-ld = '@LD@'
pkgconfig = '@PKGCONFIG@'
-[properties]
+[built-in options]
c_args = [@CFLAGS@]
c_link_args = [@LDFLAGS@]
cpp_args = [@CXXFLAGS@]
cpp_link_args = [@LDFLAGS@]
-needs_exe_wrapper = true
[host_machine]
system = 'linux'
@@ -20,6 +18,8 @@ cpu_family = '@ARCH@'
cpu = '@CPU@'
endian = '@ENDIAN@'
+[properties]
+needs_exe_wrapper = true
+
[paths]
prefix = '/usr'
-libdir = 'lib'
diff --git a/devel/meson/src/openwrt-native.txt.in b/devel/meson/src/openwrt-native.txt.in
index e5d5a2617..601edfbc4 100644
--- a/devel/meson/src/openwrt-native.txt.in
+++ b/devel/meson/src/openwrt-native.txt.in
@@ -3,7 +3,7 @@ c = [@CC@]
cpp = [@CXX@]
pkgconfig = '@PKGCONFIG@'
-[properties]
+[built-in options]
c_args = [@CFLAGS@]
c_link_args = [@LDFLAGS@]
cpp_args = [@CXXFLAGS@]
diff --git a/libs/libcap-ng/Makefile b/libs/libcap-ng/Makefile
index 8931d4968..a1026f5e1 100644
--- a/libs/libcap-ng/Makefile
+++ b/libs/libcap-ng/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libcap-ng
-PKG_VERSION:=0.8
+PKG_VERSION:=0.8.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://people.redhat.com/sgrubb/libcap-ng
-PKG_HASH:=f14d23b60ae1465b032e4e8cbd4112006572c69a6017d55d5d3c6aad622a9e21
+PKG_HASH:=f06b17aaca029e245c9a26c698c6cc8a1cf42b58483d93e94ee02b478bdc1055
PKG_MAINTAINER:=Lucian CRISTIAN <lucian.cristian@gmail.com>
PKG_LICENSE:=GPL-2.0-or-later LGPL-2.1-or-later
diff --git a/libs/libpam/Makefile b/libs/libpam/Makefile
index d5a51b2b1..719ab826c 100644
--- a/libs/libpam/Makefile
+++ b/libs/libpam/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libpam
-PKG_VERSION:=1.4.0
+PKG_VERSION:=1.5.0
PKG_RELEASE:=1
PKG_SOURCE:=Linux-PAM-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/linux-pam/linux-pam/releases/download/v$(PKG_VERSION)
-PKG_HASH:=cd6d928c51e64139be3bdb38692c68183a509b83d4f2c221024ccd4bcddfd034
+PKG_HASH:=02d39854b508fae9dc713f7733bbcdadbe17b50de965aedddd65bcb6cc7852c8
PKG_BUILD_DIR:=$(BUILD_DIR)/Linux-PAM-$(PKG_VERSION)
PKG_MAINTAINER:=Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
diff --git a/libs/libpam/patches/010-crypt.patch b/libs/libpam/patches/010-crypt.patch
deleted file mode 100644
index 705e80991..000000000
--- a/libs/libpam/patches/010-crypt.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From aef363c7e8e942224e6cffc4398366c6e5d31749 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Thu, 11 Jun 2020 00:04:32 +0200
-Subject: [PATCH] configure.ac: fix build failure when crypt() does not require
- libcrypt
-
-Since commit 522246d20e4cd92fadc2d760228cb7e78cbeb4c5, the build fails
-if "none required" is returned by AC_SEARCH_LIBS for libcrypt.
-
-Resolves: https://github.com/linux-pam/linux-pam/pull/235
-Fixes: http://autobuild.buildroot.org/results/92b3dd7c984d2b843ac9aacacd69eec99f28743e
-Fixes: v1.4.0~228 ("Use cached 'crypt' library result correctly")
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- configure.ac | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index ea08a7a3..c1862ea7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -428,7 +428,11 @@ AS_IF([test "x$ac_cv_header_xcrypt_h" = "xyes"],
- [crypt_libs="crypt"])
-
- BACKUP_LIBS=$LIBS
--AC_SEARCH_LIBS([crypt],[$crypt_libs], LIBCRYPT="${ac_cv_search_crypt}", LIBCRYPT="")
-+AC_SEARCH_LIBS([crypt],[$crypt_libs])
-+case "$ac_cv_search_crypt" in
-+ -l*) LIBCRYPT="$ac_cv_search_crypt" ;;
-+ *) LIBCRYPT="" ;;
-+esac
- AC_CHECK_FUNCS(crypt_r crypt_gensalt_r)
- LIBS=$BACKUP_LIBS
- AC_SUBST(LIBCRYPT)
diff --git a/libs/libpam/patches/020-fgetpwent_r.patch b/libs/libpam/patches/020-fgetpwent_r.patch
deleted file mode 100644
index cc8042997..000000000
--- a/libs/libpam/patches/020-fgetpwent_r.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- a/modules/pam_faillock/pam_faillock.c
-+++ b/modules/pam_faillock/pam_faillock.c
-@@ -348,42 +348,81 @@ set_conf_opt(pam_handle_t *pamh, struct options *opts, const char *name, const c
- static int
- check_local_user (pam_handle_t *pamh, const char *user)
- {
-- struct passwd pw, *pwp;
-- char buf[16384];
-- int found = 0;
-+ int rc;
-+ size_t user_len;
- FILE *fp;
-- int errn;
-+ char line[BUFSIZ];
-
-- fp = fopen(PATH_PASSWD, "r");
-- if (fp == NULL) {
-- pam_syslog(pamh, LOG_ERR, "unable to open %s: %m",
-- PATH_PASSWD);
-- return -1;
-+ /* Validate the user name. */
-+ if ((user_len = strlen(user)) == 0) {
-+ pam_syslog(pamh, LOG_NOTICE, "user name is not valid");
-+ return PAM_SERVICE_ERR;
-+ }
-+
-+ if (user_len > sizeof(line) - sizeof(":")) {
-+ pam_syslog(pamh, LOG_NOTICE, "user name is too long");
-+ return PAM_SERVICE_ERR;
-+ }
-+
-+ if (strchr(user, ':') != NULL) {
-+ /*
-+ * "root:x" is not a local user name even if the passwd file
-+ * contains a line starting with "root:x:".
-+ */
-+ return PAM_PERM_DENIED;
- }
-
-- for (;;) {
-- errn = fgetpwent_r(fp, &pw, buf, sizeof (buf), &pwp);
-- if (errn == ERANGE) {
-- pam_syslog(pamh, LOG_WARNING, "%s contains very long lines; corrupted?",
-- PATH_PASSWD);
-+ /* Open the passwd file. */
-+ FILE *file_name = "/etc/passwd";
-+ if ((fp = fopen(file_name, "r")) == NULL) {
-+ pam_syslog(pamh, LOG_ERR, "error opening %s: %m", file_name);
-+ return PAM_SERVICE_ERR;
-+ }
-+
-+ /*
-+ * Scan the file using fgets() instead of fgetpwent_r() because
-+ * the latter is not flexible enough in handling long lines
-+ * in passwd files.
-+ */
-+ rc = PAM_PERM_DENIED;
-+ while (fgets(line, sizeof(line), fp) != NULL) {
-+ size_t line_len;
-+ const char *str;
-+
-+ /*
-+ * Does this line start with the user name
-+ * followed by a colon?
-+ */
-+ if (strncmp(user, line, user_len) == 0 &&
-+ line[user_len] == ':') {
-+ rc = PAM_SUCCESS;
- break;
- }
-- if (errn != 0)
-- break;
-- if (strcmp(pwp->pw_name, user) == 0) {
-- found = 1;
-+ /* Has a newline been read? */
-+ line_len = strlen(line);
-+ if (line_len < sizeof(line) - 1 ||
-+ line[line_len - 1] == '\n') {
-+ /* Yes, continue with the next line. */
-+ continue;
-+ }
-+
-+ /* No, read till the end of this line first. */
-+ while ((str = fgets(line, sizeof(line), fp)) != NULL) {
-+ line_len = strlen(line);
-+ if (line_len == 0 ||
-+ line[line_len - 1] == '\n') {
-+ break;
-+ }
-+ }
-+ if (str == NULL) {
-+ /* fgets returned NULL, we are done. */
- break;
- }
-+ /* Continue with the next line. */
- }
-
-- fclose (fp);
--
-- if (errn != 0 && errn != ENOENT) {
-- pam_syslog(pamh, LOG_ERR, "unable to enumerate local accounts: %m");
-- return -1;
-- } else {
-- return found;
-- }
-+ fclose(fp);
-+ return rc;
- }
-
- static int
diff --git a/libs/libusb-compat/Makefile b/libs/libusb-compat/Makefile
new file mode 100644
index 000000000..0868f6eab
--- /dev/null
+++ b/libs/libusb-compat/Makefile
@@ -0,0 +1,59 @@
+#
+# Copyright (C) 2010-2015 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libusb-compat
+PKG_VERSION:=0.1.7
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=https://github.com/libusb/libusb-compat-0.1/releases/download/v$(PKG_VERSION)
+PKG_HASH:=8259f8d5b084fe43c47823a939e955e0ba21942b8d112266c39d228cc14764d6
+
+PKG_MAINTAINER:= Felix Fietkau <nbd@nbd.name>
+PKG_LICENSE:=LGPL-2.1-or-later
+PKG_LICENSE_FILES:=COPYING
+
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libusb-compat
+ SECTION:=libs
+ CATEGORY:=Libraries
+ TITLE:=libusb-0.1 compatibility library
+ DEPENDS:=+libusb-1.0
+ URL:=http://libusb.wiki.sourceforge.net/
+ ABI_VERSION:=4
+endef
+
+define Package/libusb-compat/description
+ libusb is a C library that gives applications easy access to USB devices on
+ many different operating systems.
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+define Build/InstallDev
+ $(INSTALL_DIR) $(2)/usr/bin
+ $(CP) $(PKG_INSTALL_DIR)/usr/bin/libusb-config $(2)/usr/bin/
+ $(INSTALL_DIR) $(1)/usr/include
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/usb.h $(1)/usr/include/
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libusb* $(1)/usr/lib/
+ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libusb.pc $(1)/usr/lib/pkgconfig/
+endef
+
+define Package/libusb-compat/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libusb-0.1.so.$(ABI_VERSION)* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libusb-compat))
diff --git a/libs/nghttp2/Makefile b/libs/nghttp2/Makefile
index 2cef96dd7..4b6370e9c 100644
--- a/libs/nghttp2/Makefile
+++ b/libs/nghttp2/Makefile
@@ -1,16 +1,18 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=nghttp2
-PKG_VERSION:=1.41.0
+PKG_VERSION:=1.42.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/nghttp2/nghttp2/releases/download/v$(PKG_VERSION)
-PKG_HASH:=abc25b8dc601f5b3fefe084ce50fcbdc63e3385621bee0cbfa7b57f9ec3e67c2
+PKG_HASH:=c5a7f09020f31247d0d1609078a75efadeccb7e5b86fc2e4389189b1b431fe63
+PKG_MAINTAINER:=Hans Dedecker <dedeckeh@gmail.com>
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=COPYING
-CMAKE_INSTALL:=1
+
+PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
@@ -19,7 +21,6 @@ define Package/libnghttp2
SECTION:=libs
CATEGORY:=Libraries
TITLE:=Library implementing the framing layer of HTTP/2
- MAINTAINER:=Hans Dedecker <dedeckeh@gmail.com>
ABI_VERSION:=14
endef
diff --git a/libs/oniguruma/Makefile b/libs/oniguruma/Makefile
index 62b325ee8..4ff3a662f 100644
--- a/libs/oniguruma/Makefile
+++ b/libs/oniguruma/Makefile
@@ -5,25 +5,24 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=oniguruma
-PKG_VERSION:=6.9.5_rev1
-PKG_RELEASE:=3
+PKG_VERSION:=6.9.6
+PKG_RELEASE:=1
PKG_SOURCE:=onig-v$(subst _,-,$(PKG_VERSION)).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/kkos/oniguruma/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=e0c2212102fa4146c43b6c4f2f7727a84fd055cc2109c293d64298cef0c372b5
+PKG_HASH:=aec9f6902ad8b7bb53b2c55d04686ea75da89a06694836b0362cb206578dfe89
PKG_MAINTAINER:=Eneas U de Queiroz <cotequeiroz@gmail.com>
PKG_LICENSE:=BSD-2-Clause
PKG_LICENSE_FILES:=COPYING
PKG_CPE_ID:=cpe:/a:oniguruma_project:oniguruma
-PKG_INSTALL:=1
PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
-CONFIGURE_ARGS += --enable-posix-api
-
define Package/oniguruma
SECTION:=libs
CATEGORY:=Libraries
@@ -40,6 +39,8 @@ define Package/oniguruma/description
Character encoding can be specified per regular expression object.
endef
+CONFIGURE_ARGS += --enable-posix-api
+
define Package/oniguruma/install
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libonig.so.$(ABI_VERSION) $(1)/usr/lib/
diff --git a/net/curl/Makefile b/net/curl/Makefile
index e8c2cc103..55e660364 100644
--- a/net/curl/Makefile
+++ b/net/curl/Makefile
@@ -8,15 +8,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=curl
-PKG_VERSION:=7.72.0
-PKG_RELEASE:=2
+PKG_VERSION:=7.73.0
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://dl.uxnr.de/mirror/curl/ \
https://curl.mirror.anstey.ca/ \
https://curl.askapache.com/download/ \
https://curl.haxx.se/download/
-PKG_HASH:=0ded0808c4d85f2ee0db86980ae610cc9d165e9ca9da466196cc73c346513713
+PKG_HASH:=7c4c7ca4ea88abe00fea4740dcf81075c031b1d0bb23aff2d5efde20a3c2408a
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=COPYING
diff --git a/net/curl/patches/100-configure-fix-pkg-config-detecting-wolfssl.patch b/net/curl/patches/100-configure-fix-pkg-config-detecting-wolfssl.patch
deleted file mode 100644
index a77e5c69d..000000000
--- a/net/curl/patches/100-configure-fix-pkg-config-detecting-wolfssl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 510d98157f21dee5793c4e975fde3317b6139267 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Mon, 24 Aug 2020 16:28:34 +0200
-Subject: [PATCH] configure: fix pkg-config detecting wolfssl
-
-When amending the include path with "/wolfssl", this now properly strips
-off all whitespace from the path variable! Previously this would lead to
-pkg-config builds creating bad command lines.
-
-Closes #5848
----
- configure.ac | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -2474,8 +2474,12 @@ if test -z "$ssl_backends" -o "x$OPT_WOL
- AC_DEFINE(HAVE_WOLFSSL_DES_ECB_ENCRYPT, 1,
- [if you have wolfSSL_DES_ecb_encrypt])
- if test -n "$addcflags"; then
-- CPPFLAGS="$addcflags/wolfssl $CPPFLAGS"
-- AC_MSG_NOTICE([Add $addcflags/wolfssl to CPPFLAGS])
-+ dnl use a for loop to strip off whitespace
-+ for f in $addcflags; do
-+ CPPFLAGS="$f/wolfssl $CPPFLAGS"
-+ AC_MSG_NOTICE([Add $f/wolfssl to CPPFLAGS])
-+ break
-+ done
- else
- dnl user didn't give a path, so guess/hope they installed wolfssl
- dnl headers to system default location
diff --git a/net/curl/patches/200-no_docs_tests.patch b/net/curl/patches/200-no_docs_tests.patch
index b5f92b58c..0ffcb491e 100644
--- a/net/curl/patches/200-no_docs_tests.patch
+++ b/net/curl/patches/200-no_docs_tests.patch
@@ -1,6 +1,6 @@
--- a/Makefile.am
+++ b/Makefile.am
-@@ -192,7 +192,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP)
+@@ -195,7 +195,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP)
bin_SCRIPTS = curl-config
SUBDIRS = lib src
@@ -9,7 +9,7 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libcurl.pc
-@@ -303,8 +303,8 @@ cygwinbin:
+@@ -306,8 +306,8 @@ cygwinbin:
# We extend the standard install with a custom hook:
install-data-hook:
(cd include && $(MAKE) install)
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index b77a7db27..67b1e1b18 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=mtr
-PKG_VERSION:=0.93
+PKG_VERSION:=0.94
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=ftp://ftp.bitwizard.nl/mtr
-PKG_HASH:=229c673d637bd7dbb96471623785a47e85da0b1944978200c949994c1e6af10d
+PKG_SOURCE_URL:=https://www.bitwizard.nl/mtr/files
+PKG_HASH:=cb5ffc803d136f7136b49b950abbc2a27d2a5ba62195de5b70f8ef9f0fcf2791
PKG_MAINTAINER:=Jonathan McCrohan <jmccrohan@gmail.com>
PKG_LICENSE:=GPL-2.0-or-later
@@ -49,6 +49,7 @@ TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
CONFIGURE_ARGS += \
--without-gtk \
+ --without-jansson \
$(call autoconf_bool,CONFIG_IPV6,ipv6)
CONFIGURE_VARS += ac_cv_lib_cap_cap_set_proc=no
diff --git a/utils/fio/Makefile b/utils/fio/Makefile
index d7b6c96b2..e9c284b16 100644
--- a/utils/fio/Makefile
+++ b/utils/fio/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fio
-PKG_VERSION:=3.20
+PKG_VERSION:=3.24
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://brick.kernel.dk/snaps
-PKG_HASH:=87a539ecebce3d8281ff9c653e9978302f91c72534273e85ef37a980ac5398d7
+PKG_HASH:=b66fe29ad0047c347e9c21090ff1b37a882fa1041bcc3a6f8501d47db15f5063
PKG_MAINTAINER:=
PKG_LICENSE:=GPL-2.0-or-later
diff --git a/utils/hdparm/Makefile b/utils/hdparm/Makefile
index 212dd08ea..f2fa28a0f 100644
--- a/utils/hdparm/Makefile
+++ b/utils/hdparm/Makefile
@@ -8,17 +8,20 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=hdparm
-PKG_VERSION:=9.58
-PKG_RELEASE:=2
+PKG_VERSION:=9.60
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_HASH:=9ae78e883f3ce071d32ee0f1b9a2845a634fc4dd94a434e653fdbef551c5e10f
+PKG_HASH:=8397739c73e44d5ab96c4aef28fa9c0147276d53a1b5657ce04c4565cf6635cc
PKG_MAINTAINER:=
PKG_LICENSE:=BSD-Style Open Source License
PKG_LICENSE_FILES:=LICENSE.TXT
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+
include $(INCLUDE_DIR)/package.mk
define Package/hdparm
@@ -35,7 +38,7 @@ endef
define Package/hdparm/install
$(INSTALL_DIR) $(1)/sbin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/sbin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/hdparm $(1)/sbin
endef
$(eval $(call BuildPackage,hdparm))
diff --git a/utils/hdparm/patches/010-ldflags.patch b/utils/hdparm/patches/010-cflags.patch
index e4778748d..f8b59b87c 100644
--- a/utils/hdparm/patches/010-ldflags.patch
+++ b/utils/hdparm/patches/010-cflags.patch
@@ -1,13 +1,11 @@
--- a/Makefile
+++ b/Makefile
-@@ -13,9 +13,8 @@ oldmandir = $(manprefix)/man
+@@ -13,7 +13,7 @@ oldmandir = $(manprefix)/man
CC ?= gcc
STRIP ?= strip
-CFLAGS := -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
+CFLAGS ?= -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
--LDFLAGS = -s
- #LDFLAGS = -s -static
INSTALL = install
INSTALL_DATA = $(INSTALL) -m 644
Powered by cgit, Themed by Ted Yin.