From patchwork Wed Jan 13 14:59:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 3797 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) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4DG9kB22hdz3wgX for ; Wed, 13 Jan 2021 15:05:54 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4DG9k72SY0z4h8; Wed, 13 Jan 2021 15:05:51 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4DG9Zx0ptPz2xkF; Wed, 13 Jan 2021 14:59:37 +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) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4DG9Zv1JXvz2xWW for ; Wed, 13 Jan 2021 14:59:35 +0000 (UTC) Received: from smtpq4.tb.mail.iss.as9143.net (smtpq4.tb.mail.iss.as9143.net [212.54.42.167]) (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 4DG9Zt0jwlzBT for ; Wed, 13 Jan 2021 14:59:34 +0000 (UTC) Received: from [212.54.42.110] (helo=smtp7.tb.mail.iss.as9143.net) by smtpq4.tb.mail.iss.as9143.net with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzhcS-0004gd-JI; Wed, 13 Jan 2021 15:59:32 +0100 Received: from j103033.upc-j.chello.nl ([24.132.103.33] helo=rhea.saturn.pimb.org) by smtp7.tb.mail.iss.as9143.net with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1kzhcR-005MkM-Sx; Wed, 13 Jan 2021 15:59:32 +0100 Received: from hyperion.saturn.pimb.org (hyperion.saturn.pimb.org [192.168.26.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by rhea.saturn.pimb.org (Postfix) with ESMTPSA id 77DA53E2B; Wed, 13 Jan 2021 15:59:31 +0100 (CET) From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 1/5] fuse: Convert from core to addon Date: Wed, 13 Jan 2021 15:59:20 +0100 Message-Id: <20210113145920.3660000-1-ahb.ipfire@gmail.com> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 X-SourceIP: 24.132.103.33 X-Authenticated-Sender: adolf.belka@ziggo.nl (via SMTP) X-Ziggo-spambar: / X-Ziggo-spamscore: 0.0 X-Ziggo-spamreport: CMAE Analysis: v=2.4 cv=VtOdv86n c=1 sm=1 tr=0 ts=5fff0ad4 a=N0UC3/faf55XGTeY5t7zSQ==:17 a=9+rZDBEiDlHhcck0kWbJtElFXBc=:19 a=EmqxpYm9HcoA:10 a=x7bEGLp0ZPQA:10 a=6yxbeI8x3IIA:10 a=pGLkceISAAAA:8 a=2jW0gPRiAAAA:8 a=uLk7Xll30wAbf7HajxAA:9 a=3VCx8bP5vPwQSM_nLb0P:22 X-Ziggo-Spam-Status: No X-Spam-Status: No X-Spam-Flag: No ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=none; spf=softfail (mail01.ipfire.org: 212.54.42.167 is neither permitted nor denied by domain of ahbipfire@gmail.com) smtp.mailfrom=ahbipfire@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1610549974; 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; bh=UNBZhNpVIwYnH2AaSWnod4vtQyuSydo8cp9sL4mhid8=; b=xfhQe/cOkVBqYn4ypf7BpHA6d5FbE7StNS/yT6AOGdKnW1AVbqOM6DhJEKPDktzoGjWzJc Oz8kD/O0XKZtbf/sIqebcU6eWoYtyZT24UY6LsEWcbgdxTxB1LcqwXAhlXhEYyRRQWDvRz 0JO+7UOsp2OA6HbGsj5BY9anXs0yClyNCa7Ilm4mMdYTyGdxNPX550eF17ynS9pf6wzseC ZlkGWEFOqjxZpxhYuMLwMovt8qlbCbmYxyetpCH0RU7qdw9KXPTSJq4VlmTyE5QRYUwLOD CjIwkXe9RtXbfed+41HarJ86kXxHhh/K6ShuNcTJKYEUNETNIbKbuSJ+29oz0Q== ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1610549974; a=rsa-sha256; cv=none; b=k4Y3kC6VNxlMB7AMFf4fViTSKa6Psjxg0Bq43EfogNVRZVUk0HY9ihBTq5wXbTsszIyZr6 WgSTy9WohYUV6S0Io3hr5EPfSTOO1CtZbYCJpWPyxTShwSyKDt27toFqxpSIMqkcyOds0B HI+56GDoEUIwjt//ATFI5mPPFRY5hk7tdKGd2hosCBqyNF8cEuSw92Xm+Zh/w50LewBS6j zEz1TOu0WaF42QpVqPA61Ute+YthWfkgWTj6LBEYc49pourvicwlenAsx3cVVptcR1gdGu iNvTKIM438229qkb5EOS/9eTuZ4S9OW36RtWS7wHV+LhSWhSoPMlWBdypDujaQ== X-Rspamd-Queue-Id: 4DG9Zt0jwlzBT Authentication-Results: mail01.ipfire.org; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (mail01.ipfire.org: 212.54.42.167 is neither permitted nor denied by domain of ahbipfire@gmail.com) smtp.mailfrom=ahbipfire@gmail.com X-Rspamd-Server: mail01.haj.ipfire.org X-Spamd-Result: default: False [3.90 / 11.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; R_MISSING_CHARSET(2.50)[]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; BROKEN_CONTENT_TYPE(1.50)[]; R_SPF_SOFTFAIL(0.00)[~all]; RCVD_COUNT_THREE(0.00)[4]; RCPT_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:33915, ipnet:212.54.32.0/20, country:NL]; R_DKIM_NA(0.00)[]; HAS_X_AS(0.00)[]; RCVD_IN_DNSWL_LOW(-0.10)[212.54.42.110:received]; TAGGED_FROM(0.00)[]; ARC_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.10)[text/plain]; RECEIVED_SPAMHAUS_PBL(0.00)[24.132.103.33:received]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[212.54.42.167:from]; RWL_MAILSPIKE_VERYGOOD(0.00)[212.54.42.167:from]; FREEMAIL_CC(0.00)[gmail.com]; RCVD_TLS_ALL(0.00)[]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : No valid SPF, No valid DKIM,none] 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" - Convert the fuse package from core to addon - Modify lfs to include package version number - Create initscript that loads the fuse module when fuse is installed/started and unloads the module when fuse is uninstalled/stopped - Create install/uninstall/update scripts for fuse - Move the rootfile from common to packages - Update the rootfile - Split meson/ninja build statements into individual steps Signed-off-by: Adolf Belka --- config/rootfiles/common/fuse | 38 ------------------ config/rootfiles/packages/fuse | 21 ++++++++++ lfs/fuse | 25 ++++++++++-- src/initscripts/packages/fuse | 70 ++++++++++++++++++++++++++++++++++ src/paks/fuse/install.sh | 27 +++++++++++++ src/paks/fuse/uninstall.sh | 27 +++++++++++++ src/paks/fuse/update.sh | 27 +++++++++++++ 7 files changed, 194 insertions(+), 41 deletions(-) delete mode 100644 config/rootfiles/common/fuse create mode 100644 config/rootfiles/packages/fuse create mode 100644 src/initscripts/packages/fuse create mode 100644 src/paks/fuse/install.sh create mode 100644 src/paks/fuse/uninstall.sh create mode 100644 src/paks/fuse/update.sh diff --git a/config/rootfiles/common/fuse b/config/rootfiles/common/fuse deleted file mode 100644 index bae55b321..000000000 --- a/config/rootfiles/common/fuse +++ /dev/null @@ -1,38 +0,0 @@ -#etc/rc.d/init.d/fuse3 -#lib/udev/rules.d/99-fuse3.rules -etc/udev/rules.d/99-fuse3.rules -sbin/mount.fuse3 -usr/bin/fusermount3 -#usr/local/bin/fusermount3 -#usr/local/etc -#usr/local/etc/fuse.conf -#usr/local/include/fuse3 -#usr/local/include/fuse3/cuse_lowlevel.h -#usr/local/include/fuse3/fuse.h -#usr/local/include/fuse3/fuse_common.h -#usr/local/include/fuse3/fuse_log.h -#usr/local/include/fuse3/fuse_lowlevel.h -#usr/local/include/fuse3/fuse_opt.h -#usr/local/lib/libfuse3.so -#usr/local/lib/libfuse3.so.3 -#usr/local/lib/libfuse3.so.3.10.1 -#usr/local/lib/pkgconfig -#usr/local/lib/pkgconfig/fuse3.pc -#usr/local/sbin/mount.fuse3 -#usr/local/share/man/man1/fusermount3.1 -#usr/local/share/man/man8/mount.fuse3.8 -#etc/fuse.conf -#usr/include/fuse3 -#usr/include/fuse3/cuse_lowlevel.h -#usr/include/fuse3/fuse.h -#usr/include/fuse3/fuse_common.h -#usr/include/fuse3/fuse_log.h -#usr/include/fuse3/fuse_lowlevel.h -#usr/include/fuse3/fuse_opt.h -#usr/lib/libfuse3.so -usr/lib/libfuse3.so.3 -usr/lib/libfuse3.so.3.10.1 -#usr/lib/pkgconfig/fuse3.pc -#usr/sbin/mount.fuse3 -#usr/share/man/man1/fusermount3.1 -#usr/share/man/man8/mount.fuse3.8 diff --git a/config/rootfiles/packages/fuse b/config/rootfiles/packages/fuse new file mode 100644 index 000000000..917520bdf --- /dev/null +++ b/config/rootfiles/packages/fuse @@ -0,0 +1,21 @@ +#etc/fuse.conf +etc/rc.d/init.d/fuse +etc/rc.d/rc0.d/K35fuse +etc/rc.d/rc3.d/S65fuse +etc/rc.d/rc6.d/K35fuse +etc/udev/rules.d/99-fuse3.rules +sbin/mount.fuse3 +usr/bin/fusermount3 +#usr/include/fuse3 +#usr/include/fuse3/cuse_lowlevel.h +#usr/include/fuse3/fuse.h +#usr/include/fuse3/fuse_common.h +#usr/include/fuse3/fuse_log.h +#usr/include/fuse3/fuse_lowlevel.h +#usr/include/fuse3/fuse_opt.h +#usr/lib/libfuse3.so +usr/lib/libfuse3.so.3 +usr/lib/libfuse3.so.3.10.1 +#usr/lib/pkgconfig/fuse3.pc +#usr/share/man/man1/fusermount3.1 +#usr/share/man/man8/mount.fuse3.8 diff --git a/lfs/fuse b/lfs/fuse index 167612f68..c976bb4cd 100644 --- a/lfs/fuse +++ b/lfs/fuse @@ -31,6 +31,10 @@ DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) +PROG = fuse +PAK_VER = 1 + +DEPS = ############################################################################### # Top-level Rules @@ -73,13 +77,28 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && meson --prefix=/usr builddir && cd builddir && ninja && ninja install + cd $(DIR_APP) && meson --prefix=/usr builddir/ + cd $(DIR_APP) && ninja -C builddir/ + cd $(DIR_APP) && ninja -C builddir/ install - # Move mount.fuse3 to same location as mount.fuse was in previous version + # Move mount.fuse3 to same location as mount.fuse was previously mv -v /usr/sbin/mount.fuse3 /sbin - # Move 99-fuse3 rules to same udev location as in previous version of fuse + # Move 99-fuse3 rules to same udev location as previously mv -v /lib/udev/rules.d/99-fuse3.rules /etc/udev/rules.d + # Remove initscript installed from source code as it loads the module but + # also defines and sets up the mount points that will be used by fuse. + rm /etc/init.d/fuse3 + + # Module loading extracted from source code initscript and made into an IPFire initscript + #install initscripts + $(call INSTALL_INITSCRIPT,fuse) + + # create startlinks + ln -sf ../init.d/fuse /etc/rc.d/rc0.d/K35fuse + ln -sf ../init.d/fuse /etc/rc.d/rc3.d/S65fuse + ln -sf ../init.d/fuse /etc/rc.d/rc6.d/K35fuse + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/initscripts/packages/fuse b/src/initscripts/packages/fuse new file mode 100644 index 000000000..7127e1f87 --- /dev/null +++ b/src/initscripts/packages/fuse @@ -0,0 +1,70 @@ +#!/bin/sh +######################################################################## +# Begin $rc_base/init.d/fuse +# +# Description : Load and unload the fuse3 module +# +# Authors : Adolf Belka +# +# Version : 01.00 +# +# Notes : +# +######################################################################## + +. /etc/sysconfig/rc +. ${rc_functions} + +case "${1}" in + start) + boot_mesg "Loading fuse module." + if ! grep -qw fuse /proc/filesystems; then + echo -n "Loading fuse module" + if ! modprobe fuse >/dev/null 2>&1; then + echo " failed!" + exit 1 + else + echo "." + fi + else + echo "fuse filesystem already available." + fi + ;; + + stop) + boot_mesg "Unloading fuse module." + if grep -qw "^fuse" /proc/modules; then + echo -n "Unloading fuse module" + if ! rmmod fuse >/dev/null 2>&1; then + echo " failed!" + else + echo "." + fi + else + echo "fuse module not loaded." + fi + ;; + + restart) + ${0} stop + sleep 1 + ${0} start + ;; + + status) + echo -n "Checking if fuse module loaded." + if ! grep -qw fuse /proc/filesystems; then + echo " fuse module not loaded." + exit 3 + else + echo " ok." + fi + ;; + + *) + echo "Usage: ${0} {start|stop|restart|status}" + exit 1 + ;; +esac + +# End $rc_base/init.d/fuse diff --git a/src/paks/fuse/install.sh b/src/paks/fuse/install.sh new file mode 100644 index 000000000..e6a5af92b --- /dev/null +++ b/src/paks/fuse/install.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files + +start_service --background ${NAME} diff --git a/src/paks/fuse/uninstall.sh b/src/paks/fuse/uninstall.sh new file mode 100644 index 000000000..dc37ea5b1 --- /dev/null +++ b/src/paks/fuse/uninstall.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +stop_service ${NAME} + +remove_files diff --git a/src/paks/fuse/update.sh b/src/paks/fuse/update.sh new file mode 100644 index 000000000..99776659c --- /dev/null +++ b/src/paks/fuse/update.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007-2020 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_backup_includes +./uninstall.sh +./install.sh From patchwork Wed Jan 13 15:00:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 3799 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 RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4DGBVX5tSNz3whw for ; Wed, 13 Jan 2021 15:40: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 "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4DGBVW54xZzhg; Wed, 13 Jan 2021 15:40:51 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4DGBMF11L0z2xlZ; Wed, 13 Jan 2021 15:34:33 +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 RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4DGBMD0VSNz2xWW for ; Wed, 13 Jan 2021 15:34:32 +0000 (UTC) Received: from smtpq4.tb.mail.iss.as9143.net (smtpq4.tb.mail.iss.as9143.net [212.54.42.167]) (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 4DGBMC4z0bzhg for ; Wed, 13 Jan 2021 15:34:31 +0000 (UTC) Received: from [212.54.42.110] (helo=smtp7.tb.mail.iss.as9143.net) by smtpq4.tb.mail.iss.as9143.net with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzhd5-00051M-2Y; Wed, 13 Jan 2021 16:00:11 +0100 Received: from j103033.upc-j.chello.nl ([24.132.103.33] helo=rhea.saturn.pimb.org) by smtp7.tb.mail.iss.as9143.net with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1kzhd4-005NO2-4j; Wed, 13 Jan 2021 16:00:10 +0100 Received: from hyperion.saturn.pimb.org (hyperion.saturn.pimb.org [192.168.26.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by rhea.saturn.pimb.org (Postfix) with ESMTPSA id CD6253E2B; Wed, 13 Jan 2021 16:00:10 +0100 (CET) From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 3/5] borgbackup: add fuse as dependency Date: Wed, 13 Jan 2021 16:00:01 +0100 Message-Id: <20210113150001.3660141-1-ahb.ipfire@gmail.com> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 X-SourceIP: 24.132.103.33 X-Authenticated-Sender: adolf.belka@ziggo.nl (via SMTP) X-Ziggo-spambar: / X-Ziggo-spamscore: 0.0 X-Ziggo-spamreport: CMAE Analysis: v=2.4 cv=VtOdv86n c=1 sm=1 tr=0 ts=5fff0afa a=N0UC3/faf55XGTeY5t7zSQ==:17 a=9+rZDBEiDlHhcck0kWbJtElFXBc=:19 a=EmqxpYm9HcoA:10 a=x7bEGLp0ZPQA:10 a=6yxbeI8x3IIA:10 a=pGLkceISAAAA:8 a=Jgbs6MAl4uGwa6kSdTEA:9 X-Ziggo-Spam-Status: No X-Spam-Status: No X-Spam-Flag: No ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (mail01.ipfire.org: 212.54.42.167 is neither permitted nor denied by domain of ahbipfire@gmail.com) smtp.mailfrom=ahbipfire@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1610552071; 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; bh=1Z+4xzWSb3Km3shOl91PhLt6PsKy4tHqfjFQD7W40P8=; b=Mh0aasPqLIpbiITrPWO0zFptqlOjHQ7RkNijSa+R75gaRAtwA3lrUSoEocR1wrQP7+AZDh G8MBzNXxM8H1wm1wxzA05EYUUQpgQHcLNDVP4CPf3a5Cxp+LD+yWNjNCfKKEkrJxclDiFc 2tUqULpwE3q9JQ/sLF7NM0znbHoUt82hZpmkjJ+0tNJT4fIpSHBUrX5rFRGqLZJ9PU6MNs imMe+Ch8wRVIVTjQtWug7Qjf8AyFeHn3Q8p1aZ0Yuv7/hmwKD616ezKVN1NtHmluyUWngA Pq0vsrYBH5LKt++ZZSR4joRe98z1Qak2rZw5FLuzuKXj79MDdvUVwzkf7sMPZw== ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1610552071; a=rsa-sha256; cv=none; b=d+aQizXeMJ0Uy6B9ydtOagzwwuo4FFwuJVN1IXksZoqxyuNjmgDFIAIqmv05CLsMGQjdZH xGdVbmJ7UJkjqttKZw0pwHrgrzhWH9sbC5y4bXHnmOd1jDWUKaHzgaW/SJ+TKh7x4my9I3 eEuSWOBZPTY7MZ+XBZVCr2EIvicTk0LTWjlmKYxrNBoOzc8RsDCcNQo8KMENWI1RLmrgCf PjN9z0Sfc/4mBnQ20k1L7Kc8QeuGS2yBgIMh6gUE5qq8smkPfJVNPisQNkLB5JSVHXmPyr jbkdubaJYsfWYBD+W5cf6YQXwKF917R3VdrxutHjRwxwR18GezLomGtwH1Uhuw== X-Rspamd-Queue-Id: 4DGBMC4z0bzhg Authentication-Results: mail01.ipfire.org; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (mail01.ipfire.org: 212.54.42.167 is neither permitted nor denied by domain of ahbipfire@gmail.com) smtp.mailfrom=ahbipfire@gmail.com X-Rspamd-Server: mail01.haj.ipfire.org X-Spamd-Result: default: False [3.90 / 11.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; R_MISSING_CHARSET(2.50)[]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; BROKEN_CONTENT_TYPE(1.50)[]; R_SPF_SOFTFAIL(0.00)[~all]; RCVD_COUNT_THREE(0.00)[4]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_LOW(-0.10)[212.54.42.110:received]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:33915, ipnet:212.54.32.0/20, country:NL]; R_DKIM_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; TAGGED_FROM(0.00)[]; ARC_NA(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[24.132.103.33:received]; FROM_HAS_DN(0.00)[]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.10)[text/plain]; HAS_X_AS(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[212.54.42.167:from]; RWL_MAILSPIKE_VERYGOOD(0.00)[212.54.42.167:from]; FREEMAIL_CC(0.00)[gmail.com]; RCVD_TLS_ALL(0.00)[]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : No valid SPF, No valid DKIM,none] 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" - fuse added as dependency as it has been moved from core to addon - No change to rootfiles Signed-off-by: Adolf Belka --- lfs/borgbackup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/borgbackup b/lfs/borgbackup index aafef36d8..e23498c69 100644 --- a/lfs/borgbackup +++ b/lfs/borgbackup @@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = borgbackup -PAK_VER = 8 +PAK_VER = 9 -DEPS = python3-llfuse python3-msgpack +DEPS = python3-llfuse python3-msgpack fuse ############################################################################### # Top-level Rules From patchwork Wed Jan 13 15:00:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 3798 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 RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4DGB3T4ytcz3whw for ; Wed, 13 Jan 2021 15:20:53 +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 "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4DGB3R53BZzBT; Wed, 13 Jan 2021 15:20:51 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4DG9cj2MHLz30D4; Wed, 13 Jan 2021 15:01:09 +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 RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4DG9cg2Vw5z2ykB for ; Wed, 13 Jan 2021 15:01:07 +0000 (UTC) Received: from smtpq3.tb.mail.iss.as9143.net (smtpq3.tb.mail.iss.as9143.net [212.54.42.166]) (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 4DG9cN0KLRzWs for ; Wed, 13 Jan 2021 15:00:52 +0000 (UTC) Received: from [212.54.42.110] (helo=smtp7.tb.mail.iss.as9143.net) by smtpq3.tb.mail.iss.as9143.net with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzhdj-0008V7-TE; Wed, 13 Jan 2021 16:00:51 +0100 Received: from j103033.upc-j.chello.nl ([24.132.103.33] helo=rhea.saturn.pimb.org) by smtp7.tb.mail.iss.as9143.net with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1kzhdj-005O43-AF; Wed, 13 Jan 2021 16:00:51 +0100 Received: from hyperion.saturn.pimb.org (hyperion.saturn.pimb.org [192.168.26.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by rhea.saturn.pimb.org (Postfix) with ESMTPSA id 9FC5A3E2B; Wed, 13 Jan 2021 16:00:51 +0100 (CET) From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 5/5] openvmtools: add fuse as dependency Date: Wed, 13 Jan 2021 16:00:41 +0100 Message-Id: <20210113150041.3660280-1-ahb.ipfire@gmail.com> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 X-SourceIP: 24.132.103.33 X-Authenticated-Sender: adolf.belka@ziggo.nl (via SMTP) X-Ziggo-spambar: / X-Ziggo-spamscore: 0.0 X-Ziggo-spamreport: CMAE Analysis: v=2.4 cv=VtOdv86n c=1 sm=1 tr=0 ts=5fff0b23 a=N0UC3/faf55XGTeY5t7zSQ==:17 a=9+rZDBEiDlHhcck0kWbJtElFXBc=:19 a=EmqxpYm9HcoA:10 a=x7bEGLp0ZPQA:10 a=6yxbeI8x3IIA:10 a=pGLkceISAAAA:8 a=Jgbs6MAl4uGwa6kSdTEA:9 X-Ziggo-Spam-Status: No X-Spam-Status: No X-Spam-Flag: No ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (mail01.ipfire.org: 212.54.42.166 is neither permitted nor denied by domain of ahbipfire@gmail.com) smtp.mailfrom=ahbipfire@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1610550052; 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; bh=awW/Oi+eST3rXeGfaQwEV/iuS1xQQeNUrv3biGyC5gM=; b=N/TUuSGrFIcrlLkhFXRtys9KZCAElf9FgIb1hZPLEvSm0mcjPvYN2yCqICCJfV3GJSpnJz PhPEe1HOtNukeDkxWASjqEDFlYrBsooxOQO0UAUzW+ZT+mN3DB4MRsc0SLNDFds5OFh8ja cWVystvAezcpOX/PQCiJSgG5LNLlkETrUHYJpO/NLwKHhnYFYZdLFeH1WHAQEn6MkJYUMG IN6KWAgHaSifQT16Rn3lW8zELkncEqN8RP1r8x/F/U5GyRZ30bVf6ZvlkalieKY2LucryF ZvhLjjtziirgCqLBDSP3eRJsknBzQWFNnl7Yp28SHPxU+gQxMaouuRG32gThcA== ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1610550052; a=rsa-sha256; cv=none; b=UT0nOxrqDdstvEaDQ64BXmMedvSDwFVQFTzdeSrDm4ZIolTom8+NawfvxBoNd4WA68RXDd ZnXFRv1EBOoaVSOIpbVRrzWc6yBoDdGoiFUDUTcAkYyVuSoBL2dzcne8VrMy/XHiSdWYYf t36xBOIg4mDQsewhZiOKjjuhWsYpdYt0v4jdg6HmEG4uxHsqmZmcCoUkC2rls0vD5QGNPm fnhcKWUmi4qGgIYV/bUQ0MR0bthrS0jcuQIDtGuTCDs0xqwhYQ6t85PGA/7jTswTWTEXq8 IWUugdYrwz+r8KQ6pksE9YhlzBm8KWst8TOBl3c6YjCIZp8lRJKesMGothssWw== X-Rspamd-Queue-Id: 4DG9cN0KLRzWs Authentication-Results: mail01.ipfire.org; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (mail01.ipfire.org: 212.54.42.166 is neither permitted nor denied by domain of ahbipfire@gmail.com) smtp.mailfrom=ahbipfire@gmail.com X-Rspamd-Server: mail01.haj.ipfire.org X-Spamd-Result: default: False [3.80 / 11.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; RBL_SENDERSCORE_FAIL(0.00)[212.54.42.166:query timed out]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; R_MISSING_CHARSET(2.50)[]; RWL_MAILSPIKE_GOOD(0.00)[212.54.42.166:from]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; BROKEN_CONTENT_TYPE(1.50)[]; R_SPF_SOFTFAIL(0.00)[~all]; RCVD_COUNT_THREE(0.00)[4]; RCPT_COUNT_TWO(0.00)[2]; RECEIVED_SPAMHAUS_PBL(0.00)[24.132.103.33:received]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:33915, ipnet:212.54.32.0/20, country:NL]; R_DKIM_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; TAGGED_FROM(0.00)[]; HAS_X_AS(0.00)[]; RCVD_IN_DNSWL_LOW(-0.20)[212.54.42.110:received,212.54.42.166:from]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FREEMAIL_CC(0.00)[gmail.com]; RCVD_TLS_ALL(0.00)[]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : No valid SPF, No valid DKIM,none] 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" - fuse added as dependency as it has been moved from core to addon - No change to rootfiles Signed-off-by: Adolf Belka --- lfs/openvmtools | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/openvmtools b/lfs/openvmtools index fb0d312a5..ef4fe9ad0 100644 --- a/lfs/openvmtools +++ b/lfs/openvmtools @@ -33,9 +33,9 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = x86_64 i586 PROG = openvmtools -PAK_VER = 6 +PAK_VER = 7 -DEPS = libtirpc +DEPS = libtirpc fuse CFLAGS += -Wno-error=array-bounds