[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 29e0faba1a0bf5884f1cef8490b8db833cb684d5 - IPFire-SCM

17 Feb 2021

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
       via  29e0faba1a0bf5884f1cef8490b8db833cb684d5 (commit)
       via  d338e55ce5b766f579b38f8df355957fcff6799f (commit)
       via  8ea237077d77220e2bf990bdf8abfbb361f5af63 (commit)
       via  c47c054877c53071a664b54f5bfe03d4294bcec2 (commit)
       via  ed5ef208501e9f18ee309af72d05eb8eb3811d16 (commit)
      from  6dc206ab6943aff5820a462d42e827d3e7852990 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 29e0faba1a0bf5884f1cef8490b8db833cb684d5
Author: Matthias Fischer matthias.fischer@ipfire.org
Date:   Fri Feb 12 14:15:59 2021 +0100
monit: Update to 5.27.2
For details see:
    https://mmonit.com/monit/changes/
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d338e55ce5b766f579b38f8df355957fcff6799f
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Feb 17 16:25:14 2021 +0000
libjpeg-compat: Drop package
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8ea237077d77220e2bf990bdf8abfbb361f5af63
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Feb 17 16:23:17 2021 +0000
readline-compat: Drop package
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c47c054877c53071a664b54f5bfe03d4294bcec2
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Feb 17 16:21:24 2021 +0000
berkeley-compat: Drop package
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ed5ef208501e9f18ee309af72d05eb8eb3811d16
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Feb 17 16:18:30 2021 +0000
gmp-compat: Drop package
This is no longer required because everything should be linked against
    the current version.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/common/berkeley-compat |  4 --
 config/rootfiles/common/gmp-compat      |  2 -
 config/rootfiles/common/libjpeg-compat  |  3 --
 config/rootfiles/common/readline-compat |  4 --
 config/rootfiles/core/155/update.sh     | 13 +++++
 lfs/berkeley-compat                     | 84 -------------------------------
 lfs/gmp-compat                          | 84 -------------------------------
 lfs/libjpeg-compat                      | 84 -------------------------------
 lfs/monit                               |  8 +--
 lfs/readline-compat                     | 87 ---------------------------------
 make.sh                                 |  4 --
 11 files changed, 17 insertions(+), 360 deletions(-)
 delete mode 100644 config/rootfiles/common/berkeley-compat
 delete mode 100644 config/rootfiles/common/gmp-compat
 delete mode 100644 config/rootfiles/common/libjpeg-compat
 delete mode 100644 config/rootfiles/common/readline-compat
 delete mode 100644 lfs/berkeley-compat
 delete mode 100644 lfs/gmp-compat
 delete mode 100644 lfs/libjpeg-compat
 delete mode 100644 lfs/readline-compat
Difference in files:

diff --git a/config/rootfiles/common/berkeley-compat b/config/rootfiles/common/berkeley-compat
deleted file mode 100644
index 1b149915c..000000000
--- a/config/rootfiles/common/berkeley-compat
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/libdb-4.4.so
-usr/lib/libdb-4.so
-usr/lib/libdb_cxx-4.4.so
-usr/lib/libdb_cxx-4.so
diff --git a/config/rootfiles/common/gmp-compat b/config/rootfiles/common/gmp-compat
deleted file mode 100644
index a4b82f25c..000000000
--- a/config/rootfiles/common/gmp-compat
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libgmp.so.3
-usr/lib/libgmp.so.3.5.2
diff --git a/config/rootfiles/common/libjpeg-compat b/config/rootfiles/common/libjpeg-compat
deleted file mode 100644
index 5e7b98d9d..000000000
--- a/config/rootfiles/common/libjpeg-compat
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/libjpeg.so.62
-usr/lib/libjpeg.so.62.1.0
-usr/lib/libturbojpeg.so.0.0.0
diff --git a/config/rootfiles/common/readline-compat b/config/rootfiles/common/readline-compat
deleted file mode 100644
index 9ef128a47..000000000
--- a/config/rootfiles/common/readline-compat
+++ /dev/null
@@ -1,4 +0,0 @@
-lib/libhistory.so.6
-lib/libhistory.so.6.3
-lib/libreadline.so.6
-lib/libreadline.so.6.3
diff --git a/config/rootfiles/core/155/update.sh b/config/rootfiles/core/155/update.sh
index 0f5d37848..6903e7998 100644
--- a/config/rootfiles/core/155/update.sh
+++ b/config/rootfiles/core/155/update.sh
@@ -33,8 +33,21 @@ done
# Remove files
 rm -vrf \
+	/lib/libhistory.so.6 \
+	/lib/libhistory.so.6.3 \
+	/lib/libreadline.so.6 \
+	/lib/libreadline.so.6.3 \
    /usr/lib/sse2 \
    /usr/local/lib/sse2 \
+	/usr/lib/libdb-4.so \
+	/usr/lib/libdb-4.4.so \
+	/usr/lib/libdb_cxx-4.so \
+	/usr/lib/libdb_cxx-4.4.so \
+	/usr/lib/libgmp.so.3 \
+	/usr/lib/libgmp.so.3.5.2 \
+	/usr/lib/libjpeg.so.62 \
+	/usr/lib/libjpeg.so.62.1.0 \
+	/usr/lib/libturbojpeg.so.0.0.0 \
    /lib/libpcre.so.0 \
    /lib/libpcre.so.0.0.1
diff --git a/lfs/berkeley-compat b/lfs/berkeley-compat
deleted file mode 100644
index 1e35f0fe4..000000000
--- a/lfs/berkeley-compat
+++ /dev/null
@@ -1,84 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  info@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        = 4.4.20
-
-THISAPP    = db-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = d84dff288a19186b136b0daf7067ade3
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# 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)
-	$(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/db-4.4.20-fixes-1.patch
-	cd $(DIR_APP)/build_unix && ../dist/configure --prefix=/usr --enable-compat185 --enable-cxx
-	cd $(DIR_APP)/build_unix && make $(MAKETUNING)
-
-	# Install the libraries inly
-	cd $(DIR_APP)/build_unix && install -v -m 755 .libs/{libdb-4.4.so,libdb_cxx-4.4.so} /usr/lib/
-	ln -svf libdb-4.4.so /usr/lib/libdb-4.so
-	ln -svf libdb_cxx-4.4.so /usr/lib/libdb_cxx-4.so
-
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/lfs/gmp-compat b/lfs/gmp-compat
deleted file mode 100644
index ef2d56b0a..000000000
--- a/lfs/gmp-compat
+++ /dev/null
@@ -1,84 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  info@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        = 4.3.2
-
-THISAPP    = gmp-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-ifeq "$(BUILD_ARCH)" "i586"
-	CONFIGURE_ARGS = ABI=32
-endif
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = dd60683d7057917e34630b4a787932e8
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# 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 jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && $(CONFIGURE_ARGS) ./configure --prefix=/usr \
-		--build=$(BUILDTARGET) \
-		--enable-cxx --enable-mpbsd --disable-nls
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && install -m 644 .libs/libgmp.so.3.5.2 /usr/lib
-	ln -svf libgmp.so.3.5.2 /usr/lib/libgmp.so.3
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/lfs/libjpeg-compat b/lfs/libjpeg-compat
deleted file mode 100644
index 26e32f1d8..000000000
--- a/lfs/libjpeg-compat
+++ /dev/null
@@ -1,84 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  info@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.3.1
-
-THISAPP    = libjpeg-turbo-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = libjpeg
-PAK_VER    = ipfire-beta1
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 2c3a68129dac443a72815ff5bb374b05
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# 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)
-	$(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && ./configure \
-		--prefix=/usr \
-		--enable-static \
-		--enable-shared
-	cd $(DIR_APP) && [ -e "libtool" ] || ln -svf /usr/bin/libtool libtool
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && mv -vf .libs/{libjpeg.so.62.1.0,libjpeg.so.62,libturbojpeg.so.0.0.0} /usr/lib/
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/lfs/monit b/lfs/monit
index caaa022e2..615f2febb 100644
--- a/lfs/monit
+++ b/lfs/monit
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2021  IPFire Team  info@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        = 5.27.1
+VER        = 5.27.2
THISAPP    = monit-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = monit
-PAK_VER    = 12
+PAK_VER    = 13
DEPS       =
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 200068f37847e3402f6a9b061c2d327e
+$(DL_FILE)_MD5 = 13a0804dae18ef08198c3ace72f9dd60
install : $(TARGET)
diff --git a/lfs/readline-compat b/lfs/readline-compat
deleted file mode 100644
index 248f522c4..000000000
--- a/lfs/readline-compat
+++ /dev/null
@@ -1,87 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  info@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        = 6.3
-
-THISAPP    = readline-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 33c8fb279e981274f485fd91da77e94a
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# 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)
-	$(UPDATE_AUTOMAKE)
-
-	for i in $$(seq 1 6); do \
-		cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/readline/readline63-$$(printf "%03d" "$${i}") || exit 1; \
-	done
-
-	cd $(DIR_APP) && ./configure --prefix=/usr --libdir=/lib --disable-static
-	cd $(DIR_APP) && make $(MAKETUNING) SHLIB_LIBS=-lncurses
-
-	cd $(DIR_APP)/shlib && install -m 755 libreadline.so.$(VER) /lib
-	cd $(DIR_APP)/shlib && install -m 755 libhistory.so.$(VER) /lib
-	ln -svf libreadline.so.$(VER) /lib/libreadline.so.6
-	ln -svf libhistory.so.$(VER) /lib/libhistory.so.6
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index eb00087f6..e17d0487c 100755
--- a/make.sh
+++ b/make.sh
@@ -1080,7 +1080,6 @@ buildbase() {
    lfsmake2 libtool
    lfsmake2 binutils
    lfsmake2 gmp
-	lfsmake2 gmp-compat
    lfsmake2 mpfr
    lfsmake2 libmpc
    lfsmake2 libxcrypt
@@ -1088,7 +1087,6 @@ buildbase() {
    lfsmake2 gcc
    lfsmake2 sed
    lfsmake2 berkeley
-	lfsmake2 berkeley-compat
    lfsmake2 coreutils
    lfsmake2 iana-etc
    lfsmake2 m4
@@ -1096,7 +1094,6 @@ buildbase() {
    lfsmake2 ncurses
    lfsmake2 perl
    lfsmake2 readline
-	lfsmake2 readline-compat
    lfsmake2 bzip2
    lfsmake2 xz
    lfsmake2 lzip
@@ -1258,7 +1255,6 @@ buildipfire() {
   lfsmake2 ninja
   lfsmake2 meson
   lfsmake2 libjpeg
-  lfsmake2 libjpeg-compat
   lfsmake2 openjpeg
   lfsmake2 libexif
   lfsmake2 libpng
hooks/post-receive
--
IPFire 2.x development tree

    