From 519b6385714d205c252e9b787148de06e6abb33e Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 17 Sep 2018 17:10:14 -0700 Subject: [PATCH] procps-ng: Update to 3.3.15 Switch from locally generated git tarball to official one. Signed-off-by: Rosen Penev --- utils/procps-ng/Makefile | 17 +++++++---------- utils/procps-ng/patches/100-no-tests-docs.patch | 4 ++-- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/utils/procps-ng/Makefile b/utils/procps-ng/Makefile index f302c2693b..3f38928259 100644 --- a/utils/procps-ng/Makefile +++ b/utils/procps-ng/Makefile @@ -8,19 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=procps-ng -PKG_VERSION:=3.3.11 -PKG_RELEASE:=4 -PKG_LICENSE:=GPL-2.0 -PKG_LICENSE_FILES:=COPYING COPYING.LIB +PKG_VERSION:=3.3.15 +PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://gitlab.com/procps-ng/procps.git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=8a198e3eafbde0b627e9992b41d26e6762e4f8c7 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_MIRROR_HASH:=60da7bd78e834112494e4019998c9de8d61f747eab244ef3c42cadc7fd0958cc +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=@SF/procps-ng +PKG_HASH:=10bd744ffcb3de2d591d2f6acf1a54a7ba070fdcc432a855931a5057149f0465 PKG_MAINTAINER:=Gergely Kiss +PKG_LICENSE:=GPL-2.0 +PKG_LICENSE_FILES:=COPYING COPYING.LIB PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 diff --git a/utils/procps-ng/patches/100-no-tests-docs.patch b/utils/procps-ng/patches/100-no-tests-docs.patch index 50ef7fbf67..3ae60ace8c 100644 --- a/utils/procps-ng/patches/100-no-tests-docs.patch +++ b/utils/procps-ng/patches/100-no-tests-docs.patch @@ -1,6 +1,6 @@ --- a/Makefile.am +++ b/Makefile.am -@@ -13,10 +13,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ +@@ -14,10 +14,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = \ @@ -14,7 +14,7 @@ LDADD = ./proc/libprocps.la $(CYGWINFLAGS) --- a/configure.ac +++ b/configure.ac -@@ -256,8 +256,5 @@ AC_CHECK_FUNCS([__fpending alarm atexit +@@ -292,8 +292,5 @@ AC_CHECK_FUNCS([__fpending alarm atexit dup2 gethostname getpagesize gettimeofda AC_CONFIG_FILES([Makefile include/Makefile