Development July 2022

development@lists.ipfire.org

14 participants
76 discussions

[PATCH] services.cgi: Add link to DNS settings
by Matthias Fischer 26 Jul '22

26 Jul '22

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(a)ipfire.org> --- html/cgi-bin/services.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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>", -- 2.25.1

1 0

[PATCH 1/2] cups-pdf: New package
by Michael Tremer 25 Jul '22

25 Jul '22

This package provides a CUPS backend to print into PDF files. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- config/rootfiles/packages/cups-pdf | 5 ++ lfs/cups-pdf | 106 +++++++++++++++++++++++++ make.sh | 1 + src/patches/cups-pdf-setpdfwrite.patch | 27 +++++++ 4 files changed, 139 insertions(+) create mode 100644 config/rootfiles/packages/cups-pdf create mode 100644 lfs/cups-pdf create mode 100644 src/patches/cups-pdf-setpdfwrite.patch 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/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(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 + +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/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" } }, -- 2.30.2

1 1

[PATCH] bind: Update to 9.16.31
by Matthias Fischer 24 Jul '22

24 Jul '22

For details see: https://downloads.isc.org/isc/bind9/9.16.31/doc/arm/html/notes.html#notes-f… Excerpt from changelog: " --- 9.16.31 released --- 5917. [bug] Update ifconfig.sh script as is miscomputed interface identifiers when destroying interfaces. [GL #3061] 5915. [bug] Detect missing closing brace (}) and computational overflows in $GENERATE directives. [GL #3429] 5913. [bug] Fix a race between resolver query timeout and validation in resolver.c:validated(). Remove resolver.c:maybe_destroy() as it is no loger needed. [GL #3398] 5909. [bug] The server-side destination port was missing from dnstap captures of client traffic. [GL #3309] 5905. [bug] When the TCP connection would be closed/reset between the connect/accept and the read, the uv_read_start() return value would be unexpected and cause an assertion failure. [GL #3400] 5903. [bug] When named checks that the OPCODE in a response matches that of the request, if there is a mismatch named logs an error. Some of those error messages incorrectly used RCODE instead of OPCODE to lookup the nemonic. This has been corrected. [GL !6420]" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/bind | 14 +++++++------- lfs/bind | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind index 60ec36f45..bdb0fb7e4 100644 --- a/config/rootfiles/common/bind +++ b/config/rootfiles/common/bind @@ -274,24 +274,24 @@ usr/bin/nsupdate #usr/include/pk11/site.h #usr/include/pkcs11 #usr/include/pkcs11/pkcs11.h -usr/lib/libbind9-9.16.30.so +usr/lib/libbind9-9.16.31.so #usr/lib/libbind9.la #usr/lib/libbind9.so -usr/lib/libdns-9.16.30.so +usr/lib/libdns-9.16.31.so #usr/lib/libdns.la #usr/lib/libdns.so -usr/lib/libirs-9.16.30.so +usr/lib/libirs-9.16.31.so #usr/lib/libirs.la #usr/lib/libirs.so -usr/lib/libisc-9.16.30.so +usr/lib/libisc-9.16.31.so #usr/lib/libisc.la #usr/lib/libisc.so -usr/lib/libisccc-9.16.30.so +usr/lib/libisccc-9.16.31.so #usr/lib/libisccc.la #usr/lib/libisccc.so -usr/lib/libisccfg-9.16.30.so +usr/lib/libisccfg-9.16.31.so #usr/lib/libisccfg.la #usr/lib/libisccfg.so -usr/lib/libns-9.16.30.so +usr/lib/libns-9.16.31.so #usr/lib/libns.la #usr/lib/libns.so diff --git a/lfs/bind b/lfs/bind index a492624f8..6b2fe87fe 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@ include Config -VER = 9.16.30 +VER = 9.16.31 THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 35fe14b58a018df25563e58a9632b4431f740bc7a708eb823117541548d23b1855e43058cf7323361ca904d5e59d687e282abb73dc8b617e4eb25ef113168e93 +$(DL_FILE)_BLAKE2 = 75c9038c00fe289161a15a8e4fdadaef5a6a7f3ca03068ec24e82aa9f30ac82d0ded9cf73df83219058cd81b198ea8f561211a323e31b41407294f6932dc61d3 install : $(TARGET) -- 2.25.1

2 1

ipblocklist - Call for testers
by Stefan Schantl 21 Jul '22

21 Jul '22

Hello mailing list followers, it has been done - the port of the well known (ipblacklist) feature from Tim FitzGeorge has been finished. Now it's time for the final steps. For this I need your help, in testing and giving feedback and/or bug reports. I've backed and uploaded a test version, which contains all necessary files and modifications. There is also a README file available which gives further details and how to install the test version on your sytems. This all can be found here: https://people.ipfire.org/~stevee/ipblocklist/ For those of you which are interested in the source code: https://git.ipfire.org/?p=people/stevee/ipfire-2.x.git;a=shortlog;h=refs/he… Best regards and a happy testing, -Stefan

5 14

[PATCH] checkrootfiles: exclude update.sh at x86_64 check
by Arne Fitzenreiter 20 Jul '22

20 Jul '22

the updatescript also contains this string so the check produce a false positive. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> --- tools/checkrootfiles | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/checkrootfiles b/tools/checkrootfiles index 1a55a4da9..33bfb16e0 100755 --- a/tools/checkrootfiles +++ b/tools/checkrootfiles @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team info(a)ipfire.org # +# Copyright (C) 2007-2022 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 # @@ -35,11 +35,13 @@ fi grep -r '/x86_64' ./config/rootfiles/ --exclude gcc --exclude rust-libc \ --exclude rust-ppv-lite86 --exclude rust-memchr --exclude *linux* \ + --exclude update.sh \ --exclude-dir oldcore --exclude-dir x86_64 >/dev/null 2>&1 if [ "${?}" == "0" ]; then echo "Error! '/x86_64' in rootfiles files found!" grep -r '/x86_64' ./config/rootfiles/ --exclude gcc --exclude rust-libc \ --exclude rust-ppv-lite86 --exclude rust-memchr --exclude *linux* \ + --exclude update.sh \ --exclude-dir oldcore --exclude-dir x86_64 echo "Replace by xxxMACHINExxx !" fi -- 2.36.1

2 1

[PATCH] pakfire/functions.pl: Adjust log level
by Leo-Andres Hofmann 19 Jul '22

19 Jul '22

The informative pakfire message "No new upgrades available. You are on release ..." does not mean that an error has happened. This patch adjusts the log level prefix to "info" accordingly. Reported-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de> --- src/pakfire/lib/functions.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index 24c55fd4a..505988af9 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -797,7 +797,7 @@ sub upgradecore { system("echo $core_release > $Conf::coredir/mine"); } else { - message("CORE ERROR: No new upgrades available. You are on release $Conf::core_mine."); + message("CORE INFO: No new upgrades available. You are on release $Conf::core_mine."); } } -- 2.27.0.windows.1

