diff --git a/net/seafile-server/Makefile b/net/seafile-server/Makefile index f671a799f..ab6725713 100644 --- a/net/seafile-server/Makefile +++ b/net/seafile-server/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=seafile-server PKG_VERSION:=4.1.2 -PKG_RELEASE=$(PKG_SOURCE_VERSION)-2 +PKG_RELEASE=$(PKG_SOURCE_VERSION)-3 PKG_LICENSE:=GPL-3.0 PKG_SOURCE_PROTO:=git @@ -32,7 +32,7 @@ define Package/seafile-server DEPENDS:=+shadow-useradd +libarchive +libopenssl +glib2 +libsearpc +seafile-ccnet +seafile-seahub \ +sqlite3-cli +python-mysql +jansson +libevent2 +libevent2-openssl +zlib +libzdb +libsqlite3 \ +libmysqlclient +libpthread +libuuid \ - +bash +sudo +procps +procps-pkill $(ICONV_DEPENDS) + +bash +sudo +procps-ng +procps-ng-pkill $(ICONV_DEPENDS) EXTRA_DEPENDS:=seafile-ccnet (=4.1.2-a73109f09af4ecc49cdc4c57cdde51b38e15c31a), seafile-seahub (=4.1.2-3fb1288f920de03a4e2e6a06b60671ce98971742) endef diff --git a/utils/procps-ng/Makefile b/utils/procps-ng/Makefile new file mode 100644 index 000000000..f5e3cfb1b --- /dev/null +++ b/utils/procps-ng/Makefile @@ -0,0 +1,97 @@ +# +# Copyright (C) 2006-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:=procps-ng +PKG_VERSION:=3.3.11 +PKG_RELEASE:=1 +PKG_LICENSE:=GPL-2.0 +PKG_LICENSE_FILES:=COPYING COPYING.LIB + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://gitlab.com/procps-ng/procps.git +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=de985eced583f18df273146b110491b0f7404aab +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz + +PKG_BUILD_PARALLEL:=1 +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +CONFIGURE_ARGS += --enable-skill + +PROCPS_APPLETS := \ + free kill pgrep pkill pmap ps pwdx skill slabtop \ + snice tload top uptime vmstat w watch + +define Package/procps-ng/Default + SECTION:=utils + CATEGORY:=Utilities + DEPENDS:=+libncurses + TITLE:=procps-ng utilities + URL:=https://gitlab.com/procps-ng/procps + MAINTAINER:=Gergely Kiss +endef + +define Build/Configure + (cd $(PKG_BUILD_DIR); echo "$(PKG_VERSION)" > "$(PKG_BUILD_DIR)/.tarball-version"; ./autogen.sh ); + $(call Build/Configure/Default) +endef + +define Package/procps-ng + $(call Package/procps-ng/Default) + MENU:=1 +endef + +define Package/procps-ng/description + procps is a set of command line and full-screen utilities that provide information out of the pseudo-filesystem + most commonly located at /proc. This filesystem provides a simple interface to the kernel data structures. + The programs of procps generally concentrate on the structures that describe the processess running on the system. + + NOTE: some utilities provided by procps-ng packages (ps, uptime, kill, ...) are installed as busybox applets, by default. + Conflicting applets should be removed from the build to avoid file conflicts. +endef + +define GenPlugin + define Package/$(1) + $(call Package/procps-ng/Default) + DEPENDS:=procps-ng + TITLE:=Applet $(2) from the procps-ng package + DEFAULT:=y + endef + + define Package/$(1)/description + Installs the applet $(2). + endef +endef + +$(foreach a,$(PROCPS_APPLETS),$(eval $(call GenPlugin,procps-ng-$(a),$(a)))) + +MAKE_FLAGS += \ + CFLAGS="$(TARGET_CFLAGS)" \ + CPPFLAGS="$(TARGET_CPPFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS)" \ + +define Package/procps-ng/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libprocps.so* $(1)/usr/lib/ +endef + +define BuildPlugin + define Package/$(1)/install + $(INSTALL_DIR) $$(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(2) $$(1)/usr/bin/ + endef + + $$(eval $$(call BuildPackage,$(1))) +endef + +$(foreach a,$(PROCPS_APPLETS),$(eval $(call BuildPlugin,procps-ng-$(a),$(a)))) +$(eval $(call BuildPackage,procps-ng)) diff --git a/utils/procps/Makefile b/utils/procps/Makefile deleted file mode 100644 index 25d1ddbc8..000000000 --- a/utils/procps/Makefile +++ /dev/null @@ -1,86 +0,0 @@ -# -# Copyright (C) 2006-2014 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:=procps -PKG_VERSION:=3.2.8 -PKG_RELEASE:=1 -PKG_LICENSE:=GPL-2.0 -PKG_LICENSE_FILES:=COPYING COPYING.LIB - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://procps.sourceforge.net -PKG_MD5SUM:=9532714b6846013ca9898984ba4cd7e0 - -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk - -PROCPS_APPLETS := \ - ps free pgrep pkill pmap pwdx skill w \ - slabtop snice tload top vmstat watch - -define Package/procps/Default - SECTION:=utils - CATEGORY:=Utilities - DEPENDS:=+libncurses - TITLE:=proc utilities - URL:=http://procps.sourceforge.net/ - MAINTAINER:=Gergely Kiss -endef - -define Package/procps - $(call Package/procps/Default) - MENU:=1 -endef - -define Package/procps/description - procps is the package that has a bunch of small useful utilities that give - information about processes using the /proc filesystem. The package - includes the programs ps, top, vmstat, w, kill, free, slabtop, and skill. -endef - -define GenPlugin - define Package/$(1) - $(call Package/procps/Default) - DEPENDS:=procps - TITLE:=Applet $(2) from the procps package - DEFAULT:=y - endef - - define Package/$(1)/description - Installs the applet $(2). - endef -endef - -$(foreach a,$(PROCPS_APPLETS),$(eval $(call GenPlugin,procps-$(a),$(a)))) - -MAKE_FLAGS += \ - CFLAGS="$(TARGET_CFLAGS)" \ - CPPFLAGS="$(TARGET_CPPFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - -define Package/procps/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_BUILD_DIR)/proc/libproc-$(PKG_VERSION).so $(1)/usr/lib/ -endef - -AUXDIR_ps := "ps/" - -define BuildPlugin - define Package/$(1)/install - $(INSTALL_DIR) $$(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(AUXDIR_$(2))$(2) $$(1)/usr/bin/ - endef - - $$(eval $$(call BuildPackage,$(1))) -endef - -$(foreach a,$(PROCPS_APPLETS),$(eval $(call BuildPlugin,procps-$(a),$(a)))) -$(eval $(call BuildPackage,procps)) diff --git a/utils/procps/patches/010-make_fix.patch b/utils/procps/patches/010-make_fix.patch deleted file mode 100644 index 74b1d3cc6..000000000 --- a/utils/procps/patches/010-make_fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -174,7 +174,7 @@ INSTALL := $(BINFILES) $(MANFILES) - # want this rule first, use := on ALL, and ALL not filled in yet - all: do_all - ---include */module.mk -+-include proc/module.mk ps/module.mk - - do_all: $(ALL) - diff --git a/utils/procps/patches/020_hz_fix.patch b/utils/procps/patches/020_hz_fix.patch deleted file mode 100644 index 1954453a4..000000000 --- a/utils/procps/patches/020_hz_fix.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/proc/sysinfo.c -+++ b/proc/sysinfo.c -@@ -209,7 +209,12 @@ static int check_for_privs(void){ - return !!rc; - } - -+#if __GNUC__ < 4 || __GNUC_MINOR__ < 3 - static void init_libproc(void) __attribute__((constructor)); -+#else -+static void init_libproc(void) __attribute__((constructor(200))); -+#endif -+ - static void init_libproc(void){ - have_privs = check_for_privs(); - // ought to count CPUs in /proc/stat instead of relying ---- a/proc/version.c -+++ b/proc/version.c -@@ -33,7 +33,12 @@ void display_version(void) { - - int linux_version_code; - -+#if __GNUC__ < 4 || __GNUC_MINOR__ < 3 - static void init_Linux_version(void) __attribute__((constructor)); -+#else -+static void init_Linux_version(void) __attribute__((constructor(100))); -+#endif -+ - static void init_Linux_version(void) { - static struct utsname uts; - int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */ ---- a/proc/module.mk -+++ b/proc/module.mk -@@ -76,7 +76,7 @@ proc/$(ANAME): $(LIBOBJ) - - #proc/$(SONAME): proc/library.map - proc/$(SONAME): $(LIBOBJ) -- $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -shared -Wl,-soname,$(SONAME) -Wl,--version-script=proc/library.map -o $@ $^ -lc -+ $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -shared -Wl,-soname,$(SONAME) -Wl,--version-script=proc/library.map -o $@ $(sort $^) -lc - - - # AUTOMATIC DEPENDENCY GENERATION -- GCC AND GNUMAKE DEPENDENT diff --git a/utils/procps/patches/030-fix-string-problems.patch b/utils/procps/patches/030-fix-string-problems.patch deleted file mode 100644 index de3756bb4..000000000 --- a/utils/procps/patches/030-fix-string-problems.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/proc/sig.c -+++ b/proc/sig.c -@@ -214,7 +214,7 @@ void pretty_print_signals(void){ - while(++i <= number_of_signals){ - int n; - n = printf("%2d %s", i, signal_number_to_name(i)); -- if(i%7) printf(" \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + n); -+ if(i%7) printf("%s", " \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + n); - else printf("\n"); - } - if((i-1)%7) printf("\n"); diff --git a/utils/procps/patches/040-musl-compatibility.patch b/utils/procps/patches/040-musl-compatibility.patch deleted file mode 100644 index 71dc3f07e..000000000 --- a/utils/procps/patches/040-musl-compatibility.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6f2fd55ef7621fd7ab7897aee2c2651b6faf9e6a Mon Sep 17 00:00:00 2001 -From: Paul Barker -Date: Wed, 20 Aug 2014 11:56:11 +0200 -Subject: [PATCH] Fix musl build failure - -Include for PATH_MAX. - -Signed-off-by: Paul Barker - -Upstream-status: Pending ---- - proc/readproc.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/proc/readproc.c b/proc/readproc.c -index 4fad11d..c5b1869 100644 ---- a/proc/readproc.c -+++ b/proc/readproc.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - // sometimes it's easier to do this manually, w/o gcc helping - #ifdef PROF --- -1.9.1 -