From: "Peter Müller" <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: Trying to update gd
Date: Sat, 19 Jun 2021 08:09:50 +0200 [thread overview]
Message-ID: <f91a4610-8586-d986-2103-4422d6c14238@ipfire.org> (raw)
In-Reply-To: <939f59ab-2116-7bf4-2c65-0fa73ba4a9d7@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 1934 bytes --]
Hello Adolf,
reading this thread, I just stumbled across the part below, so I thought I slip into the conversation. :-)
> With memory.cgi I get an Internal Server Error. The log gives the following:-
>
> Bareword "collectd" not allowed while "strict subs" in use at /srv/web/ipfire/cgi-bin/memory.cgi line 59.
> Bareword "localhost" not allowed while "strict subs" in use at /srv/web/ipfire/cgi-bin/memory.cgi line 59.
> Bareword "swap" not allowed while "strict subs" in use at /srv/web/ipfire/cgi-bin/memory.cgi line 59.
> Execution of /srv/web/ipfire/cgi-bin/memory.cgi aborted due to compilation errors.
>
> Looking at line 59 and checking in git this looks to be related to a change done by Stefan Schantl 8 days ago
> https://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff;h=4353c579248b3016740252009b4ed15a4c6f8fe3
>
> I don't want to commit the patch for gd until I have memory.cgi confirmed working and enough firewall data to confirm the pie charts are working but it looks close to completion.
This is because of bug #12616, which required massive changes to nearly all of the CGIs. Stefan and Michael
worked on this one, and their changes was merged into the "next" branch a few days ago.
Therefore, copying CGIs from "next" onto an already installed IPFire running Core Update 156 is not suitable
for testing, as C156 lacks additional Perl methods introduced by Stefan.
Unless your changes to a CGI hit a part of it that has been modified, you can still generate a patch of your
changes, and apply that on an existing IPFire installation. This would look like:
(on your workstation)
> git diff memory.cgi > memory-cgi-fixes.patch
> scp memory-cgi-fixes.patch [FQDN or IP address of your IPFire]:/tmp/.
(on the IPFire machine)
> cd /srv/web/ipfire/cgi-bin/
> patch < /tmp/memory-cgi-fixes.patch
Good luck, and happy patching. :-)
Thanks, and best regards,
Peter Müller
next prev parent reply other threads:[~2021-06-19 6:09 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-17 18:53 Adolf Belka
2021-06-18 8:35 ` Michael Tremer
2021-06-18 21:26 ` Adolf Belka
2021-06-19 6:09 ` Peter Müller [this message]
2021-06-19 12:09 ` Michael Tremer
2021-06-19 15:43 ` Adolf Belka
2021-06-20 18:21 ` Adolf Belka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f91a4610-8586-d986-2103-4422d6c14238@ipfire.org \
--to=peter.mueller@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox