diff --git a/utils/procps-ng/Makefile b/utils/procps-ng/Makefile index 0fad39b9d7..2ded481039 100644 --- a/utils/procps-ng/Makefile +++ b/utils/procps-ng/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=procps-ng -PKG_VERSION:=3.3.16 -PKG_RELEASE:=3 +PKG_VERSION:=4.0.4 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@SF/procps-ng -PKG_HASH:=925eacd65dedcf9c98eb94e8978bbfb63f5de37294cc1047d81462ed477a20af +PKG_HASH:=22870d6feb2478adb617ce4f09a787addaf2d260c5a8aa7b17d889a962c5e42e PKG_MAINTAINER:= PKG_LICENSE:=GPL-2.0-or-later @@ -94,7 +94,7 @@ MAKE_FLAGS += \ define Package/procps-ng/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libprocps.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libproc2.so* $(1)/usr/lib/ endef define Build/InstallDev diff --git a/utils/procps-ng/patches/100-no-tests-docs.patch b/utils/procps-ng/patches/100-no-tests-docs.patch index b863fba3de..d9dd2292eb 100644 --- a/utils/procps-ng/patches/100-no-tests-docs.patch +++ b/utils/procps-ng/patches/100-no-tests-docs.patch @@ -1,26 +1,26 @@ --- a/Makefile.am +++ b/Makefile.am -@@ -14,10 +14,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ +@@ -18,10 +18,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = \ -- include \ -- man-po \ +- local \ +- po-man \ - po \ - testsuite -+ include ++ local - AM_CFLAGS = -Iproc - LDADD = ./proc/libprocps.la $(CYGWINFLAGS) + AM_CFLAGS = -Ilibrary/include + LDADD = ./library/libproc2.la $(CYGWINFLAGS) --- a/configure.ac +++ b/configure.ac -@@ -298,8 +298,5 @@ AC_CHECK_FUNCS([__fpending alarm atexit +@@ -421,8 +421,5 @@ AC_CHECK_FUNCS([__fpending alarm atexit AC_CONFIG_FILES([Makefile - include/Makefile -- man-po/Makefile + local/Makefile +- po-man/Makefile - po/Makefile.in -- proc/libprocps.pc +- library/libproc2.pc - testsuite/Makefile]) -+ proc/libprocps.pc]) ++ library/libproc2.pc]) AC_OUTPUT