From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] download ET IDS rules via HTTPS
Date: Mon, 13 Aug 2018 21:06:05 +0100
Message-ID: <bc1de8bfe8ec81bb04b762509ade136c649003e3.camel@ipfire.org>
In-Reply-To: <bcd36d0d-9883-2023-8c79-51a35bbc6551@link38.eu>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5260268940450611259=="
List-Id: <development.lists.ipfire.org>

--===============5260268940450611259==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Hi,

this is another patch that just doesn't to apply. I downloaded the
email in mbox format and got this:

[root(a)hughes ipfire-2.x]# git am -s /home/ms/Downloads/\[PATCH\]_download_E=
T_IDS_rules_via_HTTPS.mbox
Applying: download ET IDS rules via HTTPS
error: corrupt patch at line 14
Patch failed at 0001 download ET IDS rules via HTTPS
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Looking at "git am --show-current-patch":

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 9863251e2..d9d697deb 100644
- --- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -265,7 +265,7 @@ if (!$errormessage) {
        } elsif ($snortsettings{'RULES'} eq 'community') {
                $url=3D3D" https://www.snort.org/rules/community";
        } else {
- -               $url=3D3D"http://rules.emergingthreats.net/open/snort-2.9.0=
/emerging.rul=3D
es.tar.gz";
+               $url=3D3D"https://rules.emergingthreats.net/open/snort-2.9.0/=
emerging.ru=3D
les.tar.gz";
        }
=3D20
        if ($snortsettings{'ACTION'} eq $Lang::tr{'save'} && $snortsettings{'=
AC=3D
TION2'} eq "snort" ) {
- --=3D20
2.16.4

There are fancy line-wraps in that patch.

Is that the PGP stuff that is adding them?

Best,
- -Michael

On Sun, 2018-08-12 at 11:50 +0200, Peter M=C3=BCller wrote:
> The Emerging Threats ruleset server supports HTTPS. It should
> be used for downloading the ruleset in IPFire, too.
>=20
> This also needs to be applied on the upcoming ids.cgi file for Suricata
> which I will do in a second patch.
>=20
> Signed-off-by: Peter M=C3=BCller <peter.mueller(a)link38.eu>
> ---
>  html/cgi-bin/ids.cgi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>=20
> diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
> index 9863251e2..d9d697deb 100644
> --- a/html/cgi-bin/ids.cgi
> +++ b/html/cgi-bin/ids.cgi
> @@ -265,7 +265,7 @@ if (!$errormessage) {
>  	} elsif ($snortsettings{'RULES'} eq 'community') {
>  		$url=3D" https://www.snort.org/rules/community";
>  	} else {
> -		$url=3D"http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules=
.tar.gz";
> +		$url=3D"https://rules.emergingthreats.net/open/snort-2.9.0/emerging.rule=
s.tar.gz";
>  	}
> =20
>  	if ($snortsettings{'ACTION'} eq $Lang::tr{'save'} && $snortsettings{'ACTI=
ON2'} eq "snort" ) {
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEE5/rW5l3GGe2ypktxgHnw/2+QCQcFAltx5K0ACgkQgHnw/2+Q
CQcddg//XjElESBx3KE4XNC0nDzNB4OBmUN6jXTYvud9CWuT3eTYvwRz9RQLuTrK
+R22I0L7ZZ9gegKiN/QrhLPqxSY5aGFDJxBiI4JQtpb6J+81hTheF9GINGqucBCw
ZpYaXBfVlFjKq7ryCaakr6gprtxuoyiUPdSrZ/G9GooRf252+XBtThyJ1yNJEiQH
VDLNkHF8CAtrp5UNlARfk+iC/dBhz8Tj3LihGOm7E4aHviGkVwF2M/rgPIQjAYJS
eQQ/iorFz0IaQzKIbyxeboZcxeyeQdzHDEnujfrNflgKHDfqeXnnWO0a13D27df6
cFNywMV5qm+zAy7KmuYqKlWpCQDEazZLidJz0pptcxV9+O5oQAEIBolXqNllBWXk
kwq+t6KToGMQAcBKs85fHUNUsNqOknkWg3KaNlC+n5OtbT7u4anunfhflswZj01t
73XyjjJ+L2T8eTluBhb2v5ug8uhmJwTEXSXTXWVRE/VYj4OCLP6JZktEsDeWdo49
G3Rg4bjK0AYC2YsNN/g/hu6e8wzhcexu4mMdxM1pfpAx+BFHzKS9ActAzjI08ZPk
333rqaRRz6XxMTSc8IMLsFjkazvChlbRWuM1hnR9AzDSY2wMh3Sgqs4ZQuPCKI7A
rAceVPqrvP6aoF9RuMKTbYXlUoxpxkgvdIL/y8wFvxDHvWdrVqg=3D
=3Dl9h+
-----END PGP SIGNATURE-----


--===============5260268940450611259==--