* [PATCH 1/3] zstd 1.4.5: New package
@ 2020-06-28 7:36 Matthias Fischer
2020-06-28 7:36 ` [PATCH 2/3] rsync: Update to 3.2.1 Matthias Fischer
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Matthias Fischer @ 2020-06-28 7:36 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 10979 bytes --]
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 <matthias.fischer(a)ipfire.org>
---
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 <info(a)ipfire.org> #
+# #
+# 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 <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# 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 <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /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 <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /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 <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+./uninstall.sh
+./install.sh
--
2.18.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/3] rsync: Update to 3.2.1
2020-06-28 7:36 [PATCH 1/3] zstd 1.4.5: New package Matthias Fischer
@ 2020-06-28 7:36 ` Matthias Fischer
2020-06-29 9:40 ` Michael Tremer
2020-06-28 7:36 ` [PATCH 3/3] popt: Update to 1.18 Matthias Fischer
2020-06-29 9:40 ` [PATCH 1/3] zstd 1.4.5: New package Michael Tremer
2 siblings, 1 reply; 6+ messages in thread
From: Matthias Fischer @ 2020-06-28 7:36 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2669 bytes --]
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 <matthias.fischer(a)ipfire.org>
---
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 <info(a)ipfire.org> #
+# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> #
# #
# 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)
--
2.18.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3/3] popt: Update to 1.18
2020-06-28 7:36 [PATCH 1/3] zstd 1.4.5: New package Matthias Fischer
2020-06-28 7:36 ` [PATCH 2/3] rsync: Update to 3.2.1 Matthias Fischer
@ 2020-06-28 7:36 ` Matthias Fischer
2020-06-29 9:40 ` Michael Tremer
2020-06-29 9:40 ` [PATCH 1/3] zstd 1.4.5: New package Michael Tremer
2 siblings, 1 reply; 6+ messages in thread
From: Matthias Fischer @ 2020-06-28 7:36 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1766 bytes --]
Recommended for 'rsync 3.2.1'.
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
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 <info(a)ipfire.org> #
+# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> #
# #
# 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)
--
2.18.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] rsync: Update to 3.2.1
2020-06-28 7:36 ` [PATCH 2/3] rsync: Update to 3.2.1 Matthias Fischer
@ 2020-06-29 9:40 ` Michael Tremer
0 siblings, 0 replies; 6+ messages in thread
From: Michael Tremer @ 2020-06-29 9:40 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2949 bytes --]
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
> On 28 Jun 2020, at 08:36, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote:
>
> 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 <matthias.fischer(a)ipfire.org>
> ---
> 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 <info(a)ipfire.org> #
> +# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> #
> # #
> # 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)
> --
> 2.18.0
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] zstd 1.4.5: New package
2020-06-28 7:36 [PATCH 1/3] zstd 1.4.5: New package Matthias Fischer
2020-06-28 7:36 ` [PATCH 2/3] rsync: Update to 3.2.1 Matthias Fischer
2020-06-28 7:36 ` [PATCH 3/3] popt: Update to 1.18 Matthias Fischer
@ 2020-06-29 9:40 ` Michael Tremer
2 siblings, 0 replies; 6+ messages in thread
From: Michael Tremer @ 2020-06-29 9:40 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 11601 bytes --]
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
> On 28 Jun 2020, at 08:36, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote:
>
> 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 <matthias.fischer(a)ipfire.org>
> ---
> 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 <info(a)ipfire.org> #
> +# #
> +# 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 <http://www.gnu.org/licenses/>. #
> +# #
> +###############################################################################
> +
> +###############################################################################
> +# 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 <info(a)ipfire.org>. #
> +# #
> +############################################################################
> +#
> +. /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 <info(a)ipfire.org>. #
> +# #
> +############################################################################
> +#
> +. /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 <info(a)ipfire.org>. #
> +# #
> +############################################################################
> +#
> +. /opt/pakfire/lib/functions.sh
> +./uninstall.sh
> +./install.sh
> --
> 2.18.0
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] popt: Update to 1.18
2020-06-28 7:36 ` [PATCH 3/3] popt: Update to 1.18 Matthias Fischer
@ 2020-06-29 9:40 ` Michael Tremer
0 siblings, 0 replies; 6+ messages in thread
From: Michael Tremer @ 2020-06-29 9:40 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2000 bytes --]
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
> On 28 Jun 2020, at 08:36, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote:
>
> Recommended for 'rsync 3.2.1'.
>
> Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
> ---
> 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 <info(a)ipfire.org> #
> +# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> #
> # #
> # 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)
>
> --
> 2.18.0
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-06-29 9:40 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-28 7:36 [PATCH 1/3] zstd 1.4.5: New package Matthias Fischer
2020-06-28 7:36 ` [PATCH 2/3] rsync: Update to 3.2.1 Matthias Fischer
2020-06-29 9:40 ` Michael Tremer
2020-06-28 7:36 ` [PATCH 3/3] popt: Update to 1.18 Matthias Fischer
2020-06-29 9:40 ` Michael Tremer
2020-06-29 9:40 ` [PATCH 1/3] zstd 1.4.5: New package Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox