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, thirteen has been updated via fc992179a15a53c920d8f18e276624c0ace6a6ec (commit) via 51379603c8161d5ef6ede182251789d098a3d833 (commit) via f17d112c0480e951771bdca5f5eace7592ecd2c2 (commit) via f9f13c135b2c8d86a1861aec8f80985483843f52 (commit) via 7c8301fb8a501d03e47923bf7eb321330b663736 (commit) via ff1ed674e01b7db0acd4a565dc74cca01b825f6b (commit) via 1d0fcb09edd3929dda72d23afd3a8d16f7713794 (commit) from d65e0bd38d3bf816c854d57d520bea9836959747 (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 fc992179a15a53c920d8f18e276624c0ace6a6ec Merge: d65e0bd 5137960 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Dec 17 10:16:46 2012 +0100
Merge remote-tracking branch 'origin/next' into thirteen
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/configroot | 4 ++++ config/rootfiles/core/65/filelists/files | 2 ++ html/cgi-bin/routing.cgi | 4 +++- lfs/configroot | 4 ++-- src/misc-progs/launch-ether-wake.c | 4 ++++ src/scripts/ovpn-ccd-convert | 7 +++++-- 6 files changed, 20 insertions(+), 5 deletions(-)
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/core/65/filelists/files b/config/rootfiles/core/65/filelists/files index 67bd0b3..13788f1 100644 --- a/config/rootfiles/core/65/filelists/files +++ b/config/rootfiles/core/65/filelists/files @@ -3,7 +3,9 @@ etc/system-release etc/issue srv/web/ipfire/cgi-bin/logs.cgi/calamaris.dat srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/routing.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi +usr/local/bin/launch-ether-wake usr/sbin/ovpn-ccd-convert var/ipfire/general-functions.pl var/ipfire/langs diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi index 86e0429..afcd388 100644 --- a/html/cgi-bin/routing.cgi +++ b/html/cgi-bin/routing.cgi @@ -118,6 +118,8 @@ if ($settings{'ACTION'} eq $Lang::tr{'toggle enable disable'}) { }
if ($settings{'ACTION'} eq $Lang::tr{'add'}) { + # Convert subnet masks to CIDR notation. + $settings{'IP'} = &General::iporsubtocidr($settings{'IP'});
# Validate inputs if (( !&General::validip($settings{'IP'})) and ( !&General::validipandmask($settings{'IP'}))){ @@ -443,4 +445,4 @@ sub SortDataFile # sub BuildConfiguration { system '/usr/local/bin/rebuildroutes'; -} \ No newline at end of file +} 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/src/misc-progs/launch-ether-wake.c b/src/misc-progs/launch-ether-wake.c index f487041..cac4d3c 100644 --- a/src/misc-progs/launch-ether-wake.c +++ b/src/misc-progs/launch-ether-wake.c @@ -29,5 +29,9 @@ int main(int argc, char *argv[]) snprintf(command, BUFFER_SIZE-1, "/usr/sbin/etherwake -i %s %s", argv[2], argv[1]); safe_system(command);
+ /* Send magic packet with broadcast flag set. */ + snprintf(command, BUFFER_SIZE-1, "/usr/sbin/etherwake -i %s -b %s", argv[2], argv[1]); + safe_system(command); + return(0); } diff --git a/src/scripts/ovpn-ccd-convert b/src/scripts/ovpn-ccd-convert index 86b7c94..ac76435 100644 --- a/src/scripts/ovpn-ccd-convert +++ b/src/scripts/ovpn-ccd-convert @@ -1,13 +1,15 @@ #!/usr/bin/perl - +# Converter script for old openvpn clients my %net=(); my %ovpnconfig=(); my @serverconf=(); my $greennet; my $greensubnet; my $running='off'; -require '/var/ipfire/general-functions.pl';
+require '/var/ipfire/general-functions.pl'; +unless (-d "${General::swroot}/ovpn/ccd") { system("mkdir ${General::swroot}/ovpn/ccd"); } +system ("chown nobody.nobody ${General::swroot}/ovpn/ccd"); if ( -e "/var/run/openvpn.pid"){ $running='on'; system('/usr/local/bin/openvpnctrl', '-k'); @@ -46,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