Commit Graph

1636 Commits

Author SHA1 Message Date
Arne Fitzenreiter
4200583c70 Merge branch 'master' into perl_5.12.2
Conflicts:
	config/rootfiles/core/47/filelists/files
	config/rootfiles/core/47/update.sh
2011-02-20 17:37:07 +01:00
Arne Fitzenreiter
bf8416a2ca rootfile update: cups. 2011-02-20 15:55:49 +01:00
Arne Fitzenreiter
a408c745d7 Updated php (5.3.5). 2011-02-20 15:51:15 +01:00
Arne Fitzenreiter
bf5a6d9a69 Updated ipfireseeder to core46. 2011-02-19 20:03:36 +01:00
Arne Fitzenreiter
ff7a39506a Add iptv/inet vlan settings to webif. 2011-02-19 15:07:54 +01:00
Arne Fitzenreiter
fc9d164bfe rootfile update: icecc. 2011-02-18 22:14:38 +01:00
Arne Fitzenreiter
5c0dc418e4 Add fireinfo to core47. 2011-02-18 20:34:08 +01:00
Arne Fitzenreiter
48a2495afd Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
Conflicts:
	config/rootfiles/core/47/filelists/files
2011-02-18 20:33:00 +01:00
Arne Fitzenreiter
abcbbd1fd7 Add ssh ecdsa hostkey. 2011-02-18 20:31:19 +01:00
Christian Schmidt
9fd6aa06b6 Added outgoing fw groups to backup. 2011-02-13 10:35:41 +01:00
Christian Schmidt
c703cd4ce5 Changed sourcefire download link to current snort version. 2011-02-10 21:43:24 +01:00
Arne Fitzenreiter
7fb1b9f680 Fix addon service pid/memory display if the addon name has numbers. 2011-02-10 19:49:23 +01:00
Arne Fitzenreiter
0ccf2cc417 Start core47. 2011-02-10 19:47:03 +01:00
Arne Fitzenreiter
84d2c3089c Don't overwrite ssl/ssh settings. 2011-02-09 18:04:26 +01:00
Arne Fitzenreiter
0f27d5de70 Run fireinfo @ core update. 2011-02-09 00:14:13 +01:00
Arne Fitzenreiter
a8fdfc38ad Fix openssl rootfile. 2011-02-08 22:20:34 +01:00
Arne Fitzenreiter
3fe1243490 Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x 2011-02-08 22:18:23 +01:00
Arne Fitzenreiter
bac3bb44e6 Updated openssh (5.8p1). 2011-02-08 22:15:53 +01:00
Arne Fitzenreiter
55b4b3c924 Update openssl (0.9.8r). 2011-02-08 22:14:41 +01:00
Arne Fitzenreiter
5cb1931f25 Update clamav (0.97). 2011-02-08 22:11:51 +01:00
Christian Schmidt
060ae9910d Added recent changes to core46. 2011-02-08 22:06:39 +01:00
Arne Fitzenreiter
fc5385b654 Add backup include to core46.
Fixes #0000759
2011-02-07 23:44:16 +01:00
Arne Fitzenreiter
ccbe39e94a Change pgp keyserver to pgp.ipfire.org so we can change it in the dns. 2011-02-07 19:56:39 +01:00
Arne Fitzenreiter
1c94d07923 Merge commit 'ms/squid-LFS' 2011-02-06 22:17:03 +01:00
Arne Fitzenreiter
8706303057 Move perl update from core46 to 47. 2011-02-06 18:24:43 +01:00
Arne Fitzenreiter
245ff333e8 Merge branch 'master' into perl_5.12.2
Conflicts:
	config/rootfiles/core/46/filelists/files
	config/rootfiles/core/46/update.sh
2011-02-06 16:00:49 +01:00
Arne Fitzenreiter
ff305ff7c2 Updated compat-wireless (2.6.37-4-sn).
Add crda agent.
Add python-m2crypto and swig for build crda.
2011-02-06 15:20:44 +01:00
Michael Tremer
487880cb68 core 46: Add squid update. 2011-02-03 13:00:41 +01:00
Arne Fitzenreiter
109a1ec7d4 Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x 2011-01-31 23:09:22 +01:00
Arne Fitzenreiter
beb726d82b Updated nmap (5.50). 2011-02-01 00:03:45 +01:00
Arne Fitzenreiter
58d2aa5582 Merge branch 'core45' 2011-01-31 23:09:04 +01:00
Arne Fitzenreiter
0324cdbd19 Updated cacti (0.8.7g). 2011-01-31 20:58:14 +01:00
Arne Fitzenreiter
72c5e36454 Started core46. 2011-01-31 20:53:55 +01:00
Arne Fitzenreiter
c7bfbdc2ef core45: disable snort packet decode alerts also on update. 2011-01-31 19:10:49 +01:00
Arne Fitzenreiter
a3dacdfeff Merge branch 'master' into perl_5.12.2 2011-01-29 21:38:06 +01:00
Arne Fitzenreiter
24c0b6af6c ipfireseeder: update to seed core45. 2011-01-29 20:37:23 +01:00
Arne Fitzenreiter
c644577647 Merge branch 'master' into perl_5.12.2 2011-01-27 08:48:56 +01:00
Arne Fitzenreiter
8885467fc1 Disabled geode_aes kernel modul. 2011-01-26 22:28:30 +01:00
Michael Tremer
bce6a367de Add changes from b18bad8a19 to core update 45. 2011-01-26 20:39:31 +01:00
Arne Fitzenreiter
5bc7de500f Add ssl-global.conf to core45 update. 2011-01-26 17:45:02 +01:00
Christian Schmidt
caab8fb9e3 Fixed typo for update script. 2011-01-26 00:31:42 +01:00
Arne Fitzenreiter
aaf12a485e core45: start vpn-watch only if ipsec is enabled. 2011-01-23 00:31:04 +01:00
Arne Fitzenreiter
bd3c8b5994 core45: remove some addon cronjobs if the addons are not installed. 2011-01-23 00:26:21 +01:00
Arne Fitzenreiter
fc7d153f06 Remove core-updates from pakfire cache. 2011-01-22 23:48:47 +01:00
Arne Fitzenreiter
dbd3392c8a Remove some addon cronjobs from iso. 2011-01-22 23:47:41 +01:00
Arne Fitzenreiter
841e825e7b fcron: disable mails. 2011-01-22 19:07:34 +01:00
Arne Fitzenreiter
324bb8881f remove more bogus logentries. 2011-01-22 18:54:31 +01:00
Arne Fitzenreiter
d3b702945e Fix Net_SSLeay rootfile. 2011-01-22 16:48:01 +01:00
Christian Schmidt
0a3c4cf02b Updated squid to current stables. This should fix some bugs. 2011-01-22 15:52:01 +01:00
Christian Schmidt
2eea44c8d4 Update snort to current stable. This will fix some parsing.
If we still face problems we can comment out the decoder warnings
in the snort.conf or fix guardian not to handle these.
2011-01-22 15:49:31 +01:00