2 1

Pakfire reports errors during 'tmux 3.3' upgrade - but why?
by Matthias Fischer 17 Jul '22

17 Jul '22

Hi, Pakfire likes to have a problem. ;-) ...not worried - just being curious...: Today I stumbled upon a 'tmux' update. Pakfire reported that 'tmux-3.3-10.ipfire' was available. CGI looked normal, installation went through. But Pakfire didn't close, reporting: 'Pakfire has finished! Errors occurred, please check the log output before proceeding.' I looked through the log, but can't find anything critical (screen log is attached). What triggered this message!? 'tmux 3.3' was installed, everything seems fine, but Pakfire complains. Any hints are welcome. Best, Matthias

4 4

[PATCH] ipblocklist: Suggested german translation
by Matthias Fischer 16 Jul '22

16 Jul '22

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- langs/de/cgi-bin/de.pl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 3285f1bfa..4d884f0e6 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1539,6 +1539,29 @@ 'ip basic info' => 'Grundlegende IP-Informationen', 'ip info' => 'IP-Informationen', 'ip info for' => 'IP-Informationen für', +'ipblocklist' => 'IP-Address-Blocklisten', +'ipblocklist blocklist settings' => 'Blocklist-Einstellungen', +'ipblocklist category' => 'Kategorie', +'ipblocklist category application' => 'Application', +'ipblocklist category attacker' => 'Attacker', +'ipblocklist category c and c' => 'Malware C&C', +'ipblocklist category composite' => 'Composite', +'ipblocklist category invalid' => 'Invalid Address', +'ipblocklist category reputation' => 'Reputation', +'ipblocklist category scanner' => 'Scanner', +'ipblocklist could not download blocklist' => 'Konnte Blockliste nicht herunterladen', +'ipblocklist download error' => 'Es ist ein Fehler beim Download aufgetreten.', +'ipblocklist empty blocklist received' => 'Es wurde eine leere Blockliste heruntergeladen.', +'ipblocklist enable' => 'Aktivieren', +'ipblocklist hits' => 'Gesamtanzahl der Blocklist-Treffer für', +'ipblocklist id' => 'Blocklist', +'ipblocklist input' => 'Verworfene Pakete (IN)', +'ipblocklist log list' => 'Firewallprotokoll (Blocklisten)', +'ipblocklist log' => 'Verworfene Pakete protokollieren', +'ipblocklist logs' => 'IP-Address-Blocklisten-Protokolle', +'ipblocklist name' => 'Name', +'ipblocklist output' => 'Verworfene Pakete (OUT)', +'ipblocklist use ipblocklists' => 'Aktiviere IP-Blocklisten', 'ipfire has now rebooted' => 'IPFire wird neu gestartet.', 'ipfire has now shutdown' => 'IPFire wird heruntergefahren.', 'ipfire side' => 'IPFire Seite:', -- 2.25.1

