From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [Merge Request] Guardian 2.0
Date: Mon, 01 Aug 2016 20:53:50 +0200
Message-ID: <1470077630.5573.9.camel@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4547822589720129920=="
List-Id: <development.lists.ipfire.org>

--===============4547822589720129920==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

Hello,

this is the merge request to include guardian 2.0 into IPFire 2.x.

All changes are stored at the "guardian-2.0" branch in my personal
IPFire-2.x repository.

http://git.ipfire.org/?p=people/stevee/ipfire-2.x.git;a=shortlog;h=refs
/heads/guardian-2.0

A short summary of the containing changes:

* Update guardian to the newly developed "guardian 2.0".
	- Add backup file for this service.
	- Add logrotate file.
	- Add initscript.
	- Remove old guardian code.

* Add "guardian.cgi" to administrate guardian.

* Remove guardian related code from "ids.cgi" and "snort" initscript.
(shipped by the core update)

* Add required language strings to the english and german language
files. (core update)

Please have a look at my changes and if everything is okay merge them
into the next branch to get them released / shipped by the next core
update (core 104).

Thanks in advance,

-Stefan

--===============4547822589720129920==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC
Q2dBR0JRSlhuNXEvQUFvSkVFN1hUaFdQazdMZWpiNFFBTUNSelhIQU5JYVVrV1p4Ymp5MktCVEUK
UllQRzk2S1lzeWNEOFVWL2FCU3d0OUxFYnFSUzh1cjUvZmJpS1VwK01sckRaUXRPb2xQUTh6STli
MU1RNXhubQo4YjNBZW8zVTMxc1JHV1hxYmZvbHh4ZkhxdmJ2ZjQzTnd6V042S0pCeUt2T1dmU282
NkJ5cUlIQ2NsaEJ0UlF4CkJWUDFUaWEzVzZEM1VpMVJ1VmhYUEdRak1SbUZFenBnMnovNkEwUmlE
TDBhWGFZRWVZQ3hicUo5eitua1B0UkgKRzBseVFBdHlSUUZjTFN4WDFHY2k2WTZsb0RLMEJLTTdH
U3VCc1k1Tk9UUGwyTHNsbjhjd2RoVEJxWkpGaUl6UQpoOUFTVFVIK0doYytLNE1xbW5Qc1lqM3Vq
eHBGL25VVThjMDhKWGhWck9ya0VGL2thVVpjOGg0K1hESEVKUUNaCjgycmdtcXB6RDFsMmw1NzhC
UTExQ0g3eXA3VUY0c0diaUZ0WFdJK1ROUXo3N0RFNnR1ck0vNVdUMnRyaHk4ZGMKWEJGeFc3aHFU
MnhzRzlYR05GMUFkdmNkaTZPc3g4NlVKT0ozbkVoNVB0M3dtQXNpaFJva1pJMEhGMEQwc2c5ZQpS
VnVtQndVdVY2Z21Nc0JDeHY4Z1o2SjYxSnA5YzYva1MybFkvS0R1dDFPV2wxNmsxdzNnek1MQ0hU
bURpOWZ6CmdLeEswd25JMUx6NWdDMUFGSEdva0tjeVFvelo5dnpYdFY0c0UxalhrdGF3L0YrcUQx
RUpLaS9pbC9KT3k2cTcKeGdOQjdGY0U2K2VKelVnWW1MbldaZ0E4RlRIeFo5R3BrdW1MMVd6OWZW
OGw1RU5xSXhpWUpDSCtZRWgrWGJ1WgpscXBicWkrc3QwYWZtTWI5UVlCNwo9Ri9IdAotLS0tLUVO
RCBQR1AgU0lHTkFUVVJFLS0tLS0K

--===============4547822589720129920==--