From f830beb1b62f76d2a51a187efaee8d216f07a940 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 2 Sep 2020 15:25:02 -0700 Subject: [PATCH] moreutils: update to 0.64 Remove upstreamed patch. Fixed license information. Signed-off-by: Rosen Penev --- utils/moreutils/Makefile | 10 +++++----- utils/moreutils/patches/010-uclibc.patch | 11 ----------- 2 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 utils/moreutils/patches/010-uclibc.patch diff --git a/utils/moreutils/Makefile b/utils/moreutils/Makefile index 2f2326e75..bd81a734d 100644 --- a/utils/moreutils/Makefile +++ b/utils/moreutils/Makefile @@ -8,19 +8,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=moreutils -PKG_VERSION:=0.63 -PKG_RELEASE:=2 +PKG_VERSION:=0.64 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://git.kitenet.net/index.cgi/moreutils.git/snapshot -PKG_HASH:=4fc86d56a8a276a0cec71cdabda5ccca50c7a44a2a1ccd888476741d1ce6831d +PKG_HASH:=fed203542c5c2b55c3a41d21bca5bc627ec1f6d7313ed2f758c69798d65770ec PKG_MAINTAINER:=Nikil Mehta -PKG_LICENSE:=GPL-2.0 +PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING -PKG_BUILD_PARALLEL:=0 PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=0 include $(INCLUDE_DIR)/package.mk diff --git a/utils/moreutils/patches/010-uclibc.patch b/utils/moreutils/patches/010-uclibc.patch deleted file mode 100644 index 8fff106d0..000000000 --- a/utils/moreutils/patches/010-uclibc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/parallel.c -+++ b/parallel.c -@@ -241,7 +241,7 @@ pid_t create_pipe_child(int *fd, int orig_fd) - return pipe_child(fds[0], orig_fd); - } - --#if defined(__CYGWIN__) -+#if defined(__CYGWIN__) || defined(__UCLIBC__) - int getloadavg(double loadavg[], int nelem) { - int fd, n, elem; - char buf[128];