From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [Merge Request] Guardian 2.0 Date: Tue, 02 Aug 2016 14:49:05 +0100 Message-ID: <1470145745.2710.422.camel@ipfire.org> In-Reply-To: <1470077630.5573.9.camel@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0498662483698818474==" List-Id: --===============0498662483698818474== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Thank you very much. I merged this one with a small number of additional fixe= s. I also created so bug reports about minor bugs which is mainly UI related and= is not a deal-breaker for this release, but I think should generally be resolved. A testing release should be available shortly, so that a larger number of testers can join testing Guardian. Best, -Michael On Mon, 2016-08-01 at 20:53 +0200, Stefan Schantl wrote: > Hello, >=20 > this is the merge request to include guardian 2.0 into IPFire 2.x. >=20 > All changes are stored at the "guardian-2.0" branch in my personal > IPFire-2.x repository. >=20 > http://git.ipfire.org/?p=3Dpeople/stevee/ipfire-2.x.git;a=3Dshortlog;h=3Dre= fs > /heads/guardian-2.0 >=20 > A short summary of the containing changes: >=20 > * Update guardian to the newly developed "guardian 2.0". > - Add backup file for this service. > - Add logrotate file. > - Add initscript. > - Remove old guardian code. >=20 > * Add "guardian.cgi" to administrate guardian. >=20 > * Remove guardian related code from "ids.cgi" and "snort" initscript. > (shipped by the core update) >=20 > * Add required language strings to the english and german language > files. (core update) >=20 > 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). >=20 > Thanks in advance, >=20 > -Stefan --===============0498662483698818474== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSlhvS1RSQUFvSkVJQjU4UDl2a0FrSGd3OFFBSVQ0dmUyUGdpMmFScHA2WWFvOGdoNzUK UHJQaU85MEc0T0ZlSHIxZ1U4aGYydGlBaUh1TmtZbmU2T21LKzZHcnJRUzVXVXl1TlpxK0lTUmNv K1Rialc1QwphUWxCeXRhMFlIWXk0OG11WVVsSmplUnVuQnhXd2JrTGRiR1F2bFJSMjVmUDZIREJY aFZyYTNJSkpkWWd3TFdSCmliQXdSYVJhVTVHWktrTFhOTGc0Mk40TkU0bmRUVDBiZWRWNU1Kclhk R0IyYmRJSWhMQWpmek1Jc1lSNEJxekwKWDRKRllNYWhjc05kSDNPWTRISGV5b1RCZUFmSTQ5Z0R4 aFpZUUxBTnozV29BdzVmbTQvdzRRelJyOWpuRVA0WQo4Sk9EZ3FnRlFTcHZYS2RaL2dmVjlNa2ty QWl2Q2R1Y3p4bXVFOVd5YjQyYWJ3bkJ0ampobmh4bUhwZkkyRzNCCkphK3hJWUZTZTJpL09LbDRR TlFmaTZ6ZXlaenlqeFBwaGJ5cXFPdHJjV0dmc1kvZGhQNHFzanRkaEQ2blIvcmgKSXdpSldvTWx5 ZGpUS2NSTWJqOGhaVmFocWtMTHNvQUhnWE50NXJ0dTdpclBLdGpqaGtJaDFFNWZTVEF4WG4wbApH dnVETndGNWZsN1BTVDVvWTU4aE51b21scWllR09NN0RqcjhYd2lnVmI5SWNYZFBnTnRja1g4WHk3 TGZxQjRFCkVlSVZ4Z2RxblFKd0dRZ3hyMFFkQWtkTmIzbzJET0luQVNYRE9Id0cvSzd3UTZaNlE2 RHk4WlhxT0dyUnhTek4KbWxTaXlxU3pWY25xU0RVaVlUekN3S0ZMK1FDQ2o2d3VDMmI1R3NOdzFK SzFGS1o0S3F2a1QyTEwyaEFieU54agpaTlV2Y1ZnRlRvTDlvNzUvVFZYTgo9Uzl6WgotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============0498662483698818474==--