From patchwork Sun Jun 28 07:36:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 3219 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 "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 49vj9m66l2z3x34 for ; Sun, 28 Jun 2020 07:36:44 +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 49vj9l0h5zzxQ; Sun, 28 Jun 2020 07:36:43 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 49vj9l03HLz2ydT; Sun, 28 Jun 2020 07:36:43 +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 "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 49vj9j1ZRdz2xBC for ; Sun, 28 Jun 2020 07:36:41 +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) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 49vj9g6XGCzxQ for ; Sun, 28 Jun 2020 07:36:39 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1593329799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=eviqalxkBgkiMuHzAC9N2CImtb9cAc5kVUfwnluC0Ac=; b=O7E2rXrIwFbC2qx1giuKypHRowjxgyUUoARVopxv9r/tJ0ce+5ZWwg44M21/eidBouLq+v HaomsaHUSIdfMgCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1593329799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=eviqalxkBgkiMuHzAC9N2CImtb9cAc5kVUfwnluC0Ac=; b=sAwW0P3SJ+4uYwr/sMvakOnoIq6ARBqx6P9FXXfhbWg0+FPVU4sfszsQJs/JBFZ0O1znLa JyzvS7rS9ELRc97mIheo+I9lToqSn5h/iYqk9SJT9EMYV3P63au7c50u4yieU27rhG8L7O XuJmC+OYpCFeHlE3munZaHofnG+Z5IsyYfWV1/iMPkBlXpjwiGkd1eE5z5LXzwplCzcZqb G4S3bDAfN7oBiMsZU/hHy6HuBc0JqP+bP5LqtMw0DFmihwyZj3DA9jsu5u8TKW+JR1pxPr mhcpin5eewengbb2bm1I19d2AjfGQkHRuomy855e/M09Vk7iXR+f9iwmrqsxDQ== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH 1/3] zstd 1.4.5: New package Date: Sun, 28 Jun 2020 09:36:31 +0200 Message-Id: <20200628073633.2368-1-matthias.fischer@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=matthias.fischer@ipfire.org 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" This packages adds a "lossless compression algorithm" - supported by 'rsync 3.2.1'. For details see: https://github.com/facebook/zstd/releases/tag/v1.4.5 Signed-off-by: Matthias Fischer Reviewed-by: Michael Tremer --- config/rootfiles/packages/zstd | 20 ++++++++ lfs/zstd | 83 ++++++++++++++++++++++++++++++++++ make.sh | 1 + src/paks/zstd/install.sh | 25 ++++++++++ src/paks/zstd/uninstall.sh | 25 ++++++++++ src/paks/zstd/update.sh | 26 +++++++++++ 6 files changed, 180 insertions(+) create mode 100644 config/rootfiles/packages/zstd create mode 100644 lfs/zstd create mode 100644 src/paks/zstd/install.sh create mode 100644 src/paks/zstd/uninstall.sh create mode 100644 src/paks/zstd/update.sh diff --git a/config/rootfiles/packages/zstd b/config/rootfiles/packages/zstd new file mode 100644 index 000000000..78c3ffec3 --- /dev/null +++ b/config/rootfiles/packages/zstd @@ -0,0 +1,20 @@ +usr/bin/unzstd +usr/bin/zstd +usr/bin/zstdcat +usr/bin/zstdgrep +usr/bin/zstdless +usr/bin/zstdmt +#usr/include/zbuff.h +#usr/include/zdict.h +#usr/include/zstd.h +#usr/include/zstd_errors.h +#usr/lib/libzstd.a +usr/lib/libzstd.so +usr/lib/libzstd.so.1 +usr/lib/libzstd.so.1.4.5 +#usr/lib/pkgconfig/libzstd.pc +#usr/share/man/man1/unzstd.1 +#usr/share/man/man1/zstd.1 +#usr/share/man/man1/zstdcat.1 +#usr/share/man/man1/zstdgrep.1 +#usr/share/man/man1/zstdless.1 diff --git a/lfs/zstd b/lfs/zstd new file mode 100644 index 000000000..55ac837d3 --- /dev/null +++ b/lfs/zstd @@ -0,0 +1,83 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2020 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 = 1.4.5 + +THISAPP = zstd-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = zstd +PAK_VER = 1 + +DEPS = + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = dd0b53631303b8f972dafa6fd34beb0c + +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) && make $(MAKETUNING) + cd $(DIR_APP) && make prefix=/usr install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 2e54cec28..57cf2f724 100755 --- a/make.sh +++ b/make.sh @@ -1431,6 +1431,7 @@ buildipfire() { lfsmake2 xvid lfsmake2 libmpeg2 lfsmake2 gnump3d + lfsmake2 zstd lfsmake2 rsync lfsmake2 libtirpc lfsmake2 rpcbind diff --git a/src/paks/zstd/install.sh b/src/paks/zstd/install.sh new file mode 100644 index 000000000..3fe8bc67e --- /dev/null +++ b/src/paks/zstd/install.sh @@ -0,0 +1,25 @@ +#!/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) 2009 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files diff --git a/src/paks/zstd/uninstall.sh b/src/paks/zstd/uninstall.sh new file mode 100644 index 000000000..f786519d6 --- /dev/null +++ b/src/paks/zstd/uninstall.sh @@ -0,0 +1,25 @@ +#!/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) 2009 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +remove_files diff --git a/src/paks/zstd/update.sh b/src/paks/zstd/update.sh new file mode 100644 index 000000000..89c40d0d7 --- /dev/null +++ b/src/paks/zstd/update.sh @@ -0,0 +1,26 @@ +#!/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 +./uninstall.sh +./install.sh From patchwork Sun Jun 28 07:36:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 3220 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 "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 49vj9n1gmcz3x5j for ; Sun, 28 Jun 2020 07:36:45 +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 49vj9l3dgFz2JV; Sun, 28 Jun 2020 07:36:43 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 49vj9l1xTNz2yd9; Sun, 28 Jun 2020 07:36:43 +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 "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 49vj9j6g7rz2xGc for ; Sun, 28 Jun 2020 07:36:41 +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) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 49vj9j0Ypkz1dh for ; Sun, 28 Jun 2020 07:36:41 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1593329801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=KkSeAciTvPr74LVUacUuitCaL17f6vBk4NWycCkPucc=; b=6CvA/hPF0dsK9ASPesGeV5D+HECQR3ZhKY7mqP5Xj5MF9bAdDV+GFzNtuf8+Z0b+qHHYfO W3jaLgzQ5ynfjGDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1593329801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=KkSeAciTvPr74LVUacUuitCaL17f6vBk4NWycCkPucc=; b=hzOzqJFqL6GTm9K9V5S1eTZwwp0v6bREUBMcecGNDlY2rfhi8iwz0d+1oX8gEaaljkOCam Uh7BtNZgPL/xn/m37iYbLX8gr6GnRk31zJ6WKtJr4pe90dBKvKm63xMixhwF/HRIDtoHf8 XXn+NGXA1UmGMlNyn7NsQBbxLDeYVPD1hBtER7tqVB5Xu2bnXhHjyFsSVTVXm/iYFQnG9x NuLt5rmYP9OzARnr7Iquvr03QGUEvUmaRMWCEGxN3ZDEwXyVZrTwUUz1eK6tI5qa0wnrRn LkO6YGThhk4v0wyk75wNewttniM9EGnm4f9ga//IAnXmo2EVPKSYBUoE5x3aeA== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH 2/3] rsync: Update to 3.2.1 Date: Sun, 28 Jun 2020 09:36:32 +0200 Message-Id: <20200628073633.2368-2-matthias.fischer@ipfire.org> In-Reply-To: <20200628073633.2368-1-matthias.fischer@ipfire.org> References: <20200628073633.2368-1-matthias.fischer@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=matthias.fischer@ipfire.org 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" For details see: https://download.samba.org/pub/rsync/NEWS#3.2.1 Although 3.2.2 is in "release testing", I decided to push this release now to get things running. I activated zstd-support and added 'DEPS = zstd'. Signed-off-by: Matthias Fischer Reviewed-by: Michael Tremer --- lfs/rsync | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/lfs/rsync b/lfs/rsync index 342de920b..46da6075b 100644 --- a/lfs/rsync +++ b/lfs/rsync @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2020 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 # @@ -24,7 +24,7 @@ include Config -VER = 3.1.3 +VER = 3.2.1 THISAPP = rsync-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = rsync -PAK_VER = 11 +PAK_VER = 12 -DEPS = +DEPS = zstd ############################################################################### # Top-level Rules @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1581a588fde9d89f6bc6201e8129afaf +$(DL_FILE)_MD5 = d2d7f1c6b07a1434203a2a2406e0bddd install : $(TARGET) @@ -77,11 +77,18 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr + + # Replace shebang in rsync-ssl + cd $(DIR_APP) && sed -i -e "s@^#!.*@#!/bin/bash@" rsync-ssl + + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --without-included-popt \ + --without-included-zlib \ + --disable-xxhash + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - #cd $(DIR_APP)/doc && docbook2html rsync.sgml cd $(DIR_APP) && make install - #cd $(DIR_APP) && install -v -m755 -d /usr/share/doc/rsync-$(VER) && - #cd $(DIR_APP) && install -v -m644 doc/*.html /usr/share/doc/rsync-$(VER) + @rm -rf $(DIR_APP) @$(POSTBUILD) From patchwork Sun Jun 28 07:36:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 3221 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 "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 49vj9n418dz3x65 for ; Sun, 28 Jun 2020 07:36:45 +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 49vj9l68DLz2NG; Sun, 28 Jun 2020 07:36:43 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 49vj9l4hQVz2xGc; Sun, 28 Jun 2020 07:36:43 +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 "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 49vj9k0R2rz2yc4 for ; Sun, 28 Jun 2020 07:36:42 +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) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 49vj9j5xs5zxQ for ; Sun, 28 Jun 2020 07:36:41 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1593329801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=saB4ZubDmckvE+9oGicfg1QZSy2lb1Zu88+8n/rUQiw=; b=Px4clJbUdMZC/DU4AXKMine5QkUxal6OKkYhOKMZzJF0MOKvmFUWx2hVsIeA6n00DOKWDl kT+TdztLW+LfCQCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1593329801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=saB4ZubDmckvE+9oGicfg1QZSy2lb1Zu88+8n/rUQiw=; b=Z0Doy1pmyKMngAkZPcnTydct/qFTtXlmQnRBmQe2anjxpCbB92K0V+riT+C+uULHr8ygcv mmWP2SyzkaagvOcgt3knsRazzJnUCuHP5mCUm052XddWHwUXwNnKTdn0dRUVmAikTBiTNm 7DXd51RVcPc0RBIoO4K5tpO+iePMk5nsBHkOnZ5QwKfSgOu2aJfEP8qfRAD5HxIDADD2eO EBwSPk5Ci/Bbfv3XklG7FK5G4OHkpgtfsFJeUhJQ8msmU08OI07W2vj0LmMPRFtr3mrzQ1 boxb9G3ic/wrkB4gLlEEsLxxM8ahOV+EovPfYf//W2nQnVacb27Dy59KIwQxGQ== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH 3/3] popt: Update to 1.18 Date: Sun, 28 Jun 2020 09:36:33 +0200 Message-Id: <20200628073633.2368-3-matthias.fischer@ipfire.org> In-Reply-To: <20200628073633.2368-1-matthias.fischer@ipfire.org> References: <20200628073633.2368-1-matthias.fischer@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=matthias.fischer@ipfire.org 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" Recommended for 'rsync 3.2.1'. Signed-off-by: Matthias Fischer Reviewed-by: Michael Tremer --- config/rootfiles/common/popt | 2 +- lfs/popt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/popt b/config/rootfiles/common/popt index 9383f60eb..bcadabcf0 100644 --- a/config/rootfiles/common/popt +++ b/config/rootfiles/common/popt @@ -3,6 +3,6 @@ #usr/lib/libpopt.la usr/lib/libpopt.so usr/lib/libpopt.so.0 -usr/lib/libpopt.so.0.0.0 +usr/lib/libpopt.so.0.0.1 #usr/lib/pkgconfig/popt.pc #usr/share/man/man3/popt.3 diff --git a/lfs/popt b/lfs/popt index 7b5d3f962..6d3b74248 100644 --- a/lfs/popt +++ b/lfs/popt @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2020 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 # @@ -24,7 +24,7 @@ include Config -VER = 1.16 +VER = 1.18 THISAPP = popt-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 3743beefa3dd6247a73f8f7a32c14c33 +$(DL_FILE)_MD5 = 450f2f636e6a3aa527de803d0ae76c5a install : $(TARGET)