2 1

[PATCH] ipblocklist: Fixed typo in 'sources'
by Matthias Fischer 15 Jul '22

15 Jul '22

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/ipblocklist/sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/ipblocklist/sources b/config/ipblocklist/sources index 4d42ad974..c750dcd58 100644 --- a/config/ipblocklist/sources +++ b/config/ipblocklist/sources @@ -42,7 +42,7 @@ our %sources = ( 'EMERGING_FWRULE' => { 'name' => 'Emerging Threats Blocklis 'parser' => 'ip-or-net-list', 'rate' => '1h', 'category' => 'composite', - 'disable' => ['FEODO_RECOMMENDED', 'FEODO_IP', 'FEODO_AGGRESIVE', 'SPAMHAUS_DROP', 'DSHIELD'] }, + 'disable' => ['FEODO_RECOMMENDED', 'FEODO_IP', 'FEODO_AGGRESSIVE', 'SPAMHAUS_DROP', 'DSHIELD'] }, 'EMERGING_COMPROMISED' => { 'name' => 'Emerging Threats Compromised IPs', 'url' => 'https://rules.emergingthreats.net/blockrules/compromised-ips.txt', 'info' => 'https://doc.emergingthreats.net/bin/view/Main/CompromisedHost', @@ -80,7 +80,7 @@ our %sources = ( 'EMERGING_FWRULE' => { 'name' => 'Emerging Threats Blocklis 'rate' => '5m', 'category' => 'c and c', 'disable' => 'FEODO_RECOMMENDED' }, - 'FEODO_AGGRESIVE' => { 'name' => 'Feodo Trojan IP Blocklist (Aggresive)', + 'FEODO_AGGRESSIVE' => { 'name' => 'Feodo Trojan IP Blocklist (Aggressive)', 'url' => 'https://feodotracker.abuse.ch/downloads/ipblocklist_aggressive.txt', 'info' => 'https://feodotracker.abuse.ch/blocklist', 'parser' => 'ip-or-net-list', -- 2.25.1

2 1

[PATCH] ipblocklist: Removed another unused(?) message string
by Matthias Fischer 15 Jul '22

15 Jul '22

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- langs/en/cgi-bin/en.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 0a9bc8c04..a0b004038 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1599,7 +1599,6 @@ 'ipblocklist download error' => 'A download error occured.', 'ipblocklist empty blocklist received' => 'An empty blocklist has been received.', 'ipblocklist enable' => 'Enable', -'ipblocklist entries' => 'Entries', 'ipblocklist hits' => 'Total number of blocklist hits for', 'ipblocklist id' => 'Blocklist', 'ipblocklist input' => 'Packets dropped (IN)', -- 2.25.1

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development July 2022