From patchwork Wed Feb 10 11:05:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 3885 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 4DbH4H0cDBz3wps for ; Wed, 10 Feb 2021 11:05:51 +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 "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4DbH4F75mjzB9; Wed, 10 Feb 2021 11:05:49 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4DbH4F6HdPz2ydZ; Wed, 10 Feb 2021 11:05:49 +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 4DbH4D1lyKz2xFP for ; Wed, 10 Feb 2021 11:05:48 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4DbH4B0cfJzB9; Wed, 10 Feb 2021 11:05:46 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1612955146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ri33gIjj+MSkh0W5BWFGx+siT3ao7ckNIDL2u4zrUKQ=; b=JvtdSK6RYVVIecslVB99ElKlAMojQHYRUlnWQAg0d5TAHOpMK9EastNEfDUeSd6f/uvgMT n9IwtzLgsBYKNGCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1612955146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ri33gIjj+MSkh0W5BWFGx+siT3ao7ckNIDL2u4zrUKQ=; b=ohkhvq5zaVUqxzsCcjNl/ov+Kc8xwribaBzyGxy/Q7yHfidvia/bKcgMtADMR/WToos7or uhLm3DEyRL0t8UZ2JxhEQ/9U++cHQHGLXzhviYuJGMdXpjcvHPRQOfmr0qIuJmuM969Z+O xaUmJipdIiTXGS0S63eSfp305Z8Sku7K4J5b3/ItZB1BloU//VTUAbLfeI8L1zxJV5qYEc b8jrm1FZ5LMatQ40UPucprwUc5QWDF1gSuN88GItercU2ma60AxSHYxuQRfuLw2EnpE3Ji jBt3qtMbPDdlzbRYS80a93hkCszPxJkZYvjKW2upmBz7dYchBQU52qZweiJzRA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 1/2] attr: Update to 2.4.48 Date: Wed, 10 Feb 2021 12:05:44 +0100 Message-Id: <20210210110544.3711735-1-adolf.belka@ipfire.org> MIME-Version: 1.0 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" - Update attr from 2.4.47 (2013) to 2.4.48 (2018) - Update rootfiles - Changelog in tarball only goes up to 2.4.44 so extracted changes from commits between 2.4.47 and release of 2.4.48 v2.4.48 attr: Fix segmentation fault Andreas Gruenbacher po: update Andreas Gruenbacher setfacl: Include errno.h Andreas Gruenbacher copy_action: drop unused alloca.h include Mike Frysinger include: add uninstall target to fix distcheck Mike Frysinger attr_copy_{fd,file}: sync changes between the files Mike Frysinger xattr.conf: do not copy security.evm Stefan Berger Cleanup visibility of API functions Yury Usishchev Cleanup config.h usage Yury Usishchev Use stdint types consistently Felix Janda walk_tree_rec: Add parentheses to clarify code Andreas Gruenbacher Reintroduce symbols that used to be syscall wrappers Dmitry V. Levin Do not export symbols that are not supposed to be exported Dmitry V. Levin Add explicit symbol versioning for attr_copy_action Dmitry V. Levin ignore configure.lineno Mike Frysinger walk_tree: mark internal variables as static Dmitry V. Levin Remove the attr.5 man page (moved to man-pages) Andreas Gruenbacher Remove and the syscall wrappers Andreas Gruenbacher Remove the section 2 man pages Andreas Gruenbacher Remove outdated tests from test/attr.test Andreas Gruenbacher Remove test/ext/fs.test Andreas Gruenbacher Add setfattr --raw option Andreas Gruenbacher Properly set and report empty attribute values Andreas Gruenbacher Man pages: Minor fixes Andreas Gruenbacher build: unbreak attr_copy_fd() and attr_copy_file(). Nick Alcock attr: Don't report a NULL attribute name when -l (list) fails Andreas Gruenbacher attr_list / attr_listf: Fix cursor off-by-one error Andreas Gruenbacher Portability fix: is Linux specific Emmanuel Dreyfus Portability fixes Emmanuel Dreyfus telldir return value and seekdir second parameters are of type long Cristian Rodríguez License fixes Andreas Gruenbacher test: fix cleanup & running as root Mike Frysinger include examples/ in dist tarball Mike Frysinger build: ship a pkgconfig file for libattr Jan Engelhardt build: make use of an aux-dir to stow away helper scripts Jan Engelhardt avoid glibc-specific DECLS defines Mike Frysinger build: drop attrincludedir, use pkgincludedir Jan Engelhardt disable installation of man(2) pages by default Mike Frysinger po: regenerate files after move Mike Frysinger modernize build system Mike Frysinger test: make running parallel/out-of-tree safe Mike Frysinger move gettext logic into misc.h Mike Frysinger punt debian/rpm packaging logic Mike Frysinger Suppress deprecation warnings when building attr and libattr Andreas Gruenbacher Add a default /etc/xattr.conf file Andreas Gruenbacher Mark the Irix compatibility functions as deprecated Andreas Gruenbacher Make attr_get and attr_getf behave as described in the man page Andreas Gruenbacher Use autoreconf rather than autoconf to regenerate the files. Fabrice Bauzac .gitignore: ignore *~ and config.h.in. Fabrice Bauzac Fix ATTR_OP_REMOVE operation in attr_multi() Makefile: rename configure.in to configure.ac Signed-off-by: Adolf Belka --- config/rootfiles/common/attr | 28 +++++++++++----------------- lfs/attr | 8 +++----- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/config/rootfiles/common/attr b/config/rootfiles/common/attr index edfefa7e1..ba3ed7db7 100644 --- a/config/rootfiles/common/attr +++ b/config/rootfiles/common/attr @@ -1,24 +1,31 @@ usr/bin/attr usr/bin/getfattr usr/bin/setfattr +#usr/etc +#usr/etc/xattr.conf #usr/include/attr #usr/include/attr/attributes.h #usr/include/attr/error_context.h #usr/include/attr/libattr.h -#usr/include/attr/xattr.h #usr/lib/libattr.a #usr/lib/libattr.la #usr/lib/libattr.so usr/lib/libattr.so.1 -usr/lib/libattr.so.1.1.0 +usr/lib/libattr.so.1.1.2448 +#usr/lib/pkgconfig/libattr.pc #usr/share/doc/attr -#usr/share/doc/attr/CHANGES.gz +#usr/share/doc/attr/CHANGES #usr/share/doc/attr/COPYING #usr/share/doc/attr/COPYING.LGPL #usr/share/doc/attr/PORTING -#usr/share/doc/attr/README #usr/share/locale/cs/LC_MESSAGES/attr.mo #usr/share/locale/de/LC_MESSAGES/attr.mo +#usr/share/locale/en@boldquot +#usr/share/locale/en@boldquot/LC_MESSAGES +#usr/share/locale/en@boldquot/LC_MESSAGES/attr.mo +#usr/share/locale/en@quot +#usr/share/locale/en@quot/LC_MESSAGES +#usr/share/locale/en@quot/LC_MESSAGES/attr.mo #usr/share/locale/es/LC_MESSAGES/attr.mo #usr/share/locale/fr/LC_MESSAGES/attr.mo #usr/share/locale/gl/LC_MESSAGES/attr.mo @@ -28,18 +35,6 @@ usr/lib/libattr.so.1.1.0 #usr/share/man/man1/attr.1 #usr/share/man/man1/getfattr.1 #usr/share/man/man1/setfattr.1 -#usr/share/man/man2/fgetxattr.2 -#usr/share/man/man2/flistxattr.2 -#usr/share/man/man2/fremovexattr.2 -#usr/share/man/man2/fsetxattr.2 -#usr/share/man/man2/getxattr.2 -#usr/share/man/man2/lgetxattr.2 -#usr/share/man/man2/listxattr.2 -#usr/share/man/man2/llistxattr.2 -#usr/share/man/man2/lremovexattr.2 -#usr/share/man/man2/lsetxattr.2 -#usr/share/man/man2/removexattr.2 -#usr/share/man/man2/setxattr.2 #usr/share/man/man3/attr_get.3 #usr/share/man/man3/attr_getf.3 #usr/share/man/man3/attr_list.3 @@ -50,4 +45,3 @@ usr/lib/libattr.so.1.1.0 #usr/share/man/man3/attr_removef.3 #usr/share/man/man3/attr_set.3 #usr/share/man/man3/attr_setf.3 -#usr/share/man/man5/attr.5 diff --git a/lfs/attr b/lfs/attr index bdae19a11..f31c0f2b4 100644 --- a/lfs/attr +++ b/lfs/attr @@ -24,10 +24,10 @@ include Config -VER = 2.4.47 +VER = 2.4.48 THISAPP = attr-$(VER) -DL_FILE = $(THISAPP).src.tar.gz +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 84f58dec00b60f2dc8fd1c9709291cc7 +$(DL_FILE)_MD5 = bc1e5cb5c96d99b24886f1f527d3bb3d install : $(TARGET) @@ -73,8 +73,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ./configure cd $(DIR_APP) && make cd $(DIR_APP) && make install - cd $(DIR_APP) && make install-lib - cd $(DIR_APP) && make install-dev chmod -v 755 /usr/lib/libattr.so @rm -rf $(DIR_APP) @$(POSTBUILD) From patchwork Wed Feb 10 11:06:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 3886 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 4DbHCr3dlfz3wpr for ; Wed, 10 Feb 2021 11:12:24 +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 4DbHCp3svKzys; Wed, 10 Feb 2021 11:12:22 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4DbH4Y00Zxz2yfT; Wed, 10 Feb 2021 11:06:05 +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 4DbH4X4hCDz2xFP for ; Wed, 10 Feb 2021 11:06:04 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4DbH4W6vFNz1sk; Wed, 10 Feb 2021 11:06:03 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1612955164; 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=fF5ci2bM3bZArtuQcA9NSDx8zMaIVkz5kZyLGFDRr/Q=; b=xTbrPKQN8K5bfiJRAvDlm2C+/ir12g/mRivDtPmey/zkAWC2XFWVxZQggeGOCHp/4uWfZi ZaAH4YaOldtBq6DA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1612955164; 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=fF5ci2bM3bZArtuQcA9NSDx8zMaIVkz5kZyLGFDRr/Q=; b=uJSX0GhLEMm7R8WNpct1JCt6lPg2uNfaaw1Eiskt+71TtnqO6ie9xSpYBk8D7JEs6B01tL RVOsLmU380h4sY1ipcpwubW3vJbUyWi5HmAyCJu0Iv+hEWGqAMBaPQ3sQGng0xIltibxxZ 86TlUmrQNf/2iSduutrNBi+hQJha9PLjjX8zc859rc7czQuuJKkrF0piN2EIuCCUhZROxL XrTuzxOb71QC5iX9dYPbKQfXKtJOXrpl8ns2VbRTtq0nfga3Aq6A3SErSY4rSfP6F0wXkU ZyPIbpk4p9DSgIqsrS1LMBTOopXB9L0nCcVW7/yH9pvKXYq59yF6kqq9ZZsJmg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/2] python-xattr: Removal of addon Date: Wed, 10 Feb 2021 12:06:02 +0100 Message-Id: <20210210110602.3711794-1-adolf.belka@ipfire.org> MIME-Version: 1.0 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" - Update of attr causes current version of python-xattr to fail to build - Following input from Michael Tremer - This package was orihinally required for pakfire 3 which no longer depends on it - This is a python 2 module. Python 2 is EOL - lfs and rootfile removed from IPFire - make.sh updated to remove python-xattr entry Signed-off-by: Adolf Belka --- config/rootfiles/packages/python-xattr | 2 - lfs/python-xattr | 82 -------------------------- make.sh | 1 - 3 files changed, 85 deletions(-) delete mode 100644 config/rootfiles/packages/python-xattr delete mode 100644 lfs/python-xattr diff --git a/config/rootfiles/packages/python-xattr b/config/rootfiles/packages/python-xattr deleted file mode 100644 index 747ff5c2a..000000000 --- a/config/rootfiles/packages/python-xattr +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/python2.7/site-packages/pyxattr-0.5.0-py2.7.egg-info -usr/lib/python2.7/site-packages/xattr.so diff --git a/lfs/python-xattr b/lfs/python-xattr deleted file mode 100644 index a77d22a91..000000000 --- a/lfs/python-xattr +++ /dev/null @@ -1,82 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # -# # -# This program 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 3 of the License, or # -# (at your option) any later version. # -# # -# This program 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 this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.5.0 - -THISAPP = pyxattr-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = python-xattr -PAK_VER = 1 - -DEPS = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 0f7ab1e185087329e40f7de218517c84 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && python setup.py install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 3c94509d3..4a42246fd 100755 --- a/make.sh +++ b/make.sh @@ -1552,7 +1552,6 @@ buildipfire() { lfsmake2 python-distutils-extra lfsmake2 python-lzma lfsmake2 python-progressbar - lfsmake2 python-xattr lfsmake2 ddns lfsmake2 python3-setuptools lfsmake2 python3-setuptools-scm