[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b2ab2f4cccb0792e7444e87bd5ea18590ed6272c
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 b2ab2f4cccb0792e7444e87bd5ea18590ed6272c (commit) via 342dd9afd6d3b669bc1769f6d2033f63ebda8291 (commit) via d0ee27149d53fff6c9701c554a690e422240e9e0 (commit) via e88b454cfc74276752f37ad487102638e0717408 (commit) via c6537f4539a1eb6632613cf2212696cd4a853f42 (commit) via 8aab72f01bf6035255f0c7efbed36b24638adf6d (commit) via 71aba971c455ac695bef6a3d41ed8563a53f9a44 (commit) via fdf630e8d419973f016e00fefc3a8dbc28cd9080 (commit) from 00e8b1541f6ed4aeb7b6f6ef5f3ee49d70fad0f4 (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 b2ab2f4cccb0792e7444e87bd5ea18590ed6272c Author: Matthias Fischer matthias.fischer@ipfire.org Date: Wed Jul 27 02:00:05 2022 +0200
clamav: Update to 0.105.1
For details see: https://blog.clamav.net/2022/07/clamav-01037-01041-and-01051-patch.html
"ClamAV 0.105.1 is a critical patch release with the following fixes:
Upgrade the vendored UnRAR library to version 6.1.7.
Fix issue building macOS universal binaries in some configurations.
Silence error message when the logical signature maximum functionality level is lower than the current functionality level.
Fix scan error when scanning files containing malformed images that cannot be loaded to calculate an image fuzzy hash.
Fix logical signature "Intermediates" feature.
Relax constraints on slightly malformed ZIP archives that contain overlapping file entries."
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 342dd9afd6d3b669bc1769f6d2033f63ebda8291 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jul 27 07:11:23 2022 +0000
core170: Ship logs.cgi/ids.dat
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d0ee27149d53fff6c9701c554a690e422240e9e0 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Jul 26 19:31:06 2022 +0200
logs.cgi/ids.dat: Proper display logged events.
Fix the regular expression to proper display the logged IDS events.
Fixes #12899.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e88b454cfc74276752f37ad487102638e0717408 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Tue Jul 26 16:56:50 2022 +0200
logwatch: Update to 7.7
The developers do not provide a changelog, the only comment I could find was on:
https://packetstormsecurity.com/files/167798/Logwatch-7.7.html
"Changes: Fixed bugs."
Running here on Core 169. No seen problems.
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c6537f4539a1eb6632613cf2212696cd4a853f42 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jul 27 07:10:05 2022 +0000
core170: Ship services.cgi
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8aab72f01bf6035255f0c7efbed36b24638adf6d Author: Matthias Fischer matthias.fischer@ipfire.org Date: Tue Jul 26 16:49:05 2022 +0200
services.cgi: Add link to DNS settings
This just came to my view...
I know its not *actually* a link to a "DNS-Proxyserver", but I find it nice that I can change to the page containing some of the main DNS settings in just one click. I thought it could be useful.
JM2C
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 71aba971c455ac695bef6a3d41ed8563a53f9a44 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jul 25 16:02:04 2022 +0000
cups: Add link at /etc/cups pointing to configuration
This is needed because cups-pdf is looking for its configuration file in /etc/cups.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit fdf630e8d419973f016e00fefc3a8dbc28cd9080 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jul 25 16:02:03 2022 +0000
cups-pdf: New package
This package provides a CUPS backend to print into PDF files.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/170/filelists/files | 2 ++ config/rootfiles/packages/clamav | 1 + config/rootfiles/packages/cups | 1 + config/rootfiles/packages/cups-pdf | 5 ++++ html/cgi-bin/logs.cgi/ids.dat | 2 +- html/cgi-bin/services.cgi | 2 +- lfs/clamav | 6 ++-- lfs/cups | 5 +++- lfs/{cups-filters => cups-pdf} | 47 ++++++++++++++++++------------- lfs/logwatch | 4 +-- make.sh | 1 + src/patches/cups-pdf-setpdfwrite.patch | 27 ++++++++++++++++++ 12 files changed, 76 insertions(+), 27 deletions(-) create mode 100644 config/rootfiles/packages/cups-pdf copy lfs/{cups-filters => cups-pdf} (77%) create mode 100644 src/patches/cups-pdf-setpdfwrite.patch
Difference in files: diff --git a/config/rootfiles/core/170/filelists/files b/config/rootfiles/core/170/filelists/files index 25f262eb7..0b4fa2dcc 100644 --- a/config/rootfiles/core/170/filelists/files +++ b/config/rootfiles/core/170/filelists/files @@ -2,6 +2,8 @@ etc/rc.d/init.d/firewall opt/pakfire/lib/functions.pl srv/web/ipfire/cgi-bin/aliases.cgi srv/web/ipfire/cgi-bin/ipblocklist.cgi +srv/web/ipfire/cgi-bin/services.cgi +srv/web/ipfire/cgi-bin/logs.cgi/ids.dat srv/web/ipfire/cgi-bin/logs.cgi/ipblocklists.dat srv/web/ipfire/cgi-bin/logs.cgi/log.dat srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromblocklist.dat diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index ca3124bb2..588c34eb4 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -56,6 +56,7 @@ usr/sbin/clamd #usr/share/doc/ClamAV/html/clipboard.min.js #usr/share/doc/ClamAV/html/community_resources #usr/share/doc/ClamAV/html/community_resources/CommunityResources.html +#usr/share/doc/ClamAV/html/community_resources/CompileClamAV_AmazonLinux2.txt #usr/share/doc/ClamAV/html/css #usr/share/doc/ClamAV/html/css/chrome.css #usr/share/doc/ClamAV/html/css/general.css diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups index 18987be0e..65ad4f418 100644 --- a/config/rootfiles/packages/cups +++ b/config/rootfiles/packages/cups @@ -1,3 +1,4 @@ +etc/cups etc/dbus-1/system.d/cups.conf etc/pam.d/cups etc/rc.d/init.d/cups diff --git a/config/rootfiles/packages/cups-pdf b/config/rootfiles/packages/cups-pdf new file mode 100644 index 000000000..70324cad1 --- /dev/null +++ b/config/rootfiles/packages/cups-pdf @@ -0,0 +1,5 @@ +usr/lib/cups/backend/cups-pdf +#usr/share/ppd/cups-pdf +usr/share/ppd/cups-pdf/CUPS-PDF_noopt.ppd +usr/share/ppd/cups-pdf/CUPS-PDF_opt.ppd +var/ipfire/cups/cups-pdf.conf diff --git a/html/cgi-bin/logs.cgi/ids.dat b/html/cgi-bin/logs.cgi/ids.dat index 35c0dd1fd..7991e3936 100644 --- a/html/cgi-bin/logs.cgi/ids.dat +++ b/html/cgi-bin/logs.cgi/ids.dat @@ -414,7 +414,7 @@ sub processevent } ($title,$classification,$priority,$date,$time,$srcip,$srcport,$destip,$destport,$sid) = ("n/a","n/a","n/a","n/a","n/a","n/a","n/a","n/a","n/a", "n/a"); @refs = (); - $_ =~ m/:([0-9]{1,5})] (.*) [**]/; + $_ =~ m/:([0-9]{1,10})] (.*) [**]/; $title = &Header::cleanhtml($2,"y"); } if ($_ =~ m/Classification: (.*)] [Priority: (\d)]/) { diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi index 237475735..a1dcfd57e 100644 --- a/html/cgi-bin/services.cgi +++ b/html/cgi-bin/services.cgi @@ -64,7 +64,7 @@ my %link =( $Lang::tr{'dhcp server'} => "<a href='dhcp.cgi'>$Lang::tr{'dhcp server'}</a>", $Lang::tr{'web server'} => $Lang::tr{'web server'}, $Lang::tr{'cron server'} => $Lang::tr{'cron server'}, - $Lang::tr{'dns proxy server'} => $Lang::tr{'dns proxy server'}, + $Lang::tr{'dns proxy server'} => "<a href='dns.cgi'>$Lang::tr{'dns proxy server'}</a>", $Lang::tr{'logging server'} => $Lang::tr{'logging server'}, $Lang::tr{'kernel logging server'} => $Lang::tr{'kernel logging server'}, $Lang::tr{'ntp server'} => "<a href='time.cgi'>$Lang::tr{'ntp server'}</a>", diff --git a/lfs/clamav b/lfs/clamav index 1a4913089..bcb996c4f 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -26,7 +26,7 @@ include Config
SUMMARY = Antivirus Toolkit
-VER = 0.105.0 +VER = 0.105.1
THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 60 +PAK_VER = 61
DEPS =
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 2c3055c3c5de115e01b6c0decee21c061c0583171c1794a38ecd86f354765879a6a2b7f2653c67fc19273dfc0caa9da8a2bbe339854e4c0d237baf3f3c650813 +$(DL_FILE)_BLAKE2 = be46d9afd76fb536d7de7363a45d38fef6a5983011e3cd0dcc25c2a209c8d37a2bbe1f7f4a5694152cabf622ef83e072b892ae12ba404da1955bb5b654e5216d
install : $(TARGET)
diff --git a/lfs/cups b/lfs/cups index d333532e3..312f165d8 100644 --- a/lfs/cups +++ b/lfs/cups @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/cups-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cups -PAK_VER = 27 +PAK_VER = 28
DEPS = avahi cups-filters dbus ghostscript
@@ -104,5 +104,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(call INSTALL_INITSCRIPTS,$(SERVICES)) cp -fv $(DIR_SRC)/config/cups/cupsd.conf /var/ipfire/cups/
+ # Install convenience link + ln -svf /var/ipfire/cups /etc/cups + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/cups-pdf b/lfs/cups-pdf new file mode 100644 index 000000000..efa40e87b --- /dev/null +++ b/lfs/cups-pdf @@ -0,0 +1,106 @@ +############################################################################### +# # +# 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 + +SUMMARY = OpenPrinting CUPS filters, backends, and cups-browsed + +VER = 3.0.1 + +THISAPP = cups-pdf-$(VER) +DL_FILE = cups-pdf_$(VER).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = cups-pdf +PAK_VER = 1 + +DEPS = cups + +SERVICES = + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = f964358c5e465447e703848a697f6c801624a1836e2a0a4026c507c66048cf4bef92327508598ec7e9a356d4f57894a6b610e55b7a9a34e942cf2b88c6c55b85 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +dist: + $(PAK) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cups-pdf-setpdfwrite.patch + + # Compile backend + cd $(DIR_APP)/src && gcc $(CFLAGS) cups-pdf.c -o cups-pdf -lcups + + # Install backend + cd $(DIR_APP)/src && install -v -m 700 \ + cups-pdf /usr/lib/cups/backend/cups-pdf + + # Install PPD files + -mkdir -pv /usr/share/ppd/cups-pdf + cd $(DIR_APP)/extra && install -v -m 644 \ + CUPS-PDF_noopt.ppd \ + CUPS-PDF_opt.ppd \ + /usr/share/ppd/cups-pdf + + # Install configuration + -mkdir -pv /var/ipfire/cups + cd $(DIR_APP)/extra && install -v -m 644 \ + cups-pdf.conf /var/ipfire/cups/cups-pdf.conf + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/logwatch b/lfs/logwatch index 5cd79843c..57a605ed5 100644 --- a/lfs/logwatch +++ b/lfs/logwatch @@ -24,7 +24,7 @@
include Config
-VER = 7.6 +VER = 7.7
THISAPP = logwatch-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = fd7f2a7c65151dbfbd924102b01ead00f92d74a59a417361b65be972368f7ed93810feefedf1ad9bba2de5ebbc74589c3fc0a8a484f19b5a9782c9799ffdf656 +$(DL_FILE)_BLAKE2 = 8978930fe844bde372f68038f295cc62ca61f1c2b10d18f545ddcc713cb72cd01520ff0ea0869f2dff96846431a6dd9a04da1bc79817ccb590b0235f96e934da
install : $(TARGET)
diff --git a/make.sh b/make.sh index da3f7f467..7fb63b913 100755 --- a/make.sh +++ b/make.sh @@ -1465,6 +1465,7 @@ buildipfire() { lfsmake2 poppler-data lfsmake2 cups-filters lfsmake2 epson-inkjet-printer-escpr + lfsmake2 cups-pdf lfsmake2 foomatic lfsmake2 hplip lfsmake2 cifs-utils diff --git a/src/patches/cups-pdf-setpdfwrite.patch b/src/patches/cups-pdf-setpdfwrite.patch new file mode 100644 index 000000000..58d71c02f --- /dev/null +++ b/src/patches/cups-pdf-setpdfwrite.patch @@ -0,0 +1,27 @@ +diff -ur extra/cups-pdf.conf extra/cups-pdf.conf +--- extra/cups-pdf.conf 2021-06-03 08:50:00.109555813 -0400 ++++ extra/cups-pdf.conf 2021-06-03 08:51:27.530198340 -0400 +@@ -250,9 +250,9 @@ + ### Key: GSCall (config) + ## command line for calling GhostScript (!!! DO NOT USE NEWLINES !!!) + ## MacOSX: for using pstopdf set this to %s %s -o %s %s +-### Default: %s -q -dCompatibilityLevel=%s -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile="%s" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f %s ++### Default: %s -q -dCompatibilityLevel=%s -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile="%s" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c 30000000 setvmthreshold -f %s + +-#GSCall %s -q -dCompatibilityLevel=%s -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile="%s" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f %s ++#GSCall %s -q -dCompatibilityLevel=%s -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile="%s" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c 30000000 setvmthreshold -f %s + + ### Key: PDFVer (config, ppd, lptopions) + ## PDF version to be created - can be "1.5", "1.4", "1.3" or "1.2" +diff -ur src/cups-pdf.h src/cups-pdf.h +--- src/cups-pdf.h 2021-06-03 08:50:00.109555813 -0400 ++++ src/cups-pdf.h 2021-06-03 08:51:44.833325511 -0400 +@@ -58,7 +58,7 @@ + { "AnonDirName", SEC_CONF|SEC_PPD, { "/var/spool/cups-pdf/ANONYMOUS" } }, + { "AnonUser", SEC_CONF|SEC_PPD, { "nobody" } }, + { "GhostScript", SEC_CONF|SEC_PPD, { "/usr/bin/gs" } }, +- { "GSCall", SEC_CONF|SEC_PPD, { "%s -q -dCompatibilityLevel=%s -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile="%s" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f %s" } }, ++ { "GSCall", SEC_CONF|SEC_PPD, { "%s -q -dCompatibilityLevel=%s -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile="%s" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c 30000000 setvmthreshold -f %s" } }, + { "Grp", SEC_CONF|SEC_PPD, { "lp" } }, + { "GSTmp", SEC_CONF|SEC_PPD, { "TMPDIR=/var/tmp" } }, + { "Log", SEC_CONF|SEC_PPD, { "/var/log/cups" } },
hooks/post-receive -- IPFire 2.x development tree
-
Michael Tremer