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, master has been updated via d3d76f95b1121993a151ea49ac099fd5a2bd15db (commit) via 1513690bdb33f5da6eb33e8bcc71abec792e1bf6 (commit) from 90c2e1641eca21f1edbcf95aa21ee78b1c2f2d6a (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit d3d76f95b1121993a151ea49ac099fd5a2bd15db Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat May 22 12:00:40 2010 +0200

Set nf_sip disbled as default.

commit 1513690bdb33f5da6eb33e8bcc71abec792e1bf6 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat May 22 12:00:10 2010 +0200

Add snort update to core38.

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/common/configroot | 1 + config/rootfiles/core/38/filelists/files | 1 + .../{oldcore/28 => core/38}/filelists/snort | 0 lfs/configroot | 2 +- 4 files changed, 3 insertions(+), 1 deletions(-) copy config/rootfiles/{oldcore/28 => core/38}/filelists/snort (100%)

Difference in files: diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index a960e83..c34e725 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -61,6 +61,7 @@ var/ipfire/logging var/ipfire/mac #var/ipfire/mac/settings var/ipfire/main +#var/ipfire/main/disable_nf_sip #var/ipfire/main/hosts #var/ipfire/main/settings #var/ipfire/menu.d diff --git a/config/rootfiles/core/38/filelists/files b/config/rootfiles/core/38/filelists/files index aad8010..5ad59bb 100644 --- a/config/rootfiles/core/38/filelists/files +++ b/config/rootfiles/core/38/filelists/files @@ -18,6 +18,7 @@ srv/web/ipfire/cgi-bin/vpnmain.cgi var/ipfire/langs/de.pl var/ipfire/langs/en.pl var/ipfire/langs/fr.pl +var/ipfire/main/disable_nf_sip etc/rc.d/init.d/firewall etc/rc.d/init.d/ipsec etc/rc.d/init.d/network diff --git a/config/rootfiles/core/38/filelists/snort b/config/rootfiles/core/38/filelists/snort new file mode 120000 index 0000000..9406ce0 --- /dev/null +++ b/config/rootfiles/core/38/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/lfs/configroot b/lfs/configroot index 6b6b798..c337ab0 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -65,7 +65,7 @@ $(TARGET) : certs/index.txt ddns/config ddns/noipsettings ddns/settings ddns/ipcache dhcp/settings \ dhcp/fixleases dhcp/advoptions dmzholes/config dns/settings ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \ extrahd/scan extrahd/devices extrahd/partitions extrahd/settings fwlogs/ipsettings fwlogs/portsettings \ - isdn/settings mac/settings main/hosts main/settings net-traffic/settings optionsfw/settings outgoing/settings outgoing/rules \ + isdn/settings mac/settings main/disable_nf_sip main/hosts main/settings net-traffic/settings optionsfw/settings outgoing/settings outgoing/rules \ pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \ ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \ qos/tosconfig snort/settings tripwire/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \

hooks/post-receive -- IPFire 2.x development tree