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, next has been updated via 51379603c8161d5ef6ede182251789d098a3d833 (commit) via f17d112c0480e951771bdca5f5eace7592ecd2c2 (commit) from f9f13c135b2c8d86a1861aec8f80985483843f52 (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 51379603c8161d5ef6ede182251789d098a3d833 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Dec 16 21:06:40 2012 +0100

openvpn ccd: Multiple installation fixes.

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

Summary of changes: config/rootfiles/common/configroot | 4 ++++ config/rootfiles/common/daq | 6 +++--- config/rootfiles/common/snort | 4 +--- config/rootfiles/core/65/filelists/snort | 1 - html/cgi-bin/ids.cgi | 4 ++-- lfs/configroot | 4 ++-- lfs/daq | 4 ++-- lfs/snort | 4 ++-- src/scripts/ovpn-ccd-convert | 1 + 9 files changed, 17 insertions(+), 15 deletions(-) delete mode 120000 config/rootfiles/core/65/filelists/snort

Difference in files: diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index e14f7e0..1d2fc9d 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -110,6 +110,10 @@ var/ipfire/outgoing/defaultservices #var/ipfire/outgoing/p2protocols #var/ipfire/outgoing/rules #var/ipfire/outgoing/settings +var/ipfire/ovpn +var/ipfire/ovpn/ccd.conf +var/ipfire/ovpn/ccdroute +var/ipfire/ovpn/ccdroute2 var/ipfire/pakfire #var/ipfire/pakfire/settings #var/ipfire/patches diff --git a/config/rootfiles/common/daq b/config/rootfiles/common/daq index 10ec777..b23fd19 100644 --- a/config/rootfiles/common/daq +++ b/config/rootfiles/common/daq @@ -1,4 +1,4 @@ -#usr/bin/daq-modules-config +usr/bin/daq-modules-config #usr/include/daq.h #usr/include/daq_api.h #usr/include/daq_common.h @@ -20,8 +20,8 @@ usr/lib/daq #usr/lib/libdaq.a #usr/lib/libdaq.la #usr/lib/libdaq.so -usr/lib/libdaq.so.2 -usr/lib/libdaq.so.2.0.0 +usr/lib/libdaq.so.1 +usr/lib/libdaq.so.1.0.0 #usr/lib/libdaq_static.a #usr/lib/libdaq_static.la #usr/lib/libdaq_static_modules.a diff --git a/config/rootfiles/common/snort b/config/rootfiles/common/snort index 8404486..90233a1 100644 --- a/config/rootfiles/common/snort +++ b/config/rootfiles/common/snort @@ -26,10 +26,9 @@ usr/bin/u2spewfoo #usr/include/snort/dynamic_output/snort_debug.h #usr/include/snort/dynamic_output/stream_api.h #usr/include/snort/dynamic_preproc +#usr/include/snort/dynamic_preproc/attribute_table_api.h #usr/include/snort/dynamic_preproc/bitop.h #usr/include/snort/dynamic_preproc/cpuclock.h -#usr/include/snort/dynamic_preproc/file_api.h -#usr/include/snort/dynamic_preproc/file_lib.h #usr/include/snort/dynamic_preproc/idle_processing.h #usr/include/snort/dynamic_preproc/ipv6_port.h #usr/include/snort/dynamic_preproc/mempool.h @@ -179,7 +178,6 @@ usr/sbin/snort #usr/share/doc/snort/README.dnp3 #usr/share/doc/snort/README.dns #usr/share/doc/snort/README.event_queue -#usr/share/doc/snort/README.file #usr/share/doc/snort/README.filters #usr/share/doc/snort/README.flowbits #usr/share/doc/snort/README.frag3 diff --git a/config/rootfiles/core/65/filelists/snort b/config/rootfiles/core/65/filelists/snort deleted file mode 120000 index 9406ce0..0000000 --- a/config/rootfiles/core/65/filelists/snort +++ /dev/null @@ -1 +0,0 @@ -../../../common/snort \ No newline at end of file diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index c5fb4c6..efbc3de 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -263,9 +263,9 @@ if (-e "/etc/snort/snort.conf") { ####################### End added for snort rules control #################################

if ($snortsettings{'RULES'} eq 'subscripted') { - $url=" http://www.snort.org/reg-rules/snortrules-snapshot-294_s.tar.gz/$snortsettin..."; + $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2931_s.tar.gz/$snortsetti..."; } elsif ($snortsettings{'RULES'} eq 'registered') { - $url=" http://www.snort.org/reg-rules/snortrules-snapshot-294.tar.gz/$snortsettings..."; + $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2931.tar.gz/$snortsetting..."; } else { $url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz"; } diff --git a/lfs/configroot b/lfs/configroot index 90f5afa..f8fe426 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -53,7 +53,7 @@ $(TARGET) : for i in addon-lang auth backup ca certs connscheduler crls ddns dhcp dhcpc dmzholes dns \ ethernet extrahd/bin fwlogs isdn key langs logging mac main menu.d modem net-traffic \ net-traffic/templates nfs optionsfw outgoing/bin outgoing/groups outgoing/groups/ipgroups \ - outgoing/groups/macgroups patches pakfire portfw ppp private proxy/advanced/cre \ + outgoing/groups/macgroups ovpn patches pakfire portfw ppp private proxy/advanced/cre \ proxy/calamaris/bin qos/bin red remote sensors snort time tripwire/report \ updatexlrator/bin updatexlrator/autocheck urlfilter/autoupdate urlfilter/bin upnp vpn \ wakeonlan wireless xtaccess ; do \ @@ -66,7 +66,7 @@ $(TARGET) : dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local 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/disable_nf_sip main/hosts main/routing 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 \ + ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 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 \ vpn/ipsec.secrets vpn/caconfig wakeonlan/clients.conf wireless/config wireless/settings; do \ diff --git a/lfs/daq b/lfs/daq index cac012b..a0f7b25 100644 --- a/lfs/daq +++ b/lfs/daq @@ -24,7 +24,7 @@

include Config

-VER = 2.0.0 +VER = 1.1.1

THISAPP = daq-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = a00855a153647df76d47f1ea454f74ae +$(DL_FILE)_MD5 = bc204ea09165b4ecbb1bb49c7c1a2ad4

install : $(TARGET)

diff --git a/lfs/snort b/lfs/snort index 950b319..98c232d 100644 --- a/lfs/snort +++ b/lfs/snort @@ -24,7 +24,7 @@

include Config

-VER = 2.9.4 +VER = 2.9.3.1

THISAPP = snort-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = e79ee6b4fbb32edc5dfed2d7dfcc6813 +$(DL_FILE)_MD5 = b2102605a7ca023ad6a2429821061c29

install : $(TARGET)

diff --git a/src/scripts/ovpn-ccd-convert b/src/scripts/ovpn-ccd-convert index c54e256..ac76435 100644 --- a/src/scripts/ovpn-ccd-convert +++ b/src/scripts/ovpn-ccd-convert @@ -48,3 +48,4 @@ if ($running eq 'on') { system('/usr/local/bin/openvpnctrl', '-s'); } +system ("chown nobody:nobody /var/ipfire/ovpn/ccd/*");

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