From patchwork Sun Aug 15 20:38:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Roevens X-Patchwork-Id: 4630 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Gnq0h1xjVz3xHZ for ; Sun, 15 Aug 2021 20:39:48 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Gnq0g6BCxzyn; Sun, 15 Aug 2021 20:39:47 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Gnq0g5j5Gz2y2L; Sun, 15 Aug 2021 20:39:47 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Gnq0g0lshz2xbg for ; Sun, 15 Aug 2021 20:39:47 +0000 (UTC) Received: from knopi.disroot.org (knopi.disroot.org [178.21.23.139]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 4Gnq0f5JdRzQK for ; Sun, 15 Aug 2021 20:39:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 900C46342F for ; Sun, 15 Aug 2021 22:39:46 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with UTF8SMTP id izZTPRM1gVeu for ; Sun, 15 Aug 2021 22:39:45 +0200 (CEST) Received: from amaterasu.sicho.home ([192.168.0.1] helo=chojin.sicho.home) by filekeeper.sicho.home with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1mFMuD-0000y1-BH; Sun, 15 Aug 2021 22:38:53 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1629059965; bh=6RBGyneua6qrtKasUm2gA+4MqOf1ZgklsgqIej3yv3s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fbtOVBi6M4pqMLjvp+SqT3Ao+nBHFMJB/Jugunm4kaN4tuUX9UVI/esQQRAAOb8+v aMPDPqH/CYOjr2mD8mdiXLQgX+9pvpt64nAvjP5aEV7Ys3v5KqgRCCKuceYIBaS+Lj 7+13Mev+7BZU0pSB2OGSPyVydil+X2MKv6l6FAe1FA1nbeLA/FO0h18J05vH4OSZHg KycXFscU8DECAP2kqJrKZ4FXrmXzAHFvKjjpP7OKvXF8EuppLf0QP7s0wj0XYa6BuD cWNxRb9dHA4C5sFyIBeQViphF/+iH0QJDdnU3Uy/fOeDaNv/umphYjVEpRdfWEPhiJ y15kyDJ8oSKEA== From: Robin Roevens To: development@lists.ipfire.org Subject: [PATCH v2 1/2] buildprocess: Add extra metadata to meta-* files Date: Sun, 15 Aug 2021 22:38:45 +0200 Message-Id: <20210815203846.15956-2-robin.roevens@disroot.org> In-Reply-To: <20210815203846.15956-1-robin.roevens@disroot.org> References: <20210815203846.15956-1-robin.roevens@disroot.org> Mime-Version: 1.0 X-filekeeper-MailScanner-ID: 1mFMuD-0000y1-BH X-filekeeper-MailScanner: Found to be clean X-filekeeper-MailScanner-From: robin.roevens@disroot.org X-filekeeper-MailScanner-Watermark: 1629664739.47582@uS9ttI7e/pRx64fuofgQ1w ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1629059986; a=rsa-sha256; cv=none; b=MfE+hUIAzbhKGI6KGY/7626ouHZLPIyljzSXjqAbDbiKTHQAWnlGqFh7VUKkAP2a1Hleb7 EqwMU0/S1SpDKIbY0hZa3EyZqwV5iRWGpf54M0wEdEikbyNIBRYheZD38xWCLgobgA0y8o 9XNEe6Naovhx8JJgu66pPgHr/YGnwsVv01JluaQYEtGH/saEwgJjVcUPu9nvioYyDoopez IUtFlosU/8IrS+2xJ+63lvcYXHhyH89HVUudf7AjzbT171A4H5kEIvh+H1xNA2LbYki6fF oKrX6CXnM5+JLZrCQMyUOSkwEHmD/xIXZ/YZgaxx14Ld56df1/YBA9bZFadkiA== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=fbtOVBi6; spf=pass (mail01.ipfire.org: domain of robin.roevens@disroot.org designates 178.21.23.139 as permitted sender) smtp.mailfrom=robin.roevens@disroot.org; dmarc=pass (policy=quarantine) header.from=disroot.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1629059986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=wTZXObQhk5LwIFXumpa34s4fsFv44AgzlouEe9Rhe+E=; b=fbDm1Hw07MTIDjvVLu3jdl1xJEgw/ZceB/9kMWAxsFqzkmtM3LaGG37Cjvmbb58XHRqeGX ljw0tp7pJ8z6j/hRG2Cx/jyi4baKTduFmQ6NlXzkfXWWM/onZa7NYIHw9H46edPun/vpqh 5D92wiKb4p4R8Q8cKpCjeTuBQ/Lvr37019RjMPtFGMlH9uF6NWTOinMi4+iYKX6nOPt7ue ZbF+X7DKoQwO5r55JvguHsyWeIhBhYaM/r77I5lwizsO8pbGP7a2fb1S5NzF1iLyuAs3Rk 0eaTqgJeXrO+i4Bih/ANJqSlP1muYvZY+A/ejxEKzphLYyhu0Lb3K5PiGFMJAw== X-Rspamd-Queue-Id: 4Gnq0f5JdRzQK Authentication-Results: mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=fbtOVBi6; spf=pass (mail01.ipfire.org: domain of robin.roevens@disroot.org designates 178.21.23.139 as permitted sender) smtp.mailfrom=robin.roevens@disroot.org; dmarc=pass (policy=quarantine) header.from=disroot.org X-Rspamd-Server: mail01.haj.ipfire.org X-Spamd-Result: default: False [-2.52 / 11.00]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+a:c]; MV_CASE(0.50)[]; R_MISSING_CHARSET(2.50)[]; REPLY(-4.00)[]; BROKEN_CONTENT_TYPE(1.50)[]; IP_REPUTATION_HAM(-0.01)[asn: 50673(0.00), country: NL(-0.01), ip: 178.21.23.139(0.00)]; RCVD_COUNT_THREE(0.00)[4]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; DKIM_TRACE(0.00)[disroot.org:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[disroot.org,quarantine]; MX_GOOD(-0.01)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:50673, ipnet:178.21.23.0/24, country:NL]; BAYES_HAM(-3.00)[99.99%]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[disroot.org:s=mail]; FROM_HAS_DN(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[development@lists.ipfire.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MID_CONTAINS_FROM(1.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[178.21.23.139:from] X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" * Add a Summary and Services field to the meta-* addon files. * Add an INSTALL_INITSCRIPTS macro that takes a space seperated list of initscripts to install. * I kept the original INSTALL_INITSCRIPT as a method to install individual initscripts for backwards compatibility and possible corner cases. Signed-off-by: Robin Roevens --- lfs/Config | 11 ++++++++++- src/pakfire/meta | 2 ++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lfs/Config b/lfs/Config index a2d3cddc5..27b36e3c0 100644 --- a/lfs/Config +++ b/lfs/Config @@ -302,13 +302,16 @@ define PAK # Cleanup rm -rf $(DIR_TMP_PAK) - # Create meta file + # Escape SUMMARY variable and create meta file + summaryEscaped=$$(sed 's/[&/\]/\\&/g' <<< "$(SUMMARY)"); \ sed \ -e "s/NAME/$(PROG)/g" \ + -e "s/SUMMARY/$$summaryEscaped/g" \ -e "s/VER/$(VER)/g" \ -e "s/RELEASE/$(PAK_VER)/g" \ -e "s/DEPS/$(DEPS)/g" \ -e "s/SIZE/$$(stat --format=%s /install/packages/$(PROG)-$(VER)-$(PAK_VER).ipfire)/g" \ + -e "s/SERVICES/$(SERVICES)/g" \ < /usr/src/src/pakfire/meta > /install/packages/meta-$(PROG) endef @@ -316,6 +319,12 @@ define INSTALL_INITSCRIPT install -m 754 -v $(DIR_SRC)/src/initscripts/packages/$(1) /etc/rc.d/init.d/$(1) endef +define INSTALL_INITSCRIPTS + for initscript in $(1); do \ + $(call INSTALL_INITSCRIPT,$$initscript) || exit 1; \ + done +endef + ifeq "$(BUILD_ARCH)" "$(filter $(BUILD_ARCH),aarch64 riscv64)" define UPDATE_AUTOMAKE for i in $$(find $(DIR_APP) -name config.guess -o -name config.sub); do \ diff --git a/src/pakfire/meta b/src/pakfire/meta index d97b2a0fa..08e7d53fb 100644 --- a/src/pakfire/meta +++ b/src/pakfire/meta @@ -1,6 +1,8 @@ Name: NAME +Summary: SUMMARY ProgVersion: VER Release: RELEASE Size: SIZE Dependencies: DEPS File: NAME-VER-RELEASE.ipfire +Services: SERVICES From patchwork Sun Aug 15 20:38:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Roevens X-Patchwork-Id: 4631 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Gnq0m3LP8z3xHZ for ; Sun, 15 Aug 2021 20:39:52 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Gnq0l75Whz1yH; Sun, 15 Aug 2021 20:39:51 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Gnq0l6Z91z2y0p; Sun, 15 Aug 2021 20:39:51 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Gnq0l3bmrz2xbg for ; Sun, 15 Aug 2021 20:39:51 +0000 (UTC) Received: from knopi.disroot.org (knopi.disroot.org [178.21.23.139]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 4Gnq0l0Q7sz1Tx for ; Sun, 15 Aug 2021 20:39:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 9597A63363 for ; Sun, 15 Aug 2021 22:39:50 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with UTF8SMTP id 2dz-bu0pD8Pt for ; Sun, 15 Aug 2021 22:39:43 +0200 (CEST) Received: from amaterasu.sicho.home ([192.168.0.1] helo=chojin.sicho.home) by filekeeper.sicho.home with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1mFMuH-0000y1-7S; Sun, 15 Aug 2021 22:38:57 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1629059965; bh=hBKBMFVnLV8b/Ox6g8IscDGoINZ/Ap92vAv2P5psP9g=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=U04Ej5KtIggvj0h9ukkScpHjKnxIv/jP5mX3eEsmS1OGm6c4S9cRsKW4peKJBUgTH FctQzrwUGKsAFCwglty/PBCZpi+Qkq0bYaU2f4+QLWFWykiIlb9MqoEgQvMBBIbcOV Cd5LVuXgzcu/BVAZ3uWPcRkUJdce234j9gkv9NP2WFRBn3OzZ8GXK8Bi+uuvz+LwAZ FwFyg4tuw5FIEUajEOdxMExLy4eP+WGOmfM3AbbPJHnCp6XcX7Cp1dkzovH+nOrayA CCMfG6vPtMRorCdI5yX7VIl1BcRHB6uUEljhPk8clb66Nilwgr050oyAYnbMnRWJHB H0urki7ie1oHg== From: Robin Roevens To: development@lists.ipfire.org Subject: [PATCH v2 2/2] buildprocess: Add extra metadata to pak lfs files Date: Sun, 15 Aug 2021 22:38:46 +0200 Message-Id: <20210815203846.15956-3-robin.roevens@disroot.org> In-Reply-To: <20210815203846.15956-1-robin.roevens@disroot.org> References: <20210815203846.15956-1-robin.roevens@disroot.org> Mime-Version: 1.0 X-filekeeper-MailScanner-ID: 1mFMuH-0000y1-7S X-filekeeper-MailScanner: Found to be clean X-filekeeper-MailScanner-From: robin.roevens@disroot.org X-filekeeper-MailScanner-Watermark: 1629664739.89245@mAJYf8hqsj8qh/U5CLvWwQ ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1629059991; a=rsa-sha256; cv=none; b=TT4zNCbkj4mijABXvXJN5BzDunkilOEhFaKEz1XZ2V1vsrQJyqt5VNez4LQ6j1JXOnIQc5 saFvMf5j9/tvRjWBGNLEoo8a9ozFcKLPcK+uGBEdZZnd0mukwngcAk+wsQTHORvlAQb0tC rAQvkIhh0u3t4SoMYOr0KFCwjmy/eb6vLtOojzT7h8xwH4vjs+Rmo7VBWqTTmSAsj9sxWI QJPTWcW32ZNuHZ9wJw9YD5jdzlZ+jjsOdufFaBMa+62BrbWGOncJcrTvB7ipvCZobtywW2 G6lyYF3SHmNbTyTKRseWeq9V615P6Fs/SazQLz/O4XYCBO41+X3RohNcN1f2sg== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=U04Ej5Kt; spf=pass (mail01.ipfire.org: domain of robin.roevens@disroot.org designates 178.21.23.139 as permitted sender) smtp.mailfrom=robin.roevens@disroot.org; dmarc=pass (policy=quarantine) header.from=disroot.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1629059991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=q5uvH2HCgXjgzYE2T7mr9sLpHkrw2GHD8eL6RwLNnaw=; b=NdyejyI85kPwM0Ejn9LzSbWU1WQhtDdW5zKUoS7Ulmccgl6CyieepHei75EflS2jZa8FDz a0dKoWM2OvuYWS9HGzu8/c2uAtJoxSbYl3nrUwq2xBdiUW+5QGfHgwgTVRThO+eqjply8U h+zMi4X8sr2yBJ1K3Y2kOiKOnpIPvATIKZSXSLeJlm0S2dhq750jXYe3bt6SfWBkILcYN6 7MUIOkQdVy1lP7tJ7wtSABnAwZg0e6nov/NThJwzOhrO2K24dSJ34+ue9C1Sj3wfOo9wOC SZZbZjeQhcXrrYp2TjlcbwQRJ457BN35t2Y7sJuquncYrIsHqv0U+FzAl6yleg== X-Rspamd-Queue-Id: 4Gnq0l0Q7sz1Tx Authentication-Results: mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=U04Ej5Kt; spf=pass (mail01.ipfire.org: domain of robin.roevens@disroot.org designates 178.21.23.139 as permitted sender) smtp.mailfrom=robin.roevens@disroot.org; dmarc=pass (policy=quarantine) header.from=disroot.org X-Rspamd-Server: mail01.haj.ipfire.org X-Spamd-Result: default: False [0.48 / 11.00]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[disroot.org:s=mail]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+a:c]; MV_CASE(0.50)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[development@lists.ipfire.org]; REPLY(-4.00)[]; BROKEN_CONTENT_TYPE(1.50)[]; R_MISSING_CHARSET(2.50)[]; RCVD_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_SOME(0.00)[]; IP_REPUTATION_HAM(-0.01)[asn: 50673(0.00), country: NL(-0.01), ip: 178.21.23.139(0.00)]; DKIM_TRACE(0.00)[disroot.org:+]; RCPT_COUNT_TWO(0.00)[2]; MID_CONTAINS_FROM(1.00)[]; MX_GOOD(-0.01)[]; DMARC_POLICY_ALLOW(-0.50)[disroot.org,quarantine]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:50673, ipnet:178.21.23.0/24, country:NL]; RWL_MAILSPIKE_POSSIBLE(0.00)[178.21.23.139:from] X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" X-Spam: Yes * Add a Summary and Services field to all pak lfs files * Replace occurances of INSTALL_INITSCRIPT with new INSTALL_INITSCRIPTS macro in all pak lfs files. Signed-off-by: Robin Roevens --- lfs/7zip | 4 ++++ lfs/alac | 4 ++++ lfs/alsa | 5 ++++- lfs/amazon-ssm-agent | 6 +++++- lfs/apcupsd | 6 +++++- lfs/avahi | 6 +++++- lfs/aws-cli | 4 ++++ lfs/backup | 4 ++++ lfs/bacula | 6 +++++- lfs/bird | 6 +++++- lfs/borgbackup | 4 ++++ lfs/bwm-ng | 4 ++++ lfs/c-ares | 4 ++++ lfs/cifs-utils | 4 ++++ lfs/clamav | 6 +++++- lfs/client175 | 6 +++++- lfs/core-updates | 2 ++ lfs/cpufrequtils | 6 +++++- lfs/cups | 6 +++++- lfs/cups-filters | 4 ++++ lfs/cyrus-sasl | 6 +++++- lfs/dbus | 6 +++++- lfs/ddrescue | 5 +++++ lfs/dehydrated | 4 ++++ lfs/dnsdist | 6 +++++- lfs/ebtables | 4 ++++ lfs/elfutils | 4 ++++ lfs/elinks | 4 ++++ lfs/epson-inkjet-printer-escpr | 4 ++++ lfs/faad2 | 4 ++++ lfs/fetchmail | 6 +++++- lfs/ffmpeg | 4 ++++ lfs/fireperf | 6 ++++++ lfs/firmware-update | 4 ++++ lfs/flac | 4 ++++ lfs/flashrom | 4 ++++ lfs/foomatic | 4 ++++ lfs/fping | 4 ++++ lfs/freefont | 4 ++++ lfs/freeradius | 6 +++++- lfs/frr | 6 +++++- lfs/ghostscript | 4 ++++ lfs/git | 4 ++++ lfs/gnu-netcat | 4 ++++ lfs/gnump3d | 6 +++++- lfs/guardian | 6 +++++- lfs/gutenprint | 4 ++++ lfs/haproxy | 5 ++++- lfs/hostapd | 6 +++++- lfs/hplip | 4 ++++ lfs/htop | 4 ++++ lfs/icinga | 4 ++++ lfs/iftop | 4 ++++ lfs/igmpproxy | 4 ++++ lfs/intltool | 4 ++++ lfs/iotop | 5 +++++ lfs/iperf | 4 ++++ lfs/iperf3 | 4 ++++ lfs/iptraf-ng | 4 ++++ lfs/ipvsadm | 4 ++++ lfs/joe | 4 ++++ lfs/keepalived | 6 +++++- lfs/krb5 | 4 ++++ lfs/lame | 4 ++++ lfs/lcdproc | 6 +++++- lfs/libassuan | 4 ++++ lfs/libcdada | 4 ++++ lfs/libdaemon | 6 ++++++ lfs/libexif | 4 ++++ lfs/libid3tag | 4 ++++ lfs/libmad | 4 ++++ lfs/libmpdclient | 4 ++++ lfs/libmpeg2 | 4 ++++ lfs/libnfsidmap | 6 ++++++ lfs/libogg | 4 ++++ lfs/libpciaccess | 4 ++++ lfs/libpri | 4 ++++ lfs/libseccomp | 4 ++++ lfs/libshout | 4 ++++ lfs/libsolv | 4 ++++ lfs/libstatgrab | 4 ++++ lfs/libtalloc | 4 ++++ lfs/libtiff | 4 ++++ lfs/libtirpc | 4 ++++ lfs/libusbredir | 4 ++++ lfs/libvirt | 7 +++++-- lfs/libvorbis | 4 ++++ lfs/libyajl | 4 ++++ lfs/lshw | 6 +++++- lfs/ltrace | 4 ++++ lfs/lynis | 5 +++++ lfs/make | 4 ++++ lfs/mc | 4 ++++ lfs/mcelog | 4 ++++ lfs/mdns-repeater | 6 +++++- lfs/minicom | 4 ++++ lfs/minidlna | 6 +++++- lfs/monit | 5 ++++- lfs/mpc | 4 ++++ lfs/mpd | 6 +++++- lfs/mpfire | 4 ++++ lfs/mtr | 4 ++++ lfs/nagios-plugins | 4 ++++ lfs/nagios_nrpe | 6 +++++- lfs/nano | 4 ++++ lfs/ncat | 4 ++++ lfs/ncdu | 6 +++++- lfs/netatalk | 6 +++++- lfs/netpbm | 4 ++++ lfs/netsnmpd | 6 +++++- lfs/nfs | 6 +++++- lfs/nginx | 5 +++++ lfs/nmap | 4 ++++ lfs/nut | 6 +++++- lfs/observium-agent | 4 ++++ lfs/openvmtools | 6 +++++- lfs/opus | 4 ++++ lfs/parted | 4 ++++ lfs/pcengines-apu-firmware | 4 ++++ lfs/pcmciautils | 5 +++++ lfs/perl-Authen-SASL | 4 ++++ lfs/perl-Carp-Clan | 5 +++++ lfs/perl-Date-Calc | 5 +++++ lfs/perl-Date-Manip | 5 +++++ lfs/perl-File-ReadBackwards | 4 ++++ lfs/perl-File-Tail | 5 +++++ lfs/perl-MIME-Base64 | 4 ++++ lfs/perl-Net-IP | 5 +++++ lfs/perl-Net-SMTP-SSL | 4 ++++ lfs/perl-Parse-Yapp | 4 ++++ lfs/perl-TimeDate | 5 +++++ lfs/perl-common-sense | 5 +++++ lfs/perl-gettext | 4 ++++ lfs/perl-inotify2 | 3 +++ lfs/pmacct | 6 +++++- lfs/postfix | 6 +++++- lfs/powertop | 4 ++++ lfs/python-setuptools | 4 ++++ lfs/python3-botocore | 4 ++++ lfs/python3-colorama | 4 ++++ lfs/python3-dateutil | 4 ++++ lfs/python3-docutils | 4 ++++ lfs/python3-jmespath | 4 ++++ lfs/python3-msgpack | 4 ++++ lfs/python3-pyasn1 | 4 ++++ lfs/python3-pyparsing | 4 ++++ lfs/python3-rsa | 4 ++++ lfs/python3-s3transfer | 4 ++++ lfs/python3-setuptools | 4 ++++ lfs/python3-setuptools-scm | 4 ++++ lfs/python3-six | 4 ++++ lfs/python3-urllib3 | 6 ++++++ lfs/python3-yaml | 4 ++++ lfs/qemu | 4 ++++ lfs/rpcbind | 6 +++++- lfs/rsync | 4 ++++ lfs/samba | 6 +++++- lfs/sarg | 4 ++++ lfs/sdl | 4 ++++ lfs/shairport-sync | 6 +++++- lfs/socat | 4 ++++ lfs/sox | 4 ++++ lfs/soxr | 4 ++++ lfs/spandsp | 4 ++++ lfs/spectre-meltdown-checker | 4 ++++ lfs/speedtest-cli | 4 ++++ lfs/spice | 4 ++++ lfs/spice-protocol | 4 ++++ lfs/squid-accounting | 4 ++++ lfs/squidclamav | 4 ++++ lfs/sslh | 6 +++++- lfs/strace | 4 ++++ lfs/stress | 4 ++++ lfs/stunnel | 6 +++++- lfs/swatch | 4 ++++ lfs/sysbench | 4 ++++ lfs/taglib | 4 ++++ lfs/tcpdump | 4 ++++ lfs/telnet | 5 +++++ lfs/tftpd | 6 +++++- lfs/tmux | 4 ++++ lfs/tor | 6 +++++- lfs/traceroute | 4 ++++ lfs/transmission | 6 +++++- lfs/tshark | 4 ++++ lfs/util-macros | 4 ++++ lfs/vdr | 6 +++++- lfs/vdr_dvbapi | 4 ++++ lfs/vdr_eepg | 4 ++++ lfs/vdr_epgsearch | 4 ++++ lfs/vdr_streamdev | 4 ++++ lfs/vdradmin | 6 +++++- lfs/w_scan | 3 +++ lfs/watchdog | 6 +++++- lfs/wavemon | 4 ++++ lfs/wio | 6 ++++++ lfs/xinetd | 6 +++++- lfs/xvid | 4 ++++ lfs/zabbix_agentd | 6 +++++- 199 files changed, 862 insertions(+), 51 deletions(-) diff --git a/lfs/7zip b/lfs/7zip index b70ce491c..5a31d36e0 100644 --- a/lfs/7zip +++ b/lfs/7zip @@ -24,6 +24,8 @@ include Config +SUMMARY = 7-zip file compression program + VER = 17.03 THISAPP = p7zip-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 8 DEPS = +SERVICES = + CFLAGS += -fcommon ############################################################################### diff --git a/lfs/alac b/lfs/alac index f8510294a..abae8a2f9 100644 --- a/lfs/alac +++ b/lfs/alac @@ -24,6 +24,8 @@ include Config +SUMMARY = Apple Lossless Audio Codec + VER = 0.0.7 THISAPP = alac-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 1 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/alsa b/lfs/alsa index 264849e11..f8f45a6e8 100644 --- a/lfs/alsa +++ b/lfs/alsa @@ -24,6 +24,7 @@ include Config +SUMMARY = Advanced Linux Sound Architecture VER = 1.2.5.1 UVER = 1.2.5.1 @@ -40,6 +41,8 @@ PAK_VER = 13 DEPS = +SERVICES = alsa + TARGET = $(DIR_INFO)/$(THISAPP) ############################################################################### @@ -101,6 +104,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP)/alsa-firmware-$(FVER) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP)/alsa-firmware-$(FVER) && make install # install initscript - $(call INSTALL_INITSCRIPT,alsa) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) @rm -rf $(DIR_SRC)/alsa* @$(POSTBUILD) diff --git a/lfs/amazon-ssm-agent b/lfs/amazon-ssm-agent index a029cf7ec..25c9ce33b 100644 --- a/lfs/amazon-ssm-agent +++ b/lfs/amazon-ssm-agent @@ -24,6 +24,8 @@ include Config +SUMMARY = Amazon Remote System Config Management + VER = 3.0.356.0 SUP_ARCH = x86_64 @@ -37,6 +39,8 @@ PAK_VER = 6 DEPS = +SERVICES = amazon-ssm-agent + DIR_BUILD = $(GOPATH)/src/github.com/aws/amazon-ssm-agent ############################################################################### @@ -114,7 +118,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) amazon-ssm-agent.json.template /etc/amazon/ssm/amazon-ssm-agent.json # Install initscript - $(call INSTALL_INITSCRIPT,amazon-ssm-agent) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) # Install backup include install -v -m 644 $(DIR_SRC)/config/backup/includes/amazon-ssm-agent \ diff --git a/lfs/apcupsd b/lfs/apcupsd index d63c79f8b..82c61f12a 100644 --- a/lfs/apcupsd +++ b/lfs/apcupsd @@ -24,6 +24,8 @@ include Config +SUMMARY = APC UPS Daemon (Powerful Daemon for APC UPSs) + VER = 3.14.14 THISAPP = apcupsd-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 7 DEPS = +SERVICES = apcupsd + ############################################################################### # Top-level Rules ############################################################################### @@ -84,7 +88,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make install #install initscripts - $(call INSTALL_INITSCRIPT,apcupsd) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) ln -sf ../init.d/apcupsd /etc/rc.d/rc3.d/S65apcupsd ln -sf ../init.d/apcupsd /etc/rc.d/rc0.d/K35apcupsd diff --git a/lfs/avahi b/lfs/avahi index ae166a88c..7ba13e367 100644 --- a/lfs/avahi +++ b/lfs/avahi @@ -24,6 +24,8 @@ include Config +SUMMARY = D-Bus Service for Zeroconf and Bonjour + VER = 0.8 THISAPP = avahi-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 8 DEPS = dbus libdaemon +SERVICES = avahi + ############################################################################### # Top-level Rules ############################################################################### @@ -101,7 +105,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cp -avf $(DIR_SRC)/config/avahi/smb.service /etc/avahi/services/smb.service # Install initscript - $(call INSTALL_INITSCRIPT,avahi) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/aws-cli b/lfs/aws-cli index a098f9ad8..deef69595 100644 --- a/lfs/aws-cli +++ b/lfs/aws-cli @@ -24,6 +24,8 @@ include Config +SUMMARY = Amazon Web Services Command Line Interface + VER = 1.18.188 THISAPP = awscli-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 4 DEPS = python3-botocore python3-colorama python3-docutils python3-pyasn1 python3-rsa python3-s3transfer python3-six python3-yaml +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/backup b/lfs/backup index 9d3e05735..8fcfd8616 100644 --- a/lfs/backup +++ b/lfs/backup @@ -24,6 +24,8 @@ include Config +SUMMARY = IPFire backup extension + VER = ipfire THISAPP = backup-$(VER) @@ -34,6 +36,8 @@ PAK_VER = 2 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/bacula b/lfs/bacula index 5b9f119ff..71ba3b877 100644 --- a/lfs/bacula +++ b/lfs/bacula @@ -24,6 +24,8 @@ include Config +SUMMARY = Enterprise-ready Network Backup Software + VER = 9.6.7 THISAPP = bacula-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 9 DEPS = +SERVICES = bacula + # For GCC 10 CFLAGS += -Wno-error=narrowing @@ -91,7 +95,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make install #install initscripts - $(call INSTALL_INITSCRIPT,bacula) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) install -v -m 644 ${DIR_SRC}/config/backup/includes/bacula \ /var/ipfire/backup/addons/includes/bacula diff --git a/lfs/bird b/lfs/bird index ee1829907..0d0ec1933 100644 --- a/lfs/bird +++ b/lfs/bird @@ -24,6 +24,8 @@ include Config +SUMMARY = The BIRD Internet Routing Daemon + VER = 2.0.7 THISAPP = bird-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 7 DEPS = +SERVICES = bird + CFLAGS += -fcommon ############################################################################### @@ -93,7 +97,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) /var/ipfire/backup/addons/includes/bird # Install initscript - $(call INSTALL_INITSCRIPT,bird) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/borgbackup b/lfs/borgbackup index 0a50f816a..a78be49b1 100644 --- a/lfs/borgbackup +++ b/lfs/borgbackup @@ -24,6 +24,8 @@ include Config +SUMMARY = Deduplicating backup program with compression and authenticated encryption + VER = 1.1.13 THISAPP = borgbackup-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 9 DEPS = python3-msgpack +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/bwm-ng b/lfs/bwm-ng index d92a02925..df153e3ca 100644 --- a/lfs/bwm-ng +++ b/lfs/bwm-ng @@ -24,6 +24,8 @@ include Config +SUMMARY = Realtime Bandwidth Monitor + VER = 0.6.1-f54b3fa THISAPP = bwm-ng-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 2 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/c-ares b/lfs/c-ares index 1f07623ac..07f7b02fe 100644 --- a/lfs/c-ares +++ b/lfs/c-ares @@ -24,6 +24,8 @@ include Config +SUMMARY = Tools for asynchronous name resolves + VER = 1.17.1 THISAPP = c-ares-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 1 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/cifs-utils b/lfs/cifs-utils index a363bb83b..712c74f9d 100644 --- a/lfs/cifs-utils +++ b/lfs/cifs-utils @@ -24,6 +24,8 @@ include Config +SUMMARY = Utilities for doing and managing mounts of the Linux CIFS filesystem + VER = 6.13 THISAPP = cifs-utils-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 3 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/clamav b/lfs/clamav index 4dc996ea4..26c3caf11 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -24,6 +24,8 @@ include Config +SUMMARY = Antivirus Toolkit + VER = 0.103.3 THISAPP = clamav-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 56 DEPS = +SERVICES = clamav + ifeq "$(BUILD_PLATFORM)" "arm" CONFIGURE_FLAGS = --disable-fanotify endif @@ -98,6 +102,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) mkdir -p /var/run/clamav chown clamav:clamav /var/run/clamav #install initscripts - $(call INSTALL_INITSCRIPT,clamav) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/client175 b/lfs/client175 index e69e8e705..035b237d2 100644 --- a/lfs/client175 +++ b/lfs/client175 @@ -24,6 +24,8 @@ include Config +SUMMARY = A full featured web MPD client with tag editing. + VER = 0.7 THISAPP = client175_$(VER) @@ -36,6 +38,8 @@ PAK_VER = 3 DEPS = mpfire +SERVICES = client175 + ############################################################################### # Top-level Rules ############################################################################### @@ -91,7 +95,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) chown -R nobody:nobody /srv/client175 #install initscripts - $(call INSTALL_INITSCRIPT,client175) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/core-updates b/lfs/core-updates index fa8b36d50..08d72310e 100644 --- a/lfs/core-updates +++ b/lfs/core-updates @@ -92,8 +92,10 @@ core/%: update.sh files.tar.xz ROOTFILES rm -rf /install/packages/package sed -e "s/NAME/core-upgrade/g" \ + -e "s/SUMMARY/IPFire Core Update/g" \ -e "s/VER/$(VERSION)/g" \ -e "s/RELEASE/$$(basename $@)/g" \ -e "s/DEPS/$(DEPS)/g" \ -e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-$(VERSION)-$$(basename $@).ipfire | awk '{ print $$5 }'`/g" \ + -e "s/SERVICES//g" \ < /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-$$(basename $@) diff --git a/lfs/cpufrequtils b/lfs/cpufrequtils index 3c1f5939a..11a34fcf8 100644 --- a/lfs/cpufrequtils +++ b/lfs/cpufrequtils @@ -24,6 +24,8 @@ include Config +SUMMARY = Tools to Determine and Set CPUfreq Settings + VER = 008 THISAPP = cpufrequtils-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 10 DEPS = +SERVICES = cpufreq + ############################################################################### # Top-level Rules ############################################################################### @@ -87,7 +91,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make install #install initscripts - $(call INSTALL_INITSCRIPT,cpufreq) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/cups b/lfs/cups index 99c9c8887..4d9bbc556 100644 --- a/lfs/cups +++ b/lfs/cups @@ -24,6 +24,8 @@ include Config +SUMMARY = The Common UNIX Printing System + VER = 2.3.3op2 THISAPP = cups-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 23 DEPS = avahi cups-filters dbus ghostscript krb5 libtiff +SERVICES = cups + ############################################################################### # Top-level Rules ############################################################################### @@ -95,7 +99,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ln -v -sf /usr/bin/smbspool /usr/lib/cups/backend/smb # install initscript - $(call INSTALL_INITSCRIPT,cups) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) cp -fv $(DIR_SRC)/config/cups/cupsd.conf /var/ipfire/cups/ @rm -rf $(DIR_APP) diff --git a/lfs/cups-filters b/lfs/cups-filters index d00b5ccb2..dec6f29e0 100644 --- a/lfs/cups-filters +++ b/lfs/cups-filters @@ -24,6 +24,8 @@ include Config +SUMMARY = OpenPrinting CUPS filters, backends, and cups-browsed + VER = 1.28.9 THISAPP = cups-filters-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 6 DEPS = cups ghostscript +SERVICES = + CFLAGS += -fcommon ############################################################################### diff --git a/lfs/cyrus-sasl b/lfs/cyrus-sasl index 7f5135612..f28ff3367 100644 --- a/lfs/cyrus-sasl +++ b/lfs/cyrus-sasl @@ -24,6 +24,8 @@ include Config +SUMMARY = Implementation of Cyrus SASL API + VER = 2.1.26 THISAPP = cyrus-sasl-$(VER) @@ -41,6 +43,8 @@ endif DEPS = +SERVICES = cyrus-sasl + ############################################################################### # Top-level Rules ############################################################################### @@ -100,7 +104,7 @@ ifeq "$(PASS)" "" cp -vf $(DIR_SRC)/config/cyrus-sasl/smtpd.conf /usr/lib/sasl2/ #install initscripts - $(call INSTALL_INITSCRIPT,cyrus-sasl) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) else # WITH LDAP SUPPORT AT THIS TIME diff --git a/lfs/dbus b/lfs/dbus index 09f4a541b..9452081fd 100644 --- a/lfs/dbus +++ b/lfs/dbus @@ -24,6 +24,8 @@ include Config +SUMMARY = D-Bus Message Bus System + VER = 1.12.20 THISAPP = dbus-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 4 DEPS = +SERVICES = messagebus + ############################################################################### # Top-level Rules ############################################################################### @@ -84,7 +88,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make install #install initscripts - $(call INSTALL_INITSCRIPT,messagebus) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) @rm -rf $(DIR_SRC)/dbus* @$(POSTBUILD) diff --git a/lfs/ddrescue b/lfs/ddrescue index 3c45896e9..3bf528ad5 100644 --- a/lfs/ddrescue +++ b/lfs/ddrescue @@ -24,7 +24,10 @@ include Config +SUMMARY = Data Copying in the Presence of I/O Errors + VER = 1.25 + THISAPP = ddrescue-$(VER) DL_FILE = $(THISAPP).tar.lz DL_FROM = $(URL_IPFIRE) @@ -35,6 +38,8 @@ PAK_VER = 2 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/dehydrated b/lfs/dehydrated index c2c3a9e00..1b8544a17 100644 --- a/lfs/dehydrated +++ b/lfs/dehydrated @@ -24,6 +24,8 @@ include Config +SUMMARY = A client for signing certificates with an ACME server + VER = 0.7.0 THISAPP = dehydrated-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 4 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/dnsdist b/lfs/dnsdist index 7d0e55e57..40811d5ec 100644 --- a/lfs/dnsdist +++ b/lfs/dnsdist @@ -24,6 +24,8 @@ include Config +SUMMARY = A highly DNS-, DoS- and abuse-aware loadbalancer + VER = 1.6.0 THISAPP = dnsdist-$(VER) @@ -38,6 +40,8 @@ SUP_ARCH = x86_64 DEPS = +SERVICES = dnsdist + MAX_PARALLELISM = $(shell echo $$(( $(SYSTEM_MEMORY) / 2048 ))) ############################################################################### @@ -95,7 +99,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make install #install initscripts - $(call INSTALL_INITSCRIPT,dnsdist) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) install -v -m 644 $(DIR_SRC)/config/backup/includes/dnsdist \ /var/ipfire/backup/addons/includes/dnsdist diff --git a/lfs/ebtables b/lfs/ebtables index ba94d686a..58631244e 100644 --- a/lfs/ebtables +++ b/lfs/ebtables @@ -24,6 +24,8 @@ include Config +SUMMARY = Ethernet Bridge Tables + VER = 2.0.10-4 THISAPP = ebtables-v$(VER) @@ -36,6 +38,8 @@ PAK_VER = 3 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/elfutils b/lfs/elfutils index 6a6e9dabc..c3ddc3e37 100644 --- a/lfs/elfutils +++ b/lfs/elfutils @@ -24,6 +24,8 @@ include Config +SUMMARY = Higher-level library to access ELF files + VER = 0.185 THISAPP = elfutils-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 6 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/elinks b/lfs/elinks index 6a895e943..b60c986ab 100644 --- a/lfs/elinks +++ b/lfs/elinks @@ -24,6 +24,8 @@ include Config +SUMMARY = An advanced and well-established feature-rich text mode web browser + VER = 0.12pre6 THISAPP = elinks-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 2 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/epson-inkjet-printer-escpr b/lfs/epson-inkjet-printer-escpr index 3a0f84c50..e48bcd2fb 100644 --- a/lfs/epson-inkjet-printer-escpr +++ b/lfs/epson-inkjet-printer-escpr @@ -24,6 +24,8 @@ include Config +SUMMARY = Epson ESC/P-R Inkjet Printer Driver + VER = 1.6.12 LSB = 1lsb3.2 @@ -37,6 +39,8 @@ PAK_VER = 2 DEPS = cups +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/faad2 b/lfs/faad2 index 5ec1541c1..d132ed96b 100644 --- a/lfs/faad2 +++ b/lfs/faad2 @@ -24,6 +24,8 @@ include Config +SUMMARY = C library and frontend for decoding MPEG2/4 AAC + VER = 2.8.8 THISAPP = faad2-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 2 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/fetchmail b/lfs/fetchmail index aed08aae2..37e079a2c 100644 --- a/lfs/fetchmail +++ b/lfs/fetchmail @@ -24,6 +24,8 @@ include Config +SUMMARY = Full-Featured POP and IMAP Mail Retrieval Daemon + VER = 6.4.19 THISAPP = fetchmail-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 10 DEPS = +SERVICES = fetchmail + ############################################################################### # Top-level Rules ############################################################################### @@ -99,7 +103,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) /var/ipfire/backup/addons/includes/fetchmail #install initscripts - $(call INSTALL_INITSCRIPT,fetchmail) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) @rm -rf $(DIR_APP) diff --git a/lfs/ffmpeg b/lfs/ffmpeg index 1efa14a36..ee192f97c 100644 --- a/lfs/ffmpeg +++ b/lfs/ffmpeg @@ -24,6 +24,8 @@ include Config +SUMMARY = Library for working with various multimedia formats + VER = 4.4 THISAPP = ffmpeg-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 12 DEPS = sdl lame libvorbis xvid +SERVICES = + ifeq "$(BUILD_ARCH)" "armv6l" LDFLAGS += -latomic endif diff --git a/lfs/fireperf b/lfs/fireperf index 19fe7b1fd..3bb8002fc 100644 --- a/lfs/fireperf +++ b/lfs/fireperf @@ -24,6 +24,8 @@ include Config +SUMMARY = A Network Benchmarking Tool + VER = 0.2.0 THISAPP = fireperf-$(VER) @@ -34,6 +36,10 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = fireperf PAK_VER = 2 +DEPS = + +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/firmware-update b/lfs/firmware-update index bce9c4404..fd30b9f7e 100644 --- a/lfs/firmware-update +++ b/lfs/firmware-update @@ -24,6 +24,8 @@ include Config +SUMMARY = IPFire Firmware Update Tool + VER = 20210107 THISAPP = firmware-update-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 2 DEPS = flashrom +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/flac b/lfs/flac index ef3e46ad1..c81d47283 100644 --- a/lfs/flac +++ b/lfs/flac @@ -24,6 +24,8 @@ include Config +SUMMARY = Free Lossless Audio Codec + VER = 1.3.3 THISAPP = flac-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 3 DEPS = libogg +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/flashrom b/lfs/flashrom index e770cfcf0..d7bd261b7 100644 --- a/lfs/flashrom +++ b/lfs/flashrom @@ -24,6 +24,8 @@ include Config +SUMMARY = A universal flash programming utility + VER = 1.2 THISAPP = flashrom-v$(VER) @@ -37,6 +39,8 @@ SUP_ARCH = i586 x86_64 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/foomatic b/lfs/foomatic index ea5131ef5..0ede44bf2 100644 --- a/lfs/foomatic +++ b/lfs/foomatic @@ -24,6 +24,8 @@ include Config +SUMMARY = Tools for using the foomatic database of printers and printer drivers + VER = 4.0.9 VER_DB = 4.0-$(DATE) VER_FILTERS = 4.0.17 @@ -39,6 +41,8 @@ PAK_VER = 6 DEPS = cups ghostscript libtiff hplip +SERVICES = + CFLAGS += -fcommon export LIB_CUPS=/usr/lib/cups diff --git a/lfs/fping b/lfs/fping index 8616c0e54..fd2e8260e 100644 --- a/lfs/fping +++ b/lfs/fping @@ -24,6 +24,8 @@ include Config +SUMMARY = A program to ping multiple hosts + VER = 5.0 THISAPP = fping-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 6 DEPS = "" +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/freefont b/lfs/freefont index d9b19e1ed..d944a7790 100644 --- a/lfs/freefont +++ b/lfs/freefont @@ -24,6 +24,8 @@ include Config +SUMMARY = Free UCS scalable fonts + VER = 20060126 THISAPP = freefont-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 1 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/freeradius b/lfs/freeradius index b1a139bb6..4e5139691 100644 --- a/lfs/freeradius +++ b/lfs/freeradius @@ -24,6 +24,8 @@ include Config +SUMMARY = RADIUS Server + VER = 3.0.21 THISAPP = freeradius-server-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 13 DEPS = libtalloc samba +SERVICES = freeradius + ############################################################################### # Top-level Rules ############################################################################### @@ -143,7 +147,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) /etc/logrotate.d/freeradius #install initscripts - $(call INSTALL_INITSCRIPT,freeradius) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/frr b/lfs/frr index cff23ff92..6e36bf489 100644 --- a/lfs/frr +++ b/lfs/frr @@ -24,6 +24,8 @@ include Config +SUMMARY = FRRouting Routing daemon + VER = 6.0 THISAPP = frr-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 1 DEPS = +SERVICES = frr + CFLAGS += -fcommon ############################################################################### @@ -110,7 +114,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) /var/ipfire/backup/addons/includes/frr # Install initscript - $(call INSTALL_INITSCRIPT,frr) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/ghostscript b/lfs/ghostscript index 1ee14a16e..2d5d2be17 100644 --- a/lfs/ghostscript +++ b/lfs/ghostscript @@ -24,6 +24,8 @@ include Config +SUMMARY = The Ghostscript interpreter for PostScript and PDF + VER = 9.54.0 THISAPP = ghostscript-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 8 DEPS = cups dbus libtiff +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/git b/lfs/git index 2290c6e99..c18e994e0 100644 --- a/lfs/git +++ b/lfs/git @@ -24,6 +24,8 @@ include Config +SUMMARY = Fast, scalable, distributed revision control system + VER = 2.31.0 THISAPP = git-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 19 DEPS = perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/gnu-netcat b/lfs/gnu-netcat index 2e8c10aa1..050d151e7 100644 --- a/lfs/gnu-netcat +++ b/lfs/gnu-netcat @@ -24,6 +24,8 @@ include Config +SUMMARY = GNU variant of universal network utility + VER = 0.7.1 THISAPP = netcat-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 1 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/gnump3d b/lfs/gnump3d index 440b33905..06d22a48f 100644 --- a/lfs/gnump3d +++ b/lfs/gnump3d @@ -24,6 +24,8 @@ include Config +SUMMARY = GNU MP3 Streaming Server + VER = 3.0 THISAPP = gnump3d-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 7 DEPS = +SERVICES = gnump3d + ############################################################################### # Top-level Rules ############################################################################### @@ -93,7 +97,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) ln -sf /usr/bin/gnump3d-index /etc/fcron.daily/gnump3d-index #install initscripts - $(call INSTALL_INITSCRIPT,gnump3d) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/guardian b/lfs/guardian index 245249031..66d908693 100644 --- a/lfs/guardian +++ b/lfs/guardian @@ -24,6 +24,8 @@ include Config +SUMMARY = A perl written Intrusion Prevention System + VER = 2.0.2 THISAPP = guardian-$(VER) @@ -37,6 +39,8 @@ PAK_VER = 24 DEPS = perl-inotify2 perl-Net-IP +SERVICES = guardian + ############################################################################### # Top-level Rules ############################################################################### @@ -97,7 +101,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) touch /var/log/guardian/guardian.log #install initscripts - $(call INSTALL_INITSCRIPT,guardian) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) # Create symlinks for runlevel interaction. ln -svf /etc/rc.d/init.d/guardian /etc/rc.d/rc3.d/S45guardian diff --git a/lfs/gutenprint b/lfs/gutenprint index 6c2626d26..4468acb1e 100644 --- a/lfs/gutenprint +++ b/lfs/gutenprint @@ -24,6 +24,8 @@ include Config +SUMMARY = Printer drivers for CUPS from the Gutenprint project + VER = 5.2.9 THISAPP = gutenprint-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 3 DEPS = cups +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/haproxy b/lfs/haproxy index 3b89cc509..1101eeafc 100644 --- a/lfs/haproxy +++ b/lfs/haproxy @@ -24,6 +24,8 @@ include Config +SUMMARY = The Reliable, High Performance TCP/HTTP Load Balancer + VER = 2.2.4 THISAPP = haproxy-$(VER) @@ -36,6 +38,7 @@ PAK_VER = 19 DEPS = +SERVICES = haproxy ifeq "$(BUILD_ARCH)" "riscv64" LDFLAGS += -latomic @@ -97,7 +100,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) /var/ipfire/backup/addons/includes/haproxy #install initscripts - $(call INSTALL_INITSCRIPT,haproxy) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) # Logrotate -mkdir -pv /etc/logrotate.d diff --git a/lfs/hostapd b/lfs/hostapd index 19a4b9340..56454df6e 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -24,6 +24,8 @@ include Config +SUMMARY = Daemon for running a WPA capable Access Point + VER = 581dfcc THISAPP = hostapd-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 56 DEPS = +SERVICES = hostapd + ############################################################################### # Top-level Rules ############################################################################### @@ -87,7 +91,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP)/hostapd && make install install -v -m 644 $(DIR_SRC)/config/backup/includes/hostapd /var/ipfire/backup/addons/includes/hostapd # install initscript - $(call INSTALL_INITSCRIPT,hostapd) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) mkdir -p /var/ipfire/wlanap touch /var/ipfire/wlanap/settings cp -vrf $(DIR_SRC)/config/hostapd/hostapd.conf /var/ipfire/wlanap/hostapd.conf diff --git a/lfs/hplip b/lfs/hplip index e87b8fb8e..cd869a0c6 100644 --- a/lfs/hplip +++ b/lfs/hplip @@ -24,6 +24,8 @@ include Config +SUMMARY = HP's Printing, Scanning, and Faxing Software + VER = 3.21.2 THISAPP = hplip-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 5 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/htop b/lfs/htop index 0dfdf011f..0f99cf71d 100644 --- a/lfs/htop +++ b/lfs/htop @@ -24,6 +24,8 @@ include Config +SUMMARY = An Interactive text-mode Process Viewer for Linux + VER = 3.0.5 THISAPP = htop-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 16 DEPS = +SERVICES = + CFLAGS += -fcommon ############################################################################### diff --git a/lfs/icinga b/lfs/icinga index 456f66388..4e82efa7e 100644 --- a/lfs/icinga +++ b/lfs/icinga @@ -24,6 +24,8 @@ include Config +SUMMARY = Network monitoring application + VER = 1.11.4 THISAPP = icinga-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 5 DEPS = nagios-plugins +SERVICES = icinga + CFLAGS += -fcommon ############################################################################### diff --git a/lfs/iftop b/lfs/iftop index 9c95e1b66..73ac2157d 100644 --- a/lfs/iftop +++ b/lfs/iftop @@ -24,6 +24,8 @@ include Config +SUMMARY = Real-Time Interface Bandwidth Usage + VER = 1.0pre4 THISAPP = iftop-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 2 DEPS = +SERVICES = + CFLAGS += -fcommon ############################################################################### diff --git a/lfs/igmpproxy b/lfs/igmpproxy index c32d519b9..388f01289 100644 --- a/lfs/igmpproxy +++ b/lfs/igmpproxy @@ -24,6 +24,8 @@ include Config +SUMMARY = Multicast router utilizing IGMP forwarding + VER = 0.2.1 THISAPP = igmpproxy-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 5 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/intltool b/lfs/intltool index bc5008a52..3b936c984 100644 --- a/lfs/intltool +++ b/lfs/intltool @@ -24,6 +24,8 @@ include Config +SUMMARY = Internationalization Tool Collection + VER = 0.51.0 THISAPP = intltool-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 2 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/iotop b/lfs/iotop index 02f027e5c..ba8a37338 100644 --- a/lfs/iotop +++ b/lfs/iotop @@ -24,6 +24,8 @@ include Config +SUMMARY = Top Like UI to Show Per-Process I/O Going on + VER = 0.6 THISAPP = iotop-$(VER) @@ -34,8 +36,11 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = iotop PAK_VER = 2 + DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/iperf b/lfs/iperf index 07ad3e6ea..9e9264cd2 100644 --- a/lfs/iperf +++ b/lfs/iperf @@ -24,6 +24,8 @@ include Config +SUMMARY = A tool to measure network performance + VER = 2.0.14a THISAPP = iperf-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 5 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/iperf3 b/lfs/iperf3 index ba3b1b942..95a527c42 100644 --- a/lfs/iperf3 +++ b/lfs/iperf3 @@ -24,6 +24,8 @@ include Config +SUMMARY = A tool to measure network performance + VER = 3.10.1 THISAPP = iperf-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 4 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/iptraf-ng b/lfs/iptraf-ng index 3a5ace552..2cd47b130 100644 --- a/lfs/iptraf-ng +++ b/lfs/iptraf-ng @@ -24,6 +24,8 @@ include Config +SUMMARY = TCP/IP Network Monitor + VER = 1.2.1 THISAPP = iptraf-ng-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 4 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/ipvsadm b/lfs/ipvsadm index 1f1026131..9d1532e2f 100644 --- a/lfs/ipvsadm +++ b/lfs/ipvsadm @@ -24,6 +24,8 @@ include Config +SUMMARY = A Utility for Administering the Linux Virtual Server + VER = 1.29 THISAPP = ipvsadm-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 2 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/joe b/lfs/joe index d89b44790..51032f8ee 100644 --- a/lfs/joe +++ b/lfs/joe @@ -24,6 +24,8 @@ include Config +SUMMARY = A Text Editor + VER = 4.6 THISAPP = joe-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 3 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/keepalived b/lfs/keepalived index da3f3f819..cdfd0926a 100644 --- a/lfs/keepalived +++ b/lfs/keepalived @@ -24,6 +24,8 @@ include Config +SUMMARY = A keepalive facility for Linux + VER = 2.1.5 THISAPP = keepalived-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 9 DEPS = +SERVICES = keepalived + ############################################################################### # Top-level Rules ############################################################################### @@ -86,7 +90,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) /var/ipfire/backup/addons/includes/keepalived #install initscripts - $(call INSTALL_INITSCRIPT,keepalived) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/krb5 b/lfs/krb5 index a972920e7..88aedf1ad 100644 --- a/lfs/krb5 +++ b/lfs/krb5 @@ -24,6 +24,8 @@ include Config +SUMMARY = Kerberos + VER = 1.19.1 THISAPP = krb5-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 6 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/lame b/lfs/lame index f7cbb2205..38ca186cc 100644 --- a/lfs/lame +++ b/lfs/lame @@ -24,6 +24,8 @@ include Config +SUMMARY = The LAME MP3 encoder + VER = 3.100 THISAPP = lame-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 2 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/lcdproc b/lfs/lcdproc index e5c4ee345..c5e758b8d 100644 --- a/lfs/lcdproc +++ b/lfs/lcdproc @@ -24,6 +24,8 @@ include Config +SUMMARY = Daemon capable of showing info on LCD displays + VER = 0.5.7 THISAPP = lcdproc-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 2 DEPS = +SERVICES = lcdproc + CFLAGS += -fcommon ############################################################################### @@ -98,7 +102,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cp -vf $(DIR_SRC)/config/lcdproc/{LCDd,lcdproc}.conf /etc/lcdproc #install initscripts - $(call INSTALL_INITSCRIPT,lcdproc) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) ln -sf ../init.d/lcdproc /etc/rc.d/rc3.d/S60lcdproc ln -sf ../init.d/lcdproc /etc/rc.d/rc0.d/K40lcdproc diff --git a/lfs/libassuan b/lfs/libassuan index 4edb3fcb0..934d38411 100644 --- a/lfs/libassuan +++ b/lfs/libassuan @@ -24,6 +24,8 @@ include Config +SUMMARY = IPC library used by GnuPG version 2 + VER = 2.5.4 THISAPP = libassuan-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 6 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/libcdada b/lfs/libcdada index 201cd8351..7ab12e835 100644 --- a/lfs/libcdada +++ b/lfs/libcdada @@ -24,6 +24,8 @@ include Config +SUMMARY = Basic data structures in C (libstdc++ wrapper) + VER = 0.3.5 THISAPP = libcdada-$(VER) @@ -37,6 +39,8 @@ PAK_VER = 2 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/libdaemon b/lfs/libdaemon index 276d17e5a..7018efa41 100644 --- a/lfs/libdaemon +++ b/lfs/libdaemon @@ -24,6 +24,8 @@ include Config +SUMMARY = Lightweight C library That Eases the Writing of UNIX Daemons + VER = 0.14 THISAPP = libdaemon-$(VER) @@ -34,6 +36,10 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = libdaemon PAK_VER = 1 +DEPS = + +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/libexif b/lfs/libexif index 49d401d85..8c15e2ce7 100644 --- a/lfs/libexif +++ b/lfs/libexif @@ -24,6 +24,8 @@ include Config +SUMMARY = An EXIF Tag Parsing Library for Digital Cameras + VER = 0.6.22 THISAPP = libexif-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 2 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/libid3tag b/lfs/libid3tag index b0263f267..1e0c4f3ad 100644 --- a/lfs/libid3tag +++ b/lfs/libid3tag @@ -24,6 +24,8 @@ include Config +SUMMARY = ID3 Tag Manipulation Library + VER = 0.15.1b THISAPP = libid3tag-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 3 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/libmad b/lfs/libmad index 99a20f0a1..968383f56 100644 --- a/lfs/libmad +++ b/lfs/libmad @@ -24,6 +24,8 @@ include Config +SUMMARY = An MPEG audio decoder library + VER = 0.15.1b THISAPP = libmad-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 2 DEPS = +SERVICES = + CFLAGS += -Wa,--noexecstack ############################################################################### diff --git a/lfs/libmpdclient b/lfs/libmpdclient index 24f516d01..12d5e215a 100644 --- a/lfs/libmpdclient +++ b/lfs/libmpdclient @@ -24,6 +24,8 @@ include Config +SUMMARY = Library for interfacing the Music Player Daemon + VER = 2.19 THISAPP = libmpdclient-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 4 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/libmpeg2 b/lfs/libmpeg2 index 86c1d2211..97b5515d8 100644 --- a/lfs/libmpeg2 +++ b/lfs/libmpeg2 @@ -24,6 +24,8 @@ include Config +SUMMARY = MPEG-2 Video Stream Decoder + VER = 0.4.1 THISAPP = mpeg2dec-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 2 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/libnfsidmap b/lfs/libnfsidmap index 1980d9306..b8d35a73f 100644 --- a/lfs/libnfsidmap +++ b/lfs/libnfsidmap @@ -24,6 +24,8 @@ include Config +SUMMARY = NFSv4 User and Group ID Mapping Library + VER = 0.27 THISAPP = libnfsidmap-$(VER) @@ -34,6 +36,10 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = libnfsidmap PAK_VER = 2 +DEPS = + +SERVICES = + #CFLAGS += -I/usr/include/tirpc ############################################################################### diff --git a/lfs/libogg b/lfs/libogg index 59a0a3fa1..afc527beb 100644 --- a/lfs/libogg +++ b/lfs/libogg @@ -24,6 +24,8 @@ include Config +SUMMARY = Ogg Bitstream Library + VER = 1.3.5 THISAPP = libogg-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 5 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/libpciaccess b/lfs/libpciaccess index 707722362..61b231e4a 100644 --- a/lfs/libpciaccess +++ b/lfs/libpciaccess @@ -24,6 +24,8 @@ include Config +SUMMARY = Generic PCI access library + VER = 0.16 THISAPP = libpciaccess-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 2 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/libpri b/lfs/libpri index c748c5647..be62f0a4f 100644 --- a/lfs/libpri +++ b/lfs/libpri @@ -24,6 +24,8 @@ include Config +SUMMARY = An implementation of Primary Rate ISDN + VER = 1.4.10.2 THISAPP = libpri-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 2 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/libseccomp b/lfs/libseccomp index 38d7a7dde..fc949acfa 100644 --- a/lfs/libseccomp +++ b/lfs/libseccomp @@ -24,6 +24,8 @@ include Config +SUMMARY = A Seccomp (mode 2) helper library + VER = 2.5.1 THISAPP = libseccomp-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 5 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/libshout b/lfs/libshout index 90d0f0346..09baa141a 100644 --- a/lfs/libshout +++ b/lfs/libshout @@ -24,6 +24,8 @@ include Config +SUMMARY = Library for communcating with Icecast servers + VER = 2.4.3 THISAPP = libshout-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 2 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/libsolv b/lfs/libsolv index 3741fddaf..941de732b 100644 --- a/lfs/libsolv +++ b/lfs/libsolv @@ -24,6 +24,8 @@ include Config +SUMMARY = Package dependency solver using a satisfiability algorithm + VER = 0.7.14 THISAPP = libsolv-$(VER) @@ -36,6 +38,8 @@ PROG = libsolv DEPS = PAK_VER = 3 +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/libstatgrab b/lfs/libstatgrab index eef514773..c2804d7e2 100644 --- a/lfs/libstatgrab +++ b/lfs/libstatgrab @@ -24,6 +24,8 @@ include Config +SUMMARY = Interface to System Statistics + VER = 0.92 THISAPP = libstatgrab-$(VER) @@ -32,6 +34,8 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/libtalloc b/lfs/libtalloc index 546524be5..6f400b3ad 100644 --- a/lfs/libtalloc +++ b/lfs/libtalloc @@ -24,6 +24,8 @@ include Config +SUMMARY = Samba talloc Library + VER = 2.3.1 THISAPP = talloc-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 1 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/libtiff b/lfs/libtiff index 885818568..f9b7afc63 100644 --- a/lfs/libtiff +++ b/lfs/libtiff @@ -24,6 +24,8 @@ include Config +SUMMARY = The Tiff Library (with JPEG and compression support) + VER = 4.3.0 THISAPP = tiff-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 5 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/libtirpc b/lfs/libtirpc index 0b529724c..43768bf99 100644 --- a/lfs/libtirpc +++ b/lfs/libtirpc @@ -24,6 +24,8 @@ include Config +SUMMARY = Transport Independent RPC Library + VER = 1.3.1 THISAPP = libtirpc-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 3 DEPS = +SERVICES = + CFLAGS += -fcommon ############################################################################### diff --git a/lfs/libusbredir b/lfs/libusbredir index 13eff5a73..a5a7286d9 100644 --- a/lfs/libusbredir +++ b/lfs/libusbredir @@ -24,6 +24,8 @@ include Config +SUMMARY = USB Network Redirection protocol + VER = 0.8.0 THISAPP = usbredir-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 2 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/libvirt b/lfs/libvirt index b680cbb3d..7f765e643 100644 --- a/lfs/libvirt +++ b/lfs/libvirt @@ -24,6 +24,8 @@ include Config +SUMMARY = Server side daemon and supporting files for libvirt + VER = 6.5.0 THISAPP = libvirt-$(VER) @@ -37,6 +39,8 @@ PAK_VER = 26 DEPS = ebtables libpciaccess libtirpc libyajl ncat qemu +SERVICES = libvirtd virtlogd + ############################################################################### # Top-level Rules ############################################################################### @@ -121,8 +125,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP)/build_libvirt && make install #install initscripts - $(call INSTALL_INITSCRIPT,libvirtd) - $(call INSTALL_INITSCRIPT,virtlogd) + @$(call INSTALL_INITSCRIPTS,$(SERVICES)) mv /usr/libexec/libvirt-guests.sh /etc/rc.d/init.d/libvirt-guests # Backup diff --git a/lfs/libvorbis b/lfs/libvorbis index 5d8c39811..336aae9c0 100644 --- a/lfs/libvorbis +++ b/lfs/libvorbis @@ -24,6 +24,8 @@ include Config +SUMMARY = The Vorbis General Audio Compression Codec + VER = 1.3.6 THISAPP = libvorbis-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 5 DEPS = libogg +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/libyajl b/lfs/libyajl index 1cbdc89c7..dea6b4963 100644 --- a/lfs/libyajl +++ b/lfs/libyajl @@ -24,6 +24,8 @@ include Config +SUMMARY = Yet Another JSON Library + VER = 2.1.0 THISAPP = libyajl-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 1 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/lshw b/lfs/lshw index 1e22bed05..d568d4af5 100644 --- a/lfs/lshw +++ b/lfs/lshw @@ -25,6 +25,8 @@ include Config +SUMMARY = HardWare LiSter + VER = B.02.19.2 THISAPP = lshw-$(VER) @@ -32,11 +34,13 @@ DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = lshw +PROG = lshw PAK_VER = 1 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/ltrace b/lfs/ltrace index 82d8454f9..7bfc9b731 100644 --- a/lfs/ltrace +++ b/lfs/ltrace @@ -24,6 +24,8 @@ include Config +SUMMARY = Library and system call tracer for programs + VER = 0.7.3 SUP_ARCHES = x86_64 i586 armv6l @@ -37,6 +39,8 @@ PAK_VER = 2 DEPS = elfutils +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/lynis b/lfs/lynis index 1ae501603..1cc30885d 100644 --- a/lfs/lynis +++ b/lfs/lynis @@ -24,6 +24,8 @@ include Config +SUMMARY = Security and System auditing tool + VER = 3.0.3 THISAPP = lynis-$(VER) @@ -34,8 +36,11 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = lynis PAK_VER = 9 + DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/make b/lfs/make index f6ba0ccd6..3c2d81542 100644 --- a/lfs/make +++ b/lfs/make @@ -24,6 +24,8 @@ include Config +SUMMARY = GNU make + VER = 4.3 THISAPP = make-$(VER) @@ -35,6 +37,8 @@ PAK_VER = 5 DEPS = +SERVICES = + # Normal build or $(TOOLS_DIR) build. # ifeq "$(ROOT)" "" diff --git a/lfs/mc b/lfs/mc index b5498ab24..3ed5f60b3 100644 --- a/lfs/mc +++ b/lfs/mc @@ -24,6 +24,8 @@ include Config +SUMMARY = Midnight Commander + VER = 4.8.26 THISAPP = mc-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 21 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/mcelog b/lfs/mcelog index 7482b41e9..26622d0c3 100644 --- a/lfs/mcelog +++ b/lfs/mcelog @@ -24,6 +24,8 @@ include Config +SUMMARY = Log Machine Check Events + VER = 175 THISAPP = mcelog-$(VER) @@ -37,6 +39,8 @@ SUP_ARCH = i586 x86_64 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/mdns-repeater b/lfs/mdns-repeater index afe4bfc18..310129658 100644 --- a/lfs/mdns-repeater +++ b/lfs/mdns-repeater @@ -24,6 +24,8 @@ include Config +SUMMARY = A mDNS repeater + VER = 1.10 THISAPP = mdns-repeater-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 1 DEPS = +SERVICES = mdns-repeater + CFLAGS += -DHGVERSION='\"$(VER)\"' ############################################################################### @@ -83,7 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && install -v -m 755 mdns-repeater /usr/bin # install initscripts - $(call INSTALL_INITSCRIPT,mdns-repeater) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/minicom b/lfs/minicom index 7e6ec7586..c8cb05559 100644 --- a/lfs/minicom +++ b/lfs/minicom @@ -24,6 +24,8 @@ include Config +SUMMARY = A Terminal Program + VER = 2.8 THISAPP = minicom-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 2 DEPS = +SERVICES = + CFLAGS += -fcommon ############################################################################### diff --git a/lfs/minidlna b/lfs/minidlna index 1a9020158..bd634c32f 100644 --- a/lfs/minidlna +++ b/lfs/minidlna @@ -24,6 +24,8 @@ include Config +SUMMARY = DLNA compatible server + VER = 1.2.1 THISAPP = minidlna-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 6 DEPS = ffmpeg flac libexif libid3tag libogg +SERVICES = minidlna + CFLAGS += -fcommon ############################################################################### @@ -88,7 +92,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) install -m 644 $(DIR_SRC)/config/minidlna/minidlna.conf /etc #install initscripts - $(call INSTALL_INITSCRIPT,minidlna) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/monit b/lfs/monit index 3720995cd..d1077ddc5 100644 --- a/lfs/monit +++ b/lfs/monit @@ -24,6 +24,7 @@ include Config +SUMMARY = Utility for monitoring services on a Unix system VER = 5.28.0 THISAPP = monit-$(VER) @@ -36,6 +37,8 @@ PAK_VER = 14 DEPS = +SERVICES = monit + ############################################################################### # Top-level Rules ############################################################################### @@ -94,7 +97,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) install -v -m 600 $(DIR_SRC)/config/monit/monitrc /etc #install initscripts - $(call INSTALL_INITSCRIPT,monit) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) # Install start links and backup include file. ln -sf ../init.d/monit /etc/rc.d/rc3.d/S60monit diff --git a/lfs/mpc b/lfs/mpc index 2060685cc..164104371 100644 --- a/lfs/mpc +++ b/lfs/mpc @@ -24,6 +24,8 @@ include Config +SUMMARY = Client for the Music Player Daemon + VER = 0.33 THISAPP = mpc-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 7 DEPS = mpd libmpdclient +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/mpd b/lfs/mpd index 012100b0e..8ebdeb94c 100644 --- a/lfs/mpd +++ b/lfs/mpd @@ -24,6 +24,8 @@ include Config +SUMMARY = Music Player Daemon + VER = 0.22.6 THISAPP = mpd-$(VER) @@ -37,6 +39,8 @@ SUP_ARCH = aarch64 armv6l x86_64 i586 DEPS = alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr +SERVICES = mpd + ############################################################################### # Top-level Rules ############################################################################### @@ -98,7 +102,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ninja -C builddir/ install #install initscripts - $(call INSTALL_INITSCRIPT,mpd) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) @rm -rf $(DIR_APP) touch /var/log/mpd.error.log diff --git a/lfs/mpfire b/lfs/mpfire index 94fce614e..fc8a1dd59 100644 --- a/lfs/mpfire +++ b/lfs/mpfire @@ -24,6 +24,8 @@ include Config +SUMMARY = IPFire integration for the Music Player Daemon + VER = ipfire THISAPP = mpfire-$(VER) @@ -34,6 +36,8 @@ PAK_VER = 14 DEPS = mpd mpc +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/mtr b/lfs/mtr index f2252e1dc..50fd054a8 100644 --- a/lfs/mtr +++ b/lfs/mtr @@ -24,6 +24,8 @@ include Config +SUMMARY = Ping and Traceroute Network Diagnostic Tool + VER = 0.94 THISAPP = mtr-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 5 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/nagios-plugins b/lfs/nagios-plugins index cdf1910b0..140db54c8 100644 --- a/lfs/nagios-plugins +++ b/lfs/nagios-plugins @@ -24,6 +24,8 @@ include Config +SUMMARY = The Nagios Plug-Ins + VER = 2.3.3 THISAPP = nagios-plugins-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 6 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/nagios_nrpe b/lfs/nagios_nrpe index 260bcc810..cdbe747b4 100644 --- a/lfs/nagios_nrpe +++ b/lfs/nagios_nrpe @@ -24,6 +24,8 @@ include Config +SUMMARY = Nagios Remote Plug-In Executor + VER = 4.0.3 THISAPP = nrpe-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 9 DEPS = nagios-plugins +SERVICES = nrpe + ############################################################################### # Top-level Rules ############################################################################### @@ -94,7 +98,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make install-config # install initscript - $(call INSTALL_INITSCRIPT,nrpe) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) install -v -m 644 ${DIR_SRC}/config/backup/includes/nagios_nrpe \ /var/ipfire/backup/addons/includes/nagios_nrpe diff --git a/lfs/nano b/lfs/nano index 3bb7806aa..86192e157 100644 --- a/lfs/nano +++ b/lfs/nano @@ -24,6 +24,8 @@ include Config +SUMMARY = Pico editor clone with enhancements + VER = 5.8 THISAPP = nano-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 38 DEPS = "" +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/ncat b/lfs/ncat index b8c8768dc..7ca6d69a6 100644 --- a/lfs/ncat +++ b/lfs/ncat @@ -24,6 +24,8 @@ include Config +SUMMARY = Network tool to concatenate and redirect sockets + VER = 7.80 THISAPP = ncat-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 6 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/ncdu b/lfs/ncdu index 0ea9370b2..bef729877 100644 --- a/lfs/ncdu +++ b/lfs/ncdu @@ -25,6 +25,8 @@ include Config +SUMMARY = NCurses Disk Usage + VER = 1.15.1 THISAPP = ncdu-$(VER) @@ -32,11 +34,13 @@ DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = ncdu +PROG = ncdu PAK_VER = 1 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/netatalk b/lfs/netatalk index 5a293d5e4..e84376a71 100644 --- a/lfs/netatalk +++ b/lfs/netatalk @@ -24,6 +24,8 @@ include Config +SUMMARY = AppleShare file server + VER = 3.1.12 THISAPP = netatalk-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 2 DEPS = avahi dbus krb5 +SERVICES = netatalk + CFLAGS += -fcommon -Wno-unused-result ############################################################################### @@ -93,7 +97,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) /var/ipfire/backup/addons/includes/netatalk # Install initscript - $(call INSTALL_INITSCRIPT,netatalk) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/netpbm b/lfs/netpbm index fb0a5b294..f16d670f7 100644 --- a/lfs/netpbm +++ b/lfs/netpbm @@ -24,6 +24,8 @@ include Config +SUMMARY = A Graphics Conversion Package + VER = 10.73.31 THISAPP = netpbm-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 3 DEPS = +SERVICES = + CFLAGS += -flax-vector-conversions ############################################################################### diff --git a/lfs/netsnmpd b/lfs/netsnmpd index d8243e1d9..fa5970748 100644 --- a/lfs/netsnmpd +++ b/lfs/netsnmpd @@ -24,6 +24,8 @@ include Config +SUMMARY = SNMP Daemon + VER = 5.9.1 THISAPP = net-snmp-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 12 DEPS = +SERVICES = netsnmpd + ############################################################################### # Top-level Rules ############################################################################### @@ -103,7 +107,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) /var/ipfire/backup/addons/includes/netsnmpd # install initscripts - $(call INSTALL_INITSCRIPT,netsnmpd) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) ln -sf ../init.d/netsnmpd /etc/rc.d/rc3.d/S65netsnmpd ln -sf ../init.d/netsnmpd /etc/rc.d/rc0.d/K02netsnmpd diff --git a/lfs/nfs b/lfs/nfs index 55accfb28..bad87f0fb 100644 --- a/lfs/nfs +++ b/lfs/nfs @@ -24,6 +24,8 @@ include Config +SUMMARY = Support Utilities for Kernel nfsd + VER = 2.5.3 THISAPP = nfs-utils-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 15 DEPS = libnfsidmap rpcbind +SERVICES = nfs-server + ############################################################################### # Top-level Rules ############################################################################### @@ -88,7 +92,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make install # Install initscript - $(call INSTALL_INITSCRIPT,nfs-server) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) # Install configuration mkdir -pv $(CONFIG_ROOT)/nfs diff --git a/lfs/nginx b/lfs/nginx index 183fae1de..727d414ef 100644 --- a/lfs/nginx +++ b/lfs/nginx @@ -24,6 +24,7 @@ include Config +SUMMARY = A HTTP server and IMAP/POP3 proxy server VER = 1.19.2 THISAPP = nginx-$(VER) @@ -34,6 +35,10 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = nginx PAK_VER = 11 +DEPS = + +SERVICES = nginx + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/nmap b/lfs/nmap index bd2ea9b03..926912b32 100644 --- a/lfs/nmap +++ b/lfs/nmap @@ -24,6 +24,8 @@ include Config +SUMMARY = Network exploration tool and security scanner + VER = 7.91 THISAPP = nmap-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 13 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/nut b/lfs/nut index 4af5657c5..625f7f094 100644 --- a/lfs/nut +++ b/lfs/nut @@ -24,6 +24,8 @@ include Config +SUMMARY = Network UPS Tools Core (Uninterruptible Power Supply Monitoring) + VER = 2.7.4 THISAPP = nut-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 7 DEPS = +SERVICES = nut + CXXFLAGS += -std=c++11 ############################################################################### @@ -89,7 +93,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) mkdir -p /var/state/ups #install initscripts - $(call INSTALL_INITSCRIPT,nut) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) install -v -m 644 $(DIR_SRC)/config/backup/includes/nut \ /var/ipfire/backup/addons/includes/nut diff --git a/lfs/observium-agent b/lfs/observium-agent index 9fddb69d6..d1c800a61 100644 --- a/lfs/observium-agent +++ b/lfs/observium-agent @@ -24,6 +24,8 @@ include Config +SUMMARY = Observium agent + VER = 18.9.1 THISAPP = observium-community-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 1 DEPS = xinetd +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/openvmtools b/lfs/openvmtools index 28cb9fd2b..dc938cf1d 100644 --- a/lfs/openvmtools +++ b/lfs/openvmtools @@ -24,6 +24,8 @@ include Config +SUMMARY = Open Virtual Machine Tools + VER = stable-11.3.0 THISAPP = open-vm-tools-$(VER) @@ -37,6 +39,8 @@ PAK_VER = 8 DEPS = libtirpc +SERVICES = openvmtools + CFLAGS += -Wno-error=array-bounds ############################################################################### @@ -99,7 +103,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make install #install initscripts - $(call INSTALL_INITSCRIPT,openvmtools) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) ln -sf ../init.d/openvmtools /etc/rc.d/rc3.d/S60openvmtools ln -sf ../init.d/openvmtools /etc/rc.d/rc0.d/K01openvmtools ln -sf ../init.d/openvmtools /etc/rc.d/rc6.d/K01openvmtools diff --git a/lfs/opus b/lfs/opus index 0ce5a99c1..bce8b618d 100644 --- a/lfs/opus +++ b/lfs/opus @@ -24,6 +24,8 @@ include Config +SUMMARY = Opus Audio Codec Library + VER = 1.3.1 THISAPP = opus-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 3 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/parted b/lfs/parted index 19d546420..91b4c45c2 100644 --- a/lfs/parted +++ b/lfs/parted @@ -24,6 +24,8 @@ include Config +SUMMARY = GNU partitioner + VER = 3.4 THISAPP = parted-$(VER) @@ -37,6 +39,8 @@ PAK_VER = 4 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/pcengines-apu-firmware b/lfs/pcengines-apu-firmware index cf723ff83..e061d2255 100644 --- a/lfs/pcengines-apu-firmware +++ b/lfs/pcengines-apu-firmware @@ -24,6 +24,8 @@ include Config +SUMMARY = Firmware files for PC Engines apu system boards + VER = 4.14.0.2 THISAPP = pcengines-apu-firmware-$(VER) @@ -36,6 +38,8 @@ SUP_ARCH = i586 x86_64 DEPS = firmware-update +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/pcmciautils b/lfs/pcmciautils index b71e2a221..fc77f4b3e 100644 --- a/lfs/pcmciautils +++ b/lfs/pcmciautils @@ -24,6 +24,8 @@ include Config +SUMMARY = Helper programs for PC-Cards + VER = 014 THISAPP = pcmciautils-$(VER) @@ -33,8 +35,11 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = pcmciautils PAK_VER = 1 + DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/perl-Authen-SASL b/lfs/perl-Authen-SASL index 5fee316ae..c69d24333 100644 --- a/lfs/perl-Authen-SASL +++ b/lfs/perl-Authen-SASL @@ -24,6 +24,8 @@ include Config +SUMMARY = Perl extension adding a SASL Authentication framework + VER = 2.16 THISAPP = Authen-SASL-$(VER) @@ -35,6 +37,8 @@ PROG = perl-Authen-SASL DEPS = PAK_VER = 3 +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/perl-Carp-Clan b/lfs/perl-Carp-Clan index ce5e92649..4d52b16b0 100644 --- a/lfs/perl-Carp-Clan +++ b/lfs/perl-Carp-Clan @@ -24,6 +24,9 @@ ############################################################################### include Config + +SUMMARY = Perl extension for reporting errors from perspective of caller of a "clan" of modules + VER = 6.08 THISAPP = Carp-Clan-$(VER) @@ -35,6 +38,8 @@ PROG = perl-Carp-Clan DEPS = PAK_VER = 6 +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/perl-Date-Calc b/lfs/perl-Date-Calc index 2b263596a..50500dc50 100644 --- a/lfs/perl-Date-Calc +++ b/lfs/perl-Date-Calc @@ -23,6 +23,9 @@ # Definitions ############################################################################### include Config + +SUMMARY = Perl extension for Gregorian calendar date calculations + VER = 6.4 THISAPP = Date-Calc-$(VER) @@ -34,6 +37,8 @@ PROG = perl-Date-Calc DEPS = perl-Carp-Clan PAK_VER = 6 +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/perl-Date-Manip b/lfs/perl-Date-Manip index 3c3472b53..4514ad841 100644 --- a/lfs/perl-Date-Manip +++ b/lfs/perl-Date-Manip @@ -23,6 +23,9 @@ # Definitions ############################################################################### include Config + +SUMMARY = Perl extension adding date manipulation routines + VER = 6.85 THISAPP = Date-Manip-$(VER) @@ -34,6 +37,8 @@ PROG = perl-Date-Manip DEPS = PAK_VER = 7 +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/perl-File-ReadBackwards b/lfs/perl-File-ReadBackwards index 16507972a..a778ca95e 100644 --- a/lfs/perl-File-ReadBackwards +++ b/lfs/perl-File-ReadBackwards @@ -24,6 +24,8 @@ include Config +SUMMARY = Perl extension to read a file backwards by lines + VER = 1.05 THISAPP = File-ReadBackwards-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 3 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/perl-File-Tail b/lfs/perl-File-Tail index 6b979ef87..c310404ac 100644 --- a/lfs/perl-File-Tail +++ b/lfs/perl-File-Tail @@ -24,6 +24,9 @@ ############################################################################### include Config + +SUMMARY = Perl extension for reading from continously updated files + VER = 1.3 THISAPP = File-Tail-$(VER) @@ -35,6 +38,8 @@ PROG = perl-File-Tail DEPS = PAK_VER = 6 +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/perl-MIME-Base64 b/lfs/perl-MIME-Base64 index 95f56bf5d..1f98a7f18 100644 --- a/lfs/perl-MIME-Base64 +++ b/lfs/perl-MIME-Base64 @@ -24,6 +24,8 @@ include Config +SUMMARY = Perl extension for encoding and decoding of base64 strings + VER = 3.16 THISAPP = MIME-Base64-$(VER) @@ -35,6 +37,8 @@ PROG = perl-MIME-Base64 DEPS = PAK_VER = 4 +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/perl-Net-IP b/lfs/perl-Net-IP index b840f9bae..65f916322 100644 --- a/lfs/perl-Net-IP +++ b/lfs/perl-Net-IP @@ -23,6 +23,9 @@ # Definitions ############################################################################### include Config + +SUMMARY = Perl extension for manipulating IPv4/IPv6 addresses + VER = 1.26 THISAPP = Net-IP-$(VER) @@ -35,6 +38,8 @@ PROG = perl-Net-IP DEPS = PAK_VER = 3 +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/perl-Net-SMTP-SSL b/lfs/perl-Net-SMTP-SSL index 39ba15abe..66c7c446f 100644 --- a/lfs/perl-Net-SMTP-SSL +++ b/lfs/perl-Net-SMTP-SSL @@ -24,6 +24,8 @@ include Config +SUMMARY = Perl extension adding SSL support for Net::SMTP + VER = 1.04 THISAPP = Net-SMTP-SSL-$(VER) @@ -35,6 +37,8 @@ PROG = perl-Net-SMTP-SSL DEPS = PAK_VER = 4 +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/perl-Parse-Yapp b/lfs/perl-Parse-Yapp index b93bfc8b7..9b3ac5671 100644 --- a/lfs/perl-Parse-Yapp +++ b/lfs/perl-Parse-Yapp @@ -24,6 +24,8 @@ ############################################################################### include Config +SUMMARY = Perl extension for generating and using LALR parsers + VER = 1.21 THISAPP = Parse-Yapp-$(VER) @@ -35,6 +37,8 @@ PROG = perl-Parse-Yapp DEPS = PAK_VER = 2 +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/perl-TimeDate b/lfs/perl-TimeDate index fa5fae7a4..612d84db1 100644 --- a/lfs/perl-TimeDate +++ b/lfs/perl-TimeDate @@ -23,6 +23,9 @@ # Definitions ############################################################################### include Config + +SUMMARY = TimeDate Perl module + VER = 2.33 THISAPP = TimeDate-$(VER) @@ -34,6 +37,8 @@ PROG = perl-TimeDate DEPS = PAK_VER = 6 +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/perl-common-sense b/lfs/perl-common-sense index 42ea4a77d..df57beddd 100644 --- a/lfs/perl-common-sense +++ b/lfs/perl-common-sense @@ -23,6 +23,9 @@ # Definitions ############################################################################### include Config + +SUMMARY = Save a tree AND a kitten, use common::sense! + VER = 3.74 THISAPP = common-sense-$(VER) @@ -35,6 +38,8 @@ PROG = perl-common-sense DEPS = PAK_VER = 3 +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/perl-gettext b/lfs/perl-gettext index 4fd9fe8c7..a2a51ba28 100644 --- a/lfs/perl-gettext +++ b/lfs/perl-gettext @@ -25,6 +25,8 @@ include Config +SUMMARY = Perl extension adding message handling functions + VER = 1.05 THISAPP = perl-gettext-$(VER) @@ -36,6 +38,8 @@ PROG = perl-gettext DEPS = PAK_VER = 5 +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/perl-inotify2 b/lfs/perl-inotify2 index f02c34ecd..2403165c8 100644 --- a/lfs/perl-inotify2 +++ b/lfs/perl-inotify2 @@ -25,6 +25,7 @@ include Config +SUMMARY = Perl extension for Scalable directory/file change notification VER = 1.22 THISAPP = Linux-Inotify2-$(VER) @@ -37,6 +38,8 @@ PROG = perl-inotify2 DEPS = perl-common-sense PAK_VER = 3 +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/pmacct b/lfs/pmacct index 2307f8c87..9fef56729 100644 --- a/lfs/pmacct +++ b/lfs/pmacct @@ -24,6 +24,8 @@ include Config +SUMMARY = Accounting and aggregation toolsuite for IPv4 and IPv6 + VER = 1.7.6 THISAPP = pmacct-$(VER) @@ -37,6 +39,8 @@ PAK_VER = 2 DEPS = libcdada +SERVICES = pmacct + ############################################################################### # Top-level Rules ############################################################################### @@ -95,7 +99,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install #install initscripts - $(call INSTALL_INITSCRIPT,pmacct) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) # Install backup definition install -v -m 644 ${DIR_SRC}/config/backup/includes/pmacct \ /var/ipfire/backup/addons/includes/pmacct diff --git a/lfs/postfix b/lfs/postfix index 3735f7e69..c911af056 100644 --- a/lfs/postfix +++ b/lfs/postfix @@ -24,6 +24,8 @@ include Config +SUMMARY = A fast, secure, and flexible mailer + VER = 3.6.1 THISAPP = postfix-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 31 DEPS = +SERVICES = postfix + CCARGS = `getconf LFS_CFLAGS` \ -DDEF_DAEMON_DIR="'\"/usr/lib/postfix\"'" \ -DDEF_MANPAGE_DIR="'\"/usr/share/man\"'" \ @@ -113,7 +117,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) mv /usr/sbin/sendmail /usr/sbin/sendmail.postfix #install initscripts - $(call INSTALL_INITSCRIPT,postfix) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/powertop b/lfs/powertop index b27ef8f37..c21853797 100644 --- a/lfs/powertop +++ b/lfs/powertop @@ -24,6 +24,8 @@ include Config +SUMMARY = A Linux Tool to Find out What is Using Power on a Laptop + VER = v2.10 THISAPP = powertop-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 3 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/python-setuptools b/lfs/python-setuptools index 1ffcfca18..f003814ee 100644 --- a/lfs/python-setuptools +++ b/lfs/python-setuptools @@ -24,6 +24,8 @@ include Config +SUMMARY = Enhancements to distutils for building and distributing Python packages + VER = 0.6c11 THISAPP = setuptools-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 2 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/python3-botocore b/lfs/python3-botocore index 2413511d3..2d022c9ab 100644 --- a/lfs/python3-botocore +++ b/lfs/python3-botocore @@ -24,6 +24,8 @@ include Config +SUMMARY = Python interface for AWS + VER = 1.19.28 THISAPP = botocore-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 3 DEPS = python3-dateutil python3-jmespath python3-urllib3 +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/python3-colorama b/lfs/python3-colorama index 3dcef17d2..b4c284139 100644 --- a/lfs/python3-colorama +++ b/lfs/python3-colorama @@ -24,6 +24,8 @@ include Config +SUMMARY = Cross-platform colored terminal text + VER = 0.4.3 THISAPP = colorama-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 3 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/python3-dateutil b/lfs/python3-dateutil index 04bc39cf1..2e39257d8 100644 --- a/lfs/python3-dateutil +++ b/lfs/python3-dateutil @@ -24,6 +24,8 @@ include Config +SUMMARY = Python library for working with date and datetime objects + VER = 2.8.1 THISAPP = python-dateutil-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 4 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/python3-docutils b/lfs/python3-docutils index 3756feb57..6412bd5aa 100644 --- a/lfs/python3-docutils +++ b/lfs/python3-docutils @@ -24,6 +24,8 @@ include Config +SUMMARY = Python Documentation Utilities + VER = 0.16 THISAPP = docutils-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 4 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/python3-jmespath b/lfs/python3-jmespath index d49a429a6..41637ce58 100644 --- a/lfs/python3-jmespath +++ b/lfs/python3-jmespath @@ -24,6 +24,8 @@ include Config +SUMMARY = Python module for declarative JSON document element extraction + VER = 0.9.5 THISAPP = jmespath-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 3 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/python3-msgpack b/lfs/python3-msgpack index dc764f5b3..2013dfb45 100644 --- a/lfs/python3-msgpack +++ b/lfs/python3-msgpack @@ -24,6 +24,8 @@ include Config +SUMMARY = MessagePack (de)serializer + VER = 0.5.6 THISAPP = msgpack-python-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 2 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/python3-pyasn1 b/lfs/python3-pyasn1 index f8ecfa1d8..6031e43d8 100644 --- a/lfs/python3-pyasn1 +++ b/lfs/python3-pyasn1 @@ -24,6 +24,8 @@ include Config +SUMMARY = ASN.1 types and codecs + VER = 0.4.8 THISAPP = pyasn1-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 3 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/python3-pyparsing b/lfs/python3-pyparsing index 45e960a2b..067313f7d 100644 --- a/lfs/python3-pyparsing +++ b/lfs/python3-pyparsing @@ -24,6 +24,8 @@ include Config +SUMMARY = Grammar Parser Library for Python + VER = 2.4.7 THISAPP = pyparsing-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 3 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/python3-rsa b/lfs/python3-rsa index 79a835220..086afcc18 100644 --- a/lfs/python3-rsa +++ b/lfs/python3-rsa @@ -24,6 +24,8 @@ include Config +SUMMARY = Pure-Python RSA Implementation + VER = 4.0 THISAPP = rsa-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 3 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/python3-s3transfer b/lfs/python3-s3transfer index 365200448..cfabb57dd 100644 --- a/lfs/python3-s3transfer +++ b/lfs/python3-s3transfer @@ -24,6 +24,8 @@ include Config +SUMMARY = Python S3 transfer manager + VER = 0.3.3 THISAPP = s3transfer-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 3 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/python3-setuptools b/lfs/python3-setuptools index 3c765d2a8..23cd2e7af 100644 --- a/lfs/python3-setuptools +++ b/lfs/python3-setuptools @@ -24,6 +24,8 @@ include Config +SUMMARY = Enhancements to distutils for building and distributing Python packages + VER = 56.2.0 THISAPP = setuptools-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 3 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/python3-setuptools-scm b/lfs/python3-setuptools-scm index 048d92895..e0398a4fd 100644 --- a/lfs/python3-setuptools-scm +++ b/lfs/python3-setuptools-scm @@ -24,6 +24,8 @@ include Config +SUMMARY = Python setuptools handler for SCM tags + VER = 3.2.0 THISAPP = setuptools_scm-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 1 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/python3-six b/lfs/python3-six index 9d467f273..6bb5731ff 100644 --- a/lfs/python3-six +++ b/lfs/python3-six @@ -24,6 +24,8 @@ include Config +SUMMARY = Python 2 and 3 compatibility utilities + VER = 1.14.0 THISAPP = six-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 3 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/python3-urllib3 b/lfs/python3-urllib3 index 30ea26f2d..10cb003e0 100644 --- a/lfs/python3-urllib3 +++ b/lfs/python3-urllib3 @@ -24,6 +24,8 @@ include Config +SUMMARY = HTTP library with thread-safe connection pooling, file post, and more + VER = 1.26.2 THISAPP = urllib3-$(VER) @@ -34,6 +36,10 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = python3-urllib3 PAK_VER = 1 +DEPS = + +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/python3-yaml b/lfs/python3-yaml index b8cda7f40..6aae4a0e8 100644 --- a/lfs/python3-yaml +++ b/lfs/python3-yaml @@ -24,6 +24,8 @@ include Config +SUMMARY = YAML parser and emitter for Python + VER = 3.13 THISAPP = PyYAML-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 2 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/qemu b/lfs/qemu index 689dba96d..87b10ae2d 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -24,6 +24,8 @@ include Config +SUMMARY = Machine emulator and virtualizer + VER = 5.2.0 THISAPP = qemu-$(VER) @@ -37,6 +39,8 @@ PAK_VER = 30 DEPS = libusbredir spice libseccomp +SERVICES = + TARGETS = \ i386-linux-user \ x86_64-linux-user \ diff --git a/lfs/rpcbind b/lfs/rpcbind index 39d4dba4d..007d2f1f3 100644 --- a/lfs/rpcbind +++ b/lfs/rpcbind @@ -24,6 +24,8 @@ include Config +SUMMARY = Transport independent RPC portmapper + VER = 1.2.5 THISAPP = rpcbind-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 4 DEPS = libtirpc +SERVICES = rpcbind + ############################################################################### # Top-level Rules ############################################################################### @@ -87,6 +91,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install #install initscripts - $(call INSTALL_INITSCRIPT,rpcbind) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/rsync b/lfs/rsync index 3195438a4..714e14c1a 100644 --- a/lfs/rsync +++ b/lfs/rsync @@ -24,6 +24,8 @@ include Config +SUMMARY = Versatile tool for fast incremental file transfer + VER = 3.2.3 THISAPP = rsync-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 13 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/samba b/lfs/samba index bcb65668a..161493ea4 100644 --- a/lfs/samba +++ b/lfs/samba @@ -24,6 +24,8 @@ include Config +SUMMARY = A SMB/CIFS File, Print, and Authentication Server + VER = 4.14.6 THISAPP = samba-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 81 DEPS = avahi cups libtirpc krb5 perl-Parse-Yapp +SERVICES = samba + ############################################################################### # Top-level Rules ############################################################################### @@ -118,7 +122,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) install -m 755 $(DIR_SRC)/config/samba/samba-change-password /usr/sbin/samba-change-password #install initscripts - $(call INSTALL_INITSCRIPT,samba) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/sarg b/lfs/sarg index 6a8b52e6c..b20ce29f9 100644 --- a/lfs/sarg +++ b/lfs/sarg @@ -24,6 +24,8 @@ include Config +SUMMARY = Squid Analysis Report Generator + VER = 2.4.0 THISAPP = sarg-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 5 DEPS = +SERVICES = + CFLAGS += -fcommon ############################################################################### diff --git a/lfs/sdl b/lfs/sdl index 0e96af04d..bfe4b845c 100644 --- a/lfs/sdl +++ b/lfs/sdl @@ -24,6 +24,8 @@ include Config +SUMMARY = Simple DirectMedia Layer Library + VER = 1.2.15 THISAPP = SDL-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 3 DEPS = alsa +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/shairport-sync b/lfs/shairport-sync index 6ec986bbe..f0f9ac385 100644 --- a/lfs/shairport-sync +++ b/lfs/shairport-sync @@ -24,6 +24,8 @@ include Config +SUMMARY = An AirPlay audio player + VER = 3.3.7 THISAPP = shairport-sync-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 5 DEPS = alac alsa avahi libdaemon soxr +SERVICES = shairport-sync + ############################################################################### # Top-level Rules ############################################################################### @@ -95,7 +99,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) /var/ipfire/backup/addons/includes/shairport-sync # Initscript - $(call INSTALL_INITSCRIPT,shairport-sync) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/socat b/lfs/socat index 7b001e9d1..02ef43516 100644 --- a/lfs/socat +++ b/lfs/socat @@ -25,6 +25,8 @@ include Config +SUMMARY = Multipurpose relay for bidirectional data transfer + VER = 1.7.3.4 THISAPP = socat-$(VER) @@ -37,6 +39,8 @@ PAK_VER = 1 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/sox b/lfs/sox index 8388c57fc..2ca7c204e 100644 --- a/lfs/sox +++ b/lfs/sox @@ -24,6 +24,8 @@ include Config +SUMMARY = Sound Conversion Tools + VER = 14.4.2 THISAPP = sox-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 2 DEPS = libvorbis +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/soxr b/lfs/soxr index 1660a13ff..f55e3caac 100644 --- a/lfs/soxr +++ b/lfs/soxr @@ -24,6 +24,8 @@ include Config +SUMMARY = The SoX Resampler library + VER = 0.1.3 THISAPP = soxr-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 1 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/spandsp b/lfs/spandsp index 25a3dae1b..53898a11e 100644 --- a/lfs/spandsp +++ b/lfs/spandsp @@ -24,6 +24,8 @@ include Config +SUMMARY = A DSP library for Telephony and SoftFAX + VER = 0.0.6 THISAPP = spandsp-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 5 DEPS = libtiff +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/spectre-meltdown-checker b/lfs/spectre-meltdown-checker index 063ef727e..36cc7ccd8 100644 --- a/lfs/spectre-meltdown-checker +++ b/lfs/spectre-meltdown-checker @@ -24,6 +24,8 @@ include Config +SUMMARY = Spectre & Meltdown Vulnerability Checker + VER = 0.44 THISAPP = spectre-meltdown-checker-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 5 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/speedtest-cli b/lfs/speedtest-cli index f6bcf4c96..3b9751364 100644 --- a/lfs/speedtest-cli +++ b/lfs/speedtest-cli @@ -24,6 +24,8 @@ include Config +SUMMARY = Command line interface for testing internet bandwidth + VER = 2.1.3 THISAPP = speedtest-cli-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 4 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/spice b/lfs/spice index d1f56e708..e7ccd844a 100644 --- a/lfs/spice +++ b/lfs/spice @@ -24,6 +24,8 @@ include Config +SUMMARY = A remote display system built for virtual environments + VER = 0.14.0 THISAPP = spice-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 5 DEPS = opus +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/spice-protocol b/lfs/spice-protocol index 00f2e57b3..45f5cd8b4 100644 --- a/lfs/spice-protocol +++ b/lfs/spice-protocol @@ -24,6 +24,8 @@ include Config +SUMMARY = SPICE-protocol definitions + VER = 0.12.13 THISAPP = spice-protocol-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 3 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/squid-accounting b/lfs/squid-accounting index 77742554e..9476382b3 100644 --- a/lfs/squid-accounting +++ b/lfs/squid-accounting @@ -9,6 +9,8 @@ include Config +SUMMARY = SQUID Accounting IPFire extension + VER = 1.0.4 THISAPP = squid-accounting-$(VER) @@ -19,6 +21,8 @@ PAK_VER = 13 DEPS = perl-File-ReadBackwards +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/squidclamav b/lfs/squidclamav index b4f79ab96..c73e37da8 100644 --- a/lfs/squidclamav +++ b/lfs/squidclamav @@ -24,6 +24,8 @@ include Config +SUMMARY = Antivirus redirector for Squid based on ClamAv + VER = 5.11 THISAPP = squidclamav-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 21 DEPS = clamav +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/sslh b/lfs/sslh index c5e8cdd63..4926ee816 100644 --- a/lfs/sslh +++ b/lfs/sslh @@ -24,6 +24,8 @@ include Config +SUMMARY = SSL/SSH multiplexer + VER = 1.7a THISAPP = sslh-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 5 DEPS = +SERVICES = sslh + ############################################################################### # Top-level Rules ############################################################################### @@ -81,7 +85,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && install -v -m 755 sslh /usr/sbin #install initscripts - $(call INSTALL_INITSCRIPT,sslh) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/strace b/lfs/strace index d24918626..0a1984864 100644 --- a/lfs/strace +++ b/lfs/strace @@ -24,6 +24,8 @@ include Config +SUMMARY = A utility to trace the system calls of a program + VER = 5.11 SUP_ARCHES = x86_64 i586 armv6l aarch64 @@ -37,6 +39,8 @@ PAK_VER = 5 DEPS = elfutils +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/stress b/lfs/stress index bf336eb96..1c18b1752 100644 --- a/lfs/stress +++ b/lfs/stress @@ -9,6 +9,8 @@ include Config +SUMMARY = Tool to load and stress a computer + VER = 1.0.4 THISAPP = stress-$(VER) @@ -21,6 +23,8 @@ PAK_VER = 1 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/stunnel b/lfs/stunnel index 0b6524e01..9df9b96a3 100644 --- a/lfs/stunnel +++ b/lfs/stunnel @@ -24,6 +24,8 @@ include Config +SUMMARY = Universal TLS Tunnel + VER = 5.58 THISAPP = stunnel-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 7 DEPS = +SERVICES = stunnel + ############################################################################### # Top-level Rules ############################################################################### @@ -89,7 +93,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) chown -v stunnel:stunnel /var/lib/stunnel #install initscripts - $(call INSTALL_INITSCRIPT,stunnel) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) # Install default configuration diff --git a/lfs/swatch b/lfs/swatch index 93f858ae6..d6e107342 100644 --- a/lfs/swatch +++ b/lfs/swatch @@ -24,6 +24,8 @@ include Config +SUMMARY = The Simple WATCHdog + VER = 3.2.4 THISAPP = swatchdog-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 5 DEPS = perl-File-Tail perl-Date-Calc perl-TimeDate perl-Date-Manip +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/sysbench b/lfs/sysbench index f39fd45df..55ec46ed1 100644 --- a/lfs/sysbench +++ b/lfs/sysbench @@ -9,6 +9,8 @@ include Config +SUMMARY = A MySQL benchmarking tool + VER = 1.0.20 THISAPP = sysbench-$(VER) @@ -22,6 +24,8 @@ PAK_VER = 2 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/taglib b/lfs/taglib index 101d64662..bb37c5b96 100644 --- a/lfs/taglib +++ b/lfs/taglib @@ -24,6 +24,8 @@ include Config +SUMMARY = Audio Meta-Data Library + VER = 1.11.1 THISAPP = taglib-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 2 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/tcpdump b/lfs/tcpdump index 2fcac6d4c..032b8582c 100644 --- a/lfs/tcpdump +++ b/lfs/tcpdump @@ -24,6 +24,8 @@ include Config +SUMMARY = A Packet Sniffer + VER = 4.99.1 THISAPP = tcpdump-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 13 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/telnet b/lfs/telnet index 8761b14f2..7bae0cc16 100644 --- a/lfs/telnet +++ b/lfs/telnet @@ -24,7 +24,10 @@ include Config +SUMMARY = A client program for the telnet remote login protocol + VER = 0.17 + THISAPP = netkit-telnet-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) @@ -35,6 +38,8 @@ PAK_VER = 1 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/tftpd b/lfs/tftpd index aec900d8a..63ebd632a 100644 --- a/lfs/tftpd +++ b/lfs/tftpd @@ -24,6 +24,8 @@ include Config +SUMMARY = A conglomerate of a number of versions of the BSD TFTP code + VER = 5.2 THISAPP = tftp-hpa-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 2 DEPS = +SERVICES = tftpd + CFLAGS += -fcommon ############################################################################### @@ -84,6 +88,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make install mv -fv /usr/sbin/in.tftpd /usr/sbin/tftpd #install initscripts - $(call INSTALL_INITSCRIPT,tftpd) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/tmux b/lfs/tmux index e55d38a27..918712e77 100644 --- a/lfs/tmux +++ b/lfs/tmux @@ -24,6 +24,8 @@ include Config +SUMMARY = Terminal multiplexer + VER = 3.2a THISAPP = tmux-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 9 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/tor b/lfs/tor index 97f2cf04e..3e9499daf 100644 --- a/lfs/tor +++ b/lfs/tor @@ -24,6 +24,8 @@ include Config +SUMMARY = Anonymizing overlay network for TCP (The onion router) + VER = 0.4.6.5 THISAPP = tor-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 62 DEPS = libseccomp +SERVICES = tor + ############################################################################### # Top-level Rules ############################################################################### @@ -108,7 +112,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) /usr/share/tor/defaults-torrc # Install initscripts - $(call INSTALL_INITSCRIPT,tor) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) # Install start links and backup include file. ln -sf ../init.d/tor /etc/rc.d/rc3.d/S60tor diff --git a/lfs/traceroute b/lfs/traceroute index 87157ff42..4d420c07e 100644 --- a/lfs/traceroute +++ b/lfs/traceroute @@ -24,6 +24,8 @@ include Config +SUMMARY = Packet route path tracing utility + VER = 2.0.18 THISAPP = traceroute-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 3 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/transmission b/lfs/transmission index d9c82aaae..f06f0be08 100644 --- a/lfs/transmission +++ b/lfs/transmission @@ -24,6 +24,8 @@ include Config +SUMMARY = A BitTorrent client with multiple UIs + VER = 3.00 THISAPP = transmission-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 17 DEPS = +SERVICES = transmission + CXXFLAGS += -fno-exceptions ############################################################################### @@ -89,7 +93,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) chown -Rv nobody.nobody /etc/transmission #install initscripts - $(call INSTALL_INITSCRIPT,transmission) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) # Install backup include install -v -m 644 $(DIR_SRC)/config/backup/includes/transmission \ diff --git a/lfs/tshark b/lfs/tshark index 5c62d0968..676fc4ab2 100644 --- a/lfs/tshark +++ b/lfs/tshark @@ -24,6 +24,8 @@ include Config +SUMMARY = A Network Traffic Analyser + VER = 3.4.7 THISAPP = wireshark-$(VER) @@ -35,6 +37,8 @@ PROG = tshark DEPS = krb5 c-ares PAK_VER = 11 +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/util-macros b/lfs/util-macros index 90a4ac135..71bdf0277 100644 --- a/lfs/util-macros +++ b/lfs/util-macros @@ -24,6 +24,8 @@ include Config +SUMMARY = A set of autoconf macros for Xorg modular packages + VER = 1.19.0 THISAPP = util-macros-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 1 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/vdr b/lfs/vdr index 5c7c1ac15..8cac18138 100644 --- a/lfs/vdr +++ b/lfs/vdr @@ -24,6 +24,8 @@ include Config +SUMMARY = Video Disk Recorder + VER = 2.4.7 # VDRPLUGVER must match with APIVERSION! in config.h @@ -41,6 +43,8 @@ PAK_VER = 13 DEPS = vdr_streamdev +SERVICES = vdr + CXXFLAGS += -std=c++11 MAKE_OPTIONS = \ @@ -134,7 +138,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) ln -svf ../../include/vdr/device.h /usr/lib/vdr/device.h #install initscripts - $(call INSTALL_INITSCRIPT,vdr) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) # Install start links and backup include file. ln -sf ../init.d/vdr /etc/rc.d/rc3.d/S60vdr diff --git a/lfs/vdr_dvbapi b/lfs/vdr_dvbapi index adf60b39d..3fb8d54f9 100644 --- a/lfs/vdr_dvbapi +++ b/lfs/vdr_dvbapi @@ -24,6 +24,8 @@ include Config +SUMMARY = DVBAPI plugin for VDR + VER = 2.2.5 THISAPP = vdr-plugin-dvbapi-$(VER) @@ -37,6 +39,8 @@ PAK_VER = 5 DEPS = +SERVICES = + VDRPLUGVER = 2.4.7 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE diff --git a/lfs/vdr_eepg b/lfs/vdr_eepg index 40b7811aa..bdaf4ace8 100644 --- a/lfs/vdr_eepg +++ b/lfs/vdr_eepg @@ -24,6 +24,8 @@ include Config +SUMMARY = Extended EPG (EEPG) plugin for VDR + GIT_VER = 32b4e669bf8bc6e3336073616c121f10b8518fe8 VER = master @@ -40,6 +42,8 @@ PAK_VER = 5 DEPS = +SERVICES = + VDRPLUGVER = 2.4.7 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE diff --git a/lfs/vdr_epgsearch b/lfs/vdr_epgsearch index f2a88f87b..5b67969a5 100644 --- a/lfs/vdr_epgsearch +++ b/lfs/vdr_epgsearch @@ -24,6 +24,8 @@ include Config +SUMMARY = Searchtimer and replacement of the VDR program menu + VER = 2.4.0+git20191101 THISAPP = vdr-plugin-epgsearch_$(VER).orig @@ -37,6 +39,8 @@ PAK_VER = 11 DEPS = +SERVICES = + VDRPLUGVER = 2.4.7 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE diff --git a/lfs/vdr_streamdev b/lfs/vdr_streamdev index 58c5a6438..ee4590d7a 100644 --- a/lfs/vdr_streamdev +++ b/lfs/vdr_streamdev @@ -24,6 +24,8 @@ include Config +SUMMARY = VDR implementation of the VTP (Video Transfer Protocol) + VER = 0.6.1 GIT_VER = e2a9b979d3fb92967c7a6a8221e674eb7e55c813 @@ -38,6 +40,8 @@ PAK_VER = 6 DEPS = +SERVICES = + VDRPLUGVER = 2.4.7 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE diff --git a/lfs/vdradmin b/lfs/vdradmin index 346b19489..2abf8a943 100644 --- a/lfs/vdradmin +++ b/lfs/vdradmin @@ -25,6 +25,8 @@ include Config +SUMMARY = VDRAdmin-AM, a web user interface for VDR + VER = 3.6.10 THISAPP = vdradmin-am-$(VER) @@ -37,6 +39,8 @@ PAK_VER = 6 DEPS = perl-gettext vdr vdr_epgsearch +SERVICES = vdradmin + ############################################################################### # Top-level Rules ############################################################################### @@ -83,7 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ./install-ipfire.sh #install initscripts - $(call INSTALL_INITSCRIPT,vdradmin) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) install -v -m 644 $(DIR_SRC)/config/vdradmin/vdradmind.conf \ /etc/vdradmin/vdradmind.conf diff --git a/lfs/w_scan b/lfs/w_scan index df8d3ffe9..571703381 100644 --- a/lfs/w_scan +++ b/lfs/w_scan @@ -24,6 +24,7 @@ include Config +SUMMARY = Tool for scanning DVB transponders VER = 20170107 @@ -37,6 +38,8 @@ PAK_VER = 7 DEPS = +SERVICES = + CFLAGS += -fcommon ############################################################################### diff --git a/lfs/watchdog b/lfs/watchdog index 67438434c..c84de5abc 100644 --- a/lfs/watchdog +++ b/lfs/watchdog @@ -24,6 +24,8 @@ include Config +SUMMARY = Watchdog Timer Interfaces For The Linux Operating System + VER = 5.16 THISAPP = watchdog-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 5 DEPS = +SERVICES = watchdog + ############################################################################### # Top-level Rules ############################################################################### @@ -81,7 +85,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install #install initscripts - $(call INSTALL_INITSCRIPT,watchdog) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) install -v -m 644 $(DIR_SRC)/config/backup/includes/watchdog \ /var/ipfire/backup/addons/includes/watchdog @rm -rf $(DIR_APP) diff --git a/lfs/wavemon b/lfs/wavemon index 8b66f4dfd..2db9cc767 100644 --- a/lfs/wavemon +++ b/lfs/wavemon @@ -9,6 +9,8 @@ include Config +SUMMARY = An ncurses monitoring application for wireless network devices + VER = 0.7.5 THISAPP = wavemon-$(VER) @@ -21,6 +23,8 @@ PAK_VER = 1 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/wio b/lfs/wio index c54cd3f31..f117fc2c8 100644 --- a/lfs/wio +++ b/lfs/wio @@ -9,6 +9,8 @@ include Config +SUMMARY = Who Is Online? IPFire extension + VER = 1.3.2 THISAPP = wio-$(VER) @@ -17,6 +19,10 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = wio PAK_VER = 13 +DEPS = + +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/xinetd b/lfs/xinetd index d3196beef..5ba90ea42 100644 --- a/lfs/xinetd +++ b/lfs/xinetd @@ -24,6 +24,8 @@ include Config +SUMMARY = An 'inetd' with Expanded Functionality + VER = 2.3.15 THISAPP = xinetd-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 2 DEPS = libtirpc +SERVICES = xinetd + CFLAGS += -fcommon -I/usr/include/tirpc -Wl,-ltirpc ############################################################################### @@ -88,7 +92,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cp -f $(DIR_SRC)/config/xinetd/xinetd.conf /etc/xinetd.conf #install initscripts - $(call INSTALL_INITSCRIPT,xinetd) + $(call INSTALL_INITSCRIPTS,$(SERVICES)) @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/xvid b/lfs/xvid index c26c5c271..45f5e9304 100644 --- a/lfs/xvid +++ b/lfs/xvid @@ -24,6 +24,8 @@ include Config +SUMMARY = Xvid is a high quality MPEG-4 ASP video codec + VER = 1.3.7 THISAPP = xvidcore-$(VER) @@ -36,6 +38,8 @@ PAK_VER = 3 DEPS = +SERVICES = + ############################################################################### # Top-level Rules ############################################################################### diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd index c69643a54..dbf6f2d77 100644 --- a/lfs/zabbix_agentd +++ b/lfs/zabbix_agentd @@ -24,6 +24,8 @@ include Config +SUMMARY = Zabbix Agent + VER = 4.2.6 THISAPP = zabbix-$(VER) @@ -35,6 +37,8 @@ PROG = zabbix_agentd PAK_VER = 4 DEPS = +SERVICES = zabbix_agentd + ############################################################################### # Top-level Rules ############################################################################### @@ -106,7 +110,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) chown zabbix.zabbix /var/run/zabbix # Install initscripts - $(call INSTALL_INITSCRIPT,zabbix_agentd) + @$(call INSTALL_INITSCRIPTS,$(SERVICES)) # Install sudoers include file install -v -m 644 $(DIR_SRC)/config/zabbix_agentd/sudoers \