[git.ipfire.org] IPFire 2.x development tree branch, core78, created. 05a48c2b2a09e8a5c67276dd2c372d4fbc023017
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, core78 has been created at 05a48c2b2a09e8a5c67276dd2c372d4fbc023017 (commit)
- Log ----------------------------------------------------------------- commit 05a48c2b2a09e8a5c67276dd2c372d4fbc023017 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon May 26 00:07:38 2014 +0200
close core78.
commit 5346fd16195c48bd34e53458b57995699e427627 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon May 26 00:06:40 2014 +0200
core78: add sshd initskript to updater.
commit 8f31e2c38d331bf27c4c0610f59a2df2683dac03 Merge: c3ab884 022438b Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun May 25 10:06:05 2014 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit c3ab884ca5e581448f051c75e5162428a3230d6c Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun May 25 10:03:58 2014 +0200
Revert "kernel: change compression of pae kernel to bz2."
This reverts commit 3e8286210f4e167c9ad2bb20b7fe3a56d2435b52.
bz2 is not supported by debian xen. So users that have problems with xz compression need to update the pygrub on the host.
commit 022438b50b801bc480e9585c81efb4356ac91102 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat May 24 15:05:56 2014 +0200
setddns.pl: Fix function call of udmedia and twodns.
commit b5d2be5d9b51c463e8892db74afb2372123199ae Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri May 23 22:16:17 2014 +0200
installer: increase size of root partition.
commit 4680b4a38f2e67e64e00b0e59b979610fa44f4d5 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu May 22 23:54:43 2014 +0200
qemu: bump package version to force reinstall.
commit 42c439e45d76ca42048f8cf46bf3ec9a7c7b0ad9 Merge: 85ce9e1 fded6fa Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu May 22 23:53:24 2014 +0200
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
commit 85ce9e1b971d21f44a185de4800b187d4a05ec6c Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu May 22 23:52:46 2014 +0200
kernel: update intel vendor modules.
commit fded6faa72d581114e25ddb17bcc607625736fdc Merge: 9d707db c0e0848 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu May 22 23:11:43 2014 +0200
Merge remote-tracking branch 'ms/firewall-block-green' into next
commit 9d707db06eef14a519ed1e5091a6d12f50b452d4 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu May 22 21:21:53 2014 +0200
xen-image-maker: fix linux-pae metafile create.
commit e52d2c3bb529d70ac17567a1b795f4a51a9b1467 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu May 22 20:56:10 2014 +0200
xen-image-maker: fix variable in README file.
commit 61cf8114ea71d62fe953cd4a9d97e8a8ca8fbf30 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu May 22 18:40:13 2014 +0200
xen-image-maker: add support vor XenCenter xva image output.
commit 3c4c5466ce687de0d33e6dab9cfff4f8f2e6c96a Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu May 22 08:11:11 2014 +0200
xen-image-maker: default fs to ext3.
many xen server still not support ext4.
commit 51fe9ff8e369bb123d81fe51bef6e9a7da026aa2 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu May 22 08:08:56 2014 +0200
xen-image-maker: remove legacy xen kernel.
commit d2dcd8b2e28face37be18ced3c2f22624e7e567a Merge: 30b1c1c 3e82862 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed May 21 22:47:13 2014 +0200
Merge remote-tracking branch 'origin/master' into next
commit 3e8286210f4e167c9ad2bb20b7fe3a56d2435b52 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed May 21 22:29:47 2014 +0200
kernel: change compression of pae kernel to bz2.
Many xen systems does not support load of xz compressed kernel.
fixes #10542
commit 53c07248cdb749275d9ba7023f4684f2946cf4b0 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue May 20 11:23:57 2014 +0200
kernel: build cpufreq hardware drivers as module.
commit c0e0848f999ed8944ae551047fdea32bfee88d03 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue May 20 11:41:23 2014 +0200
firewall: Allow blocking access to GREEN from GREEN.
commit 8e59a6022bf7cb225c3509be2964833cce0e630c Author: Michael Tremer michael.tremer@ipfire.org Date: Tue May 20 11:27:24 2014 +0200
firewall: Rename GUIINPUT chain to ICMPINPUT.
The name of the chain does not really explain what it does.
commit 763190af8e3272a1edd582e1e1736bfc8c0c1baa Merge: 30b1c1c 33df321 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue May 20 11:25:48 2014 +0200
Merge remote-tracking branch 'origin/master' into next
commit 33df321e1b0eea578250af4d5155a23f8891076a Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon May 19 20:12:00 2014 +0200
Revert "sshd: add fallback for oom setings with old kernel."
This reverts commit 1566fb6b5531247bd60d291716da1d5a017e9dce. xen kernel was dropped and in the code are missing brackets.
commit 3555cff1028e046dea96b7f9c98fb982b884ca54 Merge: e898660 707fd3f Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon May 19 20:07:18 2014 +0200
Merge remote-tracking branch 'arne_f/kernel-test'
commit e898660a30c7fac19e8ba495d6094e7f9a2aa03a Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon May 19 10:04:06 2014 +0200
kernel: add pie packet sheduler.
commit 30b1c1c72855e469034d9f7a6d4410367fa3069c Author: Michael Tremer michael.tremer@ipfire.org Date: Sun May 18 13:35:02 2014 +0200
Re-add missing language string "DNS Servers".
commit 4be45949e9629cc141401957e291e1e5206adb39 Author: Erik Kapfer erik.kapfer@ipfire.org Date: Sat May 17 21:59:45 2014 +0200
openvpn: Changed directioning and added additional generation for ta.key.
Deleted the direction parameter 0 and 1 in ta.key directive for compatibility purposes. Added the ta.key generation also in PKI build process. Replaced the ta.key to /certs instead of /ca and adapted the apropriate paths.
commit 53ce51761fb21c630ce547660cc0b2778835d210 Author: Erik Kapfer erik.kapfer@ipfire.org Date: Sat May 17 21:48:50 2014 +0200
openvpn: Drop unused code from cgi file.
Deleted the following unused functions:
* checkportfw * checkportoverlap * checkportinc * disallowreserved
commit 754066e6c3c6c1185fc25f8ae25b5e90c6e11f99 Author: Erik Kapfer erik.kapfer@ipfire.org Date: Sat May 17 21:32:55 2014 +0200
openvpn: Deleted double entries for TLSAUTH and DAUTH.
Also drop remaining if clauses for Engines.
commit e3b5a052ecd0eb5c53f669c5218f360b016fe128 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat May 17 15:32:56 2014 +0200
core78: Update filelist.
commit 53ac77f61004852ad7a593e0a4441619aaecd300 Merge: ace810a 5a9f406 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat May 17 15:27:53 2014 +0200
Merge remote-tracking branch 'stevee/ddns-providers' into next
commit ace810a3f85f58a59c4ca430b61d052817e7362c Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri May 16 22:07:14 2014 +0200
snort: Update url's for rule download.
commit cf6abf539ed973c6bb053293cafeee01e60ac0d1 Merge: 0805688 edb7235 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat May 17 15:18:52 2014 +0200
Merge remote-tracking branch 'alpha197/patch-1' into next
commit 080568824d60c86189a49d272a390f81c86a0eba Merge: 0f7ee3e 1a200cf Author: Michael Tremer michael.tremer@ipfire.org Date: Sat May 17 15:18:43 2014 +0200
Merge remote-tracking branch 'origin/master' into next
commit 0f7ee3ea4e63a646ae5d02207530493016240f43 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 16 17:12:43 2014 +0200
sslscan: New package.
commit 5a9f40613eea53a15e3cf6dc6348114329871ac3 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu May 15 18:47:13 2014 +0200
setddns.pl: Switch off debuging output.
Switch off accidently enabled debugging output from commit dc98645fd42873dfeda01188243565e2f977f4a9
commit 1638682beb691a4bf40f4db155c109d9a34536a4 Author: Alf Høgemark alf@i100.no Date: Wed May 14 21:56:42 2014 +0200
cgi-bin: Add title attribute to input type image where missing
Almost all of <input type="image"... has both an alt and a title attribute, but some are missing title, and when the icon is not very clear, it makes it harder to understand what the icon does. By adding title, the browser displays text when mouse pointer is over the icon.
Also add missing quotes for alt and title attributes where needed.
commit a9fb14d0513d71accacfded36f46e471cb3a88d6 Author: Alf Høgemark alf@i100.no Date: Tue Feb 18 17:48:57 2014 +0000
cgi-bin: Use readonly="readonly" attribute on html input elements
The proper way to mark readonly is to use readonly="readonly", not readonly="true", like it was done some places.
commit 040b8b0c5ed052025d9c35e26eb7092510deb25c Author: Alf Høgemark alf@i100.no Date: Wed May 14 21:54:27 2014 +0200
ovpnmain.cgi: Use language string keys already defined
commit bc2b3e9483f37ec497b3460faf0208cfb87cdfc5 Author: Alf Høgemark alf@i100.no Date: Wed May 14 21:51:50 2014 +0200
vpnmain.cgi: htmlcleanup, change html tags from uppercase to lowercase
commit d9fe569366e9dca7f833b53a212ea2ef4311d45f Author: Alexander Marx amarx@ipfire.org Date: Fri Jan 31 21:23:21 2014 +0100
openvpn: Wrong subnet calculation bug fix.
Fixes #10466.
commit ed4b4c19b9e47229ead960bd43bcc9cd6a01413a Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 12 15:40:50 2014 +0100
Re-apply: OpenVPN: Fix daemon stuck in WAIT state.
When the client is in the WAIT state, it is usally connected to the server.
Conflicts: html/cgi-bin/index.cgi html/cgi-bin/ovpnmain.cgi
commit 7e8d00649625a1f8f77e086d402e02b2ab2dce79 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed May 14 21:32:04 2014 +0200
core78: Add updated theme functions.pl.
commit 6fde3230a88f633ec6358959626ca90c1ae3e1a3 Merge: a50dadc 6e8089a Author: Michael Tremer michael.tremer@ipfire.org Date: Wed May 14 21:30:50 2014 +0200
Merge branch 'master' into next
commit a50dadc229a4ad34be60e9fa24cf20c33e9d96c2 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed May 14 21:28:45 2014 +0200
openvpn: Remove RC2 as a cipher option.
commit f527e53f54c8d908340e2102d983297392db1938 Author: Erik Kapfer erik.kapfer@ipfire.org Date: Wed May 14 19:37:15 2014 +0200
ovpn_fixes: Fixed some typos and strcture.
Fixes #10462#c21.
Conflicts: html/cgi-bin/ovpnmain.cgi langs/de/cgi-bin/de.pl langs/en/cgi-bin/en.pl
commit b7ca4506502a50776ddfb65b446ac73c85797cc3 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed May 14 20:42:41 2014 +0200
core78: Add OpenVPN changes.
commit cf910b536ade7b4bc03267d0d04cb4ddda815d5f Author: Michael Tremer michael.tremer@ipfire.org Date: Wed May 14 20:39:36 2014 +0200
daq: Update to version 2.0.2.
commit d3782f77ba9f3d4ead14cf22ac4ffe608e3114d7 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed May 14 20:33:33 2014 +0200
core78: Add all recently changes files and packages.
commit 28f44b83c32f72074bc75817698a2958119020bd Author: Michael Tremer michael.tremer@ipfire.org Date: Wed May 14 20:31:12 2014 +0200
core78: Don't remove the ipfire theme.
commit 172c1f72c4034419063589ab83fa95df5e48ef70 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed May 14 20:20:36 2014 +0200
ppp: Import some more patches from Fedora.
commit 0a511b76938a036a46446ca5cf35a47482c39382 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed May 14 20:02:55 2014 +0200
ppp: Try longer to connect via PPPoE (60 seconds).
commit f353972f3f84da9873f0512dc8810a20408fde2c Author: Stefan Schantl stefan.schantl@ipfire.org Date: Wed May 14 19:52:06 2014 +0200
Change update url for spDNS.de.
commit aab13a8d9d873c2ad83bb2454ca03d90bfecfd53 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed May 14 18:59:22 2014 +0200
backupiso: change to hybrid image.
commit 2308525f0c53c4665cbe604d6c524441b3442ac5 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed May 14 18:53:51 2014 +0200
start core78.
commit 707fd3ff72cc486a80424beec7fe76d772503b27 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed May 14 09:20:40 2014 +0200
kernel: update to 3.10.40.
commit 1f99fc9845457b2d58d584adb47866a1eec8a7dc Author: Michael Tremer michael.tremer@ipfire.org Date: Tue May 13 20:36:58 2014 +0200
openvpn: Fix wrong default port number.
commit edb7235c38554f9a02a03cd1b58f027cae43cf8c Author: alpha197 alpha197@users.noreply.github.com Date: Tue May 13 19:00:04 2014 +0200
xen-image-maker: Fix wrong menu entry for pygrub
Should fix https://bugzilla.ipfire.org/show_bug.cgi?id=10499
commit 9cf34ad1ed74f88a139e620fff476e6ae0a9707f Author: Bernhard Bitsch bbitsch@ipfire.org Date: Mon May 12 19:50:50 2014 +0200
DDNS: Add support for spdns.de.
This commit adds support for the dynamic dns service provider spdns.de.
Fixes #10533.
commit dbe2a1cc36f78e1cf48150dc4e1756be1d04abce Merge: d25b7c3 afe1107 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon May 12 19:30:02 2014 +0200
Merge remote-tracking branch 'stevee/snort-update' into next
commit d25b7c32bd420267d2604dfa34e6e3bfa7de9ed7 Merge: dd58c50 9eb6ff3 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon May 12 13:49:12 2014 +0200
Merge remote-tracking branch 'glotzi/nut-update' into next
commit dd58c50c3e55749903369c2b3258de7cc307c8ce Author: Michael Tremer michael.tremer@ipfire.org Date: Mon May 12 13:21:24 2014 +0200
proxy.pac: Don't use proxy for direct domain access.
commit 7c1b7d3e226310403ddd40b4cd19d78f7db4d457 Author: Bernhard Bitsch bbitsch@ipfire.org Date: Mon May 12 13:16:43 2014 +0200
proxy.pac: Only grant direct access for actual subnets.
Fixes #10324.
commit 27ecea56ce242adc0f3b471ed2868dc3ea246874 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 9 01:28:56 2014 +0200
squid: Update to 3.4.5.
commit c6d9cb76ab5a1ce0ac152765c929f61b68361d87 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon May 12 12:54:08 2014 +0200
openvpn: Update translation.
DH keys are actually called DH parameters.
commit b1ab4a4dd0cce83c838b9946f42d601776e9ca8a Author: Stefan Ernst sternst@ernx.de Date: Sun May 11 19:53:00 2014 +0200
DDNS: Add support for variomedia.de.
This commit adds support for the dynamic dns service provider variomedia.de.
Fixes #10485.
commit 02c542d173228b45bde7895d9ecd1e00b7129769 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Wed Jan 29 15:31:23 2014 +0100
DDNS: Add support for twodns.de.
This commit adds support for the dynamic dns service provider twodns.de.
Fixes #10418.
commit afe1107dc978dfae14c576cc1d9dc80c9e09107e Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun May 11 19:26:32 2014 +0200
snort: Update to 2.9.6.1.
commit 1a200cffc994858c8cad91b9b00093d24f00e79a Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun May 11 19:01:45 2014 +0200
clamav: update to 0.98.3.
commit 661cd276b68c274ecfee7cdf3bd6c7204dc56572 Merge: b2e7544 49abe7a Author: Michael Tremer michael.tremer@ipfire.org Date: Sun May 11 18:47:11 2014 +0200
Merge remote-tracking branch 'ummeegge/openvpn' into next
Conflicts: html/cgi-bin/ovpnmain.cgi langs/de/cgi-bin/de.pl langs/en/cgi-bin/en.pl
commit b2e75449a98f19e47b8aaf7623a6299749b21de6 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun May 11 18:34:34 2014 +0200
Revert "OpenVPN:Add HMAC, cipher 'n2n' and DH key selection. Fixes and new design."
This reverts commit c2b5d12b3453c55afce7ef84451a65e130b0d80f.
Conflicts: langs/de/cgi-bin/de.pl langs/en/cgi-bin/en.pl
commit b9e1738442dc5087ebdaaec659a0f4c21b021081 Merge: 03d0b8c 6d49c4a Author: Michael Tremer michael.tremer@ipfire.org Date: Sun May 11 18:27:50 2014 +0200
Merge remote-tracking branch 'ummeegge/OpenVPN' into next
commit 6d49c4a6318512f12cd06da7727d7000f2071030 Author: Erik Kapfer erik.kapfer@ipfire.org Date: Sun May 11 09:28:53 2014 +0200
OpenVPN: Update to version 2.3.4
commit 49abe7afb1868315b96643afe08c12fa1b339e3a Author: Erik Kapfer erik.kapfer@ipfire.org Date: Sun May 11 09:24:04 2014 +0200
OpenVPN:Add HMAC, cipher 'n2n' and DH key selection. Fixes and new design.
Added HMAC algorithm selection menu for N2N and RW. Added cipher selection menu for N2N connections. Added DH key selection also for existing installations incl. DH key upload possibility. Adjusted the ovpn main WUI design to IPSec WUI. Extend key lenght for CA, cert and control channel with faktor 2. Some code and typo cleanup. Bugfixes for #10317, #10149, #10462, #10463 V.2 New changes: Integrated changes in langs and ovpnmain.cgi until 20.03.2014 2.15-Beta3. ovpn.cnf have now default bits of 2048 instead of 1024. ovpn.cnf default_md works now with sha256 instead of md5. Bugfix: By new installation the auth directive for RWs is faded out #10462 Comment 15. Added error message if the crl should be displayed but no crl is present. v.3 New changes #10462 Comment 20: Updated to core version 77. Deleted manual name award in DH key upload section, name will be given automatically now. Added sha512WithRSAEncryption instead of sha1WithRSAEncryption for "Root Certificate". Added tls-auth support for Roadwarriors. Added crypto engine support for N2N and Roadwarriors.
commit 6e8089a94f5cb8b9baafa1afd8dc01d3baa9fd6d Author: Michael Tremer michael.tremer@ipfire.org Date: Sat May 10 14:25:36 2014 +0200
theme: Fix spacing of version string in footer.
commit 03fa5cba13c77b0a4ee8a1e84bf895af113ecb26 Author: Ersan Yildirim ersan73@gmail.com Date: Fri May 9 15:01:17 2014 +0200
Update Turkish translation of the installer and setup.
commit 03d0b8c7e8486fca41674ddac51543edad300f4d Merge: c80303c a257ce6 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 9 01:31:43 2014 +0200
Merge branch 'master' into next
Conflicts: doc/language_issues.nl doc/language_issues.tr
commit 9eb6ff30db048dfeff384b53acc18e58b6363788 Author: Dirk Wagner dirk.wagner@ipfire.org Date: Thu May 8 21:22:22 2014 +0200
nut addon: increased package version.
commit 3fe41c0159c9ad1474f4a174212b97f95972bf82 Author: Dirk Wagner dirk.wagner@ipfire.org Date: Wed May 7 21:37:51 2014 +0200
nut addon: Update to 2.7.2
commit c80303cd452f8d6b41a4039e357d30b0ece19843 Merge: 1d3c374 c5e3d52 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Apr 21 14:02:17 2014 +0200
Merge remote-tracking branch 'ms/modem-status' into next
Conflicts: doc/language_issues.es doc/language_issues.fr doc/language_issues.nl doc/language_issues.pl doc/language_issues.ru doc/language_issues.tr doc/language_missings
commit c5e3d520e92aee074f1713f8ba98ee4296341ad3 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 16 01:26:28 2014 +0200
Add modem status page.
On this page, much useful information is displayed about the hardware and the status of an LTE/3G or other kinds of modems that respond to AT commands.
commit 1d3c37402c4684e682aabe904f443b93b6dc4310 Merge: b04a341 c2b5d12 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Apr 13 15:45:19 2014 +0200
Merge remote-tracking branch 'ummeegge/openvpn' into next
commit c2b5d12b3453c55afce7ef84451a65e130b0d80f Author: Erik Kapfer erik.kapfer@ipfire.org Date: Sun Apr 13 07:14:25 2014 +0200
OpenVPN:Add HMAC, cipher 'n2n' and DH key selection. Fixes and new design.
Added HMAC algorithm selection menu for N2N and RW. Added cipher selection menu for N2N connections. Added DH key selection also for existing installations incl. DH key upload possibility. Adjusted the ovpn main WUI design to IPSec WUI. Extend key lenght for CA, cert and control channel with faktor 2. Some code and typo cleanup. Bugfixes for #10317, #10149, #10462, #10463 V.2 New changes: Integrated changes in langs and ovpnmain.cgi until 20.03.2014 2.15-Beta3. ovpn.cnf have now default bits of 2048 instead of 1024. ovpn.cnf default_md works now with sha256 instead of md5. Bugfix: By new installation the auth directive for RWs is faded out #10462 Comment 15. Added error message if the crl should be displayed but no crl is present.
commit b04a34188c8456a81c8fef0064014b8aeb584ee4 Merge: ae6ae33 21674d3 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Apr 11 15:18:50 2014 +0200
Merge branch 'master' into next
Conflicts: doc/language_issues.tr
commit ae6ae33f847ea063331b8ce205148334925385fd Merge: 8089b78 41dfa08 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Mar 30 00:21:33 2014 +0100
Merge branch 'beyond-next' into next
commit 41dfa08d2a9be671a48d4e0cd33f1e89541ae0d8 Merge: 5240f73 93b36c3 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Mar 26 23:43:04 2014 +0100
Merge branch 'ppp-update' into beyond-next
commit 5240f73d9c73c30ea92fab982d31ca986fb86e2e Merge: 4c7bfb1 513c321 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Mar 26 23:42:57 2014 +0100
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into beyond-next
commit 93b36c3e229a1d7b57deebbb8749bcaa966aa46e Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Mar 26 23:42:05 2014 +0100
ppp: Update to 2.4.6.
commit 4c7bfb1f271bdd0de493772a15209e038344e57c Merge: 6bd4bcd abfd82b Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Mar 21 14:48:22 2014 +0100
Merge remote-tracking branch 'stevee/squid-zph-qos' into beyond-next
commit 6bd4bcdaa12cc7a3111d6a9c26ab6cd1124c618a Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Mar 21 13:46:03 2014 +0100
squid: Update to 3.4.4.
commit fc84e6ec23f824f6a72935c0d274ac4fe948f0a0 Merge: 296a73a a5ecf5f Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Mar 20 23:16:15 2014 +0100
Merge remote-tracking branch 'alfh/feature_vnstat_1.11' into beyond-next
commit 296a73a5326636a53c642dcd046b03fcff221835 Merge: dd29d56 fff2be2 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Mar 20 23:15:49 2014 +0100
Merge remote-tracking branch 'alfh/feature_firewalllogcountry' into beyond-next
Conflicts: langs/de/cgi-bin/de.pl
commit dd29d563a603b0bc182af23efd5160caf75657c4 Merge: 2d6ac13 0d0df35 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Mar 20 23:14:13 2014 +0100
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into beyond-next
Conflicts: doc/language_issues.es doc/language_issues.fr doc/language_issues.nl doc/language_issues.pl doc/language_issues.ru doc/language_issues.tr doc/language_missings
commit 2d6ac13175c0ffa0a5940d812fb45e91f5585264 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Mar 11 14:19:55 2014 +0100
Update translations.
commit 1202ee15395ebd7bfe85c328d46e33b21f97f5eb Merge: 826c22d 4c96235 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Mar 11 14:19:14 2014 +0100
Merge remote-tracking branch 'ummeegge/openvpn' into beyond-next
commit fff2be22a4f97ff5b0479b1f261e783b2737ee92 Author: Alf Høgemark alf@i100.no Date: Sat Mar 1 15:00:51 2014 +0100
firewalllogcountry.dat: Fix filename for piechart image
commit 06f320318f4bed98f57bb7dd8b00f538dc24ecbf Author: Alf Høgemark alf@i100.no Date: Sat Feb 22 17:31:44 2014 +0100
firewalllogcountry.dat: Simplify code for table background color
commit fde47f5aef2aa779350cec85b5c19327fa36b938 Author: Alf Høgemark alf@i100.no Date: Sat Feb 22 08:03:59 2014 +0100
firewalllogcountry.dat: Show green0,blue0, and orange0 as countries
It makes sense to see how many fire wall logs entries are dropped from the interfaces green0, blue0, and orange0, so this is displayed as a country. The showrequestfromcountry.dat also supports filtering based on the interface.
commit c438fb070e42080e86da5de68f0a6700960ef2d2 Author: Alf Høgemark alf@i100.no Date: Mon Feb 17 20:13:53 2014 +0100
en.pl: Trivial sorting of a key
commit bde7a7d296b2d0ab165687d9c46dcf67caf955a1 Author: Alf Høgemark alf@i100.no Date: Mon Feb 17 20:05:00 2014 +0100
showrequestfromcountry.dat: Use language string, and fix links
Define language key for input field. Fix links for older and newer links. Indentation fixes.
The code is a copy from showrequestfromip.dat, ideally we should have merged all three showrequestfrom*.dat files into one file, but I do not do that now, because it would really require a rewrite of most of the logic, and I understand that one does not want to do such changes in 2.x.
commit f424897557ee41cd235ae293820a558c98e9caf2 Author: Alf Høgemark alf@i100.no Date: Sun Feb 16 07:18:41 2014 +0100
firewalllogcountry.dat: Use language strings and add to menu
Add some language strings for the new firewalllogport.dat, and include html fixes done in firewalllogip.dat, which this file is based on.
Also try to add the menu item to the sub menu, but that is currently not working.
commit e4aac473708d259a77830d5f4c2c95f436d3df54 Author: Alf Høgemark alf@i100.no Date: Wed Feb 12 18:09:53 2014 +0100
logs.cgi: Add files for showing firewall blocks by country
Add similair functionality as firewalllogip.dat and firewalllogport.dat, by listing the number of blocks per country, and provide a details link to show only the blocked ip addresses from the country.
This is a preliminary prototype.
commit a5ecf5f031b1d3f08ac7adebfc38f96860139b9c Author: Alf Høgemark alf@i100.no Date: Sat Mar 1 14:51:17 2014 +0100
vnstat: Update to 1.11
Update vnstat to version 1.11, which also contains the vnstati binary, for making graphs.
Remove the separate vnstati package.
This commit does not contain anything for doing backups before upgrading, since I do not know how that works.
The source for vnstat-1.11 has been downloaded from : http://humdi.net/vnstat/vnstat-1.11.tar.gz The changelog for vnstat-11 is here : http://humdi.net/vnstat/CHANGES
commit 4c962356a0bf2ecc935ea08e19f273b3e9cc7c2d Author: Erik Kapfer erik.kapfer@ipfire.org Date: Thu Feb 27 10:01:57 2014 +0100
OpenVPN: Added auth and cipher menu, changed design, fixed bugs.
Added --auth directive with a flip menu for N2N and RW. Added cipher menu for N2N. Added new cipher and digest algorithm. Adapted OpenVPN WUI design to IPSec design. Changed key lenght for certificates with factor 2. Added DH menu to WUI, with DH upload possibility and separated DH generation possibility. Several Bugfixes, reference can be found under Bug #10463. Also Fixes for #10317 and #10149.
commit abfd82b15e479ccfc351328ca0e86fc646f0eac5 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Wed Jan 22 20:29:26 2014 +0100
Squid: Enable support for zph-qos.
Fixes #10087.
-----------------------------------------------------------------------
hooks/post-receive -- IPFire 2.x development tree
-
git＠ipfire.org