IPFire-SCM November 2012

ipfire-scm@lists.ipfire.org

1 participants
100 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ce819132f353a4ae2103fa752ffddb3fae6f01a1
by git＠ipfire.org 16 Nov '12

16 Nov '12

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 discards 34096f965125067b262f04b4e25183533c95367c (commit) This update discarded existing revisions and left the branch pointing at a previous point in the repository history. * -- * -- N (ce819132f353a4ae2103fa752ffddb3fae6f01a1) \ O -- O -- O (34096f965125067b262f04b4e25183533c95367c) The removed revisions are not necessarilly gone - if another reference still refers to them they will stay in the repository. No new revisions were added by this update. Summary of changes: config/cfgroot/general-functions.pl | 204 +---- config/wpa_supplicant/wpa_supplicant_conf.sh | 114 --- config/wpa_supplicant/wpa_supplicant_settings | 6 - doc/language_issues.de | 3 - doc/language_issues.en | 2 - doc/language_issues.es | 39 - doc/language_issues.fr | 35 - doc/language_issues.pl | 39 - doc/language_issues.ru | 35 - doc/language_missings | 161 ---- html/cgi-bin/ovpnmain.cgi | 1219 +++++-------------------- langs/de/cgi-bin/de.pl | 38 - langs/en/cgi-bin/en.pl | 39 +- 13 files changed, 229 insertions(+), 1705 deletions(-) delete mode 100644 config/wpa_supplicant/wpa_supplicant_conf.sh delete mode 100644 config/wpa_supplicant/wpa_supplicant_settings mode change 100755 => 100644 html/cgi-bin/ovpnmain.cgi Difference in files: diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index c6a6a7c..567f2e1 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -18,7 +18,8 @@ use strict; use Socket; use IO::Socket; use Net::SSLeay; -use Net::IPv4Addr qw(:all); +use Net::IPv4Addr; + $|=1; # line buffering $General::version = 'VERSION'; @@ -211,175 +212,19 @@ sub validipormask return &validmask($mask); } -sub subtocidr -{ - #gets: Subnet in decimal (255.255.255.0) - #Gives: 24 (The cidr of network) - my ($byte1, $byte2, $byte3, $byte4) = split(/\./, $_[0].".0.0.0.0"); - my $num = ($byte1 * 16777216) + ($byte2 * 65536) + ($byte3 * 256) + $byte4; - my $bin = unpack("B*", pack("N", $num)); - my $count = ($bin =~ tr/1/1/); - return $count; -} - -sub cidrtosub -{ - #gets: Cidr of network (20-30 for ccd) - #Konverts 30 to 255.255.255.252 e.g - my $cidr=$_[0]; - my $netmask = &Net::IPv4Addr::ipv4_cidr2msk($cidr); - return "$netmask"; -} - -sub iporsubtodec -{ - #Gets: Ip address or subnetmask in decimal oder CIDR - #Gives: What it gets only in CIDR format - my $subnet=$_[0]; - my $net; - my $mask; - my $full=0; - if ($subnet =~ /^(.*?)\/(.*?)$/) { - ($net,$mask) = split (/\//,$subnet); - $full=1; - return "$subnet"; - }else{ - $mask=$subnet; - } - #Subnet already in decimal and valid? - if ($mask=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/ &&(($1<=255 && $2<=$1 && $3<=$2 && $4<=$3 ))) { - for (my $i=8;$i<=32;$i++){ - if (&General::cidrtosub($i) eq $mask){ - if ($full == 0){return $mask;}else{ - return $net."/".$mask; - } - } - } - } - #Subnet in binary format? - if ($mask=~/^(\d{1,2})$/ && (($1<=32 && $1>=8))){ - if($full == 0){ return &General::cidrtosub($mask);}else{ - return $net."/".&General::cidrtosub($mask); - } - }else{ - return 3; - } - return 3; -} - - -sub iporsubtocidr -{ - #gets: Ip Address or subnetmask in decimal oder CIDR - #Gives: What it gets only in CIDR format - my $subnet=$_[0]; - my $net; - my $mask; - my $full=0; - if ($subnet =~ /^(.*?)\/(.*?)$/) { - ($net,$mask) = split (/\//,$subnet); - $full=1; - }else{ - $mask=$subnet; - } - #Subnet in decimal and valid? - if ($mask=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/ &&(($1<=255 && $2<=$1 && $3<=$2 && $4<=$3 ))) { - for (my $i=8;$i<=32;$i++){ - if (&General::cidrtosub($i) eq $mask){ - if ($full == 0){return &General::subtocidr($mask);}else{ - return $net."/".&General::subtocidr($mask); - } - } - } - } - #Subnet already in binary format? - if ($mask=~/^(\d{1,2})$/ && (($1<=32 && $1>=8))){ - if($full == 0){ return $mask;}else{ - return $net."/".$mask; - } - }else{ - return 3; - } - return 3; -} - -sub getnetworkip -{ - #Gets: IP, CIDR (10.10.10.0-255, 24) - #Gives: 10.10.10.0 - my ($ccdip,$ccdsubnet) = @_; - my $ip_address_binary = inet_aton( $ccdip ); - my $netmask_binary = ~pack("N", (2**(32-$ccdsubnet))-1); - my $network_address = inet_ntoa( $ip_address_binary & $netmask_binary ); - return $network_address; -} - -sub getccdbc -{ - #Gets: IP in Form ("192.168.0.0/24") - #Gives: Broadcastaddress of network - my $ccdnet=$_; - my ($ccdip,$ccdsubnet) = split "/",$ccdnet; - my $ip_address_binary = inet_aton( $ccdip ); - my $netmask_binary = ~pack("N", (2**(32-$ccdsubnet))-1); - my $broadcast_address = inet_ntoa( $ip_address_binary | ~$netmask_binary ); - return $broadcast_address; -} -sub getnextip -{ - my ($byte1,$byte2,$byte3,$byte4) = split (/\./,$_[0]); - my $step=$_[1]; - for (my $x=1;$x<=$step;$x++){ - $byte4++; - if($byte4==255){ $byte4=0;$byte3++;} - if($byte3==255){$byte3=0;$byte2++;} - if ($byte2==255){$byte2=0;$byte1++} - - } - return "$byte1.$byte2.$byte3.$byte4"; -} -sub getlastip -{ - my ($byte1,$byte2,$byte3,$byte4) = split (/\./,$_[0]); - my $step=$_[1]; - for (my $x=$step;$x>=1;$x--){ - $byte4--; - if($byte4==0){ $byte4=255;$byte3--;} - if($byte3==0){$byte3=255;$byte2--;} - if ($byte2==0){$byte2=255;$byte1--} - } - return "$byte1.$byte2.$byte3.$byte4"; -} - sub validipandmask { - #Gets: Ip address in 192.168.0.0/24 or 192.168.0.0/255.255.255.0 and checks if subnet valid - #Gives: True bzw 0 if success or false - my $ccdnet=$_[0]; - my $subcidr; - - if (!($ccdnet =~ /^(.*?)\/(.*?)$/)) { - return 0; - } - my ($ccdip,$ccdsubnet)=split (/\//, $ccdnet); - #IP valid? - if ($ccdip=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/ &&(($1>0 && $1<=255 && $2>=0 && $2<=255 && $3>=0 && $3<=255 && $4<=255 ))) { - #Subnet in decimal and valid? - if ($ccdsubnet=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/ &&(($1<=255 && $2<=$1 && $3<=$2 && $4<=$3 ))) { - for (my $i=8;$i<=30;$i++){ - if (&General::cidrtosub($i) eq $ccdsubnet){ - return 1; - } - } - #Subnet already in binary format? - }elsif ($ccdsubnet=~/^(\d{1,2})$/ && (($1<=30 && $1>=8))){ - return 1; - }else{ - return 0; - } - - } - return 0; + my $ipandmask = $_[0]; + + # split it into number and mask. + if (!($ipandmask =~ /^(.*?)\/(.*?)$/)) { + return 0; } + my $ip = $1; + my $mask = $2; + # first part not a ip? + if (!(&validip($ip))) { + return 0; } + return &validmask($mask); } sub validport @@ -431,7 +276,7 @@ sub validhostname if (length ($hostname) < 1 || length ($hostname) > 63) { return 0;} # Only valid characters are a-z, A-Z, 0-9 and - - if ($hostname !~ /^[a-zA-Z0-9-\s]*$/) { + if ($hostname !~ /^[a-zA-Z0-9-]*$/) { return 0;} # First character can only be a letter or a digit if (substr ($hostname, 0, 1) !~ /^[a-zA-Z0-9]*$/) { @@ -562,12 +407,7 @@ sub NextIP ) ); } -sub NextIP2 -{ - return &Socket::inet_ntoa( pack("N", 4 + unpack('N', &Socket::inet_aton(shift)) - ) - ); -} + sub ipcidr { my ($ip,$cidr) = &Net::IPv4Addr::ipv4_parse(shift); @@ -625,13 +465,13 @@ sub writehasharray { open(FILE, ">$filename") or die "Unable to write to file $filename"; foreach $key (keys %$hash) { - if ($key =~ /^[0-9]+$/) { - print FILE "$key"; - foreach $i (0 .. $#{$hash->{$key}}) { - print FILE ",$hash->{$key}[$i]"; - } - print FILE "\n"; - } + if ($key =~ /^[0-9]+$/) { + print FILE "$key"; + foreach $i (0 .. $#{$hash->{$key}}) { + print FILE ",$hash->{$key}[$i]"; + } + print FILE "\n"; + } } close FILE; return; diff --git a/config/wpa_supplicant/wpa_supplicant_conf.sh b/config/wpa_supplicant/wpa_supplicant_conf.sh deleted file mode 100644 index 06d928d..0000000 --- a/config/wpa_supplicant/wpa_supplicant_conf.sh +++ /dev/null @@ -1,114 +0,0 @@ -#!/bin/bash - -config="/tmp/wpa_supplicant.conf" - -# Read in the configuration files. -source /root/wpa_supplicant_settings - -# Exit, if wpa_supplicant is not enabled. -if [ "${ENABLED}" != "on" ]; then - exit 0 -fi - -# Read the interface configuration. -eval $(readhash /var/ipfire/ethernet/settings) - -# Find the device, we are going to deal with. -device=${!DEVICE} - -if [ -z "${device}" ]; then - echo "No device configured. Exiting." >&2 - exit 1 -fi - -# Check, if the given device is a wireless device. -if [ -d "/sys/class/net/${device}/phy80211" ]; then - wireless="true" -else - wireless="false" -fi - -# Write a configuration file header. -( - echo "#" - echo "# THIS FILE IS AUTOMATICALLY GENERATED AND" - echo "# ANY CUSTOM CHANGES WILL BE OVERWRITTEN!" - echo -) > ${config} - -# Write the configuration file. -( - proto="" - key_mgmt="" - pairwise="" - group="" - - echo "network={" - - case "${MODE}" in - 8021X) - key_mgmt="IEEE8021X" - - echo "eap=${EAP_METHOD}" - echo "anonymous_identity=\"${ANONYMOUS_IDENTITY}\"" - echo "identity=\"${IDENTITY}\"" - echo "password=\"${PASSWORD}\"" - echo "phase2=\"${PHASE2}\"" - ;; - WPA) - proto="WPA" - key_mgmt="WPA-PSK" - ;; - WPA2) - proto="RSN" - key_mgmt="WPA-PSK" - ;; - WEP) - key_mgmt="NONE" - echo " wep_tx_keyidx=0" - echo " wep_key0=\"${PSK}\"" - ;; - esac - - if [ -n "${SSID}" ]; then - echo " ssid=\"${SSID}\"" - fi - if [ "${wireless}" = "true" ]; then - echo " scan_ssid=1" - fi - if [ -n "${key_mgmt}" ]; then - echo " key_mgmt=${key_mgmt}" - fi - if [ -n "${PSK}" ]; then - echo " psk=\"${PSK}\"" - fi - if [ -n "${proto}" ]; then - echo " proto=${proto}" - fi - - case "${WPA_MODE}" in - CCMP-CCMP) - pairwise="CCMP" - group="CCMP" - ;; - CCMP-TKIP) - pairwise="CCMP" - group="TKIP" - ;; - TKIP-TKIP) - pairwise="TKIP" - group="TKIP" - ;; - *) - echo "Unknown WPA_MODE: ${WPA_MODE}" >&2 - ;; - esac - if [ -n "${pairwise}" -a -n "${group}" ]; then - echo " pairwise=${pairwise}" - echo " group=${group}" - fi - - echo "}" -) >> ${config} - -cat ${config} diff --git a/config/wpa_supplicant/wpa_supplicant_settings b/config/wpa_supplicant/wpa_supplicant_settings deleted file mode 100644 index 5984d83..0000000 --- a/config/wpa_supplicant/wpa_supplicant_settings +++ /dev/null @@ -1,6 +0,0 @@ -ENABLED=on -DEVICE=RED_DEV -MODE=WPA2 -#WPA_MODE=CCMP-CCMP -PSK="ThisIsTheKey" -SSID="Use This One Mum" diff --git a/doc/language_issues.de b/doc/language_issues.de index 137217c..5a42ae5 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -68,9 +68,6 @@ WARNING: translation string unused: cache size WARNING: translation string unused: calamaris report interval (in minutes) WARNING: translation string unused: calc traffic all x minutes WARNING: translation string unused: capsinactive -WARNING: translation string unused: ccd err iroute -WARNING: translation string unused: ccd err netadr -WARNING: translation string unused: ccd maxclients WARNING: translation string unused: cfg restart WARNING: translation string unused: check for net traffic update WARNING: translation string unused: choose config diff --git a/doc/language_issues.en b/doc/language_issues.en index 68fef77..6d6a2a6 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -87,8 +87,6 @@ WARNING: translation string unused: cache size WARNING: translation string unused: calamaris report interval (in minutes) WARNING: translation string unused: calc traffic all x minutes WARNING: translation string unused: capsinactive -WARNING: translation string unused: ccd err iroute -WARNING: translation string unused: ccd err netadr WARNING: translation string unused: cfg restart WARNING: translation string unused: check for net traffic update WARNING: translation string unused: choose config diff --git a/doc/language_issues.es b/doc/language_issues.es index 968e321..6bcbf86 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -500,41 +500,7 @@ WARNING: untranslated string: Async logging enabled WARNING: untranslated string: Scan for Songs WARNING: untranslated string: Set time on boot WARNING: untranslated string: advproxy errmsg invalid upstream proxy -WARNING: untranslated string: attention WARNING: untranslated string: bytes -WARNING: untranslated string: ccd add -WARNING: untranslated string: ccd choose net -WARNING: untranslated string: ccd client options -WARNING: untranslated string: ccd clientip -WARNING: untranslated string: ccd dynrange -WARNING: untranslated string: ccd err blue -WARNING: untranslated string: ccd err green -WARNING: untranslated string: ccd err hostinnet -WARNING: untranslated string: ccd err inuse -WARNING: untranslated string: ccd err invalidname -WARNING: untranslated string: ccd err invalidnet -WARNING: untranslated string: ccd err irouteexist -WARNING: untranslated string: ccd err isovpnnet -WARNING: untranslated string: ccd err issubnet -WARNING: untranslated string: ccd err name -WARNING: untranslated string: ccd err nameexist -WARNING: untranslated string: ccd err netadrexist -WARNING: untranslated string: ccd err orange -WARNING: untranslated string: ccd err red -WARNING: untranslated string: ccd err routeovpn -WARNING: untranslated string: ccd err routeovpn2 -WARNING: untranslated string: ccd hint -WARNING: untranslated string: ccd invalid -WARNING: untranslated string: ccd iroute -WARNING: untranslated string: ccd iroute2 -WARNING: untranslated string: ccd iroutehint -WARNING: untranslated string: ccd modify -WARNING: untranslated string: ccd name -WARNING: untranslated string: ccd net -WARNING: untranslated string: ccd none -WARNING: untranslated string: ccd routes -WARNING: untranslated string: ccd subnet -WARNING: untranslated string: ccd used WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled @@ -580,16 +546,11 @@ WARNING: untranslated string: outgoing firewall p2p description 2 WARNING: untranslated string: outgoing firewall p2p description 3 WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: outgoing firewall view group -WARNING: untranslated string: ovpn errmsg green already pushed -WARNING: untranslated string: ovpn errmsg invalid ip or mask -WARNING: untranslated string: ovpn routes push -WARNING: untranslated string: ovpn routes push options WARNING: untranslated string: pakfire ago WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table -WARNING: untranslated string: server restart WARNING: untranslated string: static routes WARNING: untranslated string: system information WARNING: untranslated string: visit us at diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 1c37b17..189932f 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -499,41 +499,7 @@ WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs WARNING: untranslated string: advproxy errmsg invalid upstream proxy -WARNING: untranslated string: attention WARNING: untranslated string: bytes -WARNING: untranslated string: ccd add -WARNING: untranslated string: ccd choose net -WARNING: untranslated string: ccd client options -WARNING: untranslated string: ccd clientip -WARNING: untranslated string: ccd dynrange -WARNING: untranslated string: ccd err blue -WARNING: untranslated string: ccd err green -WARNING: untranslated string: ccd err hostinnet -WARNING: untranslated string: ccd err inuse -WARNING: untranslated string: ccd err invalidname -WARNING: untranslated string: ccd err invalidnet -WARNING: untranslated string: ccd err irouteexist -WARNING: untranslated string: ccd err isovpnnet -WARNING: untranslated string: ccd err issubnet -WARNING: untranslated string: ccd err name -WARNING: untranslated string: ccd err nameexist -WARNING: untranslated string: ccd err netadrexist -WARNING: untranslated string: ccd err orange -WARNING: untranslated string: ccd err red -WARNING: untranslated string: ccd err routeovpn -WARNING: untranslated string: ccd err routeovpn2 -WARNING: untranslated string: ccd hint -WARNING: untranslated string: ccd invalid -WARNING: untranslated string: ccd iroute -WARNING: untranslated string: ccd iroute2 -WARNING: untranslated string: ccd iroutehint -WARNING: untranslated string: ccd modify -WARNING: untranslated string: ccd name -WARNING: untranslated string: ccd net -WARNING: untranslated string: ccd none -WARNING: untranslated string: ccd routes -WARNING: untranslated string: ccd subnet -WARNING: untranslated string: ccd used WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: dns address deleted txt WARNING: untranslated string: fireinfo ipfire version @@ -573,7 +539,6 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table -WARNING: untranslated string: server restart WARNING: untranslated string: snort working WARNING: untranslated string: static routes WARNING: untranslated string: system information diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 968e321..6bcbf86 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -500,41 +500,7 @@ WARNING: untranslated string: Async logging enabled WARNING: untranslated string: Scan for Songs WARNING: untranslated string: Set time on boot WARNING: untranslated string: advproxy errmsg invalid upstream proxy -WARNING: untranslated string: attention WARNING: untranslated string: bytes -WARNING: untranslated string: ccd add -WARNING: untranslated string: ccd choose net -WARNING: untranslated string: ccd client options -WARNING: untranslated string: ccd clientip -WARNING: untranslated string: ccd dynrange -WARNING: untranslated string: ccd err blue -WARNING: untranslated string: ccd err green -WARNING: untranslated string: ccd err hostinnet -WARNING: untranslated string: ccd err inuse -WARNING: untranslated string: ccd err invalidname -WARNING: untranslated string: ccd err invalidnet -WARNING: untranslated string: ccd err irouteexist -WARNING: untranslated string: ccd err isovpnnet -WARNING: untranslated string: ccd err issubnet -WARNING: untranslated string: ccd err name -WARNING: untranslated string: ccd err nameexist -WARNING: untranslated string: ccd err netadrexist -WARNING: untranslated string: ccd err orange -WARNING: untranslated string: ccd err red -WARNING: untranslated string: ccd err routeovpn -WARNING: untranslated string: ccd err routeovpn2 -WARNING: untranslated string: ccd hint -WARNING: untranslated string: ccd invalid -WARNING: untranslated string: ccd iroute -WARNING: untranslated string: ccd iroute2 -WARNING: untranslated string: ccd iroutehint -WARNING: untranslated string: ccd modify -WARNING: untranslated string: ccd name -WARNING: untranslated string: ccd net -WARNING: untranslated string: ccd none -WARNING: untranslated string: ccd routes -WARNING: untranslated string: ccd subnet -WARNING: untranslated string: ccd used WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled @@ -580,16 +546,11 @@ WARNING: untranslated string: outgoing firewall p2p description 2 WARNING: untranslated string: outgoing firewall p2p description 3 WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: outgoing firewall view group -WARNING: untranslated string: ovpn errmsg green already pushed -WARNING: untranslated string: ovpn errmsg invalid ip or mask -WARNING: untranslated string: ovpn routes push -WARNING: untranslated string: ovpn routes push options WARNING: untranslated string: pakfire ago WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table -WARNING: untranslated string: server restart WARNING: untranslated string: static routes WARNING: untranslated string: system information WARNING: untranslated string: visit us at diff --git a/doc/language_issues.ru b/doc/language_issues.ru index c1c87ee..e25d81d 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -491,41 +491,7 @@ WARNING: untranslated string: Add a route WARNING: untranslated string: Edit an existing route WARNING: untranslated string: Scan for Songs WARNING: untranslated string: advproxy errmsg invalid upstream proxy -WARNING: untranslated string: attention WARNING: untranslated string: bytes -WARNING: untranslated string: ccd add -WARNING: untranslated string: ccd choose net -WARNING: untranslated string: ccd client options -WARNING: untranslated string: ccd clientip -WARNING: untranslated string: ccd dynrange -WARNING: untranslated string: ccd err blue -WARNING: untranslated string: ccd err green -WARNING: untranslated string: ccd err hostinnet -WARNING: untranslated string: ccd err inuse -WARNING: untranslated string: ccd err invalidname -WARNING: untranslated string: ccd err invalidnet -WARNING: untranslated string: ccd err irouteexist -WARNING: untranslated string: ccd err isovpnnet -WARNING: untranslated string: ccd err issubnet -WARNING: untranslated string: ccd err name -WARNING: untranslated string: ccd err nameexist -WARNING: untranslated string: ccd err netadrexist -WARNING: untranslated string: ccd err orange -WARNING: untranslated string: ccd err red -WARNING: untranslated string: ccd err routeovpn -WARNING: untranslated string: ccd err routeovpn2 -WARNING: untranslated string: ccd hint -WARNING: untranslated string: ccd invalid -WARNING: untranslated string: ccd iroute -WARNING: untranslated string: ccd iroute2 -WARNING: untranslated string: ccd iroutehint -WARNING: untranslated string: ccd modify -WARNING: untranslated string: ccd name -WARNING: untranslated string: ccd net -WARNING: untranslated string: ccd none -WARNING: untranslated string: ccd routes -WARNING: untranslated string: ccd subnet -WARNING: untranslated string: ccd used WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: disk access per WARNING: untranslated string: extrahd because there is already a device mounted @@ -554,7 +520,6 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table -WARNING: untranslated string: server restart WARNING: untranslated string: static routes WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange diff --git a/doc/language_missings b/doc/language_missings index a6a29fb..55e0e40 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -4,7 +4,6 @@ ############################################################################ # Checking cgi-bin translations for language: en # ############################################################################ -< ccd maxclients ############################################################################ # Checking install/setup translations for language: fr # ############################################################################ @@ -12,43 +11,6 @@ # Checking cgi-bin translations for language: fr # ############################################################################ < advproxy errmsg invalid upstream proxy -< attention -< ccd add -< ccd choose net -< ccd clientip -< ccd client options -< ccd dynrange -< ccd err blue -< ccd err green -< ccd err hostinnet -< ccd err inuse -< ccd err invalidname -< ccd err invalidnet -< ccd err iroute -< ccd err irouteexist -< ccd err isovpnnet -< ccd err issubnet -< ccd err name -< ccd err nameexist -< ccd err netadr -< ccd err netadrexist -< ccd err orange -< ccd err red -< ccd err routeovpn -< ccd err routeovpn2 -< ccd hint -< ccd invalid -< ccd iroute -< ccd iroute2 -< ccd iroutehint -< ccd maxclients -< ccd modify -< ccd name -< ccd net -< ccd none -< ccd routes -< ccd subnet -< ccd used < deprecated fs warn < dns address deleted txt < fireinfo ipfire version @@ -83,7 +45,6 @@ < openvpn subnet is used < other < our donors -< server restart < snort working < static routes < system information @@ -120,43 +81,6 @@ ############################################################################ < advproxy errmsg invalid upstream proxy < Async logging enabled -< attention -< ccd add -< ccd choose net -< ccd clientip -< ccd client options -< ccd dynrange -< ccd err blue -< ccd err green -< ccd err hostinnet -< ccd err inuse -< ccd err invalidname -< ccd err invalidnet -< ccd err iroute -< ccd err irouteexist -< ccd err isovpnnet -< ccd err issubnet -< ccd err name -< ccd err nameexist -< ccd err netadr -< ccd err netadrexist -< ccd err orange -< ccd err red -< ccd err routeovpn -< ccd err routeovpn2 -< ccd hint -< ccd invalid -< ccd iroute -< ccd iroute2 -< ccd iroutehint -< ccd maxclients -< ccd modify -< ccd name -< ccd net -< ccd none -< ccd routes -< ccd subnet -< ccd used < deprecated fs warn < fireinfo ipfire version < fireinfo is disabled @@ -202,11 +126,6 @@ < outgoing firewall p2p description 2 < outgoing firewall p2p description 3 < outgoing firewall view group -< ovpn errmsg green already pushed -< ovpn errmsg invalid ip or mask -< ovpn routes push -< ovpn routes push options -< server restart < Set time on boot < static routes < system information @@ -219,43 +138,6 @@ # Checking cgi-bin translations for language: pl # ############################################################################ < advproxy errmsg invalid upstream proxy -< attention -< ccd add -< ccd choose net -< ccd clientip -< ccd client options -< ccd dynrange -< ccd err blue -< ccd err green -< ccd err hostinnet -< ccd err inuse -< ccd err invalidname -< ccd err invalidnet -< ccd err iroute -< ccd err irouteexist -< ccd err isovpnnet -< ccd err issubnet -< ccd err name -< ccd err nameexist -< ccd err netadr -< ccd err netadrexist -< ccd err orange -< ccd err red -< ccd err routeovpn -< ccd err routeovpn2 -< ccd hint -< ccd invalid -< ccd iroute -< ccd iroute2 -< ccd iroutehint -< ccd maxclients -< ccd modify -< ccd name -< ccd net -< ccd none -< ccd routes -< ccd subnet -< ccd used < deprecated fs warn < extrahd because there is already a device mounted < extrahd cant umount @@ -279,11 +161,6 @@ < openvpn subnet is used < other < our donors -< ovpn errmsg green already pushed -< ovpn errmsg invalid ip or mask -< ovpn routes push -< ovpn routes push options -< server restart < static routes < visit us at < vpn keyexchange @@ -295,43 +172,6 @@ ############################################################################ < Add a route < advproxy errmsg invalid upstream proxy -< attention -< ccd add -< ccd choose net -< ccd clientip -< ccd client options -< ccd dynrange -< ccd err blue -< ccd err green -< ccd err hostinnet -< ccd err inuse -< ccd err invalidname -< ccd err invalidnet -< ccd err iroute -< ccd err irouteexist -< ccd err isovpnnet -< ccd err issubnet -< ccd err name -< ccd err nameexist -< ccd err netadr -< ccd err netadrexist -< ccd err orange -< ccd err red -< ccd err routeovpn -< ccd err routeovpn2 -< ccd hint -< ccd invalid -< ccd iroute -< ccd iroute2 -< ccd iroutehint -< ccd maxclients -< ccd modify -< ccd name -< ccd net -< ccd none -< ccd routes -< ccd subnet -< ccd used < day-graph < deprecated fs warn < disk access per @@ -363,7 +203,6 @@ < other < our donors < outgoing traffic in bytes per second -< server restart < static routes < visit us at < vpn keyexchange diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi old mode 100755 new mode 100644 index baabe8b..990fe66 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -36,10 +36,10 @@ require "${General::swroot}/header.pl"; require "${General::swroot}/countries.pl"; # enable only the following on debugging purpose -#use warnings; -#use CGI::Carp 'fatalsToBrowser'; +use warnings; +use CGI::Carp 'fatalsToBrowser'; #workaround to suppress a warning when a variable is used only once -my @dummy = ( ${Header::colourgreen}, ${Header::colourblue} ); +my @dummy = ( ${Header::colourgreen} ); undef (@dummy); my %color = (); @@ -77,12 +77,8 @@ $cgiparams{'DHCP_WINS'} = ''; $cgiparams{'ROUTES_PUSH'} = ''; $cgiparams{'DCOMPLZO'} = 'off'; $cgiparams{'MSSFIX'} = ''; -$cgiparams{'number'} = ''; $routes_push_file = "${General::swroot}/ovpn/routes_push"; unless (-e $routes_push_file) { system("touch $routes_push_file"); } -unless (-e "${General::swroot}/ovpn/ccd.conf") { system("touch ${General::swroot}/ovpn/ccd.conf"); } -unless (-e "${General::swroot}/ovpn/ccdroute") { system("touch ${General::swroot}/ovpn/ccdroute"); } -unless (-e "${General::swroot}/ovpn/ccdroute2") { system("touch ${General::swroot}/ovpn/ccdroute2"); } &Header::getcgihash(\%cgiparams, {'wantfile' => 1, 'filevar' => 'FH'}); @@ -346,35 +342,18 @@ sub writeserverconf { print CONF "dh /var/ipfire/ovpn/ca/dh1024.pem\n"; my @tempovpnsubnet = split("\/",$sovpnsettings{'DOVPN_SUBNET'}); print CONF "server $tempovpnsubnet[0] $tempovpnsubnet[1]\n"; - #print CONF "push \"route $netsettings{'GREEN_NETADDRESS'} $netsettings{'GREEN_NETMASK'}\"\n"; + print CONF "push \"route $netsettings{'GREEN_NETADDRESS'} $netsettings{'GREEN_NETMASK'}\"\n"; if ($vpnsettings{'ROUTES_PUSH'} ne '') { - @temp = split(/\n/,$vpnsettings{'ROUTES_PUSH'}); - foreach (@temp) - { - @tempovpnsubnet = split("\/",&General::ipcidr2msk($_)); - print CONF "push \"route " . $tempovpnsubnet[0]. " " . $tempovpnsubnet[1] . "\"\n"; - } - } -# a.marx ccd - my %ccdconfhash=(); - &General::readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); - foreach my $key (keys %ccdconfhash) { - my $a=$ccdconfhash{$key}[1]; - my ($b,$c) = split (/\//, $a); - print CONF "route $b ".&General::cidrtosub($c)."\n"; - } - my %ccdroutehash=(); - &General::readhasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); - foreach my $key (keys %ccdroutehash) { - foreach my $i ( 1 .. $#{$ccdroutehash{$key}}){ - my ($a,$b)=split (/\//,$ccdroutehash{$key}[$i]); - print CONF "route $a $b\n"; - } + @temp = split(/\n/,$vpnsettings{'ROUTES_PUSH'}); + foreach (@temp) + { + @tempovpnsubnet = split("\/",&General::ipcidr2msk($_)); + print CONF "push \"route " . $tempovpnsubnet[0]. " " . $tempovpnsubnet[1] . "\"\n"; } -# ccd end + } - if ($sovpnsettings{CLIENT2CLIENT} eq 'on') { + if ($sovpnsettings{CLIENT2CLIENT} eq 'on') { print CONF "client-to-client\n"; } if ($sovpnsettings{MSSFIX} eq 'on') { @@ -428,7 +407,7 @@ sub writeserverconf { close(CONF); } - +# sub emptyserverlog{ if (open(FILE, ">/var/log/ovpnserver.log")) { flock FILE, 2; @@ -438,281 +417,6 @@ sub emptyserverlog{ } -sub delccdnet -{ - my %ccdconfhash = (); - my %ccdhash = (); - my $ccdnetname=$_[0]; - if (-f "${General::swroot}/ovpn/ovpnconfig"){ - &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ccdhash); - foreach my $key (keys %ccdhash) { - if ($ccdhash{$key}[32] eq $ccdnetname) { - $errormessage=$Lang::tr{'ccd err hostinnet'}; - return; - } - } - } - &General::readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); - foreach my $key (keys %ccdconfhash) { - if ($ccdconfhash{$key}[0] eq $ccdnetname){ - delete $ccdconfhash{$key}; - } - } - &General::writehasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); - - &writeserverconf; - return 0; -} - -sub addccdnet -{ - my %ccdconfhash=(); - my @ccdconf=(); - my $ccdname=$_[0]; - my $ccdnet=$_[1]; - my $ovpnsubnet=$_[2]; - my $subcidr; - my @ip2=(); - my $checkup; - my $ccdip; - my $baseaddress; - if(!&General::validhostname($ccdname)){ - $errormessage=$Lang::tr{'ccd err invalidname'}; - return; - } - #check ip - if (&General::validipandmask($ccdnet)){ - $ccdnet=&General::iporsubtocidr($ccdnet); - }else{ - $errormessage=$Lang::tr{'ccd err invalidnet'}; - return; - } - ($ccdip,$subcidr) = split (/\//,$ccdnet); - if ($ccdname eq '') { - $errormessage=$errormessage.$Lang::tr{'ccd err name'}."<br>"; - } - #check if we try to use same network as ovpn server - if (&General::iporsubtocidr($ccdnet) eq &General::iporsubtocidr($ovpnsubnet)) { - $errormessage=$errormessage.$Lang::tr{'ccd err isovpnnet'}."<br>"; - } - - #check if we use a name/subnet that already exists - &General::readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); - foreach my $key (keys %ccdconfhash) { - @ccdconf=split(/\//,$ccdconfhash{$key}[1]); - if ($ccdname eq $ccdconfhash{$key}[0]) {$errormessage=$errormessage.$Lang::tr{'ccd err nameexist'}."<br>";} - my ($newip,$newsub) = split(/\//,$ccdnet); - if (&General::IpInSubnet($newip,$ccdconf[0],&General::iporsubtodec($ccdconf[1]))) {$errormessage=$errormessage.$Lang::tr{'ccd err issubnet'}."<br>";} - - } - #check if we use one of ipfire's networks (green,orange,blue) - my %ownnet=(); - &General::readhash("${General::swroot}/ethernet/settings", \%ownnet); - if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($ownnet{'GREEN_NETADDRESS'},$ccdip,&General::iporsubtodec($subcidr))){ $errormessage=$Lang::tr{'ccd err green'};} - if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($ownnet{'ORANGE_NETADDRESS'},$ccdip,&General::iporsubtodec($subcidr))){ $errormessage=$Lang::tr{'ccd err orange'};} - if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($ownnet{'BLUE_NETADDRESS'},$ccdip,&General::iporsubtodec($subcidr))){ $errormessage=$Lang::tr{'ccd err blue'};} - if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($ownnet{'RED_NETADDRESS'},$ccdip,&General::iporsubtodec($subcidr))){ $errormessage=$Lang::tr{'ccd err red'};} - - - if (!$errormessage) { - my %ccdconfhash=(); - $baseaddress=&General::getnetworkip($ccdip,$subcidr); - &General::readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); - my $key = &General::findhasharraykey (\%ccdconfhash); - foreach my $i (0 .. 1) { $ccdconfhash{$key}[$i] = "";} - $ccdconfhash{$key}[0] = $ccdname; - $ccdconfhash{$key}[1] = $baseaddress."/".$subcidr; - &General::writehasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); - &writeserverconf; - $cgiparams{'ccdname'}=''; - $cgiparams{'ccdsubnet'}=''; - return 1; - } -} - -sub modccdnet -{ - - my $newname=$_[0]; - my $oldname=$_[1]; - my %ccdconfhash=(); - my %ccdhash=(); - &General::readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); - foreach my $key (keys %ccdconfhash) { - if ($ccdconfhash{$key}[0] eq $oldname) { - foreach my $key1 (keys %ccdconfhash) { - if ($ccdconfhash{$key1}[0] eq $newname){ - $errormessage=$errormessage.$Lang::tr{'ccd err netadrexist'}; - return; - }else{ - $ccdconfhash{$key}[0]= $newname; - &General::writehasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); - last; - } - } - } - } - - &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ccdhash); - foreach my $key (keys %ccdhash) { - if ($ccdhash{$key}[32] eq $oldname) { - $ccdhash{$key}[32]=$newname; - &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%ccdhash); - last; - } - } - - return 0; -} -sub ccdmaxclients -{ - my $ccdnetwork=$_[0]; - my @octets=(); - my @subnet=(); - @octets=split("\/",$ccdnetwork); - @subnet= split /\./, &General::cidrtosub($octets[1]); - my ($a,$b,$c,$d,$e); - $a=256-$subnet[0]; - $b=256-$subnet[1]; - $c=256-$subnet[2]; - $d=256-$subnet[3]; - $e=($a*$b*$c*$d)/4; - return $e-1; -} - -sub getccdadresses -{ - my $ipin=$_[0]; - my ($ip1,$ip2,$ip3,$ip4)=split /\./, $ipin; - my $cidr=$_[1]; - chomp($cidr); - my $count=$_[2]; - my $hasip=$_[3]; - chomp($hasip); - my @iprange=(); - my %ccdhash=(); - &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ccdhash); - $iprange[0]=$ip1.".".$ip2.".".$ip3.".".2; - for (my $i=0;$i<=$count-1;$i++) { - my $tmpip=$iprange[$i-1]; - my $stepper=$i*4; - $iprange[$i]= &General::getnextip($tmpip,4); - } - my $r=0; - foreach my $key (keys %ccdhash) { - $r=0; - foreach my $tmp (@iprange){ - my ($net,$sub) = split (/\//,$ccdhash{$key}[33]); - if ($net eq $tmp) { - if ( $hasip ne $ccdhash{$key}[33] ){ - splice (@iprange,$r,1); - } - } - $r++; - } - } - return @iprange; -} - -sub fillselectbox -{ - my $boxname=$_[1]; - my ($ccdip,$subcidr) = split("/",$_[0]); - my $tz=$_[2]; - my @allccdips=&getccdadresses($ccdip,$subcidr,&ccdmaxclients($ccdip."/".$subcidr),$tz); - print"<select name='$boxname' STYLE='font-family : arial; font-size : 9pt; width:130px;' >"; - foreach (@allccdips) { - my $ip=$_."/30"; - chomp($ip); - print "<option value='$ip' "; - if ( $ip eq $cgiparams{$boxname} ){ - print"selected"; - } - print ">$ip</option>"; - } - print "</select>"; -} - -sub hostsinnet -{ - my $name=$_[0]; - my %ccdhash=(); - my $i=0; - &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ccdhash); - foreach my $key (keys %ccdhash) { - if ($ccdhash{$key}[32] eq $name){ $i++;} - } - return $i; -} - -sub check_routes_push -{ - my $val=$_[0]; - my ($ip,$cidr) = split (/\//, $val); - ##check for existing routes in routes_push - if (-e "${General::swroot}/ovpn/routes_push") { - open(FILE,"${General::swroot}/ovpn/routes_push"); - while (<FILE>) { - $_=~s/\s*$//g; - - my ($ip2,$cidr2) = split (/\//,"$_"); - my $val2=$ip2."/".&General::iporsubtodec($cidr2); - - if($val eq $val2){ - return 0; - } - #subnetcheck - if (&General::IpInSubnet ($ip,$ip2,&General::iporsubtodec($cidr2))){ - return 0; - } - }; - close(FILE); - } - return 1; -} - -sub check_ccdroute -{ - my %ccdroutehash=(); - my $val=$_[0]; - my ($ip,$cidr) = split (/\//, $val); - #check for existing routes in ccdroute - &General::readhasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); - foreach my $key (keys %ccdroutehash) { - foreach my $i (1 .. $#{$ccdroutehash{$key}}) { - if (&General::iporsubtodec($val) eq $ccdroutehash{$key}[$i] && $ccdroutehash{$key}[0] ne $cgiparams{'NAME'}){ - return 0; - } - my ($ip2,$cidr2) = split (/\//,$ccdroutehash{$key}[$i]); - #subnetcheck - if (&General::IpInSubnet ($ip,$ip2,$cidr2)&& $ccdroutehash{$key}[0] ne $cgiparams{'NAME'} ){ - return 0; - } - } - } - return 1; -} -sub check_ccdconf -{ - my %ccdconfhash=(); - my $val=$_[0]; - my ($ip,$cidr) = split (/\//, $val); - #check for existing routes in ccdroute - &General::readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); - foreach my $key (keys %ccdconfhash) { - if (&General::iporsubtocidr($val) eq $ccdconfhash{$key}[1]){ - return 0; - } - my ($ip2,$cidr2) = split (/\//,$ccdconfhash{$key}[1]); - #subnetcheck - if (&General::IpInSubnet ($ip,$ip2,&General::cidrtosub($cidr2))){ - return 0; - } - - } - return 1; -} - ### # m.a.d net2net ### @@ -747,7 +451,6 @@ sub read_routepushfile while (<FILE>) { $vpnsettings{'ROUTES_PUSH'} .= $_ }; close(FILE); $cgiparams{'ROUTES_PUSH'} = $vpnsettings{'ROUTES_PUSH'}; - } } @@ -787,11 +490,11 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'start ovpn server'} || &emptyserverlog(); } # #restart openvpn server -# if ($cgiparams{'ACTION'} eq $Lang::tr{'restart ovpn server'}){ + if ($cgiparams{'ACTION'} eq $Lang::tr{'restart ovpn server'}){ #workarund, till SIGHUP also works when running as nobody -# system('/usr/local/bin/openvpnctrl', '-r'); -# &emptyserverlog(); -# } + system('/usr/local/bin/openvpnctrl', '-r'); + &emptyserverlog(); + } } ### @@ -851,47 +554,24 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { if ($cgiparams{'ROUTES_PUSH'} ne ''){ @temp = split(/\n/,$cgiparams{'ROUTES_PUSH'}); undef $vpnsettings{'ROUTES_PUSH'}; - - foreach my $tmpip (@temp) + foreach (@temp) { s/^\s+//g; s/\s+$//g; - - if ($tmpip) + if ($_) { - $tmpip=~s/\s*$//g; - unless (&General::validipandmask($tmpip)) { - $errormessage = "$tmpip ".$Lang::tr{'ovpn errmsg invalid ip or mask'}; - goto ADV_ERROR; + unless (&General::validipandmask($_)) { + $errormessage = $Lang::tr{'ovpn errmsg invalid ip or mask'}; + goto ADV_ERROR; } - my ($ip, $cidr) = split("\/",&General::ipcidr2msk($tmpip)); - + my ($ip, $cidr) = split("\/",&General::ipcidr2msk($_)); if ($ip eq $netsettings{'GREEN_NETADDRESS'} && $cidr eq $netsettings{'GREEN_NETMASK'}) { $errormessage = $Lang::tr{'ovpn errmsg green already pushed'}; - goto ADV_ERROR; - } -# a.marx ccd - my %ccdroutehash=(); - &General::readhasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); - foreach my $key (keys %ccdroutehash) { - foreach my $i (1 .. $#{$ccdroutehash{$key}}) { - if ( $ip."/".$cidr eq $ccdroutehash{$key}[$i] ){ - $errormessage="Route $ip\/$cidr ".$Lang::tr{'ccd err inuse'}." $ccdroutehash{$key}[0]" ; - goto ADV_ERROR; - } - my ($ip2,$cidr2) = split(/\//,$ccdroutehash{$key}[$i]); - if (&General::IpInSubnet ($ip,$ip2,$cidr2)){ - $errormessage="Route $ip\/$cidr ".$Lang::tr{'ccd err inuse'}." $ccdroutehash{$key}[0]" ; - goto ADV_ERROR; - } - } + goto ADV_ERROR; } - -# ccd end - - $vpnsettings{'ROUTES_PUSH'} .= $tmpip."\n"; + $vpnsettings{'ROUTES_PUSH'} .= $_."\n"; } - } - &write_routepushfile; + } + &write_routepushfile; undef $vpnsettings{'ROUTES_PUSH'}; } else { @@ -1891,26 +1571,29 @@ END my $n2nactive = `/bin/ps ax|grep $confighash{$cgiparams{'KEY'}}[1]|grep -v grep|awk \'{print \$1}\'`; if ($confighash{$cgiparams{'KEY'}}) { - if ($confighash{$cgiparams{'KEY'}}[0] eq 'off') { - $confighash{$cgiparams{'KEY'}}[0] = 'on'; - &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); - if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ + + if ($confighash{$cgiparams{'KEY'}}[0] eq 'off') { + $confighash{$cgiparams{'KEY'}}[0] = 'on'; + &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); + + if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ system('/usr/local/bin/openvpnctrl', '-sn2n', $confighash{$cgiparams{'KEY'}}[1]); - } - } else { + } + + } else { - $confighash{$cgiparams{'KEY'}}[0] = 'off'; - &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); + $confighash{$cgiparams{'KEY'}}[0] = 'off'; + &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); - if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ + if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ if ($n2nactive ne ''){ - system('/usr/local/bin/openvpnctrl', '-kn2n', $confighash{$cgiparams{'KEY'}}[1]); - } + system('/usr/local/bin/openvpnctrl', '-kn2n', $confighash{$cgiparams{'KEY'}}[1]); + } - } else { + } else { $errormessage = $Lang::tr{'invalid key'}; - } + } } } @@ -2035,10 +1718,9 @@ else my $zip = Archive::Zip->new(); - print CLIENTCONF "#OpenVPN Client conf\r\n"; + print CLIENTCONF "#OpenVPN Server conf\r\n"; print CLIENTCONF "tls-client\r\n"; print CLIENTCONF "client\r\n"; - print CLIENTCONF "nobind\n"; print CLIENTCONF "dev $vpnsettings{'DDEVICE'}\r\n"; print CLIENTCONF "proto $vpnsettings{'DPROTOCOL'}\r\n"; print CLIENTCONF "$vpnsettings{'DDEVICE'}-mtu $vpnsettings{'DMTU'}\r\n"; @@ -2132,41 +1814,10 @@ else } unlink ("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem"); - unlink ("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12"); - -# A.Marx CCD delete ccd files and routes - - - if (-f "${General::swroot}/ovpn/ccd/$confighash{$cgiparams{'KEY'}}[2]") - { - unlink "${General::swroot}/ovpn/ccd/$confighash{$cgiparams{'KEY'}}[2]"; - } - my %ccdroutehash=(); - &General::readhasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); - foreach my $key (keys %ccdroutehash) { - if ($ccdroutehash{$key}[0] eq $confighash{$cgiparams{'KEY'}}[1]){ - delete $ccdroutehash{$key}; - } - } - &General::writehasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); - my %ccdroute2hash=(); - &General::readhasharray("${General::swroot}/ovpn/ccdroute2", \%ccdroute2hash); - foreach my $key (keys %ccdroute2hash) { - if ($ccdroute2hash{$key}[0] eq $confighash{$cgiparams{'KEY'}}[1]){ - delete $ccdroute2hash{$key}; - } - } - &General::writehasharray("${General::swroot}/ovpn/ccdroute2", \%ccdroute2hash); - - - -# CCD end - - + unlink ("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12"); delete $confighash{$cgiparams{'KEY'}}; my $temp2 = `/usr/bin/openssl ca -gencrl -out ${General::swroot}/ovpn/crls/cacrl.pem -config ${General::swroot}/ovpn/openssl/ovpn.cnf`; &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); - #&writeserverconf(); } else { $errormessage = $Lang::tr{'invalid key'}; @@ -2233,11 +1884,9 @@ else %cgiparams = (); %cahash = (); %confighash = (); - my $disabled; &General::readhash("${General::swroot}/ovpn/settings", \%cgiparams); read_routepushfile; - - + # if ($cgiparams{'CLIENT2CLIENT'} eq '') { # $cgiparams{'CLIENT2CLIENT'} = 'on'; # } @@ -2277,7 +1926,9 @@ ADV_ERROR: $selected{'LOG_VERB'}{'11'} = ''; $selected{'LOG_VERB'}{'0'} = ''; $selected{'LOG_VERB'}{$cgiparams{'LOG_VERB'}} = 'SELECTED'; - + + + &Header::showhttpheaders(); &Header::openpage($Lang::tr{'status ovpn'}, 1, ''); &Header::openbigbox('100%', 'LEFT', '', $errormessage); @@ -2289,8 +1940,8 @@ ADV_ERROR: } &Header::openbox('100%', 'LEFT', $Lang::tr{'advanced server'}); print <<END - <form method='post' enctype='multipart/form-data' disabled> - <table width='100%' border=0> + <form method='post' enctype='multipart/form-data'> + <table width='100%'> <tr> <td colspan='4'><b>$Lang::tr{'dhcp-options'}</b></td> </tr> @@ -2299,7 +1950,7 @@ ADV_ERROR: </tr> <tr> <td class='base'>Domain</td> - <td><input type='TEXT' name='DHCP_DOMAIN' value='$cgiparams{'DHCP_DOMAIN'}' size='30' /></td> + <td><input type='TEXT' name='DHCP_DOMAIN' value='$cgiparams{'DHCP_DOMAIN'}' size='30' /></td> </tr> <tr> <td class='base'>DNS</td> @@ -2324,7 +1975,7 @@ if ($cgiparams{'ROUTES_PUSH'} ne '') print $cgiparams{'ROUTES_PUSH'}; } -print <<END; +print <<END </textarea></td> </tr> </tr> @@ -2406,16 +2057,8 @@ print <<END; <option value='10' $selected{'LOG_VERB'}{'10'}>10</option> <option value='11' $selected{'LOG_VERB'}{'11'}>11</option> <option value='0' $selected{'LOG_VERB'}{'0'}>0</option></select></td> -</table><hr> -END - -if ( -e "/var/run/openvpn.pid"){ -print" <br><b><font color='#990000'>$Lang::tr{'attention'}:</b></font><br> - $Lang::tr{'server restart'}<br><br> - <hr>"; -} - -print<<END +</table> +<hr size='1'> <table width='100%'> <tr> <td> </td> @@ -2434,121 +2077,6 @@ END &Header::closepage(); exit(0); - -# A.Marx CCD Add,delete or edit CCD net - -} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'ccd net'} || - $cgiparams{'ACTION'} eq $Lang::tr{'ccd add'} || - $cgiparams{'ACTION'} eq "kill" || - $cgiparams{'ACTION'} eq "edit" || - $cgiparams{'ACTION'} eq 'editsave'){ - &Header::showhttpheaders(); - &Header::openpage($Lang::tr{'ccd net'}, 1, ''); - &Header::openbigbox('100%', 'LEFT', '', ''); - - if ($cgiparams{'ACTION'} eq "kill"){ - &delccdnet($cgiparams{'net'}); - } - - if ($cgiparams{'ACTION'} eq 'editsave'){ - my ($a,$b) =split (/\|/,$cgiparams{'ccdname'}); - if ( $a ne $b){ &modccdnet($a,$b);} - } - - if ($cgiparams{'ACTION'} eq $Lang::tr{'ccd add'}) { - &addccdnet($cgiparams{'ccdname'},$cgiparams{'ccdsubnet'},$cgiparams{'DOVPN_SUBNET'}); - } - if ($errormessage) { - &Header::openbox('100%', 'LEFT', $Lang::tr{'error messages'}); - print "<class name='base'>$errormessage"; - print " </class>"; - &Header::closebox(); - } -if ($cgiparams{'ACTION'} eq "edit"){ - - &Header::openbox('100%', 'LEFT', $Lang::tr{'ccd modify'}); - - print <<END - <table width='100%' border=0> - <tr><form method='post'> - <td width='10%' nowrap='nowrap'>$Lang::tr{'ccd name'}:</td><td><input type='TEXT' name='ccdname' value='$cgiparams{'ccdname'}' /></td> - <td width='8%'>$Lang::tr{'ccd subnet'}:</td><td><input type='TEXT' name='ccdsubnet' value='$cgiparams{'ccdsubnet'}' readonly /></td></tr> - <tr><td colspan='4' align='right'><hr><input type='submit' value='$Lang::tr{'save'}' /><input type='hidden' name='ACTION' value='editsave'/> - <input type='hidden' name='ccdname' value='$cgiparams{'ccdname'}'/><input type='submit' value='$Lang::tr{'cancel'}' /> - </td></tr> - </table></form> -END -; - &Header::closebox(); - - &Header::openbox('100%', 'LEFT',$Lang::tr{'ccd net'} ); - print <<END - <table width='100%' border='0' cellpadding='0' cellspacing='1'> - <tr> - <td class='boldbase' align='center'><b>$Lang::tr{'ccd name'}</td><td class='boldbase' align='center'><b>$Lang::tr{'network'}</td><td class='boldbase' width='15%' align='center'><b>$Lang::tr{'ccd used'}</td><td width='3%'></td><td width='3%'></td></tr> -END -; -} -else{ - if (! -e "/var/run/openvpn.pid"){ - &Header::openbox('100%', 'LEFT', $Lang::tr{'ccd add'}); - print <<END; - <table width='100%' border='0'> - <tr><form method='post'> - <td colspan='4'>$Lang::tr{'ccd hint'}<br><br></td></tr> - <tr> - <td width='10%' nowrap='nwrap'>$Lang::tr{'ccd name'}:</td><td><input type='TEXT' name='ccdname' value='$cgiparams{'ccdname'}' /></td> - <td width='8%'>$Lang::tr{'ccd subnet'}:</td><td><input type='TEXT' name='ccdsubnet' value='$cgiparams{'ccdsubnet'}' /></td></tr> - <tr><td colspan=4><hr /></td></tr><tr> - <td colspan='4' align='right'><input type='hidden' name='ACTION' value='$Lang::tr{'ccd add'}' /><input type='submit' value='$Lang::tr{'add'}' /><input type='hidden' name='DOVPN_SUBNET' value='$cgiparams{'DOVPN_SUBNET'}'/></td></tr> - </table></form> -END - - &Header::closebox(); -} - &Header::openbox('100%', 'LEFT',$Lang::tr{'ccd net'} ); - print <<END - <table width='100%' border='0' cellpadding='0' cellspacing='1'> - <tr> - <td class='boldbase' align='center' nowrap='nowrap' width='20%'><b>$Lang::tr{'ccd name'}</td><td class='boldbase' align='center' width='8%'><b>$Lang::tr{'network'}</td><td class='boldbase' width='8%' align='center' nowrap='nowrap'><b>$Lang::tr{'ccd used'}</td><td width='1%' align='center'></td><td width='1%' align='center'></td></tr> -END -; -} - my %ccdconfhash=(); - &General::readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); - my @ccdconf=(); - my $count=0; - foreach my $key (keys %ccdconfhash) { - @ccdconf=($ccdconfhash{$key}[0],$ccdconfhash{$key}[1]); - $count++; - my $ccdhosts = &hostsinnet($ccdconf[0]); - if ($count % 2){ print" <tr bgcolor='$color{'color22'}'>";} - else{ print" <tr bgcolor='$color{'color20'}'>";} - print"<td>$ccdconf[0]</td><td align='center'>$ccdconf[1]</td><td align='center'>$ccdhosts/".(&ccdmaxclients($ccdconf[1])+1)."</td><td>"; -print <<END - <form method='post' /> - <input type='image' src='/images/edit.gif' align='middle' alt=$Lang::tr{'edit'} title=$Lang::tr{'edit'} /> - <input type='hidden' name='ACTION' value='edit'/> - <input type='hidden' name='ccdname' value='$ccdconf[0]' /> - <input type='hidden' name='ccdsubnet' value='$ccdconf[1]' /> - </form></td> - <form method='post' /> - <td><input type='hidden' name='ACTION' value='kill'/> - <input type='hidden' name='number' value='$count' /> - <input type='hidden' name='net' value='$ccdconf[0]' /> - <input type='image' src='/images/delete.gif' align='middle' alt=$Lang::tr{'remove'} title=$Lang::tr{'remove'} /></form></td></tr> -END -; - } - print "</table></form>"; - &Header::closebox(); - print "<div align='center'><a href='/cgi-bin/ovpnmain.cgi'>$Lang::tr{'back'}</a></div>"; - &Header::closebigbox(); - &Header::closepage(); - exit(0); - -#END CCD - ### ### Openvpn Connections Statistics ### @@ -2756,7 +2284,7 @@ if ( -s "${General::swroot}/ovpn/settings") { print <<END <b>$Lang::tr{'connection type'}:</b><br /> - <table border='0' width='100%'><form method='post' ENCTYPE="multipart/form-data"> + <table><form method='post' ENCTYPE="multipart/form-data"> <tr><td><input type='radio' name='TYPE' value='host' checked /></td> <td class='base'>$Lang::tr{'host to net vpn'}</td></tr> <tr><td><input type='radio' name='TYPE' value='net' /></td> @@ -2765,21 +2293,21 @@ if ( -s "${General::swroot}/ovpn/settings") { <td class='base'>$Lang::tr{'net to net vpn'} (Upload Client Package)</td></tr> <tr><td> </td><td class='base'><input type='file' name='FH' size='30'></td></tr> <tr><td> </td><td>Import Connection Name <img src='/blob.gif' /></td></tr> - <tr><td> </td><td class='base'><input type='text' name='n2nname' size='30'>Default : Client Packagename</td></tr> + <tr><td> </td><td class='base'><input type='text' name='n2nname' size='30'><td class='base'>Default : Client Packagename</td></td></tr> <tr><td colspan='3'><hr /></td></tr> - <tr><td align='right' colspan='3'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td></tr> + <tr><td align='center'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td></tr> + <tr><td> </td></tr> <tr><td class='base' colspan='3' align='left'><img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td></tr> </form></table> END ; - } else { print <<END <b>$Lang::tr{'connection type'}:</b><br /> - <table border='0' width='100%'><form method='post' ENCTYPE="multipart/form-data"> + <table><form method='post' ENCTYPE="multipart/form-data"> <tr><td><input type='radio' name='TYPE' value='host' checked /></td> <td class='base'>$Lang::tr{'host to net vpn'}</td></tr> - <tr><td align='right' colspan'3'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td></tr> + <tr><td align='center'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td></tr> </form></table> END ; @@ -3009,26 +2537,26 @@ foreach my $dkey (keys %confighash) { $key = &General::findhasharraykey (\%confighash); - foreach my $i (0 .. 38) { $confighash{$key}[$i] = "";} + foreach my $i (0 .. 31) { $confighash{$key}[$i] = "";} $confighash{$key}[0] = 'off'; $confighash{$key}[1] = $n2nname[0]; - $confighash{$key}[2] = $n2nname[0]; + $confighash{$key}[2] = $n2nname[0]; $confighash{$key}[3] = 'net'; $confighash{$key}[4] = 'cert'; $confighash{$key}[6] = 'client'; $confighash{$key}[8] = $n2nlocalsub[2]; - $confighash{$key}[10] = $n2nremote[1]; - $confighash{$key}[11] = "$n2nremsub[1]/$n2nremsub[2]"; + $confighash{$key}[10] = $n2nremote[1]; + $confighash{$key}[11] = "$n2nremsub[1]/$n2nremsub[2]"; $confighash{$key}[22] = $n2nmgmt[2]; - $confighash{$key}[23] = $mssfixactive; + $confighash{$key}[23] = $mssfixactive; $confighash{$key}[24] = $n2nfragment[1]; - $confighash{$key}[25] = 'IPFire n2n Client'; + $confighash{$key}[25] = 'IPFire n2n Client'; $confighash{$key}[26] = 'red'; - $confighash{$key}[27] = "$n2novpnsub[0].$n2novpnsub[1].$n2novpnsub[2].0/255.255.255.0"; - $confighash{$key}[28] = $n2nproto[0]; - $confighash{$key}[29] = $n2nport[1]; - $confighash{$key}[30] = $complzoactive; - $confighash{$key}[31] = $n2ntunmtu[1]; + $confighash{$key}[27] = "$n2novpnsub[0].$n2novpnsub[1].$n2novpnsub[2].0/255.255.255.0"; + $confighash{$key}[28] = $n2nproto[0]; + $confighash{$key}[29] = $n2nport[1]; + $confighash{$key}[30] = $complzoactive; + $confighash{$key}[31] = $n2ntunmtu[1]; &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); @@ -3127,194 +2655,45 @@ if ($confighash{$cgiparams{'KEY'}}) { } elsif (($cgiparams{'ACTION'} eq $Lang::tr{'add'}) || ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) || ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'ADVANCED'} eq '')) { - + &General::readhash("${General::swroot}/ovpn/settings", \%vpnsettings); &General::readhasharray("${General::swroot}/ovpn/caconfig", \%cahash); &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) { - if (! $confighash{$cgiparams{'KEY'}}[0]) { - $errormessage = $Lang::tr{'invalid key'}; - goto VPNCONF_END; - } - $cgiparams{'ENABLED'} = $confighash{$cgiparams{'KEY'}}[0]; - $cgiparams{'NAME'} = $confighash{$cgiparams{'KEY'}}[1]; - $cgiparams{'TYPE'} = $confighash{$cgiparams{'KEY'}}[3]; - $cgiparams{'AUTH'} = $confighash{$cgiparams{'KEY'}}[4]; - $cgiparams{'PSK'} = $confighash{$cgiparams{'KEY'}}[5]; - $cgiparams{'SIDE'} = $confighash{$cgiparams{'KEY'}}[6]; - $cgiparams{'LOCAL_SUBNET'} = $confighash{$cgiparams{'KEY'}}[8]; - $cgiparams{'REMOTE'} = $confighash{$cgiparams{'KEY'}}[10]; - $cgiparams{'REMOTE_SUBNET'} = $confighash{$cgiparams{'KEY'}}[11]; - $cgiparams{'OVPN_MGMT'} = $confighash{$cgiparams{'KEY'}}[22]; - $cgiparams{'MSSFIX'} = $confighash{$cgiparams{'KEY'}}[23]; - $cgiparams{'FRAGMENT'} = $confighash{$cgiparams{'KEY'}}[24]; - $cgiparams{'REMARK'} = $confighash{$cgiparams{'KEY'}}[25]; - $cgiparams{'INTERFACE'} = $confighash{$cgiparams{'KEY'}}[26]; - $cgiparams{'OVPN_SUBNET'} = $confighash{$cgiparams{'KEY'}}[27]; - $cgiparams{'PROTOCOL'} = $confighash{$cgiparams{'KEY'}}[28]; - $cgiparams{'DEST_PORT'} = $confighash{$cgiparams{'KEY'}}[29]; - $cgiparams{'COMPLZO'} = $confighash{$cgiparams{'KEY'}}[30]; - $cgiparams{'MTU'} = $confighash{$cgiparams{'KEY'}}[31]; - $cgiparams{'CHECK1'} = $confighash{$cgiparams{'KEY'}}[32]; - my $name=$cgiparams{'CHECK1'} ; - $cgiparams{$name} = $confighash{$cgiparams{'KEY'}}[33]; - $cgiparams{'RG'} = $confighash{$cgiparams{'KEY'}}[34]; - $cgiparams{'CCD_DNS1'} = $confighash{$cgiparams{'KEY'}}[35]; - $cgiparams{'CCD_DNS2'} = $confighash{$cgiparams{'KEY'}}[36]; - $cgiparams{'CCD_WINS'} = $confighash{$cgiparams{'KEY'}}[37]; - } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) { + if (! $confighash{$cgiparams{'KEY'}}[0]) { + $errormessage = $Lang::tr{'invalid key'}; + goto VPNCONF_END; + } + $cgiparams{'ENABLED'} = $confighash{$cgiparams{'KEY'}}[0]; + $cgiparams{'NAME'} = $confighash{$cgiparams{'KEY'}}[1]; + $cgiparams{'TYPE'} = $confighash{$cgiparams{'KEY'}}[3]; + $cgiparams{'AUTH'} = $confighash{$cgiparams{'KEY'}}[4]; + $cgiparams{'PSK'} = $confighash{$cgiparams{'KEY'}}[5]; + $cgiparams{'SIDE'} = $confighash{$cgiparams{'KEY'}}[6]; + $cgiparams{'LOCAL_SUBNET'} = $confighash{$cgiparams{'KEY'}}[8]; + $cgiparams{'REMOTE'} = $confighash{$cgiparams{'KEY'}}[10]; + $cgiparams{'REMOTE_SUBNET'} = $confighash{$cgiparams{'KEY'}}[11]; +# n2n m.a.d new fields + $cgiparams{'OVPN_MGMT'} = $confighash{$cgiparams{'KEY'}}[22]; + $cgiparams{'MSSFIX'} = $confighash{$cgiparams{'KEY'}}[23]; + $cgiparams{'FRAGMENT'} = $confighash{$cgiparams{'KEY'}}[24]; + $cgiparams{'REMARK'} = $confighash{$cgiparams{'KEY'}}[25]; + $cgiparams{'INTERFACE'} = $confighash{$cgiparams{'KEY'}}[26]; +#new fields + $cgiparams{'OVPN_SUBNET'} = $confighash{$cgiparams{'KEY'}}[27]; + $cgiparams{'PROTOCOL'} = $confighash{$cgiparams{'KEY'}}[28]; + $cgiparams{'DEST_PORT'} = $confighash{$cgiparams{'KEY'}}[29]; + $cgiparams{'COMPLZO'} = $confighash{$cgiparams{'KEY'}}[30]; + $cgiparams{'MTU'} = $confighash{$cgiparams{'KEY'}}[31]; + +#new fields +#ab hiere error uebernehmen + + } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) { $cgiparams{'REMARK'} = &Header::cleanhtml($cgiparams{'REMARK'}); -#A.Marx CCD check iroute field and convert it to decimal - - my @temp=(); - my %ccdroutehash=(); - my $keypoint=0; - if ($cgiparams{'IR'} ne ''){ - @temp = split("\n",$cgiparams{'IR'}); - &General::readhasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); - #find key to use - foreach my $key (keys %ccdroutehash) { - if ($ccdroutehash{$key}[0] eq $cgiparams{'NAME'}) { - $keypoint=$key; - delete $ccdroutehash{$key}; - }else{ - $keypoint = &General::findhasharraykey (\%ccdroutehash); - } - } - $ccdroutehash{$keypoint}[0]=$cgiparams{'NAME'}; - my $i=1; - my $val=0; - foreach $val (@temp){ - chomp($val); - $val=~s/\s*$//g; - my($ip,$cidr) = split(/\//,$val); - $cidr=&General::iporsubtodec($cidr); - - #check if iroute exists in ccdroute - foreach my $key (keys %ccdroutehash) { - foreach my $oldiroute ( 1 .. $#{$ccdroutehash{$key}}){ - if ($ccdroutehash{$key}[$oldiroute] eq "$ip/$cidr") { - $errormessage=$Lang::tr{'ccd err irouteexist'}; - goto VPNCONF_ERROR; - } - } - } - - #check for existing network IP's - if ((&General::IpInSubnet ($ip,$netsettings{GREEN_NETADDRESS},$netsettings{GREEN_NETMASK}) && $netsettings{GREEN_NETADDRESS} ne '0.0.0.0')|| - (&General::IpInSubnet ($ip,$netsettings{RED_NETADDRESS},$netsettings{RED_NETMASK}) && $netsettings{RED_NETADDRESS} ne '0.0.0.0')|| - (&General::IpInSubnet ($ip,$netsettings{BLUE_NETADDRESS},$netsettings{BLUE_NETMASK}) && $netsettings{BLUE_NETADDRESS} ne '0.0.0.0' && $netsettings{BLUE_NETADDRESS} gt '')|| - (&General::IpInSubnet ($ip,$netsettings{ORANGE_NETADDRESS},$netsettings{ORANGE_NETMASK}) && $netsettings{ORANGE_NETADDRESS} ne '0.0.0.0' && $netsettings{ORANGE_NETADDRESS} gt '' )){ - $errormessage="$ip USED FOR SYSTEM!"; - goto VPNCONF_ERROR; - } - - - - if (&General::validipandmask($val)){ - $ccdroutehash{$keypoint}[$i] = $ip."/".$cidr; - }else{ - $errormessage=$errormessage."Route ".$Lang::tr{'ccd invalid'}." ($ip/$cidr)"; - goto VPNCONF_ERROR; - } - $i++; - } - &General::writehasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); - &writeserverconf; - }else{ - &General::readhasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); - foreach my $key (keys %ccdroutehash) { - if ($ccdroutehash{$key}[0] eq $cgiparams{'NAME'}) { - delete $ccdroutehash{$key}; - &General::writehasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); - &writeserverconf; - } - } - } - undef @temp; - #check route field and convert it to decimal - my %ccdroute2hash=(); - my $val=0; - my $i=1; - - &General::readhasharray("${General::swroot}/ovpn/ccdroute2", \%ccdroute2hash); - if($cgiparams{'IFROUTE'} eq $Lang::tr{'ccd none'} || $cgiparams{'IFROUTE'} eq '') { - undef $cgiparams{'IFROUTE'}; - foreach my $key (keys %ccdroute2hash){ - if ($ccdroute2hash{$key}[0] eq $cgiparams{'NAME'}) { - delete $ccdroute2hash{$key}; - } - } - &General::writehasharray("${General::swroot}/ovpn/ccdroute2", \%ccdroute2hash); - }else{ - #find key to use - foreach my $key (keys %ccdroute2hash) { - if ($ccdroute2hash{$key}[0] eq $cgiparams{'NAME'}) { - $keypoint=$key; - delete $ccdroute2hash{$key}; - }else{ - $keypoint = &General::findhasharraykey (\%ccdroute2hash); - &General::writehasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); - &writeserverconf; - } - } - $ccdroute2hash{$keypoint}[0]=$cgiparams{'NAME'}; - @temp = split(/\|/,$cgiparams{'IFROUTE'}); - my %ownnet=(); - &General::readhash("${General::swroot}/ethernet/settings", \%ownnet); - foreach $val (@temp){ - chomp($val); - $val=~s/\s*$//g; - if ($val eq $Lang::tr{'green'}) - { - $val=$ownnet{GREEN_NETADDRESS}."/".$ownnet{GREEN_NETMASK}; - } - if ($val eq $Lang::tr{'blue'}) - { - $val=$ownnet{BLUE_NETADDRESS}."/".$ownnet{BLUE_NETMASK}; - } - if ($val eq $Lang::tr{'orange'}) - { - $val=$ownnet{ORANGE_NETADDRESS}."/".$ownnet{ORANGE_NETMASK}; - } - my ($ip,$cidr) = split (/\//, $val); - if (! &check_routes_push($val)){$errormessage=$errormessage."Route $val ".$Lang::tr{'ccd err routeovpn2'}." ($val)";goto VPNCONF_ERROR;} - if (! &check_ccdroute($val)){$errormessage=$errormessage."<br>Route $val ".$Lang::tr{'ccd err inuse'}." ($val)" ;goto VPNCONF_ERROR;} - if (! &check_ccdconf($val)){$errormessage=$errormessage."<br>Route $val ".$Lang::tr{'ccd err routeovpn'}." ($val)";goto VPNCONF_ERROR;} - if (&General::validipandmask($val)){ - $val=$ip."/".&General::iporsubtodec($cidr); - $ccdroute2hash{$keypoint}[$i] = $val; - }else{ - $errormessage=$errormessage."Route ".$Lang::tr{'ccd invalid'}." ($val)"; - goto VPNCONF_ERROR; - } - $i++; - } - &General::writehasharray("${General::swroot}/ovpn/ccdroute2", \%ccdroute2hash); - } - #check dns1 ip - if ($cgiparams{'CCD_DNS1'} ne '' && ! &General::validip($cgiparams{'CCD_DNS1'})) { - $errormessage=$errormessage."<br>".$Lang::tr{'invalid input for dhcp dns'}." 1"; - goto VPNCONF_ERROR; - } - #check dns2 ip - if ($cgiparams{'CCD_DNS2'} ne '' && ! &General::validip($cgiparams{'CCD_DNS2'})) { - $errormessage=$errormessage."<br>".$Lang::tr{'invalid input for dhcp dns'}." 2"; - goto VPNCONF_ERROR; - } - #check wins ip - if ($cgiparams{'CCD_WINS'} ne '' && ! &General::validip($cgiparams{'CCD_WINS'})) { - $errormessage=$errormessage."<br>".$Lang::tr{'invalid input for dhcp wins'}; - goto VPNCONF_ERROR; - } - - -#CCD End - - - if ($cgiparams{'TYPE'} !~ /^(host|net)$/) { + if ($cgiparams{'TYPE'} !~ /^(host|net)$/) { $errormessage = $Lang::tr{'connection type is invalid'}; if ($cgiparams{'TYPE'} eq 'net') { unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; @@ -3764,119 +3143,45 @@ if ($cgiparams{'TYPE'} eq 'net') { # Save the config my $key = $cgiparams{'KEY'}; - if (! $key) { $key = &General::findhasharraykey (\%confighash); - foreach my $i (0 .. 38) { $confighash{$key}[$i] = "";} + foreach my $i (0 .. 31) { $confighash{$key}[$i] = "";} } - $confighash{$key}[0] = $cgiparams{'ENABLED'}; - $confighash{$key}[1] = $cgiparams{'NAME'}; + $confighash{$key}[0] = $cgiparams{'ENABLED'}; + $confighash{$key}[1] = $cgiparams{'NAME'}; if ((! $cgiparams{'KEY'}) && $cgiparams{'AUTH'} ne 'psk') { - $confighash{$key}[2] = $cgiparams{'CERT_NAME'}; + $confighash{$key}[2] = $cgiparams{'CERT_NAME'}; } - - $confighash{$key}[3] = $cgiparams{'TYPE'}; + $confighash{$key}[3] = $cgiparams{'TYPE'}; if ($cgiparams{'AUTH'} eq 'psk') { - $confighash{$key}[4] = 'psk'; - $confighash{$key}[5] = $cgiparams{'PSK'}; + $confighash{$key}[4] = 'psk'; + $confighash{$key}[5] = $cgiparams{'PSK'}; } else { - $confighash{$key}[4] = 'cert'; + $confighash{$key}[4] = 'cert'; } if ($cgiparams{'TYPE'} eq 'net') { - $confighash{$key}[6] = $cgiparams{'SIDE'}; - $confighash{$key}[11] = $cgiparams{'REMOTE_SUBNET'}; + $confighash{$key}[6] = $cgiparams{'SIDE'}; + $confighash{$key}[11] = $cgiparams{'REMOTE_SUBNET'}; } - $confighash{$key}[8] = $cgiparams{'LOCAL_SUBNET'}; - $confighash{$key}[10] = $cgiparams{'REMOTE'}; + $confighash{$key}[8] = $cgiparams{'LOCAL_SUBNET'}; + $confighash{$key}[10] = $cgiparams{'REMOTE'}; if ($cgiparams{'OVPN_MGMT'} eq '') { - $confighash{$key}[22] = $confighash{$key}[29]; + $confighash{$key}[22] = $confighash{$key}[29]; } else { - $confighash{$key}[22] = $cgiparams{'OVPN_MGMT'}; + $confighash{$key}[22] = $cgiparams{'OVPN_MGMT'}; } - $confighash{$key}[23] = $cgiparams{'MSSFIX'}; - $confighash{$key}[24] = $cgiparams{'FRAGMENT'}; - $confighash{$key}[25] = $cgiparams{'REMARK'}; - $confighash{$key}[26] = $cgiparams{'INTERFACE'}; + $confighash{$key}[23] = $cgiparams{'MSSFIX'}; + $confighash{$key}[24] = $cgiparams{'FRAGMENT'}; + $confighash{$key}[25] = $cgiparams{'REMARK'}; + $confighash{$key}[26] = $cgiparams{'INTERFACE'}; # new fields - $confighash{$key}[27] = $cgiparams{'OVPN_SUBNET'}; - $confighash{$key}[28] = $cgiparams{'PROTOCOL'}; - $confighash{$key}[29] = $cgiparams{'DEST_PORT'}; - $confighash{$key}[30] = $cgiparams{'COMPLZO'}; - $confighash{$key}[31] = $cgiparams{'MTU'}; - $confighash{$key}[32] = $cgiparams{'CHECK1'}; - my $name=$cgiparams{'CHECK1'}; - $confighash{$key}[33] = $cgiparams{$name}; - $confighash{$key}[34] = $cgiparams{'RG'}; - $confighash{$key}[35] = $cgiparams{'CCD_DNS1'}; - $confighash{$key}[36] = $cgiparams{'CCD_DNS2'}; - $confighash{$key}[37] = $cgiparams{'CCD_WINS'}; - - + $confighash{$key}[27] = $cgiparams{'OVPN_SUBNET'}; + $confighash{$key}[28] = $cgiparams{'PROTOCOL'}; + $confighash{$key}[29] = $cgiparams{'DEST_PORT'}; + $confighash{$key}[30] = $cgiparams{'COMPLZO'}; + $confighash{$key}[31] = $cgiparams{'MTU'}; +# new fileds &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); - - if ($cgiparams{'CHECK1'} ){ - - my ($ccdip,$ccdsub)=split "/",$cgiparams{$name}; - my ($a,$b,$c,$d) = split (/\./,$ccdip); - if ( -e "${General::swroot}/ovpn/ccd/$confighash{$key}[2]"){unlink "${General::swroot}/ovpn/ccd/$cgiparams{'CERT_NAME'}";} - open ( CCDRWCONF,'>',"${General::swroot}/ovpn/ccd/$confighash{$key}[2]") or die "Unable to create clientconfigfile $!"; - print CCDRWCONF "# OpenVPN Clientconfig from CCD extension by Copymaster#\n\n"; - if($cgiparams{'CHECK1'} eq 'dynamic'){ - print CCDRWCONF "#This client uses the dynamic pool\n"; - }else{ - print CCDRWCONF "#Ip address client and Server\n"; - print CCDRWCONF "ifconfig-push $ccdip ".&General::getlastip($ccdip,1)."\n"; - } - if ($confighash{$key}[34] eq 'on'){ - print CCDRWCONF "\n#Redirect Gateway: \n#All IP traffic is redirected through the vpn \n"; - print CCDRWCONF "push redirect-gateway\n"; - } - if ($cgiparams{'IR'} ne ''){ - print CCDRWCONF "\n#Client routes these Networks (behind Client)\n"; - foreach my $key (keys %ccdroutehash){ - if ($ccdroutehash{$key}[0] eq $cgiparams{'NAME'}){ - foreach my $i ( 1 .. $#{$ccdroutehash{$key}}){ - my ($a,$b)=split (/\//,$ccdroutehash{$key}[$i]); - print CCDRWCONF "iroute $a $b\n"; - } - } - } - } - if ($cgiparams{'IFROUTE'} ne ''){ - print CCDRWCONF "\n#Client gets routes to these Networks (behind IPFIRE)\n"; - foreach my $key (keys %ccdroute2hash){ - if ($ccdroute2hash{$key}[0] eq $cgiparams{'NAME'}){ - foreach my $i ( 1 .. $#{$ccdroute2hash{$key}}){ - if($ccdroute2hash{$key}[$i] eq $Lang::tr{'blue'}){ - my %blue=(); - &General::readhash("${General::swroot}/ethernet/settings", \%blue); - print CCDRWCONF "push \"route $blue{BLUE_ADDRESS} $blue{BLUE_NETMASK}\n"; - }elsif($ccdroute2hash{$key}[$i] eq $Lang::tr{'orange'}){ - my %orange=(); - &General::readhash("${General::swroot}/ethernet/settings", \%orange); - print CCDRWCONF "push \"route $orange{ORANGE_ADDRESS} $orange{ORANGE_NETMASK}\n"; - }else{ - my ($a,$b)=split (/\//,$ccdroute2hash{$key}[$i]); - print CCDRWCONF "push \"route $a $b\"\n"; - } - } - } - } - } - if(($cgiparams{'CCD_DNS1'} eq '') && ($cgiparams{'CCD_DNS1'} ne '')){ $cgiparams{'CCD_DNS1'} = $cgiparams{'CCD_DNS2'};$cgiparams{'CCD_DNS2'}='';} - if($cgiparams{'CCD_DNS1'} ne ''){ - print CCDRWCONF "\n#Client gets these Nameservers\n"; - print CCDRWCONF "push \"dhcp-option DNS $cgiparams{'CCD_DNS1'}\" \n"; - } - if($cgiparams{'CCD_DNS2'} ne ''){ - print CCDRWCONF "push \"dhcp-option DNS $cgiparams{'CCD_DNS2'}\" \n"; - } - if($cgiparams{'CCD_WINS'} ne ''){ - print CCDRWCONF "\n#Client gets this WINS server\n"; - print CCDRWCONF "push \"dhcp-option WINS $cgiparams{'CCD_WINS'}\" \n"; - } - close CCDRWCONF; - } ### # m.a.d n2n begin @@ -4003,17 +3308,12 @@ if ($cgiparams{'TYPE'} eq 'net') { } &Header::openbox('100%', 'LEFT', "$Lang::tr{'connection'}:"); - print "<table width='100%' border='0'>\n"; - - - - print "<tr><td width='14%' class='boldbase'>$Lang::tr{'name'}: </td>"; - + print "<table width='100%'>\n"; + print "<tr><td width='25%' class='boldbase'>$Lang::tr{'name'}:</td>"; if ($cgiparams{'TYPE'} eq 'host') { if ($cgiparams{'KEY'}) { - print "<td width='35%' class='base'><input type='hidden' name='NAME' value='$cgiparams{'NAME'}' />$cgiparams{'NAME'}</td>"; + print "<td width='35%' class='base'><input type='hidden' name='NAME' value='$cgiparams{'NAME'}' />$cgiparams{'NAME'}</td>\n"; } else { - print "<td width='35%'><input type='text' name='NAME' value='$cgiparams{'NAME'}' maxlength='20' size='30' /></td>"; } # print "<tr><td>$Lang::tr{'interface'}</td>"; @@ -4033,9 +3333,6 @@ if ($cgiparams{'TYPE'} eq 'net') { } else { print "<td width='25%'><input type='text' name='NAME' value='$cgiparams{'NAME'}' maxlength='20' /></td>"; } - - - print <<END <td width='25%'> </td> <td width='25%'> </td></tr> @@ -4077,64 +3374,46 @@ if ($cgiparams{'TYPE'} eq 'net') { <td colspan='2'>$Lang::tr{'openvpn default'}: <span class="base">$Lang::tr{'destination port'}</span></td> END -; + ; } print "<tr><td class='boldbase'>$Lang::tr{'remark title'} <img src='/blob.gif' /></td>"; - print "<td colspan='3'><input type='text' name='REMARK' value='$cgiparams{'REMARK'}' size='55' maxlength='50' /></td></tr></table>"; + print "<td colspan='3'><input type='text' name='REMARK' value='$cgiparams{'REMARK'}' size='55' maxlength='50' /></td></tr>"; if ($cgiparams{'TYPE'} eq 'host') { - print "<tr><td>$Lang::tr{'enabled'} <input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td>"; - } - print"</tr></table><br><br>"; -#A.Marx CCD new client + print "<tr><td>$Lang::tr{'enabled'} <input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td>\n"; + } + +# if ($cgiparams{'KEY'}) { +# print "<td colspan='3'> </td></tr></table>"; +# } else { +# print "<td colspan='3'><input type='checkbox' name='EDIT_ADVANCED' $checked{'EDIT_ADVANCED'}{'on'} /> $Lang::tr{'edit advanced settings when done'}</tr></table>"; +# } +# }else{ + print "<td colspan='3'> </td></tr></table>"; +# } + - print "<table border='0' width='100%' cellspacing='1' cellpadding='0'><tr><td colspan='3'><hr><br><b>$Lang::tr{'ccd choose net'}</td></tr><tr><td height='20' colspan='3'></td></tr>"; - my %ccdconfhash=(); - my %ccdroutehash=(); - my %ccdroute2hash=(); - my %vpnnet=(); - my $vpnip; - &General::readhash("${General::swroot}/ovpn/settings", \%vpnnet); - $vpnip=$vpnnet{'DOVPN_SUBNET'}; - &General::readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); - my @ccdconf=(); - my $count=0; - my $checked; - $checked{'check1'}{'off'} = ''; - $checked{'check1'}{'on'} = ''; - $checked{'check1'}{$cgiparams{'CHECK1'}} = 'CHECKED'; - print"<tr><td align='center' width='1%' valign='top'><input type='radio' name='CHECK1' value='dynamic' checked /></td><td align='left' valign='top' width='35%'>$Lang::tr{'ccd dynrange'} ($vpnip)</td><td width='30%'>"; - print"</td></tr></table><br><br>"; - my $name=$cgiparams{'CHECK1'}; - $checked{'RG'}{$cgiparams{'RG'}} = 'CHECKED'; - - if (! -z "${General::swroot}/ovpn/ccd.conf"){ - print"<table border='0' width='100%' cellspacing='1' cellpadding='0'><tr><td width='1%'></td><td width='30%' class='boldbase' align='center'><b>$Lang::tr{'ccd name'}</td><td width='15%' class='boldbase' align='center'><b>$Lang::tr{'network'}</td><td class='boldbase' align='center' width='18%'><b>$Lang::tr{'ccd clientip'}</td></tr>"; - foreach my $key (keys %ccdconfhash) { - $count++; - @ccdconf=($ccdconfhash{$key}[0],$ccdconfhash{$key}[1]); - if ($count % 2){print"<tr bgcolor='$color{'color22'}'>";}else{print"<tr bgcolor='$color{'color20'}'>";} - print"<td align='center' width='1%'><input type='radio' name='CHECK1' value='$ccdconf[0]' $checked{'check1'}{$ccdconf[0]}/></td><td>$ccdconf[0]</td><td width='40%' align='center'>$ccdconf[1]</td><td align='left' width='10%'>"; - &fillselectbox($ccdconf[1],$ccdconf[0],$cgiparams{$name}); - print"</td></tr>"; - } - print "</table><br><br><hr><br><br>"; - } -# ccd end + &Header::closebox(); + if ($cgiparams{'KEY'} && $cgiparams{'AUTH'} eq 'psk') { - - } elsif (! $cgiparams{'KEY'}) { - - + # &Header::openbox('100%', 'LEFT', $Lang::tr{'authentication'}); + # print <<END + # <table width='100%' cellpadding='0' cellspacing='5' border='0'> + # <tr><td class='base' width='50%'>$Lang::tr{'use a pre-shared key'}</td> + # <td class='base' width='50%'><input type='text' name='PSK' size='30' value='$cgiparams{'PSK'}' /></td></tr> + # </table> +END + # ; + # &Header::closebox(); + } elsif (! $cgiparams{'KEY'}) { my $disabled=''; my $cakeydisabled=''; my $cacrtdisabled=''; if ( ! -f "${General::swroot}/ovpn/ca/cakey.pem" ) { $cakeydisabled = "disabled='disabled'" } else { $cakeydisabled = "" }; if ( ! -f "${General::swroot}/ovpn/ca/cacert.pem" ) { $cacrtdisabled = "disabled='disabled'" } else { $cacrtdisabled = "" }; - &Header::openbox('100%', 'LEFT', $Lang::tr{'authentication'}); @@ -4231,96 +3510,8 @@ END ### ; &Header::closebox(); - - } - print"<br><br>"; - &Header::openbox('100%', 'LEFT', "$Lang::tr{'ccd client options'}:"); - -#A.Marx CCD new client - - print <<END; - <table border='0' width='100%'> - <tr><td width='20%'>Redirect Gateway:</td><td colspan='3'><input type='checkbox' name='RG' $checked{'RG'}{'on'} /></td></tr> - <tr><td colspan='4'><b><br>$Lang::tr{'ccd routes'}</b></td></tr> - <tr><td colspan='4'>&nbsp</td></tr> - <tr><td valign='top'>$Lang::tr{'ccd iroute'}</td><td align='left' width='30%'><textarea name='IR' cols='26' rows='6' wrap='off'> -END - - if ($cgiparams{'IR'} ne ''){ - print $cgiparams{'IR'}; - }else{ - &General::readhasharray ("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); - foreach my $key (keys %ccdroutehash) { - if( $cgiparams{'NAME'} eq $ccdroutehash{$key}[0]){ - foreach my $i (1 .. $#{$ccdroutehash{$key}}) { - if ($ccdroutehash{$key}[$i] ne ''){ - print $ccdroutehash{$key}[$i]."\n"; - } - $cgiparams{'IR'} .= $ccdroutehash{$key}[$i]; - } - } - } } - - print <<END; -</textarea></td><td valign='top' colspan='2'>$Lang::tr{'ccd iroutehint'}</td></tr> - <tr><td colspan='4'><br></td></tr> - <tr><td valign='top' rowspan='3'>$Lang::tr{'ccd iroute2'}</td><td align='left' valign='top' rowspan='3'><select name='IFROUTE' style="width: 205px"; size='6' multiple> -END - our @current = (); - open(FILE, "${General::swroot}/main/routing") ; - @current = <FILE>; - close (FILE); - &General::readhasharray ("${General::swroot}/ovpn/ccdroute2", \%ccdroute2hash); - my $set=0; - my $selorange=0; - my $selblue=0; - my $helpblue=0; - my $helporange=0; - print"<option>$Lang::tr{'ccd none'}</option>"; - print"<option selected>$Lang::tr{'green'}</option>"; - - foreach my $line (@current) { - chomp($line); # remove newline - my @temp=split(/\,/,$line); - $temp[1] = '' unless defined $temp[1]; # not always populated - my ($a,$b) = split(/\//,$temp[1]); - $temp[1] = $a."/".&General::iporsubtocidr($b); - foreach my $key (keys %ccdroute2hash) { - if($ccdroute2hash{$key}[0] eq $cgiparams{'NAME'}){ - foreach my $i (1 .. $#{$ccdroute2hash{$key}}) { - - if($ccdroute2hash{$key}[$i] eq $a."/".&General::iporsubtodec($b)){ - $set=1; - } - if (&haveBlueNet()){ - if($netsettings{'BLUE_NETADDRESS'}."/".&General::iporsubtodec($netsettings{'BLUE_NETMASK'} eq $ccdroute2hash{$key}[$i])) { - $selblue=1; - - } - } - if (&haveOrangeNet()){ - if($netsettings{'ORANGE_NETADDRESS'}."/".&General::iporsubtodec($netsettings{'ORANGE_NETMASK'}) eq $ccdroute2hash{$key}[$i]) { - $selorange=1; - } - } - } - } - } - if ($set == '1'){ print"<option selected>$temp[1]</option>";$set=0;}else{print"<option>$temp[1]</option>";} - if (&haveBlueNet() && $selblue == '1'){ print"<option selected>$Lang::tr{'blue'}</option>";$selblue=0;}elsif(&haveBlueNet() && $selblue == '0'){print"<option>$Lang::tr{'blue'}</option>";} - if (&haveOrangeNet() && $selorange == '1'){ print"<option selected>$Lang::tr{'orange'}</option>";$selorange=0;}elsif(&haveOrangeNet() && $selorange == '0'){print"<option>$Lang::tr{'orange'}</option>";} - } - print<<END - </select></td><td valign='top'>DNS1:</td><td valign='top'><input type='TEXT' name='CCD_DNS1' value='$cgiparams{'CCD_DNS1'}' size='30' /></td></tr> - <tr valign='top'><td>DNS2:</td><td><input type='TEXT' name='CCD_DNS2' value='$cgiparams{'CCD_DNS2'}' size='30' /></td></tr> - <tr valign='top'><td valign='top'>WINS:</td><td><input type='TEXT' name='CCD_WINS' value='$cgiparams{'CCD_WINS'}' size='30' /></td></tr></table><br><hr> - -END -; - &Header::closebox(); - print "<div align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' />"; if ($cgiparams{'KEY'}) { # print "<input type='submit' name='ACTION' value='$Lang::tr{'advanced'}' />"; @@ -4347,21 +3538,24 @@ END my @status = `/bin/cat /var/log/ovpnserver.log`; if ($cgiparams{'VPN_IP'} eq '' && -e "${General::swroot}/red/active") { - if (open(IPADDR, "${General::swroot}/red/local-ipaddress")) { - my $ipaddr = <IPADDR>; - close IPADDR; - chomp ($ipaddr); - $cgiparams{'VPN_IP'} = (gethostbyaddr(pack("C4", split(/\./, $ipaddr)), 2))[0]; - if ($cgiparams{'VPN_IP'} eq '') { - $cgiparams{'VPN_IP'} = $ipaddr; - } - } + if (open(IPADDR, "${General::swroot}/red/local-ipaddress")) { + my $ipaddr = <IPADDR>; + close IPADDR; + chomp ($ipaddr); + $cgiparams{'VPN_IP'} = (gethostbyaddr(pack("C4", split(/\./, $ipaddr)), 2))[0]; + if ($cgiparams{'VPN_IP'} eq '') { + $cgiparams{'VPN_IP'} = $ipaddr; + } + } } #default setzen if ($cgiparams{'DCIPHER'} eq '') { $cgiparams{'DCIPHER'} = 'BF-CBC'; } +# if ($cgiparams{'DCOMPLZO'} eq '') { +# $cgiparams{'DCOMPLZO'} = 'on'; +# } if ($cgiparams{'DDEST_PORT'} eq '') { $cgiparams{'DDEST_PORT'} = '1194'; } @@ -4371,7 +3565,8 @@ END if ($cgiparams{'DOVPN_SUBNET'} eq '') { $cgiparams{'DOVPN_SUBNET'} = '10.' . int(rand(256)) . '.' . int(rand(256)) . '.0/255.255.255.0'; } - $checked{'ENABLED'}{'off'} = ''; + + $checked{'ENABLED'}{'off'} = ''; $checked{'ENABLED'}{'on'} = ''; $checked{'ENABLED'}{$cgiparams{'ENABLED'}} = 'CHECKED'; $checked{'ENABLED_BLUE'}{'off'} = ''; @@ -4431,8 +3626,8 @@ END $activeonrun = "disabled='disabled'"; } &Header::openbox('100%', 'LEFT', $Lang::tr{'global settings'}); - print <<END - <table width='100%' border=0> + print <<END + <table width='100%'> <form method='post'> <td width='25%'> </td> <td width='25%'> </td> @@ -4440,7 +3635,7 @@ END <tr><td class='boldbase'>$Lang::tr{'ovpn server status'}</td> <td align='left'>$sactive</td> <tr><td class='boldbase'>$Lang::tr{'ovpn on red'}</td> - <td><input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td> + <td><input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td> END ; if (&haveBlueNet()) { @@ -4479,20 +3674,18 @@ END <option value='CAST5-CBC' $selected{'DCIPHER'}{'CAST5-CBC'}>CAST5-CBC</option> <option value='AES-128-CBC' $selected{'DCIPHER'}{'AES-128-CBC'}>AES-128-CBC</option> <option value='AES-192-CBC' $selected{'DCIPHER'}{'AES-192-CBC'}>AES-192-CBC</option> - <option value='AES-256-CBC' $selected{'DCIPHER'}{'AES-256-CBC'}>AES-256-CBC</option></select></td></tr> - <tr><td colspan='4'><hr /></td></tr> + <option value='AES-256-CBC' $selected{'DCIPHER'}{'AES-256-CBC'}>AES-256-CBC</option></select></td> END ; if ( $srunning eq "yes" ) { - print "<tr><td align='right' colspan='4'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' disabled='disabled' />"; - print "<input type='submit' name='ACTION' value='$Lang::tr{'ccd net'}' />"; - print "<input type='submit' name='ACTION' value='$Lang::tr{'advanced server'}' />"; - print "<input type='submit' name='ACTION' value='$Lang::tr{'stop ovpn server'}' /></td></tr>"; + print "<tr><td align='left'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' disabled='disabled' /></td>"; + print "<td><input type='submit' name='ACTION' value='$Lang::tr{'advanced server'}' disabled='disabled'/></td>"; + print "<td><input type='submit' name='ACTION' value='$Lang::tr{'stop ovpn server'}' /></td>"; + print "<td><input type='submit' name='ACTION' value='$Lang::tr{'restart ovpn server'}' /></td></tr>"; } else{ - print "<tr><td align='right' colspan='4'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' />"; - print "<input type='submit' name='ACTION' value='$Lang::tr{'ccd net'}' />"; - print "<input type='submit' name='ACTION' value='$Lang::tr{'advanced server'}' />"; + print "<tr><td align='left'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>"; + print "<td><input type='submit' name='ACTION' value='$Lang::tr{'advanced server'}' /></td>"; if (( -e "${General::swroot}/ovpn/ca/cacert.pem" && -e "${General::swroot}/ovpn/ca/dh1024.pem" && -e "${General::swroot}/ovpn/certs/servercert.pem" && @@ -4500,9 +3693,11 @@ END (( $cgiparams{'ENABLED'} eq 'on') || ( $cgiparams{'ENABLED_BLUE'} eq 'on') || ( $cgiparams{'ENABLED_ORANGE'} eq 'on'))){ - print "<input type='submit' name='ACTION' value='$Lang::tr{'start ovpn server'}' /></td></tr>"; + print "<td><input type='submit' name='ACTION' value='$Lang::tr{'start ovpn server'}' /></td>"; + print "<td><input type='submit' name='ACTION' value='$Lang::tr{'restart ovpn server'}' /></td></tr>"; } else { - print "<input type='submit' name='ACTION' value='$Lang::tr{'start ovpn server'}' disabled='disabled' /></td></tr>"; + print "<td><input type='submit' name='ACTION' value='$Lang::tr{'start ovpn server'}' disabled='disabled' /></td>"; + print "<td><input type='submit' name='ACTION' value='$Lang::tr{'restart ovpn server'}' disabled='disabled' /></td></tr>"; } } print "</form></table>"; @@ -4634,19 +3829,18 @@ END </tr> </table> END -; + ; } - -print <<END -<form method='post' enctype='multipart/form-data'> -<table width='100%' border='0'> -<tr><td class='base' nowrap='nowrap'>$Lang::tr{'ca name'}:</td><td nowrap='nowrap' width='8%'><input type='text' name='CA_NAME' value='$cgiparams{'CA_NAME'}' size='15' align='left'/></td><td nowrap='nowrap' align='right'><input type='file' name='FH' size='25' /><input type='submit' name='ACTION' value='$Lang::tr{'upload ca certificate'}' /></td></tr> -<tr><td colspan='4'><hr /></td></tr> -<tr align='right'><td colspan='4' align='right' width='80%'><input type='submit' name='ACTION' value='$Lang::tr{'show crl'}' /></td></tr> -</table> + print <<END + <form method='post' enctype='multipart/form-data'> + <table width='100%' border='0' cellspacing='1' cellpadding='0'> + <tr><td class='base' nowrap='nowrap'>$Lang::tr{'ca name'}:</td> + <td nowrap='nowrap'><input type='text' name='CA_NAME' value='$cgiparams{'CA_NAME'}' size='15' /> + <td nowrap='nowrap'><input type='file' name='FH' size='30' /></td> + <td nowrap='nowrap'><input type='submit' name='ACTION' value='$Lang::tr{'upload ca certificate'}' /><br /><input type='submit' name='ACTION' value='$Lang::tr{'show crl'}' /></td> + </tr></table></form> END -; - + ; &Header::closebox(); if ( $srunning eq "yes" ) { @@ -4669,7 +3863,8 @@ END <tr> <td width='10%' class='boldbase' align='center'><b>$Lang::tr{'name'}</b></td> <td width='15%' class='boldbase' align='center'><b>$Lang::tr{'type'}</b></td> - <td width='22%' class='boldbase' align='center'><b>$Lang::tr{'network'}</b></td> + <td width='18%' class='boldbase' align='center'><b>$Lang::tr{'common name'}</b></td> + <td width='22%' class='boldbase' align='center'><b>$Lang::tr{'valid till'}</b></td> <td width='20%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b></td> <td width='10%' class='boldbase' align='center'><b>$Lang::tr{'status'}</b></td> <td width='5%' class='boldbase' colspan='6' align='center'><b>$Lang::tr{'action'}</b></td> @@ -4688,17 +3883,15 @@ END } print "<td align='center' nowrap='nowrap'>$confighash{$key}[1]</td>"; print "<td align='center' nowrap='nowrap'>" . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")</td>"; - #if ($confighash{$key}[4] eq 'cert') { - #print "<td align='left' nowrap='nowrap'>$confighash{$key}[2]</td>"; - #} else { - #print "<td align='left'> </td>"; - #} + if ($confighash{$key}[4] eq 'cert') { + print "<td align='left' nowrap='nowrap'>$confighash{$key}[2]</td>"; + } else { + print "<td align='left'> </td>"; + } my $cavalid = `/usr/bin/openssl x509 -text -in ${General::swroot}/ovpn/certs/$confighash{$key}[1]cert.pem`; $cavalid =~ /Not After : (.*)[\n]/; $cavalid = $1; - if ($confighash{$key}[32] eq "" && $confighash{$key}[3] eq 'net' ){$confighash{$key}[32]="net-2-net";} - if ($confighash{$key}[32] eq "" && $confighash{$key}[3] eq 'host' ){$confighash{$key}[32]="dynamic";} - print "<td align='center'>$confighash{$key}[32]</td>"; + print "<td align='center'>$cavalid</td>"; print "<td align='center'>$confighash{$key}[25]</td>"; my $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>"; @@ -4836,7 +4029,7 @@ END # If the config file contains entries, print Key to action icons if ( $id ) { print <<END - <table border='0'> + <table> <tr> <td class='boldbase'>  <b>$Lang::tr{'legend'}:</b></td> <td>  <img src='/images/on.gif' alt='$Lang::tr{'click to disable'}' /></td> @@ -4857,7 +4050,7 @@ END <td> <img src='/images/openvpn.png' alt='?RELOAD'/></td> <td class='base'>$Lang::tr{'dl client arch'}</td> </tr> - </table><hr> + </table> END ; } @@ -4865,8 +4058,8 @@ END print <<END <table width='100%'> <form method='post'> - <tr><td align='right'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /> - <input type='submit' name='ACTION' value='$Lang::tr{'ovpn con stat'}' $activeonrun /></td></tr> + <tr><td width='50%' ><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td> + <td width='50%' ><input type='submit' name='ACTION' value='$Lang::tr{'ovpn con stat'}' $activeonrun /></td></tr> </form> </table> END diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index cb29cf1..f686c30 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -351,7 +351,6 @@ 'arp table entries' => 'Einträge der ARP-Tabelle:', 'artist' => 'Künstler', 'attemps' => 'Versuche', -'attention' => 'ACHTUNG', 'august' => 'August', 'authentication' => 'Authentifizierung:', 'automatic' => 'Automatisch', @@ -456,42 +455,6 @@ 'capsopen' => 'VERBUNDEN', 'capswarning' => 'WARNUNG', 'caption' => 'Legende', -'ccd add' => 'Netzwerk hinzufügen', -'ccd choose net' => 'Netzwerk auswählen', -'ccd client options' => 'Erweiterte Client-Optionen', -'ccd clientip' => 'Hostadresse', -'ccd dynrange' => 'Dynamischer OpenVPN IP-Addressen-Pool', -'ccd err blue' => 'Das ist das BLAUE Subnetz.', -'ccd err green' => 'Das ist das GRÜNE Subnetz.', -'ccd err hostinnet' => 'Das Netzwerk kann nicht gelöscht werden, da sich in ihm noch Clients befinden.', -'ccd err inuse' => 'Wird bereits von einem anderen Client genutzt.', -'ccd err invalidname' => 'Ungültiger Name. Erlaubte Zeichen: A-Z, a-z, Bindestrich und Leerzeichen.', -'ccd err invalidnet' => 'Ungültige IP-Addresse. Format: 192.168.0.0/24 oder 192.168.0.0/255.255.255.0.', -'ccd err iroute' => 'Netzadresse für Route ungültig.', -'ccd err irouteexist' => 'Diese Route wird bereits verwendet.', -'ccd err isovpnnet' => 'Subnetzadresse wird für bereits für den OpenVPN-Server verwendet!', -'ccd err issubnet' => 'Subnetzadresse wird bereits verwendet.', -'ccd err name' => 'Es muss ein Name angegeben werden.', -'ccd err nameexist' => 'Name existiert bereits.', -'ccd err netadr' => 'Subnetzadresse ist ungültig oder Bereich zu groß.', -'ccd err netadrexist' => 'Netwerk existiert bereits.', -'ccd err orange' => 'Das ist das ORANGE Subnetz.', -'ccd err red' => 'Das ist das ROTE Subnetz.', -'ccd err routeovpn' => 'Wird vom OpenVPN-Server genutzt.', -'ccd err routeovpn2' => 'Wird bereits vom OpenVPN-Server verteilt.', -'ccd hint' => 'Auf dieser Seite können statische Netzwerke definiert werden, von denen Roadwarrior-Clients feste Adressen zugewiesen bekommen können.', -'ccd invalid' => 'ist ungültig.', -'ccd iroute' => 'IPFire hat Zugriff auf diese Netzwerke auf Clientseite: ', -'ccd iroute2' => 'Client hat Zugriff auf diese Netzwerke auf IPFire-Seite: ', -'ccd iroutehint' => 'Achtung! Wenn Sie diese Einstellungen ändern, muss der OpenVPN Server neu gestartet werden!', -'ccd maxclients' => 'Mögliche Adressen', -'ccd modify' => 'Netzwerk ändern', -'ccd name' => 'Name', -'ccd net' => 'Statische IP-Adressen-Pools', -'ccd none' => 'Keine', -'ccd routes' => 'Routen:', -'ccd subnet' => 'Subnetz', -'ccd used' => 'Genutzte Adressen', 'cert' => 'Zertifikat', 'certificate' => 'Zertifikat', 'certificate authorities' => 'Zertifizierungsstellen (CAs)', @@ -1605,7 +1568,6 @@ 'september' => 'September', 'serial' => 'serielle', 'server reserved' => 'The connection name server is reserved and not allowed', -'server restart' => 'Wenn hier etwas geändert wird, muss der openVPN Server neu gestartet werden, damit die Einstellungen übernommen werden!', 'server string' => 'Server String', 'service' => 'Dienst', 'service added' => 'Benutzerdefinierter Netzwerkdienst wurde hinzugefügt', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index d92fadc..5fe2391 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -353,7 +353,6 @@ 'arp table entries' => 'ARP Table Entries:', 'artist' => 'Artist', 'attemps' => 'Attempts', -'attention' => 'ATTENTION', 'august' => 'August', 'authentication' => 'Authentication:', 'automatic' => 'Automatic', @@ -475,41 +474,6 @@ 'capsopen' => 'CONNECTED', 'capswarning' => 'WARNING', 'caption' => 'Caption', -'ccd add' => 'Add network', -'ccd choose net' => 'Choose network', -'ccd client options' => 'Advanced client options', -'ccd clientip' => 'Host address', -'ccd dynrange' => 'Dynamic OpenVPN IP address pool', -'ccd err blue' => 'This is the BLUE subnet.', -'ccd err green' => 'This is the GREEN subnet.', -'ccd err hostinnet' => 'You are not able to delete this network, while it still contains clients.', -'ccd err inuse' => 'Already used by another client.', -'ccd err invalidname' => 'Invalid name. Allowed characters are A-Z, a-z, dash and space.', -'ccd err invalidnet' => 'Invalid IP address. Format: 192.168.0.0/24 or 192.168.0.0/255.255.255.0.', -'ccd err iroute' => 'Network address for route is invalid.', -'ccd err irouteexist' => 'This route is already in use.', -'ccd err isovpnnet' => 'Subnet address already in use for OpenVPN Server.', -'ccd err issubnet' => 'Subnet address already in use.', -'ccd err name' => 'Please choose a name.', -'ccd err nameexist' => 'Name already exists.', -'ccd err netadr' => 'Subnet address is invalid or range is too large.', -'ccd err netadrexist' => 'Network already exists.', -'ccd err orange' => 'This is the ORANGE subnet.', -'ccd err red' => 'This is the RED subnet.', -'ccd err routeovpn' => 'Already used by OpenVPN server.', -'ccd err routeovpn2' => 'Already pushed from OpenVPN server.', -'ccd hint' => 'On this page you are able to define static networks from which the roadwarrior clients can get fixed IP address assignments.', -'ccd invalid' => 'Invalid.', -'ccd iroute' => 'IPFire has access to these networks on the client\'s site', -'ccd iroute2' => 'Client has access to these networks on IPFire\'s site', -'ccd iroutehint' => 'Attention! If you change these settings, you have to restart the OpenVPN server that the changes take effect!', -'ccd modify' => 'Change network', -'ccd name' => 'Name', -'ccd net' => 'Static IP address pools', -'ccd none' => 'None', -'ccd routes' => 'Routing:', -'ccd subnet' => 'Subnet', -'ccd used' => 'Used addresses', 'cert' => 'Certificate', 'certificate' => 'Certificate', 'certificate authorities' => 'Certificate Authorities', @@ -931,7 +895,7 @@ 'gpl unofficial translation of the general public license v3' => 'Unofficial translation of the General Public License v3', 'graph' => 'Graph', 'graph per' => 'per', -'green' => 'GREEN', +'green' => 'Green', 'green interface' => 'Green Interface', 'guaranteed bandwith' => 'Guaranteed bandwith', 'guardian alertfile' => 'Alertfile', @@ -1634,7 +1598,6 @@ 'september' => 'September', 'serial' => 'Serial', 'server reserved' => 'The connection name server is reserved and not allowed', -'server restart' => 'If you change these settings you have to restart the OpenVPN server for the changes to take effect!', 'server string' => 'Server String', 'service' => 'Service', 'service added' => 'Custom network service added', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 34096f965125067b262f04b4e25183533c95367c
by git＠ipfire.org 16 Nov '12

16 Nov '12

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 34096f965125067b262f04b4e25183533c95367c (commit) from ce819132f353a4ae2103fa752ffddb3fae6f01a1 (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 34096f965125067b262f04b4e25183533c95367c Author: Alexander Marx <amarx(a)ipfire.org> Date: Fri Nov 16 17:02:15 2012 +0100 OpenVPN: Add CCD configuration GUI. ----------------------------------------------------------------------- Summary of changes: config/cfgroot/general-functions.pl | 204 ++++- config/wpa_supplicant/wpa_supplicant_conf.sh | 114 +++ config/wpa_supplicant/wpa_supplicant_settings | 6 + doc/language_issues.de | 3 + doc/language_issues.en | 2 + doc/language_issues.es | 39 + doc/language_issues.fr | 35 + doc/language_issues.pl | 39 + doc/language_issues.ru | 35 + doc/language_missings | 161 ++++ html/cgi-bin/ovpnmain.cgi | 1219 ++++++++++++++++++++----- langs/de/cgi-bin/de.pl | 38 + langs/en/cgi-bin/en.pl | 39 +- 13 files changed, 1705 insertions(+), 229 deletions(-) create mode 100644 config/wpa_supplicant/wpa_supplicant_conf.sh create mode 100644 config/wpa_supplicant/wpa_supplicant_settings mode change 100644 => 100755 html/cgi-bin/ovpnmain.cgi Difference in files: diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 567f2e1..c6a6a7c 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -18,8 +18,7 @@ use strict; use Socket; use IO::Socket; use Net::SSLeay; -use Net::IPv4Addr; - +use Net::IPv4Addr qw(:all); $|=1; # line buffering $General::version = 'VERSION'; @@ -212,19 +211,175 @@ sub validipormask return &validmask($mask); } -sub validipandmask +sub subtocidr { - my $ipandmask = $_[0]; + #gets: Subnet in decimal (255.255.255.0) + #Gives: 24 (The cidr of network) + my ($byte1, $byte2, $byte3, $byte4) = split(/\./, $_[0].".0.0.0.0"); + my $num = ($byte1 * 16777216) + ($byte2 * 65536) + ($byte3 * 256) + $byte4; + my $bin = unpack("B*", pack("N", $num)); + my $count = ($bin =~ tr/1/1/); + return $count; +} - # split it into number and mask. - if (!($ipandmask =~ /^(.*?)\/(.*?)$/)) { - return 0; } - my $ip = $1; - my $mask = $2; - # first part not a ip? - if (!(&validip($ip))) { - return 0; } - return &validmask($mask); +sub cidrtosub +{ + #gets: Cidr of network (20-30 for ccd) + #Konverts 30 to 255.255.255.252 e.g + my $cidr=$_[0]; + my $netmask = &Net::IPv4Addr::ipv4_cidr2msk($cidr); + return "$netmask"; +} + +sub iporsubtodec +{ + #Gets: Ip address or subnetmask in decimal oder CIDR + #Gives: What it gets only in CIDR format + my $subnet=$_[0]; + my $net; + my $mask; + my $full=0; + if ($subnet =~ /^(.*?)\/(.*?)$/) { + ($net,$mask) = split (/\//,$subnet); + $full=1; + return "$subnet"; + }else{ + $mask=$subnet; + } + #Subnet already in decimal and valid? + if ($mask=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/ &&(($1<=255 && $2<=$1 && $3<=$2 && $4<=$3 ))) { + for (my $i=8;$i<=32;$i++){ + if (&General::cidrtosub($i) eq $mask){ + if ($full == 0){return $mask;}else{ + return $net."/".$mask; + } + } + } + } + #Subnet in binary format? + if ($mask=~/^(\d{1,2})$/ && (($1<=32 && $1>=8))){ + if($full == 0){ return &General::cidrtosub($mask);}else{ + return $net."/".&General::cidrtosub($mask); + } + }else{ + return 3; + } + return 3; +} + + +sub iporsubtocidr +{ + #gets: Ip Address or subnetmask in decimal oder CIDR + #Gives: What it gets only in CIDR format + my $subnet=$_[0]; + my $net; + my $mask; + my $full=0; + if ($subnet =~ /^(.*?)\/(.*?)$/) { + ($net,$mask) = split (/\//,$subnet); + $full=1; + }else{ + $mask=$subnet; + } + #Subnet in decimal and valid? + if ($mask=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/ &&(($1<=255 && $2<=$1 && $3<=$2 && $4<=$3 ))) { + for (my $i=8;$i<=32;$i++){ + if (&General::cidrtosub($i) eq $mask){ + if ($full == 0){return &General::subtocidr($mask);}else{ + return $net."/".&General::subtocidr($mask); + } + } + } + } + #Subnet already in binary format? + if ($mask=~/^(\d{1,2})$/ && (($1<=32 && $1>=8))){ + if($full == 0){ return $mask;}else{ + return $net."/".$mask; + } + }else{ + return 3; + } + return 3; +} + +sub getnetworkip +{ + #Gets: IP, CIDR (10.10.10.0-255, 24) + #Gives: 10.10.10.0 + my ($ccdip,$ccdsubnet) = @_; + my $ip_address_binary = inet_aton( $ccdip ); + my $netmask_binary = ~pack("N", (2**(32-$ccdsubnet))-1); + my $network_address = inet_ntoa( $ip_address_binary & $netmask_binary ); + return $network_address; +} + +sub getccdbc +{ + #Gets: IP in Form ("192.168.0.0/24") + #Gives: Broadcastaddress of network + my $ccdnet=$_; + my ($ccdip,$ccdsubnet) = split "/",$ccdnet; + my $ip_address_binary = inet_aton( $ccdip ); + my $netmask_binary = ~pack("N", (2**(32-$ccdsubnet))-1); + my $broadcast_address = inet_ntoa( $ip_address_binary | ~$netmask_binary ); + return $broadcast_address; +} +sub getnextip +{ + my ($byte1,$byte2,$byte3,$byte4) = split (/\./,$_[0]); + my $step=$_[1]; + for (my $x=1;$x<=$step;$x++){ + $byte4++; + if($byte4==255){ $byte4=0;$byte3++;} + if($byte3==255){$byte3=0;$byte2++;} + if ($byte2==255){$byte2=0;$byte1++} + + } + return "$byte1.$byte2.$byte3.$byte4"; +} +sub getlastip +{ + my ($byte1,$byte2,$byte3,$byte4) = split (/\./,$_[0]); + my $step=$_[1]; + for (my $x=$step;$x>=1;$x--){ + $byte4--; + if($byte4==0){ $byte4=255;$byte3--;} + if($byte3==0){$byte3=255;$byte2--;} + if ($byte2==0){$byte2=255;$byte1--} + } + return "$byte1.$byte2.$byte3.$byte4"; +} + +sub validipandmask +{ + #Gets: Ip address in 192.168.0.0/24 or 192.168.0.0/255.255.255.0 and checks if subnet valid + #Gives: True bzw 0 if success or false + my $ccdnet=$_[0]; + my $subcidr; + + if (!($ccdnet =~ /^(.*?)\/(.*?)$/)) { + return 0; + } + my ($ccdip,$ccdsubnet)=split (/\//, $ccdnet); + #IP valid? + if ($ccdip=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/ &&(($1>0 && $1<=255 && $2>=0 && $2<=255 && $3>=0 && $3<=255 && $4<=255 ))) { + #Subnet in decimal and valid? + if ($ccdsubnet=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/ &&(($1<=255 && $2<=$1 && $3<=$2 && $4<=$3 ))) { + for (my $i=8;$i<=30;$i++){ + if (&General::cidrtosub($i) eq $ccdsubnet){ + return 1; + } + } + #Subnet already in binary format? + }elsif ($ccdsubnet=~/^(\d{1,2})$/ && (($1<=30 && $1>=8))){ + return 1; + }else{ + return 0; + } + + } + return 0; } sub validport @@ -276,7 +431,7 @@ sub validhostname if (length ($hostname) < 1 || length ($hostname) > 63) { return 0;} # Only valid characters are a-z, A-Z, 0-9 and - - if ($hostname !~ /^[a-zA-Z0-9-]*$/) { + if ($hostname !~ /^[a-zA-Z0-9-\s]*$/) { return 0;} # First character can only be a letter or a digit if (substr ($hostname, 0, 1) !~ /^[a-zA-Z0-9]*$/) { @@ -407,7 +562,12 @@ sub NextIP ) ); } - +sub NextIP2 +{ + return &Socket::inet_ntoa( pack("N", 4 + unpack('N', &Socket::inet_aton(shift)) + ) + ); +} sub ipcidr { my ($ip,$cidr) = &Net::IPv4Addr::ipv4_parse(shift); @@ -465,13 +625,13 @@ sub writehasharray { open(FILE, ">$filename") or die "Unable to write to file $filename"; foreach $key (keys %$hash) { - if ($key =~ /^[0-9]+$/) { - print FILE "$key"; - foreach $i (0 .. $#{$hash->{$key}}) { - print FILE ",$hash->{$key}[$i]"; - } - print FILE "\n"; - } + if ($key =~ /^[0-9]+$/) { + print FILE "$key"; + foreach $i (0 .. $#{$hash->{$key}}) { + print FILE ",$hash->{$key}[$i]"; + } + print FILE "\n"; + } } close FILE; return; diff --git a/config/wpa_supplicant/wpa_supplicant_conf.sh b/config/wpa_supplicant/wpa_supplicant_conf.sh new file mode 100644 index 0000000..06d928d --- /dev/null +++ b/config/wpa_supplicant/wpa_supplicant_conf.sh @@ -0,0 +1,114 @@ +#!/bin/bash + +config="/tmp/wpa_supplicant.conf" + +# Read in the configuration files. +source /root/wpa_supplicant_settings + +# Exit, if wpa_supplicant is not enabled. +if [ "${ENABLED}" != "on" ]; then + exit 0 +fi + +# Read the interface configuration. +eval $(readhash /var/ipfire/ethernet/settings) + +# Find the device, we are going to deal with. +device=${!DEVICE} + +if [ -z "${device}" ]; then + echo "No device configured. Exiting." >&2 + exit 1 +fi + +# Check, if the given device is a wireless device. +if [ -d "/sys/class/net/${device}/phy80211" ]; then + wireless="true" +else + wireless="false" +fi + +# Write a configuration file header. +( + echo "#" + echo "# THIS FILE IS AUTOMATICALLY GENERATED AND" + echo "# ANY CUSTOM CHANGES WILL BE OVERWRITTEN!" + echo +) > ${config} + +# Write the configuration file. +( + proto="" + key_mgmt="" + pairwise="" + group="" + + echo "network={" + + case "${MODE}" in + 8021X) + key_mgmt="IEEE8021X" + + echo "eap=${EAP_METHOD}" + echo "anonymous_identity=\"${ANONYMOUS_IDENTITY}\"" + echo "identity=\"${IDENTITY}\"" + echo "password=\"${PASSWORD}\"" + echo "phase2=\"${PHASE2}\"" + ;; + WPA) + proto="WPA" + key_mgmt="WPA-PSK" + ;; + WPA2) + proto="RSN" + key_mgmt="WPA-PSK" + ;; + WEP) + key_mgmt="NONE" + echo " wep_tx_keyidx=0" + echo " wep_key0=\"${PSK}\"" + ;; + esac + + if [ -n "${SSID}" ]; then + echo " ssid=\"${SSID}\"" + fi + if [ "${wireless}" = "true" ]; then + echo " scan_ssid=1" + fi + if [ -n "${key_mgmt}" ]; then + echo " key_mgmt=${key_mgmt}" + fi + if [ -n "${PSK}" ]; then + echo " psk=\"${PSK}\"" + fi + if [ -n "${proto}" ]; then + echo " proto=${proto}" + fi + + case "${WPA_MODE}" in + CCMP-CCMP) + pairwise="CCMP" + group="CCMP" + ;; + CCMP-TKIP) + pairwise="CCMP" + group="TKIP" + ;; + TKIP-TKIP) + pairwise="TKIP" + group="TKIP" + ;; + *) + echo "Unknown WPA_MODE: ${WPA_MODE}" >&2 + ;; + esac + if [ -n "${pairwise}" -a -n "${group}" ]; then + echo " pairwise=${pairwise}" + echo " group=${group}" + fi + + echo "}" +) >> ${config} + +cat ${config} diff --git a/config/wpa_supplicant/wpa_supplicant_settings b/config/wpa_supplicant/wpa_supplicant_settings new file mode 100644 index 0000000..5984d83 --- /dev/null +++ b/config/wpa_supplicant/wpa_supplicant_settings @@ -0,0 +1,6 @@ +ENABLED=on +DEVICE=RED_DEV +MODE=WPA2 +#WPA_MODE=CCMP-CCMP +PSK="ThisIsTheKey" +SSID="Use This One Mum" diff --git a/doc/language_issues.de b/doc/language_issues.de index 5a42ae5..137217c 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -68,6 +68,9 @@ WARNING: translation string unused: cache size WARNING: translation string unused: calamaris report interval (in minutes) WARNING: translation string unused: calc traffic all x minutes WARNING: translation string unused: capsinactive +WARNING: translation string unused: ccd err iroute +WARNING: translation string unused: ccd err netadr +WARNING: translation string unused: ccd maxclients WARNING: translation string unused: cfg restart WARNING: translation string unused: check for net traffic update WARNING: translation string unused: choose config diff --git a/doc/language_issues.en b/doc/language_issues.en index 6d6a2a6..68fef77 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -87,6 +87,8 @@ WARNING: translation string unused: cache size WARNING: translation string unused: calamaris report interval (in minutes) WARNING: translation string unused: calc traffic all x minutes WARNING: translation string unused: capsinactive +WARNING: translation string unused: ccd err iroute +WARNING: translation string unused: ccd err netadr WARNING: translation string unused: cfg restart WARNING: translation string unused: check for net traffic update WARNING: translation string unused: choose config diff --git a/doc/language_issues.es b/doc/language_issues.es index 6bcbf86..968e321 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -500,7 +500,41 @@ WARNING: untranslated string: Async logging enabled WARNING: untranslated string: Scan for Songs WARNING: untranslated string: Set time on boot WARNING: untranslated string: advproxy errmsg invalid upstream proxy +WARNING: untranslated string: attention WARNING: untranslated string: bytes +WARNING: untranslated string: ccd add +WARNING: untranslated string: ccd choose net +WARNING: untranslated string: ccd client options +WARNING: untranslated string: ccd clientip +WARNING: untranslated string: ccd dynrange +WARNING: untranslated string: ccd err blue +WARNING: untranslated string: ccd err green +WARNING: untranslated string: ccd err hostinnet +WARNING: untranslated string: ccd err inuse +WARNING: untranslated string: ccd err invalidname +WARNING: untranslated string: ccd err invalidnet +WARNING: untranslated string: ccd err irouteexist +WARNING: untranslated string: ccd err isovpnnet +WARNING: untranslated string: ccd err issubnet +WARNING: untranslated string: ccd err name +WARNING: untranslated string: ccd err nameexist +WARNING: untranslated string: ccd err netadrexist +WARNING: untranslated string: ccd err orange +WARNING: untranslated string: ccd err red +WARNING: untranslated string: ccd err routeovpn +WARNING: untranslated string: ccd err routeovpn2 +WARNING: untranslated string: ccd hint +WARNING: untranslated string: ccd invalid +WARNING: untranslated string: ccd iroute +WARNING: untranslated string: ccd iroute2 +WARNING: untranslated string: ccd iroutehint +WARNING: untranslated string: ccd modify +WARNING: untranslated string: ccd name +WARNING: untranslated string: ccd net +WARNING: untranslated string: ccd none +WARNING: untranslated string: ccd routes +WARNING: untranslated string: ccd subnet +WARNING: untranslated string: ccd used WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled @@ -546,11 +580,16 @@ WARNING: untranslated string: outgoing firewall p2p description 2 WARNING: untranslated string: outgoing firewall p2p description 3 WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: outgoing firewall view group +WARNING: untranslated string: ovpn errmsg green already pushed +WARNING: untranslated string: ovpn errmsg invalid ip or mask +WARNING: untranslated string: ovpn routes push +WARNING: untranslated string: ovpn routes push options WARNING: untranslated string: pakfire ago WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: server restart WARNING: untranslated string: static routes WARNING: untranslated string: system information WARNING: untranslated string: visit us at diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 189932f..1c37b17 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -499,7 +499,41 @@ WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs WARNING: untranslated string: advproxy errmsg invalid upstream proxy +WARNING: untranslated string: attention WARNING: untranslated string: bytes +WARNING: untranslated string: ccd add +WARNING: untranslated string: ccd choose net +WARNING: untranslated string: ccd client options +WARNING: untranslated string: ccd clientip +WARNING: untranslated string: ccd dynrange +WARNING: untranslated string: ccd err blue +WARNING: untranslated string: ccd err green +WARNING: untranslated string: ccd err hostinnet +WARNING: untranslated string: ccd err inuse +WARNING: untranslated string: ccd err invalidname +WARNING: untranslated string: ccd err invalidnet +WARNING: untranslated string: ccd err irouteexist +WARNING: untranslated string: ccd err isovpnnet +WARNING: untranslated string: ccd err issubnet +WARNING: untranslated string: ccd err name +WARNING: untranslated string: ccd err nameexist +WARNING: untranslated string: ccd err netadrexist +WARNING: untranslated string: ccd err orange +WARNING: untranslated string: ccd err red +WARNING: untranslated string: ccd err routeovpn +WARNING: untranslated string: ccd err routeovpn2 +WARNING: untranslated string: ccd hint +WARNING: untranslated string: ccd invalid +WARNING: untranslated string: ccd iroute +WARNING: untranslated string: ccd iroute2 +WARNING: untranslated string: ccd iroutehint +WARNING: untranslated string: ccd modify +WARNING: untranslated string: ccd name +WARNING: untranslated string: ccd net +WARNING: untranslated string: ccd none +WARNING: untranslated string: ccd routes +WARNING: untranslated string: ccd subnet +WARNING: untranslated string: ccd used WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: dns address deleted txt WARNING: untranslated string: fireinfo ipfire version @@ -539,6 +573,7 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: server restart WARNING: untranslated string: snort working WARNING: untranslated string: static routes WARNING: untranslated string: system information diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 6bcbf86..968e321 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -500,7 +500,41 @@ WARNING: untranslated string: Async logging enabled WARNING: untranslated string: Scan for Songs WARNING: untranslated string: Set time on boot WARNING: untranslated string: advproxy errmsg invalid upstream proxy +WARNING: untranslated string: attention WARNING: untranslated string: bytes +WARNING: untranslated string: ccd add +WARNING: untranslated string: ccd choose net +WARNING: untranslated string: ccd client options +WARNING: untranslated string: ccd clientip +WARNING: untranslated string: ccd dynrange +WARNING: untranslated string: ccd err blue +WARNING: untranslated string: ccd err green +WARNING: untranslated string: ccd err hostinnet +WARNING: untranslated string: ccd err inuse +WARNING: untranslated string: ccd err invalidname +WARNING: untranslated string: ccd err invalidnet +WARNING: untranslated string: ccd err irouteexist +WARNING: untranslated string: ccd err isovpnnet +WARNING: untranslated string: ccd err issubnet +WARNING: untranslated string: ccd err name +WARNING: untranslated string: ccd err nameexist +WARNING: untranslated string: ccd err netadrexist +WARNING: untranslated string: ccd err orange +WARNING: untranslated string: ccd err red +WARNING: untranslated string: ccd err routeovpn +WARNING: untranslated string: ccd err routeovpn2 +WARNING: untranslated string: ccd hint +WARNING: untranslated string: ccd invalid +WARNING: untranslated string: ccd iroute +WARNING: untranslated string: ccd iroute2 +WARNING: untranslated string: ccd iroutehint +WARNING: untranslated string: ccd modify +WARNING: untranslated string: ccd name +WARNING: untranslated string: ccd net +WARNING: untranslated string: ccd none +WARNING: untranslated string: ccd routes +WARNING: untranslated string: ccd subnet +WARNING: untranslated string: ccd used WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled @@ -546,11 +580,16 @@ WARNING: untranslated string: outgoing firewall p2p description 2 WARNING: untranslated string: outgoing firewall p2p description 3 WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: outgoing firewall view group +WARNING: untranslated string: ovpn errmsg green already pushed +WARNING: untranslated string: ovpn errmsg invalid ip or mask +WARNING: untranslated string: ovpn routes push +WARNING: untranslated string: ovpn routes push options WARNING: untranslated string: pakfire ago WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: server restart WARNING: untranslated string: static routes WARNING: untranslated string: system information WARNING: untranslated string: visit us at diff --git a/doc/language_issues.ru b/doc/language_issues.ru index e25d81d..c1c87ee 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -491,7 +491,41 @@ WARNING: untranslated string: Add a route WARNING: untranslated string: Edit an existing route WARNING: untranslated string: Scan for Songs WARNING: untranslated string: advproxy errmsg invalid upstream proxy +WARNING: untranslated string: attention WARNING: untranslated string: bytes +WARNING: untranslated string: ccd add +WARNING: untranslated string: ccd choose net +WARNING: untranslated string: ccd client options +WARNING: untranslated string: ccd clientip +WARNING: untranslated string: ccd dynrange +WARNING: untranslated string: ccd err blue +WARNING: untranslated string: ccd err green +WARNING: untranslated string: ccd err hostinnet +WARNING: untranslated string: ccd err inuse +WARNING: untranslated string: ccd err invalidname +WARNING: untranslated string: ccd err invalidnet +WARNING: untranslated string: ccd err irouteexist +WARNING: untranslated string: ccd err isovpnnet +WARNING: untranslated string: ccd err issubnet +WARNING: untranslated string: ccd err name +WARNING: untranslated string: ccd err nameexist +WARNING: untranslated string: ccd err netadrexist +WARNING: untranslated string: ccd err orange +WARNING: untranslated string: ccd err red +WARNING: untranslated string: ccd err routeovpn +WARNING: untranslated string: ccd err routeovpn2 +WARNING: untranslated string: ccd hint +WARNING: untranslated string: ccd invalid +WARNING: untranslated string: ccd iroute +WARNING: untranslated string: ccd iroute2 +WARNING: untranslated string: ccd iroutehint +WARNING: untranslated string: ccd modify +WARNING: untranslated string: ccd name +WARNING: untranslated string: ccd net +WARNING: untranslated string: ccd none +WARNING: untranslated string: ccd routes +WARNING: untranslated string: ccd subnet +WARNING: untranslated string: ccd used WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: disk access per WARNING: untranslated string: extrahd because there is already a device mounted @@ -520,6 +554,7 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: server restart WARNING: untranslated string: static routes WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange diff --git a/doc/language_missings b/doc/language_missings index 55e0e40..a6a29fb 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -4,6 +4,7 @@ ############################################################################ # Checking cgi-bin translations for language: en # ############################################################################ +< ccd maxclients ############################################################################ # Checking install/setup translations for language: fr # ############################################################################ @@ -11,6 +12,43 @@ # Checking cgi-bin translations for language: fr # ############################################################################ < advproxy errmsg invalid upstream proxy +< attention +< ccd add +< ccd choose net +< ccd clientip +< ccd client options +< ccd dynrange +< ccd err blue +< ccd err green +< ccd err hostinnet +< ccd err inuse +< ccd err invalidname +< ccd err invalidnet +< ccd err iroute +< ccd err irouteexist +< ccd err isovpnnet +< ccd err issubnet +< ccd err name +< ccd err nameexist +< ccd err netadr +< ccd err netadrexist +< ccd err orange +< ccd err red +< ccd err routeovpn +< ccd err routeovpn2 +< ccd hint +< ccd invalid +< ccd iroute +< ccd iroute2 +< ccd iroutehint +< ccd maxclients +< ccd modify +< ccd name +< ccd net +< ccd none +< ccd routes +< ccd subnet +< ccd used < deprecated fs warn < dns address deleted txt < fireinfo ipfire version @@ -45,6 +83,7 @@ < openvpn subnet is used < other < our donors +< server restart < snort working < static routes < system information @@ -81,6 +120,43 @@ ############################################################################ < advproxy errmsg invalid upstream proxy < Async logging enabled +< attention +< ccd add +< ccd choose net +< ccd clientip +< ccd client options +< ccd dynrange +< ccd err blue +< ccd err green +< ccd err hostinnet +< ccd err inuse +< ccd err invalidname +< ccd err invalidnet +< ccd err iroute +< ccd err irouteexist +< ccd err isovpnnet +< ccd err issubnet +< ccd err name +< ccd err nameexist +< ccd err netadr +< ccd err netadrexist +< ccd err orange +< ccd err red +< ccd err routeovpn +< ccd err routeovpn2 +< ccd hint +< ccd invalid +< ccd iroute +< ccd iroute2 +< ccd iroutehint +< ccd maxclients +< ccd modify +< ccd name +< ccd net +< ccd none +< ccd routes +< ccd subnet +< ccd used < deprecated fs warn < fireinfo ipfire version < fireinfo is disabled @@ -126,6 +202,11 @@ < outgoing firewall p2p description 2 < outgoing firewall p2p description 3 < outgoing firewall view group +< ovpn errmsg green already pushed +< ovpn errmsg invalid ip or mask +< ovpn routes push +< ovpn routes push options +< server restart < Set time on boot < static routes < system information @@ -138,6 +219,43 @@ # Checking cgi-bin translations for language: pl # ############################################################################ < advproxy errmsg invalid upstream proxy +< attention +< ccd add +< ccd choose net +< ccd clientip +< ccd client options +< ccd dynrange +< ccd err blue +< ccd err green +< ccd err hostinnet +< ccd err inuse +< ccd err invalidname +< ccd err invalidnet +< ccd err iroute +< ccd err irouteexist +< ccd err isovpnnet +< ccd err issubnet +< ccd err name +< ccd err nameexist +< ccd err netadr +< ccd err netadrexist +< ccd err orange +< ccd err red +< ccd err routeovpn +< ccd err routeovpn2 +< ccd hint +< ccd invalid +< ccd iroute +< ccd iroute2 +< ccd iroutehint +< ccd maxclients +< ccd modify +< ccd name +< ccd net +< ccd none +< ccd routes +< ccd subnet +< ccd used < deprecated fs warn < extrahd because there is already a device mounted < extrahd cant umount @@ -161,6 +279,11 @@ < openvpn subnet is used < other < our donors +< ovpn errmsg green already pushed +< ovpn errmsg invalid ip or mask +< ovpn routes push +< ovpn routes push options +< server restart < static routes < visit us at < vpn keyexchange @@ -172,6 +295,43 @@ ############################################################################ < Add a route < advproxy errmsg invalid upstream proxy +< attention +< ccd add +< ccd choose net +< ccd clientip +< ccd client options +< ccd dynrange +< ccd err blue +< ccd err green +< ccd err hostinnet +< ccd err inuse +< ccd err invalidname +< ccd err invalidnet +< ccd err iroute +< ccd err irouteexist +< ccd err isovpnnet +< ccd err issubnet +< ccd err name +< ccd err nameexist +< ccd err netadr +< ccd err netadrexist +< ccd err orange +< ccd err red +< ccd err routeovpn +< ccd err routeovpn2 +< ccd hint +< ccd invalid +< ccd iroute +< ccd iroute2 +< ccd iroutehint +< ccd maxclients +< ccd modify +< ccd name +< ccd net +< ccd none +< ccd routes +< ccd subnet +< ccd used < day-graph < deprecated fs warn < disk access per @@ -203,6 +363,7 @@ < other < our donors < outgoing traffic in bytes per second +< server restart < static routes < visit us at < vpn keyexchange diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi old mode 100644 new mode 100755 index 990fe66..baabe8b --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -36,10 +36,10 @@ require "${General::swroot}/header.pl"; require "${General::swroot}/countries.pl"; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; #workaround to suppress a warning when a variable is used only once -my @dummy = ( ${Header::colourgreen} ); +my @dummy = ( ${Header::colourgreen}, ${Header::colourblue} ); undef (@dummy); my %color = (); @@ -77,8 +77,12 @@ $cgiparams{'DHCP_WINS'} = ''; $cgiparams{'ROUTES_PUSH'} = ''; $cgiparams{'DCOMPLZO'} = 'off'; $cgiparams{'MSSFIX'} = ''; +$cgiparams{'number'} = ''; $routes_push_file = "${General::swroot}/ovpn/routes_push"; unless (-e $routes_push_file) { system("touch $routes_push_file"); } +unless (-e "${General::swroot}/ovpn/ccd.conf") { system("touch ${General::swroot}/ovpn/ccd.conf"); } +unless (-e "${General::swroot}/ovpn/ccdroute") { system("touch ${General::swroot}/ovpn/ccdroute"); } +unless (-e "${General::swroot}/ovpn/ccdroute2") { system("touch ${General::swroot}/ovpn/ccdroute2"); } &Header::getcgihash(\%cgiparams, {'wantfile' => 1, 'filevar' => 'FH'}); @@ -342,18 +346,35 @@ sub writeserverconf { print CONF "dh /var/ipfire/ovpn/ca/dh1024.pem\n"; my @tempovpnsubnet = split("\/",$sovpnsettings{'DOVPN_SUBNET'}); print CONF "server $tempovpnsubnet[0] $tempovpnsubnet[1]\n"; - print CONF "push \"route $netsettings{'GREEN_NETADDRESS'} $netsettings{'GREEN_NETMASK'}\"\n"; + #print CONF "push \"route $netsettings{'GREEN_NETADDRESS'} $netsettings{'GREEN_NETMASK'}\"\n"; if ($vpnsettings{'ROUTES_PUSH'} ne '') { - @temp = split(/\n/,$vpnsettings{'ROUTES_PUSH'}); - foreach (@temp) - { - @tempovpnsubnet = split("\/",&General::ipcidr2msk($_)); - print CONF "push \"route " . $tempovpnsubnet[0]. " " . $tempovpnsubnet[1] . "\"\n"; + @temp = split(/\n/,$vpnsettings{'ROUTES_PUSH'}); + foreach (@temp) + { + @tempovpnsubnet = split("\/",&General::ipcidr2msk($_)); + print CONF "push \"route " . $tempovpnsubnet[0]. " " . $tempovpnsubnet[1] . "\"\n"; + } } - } +# a.marx ccd + my %ccdconfhash=(); + &General::readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); + foreach my $key (keys %ccdconfhash) { + my $a=$ccdconfhash{$key}[1]; + my ($b,$c) = split (/\//, $a); + print CONF "route $b ".&General::cidrtosub($c)."\n"; + } + my %ccdroutehash=(); + &General::readhasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); + foreach my $key (keys %ccdroutehash) { + foreach my $i ( 1 .. $#{$ccdroutehash{$key}}){ + my ($a,$b)=split (/\//,$ccdroutehash{$key}[$i]); + print CONF "route $a $b\n"; + } + } +# ccd end - if ($sovpnsettings{CLIENT2CLIENT} eq 'on') { + if ($sovpnsettings{CLIENT2CLIENT} eq 'on') { print CONF "client-to-client\n"; } if ($sovpnsettings{MSSFIX} eq 'on') { @@ -407,7 +428,7 @@ sub writeserverconf { close(CONF); } -# + sub emptyserverlog{ if (open(FILE, ">/var/log/ovpnserver.log")) { flock FILE, 2; @@ -417,6 +438,281 @@ sub emptyserverlog{ } +sub delccdnet +{ + my %ccdconfhash = (); + my %ccdhash = (); + my $ccdnetname=$_[0]; + if (-f "${General::swroot}/ovpn/ovpnconfig"){ + &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ccdhash); + foreach my $key (keys %ccdhash) { + if ($ccdhash{$key}[32] eq $ccdnetname) { + $errormessage=$Lang::tr{'ccd err hostinnet'}; + return; + } + } + } + &General::readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); + foreach my $key (keys %ccdconfhash) { + if ($ccdconfhash{$key}[0] eq $ccdnetname){ + delete $ccdconfhash{$key}; + } + } + &General::writehasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); + + &writeserverconf; + return 0; +} + +sub addccdnet +{ + my %ccdconfhash=(); + my @ccdconf=(); + my $ccdname=$_[0]; + my $ccdnet=$_[1]; + my $ovpnsubnet=$_[2]; + my $subcidr; + my @ip2=(); + my $checkup; + my $ccdip; + my $baseaddress; + if(!&General::validhostname($ccdname)){ + $errormessage=$Lang::tr{'ccd err invalidname'}; + return; + } + #check ip + if (&General::validipandmask($ccdnet)){ + $ccdnet=&General::iporsubtocidr($ccdnet); + }else{ + $errormessage=$Lang::tr{'ccd err invalidnet'}; + return; + } + ($ccdip,$subcidr) = split (/\//,$ccdnet); + if ($ccdname eq '') { + $errormessage=$errormessage.$Lang::tr{'ccd err name'}."<br>"; + } + #check if we try to use same network as ovpn server + if (&General::iporsubtocidr($ccdnet) eq &General::iporsubtocidr($ovpnsubnet)) { + $errormessage=$errormessage.$Lang::tr{'ccd err isovpnnet'}."<br>"; + } + + #check if we use a name/subnet that already exists + &General::readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); + foreach my $key (keys %ccdconfhash) { + @ccdconf=split(/\//,$ccdconfhash{$key}[1]); + if ($ccdname eq $ccdconfhash{$key}[0]) {$errormessage=$errormessage.$Lang::tr{'ccd err nameexist'}."<br>";} + my ($newip,$newsub) = split(/\//,$ccdnet); + if (&General::IpInSubnet($newip,$ccdconf[0],&General::iporsubtodec($ccdconf[1]))) {$errormessage=$errormessage.$Lang::tr{'ccd err issubnet'}."<br>";} + + } + #check if we use one of ipfire's networks (green,orange,blue) + my %ownnet=(); + &General::readhash("${General::swroot}/ethernet/settings", \%ownnet); + if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($ownnet{'GREEN_NETADDRESS'},$ccdip,&General::iporsubtodec($subcidr))){ $errormessage=$Lang::tr{'ccd err green'};} + if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($ownnet{'ORANGE_NETADDRESS'},$ccdip,&General::iporsubtodec($subcidr))){ $errormessage=$Lang::tr{'ccd err orange'};} + if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($ownnet{'BLUE_NETADDRESS'},$ccdip,&General::iporsubtodec($subcidr))){ $errormessage=$Lang::tr{'ccd err blue'};} + if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($ownnet{'RED_NETADDRESS'},$ccdip,&General::iporsubtodec($subcidr))){ $errormessage=$Lang::tr{'ccd err red'};} + + + if (!$errormessage) { + my %ccdconfhash=(); + $baseaddress=&General::getnetworkip($ccdip,$subcidr); + &General::readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); + my $key = &General::findhasharraykey (\%ccdconfhash); + foreach my $i (0 .. 1) { $ccdconfhash{$key}[$i] = "";} + $ccdconfhash{$key}[0] = $ccdname; + $ccdconfhash{$key}[1] = $baseaddress."/".$subcidr; + &General::writehasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); + &writeserverconf; + $cgiparams{'ccdname'}=''; + $cgiparams{'ccdsubnet'}=''; + return 1; + } +} + +sub modccdnet +{ + + my $newname=$_[0]; + my $oldname=$_[1]; + my %ccdconfhash=(); + my %ccdhash=(); + &General::readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); + foreach my $key (keys %ccdconfhash) { + if ($ccdconfhash{$key}[0] eq $oldname) { + foreach my $key1 (keys %ccdconfhash) { + if ($ccdconfhash{$key1}[0] eq $newname){ + $errormessage=$errormessage.$Lang::tr{'ccd err netadrexist'}; + return; + }else{ + $ccdconfhash{$key}[0]= $newname; + &General::writehasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); + last; + } + } + } + } + + &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ccdhash); + foreach my $key (keys %ccdhash) { + if ($ccdhash{$key}[32] eq $oldname) { + $ccdhash{$key}[32]=$newname; + &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%ccdhash); + last; + } + } + + return 0; +} +sub ccdmaxclients +{ + my $ccdnetwork=$_[0]; + my @octets=(); + my @subnet=(); + @octets=split("\/",$ccdnetwork); + @subnet= split /\./, &General::cidrtosub($octets[1]); + my ($a,$b,$c,$d,$e); + $a=256-$subnet[0]; + $b=256-$subnet[1]; + $c=256-$subnet[2]; + $d=256-$subnet[3]; + $e=($a*$b*$c*$d)/4; + return $e-1; +} + +sub getccdadresses +{ + my $ipin=$_[0]; + my ($ip1,$ip2,$ip3,$ip4)=split /\./, $ipin; + my $cidr=$_[1]; + chomp($cidr); + my $count=$_[2]; + my $hasip=$_[3]; + chomp($hasip); + my @iprange=(); + my %ccdhash=(); + &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ccdhash); + $iprange[0]=$ip1.".".$ip2.".".$ip3.".".2; + for (my $i=0;$i<=$count-1;$i++) { + my $tmpip=$iprange[$i-1]; + my $stepper=$i*4; + $iprange[$i]= &General::getnextip($tmpip,4); + } + my $r=0; + foreach my $key (keys %ccdhash) { + $r=0; + foreach my $tmp (@iprange){ + my ($net,$sub) = split (/\//,$ccdhash{$key}[33]); + if ($net eq $tmp) { + if ( $hasip ne $ccdhash{$key}[33] ){ + splice (@iprange,$r,1); + } + } + $r++; + } + } + return @iprange; +} + +sub fillselectbox +{ + my $boxname=$_[1]; + my ($ccdip,$subcidr) = split("/",$_[0]); + my $tz=$_[2]; + my @allccdips=&getccdadresses($ccdip,$subcidr,&ccdmaxclients($ccdip."/".$subcidr),$tz); + print"<select name='$boxname' STYLE='font-family : arial; font-size : 9pt; width:130px;' >"; + foreach (@allccdips) { + my $ip=$_."/30"; + chomp($ip); + print "<option value='$ip' "; + if ( $ip eq $cgiparams{$boxname} ){ + print"selected"; + } + print ">$ip</option>"; + } + print "</select>"; +} + +sub hostsinnet +{ + my $name=$_[0]; + my %ccdhash=(); + my $i=0; + &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ccdhash); + foreach my $key (keys %ccdhash) { + if ($ccdhash{$key}[32] eq $name){ $i++;} + } + return $i; +} + +sub check_routes_push +{ + my $val=$_[0]; + my ($ip,$cidr) = split (/\//, $val); + ##check for existing routes in routes_push + if (-e "${General::swroot}/ovpn/routes_push") { + open(FILE,"${General::swroot}/ovpn/routes_push"); + while (<FILE>) { + $_=~s/\s*$//g; + + my ($ip2,$cidr2) = split (/\//,"$_"); + my $val2=$ip2."/".&General::iporsubtodec($cidr2); + + if($val eq $val2){ + return 0; + } + #subnetcheck + if (&General::IpInSubnet ($ip,$ip2,&General::iporsubtodec($cidr2))){ + return 0; + } + }; + close(FILE); + } + return 1; +} + +sub check_ccdroute +{ + my %ccdroutehash=(); + my $val=$_[0]; + my ($ip,$cidr) = split (/\//, $val); + #check for existing routes in ccdroute + &General::readhasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); + foreach my $key (keys %ccdroutehash) { + foreach my $i (1 .. $#{$ccdroutehash{$key}}) { + if (&General::iporsubtodec($val) eq $ccdroutehash{$key}[$i] && $ccdroutehash{$key}[0] ne $cgiparams{'NAME'}){ + return 0; + } + my ($ip2,$cidr2) = split (/\//,$ccdroutehash{$key}[$i]); + #subnetcheck + if (&General::IpInSubnet ($ip,$ip2,$cidr2)&& $ccdroutehash{$key}[0] ne $cgiparams{'NAME'} ){ + return 0; + } + } + } + return 1; +} +sub check_ccdconf +{ + my %ccdconfhash=(); + my $val=$_[0]; + my ($ip,$cidr) = split (/\//, $val); + #check for existing routes in ccdroute + &General::readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); + foreach my $key (keys %ccdconfhash) { + if (&General::iporsubtocidr($val) eq $ccdconfhash{$key}[1]){ + return 0; + } + my ($ip2,$cidr2) = split (/\//,$ccdconfhash{$key}[1]); + #subnetcheck + if (&General::IpInSubnet ($ip,$ip2,&General::cidrtosub($cidr2))){ + return 0; + } + + } + return 1; +} + ### # m.a.d net2net ### @@ -451,6 +747,7 @@ sub read_routepushfile while (<FILE>) { $vpnsettings{'ROUTES_PUSH'} .= $_ }; close(FILE); $cgiparams{'ROUTES_PUSH'} = $vpnsettings{'ROUTES_PUSH'}; + } } @@ -490,11 +787,11 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'start ovpn server'} || &emptyserverlog(); } # #restart openvpn server - if ($cgiparams{'ACTION'} eq $Lang::tr{'restart ovpn server'}){ +# if ($cgiparams{'ACTION'} eq $Lang::tr{'restart ovpn server'}){ #workarund, till SIGHUP also works when running as nobody - system('/usr/local/bin/openvpnctrl', '-r'); - &emptyserverlog(); - } +# system('/usr/local/bin/openvpnctrl', '-r'); +# &emptyserverlog(); +# } } ### @@ -554,24 +851,47 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { if ($cgiparams{'ROUTES_PUSH'} ne ''){ @temp = split(/\n/,$cgiparams{'ROUTES_PUSH'}); undef $vpnsettings{'ROUTES_PUSH'}; - foreach (@temp) + + foreach my $tmpip (@temp) { s/^\s+//g; s/\s+$//g; - if ($_) + + if ($tmpip) { - unless (&General::validipandmask($_)) { - $errormessage = $Lang::tr{'ovpn errmsg invalid ip or mask'}; - goto ADV_ERROR; + $tmpip=~s/\s*$//g; + unless (&General::validipandmask($tmpip)) { + $errormessage = "$tmpip ".$Lang::tr{'ovpn errmsg invalid ip or mask'}; + goto ADV_ERROR; } - my ($ip, $cidr) = split("\/",&General::ipcidr2msk($_)); + my ($ip, $cidr) = split("\/",&General::ipcidr2msk($tmpip)); + if ($ip eq $netsettings{'GREEN_NETADDRESS'} && $cidr eq $netsettings{'GREEN_NETMASK'}) { $errormessage = $Lang::tr{'ovpn errmsg green already pushed'}; - goto ADV_ERROR; + goto ADV_ERROR; + } +# a.marx ccd + my %ccdroutehash=(); + &General::readhasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); + foreach my $key (keys %ccdroutehash) { + foreach my $i (1 .. $#{$ccdroutehash{$key}}) { + if ( $ip."/".$cidr eq $ccdroutehash{$key}[$i] ){ + $errormessage="Route $ip\/$cidr ".$Lang::tr{'ccd err inuse'}." $ccdroutehash{$key}[0]" ; + goto ADV_ERROR; + } + my ($ip2,$cidr2) = split(/\//,$ccdroutehash{$key}[$i]); + if (&General::IpInSubnet ($ip,$ip2,$cidr2)){ + $errormessage="Route $ip\/$cidr ".$Lang::tr{'ccd err inuse'}." $ccdroutehash{$key}[0]" ; + goto ADV_ERROR; + } + } } - $vpnsettings{'ROUTES_PUSH'} .= $_."\n"; + +# ccd end + + $vpnsettings{'ROUTES_PUSH'} .= $tmpip."\n"; } - } - &write_routepushfile; + } + &write_routepushfile; undef $vpnsettings{'ROUTES_PUSH'}; } else { @@ -1571,29 +1891,26 @@ END my $n2nactive = `/bin/ps ax|grep $confighash{$cgiparams{'KEY'}}[1]|grep -v grep|awk \'{print \$1}\'`; if ($confighash{$cgiparams{'KEY'}}) { + if ($confighash{$cgiparams{'KEY'}}[0] eq 'off') { + $confighash{$cgiparams{'KEY'}}[0] = 'on'; + &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); - - if ($confighash{$cgiparams{'KEY'}}[0] eq 'off') { - $confighash{$cgiparams{'KEY'}}[0] = 'on'; - &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); - - if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ + if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ system('/usr/local/bin/openvpnctrl', '-sn2n', $confighash{$cgiparams{'KEY'}}[1]); - } - - } else { + } + } else { - $confighash{$cgiparams{'KEY'}}[0] = 'off'; - &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); + $confighash{$cgiparams{'KEY'}}[0] = 'off'; + &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); - if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ + if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ if ($n2nactive ne ''){ - system('/usr/local/bin/openvpnctrl', '-kn2n', $confighash{$cgiparams{'KEY'}}[1]); - } + system('/usr/local/bin/openvpnctrl', '-kn2n', $confighash{$cgiparams{'KEY'}}[1]); + } - } else { + } else { $errormessage = $Lang::tr{'invalid key'}; - } + } } } @@ -1718,9 +2035,10 @@ else my $zip = Archive::Zip->new(); - print CLIENTCONF "#OpenVPN Server conf\r\n"; + print CLIENTCONF "#OpenVPN Client conf\r\n"; print CLIENTCONF "tls-client\r\n"; print CLIENTCONF "client\r\n"; + print CLIENTCONF "nobind\n"; print CLIENTCONF "dev $vpnsettings{'DDEVICE'}\r\n"; print CLIENTCONF "proto $vpnsettings{'DPROTOCOL'}\r\n"; print CLIENTCONF "$vpnsettings{'DDEVICE'}-mtu $vpnsettings{'DMTU'}\r\n"; @@ -1814,10 +2132,41 @@ else } unlink ("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem"); - unlink ("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12"); + unlink ("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12"); + +# A.Marx CCD delete ccd files and routes + + + if (-f "${General::swroot}/ovpn/ccd/$confighash{$cgiparams{'KEY'}}[2]") + { + unlink "${General::swroot}/ovpn/ccd/$confighash{$cgiparams{'KEY'}}[2]"; + } + my %ccdroutehash=(); + &General::readhasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); + foreach my $key (keys %ccdroutehash) { + if ($ccdroutehash{$key}[0] eq $confighash{$cgiparams{'KEY'}}[1]){ + delete $ccdroutehash{$key}; + } + } + &General::writehasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); + my %ccdroute2hash=(); + &General::readhasharray("${General::swroot}/ovpn/ccdroute2", \%ccdroute2hash); + foreach my $key (keys %ccdroute2hash) { + if ($ccdroute2hash{$key}[0] eq $confighash{$cgiparams{'KEY'}}[1]){ + delete $ccdroute2hash{$key}; + } + } + &General::writehasharray("${General::swroot}/ovpn/ccdroute2", \%ccdroute2hash); + + + +# CCD end + + delete $confighash{$cgiparams{'KEY'}}; my $temp2 = `/usr/bin/openssl ca -gencrl -out ${General::swroot}/ovpn/crls/cacrl.pem -config ${General::swroot}/ovpn/openssl/ovpn.cnf`; &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); + #&writeserverconf(); } else { $errormessage = $Lang::tr{'invalid key'}; @@ -1884,9 +2233,11 @@ else %cgiparams = (); %cahash = (); %confighash = (); + my $disabled; &General::readhash("${General::swroot}/ovpn/settings", \%cgiparams); read_routepushfile; - + + # if ($cgiparams{'CLIENT2CLIENT'} eq '') { # $cgiparams{'CLIENT2CLIENT'} = 'on'; # } @@ -1926,9 +2277,7 @@ ADV_ERROR: $selected{'LOG_VERB'}{'11'} = ''; $selected{'LOG_VERB'}{'0'} = ''; $selected{'LOG_VERB'}{$cgiparams{'LOG_VERB'}} = 'SELECTED'; - - - + &Header::showhttpheaders(); &Header::openpage($Lang::tr{'status ovpn'}, 1, ''); &Header::openbigbox('100%', 'LEFT', '', $errormessage); @@ -1940,8 +2289,8 @@ ADV_ERROR: } &Header::openbox('100%', 'LEFT', $Lang::tr{'advanced server'}); print <<END - <form method='post' enctype='multipart/form-data'> - <table width='100%'> + <form method='post' enctype='multipart/form-data' disabled> + <table width='100%' border=0> <tr> <td colspan='4'><b>$Lang::tr{'dhcp-options'}</b></td> </tr> @@ -1950,7 +2299,7 @@ ADV_ERROR: </tr> <tr> <td class='base'>Domain</td> - <td><input type='TEXT' name='DHCP_DOMAIN' value='$cgiparams{'DHCP_DOMAIN'}' size='30' /></td> + <td><input type='TEXT' name='DHCP_DOMAIN' value='$cgiparams{'DHCP_DOMAIN'}' size='30' /></td> </tr> <tr> <td class='base'>DNS</td> @@ -1975,7 +2324,7 @@ if ($cgiparams{'ROUTES_PUSH'} ne '') print $cgiparams{'ROUTES_PUSH'}; } -print <<END +print <<END; </textarea></td> </tr> </tr> @@ -2057,8 +2406,16 @@ print <<END <option value='10' $selected{'LOG_VERB'}{'10'}>10</option> <option value='11' $selected{'LOG_VERB'}{'11'}>11</option> <option value='0' $selected{'LOG_VERB'}{'0'}>0</option></select></td> -</table> -<hr size='1'> +</table><hr> +END + +if ( -e "/var/run/openvpn.pid"){ +print" <br><b><font color='#990000'>$Lang::tr{'attention'}:</b></font><br> + $Lang::tr{'server restart'}<br><br> + <hr>"; +} + +print<<END <table width='100%'> <tr> <td> </td> @@ -2077,6 +2434,121 @@ END &Header::closepage(); exit(0); + +# A.Marx CCD Add,delete or edit CCD net + +} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'ccd net'} || + $cgiparams{'ACTION'} eq $Lang::tr{'ccd add'} || + $cgiparams{'ACTION'} eq "kill" || + $cgiparams{'ACTION'} eq "edit" || + $cgiparams{'ACTION'} eq 'editsave'){ + &Header::showhttpheaders(); + &Header::openpage($Lang::tr{'ccd net'}, 1, ''); + &Header::openbigbox('100%', 'LEFT', '', ''); + + if ($cgiparams{'ACTION'} eq "kill"){ + &delccdnet($cgiparams{'net'}); + } + + if ($cgiparams{'ACTION'} eq 'editsave'){ + my ($a,$b) =split (/\|/,$cgiparams{'ccdname'}); + if ( $a ne $b){ &modccdnet($a,$b);} + } + + if ($cgiparams{'ACTION'} eq $Lang::tr{'ccd add'}) { + &addccdnet($cgiparams{'ccdname'},$cgiparams{'ccdsubnet'},$cgiparams{'DOVPN_SUBNET'}); + } + if ($errormessage) { + &Header::openbox('100%', 'LEFT', $Lang::tr{'error messages'}); + print "<class name='base'>$errormessage"; + print " </class>"; + &Header::closebox(); + } +if ($cgiparams{'ACTION'} eq "edit"){ + + &Header::openbox('100%', 'LEFT', $Lang::tr{'ccd modify'}); + + print <<END + <table width='100%' border=0> + <tr><form method='post'> + <td width='10%' nowrap='nowrap'>$Lang::tr{'ccd name'}:</td><td><input type='TEXT' name='ccdname' value='$cgiparams{'ccdname'}' /></td> + <td width='8%'>$Lang::tr{'ccd subnet'}:</td><td><input type='TEXT' name='ccdsubnet' value='$cgiparams{'ccdsubnet'}' readonly /></td></tr> + <tr><td colspan='4' align='right'><hr><input type='submit' value='$Lang::tr{'save'}' /><input type='hidden' name='ACTION' value='editsave'/> + <input type='hidden' name='ccdname' value='$cgiparams{'ccdname'}'/><input type='submit' value='$Lang::tr{'cancel'}' /> + </td></tr> + </table></form> +END +; + &Header::closebox(); + + &Header::openbox('100%', 'LEFT',$Lang::tr{'ccd net'} ); + print <<END + <table width='100%' border='0' cellpadding='0' cellspacing='1'> + <tr> + <td class='boldbase' align='center'><b>$Lang::tr{'ccd name'}</td><td class='boldbase' align='center'><b>$Lang::tr{'network'}</td><td class='boldbase' width='15%' align='center'><b>$Lang::tr{'ccd used'}</td><td width='3%'></td><td width='3%'></td></tr> +END +; +} +else{ + if (! -e "/var/run/openvpn.pid"){ + &Header::openbox('100%', 'LEFT', $Lang::tr{'ccd add'}); + print <<END; + <table width='100%' border='0'> + <tr><form method='post'> + <td colspan='4'>$Lang::tr{'ccd hint'}<br><br></td></tr> + <tr> + <td width='10%' nowrap='nwrap'>$Lang::tr{'ccd name'}:</td><td><input type='TEXT' name='ccdname' value='$cgiparams{'ccdname'}' /></td> + <td width='8%'>$Lang::tr{'ccd subnet'}:</td><td><input type='TEXT' name='ccdsubnet' value='$cgiparams{'ccdsubnet'}' /></td></tr> + <tr><td colspan=4><hr /></td></tr><tr> + <td colspan='4' align='right'><input type='hidden' name='ACTION' value='$Lang::tr{'ccd add'}' /><input type='submit' value='$Lang::tr{'add'}' /><input type='hidden' name='DOVPN_SUBNET' value='$cgiparams{'DOVPN_SUBNET'}'/></td></tr> + </table></form> +END + + &Header::closebox(); +} + &Header::openbox('100%', 'LEFT',$Lang::tr{'ccd net'} ); + print <<END + <table width='100%' border='0' cellpadding='0' cellspacing='1'> + <tr> + <td class='boldbase' align='center' nowrap='nowrap' width='20%'><b>$Lang::tr{'ccd name'}</td><td class='boldbase' align='center' width='8%'><b>$Lang::tr{'network'}</td><td class='boldbase' width='8%' align='center' nowrap='nowrap'><b>$Lang::tr{'ccd used'}</td><td width='1%' align='center'></td><td width='1%' align='center'></td></tr> +END +; +} + my %ccdconfhash=(); + &General::readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); + my @ccdconf=(); + my $count=0; + foreach my $key (keys %ccdconfhash) { + @ccdconf=($ccdconfhash{$key}[0],$ccdconfhash{$key}[1]); + $count++; + my $ccdhosts = &hostsinnet($ccdconf[0]); + if ($count % 2){ print" <tr bgcolor='$color{'color22'}'>";} + else{ print" <tr bgcolor='$color{'color20'}'>";} + print"<td>$ccdconf[0]</td><td align='center'>$ccdconf[1]</td><td align='center'>$ccdhosts/".(&ccdmaxclients($ccdconf[1])+1)."</td><td>"; +print <<END + <form method='post' /> + <input type='image' src='/images/edit.gif' align='middle' alt=$Lang::tr{'edit'} title=$Lang::tr{'edit'} /> + <input type='hidden' name='ACTION' value='edit'/> + <input type='hidden' name='ccdname' value='$ccdconf[0]' /> + <input type='hidden' name='ccdsubnet' value='$ccdconf[1]' /> + </form></td> + <form method='post' /> + <td><input type='hidden' name='ACTION' value='kill'/> + <input type='hidden' name='number' value='$count' /> + <input type='hidden' name='net' value='$ccdconf[0]' /> + <input type='image' src='/images/delete.gif' align='middle' alt=$Lang::tr{'remove'} title=$Lang::tr{'remove'} /></form></td></tr> +END +; + } + print "</table></form>"; + &Header::closebox(); + print "<div align='center'><a href='/cgi-bin/ovpnmain.cgi'>$Lang::tr{'back'}</a></div>"; + &Header::closebigbox(); + &Header::closepage(); + exit(0); + +#END CCD + ### ### Openvpn Connections Statistics ### @@ -2284,7 +2756,7 @@ if ( -s "${General::swroot}/ovpn/settings") { print <<END <b>$Lang::tr{'connection type'}:</b><br /> - <table><form method='post' ENCTYPE="multipart/form-data"> + <table border='0' width='100%'><form method='post' ENCTYPE="multipart/form-data"> <tr><td><input type='radio' name='TYPE' value='host' checked /></td> <td class='base'>$Lang::tr{'host to net vpn'}</td></tr> <tr><td><input type='radio' name='TYPE' value='net' /></td> @@ -2293,21 +2765,21 @@ if ( -s "${General::swroot}/ovpn/settings") { <td class='base'>$Lang::tr{'net to net vpn'} (Upload Client Package)</td></tr> <tr><td> </td><td class='base'><input type='file' name='FH' size='30'></td></tr> <tr><td> </td><td>Import Connection Name <img src='/blob.gif' /></td></tr> - <tr><td> </td><td class='base'><input type='text' name='n2nname' size='30'><td class='base'>Default : Client Packagename</td></td></tr> + <tr><td> </td><td class='base'><input type='text' name='n2nname' size='30'>Default : Client Packagename</td></tr> <tr><td colspan='3'><hr /></td></tr> - <tr><td align='center'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td></tr> - <tr><td> </td></tr> + <tr><td align='right' colspan='3'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td></tr> <tr><td class='base' colspan='3' align='left'><img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td></tr> </form></table> END ; + } else { print <<END <b>$Lang::tr{'connection type'}:</b><br /> - <table><form method='post' ENCTYPE="multipart/form-data"> + <table border='0' width='100%'><form method='post' ENCTYPE="multipart/form-data"> <tr><td><input type='radio' name='TYPE' value='host' checked /></td> <td class='base'>$Lang::tr{'host to net vpn'}</td></tr> - <tr><td align='center'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td></tr> + <tr><td align='right' colspan'3'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td></tr> </form></table> END ; @@ -2537,26 +3009,26 @@ foreach my $dkey (keys %confighash) { $key = &General::findhasharraykey (\%confighash); - foreach my $i (0 .. 31) { $confighash{$key}[$i] = "";} + foreach my $i (0 .. 38) { $confighash{$key}[$i] = "";} $confighash{$key}[0] = 'off'; $confighash{$key}[1] = $n2nname[0]; - $confighash{$key}[2] = $n2nname[0]; + $confighash{$key}[2] = $n2nname[0]; $confighash{$key}[3] = 'net'; $confighash{$key}[4] = 'cert'; $confighash{$key}[6] = 'client'; $confighash{$key}[8] = $n2nlocalsub[2]; - $confighash{$key}[10] = $n2nremote[1]; - $confighash{$key}[11] = "$n2nremsub[1]/$n2nremsub[2]"; + $confighash{$key}[10] = $n2nremote[1]; + $confighash{$key}[11] = "$n2nremsub[1]/$n2nremsub[2]"; $confighash{$key}[22] = $n2nmgmt[2]; - $confighash{$key}[23] = $mssfixactive; + $confighash{$key}[23] = $mssfixactive; $confighash{$key}[24] = $n2nfragment[1]; - $confighash{$key}[25] = 'IPFire n2n Client'; + $confighash{$key}[25] = 'IPFire n2n Client'; $confighash{$key}[26] = 'red'; - $confighash{$key}[27] = "$n2novpnsub[0].$n2novpnsub[1].$n2novpnsub[2].0/255.255.255.0"; - $confighash{$key}[28] = $n2nproto[0]; - $confighash{$key}[29] = $n2nport[1]; - $confighash{$key}[30] = $complzoactive; - $confighash{$key}[31] = $n2ntunmtu[1]; + $confighash{$key}[27] = "$n2novpnsub[0].$n2novpnsub[1].$n2novpnsub[2].0/255.255.255.0"; + $confighash{$key}[28] = $n2nproto[0]; + $confighash{$key}[29] = $n2nport[1]; + $confighash{$key}[30] = $complzoactive; + $confighash{$key}[31] = $n2ntunmtu[1]; &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); @@ -2655,45 +3127,194 @@ if ($confighash{$cgiparams{'KEY'}}) { } elsif (($cgiparams{'ACTION'} eq $Lang::tr{'add'}) || ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) || ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'ADVANCED'} eq '')) { - + &General::readhash("${General::swroot}/ovpn/settings", \%vpnsettings); &General::readhasharray("${General::swroot}/ovpn/caconfig", \%cahash); &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) { - if (! $confighash{$cgiparams{'KEY'}}[0]) { - $errormessage = $Lang::tr{'invalid key'}; - goto VPNCONF_END; - } - $cgiparams{'ENABLED'} = $confighash{$cgiparams{'KEY'}}[0]; - $cgiparams{'NAME'} = $confighash{$cgiparams{'KEY'}}[1]; - $cgiparams{'TYPE'} = $confighash{$cgiparams{'KEY'}}[3]; - $cgiparams{'AUTH'} = $confighash{$cgiparams{'KEY'}}[4]; - $cgiparams{'PSK'} = $confighash{$cgiparams{'KEY'}}[5]; - $cgiparams{'SIDE'} = $confighash{$cgiparams{'KEY'}}[6]; - $cgiparams{'LOCAL_SUBNET'} = $confighash{$cgiparams{'KEY'}}[8]; - $cgiparams{'REMOTE'} = $confighash{$cgiparams{'KEY'}}[10]; - $cgiparams{'REMOTE_SUBNET'} = $confighash{$cgiparams{'KEY'}}[11]; -# n2n m.a.d new fields - $cgiparams{'OVPN_MGMT'} = $confighash{$cgiparams{'KEY'}}[22]; - $cgiparams{'MSSFIX'} = $confighash{$cgiparams{'KEY'}}[23]; - $cgiparams{'FRAGMENT'} = $confighash{$cgiparams{'KEY'}}[24]; - $cgiparams{'REMARK'} = $confighash{$cgiparams{'KEY'}}[25]; - $cgiparams{'INTERFACE'} = $confighash{$cgiparams{'KEY'}}[26]; -#new fields - $cgiparams{'OVPN_SUBNET'} = $confighash{$cgiparams{'KEY'}}[27]; - $cgiparams{'PROTOCOL'} = $confighash{$cgiparams{'KEY'}}[28]; - $cgiparams{'DEST_PORT'} = $confighash{$cgiparams{'KEY'}}[29]; - $cgiparams{'COMPLZO'} = $confighash{$cgiparams{'KEY'}}[30]; - $cgiparams{'MTU'} = $confighash{$cgiparams{'KEY'}}[31]; - -#new fields -#ab hiere error uebernehmen - - } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) { + if (! $confighash{$cgiparams{'KEY'}}[0]) { + $errormessage = $Lang::tr{'invalid key'}; + goto VPNCONF_END; + } + $cgiparams{'ENABLED'} = $confighash{$cgiparams{'KEY'}}[0]; + $cgiparams{'NAME'} = $confighash{$cgiparams{'KEY'}}[1]; + $cgiparams{'TYPE'} = $confighash{$cgiparams{'KEY'}}[3]; + $cgiparams{'AUTH'} = $confighash{$cgiparams{'KEY'}}[4]; + $cgiparams{'PSK'} = $confighash{$cgiparams{'KEY'}}[5]; + $cgiparams{'SIDE'} = $confighash{$cgiparams{'KEY'}}[6]; + $cgiparams{'LOCAL_SUBNET'} = $confighash{$cgiparams{'KEY'}}[8]; + $cgiparams{'REMOTE'} = $confighash{$cgiparams{'KEY'}}[10]; + $cgiparams{'REMOTE_SUBNET'} = $confighash{$cgiparams{'KEY'}}[11]; + $cgiparams{'OVPN_MGMT'} = $confighash{$cgiparams{'KEY'}}[22]; + $cgiparams{'MSSFIX'} = $confighash{$cgiparams{'KEY'}}[23]; + $cgiparams{'FRAGMENT'} = $confighash{$cgiparams{'KEY'}}[24]; + $cgiparams{'REMARK'} = $confighash{$cgiparams{'KEY'}}[25]; + $cgiparams{'INTERFACE'} = $confighash{$cgiparams{'KEY'}}[26]; + $cgiparams{'OVPN_SUBNET'} = $confighash{$cgiparams{'KEY'}}[27]; + $cgiparams{'PROTOCOL'} = $confighash{$cgiparams{'KEY'}}[28]; + $cgiparams{'DEST_PORT'} = $confighash{$cgiparams{'KEY'}}[29]; + $cgiparams{'COMPLZO'} = $confighash{$cgiparams{'KEY'}}[30]; + $cgiparams{'MTU'} = $confighash{$cgiparams{'KEY'}}[31]; + $cgiparams{'CHECK1'} = $confighash{$cgiparams{'KEY'}}[32]; + my $name=$cgiparams{'CHECK1'} ; + $cgiparams{$name} = $confighash{$cgiparams{'KEY'}}[33]; + $cgiparams{'RG'} = $confighash{$cgiparams{'KEY'}}[34]; + $cgiparams{'CCD_DNS1'} = $confighash{$cgiparams{'KEY'}}[35]; + $cgiparams{'CCD_DNS2'} = $confighash{$cgiparams{'KEY'}}[36]; + $cgiparams{'CCD_WINS'} = $confighash{$cgiparams{'KEY'}}[37]; + } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) { $cgiparams{'REMARK'} = &Header::cleanhtml($cgiparams{'REMARK'}); - if ($cgiparams{'TYPE'} !~ /^(host|net)$/) { +#A.Marx CCD check iroute field and convert it to decimal + + my @temp=(); + my %ccdroutehash=(); + my $keypoint=0; + if ($cgiparams{'IR'} ne ''){ + @temp = split("\n",$cgiparams{'IR'}); + &General::readhasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); + #find key to use + foreach my $key (keys %ccdroutehash) { + if ($ccdroutehash{$key}[0] eq $cgiparams{'NAME'}) { + $keypoint=$key; + delete $ccdroutehash{$key}; + }else{ + $keypoint = &General::findhasharraykey (\%ccdroutehash); + } + } + $ccdroutehash{$keypoint}[0]=$cgiparams{'NAME'}; + my $i=1; + my $val=0; + foreach $val (@temp){ + chomp($val); + $val=~s/\s*$//g; + my($ip,$cidr) = split(/\//,$val); + $cidr=&General::iporsubtodec($cidr); + + #check if iroute exists in ccdroute + foreach my $key (keys %ccdroutehash) { + foreach my $oldiroute ( 1 .. $#{$ccdroutehash{$key}}){ + if ($ccdroutehash{$key}[$oldiroute] eq "$ip/$cidr") { + $errormessage=$Lang::tr{'ccd err irouteexist'}; + goto VPNCONF_ERROR; + } + } + } + + #check for existing network IP's + if ((&General::IpInSubnet ($ip,$netsettings{GREEN_NETADDRESS},$netsettings{GREEN_NETMASK}) && $netsettings{GREEN_NETADDRESS} ne '0.0.0.0')|| + (&General::IpInSubnet ($ip,$netsettings{RED_NETADDRESS},$netsettings{RED_NETMASK}) && $netsettings{RED_NETADDRESS} ne '0.0.0.0')|| + (&General::IpInSubnet ($ip,$netsettings{BLUE_NETADDRESS},$netsettings{BLUE_NETMASK}) && $netsettings{BLUE_NETADDRESS} ne '0.0.0.0' && $netsettings{BLUE_NETADDRESS} gt '')|| + (&General::IpInSubnet ($ip,$netsettings{ORANGE_NETADDRESS},$netsettings{ORANGE_NETMASK}) && $netsettings{ORANGE_NETADDRESS} ne '0.0.0.0' && $netsettings{ORANGE_NETADDRESS} gt '' )){ + $errormessage="$ip USED FOR SYSTEM!"; + goto VPNCONF_ERROR; + } + + + + if (&General::validipandmask($val)){ + $ccdroutehash{$keypoint}[$i] = $ip."/".$cidr; + }else{ + $errormessage=$errormessage."Route ".$Lang::tr{'ccd invalid'}." ($ip/$cidr)"; + goto VPNCONF_ERROR; + } + $i++; + } + &General::writehasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); + &writeserverconf; + }else{ + &General::readhasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); + foreach my $key (keys %ccdroutehash) { + if ($ccdroutehash{$key}[0] eq $cgiparams{'NAME'}) { + delete $ccdroutehash{$key}; + &General::writehasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); + &writeserverconf; + } + } + } + undef @temp; + #check route field and convert it to decimal + my %ccdroute2hash=(); + my $val=0; + my $i=1; + + &General::readhasharray("${General::swroot}/ovpn/ccdroute2", \%ccdroute2hash); + if($cgiparams{'IFROUTE'} eq $Lang::tr{'ccd none'} || $cgiparams{'IFROUTE'} eq '') { + undef $cgiparams{'IFROUTE'}; + foreach my $key (keys %ccdroute2hash){ + if ($ccdroute2hash{$key}[0] eq $cgiparams{'NAME'}) { + delete $ccdroute2hash{$key}; + } + } + &General::writehasharray("${General::swroot}/ovpn/ccdroute2", \%ccdroute2hash); + }else{ + #find key to use + foreach my $key (keys %ccdroute2hash) { + if ($ccdroute2hash{$key}[0] eq $cgiparams{'NAME'}) { + $keypoint=$key; + delete $ccdroute2hash{$key}; + }else{ + $keypoint = &General::findhasharraykey (\%ccdroute2hash); + &General::writehasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); + &writeserverconf; + } + } + $ccdroute2hash{$keypoint}[0]=$cgiparams{'NAME'}; + @temp = split(/\|/,$cgiparams{'IFROUTE'}); + my %ownnet=(); + &General::readhash("${General::swroot}/ethernet/settings", \%ownnet); + foreach $val (@temp){ + chomp($val); + $val=~s/\s*$//g; + if ($val eq $Lang::tr{'green'}) + { + $val=$ownnet{GREEN_NETADDRESS}."/".$ownnet{GREEN_NETMASK}; + } + if ($val eq $Lang::tr{'blue'}) + { + $val=$ownnet{BLUE_NETADDRESS}."/".$ownnet{BLUE_NETMASK}; + } + if ($val eq $Lang::tr{'orange'}) + { + $val=$ownnet{ORANGE_NETADDRESS}."/".$ownnet{ORANGE_NETMASK}; + } + my ($ip,$cidr) = split (/\//, $val); + if (! &check_routes_push($val)){$errormessage=$errormessage."Route $val ".$Lang::tr{'ccd err routeovpn2'}." ($val)";goto VPNCONF_ERROR;} + if (! &check_ccdroute($val)){$errormessage=$errormessage."<br>Route $val ".$Lang::tr{'ccd err inuse'}." ($val)" ;goto VPNCONF_ERROR;} + if (! &check_ccdconf($val)){$errormessage=$errormessage."<br>Route $val ".$Lang::tr{'ccd err routeovpn'}." ($val)";goto VPNCONF_ERROR;} + if (&General::validipandmask($val)){ + $val=$ip."/".&General::iporsubtodec($cidr); + $ccdroute2hash{$keypoint}[$i] = $val; + }else{ + $errormessage=$errormessage."Route ".$Lang::tr{'ccd invalid'}." ($val)"; + goto VPNCONF_ERROR; + } + $i++; + } + &General::writehasharray("${General::swroot}/ovpn/ccdroute2", \%ccdroute2hash); + } + #check dns1 ip + if ($cgiparams{'CCD_DNS1'} ne '' && ! &General::validip($cgiparams{'CCD_DNS1'})) { + $errormessage=$errormessage."<br>".$Lang::tr{'invalid input for dhcp dns'}." 1"; + goto VPNCONF_ERROR; + } + #check dns2 ip + if ($cgiparams{'CCD_DNS2'} ne '' && ! &General::validip($cgiparams{'CCD_DNS2'})) { + $errormessage=$errormessage."<br>".$Lang::tr{'invalid input for dhcp dns'}." 2"; + goto VPNCONF_ERROR; + } + #check wins ip + if ($cgiparams{'CCD_WINS'} ne '' && ! &General::validip($cgiparams{'CCD_WINS'})) { + $errormessage=$errormessage."<br>".$Lang::tr{'invalid input for dhcp wins'}; + goto VPNCONF_ERROR; + } + + +#CCD End + + + if ($cgiparams{'TYPE'} !~ /^(host|net)$/) { $errormessage = $Lang::tr{'connection type is invalid'}; if ($cgiparams{'TYPE'} eq 'net') { unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; @@ -3143,45 +3764,119 @@ if ($cgiparams{'TYPE'} eq 'net') { # Save the config my $key = $cgiparams{'KEY'}; + if (! $key) { $key = &General::findhasharraykey (\%confighash); - foreach my $i (0 .. 31) { $confighash{$key}[$i] = "";} + foreach my $i (0 .. 38) { $confighash{$key}[$i] = "";} } - $confighash{$key}[0] = $cgiparams{'ENABLED'}; - $confighash{$key}[1] = $cgiparams{'NAME'}; + $confighash{$key}[0] = $cgiparams{'ENABLED'}; + $confighash{$key}[1] = $cgiparams{'NAME'}; if ((! $cgiparams{'KEY'}) && $cgiparams{'AUTH'} ne 'psk') { - $confighash{$key}[2] = $cgiparams{'CERT_NAME'}; + $confighash{$key}[2] = $cgiparams{'CERT_NAME'}; } - $confighash{$key}[3] = $cgiparams{'TYPE'}; + + $confighash{$key}[3] = $cgiparams{'TYPE'}; if ($cgiparams{'AUTH'} eq 'psk') { - $confighash{$key}[4] = 'psk'; - $confighash{$key}[5] = $cgiparams{'PSK'}; + $confighash{$key}[4] = 'psk'; + $confighash{$key}[5] = $cgiparams{'PSK'}; } else { - $confighash{$key}[4] = 'cert'; + $confighash{$key}[4] = 'cert'; } if ($cgiparams{'TYPE'} eq 'net') { - $confighash{$key}[6] = $cgiparams{'SIDE'}; - $confighash{$key}[11] = $cgiparams{'REMOTE_SUBNET'}; + $confighash{$key}[6] = $cgiparams{'SIDE'}; + $confighash{$key}[11] = $cgiparams{'REMOTE_SUBNET'}; } - $confighash{$key}[8] = $cgiparams{'LOCAL_SUBNET'}; - $confighash{$key}[10] = $cgiparams{'REMOTE'}; + $confighash{$key}[8] = $cgiparams{'LOCAL_SUBNET'}; + $confighash{$key}[10] = $cgiparams{'REMOTE'}; if ($cgiparams{'OVPN_MGMT'} eq '') { - $confighash{$key}[22] = $confighash{$key}[29]; + $confighash{$key}[22] = $confighash{$key}[29]; } else { - $confighash{$key}[22] = $cgiparams{'OVPN_MGMT'}; + $confighash{$key}[22] = $cgiparams{'OVPN_MGMT'}; } - $confighash{$key}[23] = $cgiparams{'MSSFIX'}; - $confighash{$key}[24] = $cgiparams{'FRAGMENT'}; - $confighash{$key}[25] = $cgiparams{'REMARK'}; - $confighash{$key}[26] = $cgiparams{'INTERFACE'}; + $confighash{$key}[23] = $cgiparams{'MSSFIX'}; + $confighash{$key}[24] = $cgiparams{'FRAGMENT'}; + $confighash{$key}[25] = $cgiparams{'REMARK'}; + $confighash{$key}[26] = $cgiparams{'INTERFACE'}; # new fields - $confighash{$key}[27] = $cgiparams{'OVPN_SUBNET'}; - $confighash{$key}[28] = $cgiparams{'PROTOCOL'}; - $confighash{$key}[29] = $cgiparams{'DEST_PORT'}; - $confighash{$key}[30] = $cgiparams{'COMPLZO'}; - $confighash{$key}[31] = $cgiparams{'MTU'}; -# new fileds + $confighash{$key}[27] = $cgiparams{'OVPN_SUBNET'}; + $confighash{$key}[28] = $cgiparams{'PROTOCOL'}; + $confighash{$key}[29] = $cgiparams{'DEST_PORT'}; + $confighash{$key}[30] = $cgiparams{'COMPLZO'}; + $confighash{$key}[31] = $cgiparams{'MTU'}; + $confighash{$key}[32] = $cgiparams{'CHECK1'}; + my $name=$cgiparams{'CHECK1'}; + $confighash{$key}[33] = $cgiparams{$name}; + $confighash{$key}[34] = $cgiparams{'RG'}; + $confighash{$key}[35] = $cgiparams{'CCD_DNS1'}; + $confighash{$key}[36] = $cgiparams{'CCD_DNS2'}; + $confighash{$key}[37] = $cgiparams{'CCD_WINS'}; + + &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); + + if ($cgiparams{'CHECK1'} ){ + + my ($ccdip,$ccdsub)=split "/",$cgiparams{$name}; + my ($a,$b,$c,$d) = split (/\./,$ccdip); + if ( -e "${General::swroot}/ovpn/ccd/$confighash{$key}[2]"){unlink "${General::swroot}/ovpn/ccd/$cgiparams{'CERT_NAME'}";} + open ( CCDRWCONF,'>',"${General::swroot}/ovpn/ccd/$confighash{$key}[2]") or die "Unable to create clientconfigfile $!"; + print CCDRWCONF "# OpenVPN Clientconfig from CCD extension by Copymaster#\n\n"; + if($cgiparams{'CHECK1'} eq 'dynamic'){ + print CCDRWCONF "#This client uses the dynamic pool\n"; + }else{ + print CCDRWCONF "#Ip address client and Server\n"; + print CCDRWCONF "ifconfig-push $ccdip ".&General::getlastip($ccdip,1)."\n"; + } + if ($confighash{$key}[34] eq 'on'){ + print CCDRWCONF "\n#Redirect Gateway: \n#All IP traffic is redirected through the vpn \n"; + print CCDRWCONF "push redirect-gateway\n"; + } + if ($cgiparams{'IR'} ne ''){ + print CCDRWCONF "\n#Client routes these Networks (behind Client)\n"; + foreach my $key (keys %ccdroutehash){ + if ($ccdroutehash{$key}[0] eq $cgiparams{'NAME'}){ + foreach my $i ( 1 .. $#{$ccdroutehash{$key}}){ + my ($a,$b)=split (/\//,$ccdroutehash{$key}[$i]); + print CCDRWCONF "iroute $a $b\n"; + } + } + } + } + if ($cgiparams{'IFROUTE'} ne ''){ + print CCDRWCONF "\n#Client gets routes to these Networks (behind IPFIRE)\n"; + foreach my $key (keys %ccdroute2hash){ + if ($ccdroute2hash{$key}[0] eq $cgiparams{'NAME'}){ + foreach my $i ( 1 .. $#{$ccdroute2hash{$key}}){ + if($ccdroute2hash{$key}[$i] eq $Lang::tr{'blue'}){ + my %blue=(); + &General::readhash("${General::swroot}/ethernet/settings", \%blue); + print CCDRWCONF "push \"route $blue{BLUE_ADDRESS} $blue{BLUE_NETMASK}\n"; + }elsif($ccdroute2hash{$key}[$i] eq $Lang::tr{'orange'}){ + my %orange=(); + &General::readhash("${General::swroot}/ethernet/settings", \%orange); + print CCDRWCONF "push \"route $orange{ORANGE_ADDRESS} $orange{ORANGE_NETMASK}\n"; + }else{ + my ($a,$b)=split (/\//,$ccdroute2hash{$key}[$i]); + print CCDRWCONF "push \"route $a $b\"\n"; + } + } + } + } + } + if(($cgiparams{'CCD_DNS1'} eq '') && ($cgiparams{'CCD_DNS1'} ne '')){ $cgiparams{'CCD_DNS1'} = $cgiparams{'CCD_DNS2'};$cgiparams{'CCD_DNS2'}='';} + if($cgiparams{'CCD_DNS1'} ne ''){ + print CCDRWCONF "\n#Client gets these Nameservers\n"; + print CCDRWCONF "push \"dhcp-option DNS $cgiparams{'CCD_DNS1'}\" \n"; + } + if($cgiparams{'CCD_DNS2'} ne ''){ + print CCDRWCONF "push \"dhcp-option DNS $cgiparams{'CCD_DNS2'}\" \n"; + } + if($cgiparams{'CCD_WINS'} ne ''){ + print CCDRWCONF "\n#Client gets this WINS server\n"; + print CCDRWCONF "push \"dhcp-option WINS $cgiparams{'CCD_WINS'}\" \n"; + } + close CCDRWCONF; + } ### # m.a.d n2n begin @@ -3308,12 +4003,17 @@ if ($cgiparams{'TYPE'} eq 'net') { } &Header::openbox('100%', 'LEFT', "$Lang::tr{'connection'}:"); - print "<table width='100%'>\n"; - print "<tr><td width='25%' class='boldbase'>$Lang::tr{'name'}:</td>"; + print "<table width='100%' border='0'>\n"; + + + + print "<tr><td width='14%' class='boldbase'>$Lang::tr{'name'}: </td>"; + if ($cgiparams{'TYPE'} eq 'host') { if ($cgiparams{'KEY'}) { - print "<td width='35%' class='base'><input type='hidden' name='NAME' value='$cgiparams{'NAME'}' />$cgiparams{'NAME'}</td>\n"; + print "<td width='35%' class='base'><input type='hidden' name='NAME' value='$cgiparams{'NAME'}' />$cgiparams{'NAME'}</td>"; } else { + print "<td width='35%'><input type='text' name='NAME' value='$cgiparams{'NAME'}' maxlength='20' size='30' /></td>"; } # print "<tr><td>$Lang::tr{'interface'}</td>"; @@ -3333,6 +4033,9 @@ if ($cgiparams{'TYPE'} eq 'net') { } else { print "<td width='25%'><input type='text' name='NAME' value='$cgiparams{'NAME'}' maxlength='20' /></td>"; } + + + print <<END <td width='25%'> </td> <td width='25%'> </td></tr> @@ -3374,46 +4077,64 @@ if ($cgiparams{'TYPE'} eq 'net') { <td colspan='2'>$Lang::tr{'openvpn default'}: <span class="base">$Lang::tr{'destination port'}</span></td> END - ; +; } print "<tr><td class='boldbase'>$Lang::tr{'remark title'} <img src='/blob.gif' /></td>"; - print "<td colspan='3'><input type='text' name='REMARK' value='$cgiparams{'REMARK'}' size='55' maxlength='50' /></td></tr>"; + print "<td colspan='3'><input type='text' name='REMARK' value='$cgiparams{'REMARK'}' size='55' maxlength='50' /></td></tr></table>"; if ($cgiparams{'TYPE'} eq 'host') { + print "<tr><td>$Lang::tr{'enabled'} <input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td>"; + } - print "<tr><td>$Lang::tr{'enabled'} <input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td>\n"; - } - -# if ($cgiparams{'KEY'}) { -# print "<td colspan='3'> </td></tr></table>"; -# } else { -# print "<td colspan='3'><input type='checkbox' name='EDIT_ADVANCED' $checked{'EDIT_ADVANCED'}{'on'} /> $Lang::tr{'edit advanced settings when done'}</tr></table>"; -# } -# }else{ - print "<td colspan='3'> </td></tr></table>"; -# } - + print"</tr></table><br><br>"; +#A.Marx CCD new client - + print "<table border='0' width='100%' cellspacing='1' cellpadding='0'><tr><td colspan='3'><hr><br><b>$Lang::tr{'ccd choose net'}</td></tr><tr><td height='20' colspan='3'></td></tr>"; + my %ccdconfhash=(); + my %ccdroutehash=(); + my %ccdroute2hash=(); + my %vpnnet=(); + my $vpnip; + &General::readhash("${General::swroot}/ovpn/settings", \%vpnnet); + $vpnip=$vpnnet{'DOVPN_SUBNET'}; + &General::readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash); + my @ccdconf=(); + my $count=0; + my $checked; + $checked{'check1'}{'off'} = ''; + $checked{'check1'}{'on'} = ''; + $checked{'check1'}{$cgiparams{'CHECK1'}} = 'CHECKED'; + print"<tr><td align='center' width='1%' valign='top'><input type='radio' name='CHECK1' value='dynamic' checked /></td><td align='left' valign='top' width='35%'>$Lang::tr{'ccd dynrange'} ($vpnip)</td><td width='30%'>"; + print"</td></tr></table><br><br>"; + my $name=$cgiparams{'CHECK1'}; + $checked{'RG'}{$cgiparams{'RG'}} = 'CHECKED'; + + if (! -z "${General::swroot}/ovpn/ccd.conf"){ + print"<table border='0' width='100%' cellspacing='1' cellpadding='0'><tr><td width='1%'></td><td width='30%' class='boldbase' align='center'><b>$Lang::tr{'ccd name'}</td><td width='15%' class='boldbase' align='center'><b>$Lang::tr{'network'}</td><td class='boldbase' align='center' width='18%'><b>$Lang::tr{'ccd clientip'}</td></tr>"; + foreach my $key (keys %ccdconfhash) { + $count++; + @ccdconf=($ccdconfhash{$key}[0],$ccdconfhash{$key}[1]); + if ($count % 2){print"<tr bgcolor='$color{'color22'}'>";}else{print"<tr bgcolor='$color{'color20'}'>";} + print"<td align='center' width='1%'><input type='radio' name='CHECK1' value='$ccdconf[0]' $checked{'check1'}{$ccdconf[0]}/></td><td>$ccdconf[0]</td><td width='40%' align='center'>$ccdconf[1]</td><td align='left' width='10%'>"; + &fillselectbox($ccdconf[1],$ccdconf[0],$cgiparams{$name}); + print"</td></tr>"; + } + print "</table><br><br><hr><br><br>"; + } +# ccd end &Header::closebox(); - if ($cgiparams{'KEY'} && $cgiparams{'AUTH'} eq 'psk') { - # &Header::openbox('100%', 'LEFT', $Lang::tr{'authentication'}); - # print <<END - # <table width='100%' cellpadding='0' cellspacing='5' border='0'> - # <tr><td class='base' width='50%'>$Lang::tr{'use a pre-shared key'}</td> - # <td class='base' width='50%'><input type='text' name='PSK' size='30' value='$cgiparams{'PSK'}' /></td></tr> - # </table> -END - # ; - # &Header::closebox(); - } elsif (! $cgiparams{'KEY'}) { + + } elsif (! $cgiparams{'KEY'}) { + + my $disabled=''; my $cakeydisabled=''; my $cacrtdisabled=''; if ( ! -f "${General::swroot}/ovpn/ca/cakey.pem" ) { $cakeydisabled = "disabled='disabled'" } else { $cakeydisabled = "" }; if ( ! -f "${General::swroot}/ovpn/ca/cacert.pem" ) { $cacrtdisabled = "disabled='disabled'" } else { $cacrtdisabled = "" }; + &Header::openbox('100%', 'LEFT', $Lang::tr{'authentication'}); @@ -3510,8 +4231,96 @@ END ### ; &Header::closebox(); + + } + print"<br><br>"; + &Header::openbox('100%', 'LEFT', "$Lang::tr{'ccd client options'}:"); + +#A.Marx CCD new client + + print <<END; + <table border='0' width='100%'> + <tr><td width='20%'>Redirect Gateway:</td><td colspan='3'><input type='checkbox' name='RG' $checked{'RG'}{'on'} /></td></tr> + <tr><td colspan='4'><b><br>$Lang::tr{'ccd routes'}</b></td></tr> + <tr><td colspan='4'>&nbsp</td></tr> + <tr><td valign='top'>$Lang::tr{'ccd iroute'}</td><td align='left' width='30%'><textarea name='IR' cols='26' rows='6' wrap='off'> +END + + if ($cgiparams{'IR'} ne ''){ + print $cgiparams{'IR'}; + }else{ + &General::readhasharray ("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); + foreach my $key (keys %ccdroutehash) { + if( $cgiparams{'NAME'} eq $ccdroutehash{$key}[0]){ + foreach my $i (1 .. $#{$ccdroutehash{$key}}) { + if ($ccdroutehash{$key}[$i] ne ''){ + print $ccdroutehash{$key}[$i]."\n"; + } + $cgiparams{'IR'} .= $ccdroutehash{$key}[$i]; + } + } + } } + + print <<END; +</textarea></td><td valign='top' colspan='2'>$Lang::tr{'ccd iroutehint'}</td></tr> + <tr><td colspan='4'><br></td></tr> + <tr><td valign='top' rowspan='3'>$Lang::tr{'ccd iroute2'}</td><td align='left' valign='top' rowspan='3'><select name='IFROUTE' style="width: 205px"; size='6' multiple> +END + our @current = (); + open(FILE, "${General::swroot}/main/routing") ; + @current = <FILE>; + close (FILE); + &General::readhasharray ("${General::swroot}/ovpn/ccdroute2", \%ccdroute2hash); + my $set=0; + my $selorange=0; + my $selblue=0; + my $helpblue=0; + my $helporange=0; + print"<option>$Lang::tr{'ccd none'}</option>"; + print"<option selected>$Lang::tr{'green'}</option>"; + + foreach my $line (@current) { + chomp($line); # remove newline + my @temp=split(/\,/,$line); + $temp[1] = '' unless defined $temp[1]; # not always populated + my ($a,$b) = split(/\//,$temp[1]); + $temp[1] = $a."/".&General::iporsubtocidr($b); + foreach my $key (keys %ccdroute2hash) { + if($ccdroute2hash{$key}[0] eq $cgiparams{'NAME'}){ + foreach my $i (1 .. $#{$ccdroute2hash{$key}}) { + + if($ccdroute2hash{$key}[$i] eq $a."/".&General::iporsubtodec($b)){ + $set=1; + } + if (&haveBlueNet()){ + if($netsettings{'BLUE_NETADDRESS'}."/".&General::iporsubtodec($netsettings{'BLUE_NETMASK'} eq $ccdroute2hash{$key}[$i])) { + $selblue=1; + + } + } + if (&haveOrangeNet()){ + if($netsettings{'ORANGE_NETADDRESS'}."/".&General::iporsubtodec($netsettings{'ORANGE_NETMASK'}) eq $ccdroute2hash{$key}[$i]) { + $selorange=1; + } + } + } + } + } + if ($set == '1'){ print"<option selected>$temp[1]</option>";$set=0;}else{print"<option>$temp[1]</option>";} + if (&haveBlueNet() && $selblue == '1'){ print"<option selected>$Lang::tr{'blue'}</option>";$selblue=0;}elsif(&haveBlueNet() && $selblue == '0'){print"<option>$Lang::tr{'blue'}</option>";} + if (&haveOrangeNet() && $selorange == '1'){ print"<option selected>$Lang::tr{'orange'}</option>";$selorange=0;}elsif(&haveOrangeNet() && $selorange == '0'){print"<option>$Lang::tr{'orange'}</option>";} + } + print<<END + </select></td><td valign='top'>DNS1:</td><td valign='top'><input type='TEXT' name='CCD_DNS1' value='$cgiparams{'CCD_DNS1'}' size='30' /></td></tr> + <tr valign='top'><td>DNS2:</td><td><input type='TEXT' name='CCD_DNS2' value='$cgiparams{'CCD_DNS2'}' size='30' /></td></tr> + <tr valign='top'><td valign='top'>WINS:</td><td><input type='TEXT' name='CCD_WINS' value='$cgiparams{'CCD_WINS'}' size='30' /></td></tr></table><br><hr> + +END +; + &Header::closebox(); + print "<div align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' />"; if ($cgiparams{'KEY'}) { # print "<input type='submit' name='ACTION' value='$Lang::tr{'advanced'}' />"; @@ -3538,24 +4347,21 @@ END my @status = `/bin/cat /var/log/ovpnserver.log`; if ($cgiparams{'VPN_IP'} eq '' && -e "${General::swroot}/red/active") { - if (open(IPADDR, "${General::swroot}/red/local-ipaddress")) { - my $ipaddr = <IPADDR>; - close IPADDR; - chomp ($ipaddr); - $cgiparams{'VPN_IP'} = (gethostbyaddr(pack("C4", split(/\./, $ipaddr)), 2))[0]; - if ($cgiparams{'VPN_IP'} eq '') { - $cgiparams{'VPN_IP'} = $ipaddr; - } - } + if (open(IPADDR, "${General::swroot}/red/local-ipaddress")) { + my $ipaddr = <IPADDR>; + close IPADDR; + chomp ($ipaddr); + $cgiparams{'VPN_IP'} = (gethostbyaddr(pack("C4", split(/\./, $ipaddr)), 2))[0]; + if ($cgiparams{'VPN_IP'} eq '') { + $cgiparams{'VPN_IP'} = $ipaddr; + } + } } #default setzen if ($cgiparams{'DCIPHER'} eq '') { $cgiparams{'DCIPHER'} = 'BF-CBC'; } -# if ($cgiparams{'DCOMPLZO'} eq '') { -# $cgiparams{'DCOMPLZO'} = 'on'; -# } if ($cgiparams{'DDEST_PORT'} eq '') { $cgiparams{'DDEST_PORT'} = '1194'; } @@ -3565,8 +4371,7 @@ END if ($cgiparams{'DOVPN_SUBNET'} eq '') { $cgiparams{'DOVPN_SUBNET'} = '10.' . int(rand(256)) . '.' . int(rand(256)) . '.0/255.255.255.0'; } - - $checked{'ENABLED'}{'off'} = ''; + $checked{'ENABLED'}{'off'} = ''; $checked{'ENABLED'}{'on'} = ''; $checked{'ENABLED'}{$cgiparams{'ENABLED'}} = 'CHECKED'; $checked{'ENABLED_BLUE'}{'off'} = ''; @@ -3626,8 +4431,8 @@ END $activeonrun = "disabled='disabled'"; } &Header::openbox('100%', 'LEFT', $Lang::tr{'global settings'}); - print <<END - <table width='100%'> + print <<END + <table width='100%' border=0> <form method='post'> <td width='25%'> </td> <td width='25%'> </td> @@ -3635,7 +4440,7 @@ END <tr><td class='boldbase'>$Lang::tr{'ovpn server status'}</td> <td align='left'>$sactive</td> <tr><td class='boldbase'>$Lang::tr{'ovpn on red'}</td> - <td><input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td> + <td><input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td> END ; if (&haveBlueNet()) { @@ -3674,18 +4479,20 @@ END <option value='CAST5-CBC' $selected{'DCIPHER'}{'CAST5-CBC'}>CAST5-CBC</option> <option value='AES-128-CBC' $selected{'DCIPHER'}{'AES-128-CBC'}>AES-128-CBC</option> <option value='AES-192-CBC' $selected{'DCIPHER'}{'AES-192-CBC'}>AES-192-CBC</option> - <option value='AES-256-CBC' $selected{'DCIPHER'}{'AES-256-CBC'}>AES-256-CBC</option></select></td> + <option value='AES-256-CBC' $selected{'DCIPHER'}{'AES-256-CBC'}>AES-256-CBC</option></select></td></tr> + <tr><td colspan='4'><hr /></td></tr> END ; if ( $srunning eq "yes" ) { - print "<tr><td align='left'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' disabled='disabled' /></td>"; - print "<td><input type='submit' name='ACTION' value='$Lang::tr{'advanced server'}' disabled='disabled'/></td>"; - print "<td><input type='submit' name='ACTION' value='$Lang::tr{'stop ovpn server'}' /></td>"; - print "<td><input type='submit' name='ACTION' value='$Lang::tr{'restart ovpn server'}' /></td></tr>"; + print "<tr><td align='right' colspan='4'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' disabled='disabled' />"; + print "<input type='submit' name='ACTION' value='$Lang::tr{'ccd net'}' />"; + print "<input type='submit' name='ACTION' value='$Lang::tr{'advanced server'}' />"; + print "<input type='submit' name='ACTION' value='$Lang::tr{'stop ovpn server'}' /></td></tr>"; } else{ - print "<tr><td align='left'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>"; - print "<td><input type='submit' name='ACTION' value='$Lang::tr{'advanced server'}' /></td>"; + print "<tr><td align='right' colspan='4'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' />"; + print "<input type='submit' name='ACTION' value='$Lang::tr{'ccd net'}' />"; + print "<input type='submit' name='ACTION' value='$Lang::tr{'advanced server'}' />"; if (( -e "${General::swroot}/ovpn/ca/cacert.pem" && -e "${General::swroot}/ovpn/ca/dh1024.pem" && -e "${General::swroot}/ovpn/certs/servercert.pem" && @@ -3693,11 +4500,9 @@ END (( $cgiparams{'ENABLED'} eq 'on') || ( $cgiparams{'ENABLED_BLUE'} eq 'on') || ( $cgiparams{'ENABLED_ORANGE'} eq 'on'))){ - print "<td><input type='submit' name='ACTION' value='$Lang::tr{'start ovpn server'}' /></td>"; - print "<td><input type='submit' name='ACTION' value='$Lang::tr{'restart ovpn server'}' /></td></tr>"; + print "<input type='submit' name='ACTION' value='$Lang::tr{'start ovpn server'}' /></td></tr>"; } else { - print "<td><input type='submit' name='ACTION' value='$Lang::tr{'start ovpn server'}' disabled='disabled' /></td>"; - print "<td><input type='submit' name='ACTION' value='$Lang::tr{'restart ovpn server'}' disabled='disabled' /></td></tr>"; + print "<input type='submit' name='ACTION' value='$Lang::tr{'start ovpn server'}' disabled='disabled' /></td></tr>"; } } print "</form></table>"; @@ -3829,18 +4634,19 @@ END </tr> </table> END - ; +; } - print <<END - <form method='post' enctype='multipart/form-data'> - <table width='100%' border='0' cellspacing='1' cellpadding='0'> - <tr><td class='base' nowrap='nowrap'>$Lang::tr{'ca name'}:</td> - <td nowrap='nowrap'><input type='text' name='CA_NAME' value='$cgiparams{'CA_NAME'}' size='15' /> - <td nowrap='nowrap'><input type='file' name='FH' size='30' /></td> - <td nowrap='nowrap'><input type='submit' name='ACTION' value='$Lang::tr{'upload ca certificate'}' /><br /><input type='submit' name='ACTION' value='$Lang::tr{'show crl'}' /></td> - </tr></table></form> + +print <<END +<form method='post' enctype='multipart/form-data'> +<table width='100%' border='0'> +<tr><td class='base' nowrap='nowrap'>$Lang::tr{'ca name'}:</td><td nowrap='nowrap' width='8%'><input type='text' name='CA_NAME' value='$cgiparams{'CA_NAME'}' size='15' align='left'/></td><td nowrap='nowrap' align='right'><input type='file' name='FH' size='25' /><input type='submit' name='ACTION' value='$Lang::tr{'upload ca certificate'}' /></td></tr> +<tr><td colspan='4'><hr /></td></tr> +<tr align='right'><td colspan='4' align='right' width='80%'><input type='submit' name='ACTION' value='$Lang::tr{'show crl'}' /></td></tr> +</table> END - ; +; + &Header::closebox(); if ( $srunning eq "yes" ) { @@ -3863,8 +4669,7 @@ END <tr> <td width='10%' class='boldbase' align='center'><b>$Lang::tr{'name'}</b></td> <td width='15%' class='boldbase' align='center'><b>$Lang::tr{'type'}</b></td> - <td width='18%' class='boldbase' align='center'><b>$Lang::tr{'common name'}</b></td> - <td width='22%' class='boldbase' align='center'><b>$Lang::tr{'valid till'}</b></td> + <td width='22%' class='boldbase' align='center'><b>$Lang::tr{'network'}</b></td> <td width='20%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b></td> <td width='10%' class='boldbase' align='center'><b>$Lang::tr{'status'}</b></td> <td width='5%' class='boldbase' colspan='6' align='center'><b>$Lang::tr{'action'}</b></td> @@ -3883,15 +4688,17 @@ END } print "<td align='center' nowrap='nowrap'>$confighash{$key}[1]</td>"; print "<td align='center' nowrap='nowrap'>" . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")</td>"; - if ($confighash{$key}[4] eq 'cert') { - print "<td align='left' nowrap='nowrap'>$confighash{$key}[2]</td>"; - } else { - print "<td align='left'> </td>"; - } + #if ($confighash{$key}[4] eq 'cert') { + #print "<td align='left' nowrap='nowrap'>$confighash{$key}[2]</td>"; + #} else { + #print "<td align='left'> </td>"; + #} my $cavalid = `/usr/bin/openssl x509 -text -in ${General::swroot}/ovpn/certs/$confighash{$key}[1]cert.pem`; $cavalid =~ /Not After : (.*)[\n]/; $cavalid = $1; - print "<td align='center'>$cavalid</td>"; + if ($confighash{$key}[32] eq "" && $confighash{$key}[3] eq 'net' ){$confighash{$key}[32]="net-2-net";} + if ($confighash{$key}[32] eq "" && $confighash{$key}[3] eq 'host' ){$confighash{$key}[32]="dynamic";} + print "<td align='center'>$confighash{$key}[32]</td>"; print "<td align='center'>$confighash{$key}[25]</td>"; my $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>"; @@ -4029,7 +4836,7 @@ END # If the config file contains entries, print Key to action icons if ( $id ) { print <<END - <table> + <table border='0'> <tr> <td class='boldbase'>  <b>$Lang::tr{'legend'}:</b></td> <td>  <img src='/images/on.gif' alt='$Lang::tr{'click to disable'}' /></td> @@ -4050,7 +4857,7 @@ END <td> <img src='/images/openvpn.png' alt='?RELOAD'/></td> <td class='base'>$Lang::tr{'dl client arch'}</td> </tr> - </table> + </table><hr> END ; } @@ -4058,8 +4865,8 @@ END print <<END <table width='100%'> <form method='post'> - <tr><td width='50%' ><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td> - <td width='50%' ><input type='submit' name='ACTION' value='$Lang::tr{'ovpn con stat'}' $activeonrun /></td></tr> + <tr><td align='right'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /> + <input type='submit' name='ACTION' value='$Lang::tr{'ovpn con stat'}' $activeonrun /></td></tr> </form> </table> END diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index f686c30..cb29cf1 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -351,6 +351,7 @@ 'arp table entries' => 'Einträge der ARP-Tabelle:', 'artist' => 'Künstler', 'attemps' => 'Versuche', +'attention' => 'ACHTUNG', 'august' => 'August', 'authentication' => 'Authentifizierung:', 'automatic' => 'Automatisch', @@ -455,6 +456,42 @@ 'capsopen' => 'VERBUNDEN', 'capswarning' => 'WARNUNG', 'caption' => 'Legende', +'ccd add' => 'Netzwerk hinzufügen', +'ccd choose net' => 'Netzwerk auswählen', +'ccd client options' => 'Erweiterte Client-Optionen', +'ccd clientip' => 'Hostadresse', +'ccd dynrange' => 'Dynamischer OpenVPN IP-Addressen-Pool', +'ccd err blue' => 'Das ist das BLAUE Subnetz.', +'ccd err green' => 'Das ist das GRÜNE Subnetz.', +'ccd err hostinnet' => 'Das Netzwerk kann nicht gelöscht werden, da sich in ihm noch Clients befinden.', +'ccd err inuse' => 'Wird bereits von einem anderen Client genutzt.', +'ccd err invalidname' => 'Ungültiger Name. Erlaubte Zeichen: A-Z, a-z, Bindestrich und Leerzeichen.', +'ccd err invalidnet' => 'Ungültige IP-Addresse. Format: 192.168.0.0/24 oder 192.168.0.0/255.255.255.0.', +'ccd err iroute' => 'Netzadresse für Route ungültig.', +'ccd err irouteexist' => 'Diese Route wird bereits verwendet.', +'ccd err isovpnnet' => 'Subnetzadresse wird für bereits für den OpenVPN-Server verwendet!', +'ccd err issubnet' => 'Subnetzadresse wird bereits verwendet.', +'ccd err name' => 'Es muss ein Name angegeben werden.', +'ccd err nameexist' => 'Name existiert bereits.', +'ccd err netadr' => 'Subnetzadresse ist ungültig oder Bereich zu groß.', +'ccd err netadrexist' => 'Netwerk existiert bereits.', +'ccd err orange' => 'Das ist das ORANGE Subnetz.', +'ccd err red' => 'Das ist das ROTE Subnetz.', +'ccd err routeovpn' => 'Wird vom OpenVPN-Server genutzt.', +'ccd err routeovpn2' => 'Wird bereits vom OpenVPN-Server verteilt.', +'ccd hint' => 'Auf dieser Seite können statische Netzwerke definiert werden, von denen Roadwarrior-Clients feste Adressen zugewiesen bekommen können.', +'ccd invalid' => 'ist ungültig.', +'ccd iroute' => 'IPFire hat Zugriff auf diese Netzwerke auf Clientseite: ', +'ccd iroute2' => 'Client hat Zugriff auf diese Netzwerke auf IPFire-Seite: ', +'ccd iroutehint' => 'Achtung! Wenn Sie diese Einstellungen ändern, muss der OpenVPN Server neu gestartet werden!', +'ccd maxclients' => 'Mögliche Adressen', +'ccd modify' => 'Netzwerk ändern', +'ccd name' => 'Name', +'ccd net' => 'Statische IP-Adressen-Pools', +'ccd none' => 'Keine', +'ccd routes' => 'Routen:', +'ccd subnet' => 'Subnetz', +'ccd used' => 'Genutzte Adressen', 'cert' => 'Zertifikat', 'certificate' => 'Zertifikat', 'certificate authorities' => 'Zertifizierungsstellen (CAs)', @@ -1568,6 +1605,7 @@ 'september' => 'September', 'serial' => 'serielle', 'server reserved' => 'The connection name server is reserved and not allowed', +'server restart' => 'Wenn hier etwas geändert wird, muss der openVPN Server neu gestartet werden, damit die Einstellungen übernommen werden!', 'server string' => 'Server String', 'service' => 'Dienst', 'service added' => 'Benutzerdefinierter Netzwerkdienst wurde hinzugefügt', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 5fe2391..d92fadc 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -353,6 +353,7 @@ 'arp table entries' => 'ARP Table Entries:', 'artist' => 'Artist', 'attemps' => 'Attempts', +'attention' => 'ATTENTION', 'august' => 'August', 'authentication' => 'Authentication:', 'automatic' => 'Automatic', @@ -474,6 +475,41 @@ 'capsopen' => 'CONNECTED', 'capswarning' => 'WARNING', 'caption' => 'Caption', +'ccd add' => 'Add network', +'ccd choose net' => 'Choose network', +'ccd client options' => 'Advanced client options', +'ccd clientip' => 'Host address', +'ccd dynrange' => 'Dynamic OpenVPN IP address pool', +'ccd err blue' => 'This is the BLUE subnet.', +'ccd err green' => 'This is the GREEN subnet.', +'ccd err hostinnet' => 'You are not able to delete this network, while it still contains clients.', +'ccd err inuse' => 'Already used by another client.', +'ccd err invalidname' => 'Invalid name. Allowed characters are A-Z, a-z, dash and space.', +'ccd err invalidnet' => 'Invalid IP address. Format: 192.168.0.0/24 or 192.168.0.0/255.255.255.0.', +'ccd err iroute' => 'Network address for route is invalid.', +'ccd err irouteexist' => 'This route is already in use.', +'ccd err isovpnnet' => 'Subnet address already in use for OpenVPN Server.', +'ccd err issubnet' => 'Subnet address already in use.', +'ccd err name' => 'Please choose a name.', +'ccd err nameexist' => 'Name already exists.', +'ccd err netadr' => 'Subnet address is invalid or range is too large.', +'ccd err netadrexist' => 'Network already exists.', +'ccd err orange' => 'This is the ORANGE subnet.', +'ccd err red' => 'This is the RED subnet.', +'ccd err routeovpn' => 'Already used by OpenVPN server.', +'ccd err routeovpn2' => 'Already pushed from OpenVPN server.', +'ccd hint' => 'On this page you are able to define static networks from which the roadwarrior clients can get fixed IP address assignments.', +'ccd invalid' => 'Invalid.', +'ccd iroute' => 'IPFire has access to these networks on the client\'s site', +'ccd iroute2' => 'Client has access to these networks on IPFire\'s site', +'ccd iroutehint' => 'Attention! If you change these settings, you have to restart the OpenVPN server that the changes take effect!', +'ccd modify' => 'Change network', +'ccd name' => 'Name', +'ccd net' => 'Static IP address pools', +'ccd none' => 'None', +'ccd routes' => 'Routing:', +'ccd subnet' => 'Subnet', +'ccd used' => 'Used addresses', 'cert' => 'Certificate', 'certificate' => 'Certificate', 'certificate authorities' => 'Certificate Authorities', @@ -895,7 +931,7 @@ 'gpl unofficial translation of the general public license v3' => 'Unofficial translation of the General Public License v3', 'graph' => 'Graph', 'graph per' => 'per', -'green' => 'Green', +'green' => 'GREEN', 'green interface' => 'Green Interface', 'guaranteed bandwith' => 'Guaranteed bandwith', 'guardian alertfile' => 'Alertfile', @@ -1598,6 +1634,7 @@ 'september' => 'September', 'serial' => 'Serial', 'server reserved' => 'The connection name server is reserved and not allowed', +'server restart' => 'If you change these settings you have to restart the OpenVPN server for the changes to take effect!', 'server string' => 'Server String', 'service' => 'Service', 'service added' => 'Custom network service added', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 83cc9084a9c86d64cc092ae766cf0884b44f6e24
by git＠ipfire.org 15 Nov '12

15 Nov '12

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 83cc9084a9c86d64cc092ae766cf0884b44f6e24 (commit) via 44d148b9a8017c83860f2eb4a385619313e3a7f9 (commit) via 3f350057661c1c2982cb88cbadef3b22870b52b4 (commit) via 746c2e6a2282ced1123fe4328e14016ff9b78443 (commit) from 7a6448326f80cfa1349ded50eae96fd92df1565a (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 83cc9084a9c86d64cc092ae766cf0884b44f6e24 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Nov 15 13:50:36 2012 +0100 bash startfiles: Add file to make sure that all paths are available. commit 44d148b9a8017c83860f2eb4a385619313e3a7f9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Nov 15 13:50:15 2012 +0100 bash startfiles: Fix locale of path names in glib2. commit 3f350057661c1c2982cb88cbadef3b22870b52b4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Nov 15 13:49:51 2012 +0100 bash startfiles: Add /sbin. commit 746c2e6a2282ced1123fe4328e14016ff9b78443 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Nov 15 13:49:23 2012 +0100 bash: Execute start files when loggin in over SSH. ----------------------------------------------------------------------- Summary of changes: config/etc/profile | 2 ++ config/profile.d/extrapaths.sh | 11 +++++++++++ config/profile.d/glib2-locale.sh | 3 +++ lfs/bash | 1 + src/patches/bash-3.2-ssh_source_bash.patch | 9 +++++++++ 5 files changed, 26 insertions(+), 0 deletions(-) create mode 100644 config/profile.d/extrapaths.sh create mode 100644 config/profile.d/glib2-locale.sh create mode 100644 src/patches/bash-3.2-ssh_source_bash.patch Difference in files: diff --git a/config/etc/profile b/config/etc/profile index 912d3d0..2d66685 100644 --- a/config/etc/profile +++ b/config/etc/profile @@ -35,11 +35,13 @@ fi # Path manipulation if [ "$EUID" = "0" ]; then + pathmunge /sbin pathmunge /usr/sbin pathmunge /usr/local/sbin else pathmunge /usr/local/sbin after pathmunge /usr/sbin after + pathmunge /sbin after fi HOSTNAME=`/bin/hostname 2>/dev/null` diff --git a/config/profile.d/extrapaths.sh b/config/profile.d/extrapaths.sh new file mode 100644 index 0000000..d712736 --- /dev/null +++ b/config/profile.d/extrapaths.sh @@ -0,0 +1,11 @@ +# Make sure the basic paths are always available. + +pathmunge /bin +pathmunge /usr/bin +pathmunge /usr/local/bin + +for directory in $(find /opt/*/bin -maxdepth 1 -type d 2>/dev/null); do + pathmunge ${directory} after +done + +unset directory diff --git a/config/profile.d/glib2-locale.sh b/config/profile.d/glib2-locale.sh new file mode 100644 index 0000000..8dd50d5 --- /dev/null +++ b/config/profile.d/glib2-locale.sh @@ -0,0 +1,3 @@ +# Use the current locale charset for filenames +# in applications using GLib +export G_FILENAME_ENCODING=@locale diff --git a/lfs/bash b/lfs/bash index 4fef89e..c89ff54 100644 --- a/lfs/bash +++ b/lfs/bash @@ -95,6 +95,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash-4.0-paths-1.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash-4.0-profile-1.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash-3.2-ssh_source_bash.patch cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) cd $(DIR_APP) && make $(EXTRA_MAKE) cd $(DIR_APP) && make $(EXTRA_INSTALL) install diff --git a/src/patches/bash-3.2-ssh_source_bash.patch b/src/patches/bash-3.2-ssh_source_bash.patch new file mode 100644 index 0000000..4b37132 --- /dev/null +++ b/src/patches/bash-3.2-ssh_source_bash.patch @@ -0,0 +1,9 @@ +diff -up bash-3.2/config-top.h.ssh_source_bash bash-3.2/config-top.h +--- bash-3.2/config-top.h.ssh_source_bash 2008-10-23 15:08:04.000000000 +0200 ++++ bash-3.2/config-top.h 2008-10-23 15:08:33.000000000 +0200 +@@ -86,4 +86,4 @@ + + /* Define this if you want bash to try to check whether it's being run by + sshd and source the .bashrc if so (like the rshd behavior). */ +-/* #define SSH_SOURCE_BASHRC */ ++#define SSH_SOURCE_BASHRC hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ce819132f353a4ae2103fa752ffddb3fae6f01a1
by git＠ipfire.org 13 Nov '12

13 Nov '12

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 7a6448326f80cfa1349ded50eae96fd92df1565a
by git＠ipfire.org 13 Nov '12

13 Nov '12

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 7a6448326f80cfa1349ded50eae96fd92df1565a (commit) from 68afc6675df46ecd5ba7ccc9ce342371ba59e816 (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 7a6448326f80cfa1349ded50eae96fd92df1565a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Nov 13 22:27:49 2012 +0100 bash: Fix startfiles. Sanitize PATH variable and fix wrong path to hostname command. ----------------------------------------------------------------------- Summary of changes: config/etc/profile | 2 +- lfs/bash | 2 ++ src/patches/bash-4.0-paths-1.patch | 30 ++++++++++++++++++++++++++++++ src/patches/bash-4.0-profile-1.patch | 12 ++++++++++++ 4 files changed, 45 insertions(+), 1 deletions(-) create mode 100644 src/patches/bash-4.0-paths-1.patch create mode 100644 src/patches/bash-4.0-profile-1.patch Difference in files: diff --git a/config/etc/profile b/config/etc/profile index cc63878..912d3d0 100644 --- a/config/etc/profile +++ b/config/etc/profile @@ -42,7 +42,7 @@ else pathmunge /usr/sbin after fi -HOSTNAME=`/usr/bin/hostname 2>/dev/null` +HOSTNAME=`/bin/hostname 2>/dev/null` HISTSIZE=1000 if [ "$HISTCONTROL" = "ignorespace" ] ; then export HISTCONTROL=ignoreboth diff --git a/lfs/bash b/lfs/bash index 34bf075..4fef89e 100644 --- a/lfs/bash +++ b/lfs/bash @@ -93,6 +93,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/bash/bash32-$$(printf "%03d" "$${i}") || exit 1; \ done + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash-4.0-paths-1.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash-4.0-profile-1.patch cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) cd $(DIR_APP) && make $(EXTRA_MAKE) cd $(DIR_APP) && make $(EXTRA_INSTALL) install diff --git a/src/patches/bash-4.0-paths-1.patch b/src/patches/bash-4.0-paths-1.patch new file mode 100644 index 0000000..735a381 --- /dev/null +++ b/src/patches/bash-4.0-paths-1.patch @@ -0,0 +1,30 @@ +--- bash-3.0/config.h.in.paths 2004-07-21 21:08:31.000000000 +0100 ++++ bash-3.0/config.h.in 2004-07-28 09:16:27.257884999 +0100 +@@ -197,7 +197,7 @@ + + /* System paths */ + +-#define DEFAULT_MAIL_DIRECTORY "/usr/spool/mail" ++#define DEFAULT_MAIL_DIRECTORY "/var/spool/mail" + + /* Characteristics of the system's header files and libraries that affect + the compilation environment. */ +--- bash-3.0/config-top.h.paths 2003-08-05 15:36:12.000000000 +0100 ++++ bash-3.0/config-top.h 2004-07-28 09:36:27.117205637 +0100 +@@ -52,14 +52,14 @@ + /* The default value of the PATH variable. */ + #ifndef DEFAULT_PATH_VALUE + #define DEFAULT_PATH_VALUE \ +- "/usr/gnu/bin:/usr/local/bin:/bin:/usr/bin:." ++ "/usr/local/bin:/bin:/usr/bin" + #endif + + /* The value for PATH when invoking `command -p'. This is only used when + the Posix.2 confstr () function, or CS_PATH define are not present. */ + #ifndef STANDARD_UTILS_PATH + #define STANDARD_UTILS_PATH \ +- "/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/etc" ++ "/bin:/usr/bin:/usr/sbin:/sbin" + #endif + + /* Default primary and secondary prompt strings. */ diff --git a/src/patches/bash-4.0-profile-1.patch b/src/patches/bash-4.0-profile-1.patch new file mode 100644 index 0000000..ba3344b --- /dev/null +++ b/src/patches/bash-4.0-profile-1.patch @@ -0,0 +1,12 @@ +diff -up bash-3.2/config-top.h.profile bash-3.2/config-top.h +--- bash-3.2/config-top.h.profile 2008-07-17 13:35:39.000000000 +0200 ++++ bash-3.2/config-top.h 2008-07-17 13:42:18.000000000 +0200 +@@ -26,6 +26,8 @@ + what POSIX.2 specifies. */ + #define CONTINUE_AFTER_KILL_ERROR + ++#define NON_INTERACTIVE_LOGIN_SHELLS ++ + /* Define BREAK_COMPLAINS if you want the non-standard, but useful + error messages about `break' and `continue' out of context. */ + #define BREAK_COMPLAINS hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cc8ac76307ebb11b010dd6cbc83ad14c0c0c3d83
by git＠ipfire.org 13 Nov '12

13 Nov '12

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 68afc6675df46ecd5ba7ccc9ce342371ba59e816
by git＠ipfire.org 13 Nov '12

13 Nov '12

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 68afc6675df46ecd5ba7ccc9ce342371ba59e816 (commit) from 7e5cbd938bb3d62182689aac0a2ac27c609c4515 (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 68afc6675df46ecd5ba7ccc9ce342371ba59e816 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Nov 13 19:36:34 2012 +0100 rootfiles: update linux-headers and glibc on armv5tel. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/armv5tel/glibc | 7 +-- .../common/armv5tel/{linux2 => linux-headers} | 75 ++++++++++++++++---- 2 files changed, 63 insertions(+), 19 deletions(-) rename config/rootfiles/common/armv5tel/{linux2 => linux-headers} (90%) Difference in files: diff --git a/config/rootfiles/common/armv5tel/glibc b/config/rootfiles/common/armv5tel/glibc index 5f16c92..42ae490 100644 --- a/config/rootfiles/common/armv5tel/glibc +++ b/config/rootfiles/common/armv5tel/glibc @@ -52,7 +52,6 @@ sbin/ldconfig #usr/bin/getent #usr/bin/iconv usr/bin/ldd -#usr/bin/lddlibc4 #usr/bin/locale #usr/bin/localedef #usr/bin/mtrace @@ -208,7 +207,6 @@ usr/bin/ldd #usr/include/gnu-versions.h #usr/include/gnu/lib-names.h #usr/include/gnu/libc-version.h -#usr/include/gnu/stubs-32.h #usr/include/gnu/stubs.h #usr/include/grp.h #usr/include/gshadow.h @@ -354,6 +352,7 @@ usr/bin/ldd #usr/include/rpcsvc/yppasswd.x #usr/include/rpcsvc/ypupd.h #usr/include/sched.h +#usr/include/scsi/scsi.h #usr/include/scsi/scsi_ioctl.h #usr/include/scsi/sg.h #usr/include/search.h @@ -374,7 +373,6 @@ usr/bin/ldd #usr/include/sys/acct.h #usr/include/sys/bitypes.h #usr/include/sys/cdefs.h -#usr/include/sys/debugreg.h #usr/include/sys/dir.h #usr/include/sys/elf.h #usr/include/sys/epoll.h @@ -398,7 +396,6 @@ usr/bin/ldd #usr/include/sys/mtio.h #usr/include/sys/param.h #usr/include/sys/pci.h -#usr/include/sys/perm.h #usr/include/sys/personality.h #usr/include/sys/poll.h #usr/include/sys/prctl.h @@ -409,7 +406,6 @@ usr/bin/ldd #usr/include/sys/quota.h #usr/include/sys/raw.h #usr/include/sys/reboot.h -#usr/include/sys/reg.h #usr/include/sys/resource.h #usr/include/sys/select.h #usr/include/sys/sem.h @@ -448,7 +444,6 @@ usr/bin/ldd #usr/include/sys/utsname.h #usr/include/sys/vfs.h #usr/include/sys/vlimit.h -#usr/include/sys/vm86.h #usr/include/sys/vt.h #usr/include/sys/vtimes.h #usr/include/sys/wait.h diff --git a/config/rootfiles/common/armv5tel/linux-headers b/config/rootfiles/common/armv5tel/linux-headers new file mode 100644 index 0000000..3b8dd3a --- /dev/null +++ b/config/rootfiles/common/armv5tel/linux-headers @@ -0,0 +1,678 @@ +#usr/include/asm +#usr/include/asm-generic +#usr/include/asm-generic/auxvec.h +#usr/include/asm-generic/bitsperlong.h +#usr/include/asm-generic/errno-base.h +#usr/include/asm-generic/errno.h +#usr/include/asm-generic/fcntl.h +#usr/include/asm-generic/int-l64.h +#usr/include/asm-generic/int-ll64.h +#usr/include/asm-generic/ioctl.h +#usr/include/asm-generic/ioctls.h +#usr/include/asm-generic/ipcbuf.h +#usr/include/asm-generic/mman-common.h +#usr/include/asm-generic/mman.h +#usr/include/asm-generic/msgbuf.h +#usr/include/asm-generic/param.h +#usr/include/asm-generic/poll.h +#usr/include/asm-generic/posix_types.h +#usr/include/asm-generic/resource.h +#usr/include/asm-generic/sembuf.h +#usr/include/asm-generic/setup.h +#usr/include/asm-generic/shmbuf.h +#usr/include/asm-generic/shmparam.h +#usr/include/asm-generic/siginfo.h +#usr/include/asm-generic/signal-defs.h +#usr/include/asm-generic/signal.h +#usr/include/asm-generic/socket.h +#usr/include/asm-generic/sockios.h +#usr/include/asm-generic/stat.h +#usr/include/asm-generic/statfs.h +#usr/include/asm-generic/swab.h +#usr/include/asm-generic/termbits.h +#usr/include/asm-generic/termios.h +#usr/include/asm-generic/types.h +#usr/include/asm-generic/ucontext.h +#usr/include/asm-generic/unistd.h +#usr/include/asm/a.out.h +#usr/include/asm/auxvec.h +#usr/include/asm/bitsperlong.h +#usr/include/asm/byteorder.h +#usr/include/asm/errno.h +#usr/include/asm/fcntl.h +#usr/include/asm/hwcap.h +#usr/include/asm/ioctl.h +#usr/include/asm/ioctls.h +#usr/include/asm/ipcbuf.h +#usr/include/asm/mman.h +#usr/include/asm/msgbuf.h +#usr/include/asm/param.h +#usr/include/asm/poll.h +#usr/include/asm/posix_types.h +#usr/include/asm/ptrace.h +#usr/include/asm/resource.h +#usr/include/asm/sembuf.h +#usr/include/asm/setup.h +#usr/include/asm/shmbuf.h +#usr/include/asm/sigcontext.h +#usr/include/asm/siginfo.h +#usr/include/asm/signal.h +#usr/include/asm/socket.h +#usr/include/asm/sockios.h +#usr/include/asm/stat.h +#usr/include/asm/statfs.h +#usr/include/asm/swab.h +#usr/include/asm/termbits.h +#usr/include/asm/termios.h +#usr/include/asm/types.h +#usr/include/asm/unistd.h +#usr/include/drm +#usr/include/drm/drm.h +#usr/include/drm/drm_mode.h +#usr/include/drm/drm_sarea.h +#usr/include/drm/i810_drm.h +#usr/include/drm/i915_drm.h +#usr/include/drm/mga_drm.h +#usr/include/drm/nouveau_drm.h +#usr/include/drm/r128_drm.h +#usr/include/drm/radeon_drm.h +#usr/include/drm/savage_drm.h +#usr/include/drm/sis_drm.h +#usr/include/drm/via_drm.h +#usr/include/drm/vmwgfx_drm.h +#usr/include/linux +#usr/include/linux/a.out.h +#usr/include/linux/acct.h +#usr/include/linux/adb.h +#usr/include/linux/adfs_fs.h +#usr/include/linux/affs_hardblocks.h +#usr/include/linux/agpgart.h +#usr/include/linux/aio_abi.h +#usr/include/linux/apm_bios.h +#usr/include/linux/arcfb.h +#usr/include/linux/atalk.h +#usr/include/linux/atm.h +#usr/include/linux/atm_eni.h +#usr/include/linux/atm_he.h +#usr/include/linux/atm_idt77105.h +#usr/include/linux/atm_nicstar.h +#usr/include/linux/atm_tcp.h +#usr/include/linux/atm_zatm.h +#usr/include/linux/atmapi.h +#usr/include/linux/atmarp.h +#usr/include/linux/atmbr2684.h +#usr/include/linux/atmclip.h +#usr/include/linux/atmdev.h +#usr/include/linux/atmioc.h +#usr/include/linux/atmlec.h +#usr/include/linux/atmmpc.h +#usr/include/linux/atmppp.h +#usr/include/linux/atmsap.h +#usr/include/linux/atmsvc.h +#usr/include/linux/audit.h +#usr/include/linux/auto_fs.h +#usr/include/linux/auto_fs4.h +#usr/include/linux/auxvec.h +#usr/include/linux/ax25.h +#usr/include/linux/b1lli.h +#usr/include/linux/baycom.h +#usr/include/linux/bfs_fs.h +#usr/include/linux/binfmts.h +#usr/include/linux/blk_types.h +#usr/include/linux/blkpg.h +#usr/include/linux/blktrace_api.h +#usr/include/linux/bpqether.h +#usr/include/linux/bsg.h +#usr/include/linux/byteorder +#usr/include/linux/byteorder/big_endian.h +#usr/include/linux/byteorder/little_endian.h +#usr/include/linux/caif +#usr/include/linux/caif/caif_socket.h +#usr/include/linux/caif/if_caif.h +#usr/include/linux/can +#usr/include/linux/can.h +#usr/include/linux/can/bcm.h +#usr/include/linux/can/error.h +#usr/include/linux/can/gw.h +#usr/include/linux/can/netlink.h +#usr/include/linux/can/raw.h +#usr/include/linux/capability.h +#usr/include/linux/capi.h +#usr/include/linux/cciss_defs.h +#usr/include/linux/cciss_ioctl.h +#usr/include/linux/cdk.h +#usr/include/linux/cdrom.h +#usr/include/linux/cgroupstats.h +#usr/include/linux/chio.h +#usr/include/linux/cm4000_cs.h +#usr/include/linux/cn_proc.h +#usr/include/linux/coda.h +#usr/include/linux/coda_psdev.h +#usr/include/linux/coff.h +#usr/include/linux/comstats.h +#usr/include/linux/connector.h +#usr/include/linux/const.h +#usr/include/linux/cramfs_fs.h +#usr/include/linux/cuda.h +#usr/include/linux/cyclades.h +#usr/include/linux/cycx_cfm.h +#usr/include/linux/dcbnl.h +#usr/include/linux/dccp.h +#usr/include/linux/dlm.h +#usr/include/linux/dlm_device.h +#usr/include/linux/dlm_netlink.h +#usr/include/linux/dlm_plock.h +#usr/include/linux/dlmconstants.h +#usr/include/linux/dm-ioctl.h +#usr/include/linux/dm-log-userspace.h +#usr/include/linux/dn.h +#usr/include/linux/dqblk_xfs.h +#usr/include/linux/dvb +#usr/include/linux/dvb/audio.h +#usr/include/linux/dvb/ca.h +#usr/include/linux/dvb/dmx.h +#usr/include/linux/dvb/frontend.h +#usr/include/linux/dvb/net.h +#usr/include/linux/dvb/osd.h +#usr/include/linux/dvb/version.h +#usr/include/linux/dvb/video.h +#usr/include/linux/edd.h +#usr/include/linux/efs_fs_sb.h +#usr/include/linux/elf-em.h +#usr/include/linux/elf-fdpic.h +#usr/include/linux/elf.h +#usr/include/linux/elfcore.h +#usr/include/linux/errno.h +#usr/include/linux/errqueue.h +#usr/include/linux/ethtool.h +#usr/include/linux/eventpoll.h +#usr/include/linux/ext2_fs.h +#usr/include/linux/fadvise.h +#usr/include/linux/falloc.h +#usr/include/linux/fanotify.h +#usr/include/linux/fb.h +#usr/include/linux/fcntl.h +#usr/include/linux/fd.h +#usr/include/linux/fdreg.h +#usr/include/linux/fib_rules.h +#usr/include/linux/fiemap.h +#usr/include/linux/filter.h +#usr/include/linux/firewire-cdev.h +#usr/include/linux/firewire-constants.h +#usr/include/linux/flat.h +#usr/include/linux/fs.h +#usr/include/linux/fsl_hypervisor.h +#usr/include/linux/fuse.h +#usr/include/linux/futex.h +#usr/include/linux/gameport.h +#usr/include/linux/gen_stats.h +#usr/include/linux/generic_serial.h +#usr/include/linux/genetlink.h +#usr/include/linux/gfs2_ondisk.h +#usr/include/linux/gigaset_dev.h +#usr/include/linux/hdlc +#usr/include/linux/hdlc.h +#usr/include/linux/hdlc/ioctl.h +#usr/include/linux/hdlcdrv.h +#usr/include/linux/hdreg.h +#usr/include/linux/hid.h +#usr/include/linux/hiddev.h +#usr/include/linux/hidraw.h +#usr/include/linux/hpet.h +#usr/include/linux/hysdn_if.h +#usr/include/linux/i2c-dev.h +#usr/include/linux/i2c.h +#usr/include/linux/i2o-dev.h +#usr/include/linux/i8k.h +#usr/include/linux/icmp.h +#usr/include/linux/icmpv6.h +#usr/include/linux/if.h +#usr/include/linux/if_addr.h +#usr/include/linux/if_addrlabel.h +#usr/include/linux/if_alg.h +#usr/include/linux/if_arcnet.h +#usr/include/linux/if_arp.h +#usr/include/linux/if_bonding.h +#usr/include/linux/if_bridge.h +#usr/include/linux/if_cablemodem.h +#usr/include/linux/if_ec.h +#usr/include/linux/if_eql.h +#usr/include/linux/if_ether.h +#usr/include/linux/if_fc.h +#usr/include/linux/if_fddi.h +#usr/include/linux/if_frad.h +#usr/include/linux/if_hippi.h +#usr/include/linux/if_infiniband.h +#usr/include/linux/if_link.h +#usr/include/linux/if_ltalk.h +#usr/include/linux/if_packet.h +#usr/include/linux/if_phonet.h +#usr/include/linux/if_plip.h +#usr/include/linux/if_ppp.h +#usr/include/linux/if_pppol2tp.h +#usr/include/linux/if_pppox.h +#usr/include/linux/if_slip.h +#usr/include/linux/if_strip.h +#usr/include/linux/if_tr.h +#usr/include/linux/if_tun.h +#usr/include/linux/if_tunnel.h +#usr/include/linux/if_vlan.h +#usr/include/linux/if_x25.h +#usr/include/linux/igmp.h +#usr/include/linux/in.h +#usr/include/linux/in6.h +#usr/include/linux/in_route.h +#usr/include/linux/inet_diag.h +#usr/include/linux/inotify.h +#usr/include/linux/input.h +#usr/include/linux/ioctl.h +#usr/include/linux/ip.h +#usr/include/linux/ip6_tunnel.h +#usr/include/linux/ip_vs.h +#usr/include/linux/ipc.h +#usr/include/linux/ipmi.h +#usr/include/linux/ipmi_msgdefs.h +#usr/include/linux/ipsec.h +#usr/include/linux/ipv6.h +#usr/include/linux/ipv6_route.h +#usr/include/linux/ipx.h +#usr/include/linux/irda.h +#usr/include/linux/irqnr.h +#usr/include/linux/isdn +#usr/include/linux/isdn.h +#usr/include/linux/isdn/capicmd.h +#usr/include/linux/isdn_divertif.h +#usr/include/linux/isdn_ppp.h +#usr/include/linux/isdnif.h +#usr/include/linux/iso_fs.h +#usr/include/linux/ivtv.h +#usr/include/linux/ivtvfb.h +#usr/include/linux/ixjuser.h +#usr/include/linux/jffs2.h +#usr/include/linux/joystick.h +#usr/include/linux/kd.h +#usr/include/linux/kdev_t.h +#usr/include/linux/kernel-page-flags.h +#usr/include/linux/kernel.h +#usr/include/linux/kernelcapi.h +#usr/include/linux/keyboard.h +#usr/include/linux/keyctl.h +#usr/include/linux/l2tp.h +#usr/include/linux/limits.h +#usr/include/linux/llc.h +#usr/include/linux/loop.h +#usr/include/linux/lp.h +#usr/include/linux/magic.h +#usr/include/linux/major.h +#usr/include/linux/map_to_7segment.h +#usr/include/linux/matroxfb.h +#usr/include/linux/media.h +#usr/include/linux/mempolicy.h +#usr/include/linux/meye.h +#usr/include/linux/mii.h +#usr/include/linux/minix_fs.h +#usr/include/linux/mman.h +#usr/include/linux/mmc +#usr/include/linux/mmc/ioctl.h +#usr/include/linux/mmtimer.h +#usr/include/linux/mqueue.h +#usr/include/linux/mroute.h +#usr/include/linux/mroute6.h +#usr/include/linux/msdos_fs.h +#usr/include/linux/msg.h +#usr/include/linux/mtio.h +#usr/include/linux/n_r3964.h +#usr/include/linux/nbd.h +#usr/include/linux/ncp.h +#usr/include/linux/ncp_fs.h +#usr/include/linux/ncp_mount.h +#usr/include/linux/ncp_no.h +#usr/include/linux/neighbour.h +#usr/include/linux/net.h +#usr/include/linux/net_dropmon.h +#usr/include/linux/net_tstamp.h +#usr/include/linux/netdevice.h +#usr/include/linux/netfilter +#usr/include/linux/netfilter.h +#usr/include/linux/netfilter/ipset +#usr/include/linux/netfilter/ipset/ip_set.h +#usr/include/linux/netfilter/ipset/ip_set_bitmap.h +#usr/include/linux/netfilter/ipset/ip_set_hash.h +#usr/include/linux/netfilter/ipset/ip_set_list.h +#usr/include/linux/netfilter/nf_conntrack_common.h +#usr/include/linux/netfilter/nf_conntrack_ftp.h +#usr/include/linux/netfilter/nf_conntrack_sctp.h +#usr/include/linux/netfilter/nf_conntrack_tcp.h +#usr/include/linux/netfilter/nf_conntrack_tuple_common.h +#usr/include/linux/netfilter/nfnetlink.h +#usr/include/linux/netfilter/nfnetlink_compat.h +#usr/include/linux/netfilter/nfnetlink_conntrack.h +#usr/include/linux/netfilter/nfnetlink_log.h +#usr/include/linux/netfilter/nfnetlink_queue.h +#usr/include/linux/netfilter/x_tables.h +#usr/include/linux/netfilter/xt_AUDIT.h +#usr/include/linux/netfilter/xt_CHECKSUM.h +#usr/include/linux/netfilter/xt_CLASSIFY.h +#usr/include/linux/netfilter/xt_CONNMARK.h +#usr/include/linux/netfilter/xt_CONNSECMARK.h +#usr/include/linux/netfilter/xt_CT.h +#usr/include/linux/netfilter/xt_DSCP.h +#usr/include/linux/netfilter/xt_IDLETIMER.h +#usr/include/linux/netfilter/xt_LED.h +#usr/include/linux/netfilter/xt_MARK.h +#usr/include/linux/netfilter/xt_NFLOG.h +#usr/include/linux/netfilter/xt_NFQUEUE.h +#usr/include/linux/netfilter/xt_RATEEST.h +#usr/include/linux/netfilter/xt_SECMARK.h +#usr/include/linux/netfilter/xt_TCPMSS.h +#usr/include/linux/netfilter/xt_TCPOPTSTRIP.h +#usr/include/linux/netfilter/xt_TEE.h +#usr/include/linux/netfilter/xt_TPROXY.h +#usr/include/linux/netfilter/xt_addrtype.h +#usr/include/linux/netfilter/xt_cluster.h +#usr/include/linux/netfilter/xt_comment.h +#usr/include/linux/netfilter/xt_connbytes.h +#usr/include/linux/netfilter/xt_connlimit.h +#usr/include/linux/netfilter/xt_connmark.h +#usr/include/linux/netfilter/xt_conntrack.h +#usr/include/linux/netfilter/xt_cpu.h +#usr/include/linux/netfilter/xt_dccp.h +#usr/include/linux/netfilter/xt_devgroup.h +#usr/include/linux/netfilter/xt_dscp.h +#usr/include/linux/netfilter/xt_esp.h +#usr/include/linux/netfilter/xt_hashlimit.h +#usr/include/linux/netfilter/xt_helper.h +#usr/include/linux/netfilter/xt_iprange.h +#usr/include/linux/netfilter/xt_ipvs.h +#usr/include/linux/netfilter/xt_length.h +#usr/include/linux/netfilter/xt_limit.h +#usr/include/linux/netfilter/xt_mac.h +#usr/include/linux/netfilter/xt_mark.h +#usr/include/linux/netfilter/xt_multiport.h +#usr/include/linux/netfilter/xt_osf.h +#usr/include/linux/netfilter/xt_owner.h +#usr/include/linux/netfilter/xt_physdev.h +#usr/include/linux/netfilter/xt_pkttype.h +#usr/include/linux/netfilter/xt_policy.h +#usr/include/linux/netfilter/xt_quota.h +#usr/include/linux/netfilter/xt_rateest.h +#usr/include/linux/netfilter/xt_realm.h +#usr/include/linux/netfilter/xt_recent.h +#usr/include/linux/netfilter/xt_sctp.h +#usr/include/linux/netfilter/xt_set.h +#usr/include/linux/netfilter/xt_socket.h +#usr/include/linux/netfilter/xt_state.h +#usr/include/linux/netfilter/xt_statistic.h +#usr/include/linux/netfilter/xt_string.h +#usr/include/linux/netfilter/xt_tcpmss.h +#usr/include/linux/netfilter/xt_tcpudp.h +#usr/include/linux/netfilter/xt_time.h +#usr/include/linux/netfilter/xt_u32.h +#usr/include/linux/netfilter_arp +#usr/include/linux/netfilter_arp.h +#usr/include/linux/netfilter_arp/arp_tables.h +#usr/include/linux/netfilter_arp/arpt_mangle.h +#usr/include/linux/netfilter_bridge +#usr/include/linux/netfilter_bridge.h +#usr/include/linux/netfilter_bridge/ebt_802_3.h +#usr/include/linux/netfilter_bridge/ebt_among.h +#usr/include/linux/netfilter_bridge/ebt_arp.h +#usr/include/linux/netfilter_bridge/ebt_arpreply.h +#usr/include/linux/netfilter_bridge/ebt_ip.h +#usr/include/linux/netfilter_bridge/ebt_ip6.h +#usr/include/linux/netfilter_bridge/ebt_limit.h +#usr/include/linux/netfilter_bridge/ebt_log.h +#usr/include/linux/netfilter_bridge/ebt_mark_m.h +#usr/include/linux/netfilter_bridge/ebt_mark_t.h +#usr/include/linux/netfilter_bridge/ebt_nat.h +#usr/include/linux/netfilter_bridge/ebt_nflog.h +#usr/include/linux/netfilter_bridge/ebt_pkttype.h +#usr/include/linux/netfilter_bridge/ebt_redirect.h +#usr/include/linux/netfilter_bridge/ebt_stp.h +#usr/include/linux/netfilter_bridge/ebt_ulog.h +#usr/include/linux/netfilter_bridge/ebt_vlan.h +#usr/include/linux/netfilter_bridge/ebtables.h +#usr/include/linux/netfilter_decnet.h +#usr/include/linux/netfilter_ipv4 +#usr/include/linux/netfilter_ipv4.h +#usr/include/linux/netfilter_ipv4/ip_queue.h +#usr/include/linux/netfilter_ipv4/ip_tables.h +#usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h +#usr/include/linux/netfilter_ipv4/ipt_ECN.h +#usr/include/linux/netfilter_ipv4/ipt_LOG.h +#usr/include/linux/netfilter_ipv4/ipt_REJECT.h +#usr/include/linux/netfilter_ipv4/ipt_SAME.h +#usr/include/linux/netfilter_ipv4/ipt_TTL.h +#usr/include/linux/netfilter_ipv4/ipt_ULOG.h +#usr/include/linux/netfilter_ipv4/ipt_addrtype.h +#usr/include/linux/netfilter_ipv4/ipt_ah.h +#usr/include/linux/netfilter_ipv4/ipt_ecn.h +#usr/include/linux/netfilter_ipv4/ipt_realm.h +#usr/include/linux/netfilter_ipv4/ipt_ttl.h +#usr/include/linux/netfilter_ipv4/nf_nat.h +#usr/include/linux/netfilter_ipv6 +#usr/include/linux/netfilter_ipv6.h +#usr/include/linux/netfilter_ipv6/ip6_tables.h +#usr/include/linux/netfilter_ipv6/ip6t_HL.h +#usr/include/linux/netfilter_ipv6/ip6t_LOG.h +#usr/include/linux/netfilter_ipv6/ip6t_REJECT.h +#usr/include/linux/netfilter_ipv6/ip6t_ah.h +#usr/include/linux/netfilter_ipv6/ip6t_frag.h +#usr/include/linux/netfilter_ipv6/ip6t_hl.h +#usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h +#usr/include/linux/netfilter_ipv6/ip6t_mh.h +#usr/include/linux/netfilter_ipv6/ip6t_opts.h +#usr/include/linux/netfilter_ipv6/ip6t_rt.h +#usr/include/linux/netlink.h +#usr/include/linux/netrom.h +#usr/include/linux/nfc.h +#usr/include/linux/nfs.h +#usr/include/linux/nfs2.h +#usr/include/linux/nfs3.h +#usr/include/linux/nfs4.h +#usr/include/linux/nfs4_mount.h +#usr/include/linux/nfs_fs.h +#usr/include/linux/nfs_idmap.h +#usr/include/linux/nfs_mount.h +#usr/include/linux/nfsacl.h +#usr/include/linux/nfsd +#usr/include/linux/nfsd/debug.h +#usr/include/linux/nfsd/export.h +#usr/include/linux/nfsd/nfsfh.h +#usr/include/linux/nfsd/stats.h +#usr/include/linux/nl80211.h +#usr/include/linux/nubus.h +#usr/include/linux/nvram.h +#usr/include/linux/omap3isp.h +#usr/include/linux/omapfb.h +#usr/include/linux/oom.h +#usr/include/linux/param.h +#usr/include/linux/parport.h +#usr/include/linux/patchkey.h +#usr/include/linux/pci.h +#usr/include/linux/pci_regs.h +#usr/include/linux/perf_event.h +#usr/include/linux/personality.h +#usr/include/linux/pfkeyv2.h +#usr/include/linux/pg.h +#usr/include/linux/phantom.h +#usr/include/linux/phonet.h +#usr/include/linux/pkt_cls.h +#usr/include/linux/pkt_sched.h +#usr/include/linux/pktcdvd.h +#usr/include/linux/pmu.h +#usr/include/linux/poll.h +#usr/include/linux/posix_types.h +#usr/include/linux/ppdev.h +#usr/include/linux/ppp-comp.h +#usr/include/linux/ppp_defs.h +#usr/include/linux/pps.h +#usr/include/linux/prctl.h +#usr/include/linux/ptp_clock.h +#usr/include/linux/ptrace.h +#usr/include/linux/qnx4_fs.h +#usr/include/linux/qnxtypes.h +#usr/include/linux/quota.h +#usr/include/linux/radeonfb.h +#usr/include/linux/raid +#usr/include/linux/raid/md_p.h +#usr/include/linux/raid/md_u.h +#usr/include/linux/random.h +#usr/include/linux/raw.h +#usr/include/linux/rds.h +#usr/include/linux/reboot.h +#usr/include/linux/reiserfs_fs.h +#usr/include/linux/reiserfs_xattr.h +#usr/include/linux/resource.h +#usr/include/linux/rfkill.h +#usr/include/linux/romfs_fs.h +#usr/include/linux/rose.h +#usr/include/linux/route.h +#usr/include/linux/rtc.h +#usr/include/linux/rtnetlink.h +#usr/include/linux/scc.h +#usr/include/linux/sched.h +#usr/include/linux/screen_info.h +#usr/include/linux/sdla.h +#usr/include/linux/securebits.h +#usr/include/linux/selinux_netlink.h +#usr/include/linux/sem.h +#usr/include/linux/serial.h +#usr/include/linux/serial_core.h +#usr/include/linux/serial_reg.h +#usr/include/linux/serio.h +#usr/include/linux/shm.h +#usr/include/linux/signal.h +#usr/include/linux/signalfd.h +#usr/include/linux/snmp.h +#usr/include/linux/socket.h +#usr/include/linux/sockios.h +#usr/include/linux/som.h +#usr/include/linux/sonet.h +#usr/include/linux/sonypi.h +#usr/include/linux/sound.h +#usr/include/linux/soundcard.h +#usr/include/linux/spi +#usr/include/linux/spi/spidev.h +#usr/include/linux/stat.h +#usr/include/linux/stddef.h +#usr/include/linux/string.h +#usr/include/linux/sunrpc +#usr/include/linux/sunrpc/debug.h +#usr/include/linux/suspend_ioctls.h +#usr/include/linux/swab.h +#usr/include/linux/synclink.h +#usr/include/linux/sysctl.h +#usr/include/linux/taskstats.h +#usr/include/linux/tc_act +#usr/include/linux/tc_act/tc_csum.h +#usr/include/linux/tc_act/tc_gact.h +#usr/include/linux/tc_act/tc_ipt.h +#usr/include/linux/tc_act/tc_mirred.h +#usr/include/linux/tc_act/tc_nat.h +#usr/include/linux/tc_act/tc_pedit.h +#usr/include/linux/tc_act/tc_skbedit.h +#usr/include/linux/tc_ematch +#usr/include/linux/tc_ematch/tc_em_cmp.h +#usr/include/linux/tc_ematch/tc_em_meta.h +#usr/include/linux/tc_ematch/tc_em_nbyte.h +#usr/include/linux/tc_ematch/tc_em_text.h +#usr/include/linux/tcp.h +#usr/include/linux/telephony.h +#usr/include/linux/termios.h +#usr/include/linux/time.h +#usr/include/linux/times.h +#usr/include/linux/timex.h +#usr/include/linux/tiocl.h +#usr/include/linux/tipc.h +#usr/include/linux/tipc_config.h +#usr/include/linux/toshiba.h +#usr/include/linux/tty.h +#usr/include/linux/types.h +#usr/include/linux/udf_fs_i.h +#usr/include/linux/udp.h +#usr/include/linux/uinput.h +#usr/include/linux/uio.h +#usr/include/linux/ultrasound.h +#usr/include/linux/un.h +#usr/include/linux/unistd.h +#usr/include/linux/usb +#usr/include/linux/usb/audio.h +#usr/include/linux/usb/cdc.h +#usr/include/linux/usb/ch11.h +#usr/include/linux/usb/ch9.h +#usr/include/linux/usb/functionfs.h +#usr/include/linux/usb/g_printer.h +#usr/include/linux/usb/gadgetfs.h +#usr/include/linux/usb/midi.h +#usr/include/linux/usb/tmc.h +#usr/include/linux/usb/video.h +#usr/include/linux/usbdevice_fs.h +#usr/include/linux/utime.h +#usr/include/linux/utsname.h +#usr/include/linux/uvcvideo.h +#usr/include/linux/v4l2-mediabus.h +#usr/include/linux/v4l2-subdev.h +#usr/include/linux/version.h +#usr/include/linux/veth.h +#usr/include/linux/vhost.h +#usr/include/linux/videodev2.h +#usr/include/linux/virtio_9p.h +#usr/include/linux/virtio_balloon.h +#usr/include/linux/virtio_blk.h +#usr/include/linux/virtio_config.h +#usr/include/linux/virtio_console.h +#usr/include/linux/virtio_ids.h +#usr/include/linux/virtio_net.h +#usr/include/linux/virtio_pci.h +#usr/include/linux/virtio_ring.h +#usr/include/linux/virtio_rng.h +#usr/include/linux/vt.h +#usr/include/linux/wait.h +#usr/include/linux/wanrouter.h +#usr/include/linux/watchdog.h +#usr/include/linux/wimax +#usr/include/linux/wimax.h +#usr/include/linux/wimax/i2400m.h +#usr/include/linux/wireless.h +#usr/include/linux/x25.h +#usr/include/linux/xattr.h +#usr/include/linux/xfrm.h +#usr/include/mtd +#usr/include/mtd/inftl-user.h +#usr/include/mtd/mtd-abi.h +#usr/include/mtd/mtd-user.h +#usr/include/mtd/nftl-user.h +#usr/include/mtd/ubi-user.h +#usr/include/rdma +#usr/include/rdma/ib_user_cm.h +#usr/include/rdma/ib_user_mad.h +#usr/include/rdma/ib_user_sa.h +#usr/include/rdma/ib_user_verbs.h +#usr/include/rdma/rdma_netlink.h +#usr/include/rdma/rdma_user_cm.h +#usr/include/scsi +#usr/include/scsi/fc +#usr/include/scsi/fc/fc_els.h +#usr/include/scsi/fc/fc_fs.h +#usr/include/scsi/fc/fc_gs.h +#usr/include/scsi/fc/fc_ns.h +#usr/include/scsi/scsi_bsg_fc.h +#usr/include/scsi/scsi_netlink.h +#usr/include/scsi/scsi_netlink_fc.h +#usr/include/sound +#usr/include/sound/asequencer.h +#usr/include/sound/asound.h +#usr/include/sound/asound_fm.h +#usr/include/sound/emu10k1.h +#usr/include/sound/hdsp.h +#usr/include/sound/hdspm.h +#usr/include/sound/sb16_csp.h +#usr/include/sound/sfnt_info.h +#usr/include/video +#usr/include/video/edid.h +#usr/include/video/sisfb.h +#usr/include/video/uvesafb.h +#usr/include/xen +#usr/include/xen/evtchn.h +#usr/include/xen/privcmd.h diff --git a/config/rootfiles/common/armv5tel/linux2 b/config/rootfiles/common/armv5tel/linux2 deleted file mode 100644 index 073cd59..0000000 --- a/config/rootfiles/common/armv5tel/linux2 +++ /dev/null @@ -1,629 +0,0 @@ -#usr/include/asm -#usr/include/asm-generic -#usr/include/asm-generic/auxvec.h -#usr/include/asm-generic/bitsperlong.h -#usr/include/asm-generic/errno-base.h -#usr/include/asm-generic/errno.h -#usr/include/asm-generic/fcntl.h -#usr/include/asm-generic/int-l64.h -#usr/include/asm-generic/int-ll64.h -#usr/include/asm-generic/ioctl.h -#usr/include/asm-generic/ioctls.h -#usr/include/asm-generic/ipcbuf.h -#usr/include/asm-generic/mman-common.h -#usr/include/asm-generic/mman.h -#usr/include/asm-generic/msgbuf.h -#usr/include/asm-generic/param.h -#usr/include/asm-generic/poll.h -#usr/include/asm-generic/posix_types.h -#usr/include/asm-generic/resource.h -#usr/include/asm-generic/sembuf.h -#usr/include/asm-generic/setup.h -#usr/include/asm-generic/shmbuf.h -#usr/include/asm-generic/shmparam.h -#usr/include/asm-generic/siginfo.h -#usr/include/asm-generic/signal-defs.h -#usr/include/asm-generic/signal.h -#usr/include/asm-generic/socket.h -#usr/include/asm-generic/sockios.h -#usr/include/asm-generic/stat.h -#usr/include/asm-generic/statfs.h -#usr/include/asm-generic/swab.h -#usr/include/asm-generic/termbits.h -#usr/include/asm-generic/termios.h -#usr/include/asm-generic/types.h -#usr/include/asm-generic/ucontext.h -#usr/include/asm-generic/unistd.h -#usr/include/asm/a.out.h -#usr/include/asm/auxvec.h -#usr/include/asm/bitsperlong.h -#usr/include/asm/byteorder.h -#usr/include/asm/errno.h -#usr/include/asm/fcntl.h -#usr/include/asm/hwcap.h -#usr/include/asm/ioctl.h -#usr/include/asm/ioctls.h -#usr/include/asm/ipcbuf.h -#usr/include/asm/mman.h -#usr/include/asm/msgbuf.h -#usr/include/asm/param.h -#usr/include/asm/poll.h -#usr/include/asm/posix_types.h -#usr/include/asm/ptrace.h -#usr/include/asm/resource.h -#usr/include/asm/sembuf.h -#usr/include/asm/setup.h -#usr/include/asm/shmbuf.h -#usr/include/asm/sigcontext.h -#usr/include/asm/siginfo.h -#usr/include/asm/signal.h -#usr/include/asm/socket.h -#usr/include/asm/sockios.h -#usr/include/asm/stat.h -#usr/include/asm/statfs.h -#usr/include/asm/swab.h -#usr/include/asm/termbits.h -#usr/include/asm/termios.h -#usr/include/asm/types.h -#usr/include/asm/unistd.h -#usr/include/drm -#usr/include/drm/drm.h -#usr/include/drm/drm_mode.h -#usr/include/drm/drm_sarea.h -#usr/include/drm/i810_drm.h -#usr/include/drm/i830_drm.h -#usr/include/drm/i915_drm.h -#usr/include/drm/mga_drm.h -#usr/include/drm/r128_drm.h -#usr/include/drm/radeon_drm.h -#usr/include/drm/savage_drm.h -#usr/include/drm/sis_drm.h -#usr/include/drm/via_drm.h -#usr/include/linux -#usr/include/linux/a.out.h -#usr/include/linux/acct.h -#usr/include/linux/adb.h -#usr/include/linux/adfs_fs.h -#usr/include/linux/affs_hardblocks.h -#usr/include/linux/agpgart.h -#usr/include/linux/aio_abi.h -#usr/include/linux/apm_bios.h -#usr/include/linux/arcfb.h -#usr/include/linux/atalk.h -#usr/include/linux/atm.h -#usr/include/linux/atm_eni.h -#usr/include/linux/atm_he.h -#usr/include/linux/atm_idt77105.h -#usr/include/linux/atm_nicstar.h -#usr/include/linux/atm_tcp.h -#usr/include/linux/atm_zatm.h -#usr/include/linux/atmapi.h -#usr/include/linux/atmarp.h -#usr/include/linux/atmbr2684.h -#usr/include/linux/atmclip.h -#usr/include/linux/atmdev.h -#usr/include/linux/atmioc.h -#usr/include/linux/atmlec.h -#usr/include/linux/atmmpc.h -#usr/include/linux/atmppp.h -#usr/include/linux/atmsap.h -#usr/include/linux/atmsvc.h -#usr/include/linux/audit.h -#usr/include/linux/auto_fs.h -#usr/include/linux/auto_fs4.h -#usr/include/linux/auxvec.h -#usr/include/linux/ax25.h -#usr/include/linux/b1lli.h -#usr/include/linux/baycom.h -#usr/include/linux/bfs_fs.h -#usr/include/linux/binfmts.h -#usr/include/linux/blkpg.h -#usr/include/linux/blktrace_api.h -#usr/include/linux/bpqether.h -#usr/include/linux/bsg.h -#usr/include/linux/byteorder -#usr/include/linux/byteorder/big_endian.h -#usr/include/linux/byteorder/little_endian.h -#usr/include/linux/can -#usr/include/linux/can.h -#usr/include/linux/can/bcm.h -#usr/include/linux/can/error.h -#usr/include/linux/can/netlink.h -#usr/include/linux/can/raw.h -#usr/include/linux/capability.h -#usr/include/linux/capi.h -#usr/include/linux/cciss_ioctl.h -#usr/include/linux/cdk.h -#usr/include/linux/cdrom.h -#usr/include/linux/cgroupstats.h -#usr/include/linux/chio.h -#usr/include/linux/cm4000_cs.h -#usr/include/linux/cn_proc.h -#usr/include/linux/coda.h -#usr/include/linux/coda_psdev.h -#usr/include/linux/coff.h -#usr/include/linux/comstats.h -#usr/include/linux/connector.h -#usr/include/linux/const.h -#usr/include/linux/cramfs_fs.h -#usr/include/linux/cuda.h -#usr/include/linux/cyclades.h -#usr/include/linux/cycx_cfm.h -#usr/include/linux/dcbnl.h -#usr/include/linux/dccp.h -#usr/include/linux/dlm.h -#usr/include/linux/dlm_device.h -#usr/include/linux/dlm_netlink.h -#usr/include/linux/dlm_plock.h -#usr/include/linux/dlmconstants.h -#usr/include/linux/dm-ioctl.h -#usr/include/linux/dm-log-userspace.h -#usr/include/linux/dn.h -#usr/include/linux/dqblk_xfs.h -#usr/include/linux/dvb -#usr/include/linux/dvb/audio.h -#usr/include/linux/dvb/ca.h -#usr/include/linux/dvb/dmx.h -#usr/include/linux/dvb/frontend.h -#usr/include/linux/dvb/net.h -#usr/include/linux/dvb/osd.h -#usr/include/linux/dvb/version.h -#usr/include/linux/dvb/video.h -#usr/include/linux/edd.h -#usr/include/linux/efs_fs_sb.h -#usr/include/linux/elf-em.h -#usr/include/linux/elf-fdpic.h -#usr/include/linux/elf.h -#usr/include/linux/elfcore.h -#usr/include/linux/errno.h -#usr/include/linux/errqueue.h -#usr/include/linux/ethtool.h -#usr/include/linux/eventpoll.h -#usr/include/linux/ext2_fs.h -#usr/include/linux/fadvise.h -#usr/include/linux/falloc.h -#usr/include/linux/fb.h -#usr/include/linux/fcntl.h -#usr/include/linux/fd.h -#usr/include/linux/fdreg.h -#usr/include/linux/fib_rules.h -#usr/include/linux/fiemap.h -#usr/include/linux/filter.h -#usr/include/linux/firewire-cdev.h -#usr/include/linux/firewire-constants.h -#usr/include/linux/flat.h -#usr/include/linux/fs.h -#usr/include/linux/fuse.h -#usr/include/linux/futex.h -#usr/include/linux/gameport.h -#usr/include/linux/gen_stats.h -#usr/include/linux/generic_serial.h -#usr/include/linux/genetlink.h -#usr/include/linux/gfs2_ondisk.h -#usr/include/linux/gigaset_dev.h -#usr/include/linux/hayesesp.h -#usr/include/linux/hdlc -#usr/include/linux/hdlc.h -#usr/include/linux/hdlc/ioctl.h -#usr/include/linux/hdlcdrv.h -#usr/include/linux/hdreg.h -#usr/include/linux/hid.h -#usr/include/linux/hiddev.h -#usr/include/linux/hidraw.h -#usr/include/linux/hpet.h -#usr/include/linux/hysdn_if.h -#usr/include/linux/i2c-dev.h -#usr/include/linux/i2c.h -#usr/include/linux/i2o-dev.h -#usr/include/linux/i8k.h -#usr/include/linux/icmp.h -#usr/include/linux/icmpv6.h -#usr/include/linux/if.h -#usr/include/linux/if_addr.h -#usr/include/linux/if_addrlabel.h -#usr/include/linux/if_arcnet.h -#usr/include/linux/if_arp.h -#usr/include/linux/if_bonding.h -#usr/include/linux/if_bridge.h -#usr/include/linux/if_cablemodem.h -#usr/include/linux/if_ec.h -#usr/include/linux/if_eql.h -#usr/include/linux/if_ether.h -#usr/include/linux/if_fc.h -#usr/include/linux/if_fddi.h -#usr/include/linux/if_frad.h -#usr/include/linux/if_hippi.h -#usr/include/linux/if_infiniband.h -#usr/include/linux/if_link.h -#usr/include/linux/if_ltalk.h -#usr/include/linux/if_packet.h -#usr/include/linux/if_phonet.h -#usr/include/linux/if_plip.h -#usr/include/linux/if_ppp.h -#usr/include/linux/if_pppol2tp.h -#usr/include/linux/if_pppox.h -#usr/include/linux/if_slip.h -#usr/include/linux/if_strip.h -#usr/include/linux/if_tr.h -#usr/include/linux/if_tun.h -#usr/include/linux/if_tunnel.h -#usr/include/linux/if_vlan.h -#usr/include/linux/igmp.h -#usr/include/linux/in.h -#usr/include/linux/in6.h -#usr/include/linux/in_route.h -#usr/include/linux/inet_diag.h -#usr/include/linux/inotify.h -#usr/include/linux/input.h -#usr/include/linux/ioctl.h -#usr/include/linux/ip.h -#usr/include/linux/ip6_tunnel.h -#usr/include/linux/ip_vs.h -#usr/include/linux/ipc.h -#usr/include/linux/ipmi.h -#usr/include/linux/ipmi_msgdefs.h -#usr/include/linux/ipsec.h -#usr/include/linux/ipv6.h -#usr/include/linux/ipv6_route.h -#usr/include/linux/ipx.h -#usr/include/linux/irda.h -#usr/include/linux/irqnr.h -#usr/include/linux/isdn -#usr/include/linux/isdn.h -#usr/include/linux/isdn/capicmd.h -#usr/include/linux/isdn_divertif.h -#usr/include/linux/isdn_ppp.h -#usr/include/linux/isdnif.h -#usr/include/linux/iso_fs.h -#usr/include/linux/ivtv.h -#usr/include/linux/ivtvfb.h -#usr/include/linux/ixjuser.h -#usr/include/linux/jffs2.h -#usr/include/linux/joystick.h -#usr/include/linux/kd.h -#usr/include/linux/kdev_t.h -#usr/include/linux/kernel.h -#usr/include/linux/kernelcapi.h -#usr/include/linux/keyboard.h -#usr/include/linux/keyctl.h -#usr/include/linux/limits.h -#usr/include/linux/llc.h -#usr/include/linux/loop.h -#usr/include/linux/lp.h -#usr/include/linux/magic.h -#usr/include/linux/major.h -#usr/include/linux/map_to_7segment.h -#usr/include/linux/matroxfb.h -#usr/include/linux/mempolicy.h -#usr/include/linux/meye.h -#usr/include/linux/mii.h -#usr/include/linux/minix_fs.h -#usr/include/linux/mman.h -#usr/include/linux/mmtimer.h -#usr/include/linux/mqueue.h -#usr/include/linux/mroute.h -#usr/include/linux/mroute6.h -#usr/include/linux/msdos_fs.h -#usr/include/linux/msg.h -#usr/include/linux/mtio.h -#usr/include/linux/n_r3964.h -#usr/include/linux/nbd.h -#usr/include/linux/ncp.h -#usr/include/linux/ncp_fs.h -#usr/include/linux/ncp_mount.h -#usr/include/linux/ncp_no.h -#usr/include/linux/neighbour.h -#usr/include/linux/net.h -#usr/include/linux/net_dropmon.h -#usr/include/linux/netdevice.h -#usr/include/linux/netfilter -#usr/include/linux/netfilter.h -#usr/include/linux/netfilter/nf_conntrack_common.h -#usr/include/linux/netfilter/nf_conntrack_ftp.h -#usr/include/linux/netfilter/nf_conntrack_sctp.h -#usr/include/linux/netfilter/nf_conntrack_tcp.h -#usr/include/linux/netfilter/nf_conntrack_tuple_common.h -#usr/include/linux/netfilter/nfnetlink.h -#usr/include/linux/netfilter/nfnetlink_compat.h -#usr/include/linux/netfilter/nfnetlink_conntrack.h -#usr/include/linux/netfilter/nfnetlink_log.h -#usr/include/linux/netfilter/nfnetlink_queue.h -#usr/include/linux/netfilter/x_tables.h -#usr/include/linux/netfilter/xt_CLASSIFY.h -#usr/include/linux/netfilter/xt_CONNMARK.h -#usr/include/linux/netfilter/xt_CONNSECMARK.h -#usr/include/linux/netfilter/xt_DSCP.h -#usr/include/linux/netfilter/xt_LED.h -#usr/include/linux/netfilter/xt_MARK.h -#usr/include/linux/netfilter/xt_NFLOG.h -#usr/include/linux/netfilter/xt_NFQUEUE.h -#usr/include/linux/netfilter/xt_RATEEST.h -#usr/include/linux/netfilter/xt_SECMARK.h -#usr/include/linux/netfilter/xt_TCPMSS.h -#usr/include/linux/netfilter/xt_TCPOPTSTRIP.h -#usr/include/linux/netfilter/xt_TPROXY.h -#usr/include/linux/netfilter/xt_cluster.h -#usr/include/linux/netfilter/xt_comment.h -#usr/include/linux/netfilter/xt_connbytes.h -#usr/include/linux/netfilter/xt_connlimit.h -#usr/include/linux/netfilter/xt_connmark.h -#usr/include/linux/netfilter/xt_conntrack.h -#usr/include/linux/netfilter/xt_dccp.h -#usr/include/linux/netfilter/xt_dscp.h -#usr/include/linux/netfilter/xt_esp.h -#usr/include/linux/netfilter/xt_hashlimit.h -#usr/include/linux/netfilter/xt_helper.h -#usr/include/linux/netfilter/xt_iprange.h -#usr/include/linux/netfilter/xt_length.h -#usr/include/linux/netfilter/xt_limit.h -#usr/include/linux/netfilter/xt_mac.h -#usr/include/linux/netfilter/xt_mark.h -#usr/include/linux/netfilter/xt_multiport.h -#usr/include/linux/netfilter/xt_osf.h -#usr/include/linux/netfilter/xt_owner.h -#usr/include/linux/netfilter/xt_physdev.h -#usr/include/linux/netfilter/xt_pkttype.h -#usr/include/linux/netfilter/xt_policy.h -#usr/include/linux/netfilter/xt_quota.h -#usr/include/linux/netfilter/xt_rateest.h -#usr/include/linux/netfilter/xt_realm.h -#usr/include/linux/netfilter/xt_recent.h -#usr/include/linux/netfilter/xt_sctp.h -#usr/include/linux/netfilter/xt_state.h -#usr/include/linux/netfilter/xt_statistic.h -#usr/include/linux/netfilter/xt_string.h -#usr/include/linux/netfilter/xt_tcpmss.h -#usr/include/linux/netfilter/xt_tcpudp.h -#usr/include/linux/netfilter/xt_time.h -#usr/include/linux/netfilter/xt_u32.h -#usr/include/linux/netfilter_arp -#usr/include/linux/netfilter_arp.h -#usr/include/linux/netfilter_arp/arp_tables.h -#usr/include/linux/netfilter_arp/arpt_mangle.h -#usr/include/linux/netfilter_bridge -#usr/include/linux/netfilter_bridge.h -#usr/include/linux/netfilter_bridge/ebt_802_3.h -#usr/include/linux/netfilter_bridge/ebt_among.h -#usr/include/linux/netfilter_bridge/ebt_arp.h -#usr/include/linux/netfilter_bridge/ebt_arpreply.h -#usr/include/linux/netfilter_bridge/ebt_ip.h -#usr/include/linux/netfilter_bridge/ebt_limit.h -#usr/include/linux/netfilter_bridge/ebt_log.h -#usr/include/linux/netfilter_bridge/ebt_mark_m.h -#usr/include/linux/netfilter_bridge/ebt_mark_t.h -#usr/include/linux/netfilter_bridge/ebt_nat.h -#usr/include/linux/netfilter_bridge/ebt_pkttype.h -#usr/include/linux/netfilter_bridge/ebt_redirect.h -#usr/include/linux/netfilter_bridge/ebt_stp.h -#usr/include/linux/netfilter_bridge/ebt_ulog.h -#usr/include/linux/netfilter_bridge/ebt_vlan.h -#usr/include/linux/netfilter_bridge/ebtables.h -#usr/include/linux/netfilter_decnet.h -#usr/include/linux/netfilter_ipv4 -#usr/include/linux/netfilter_ipv4.h -#usr/include/linux/netfilter_ipv4/ip_queue.h -#usr/include/linux/netfilter_ipv4/ip_tables.h -#usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h -#usr/include/linux/netfilter_ipv4/ipt_ECN.h -#usr/include/linux/netfilter_ipv4/ipt_LOG.h -#usr/include/linux/netfilter_ipv4/ipt_REJECT.h -#usr/include/linux/netfilter_ipv4/ipt_SAME.h -#usr/include/linux/netfilter_ipv4/ipt_TTL.h -#usr/include/linux/netfilter_ipv4/ipt_ULOG.h -#usr/include/linux/netfilter_ipv4/ipt_addrtype.h -#usr/include/linux/netfilter_ipv4/ipt_ah.h -#usr/include/linux/netfilter_ipv4/ipt_ecn.h -#usr/include/linux/netfilter_ipv4/ipt_realm.h -#usr/include/linux/netfilter_ipv4/ipt_ttl.h -#usr/include/linux/netfilter_ipv6 -#usr/include/linux/netfilter_ipv6.h -#usr/include/linux/netfilter_ipv6/ip6_tables.h -#usr/include/linux/netfilter_ipv6/ip6t_HL.h -#usr/include/linux/netfilter_ipv6/ip6t_LOG.h -#usr/include/linux/netfilter_ipv6/ip6t_REJECT.h -#usr/include/linux/netfilter_ipv6/ip6t_ah.h -#usr/include/linux/netfilter_ipv6/ip6t_frag.h -#usr/include/linux/netfilter_ipv6/ip6t_hl.h -#usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h -#usr/include/linux/netfilter_ipv6/ip6t_mh.h -#usr/include/linux/netfilter_ipv6/ip6t_opts.h -#usr/include/linux/netfilter_ipv6/ip6t_rt.h -#usr/include/linux/netlink.h -#usr/include/linux/netrom.h -#usr/include/linux/nfs.h -#usr/include/linux/nfs2.h -#usr/include/linux/nfs3.h -#usr/include/linux/nfs4.h -#usr/include/linux/nfs4_mount.h -#usr/include/linux/nfs_fs.h -#usr/include/linux/nfs_idmap.h -#usr/include/linux/nfs_mount.h -#usr/include/linux/nfsacl.h -#usr/include/linux/nfsd -#usr/include/linux/nfsd/const.h -#usr/include/linux/nfsd/debug.h -#usr/include/linux/nfsd/export.h -#usr/include/linux/nfsd/nfsfh.h -#usr/include/linux/nfsd/stats.h -#usr/include/linux/nfsd/syscall.h -#usr/include/linux/nl80211.h -#usr/include/linux/nubus.h -#usr/include/linux/nvram.h -#usr/include/linux/oom.h -#usr/include/linux/param.h -#usr/include/linux/parport.h -#usr/include/linux/patchkey.h -#usr/include/linux/pci.h -#usr/include/linux/pci_regs.h -#usr/include/linux/perf_event.h -#usr/include/linux/personality.h -#usr/include/linux/pfkeyv2.h -#usr/include/linux/pg.h -#usr/include/linux/phantom.h -#usr/include/linux/phonet.h -#usr/include/linux/pkt_cls.h -#usr/include/linux/pkt_sched.h -#usr/include/linux/pktcdvd.h -#usr/include/linux/pmu.h -#usr/include/linux/poll.h -#usr/include/linux/posix_types.h -#usr/include/linux/ppdev.h -#usr/include/linux/ppp-comp.h -#usr/include/linux/ppp_defs.h -#usr/include/linux/pps.h -#usr/include/linux/prctl.h -#usr/include/linux/ptrace.h -#usr/include/linux/qnx4_fs.h -#usr/include/linux/qnxtypes.h -#usr/include/linux/quota.h -#usr/include/linux/radeonfb.h -#usr/include/linux/raid -#usr/include/linux/raid/md_p.h -#usr/include/linux/raid/md_u.h -#usr/include/linux/random.h -#usr/include/linux/raw.h -#usr/include/linux/reboot.h -#usr/include/linux/reiserfs_fs.h -#usr/include/linux/reiserfs_xattr.h -#usr/include/linux/resource.h -#usr/include/linux/rfkill.h -#usr/include/linux/romfs_fs.h -#usr/include/linux/rose.h -#usr/include/linux/route.h -#usr/include/linux/rtc.h -#usr/include/linux/rtnetlink.h -#usr/include/linux/scc.h -#usr/include/linux/sched.h -#usr/include/linux/screen_info.h -#usr/include/linux/sdla.h -#usr/include/linux/selinux_netlink.h -#usr/include/linux/sem.h -#usr/include/linux/serial.h -#usr/include/linux/serial_core.h -#usr/include/linux/serial_reg.h -#usr/include/linux/serio.h -#usr/include/linux/shm.h -#usr/include/linux/signal.h -#usr/include/linux/signalfd.h -#usr/include/linux/smb.h -#usr/include/linux/smb_fs.h -#usr/include/linux/smb_mount.h -#usr/include/linux/smbno.h -#usr/include/linux/snmp.h -#usr/include/linux/socket.h -#usr/include/linux/sockios.h -#usr/include/linux/som.h -#usr/include/linux/sonet.h -#usr/include/linux/sonypi.h -#usr/include/linux/sound.h -#usr/include/linux/soundcard.h -#usr/include/linux/spi -#usr/include/linux/spi/spidev.h -#usr/include/linux/stat.h -#usr/include/linux/stddef.h -#usr/include/linux/string.h -#usr/include/linux/sunrpc -#usr/include/linux/sunrpc/debug.h -#usr/include/linux/suspend_ioctls.h -#usr/include/linux/swab.h -#usr/include/linux/synclink.h -#usr/include/linux/sysctl.h -#usr/include/linux/taskstats.h -#usr/include/linux/tc_act -#usr/include/linux/tc_act/tc_gact.h -#usr/include/linux/tc_act/tc_ipt.h -#usr/include/linux/tc_act/tc_mirred.h -#usr/include/linux/tc_act/tc_nat.h -#usr/include/linux/tc_act/tc_pedit.h -#usr/include/linux/tc_act/tc_skbedit.h -#usr/include/linux/tc_ematch -#usr/include/linux/tc_ematch/tc_em_cmp.h -#usr/include/linux/tc_ematch/tc_em_meta.h -#usr/include/linux/tc_ematch/tc_em_nbyte.h -#usr/include/linux/tc_ematch/tc_em_text.h -#usr/include/linux/tcp.h -#usr/include/linux/telephony.h -#usr/include/linux/termios.h -#usr/include/linux/time.h -#usr/include/linux/times.h -#usr/include/linux/timex.h -#usr/include/linux/tiocl.h -#usr/include/linux/tipc.h -#usr/include/linux/tipc_config.h -#usr/include/linux/toshiba.h -#usr/include/linux/tty.h -#usr/include/linux/types.h -#usr/include/linux/udf_fs_i.h -#usr/include/linux/udp.h -#usr/include/linux/uinput.h -#usr/include/linux/uio.h -#usr/include/linux/ultrasound.h -#usr/include/linux/un.h -#usr/include/linux/unistd.h -#usr/include/linux/usb -#usr/include/linux/usb/audio.h -#usr/include/linux/usb/cdc.h -#usr/include/linux/usb/ch9.h -#usr/include/linux/usb/g_printer.h -#usr/include/linux/usb/gadgetfs.h -#usr/include/linux/usb/midi.h -#usr/include/linux/usb/tmc.h -#usr/include/linux/usb/vstusb.h -#usr/include/linux/usbdevice_fs.h -#usr/include/linux/utime.h -#usr/include/linux/utsname.h -#usr/include/linux/version.h -#usr/include/linux/veth.h -#usr/include/linux/videodev.h -#usr/include/linux/videodev2.h -#usr/include/linux/videotext.h -#usr/include/linux/virtio_9p.h -#usr/include/linux/virtio_balloon.h -#usr/include/linux/virtio_blk.h -#usr/include/linux/virtio_config.h -#usr/include/linux/virtio_console.h -#usr/include/linux/virtio_ids.h -#usr/include/linux/virtio_net.h -#usr/include/linux/virtio_pci.h -#usr/include/linux/virtio_ring.h -#usr/include/linux/virtio_rng.h -#usr/include/linux/vt.h -#usr/include/linux/wait.h -#usr/include/linux/wanrouter.h -#usr/include/linux/watchdog.h -#usr/include/linux/wimax -#usr/include/linux/wimax.h -#usr/include/linux/wimax/i2400m.h -#usr/include/linux/wireless.h -#usr/include/linux/x25.h -#usr/include/linux/xattr.h -#usr/include/linux/xfrm.h -#usr/include/mtd -#usr/include/mtd/inftl-user.h -#usr/include/mtd/mtd-abi.h -#usr/include/mtd/mtd-user.h -#usr/include/mtd/nftl-user.h -#usr/include/mtd/ubi-user.h -#usr/include/rdma -#usr/include/rdma/ib_user_mad.h -#usr/include/scsi -#usr/include/scsi/scsi.h -#usr/include/scsi/scsi_bsg_fc.h -#usr/include/scsi/scsi_netlink.h -#usr/include/scsi/scsi_netlink_fc.h -#usr/include/sound -#usr/include/sound/asequencer.h -#usr/include/sound/asound.h -#usr/include/sound/asound_fm.h -#usr/include/sound/emu10k1.h -#usr/include/sound/hdsp.h -#usr/include/sound/hdspm.h -#usr/include/sound/sb16_csp.h -#usr/include/sound/sfnt_info.h -#usr/include/sound/sscape_ioctl.h -#usr/include/video -#usr/include/video/edid.h -#usr/include/video/sisfb.h -#usr/include/video/uvesafb.h -#usr/include/xen -#usr/include/xen/evtchn.h hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 7e5cbd938bb3d62182689aac0a2ac27c609c4515
by git＠ipfire.org 13 Nov '12

13 Nov '12

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 7e5cbd938bb3d62182689aac0a2ac27c609c4515 (commit) via cc24c14bfe52558aceb4489c8ef7a94fbe79edb0 (commit) via aaddc86cbfea0da30b88a03c326c097562f38b9d (commit) via 94385278fb924524a1781a9ddcc8f42e949ec2c0 (commit) via 10c30c2066a4c0fd74f7ac6da33005927faec57f (commit) via 0f8a5b08565b456681562f5c8dcd4df7477b1d47 (commit) via 7343fdaf6e7e2619c3be2008ddb261462fb92ea9 (commit) from 6fead212add7e93df5a5f9affab71679f438888f (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 7e5cbd938bb3d62182689aac0a2ac27c609c4515 Merge: cc24c14 6fead21 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Nov 13 18:29:13 2012 +0100 Merge branch 'thirteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into thirteen commit cc24c14bfe52558aceb4489c8ef7a94fbe79edb0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Nov 13 18:26:28 2012 +0100 linux-headers: use kernel 3.2.x headers. commit aaddc86cbfea0da30b88a03c326c097562f38b9d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Nov 13 18:25:35 2012 +0100 compat-wireless: updated to 3.6.6-1-snp. commit 94385278fb924524a1781a9ddcc8f42e949ec2c0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Nov 13 18:25:07 2012 +0100 w_scan: update to 20121111. commit 10c30c2066a4c0fd74f7ac6da33005927faec57f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Nov 13 08:51:39 2012 +0100 initskripts: acpid need syslog. also added stop at shutdown to suppress ugly messages on console. commit 0f8a5b08565b456681562f5c8dcd4df7477b1d47 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Nov 13 08:44:34 2012 +0100 initskripts: sendsignal - print ok if no processes are left. commit 7343fdaf6e7e2619c3be2008ddb261462fb92ea9 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Nov 13 06:40:25 2012 +0100 iptables: rootfile update. ----------------------------------------------------------------------- Summary of changes: config/include/obsolete_videodev.h | 320 ++++++++++++++++++++ config/rootfiles/common/i586/glibc | 1 + config/rootfiles/common/i586/initscripts | 4 +- .../common/i586/{linux2 => linux-headers} | 77 ++++- config/rootfiles/common/iptables | 16 + config/rootfiles/packages/w_scan | 4 +- lfs/compat-wireless | 4 +- lfs/initscripts | 4 +- lfs/linux | 10 +- lfs/motion | 8 + lfs/vdr | 9 +- lfs/w_scan | 16 +- make.sh | 4 +- src/initscripts/init.d/sendsignals | 4 +- src/patches/w_scan-ipfire.patch | 130 -------- 15 files changed, 441 insertions(+), 170 deletions(-) create mode 100644 config/include/obsolete_videodev.h rename config/rootfiles/common/i586/{linux2 => linux-headers} (90%) delete mode 100644 src/patches/w_scan-ipfire.patch Difference in files: diff --git a/config/include/obsolete_videodev.h b/config/include/obsolete_videodev.h new file mode 100644 index 0000000..c51a5f9 --- /dev/null +++ b/config/include/obsolete_videodev.h @@ -0,0 +1,320 @@ +/* + * Video for Linux version 1 - OBSOLETE + * + * Header file for v4l1 drivers and applications, for + * Linux kernels 2.2.x or 2.4.x. + * + * Provides header for legacy drivers and applications + * + * See http://linuxtv.org for more info + * + */ +#ifndef __LINUX_VIDEODEV_H +#define __LINUX_VIDEODEV_H + +#include <linux/types.h> +#include <linux/ioctl.h> +#include <linux/videodev2.h> + + +#define VID_TYPE_CAPTURE 1 /* Can capture */ +#define VID_TYPE_TUNER 2 /* Can tune */ +#define VID_TYPE_TELETEXT 4 /* Does teletext */ +#define VID_TYPE_OVERLAY 8 /* Overlay onto frame buffer */ +#define VID_TYPE_CHROMAKEY 16 /* Overlay by chromakey */ +#define VID_TYPE_CLIPPING 32 /* Can clip */ +#define VID_TYPE_FRAMERAM 64 /* Uses the frame buffer memory */ +#define VID_TYPE_SCALES 128 /* Scalable */ +#define VID_TYPE_MONOCHROME 256 /* Monochrome only */ +#define VID_TYPE_SUBCAPTURE 512 /* Can capture subareas of the image */ +#define VID_TYPE_MPEG_DECODER 1024 /* Can decode MPEG streams */ +#define VID_TYPE_MPEG_ENCODER 2048 /* Can encode MPEG streams */ +#define VID_TYPE_MJPEG_DECODER 4096 /* Can decode MJPEG streams */ +#define VID_TYPE_MJPEG_ENCODER 8192 /* Can encode MJPEG streams */ + +struct video_capability +{ + char name[32]; + int type; + int channels; /* Num channels */ + int audios; /* Num audio devices */ + int maxwidth; /* Supported width */ + int maxheight; /* And height */ + int minwidth; /* Supported width */ + int minheight; /* And height */ +}; + + +struct video_channel +{ + int channel; + char name[32]; + int tuners; + __u32 flags; +#define VIDEO_VC_TUNER 1 /* Channel has a tuner */ +#define VIDEO_VC_AUDIO 2 /* Channel has audio */ + __u16 type; +#define VIDEO_TYPE_TV 1 +#define VIDEO_TYPE_CAMERA 2 + __u16 norm; /* Norm set by channel */ +}; + +struct video_tuner +{ + int tuner; + char name[32]; + unsigned long rangelow, rangehigh; /* Tuner range */ + __u32 flags; +#define VIDEO_TUNER_PAL 1 +#define VIDEO_TUNER_NTSC 2 +#define VIDEO_TUNER_SECAM 4 +#define VIDEO_TUNER_LOW 8 /* Uses KHz not MHz */ +#define VIDEO_TUNER_NORM 16 /* Tuner can set norm */ +#define VIDEO_TUNER_STEREO_ON 128 /* Tuner is seeing stereo */ +#define VIDEO_TUNER_RDS_ON 256 /* Tuner is seeing an RDS datastream */ +#define VIDEO_TUNER_MBS_ON 512 /* Tuner is seeing an MBS datastream */ + __u16 mode; /* PAL/NTSC/SECAM/OTHER */ +#define VIDEO_MODE_PAL 0 +#define VIDEO_MODE_NTSC 1 +#define VIDEO_MODE_SECAM 2 +#define VIDEO_MODE_AUTO 3 + __u16 signal; /* Signal strength 16bit scale */ +}; + +struct video_picture +{ + __u16 brightness; + __u16 hue; + __u16 colour; + __u16 contrast; + __u16 whiteness; /* Black and white only */ + __u16 depth; /* Capture depth */ + __u16 palette; /* Palette in use */ +#define VIDEO_PALETTE_GREY 1 /* Linear greyscale */ +#define VIDEO_PALETTE_HI240 2 /* High 240 cube (BT848) */ +#define VIDEO_PALETTE_RGB565 3 /* 565 16 bit RGB */ +#define VIDEO_PALETTE_RGB24 4 /* 24bit RGB */ +#define VIDEO_PALETTE_RGB32 5 /* 32bit RGB */ +#define VIDEO_PALETTE_RGB555 6 /* 555 15bit RGB */ +#define VIDEO_PALETTE_YUV422 7 /* YUV422 capture */ +#define VIDEO_PALETTE_YUYV 8 +#define VIDEO_PALETTE_UYVY 9 /* The great thing about standards is ... */ +#define VIDEO_PALETTE_YUV420 10 +#define VIDEO_PALETTE_YUV411 11 /* YUV411 capture */ +#define VIDEO_PALETTE_RAW 12 /* RAW capture (BT848) */ +#define VIDEO_PALETTE_YUV422P 13 /* YUV 4:2:2 Planar */ +#define VIDEO_PALETTE_YUV411P 14 /* YUV 4:1:1 Planar */ +#define VIDEO_PALETTE_YUV420P 15 /* YUV 4:2:0 Planar */ +#define VIDEO_PALETTE_YUV410P 16 /* YUV 4:1:0 Planar */ +#define VIDEO_PALETTE_PLANAR 13 /* start of planar entries */ +#define VIDEO_PALETTE_COMPONENT 7 /* start of component entries */ +}; + +struct video_audio +{ + int audio; /* Audio channel */ + __u16 volume; /* If settable */ + __u16 bass, treble; + __u32 flags; +#define VIDEO_AUDIO_MUTE 1 +#define VIDEO_AUDIO_MUTABLE 2 +#define VIDEO_AUDIO_VOLUME 4 +#define VIDEO_AUDIO_BASS 8 +#define VIDEO_AUDIO_TREBLE 16 +#define VIDEO_AUDIO_BALANCE 32 + char name[16]; +#define VIDEO_SOUND_MONO 1 +#define VIDEO_SOUND_STEREO 2 +#define VIDEO_SOUND_LANG1 4 +#define VIDEO_SOUND_LANG2 8 + __u16 mode; + __u16 balance; /* Stereo balance */ + __u16 step; /* Step actual volume uses */ +}; + +struct video_clip +{ + __s32 x,y; + __s32 width, height; + struct video_clip *next; /* For user use/driver use only */ +}; + +struct video_window +{ + __u32 x,y; /* Position of window */ + __u32 width,height; /* Its size */ + __u32 chromakey; + __u32 flags; + struct video_clip *clips; /* Set only */ + int clipcount; +#define VIDEO_WINDOW_INTERLACE 1 +#define VIDEO_WINDOW_CHROMAKEY 16 /* Overlay by chromakey */ +#define VIDEO_CLIP_BITMAP -1 +/* bitmap is 1024x625, a '1' bit represents a clipped pixel */ +#define VIDEO_CLIPMAP_SIZE (128 * 625) +}; + +struct video_capture +{ + __u32 x,y; /* Offsets into image */ + __u32 width, height; /* Area to capture */ + __u16 decimation; /* Decimation divider */ + __u16 flags; /* Flags for capture */ +#define VIDEO_CAPTURE_ODD 0 /* Temporal */ +#define VIDEO_CAPTURE_EVEN 1 +}; + +struct video_buffer +{ + void *base; + int height,width; + int depth; + int bytesperline; +}; + +struct video_mmap +{ + unsigned int frame; /* Frame (0 - n) for double buffer */ + int height,width; + unsigned int format; /* should be VIDEO_PALETTE_* */ +}; + +struct video_key +{ + __u8 key[8]; + __u32 flags; +}; + +struct video_mbuf +{ + int size; /* Total memory to map */ + int frames; /* Frames */ + int offsets[VIDEO_MAX_FRAME]; +}; + +#define VIDEO_NO_UNIT (-1) + +struct video_unit +{ + int video; /* Video minor */ + int vbi; /* VBI minor */ + int radio; /* Radio minor */ + int audio; /* Audio minor */ + int teletext; /* Teletext minor */ +}; + +struct vbi_format { + __u32 sampling_rate; /* in Hz */ + __u32 samples_per_line; + __u32 sample_format; /* VIDEO_PALETTE_RAW only (1 byte) */ + __s32 start[2]; /* starting line for each frame */ + __u32 count[2]; /* count of lines for each frame */ + __u32 flags; +#define VBI_UNSYNC 1 /* can distingues between top/bottom field */ +#define VBI_INTERLACED 2 /* lines are interlaced */ +}; + +/* video_info is biased towards hardware mpeg encode/decode */ +/* but it could apply generically to any hardware compressor/decompressor */ +struct video_info +{ + __u32 frame_count; /* frames output since decode/encode began */ + __u32 h_size; /* current unscaled horizontal size */ + __u32 v_size; /* current unscaled veritcal size */ + __u32 smpte_timecode; /* current SMPTE timecode (for current GOP) */ + __u32 picture_type; /* current picture type */ + __u32 temporal_reference; /* current temporal reference */ + __u8 user_data[256]; /* user data last found in compressed stream */ + /* user_data[0] contains user data flags, user_data[1] has count */ +}; + +/* generic structure for setting playback modes */ +struct video_play_mode +{ + int mode; + int p1; + int p2; +}; + +/* for loading microcode / fpga programming */ +struct video_code +{ + char loadwhat[16]; /* name or tag of file being passed */ + int datasize; + __u8 *data; +}; + +#define VIDIOCGCAP _IOR('v',1,struct video_capability) /* Get capabilities */ +#define VIDIOCGCHAN _IOWR('v',2,struct video_channel) /* Get channel info (sources) */ +#define VIDIOCSCHAN _IOW('v',3,struct video_channel) /* Set channel */ +#define VIDIOCGTUNER _IOWR('v',4,struct video_tuner) /* Get tuner abilities */ +#define VIDIOCSTUNER _IOW('v',5,struct video_tuner) /* Tune the tuner for the current channel */ +#define VIDIOCGPICT _IOR('v',6,struct video_picture) /* Get picture properties */ +#define VIDIOCSPICT _IOW('v',7,struct video_picture) /* Set picture properties */ +#define VIDIOCCAPTURE _IOW('v',8,int) /* Start, end capture */ +#define VIDIOCGWIN _IOR('v',9, struct video_window) /* Get the video overlay window */ +#define VIDIOCSWIN _IOW('v',10, struct video_window) /* Set the video overlay window - passes clip list for hardware smarts , chromakey etc */ +#define VIDIOCGFBUF _IOR('v',11, struct video_buffer) /* Get frame buffer */ +#define VIDIOCSFBUF _IOW('v',12, struct video_buffer) /* Set frame buffer - root only */ +#define VIDIOCKEY _IOR('v',13, struct video_key) /* Video key event - to dev 255 is to all - cuts capture on all DMA windows with this key (0xFFFFFFFF == all) */ +#define VIDIOCGFREQ _IOR('v',14, unsigned long) /* Set tuner */ +#define VIDIOCSFREQ _IOW('v',15, unsigned long) /* Set tuner */ +#define VIDIOCGAUDIO _IOR('v',16, struct video_audio) /* Get audio info */ +#define VIDIOCSAUDIO _IOW('v',17, struct video_audio) /* Audio source, mute etc */ +#define VIDIOCSYNC _IOW('v',18, int) /* Sync with mmap grabbing */ +#define VIDIOCMCAPTURE _IOW('v',19, struct video_mmap) /* Grab frames */ +#define VIDIOCGMBUF _IOR('v',20, struct video_mbuf) /* Memory map buffer info */ +#define VIDIOCGUNIT _IOR('v',21, struct video_unit) /* Get attached units */ +#define VIDIOCGCAPTURE _IOR('v',22, struct video_capture) /* Get subcapture */ +#define VIDIOCSCAPTURE _IOW('v',23, struct video_capture) /* Set subcapture */ +#define VIDIOCSPLAYMODE _IOW('v',24, struct video_play_mode) /* Set output video mode/feature */ +#define VIDIOCSWRITEMODE _IOW('v',25, int) /* Set write mode */ +#define VIDIOCGPLAYINFO _IOR('v',26, struct video_info) /* Get current playback info from hardware */ +#define VIDIOCSMICROCODE _IOW('v',27, struct video_code) /* Load microcode into hardware */ +#define VIDIOCGVBIFMT _IOR('v',28, struct vbi_format) /* Get VBI information */ +#define VIDIOCSVBIFMT _IOW('v',29, struct vbi_format) /* Set VBI information */ + + +#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */ + +/* VIDIOCSWRITEMODE */ +#define VID_WRITE_MPEG_AUD 0 +#define VID_WRITE_MPEG_VID 1 +#define VID_WRITE_OSD 2 +#define VID_WRITE_TTX 3 +#define VID_WRITE_CC 4 +#define VID_WRITE_MJPEG 5 + +/* VIDIOCSPLAYMODE */ +#define VID_PLAY_VID_OUT_MODE 0 + /* p1: = VIDEO_MODE_PAL, VIDEO_MODE_NTSC, etc ... */ +#define VID_PLAY_GENLOCK 1 + /* p1: 0 = OFF, 1 = ON */ + /* p2: GENLOCK FINE DELAY value */ +#define VID_PLAY_NORMAL 2 +#define VID_PLAY_PAUSE 3 +#define VID_PLAY_SINGLE_FRAME 4 +#define VID_PLAY_FAST_FORWARD 5 +#define VID_PLAY_SLOW_MOTION 6 +#define VID_PLAY_IMMEDIATE_NORMAL 7 +#define VID_PLAY_SWITCH_CHANNELS 8 +#define VID_PLAY_FREEZE_FRAME 9 +#define VID_PLAY_STILL_MODE 10 +#define VID_PLAY_MASTER_MODE 11 + /* p1: see below */ +#define VID_PLAY_MASTER_NONE 1 +#define VID_PLAY_MASTER_VIDEO 2 +#define VID_PLAY_MASTER_AUDIO 3 +#define VID_PLAY_ACTIVE_SCANLINES 12 + /* p1 = first active; p2 = last active */ +#define VID_PLAY_RESET 13 +#define VID_PLAY_END_MARK 14 + + +#endif /* __LINUX_VIDEODEV_H */ + +/* + * Local variables: + * c-basic-offset: 8 + * End: + */ diff --git a/config/rootfiles/common/i586/glibc b/config/rootfiles/common/i586/glibc index 129475f..ca62948 100644 --- a/config/rootfiles/common/i586/glibc +++ b/config/rootfiles/common/i586/glibc @@ -354,6 +354,7 @@ usr/bin/ldd #usr/include/rpcsvc/yppasswd.x #usr/include/rpcsvc/ypupd.h #usr/include/sched.h +#usr/include/scsi/scsi.h #usr/include/scsi/scsi_ioctl.h #usr/include/scsi/sg.h #usr/include/search.h diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 8092a16..5bc93d7 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -151,6 +151,7 @@ etc/rc.d/rc0.d/K80network #etc/rc.d/rc0.d/K84bluetooth #etc/rc.d/rc0.d/K85messagebus etc/rc.d/rc0.d/K85tmpfs +etc/rc.d/rc0.d/K87acpid etc/rc.d/rc0.d/K90sysklogd etc/rc.d/rc0.d/S60sendsignals etc/rc.d/rc0.d/S70localnet @@ -160,6 +161,7 @@ etc/rc.d/rc0.d/S99halt #etc/rc.d/rc3.d etc/rc.d/rc3.d/S01tmpfs etc/rc.d/rc3.d/S10sysklogd +etc/rc.d/rc3.d/S12acpid #etc/rc.d/rc3.d/S15messagebus #etc/rc.d/rc3.d/S16bluetooth #etc/rc.d/rc3.d/S18cpufreq @@ -197,6 +199,7 @@ etc/rc.d/rc6.d/K80network #etc/rc.d/rc6.d/K84bluetooth #etc/rc.d/rc6.d/K85messagebus etc/rc.d/rc6.d/K85tmpfs +etc/rc.d/rc6.d/K87acpid etc/rc.d/rc6.d/K90sysklogd etc/rc.d/rc6.d/S60sendsignals etc/rc.d/rc6.d/S70mountfs @@ -214,7 +217,6 @@ etc/rc.d/rcsysinit.d/S30checkfs etc/rc.d/rcsysinit.d/S40mountfs etc/rc.d/rcsysinit.d/S45udev_retry etc/rc.d/rcsysinit.d/S50cleanfs -etc/rc.d/rcsysinit.d/S51acpid etc/rc.d/rcsysinit.d/S60setclock etc/rc.d/rcsysinit.d/S70console etc/rc.d/rcsysinit.d/S75firstsetup diff --git a/config/rootfiles/common/i586/linux-headers b/config/rootfiles/common/i586/linux-headers new file mode 100644 index 0000000..e518ab3 --- /dev/null +++ b/config/rootfiles/common/i586/linux-headers @@ -0,0 +1,704 @@ +#usr/include/asm +#usr/include/asm-generic +#usr/include/asm-generic/auxvec.h +#usr/include/asm-generic/bitsperlong.h +#usr/include/asm-generic/errno-base.h +#usr/include/asm-generic/errno.h +#usr/include/asm-generic/fcntl.h +#usr/include/asm-generic/int-l64.h +#usr/include/asm-generic/int-ll64.h +#usr/include/asm-generic/ioctl.h +#usr/include/asm-generic/ioctls.h +#usr/include/asm-generic/ipcbuf.h +#usr/include/asm-generic/mman-common.h +#usr/include/asm-generic/mman.h +#usr/include/asm-generic/msgbuf.h +#usr/include/asm-generic/param.h +#usr/include/asm-generic/poll.h +#usr/include/asm-generic/posix_types.h +#usr/include/asm-generic/resource.h +#usr/include/asm-generic/sembuf.h +#usr/include/asm-generic/setup.h +#usr/include/asm-generic/shmbuf.h +#usr/include/asm-generic/shmparam.h +#usr/include/asm-generic/siginfo.h +#usr/include/asm-generic/signal-defs.h +#usr/include/asm-generic/signal.h +#usr/include/asm-generic/socket.h +#usr/include/asm-generic/sockios.h +#usr/include/asm-generic/stat.h +#usr/include/asm-generic/statfs.h +#usr/include/asm-generic/swab.h +#usr/include/asm-generic/termbits.h +#usr/include/asm-generic/termios.h +#usr/include/asm-generic/types.h +#usr/include/asm-generic/ucontext.h +#usr/include/asm-generic/unistd.h +#usr/include/asm/a.out.h +#usr/include/asm/auxvec.h +#usr/include/asm/bitsperlong.h +#usr/include/asm/boot.h +#usr/include/asm/bootparam.h +#usr/include/asm/byteorder.h +#usr/include/asm/debugreg.h +#usr/include/asm/e820.h +#usr/include/asm/errno.h +#usr/include/asm/fcntl.h +#usr/include/asm/hw_breakpoint.h +#usr/include/asm/hyperv.h +#usr/include/asm/ioctl.h +#usr/include/asm/ioctls.h +#usr/include/asm/ipcbuf.h +#usr/include/asm/ist.h +#usr/include/asm/kvm.h +#usr/include/asm/kvm_para.h +#usr/include/asm/ldt.h +#usr/include/asm/mce.h +#usr/include/asm/mman.h +#usr/include/asm/msgbuf.h +#usr/include/asm/msr-index.h +#usr/include/asm/msr.h +#usr/include/asm/mtrr.h +#usr/include/asm/param.h +#usr/include/asm/poll.h +#usr/include/asm/posix_types.h +#usr/include/asm/posix_types_32.h +#usr/include/asm/posix_types_64.h +#usr/include/asm/prctl.h +#usr/include/asm/processor-flags.h +#usr/include/asm/ptrace-abi.h +#usr/include/asm/ptrace.h +#usr/include/asm/resource.h +#usr/include/asm/sembuf.h +#usr/include/asm/setup.h +#usr/include/asm/shmbuf.h +#usr/include/asm/sigcontext.h +#usr/include/asm/sigcontext32.h +#usr/include/asm/siginfo.h +#usr/include/asm/signal.h +#usr/include/asm/socket.h +#usr/include/asm/sockios.h +#usr/include/asm/stat.h +#usr/include/asm/statfs.h +#usr/include/asm/swab.h +#usr/include/asm/termbits.h +#usr/include/asm/termios.h +#usr/include/asm/types.h +#usr/include/asm/ucontext.h +#usr/include/asm/unistd.h +#usr/include/asm/unistd_32.h +#usr/include/asm/unistd_64.h +#usr/include/asm/vm86.h +#usr/include/asm/vsyscall.h +#usr/include/drm +#usr/include/drm/drm.h +#usr/include/drm/drm_mode.h +#usr/include/drm/drm_sarea.h +#usr/include/drm/i810_drm.h +#usr/include/drm/i915_drm.h +#usr/include/drm/mga_drm.h +#usr/include/drm/nouveau_drm.h +#usr/include/drm/r128_drm.h +#usr/include/drm/radeon_drm.h +#usr/include/drm/savage_drm.h +#usr/include/drm/sis_drm.h +#usr/include/drm/via_drm.h +#usr/include/drm/vmwgfx_drm.h +#usr/include/linux +#usr/include/linux/a.out.h +#usr/include/linux/acct.h +#usr/include/linux/adb.h +#usr/include/linux/adfs_fs.h +#usr/include/linux/affs_hardblocks.h +#usr/include/linux/agpgart.h +#usr/include/linux/aio_abi.h +#usr/include/linux/apm_bios.h +#usr/include/linux/arcfb.h +#usr/include/linux/atalk.h +#usr/include/linux/atm.h +#usr/include/linux/atm_eni.h +#usr/include/linux/atm_he.h +#usr/include/linux/atm_idt77105.h +#usr/include/linux/atm_nicstar.h +#usr/include/linux/atm_tcp.h +#usr/include/linux/atm_zatm.h +#usr/include/linux/atmapi.h +#usr/include/linux/atmarp.h +#usr/include/linux/atmbr2684.h +#usr/include/linux/atmclip.h +#usr/include/linux/atmdev.h +#usr/include/linux/atmioc.h +#usr/include/linux/atmlec.h +#usr/include/linux/atmmpc.h +#usr/include/linux/atmppp.h +#usr/include/linux/atmsap.h +#usr/include/linux/atmsvc.h +#usr/include/linux/audit.h +#usr/include/linux/auto_fs.h +#usr/include/linux/auto_fs4.h +#usr/include/linux/auxvec.h +#usr/include/linux/ax25.h +#usr/include/linux/b1lli.h +#usr/include/linux/baycom.h +#usr/include/linux/bfs_fs.h +#usr/include/linux/binfmts.h +#usr/include/linux/blk_types.h +#usr/include/linux/blkpg.h +#usr/include/linux/blktrace_api.h +#usr/include/linux/bpqether.h +#usr/include/linux/bsg.h +#usr/include/linux/byteorder +#usr/include/linux/byteorder/big_endian.h +#usr/include/linux/byteorder/little_endian.h +#usr/include/linux/caif +#usr/include/linux/caif/caif_socket.h +#usr/include/linux/caif/if_caif.h +#usr/include/linux/can +#usr/include/linux/can.h +#usr/include/linux/can/bcm.h +#usr/include/linux/can/error.h +#usr/include/linux/can/gw.h +#usr/include/linux/can/netlink.h +#usr/include/linux/can/raw.h +#usr/include/linux/capability.h +#usr/include/linux/capi.h +#usr/include/linux/cciss_defs.h +#usr/include/linux/cciss_ioctl.h +#usr/include/linux/cdk.h +#usr/include/linux/cdrom.h +#usr/include/linux/cgroupstats.h +#usr/include/linux/chio.h +#usr/include/linux/cm4000_cs.h +#usr/include/linux/cn_proc.h +#usr/include/linux/coda.h +#usr/include/linux/coda_psdev.h +#usr/include/linux/coff.h +#usr/include/linux/comstats.h +#usr/include/linux/connector.h +#usr/include/linux/const.h +#usr/include/linux/cramfs_fs.h +#usr/include/linux/cuda.h +#usr/include/linux/cyclades.h +#usr/include/linux/cycx_cfm.h +#usr/include/linux/dcbnl.h +#usr/include/linux/dccp.h +#usr/include/linux/dlm.h +#usr/include/linux/dlm_device.h +#usr/include/linux/dlm_netlink.h +#usr/include/linux/dlm_plock.h +#usr/include/linux/dlmconstants.h +#usr/include/linux/dm-ioctl.h +#usr/include/linux/dm-log-userspace.h +#usr/include/linux/dn.h +#usr/include/linux/dqblk_xfs.h +#usr/include/linux/dvb +#usr/include/linux/dvb/audio.h +#usr/include/linux/dvb/ca.h +#usr/include/linux/dvb/dmx.h +#usr/include/linux/dvb/frontend.h +#usr/include/linux/dvb/net.h +#usr/include/linux/dvb/osd.h +#usr/include/linux/dvb/version.h +#usr/include/linux/dvb/video.h +#usr/include/linux/edd.h +#usr/include/linux/efs_fs_sb.h +#usr/include/linux/elf-em.h +#usr/include/linux/elf-fdpic.h +#usr/include/linux/elf.h +#usr/include/linux/elfcore.h +#usr/include/linux/errno.h +#usr/include/linux/errqueue.h +#usr/include/linux/ethtool.h +#usr/include/linux/eventpoll.h +#usr/include/linux/ext2_fs.h +#usr/include/linux/fadvise.h +#usr/include/linux/falloc.h +#usr/include/linux/fanotify.h +#usr/include/linux/fb.h +#usr/include/linux/fcntl.h +#usr/include/linux/fd.h +#usr/include/linux/fdreg.h +#usr/include/linux/fib_rules.h +#usr/include/linux/fiemap.h +#usr/include/linux/filter.h +#usr/include/linux/firewire-cdev.h +#usr/include/linux/firewire-constants.h +#usr/include/linux/flat.h +#usr/include/linux/fs.h +#usr/include/linux/fsl_hypervisor.h +#usr/include/linux/fuse.h +#usr/include/linux/futex.h +#usr/include/linux/gameport.h +#usr/include/linux/gen_stats.h +#usr/include/linux/generic_serial.h +#usr/include/linux/genetlink.h +#usr/include/linux/gfs2_ondisk.h +#usr/include/linux/gigaset_dev.h +#usr/include/linux/hdlc +#usr/include/linux/hdlc.h +#usr/include/linux/hdlc/ioctl.h +#usr/include/linux/hdlcdrv.h +#usr/include/linux/hdreg.h +#usr/include/linux/hid.h +#usr/include/linux/hiddev.h +#usr/include/linux/hidraw.h +#usr/include/linux/hpet.h +#usr/include/linux/hysdn_if.h +#usr/include/linux/i2c-dev.h +#usr/include/linux/i2c.h +#usr/include/linux/i2o-dev.h +#usr/include/linux/i8k.h +#usr/include/linux/icmp.h +#usr/include/linux/icmpv6.h +#usr/include/linux/if.h +#usr/include/linux/if_addr.h +#usr/include/linux/if_addrlabel.h +#usr/include/linux/if_alg.h +#usr/include/linux/if_arcnet.h +#usr/include/linux/if_arp.h +#usr/include/linux/if_bonding.h +#usr/include/linux/if_bridge.h +#usr/include/linux/if_cablemodem.h +#usr/include/linux/if_ec.h +#usr/include/linux/if_eql.h +#usr/include/linux/if_ether.h +#usr/include/linux/if_fc.h +#usr/include/linux/if_fddi.h +#usr/include/linux/if_frad.h +#usr/include/linux/if_hippi.h +#usr/include/linux/if_infiniband.h +#usr/include/linux/if_link.h +#usr/include/linux/if_ltalk.h +#usr/include/linux/if_packet.h +#usr/include/linux/if_phonet.h +#usr/include/linux/if_plip.h +#usr/include/linux/if_ppp.h +#usr/include/linux/if_pppol2tp.h +#usr/include/linux/if_pppox.h +#usr/include/linux/if_slip.h +#usr/include/linux/if_strip.h +#usr/include/linux/if_tr.h +#usr/include/linux/if_tun.h +#usr/include/linux/if_tunnel.h +#usr/include/linux/if_vlan.h +#usr/include/linux/if_x25.h +#usr/include/linux/igmp.h +#usr/include/linux/in.h +#usr/include/linux/in6.h +#usr/include/linux/in_route.h +#usr/include/linux/inet_diag.h +#usr/include/linux/inotify.h +#usr/include/linux/input.h +#usr/include/linux/ioctl.h +#usr/include/linux/ip.h +#usr/include/linux/ip6_tunnel.h +#usr/include/linux/ip_vs.h +#usr/include/linux/ipc.h +#usr/include/linux/ipmi.h +#usr/include/linux/ipmi_msgdefs.h +#usr/include/linux/ipsec.h +#usr/include/linux/ipv6.h +#usr/include/linux/ipv6_route.h +#usr/include/linux/ipx.h +#usr/include/linux/irda.h +#usr/include/linux/irqnr.h +#usr/include/linux/isdn +#usr/include/linux/isdn.h +#usr/include/linux/isdn/capicmd.h +#usr/include/linux/isdn_divertif.h +#usr/include/linux/isdn_ppp.h +#usr/include/linux/isdnif.h +#usr/include/linux/iso_fs.h +#usr/include/linux/ivtv.h +#usr/include/linux/ivtvfb.h +#usr/include/linux/ixjuser.h +#usr/include/linux/jffs2.h +#usr/include/linux/joystick.h +#usr/include/linux/kd.h +#usr/include/linux/kdev_t.h +#usr/include/linux/kernel-page-flags.h +#usr/include/linux/kernel.h +#usr/include/linux/kernelcapi.h +#usr/include/linux/keyboard.h +#usr/include/linux/keyctl.h +#usr/include/linux/kvm.h +#usr/include/linux/kvm_para.h +#usr/include/linux/l2tp.h +#usr/include/linux/limits.h +#usr/include/linux/llc.h +#usr/include/linux/loop.h +#usr/include/linux/lp.h +#usr/include/linux/magic.h +#usr/include/linux/major.h +#usr/include/linux/map_to_7segment.h +#usr/include/linux/matroxfb.h +#usr/include/linux/media.h +#usr/include/linux/mempolicy.h +#usr/include/linux/meye.h +#usr/include/linux/mii.h +#usr/include/linux/minix_fs.h +#usr/include/linux/mman.h +#usr/include/linux/mmc +#usr/include/linux/mmc/ioctl.h +#usr/include/linux/mmtimer.h +#usr/include/linux/mqueue.h +#usr/include/linux/mroute.h +#usr/include/linux/mroute6.h +#usr/include/linux/msdos_fs.h +#usr/include/linux/msg.h +#usr/include/linux/mtio.h +#usr/include/linux/n_r3964.h +#usr/include/linux/nbd.h +#usr/include/linux/ncp.h +#usr/include/linux/ncp_fs.h +#usr/include/linux/ncp_mount.h +#usr/include/linux/ncp_no.h +#usr/include/linux/neighbour.h +#usr/include/linux/net.h +#usr/include/linux/net_dropmon.h +#usr/include/linux/net_tstamp.h +#usr/include/linux/netdevice.h +#usr/include/linux/netfilter +#usr/include/linux/netfilter.h +#usr/include/linux/netfilter/ipset +#usr/include/linux/netfilter/ipset/ip_set.h +#usr/include/linux/netfilter/ipset/ip_set_bitmap.h +#usr/include/linux/netfilter/ipset/ip_set_hash.h +#usr/include/linux/netfilter/ipset/ip_set_list.h +#usr/include/linux/netfilter/nf_conntrack_common.h +#usr/include/linux/netfilter/nf_conntrack_ftp.h +#usr/include/linux/netfilter/nf_conntrack_sctp.h +#usr/include/linux/netfilter/nf_conntrack_tcp.h +#usr/include/linux/netfilter/nf_conntrack_tuple_common.h +#usr/include/linux/netfilter/nfnetlink.h +#usr/include/linux/netfilter/nfnetlink_compat.h +#usr/include/linux/netfilter/nfnetlink_conntrack.h +#usr/include/linux/netfilter/nfnetlink_log.h +#usr/include/linux/netfilter/nfnetlink_queue.h +#usr/include/linux/netfilter/x_tables.h +#usr/include/linux/netfilter/xt_AUDIT.h +#usr/include/linux/netfilter/xt_CHECKSUM.h +#usr/include/linux/netfilter/xt_CLASSIFY.h +#usr/include/linux/netfilter/xt_CONNMARK.h +#usr/include/linux/netfilter/xt_CONNSECMARK.h +#usr/include/linux/netfilter/xt_CT.h +#usr/include/linux/netfilter/xt_DSCP.h +#usr/include/linux/netfilter/xt_IDLETIMER.h +#usr/include/linux/netfilter/xt_LED.h +#usr/include/linux/netfilter/xt_MARK.h +#usr/include/linux/netfilter/xt_NFLOG.h +#usr/include/linux/netfilter/xt_NFQUEUE.h +#usr/include/linux/netfilter/xt_RATEEST.h +#usr/include/linux/netfilter/xt_SECMARK.h +#usr/include/linux/netfilter/xt_TCPMSS.h +#usr/include/linux/netfilter/xt_TCPOPTSTRIP.h +#usr/include/linux/netfilter/xt_TEE.h +#usr/include/linux/netfilter/xt_TPROXY.h +#usr/include/linux/netfilter/xt_addrtype.h +#usr/include/linux/netfilter/xt_cluster.h +#usr/include/linux/netfilter/xt_comment.h +#usr/include/linux/netfilter/xt_connbytes.h +#usr/include/linux/netfilter/xt_connlimit.h +#usr/include/linux/netfilter/xt_connmark.h +#usr/include/linux/netfilter/xt_conntrack.h +#usr/include/linux/netfilter/xt_cpu.h +#usr/include/linux/netfilter/xt_dccp.h +#usr/include/linux/netfilter/xt_devgroup.h +#usr/include/linux/netfilter/xt_dscp.h +#usr/include/linux/netfilter/xt_esp.h +#usr/include/linux/netfilter/xt_hashlimit.h +#usr/include/linux/netfilter/xt_helper.h +#usr/include/linux/netfilter/xt_iprange.h +#usr/include/linux/netfilter/xt_ipvs.h +#usr/include/linux/netfilter/xt_length.h +#usr/include/linux/netfilter/xt_limit.h +#usr/include/linux/netfilter/xt_mac.h +#usr/include/linux/netfilter/xt_mark.h +#usr/include/linux/netfilter/xt_multiport.h +#usr/include/linux/netfilter/xt_osf.h +#usr/include/linux/netfilter/xt_owner.h +#usr/include/linux/netfilter/xt_physdev.h +#usr/include/linux/netfilter/xt_pkttype.h +#usr/include/linux/netfilter/xt_policy.h +#usr/include/linux/netfilter/xt_quota.h +#usr/include/linux/netfilter/xt_rateest.h +#usr/include/linux/netfilter/xt_realm.h +#usr/include/linux/netfilter/xt_recent.h +#usr/include/linux/netfilter/xt_sctp.h +#usr/include/linux/netfilter/xt_set.h +#usr/include/linux/netfilter/xt_socket.h +#usr/include/linux/netfilter/xt_state.h +#usr/include/linux/netfilter/xt_statistic.h +#usr/include/linux/netfilter/xt_string.h +#usr/include/linux/netfilter/xt_tcpmss.h +#usr/include/linux/netfilter/xt_tcpudp.h +#usr/include/linux/netfilter/xt_time.h +#usr/include/linux/netfilter/xt_u32.h +#usr/include/linux/netfilter_arp +#usr/include/linux/netfilter_arp.h +#usr/include/linux/netfilter_arp/arp_tables.h +#usr/include/linux/netfilter_arp/arpt_mangle.h +#usr/include/linux/netfilter_bridge +#usr/include/linux/netfilter_bridge.h +#usr/include/linux/netfilter_bridge/ebt_802_3.h +#usr/include/linux/netfilter_bridge/ebt_among.h +#usr/include/linux/netfilter_bridge/ebt_arp.h +#usr/include/linux/netfilter_bridge/ebt_arpreply.h +#usr/include/linux/netfilter_bridge/ebt_ip.h +#usr/include/linux/netfilter_bridge/ebt_ip6.h +#usr/include/linux/netfilter_bridge/ebt_limit.h +#usr/include/linux/netfilter_bridge/ebt_log.h +#usr/include/linux/netfilter_bridge/ebt_mark_m.h +#usr/include/linux/netfilter_bridge/ebt_mark_t.h +#usr/include/linux/netfilter_bridge/ebt_nat.h +#usr/include/linux/netfilter_bridge/ebt_nflog.h +#usr/include/linux/netfilter_bridge/ebt_pkttype.h +#usr/include/linux/netfilter_bridge/ebt_redirect.h +#usr/include/linux/netfilter_bridge/ebt_stp.h +#usr/include/linux/netfilter_bridge/ebt_ulog.h +#usr/include/linux/netfilter_bridge/ebt_vlan.h +#usr/include/linux/netfilter_bridge/ebtables.h +#usr/include/linux/netfilter_decnet.h +#usr/include/linux/netfilter_ipv4 +#usr/include/linux/netfilter_ipv4.h +#usr/include/linux/netfilter_ipv4/ip_queue.h +#usr/include/linux/netfilter_ipv4/ip_tables.h +#usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h +#usr/include/linux/netfilter_ipv4/ipt_ECN.h +#usr/include/linux/netfilter_ipv4/ipt_LOG.h +#usr/include/linux/netfilter_ipv4/ipt_REJECT.h +#usr/include/linux/netfilter_ipv4/ipt_SAME.h +#usr/include/linux/netfilter_ipv4/ipt_TTL.h +#usr/include/linux/netfilter_ipv4/ipt_ULOG.h +#usr/include/linux/netfilter_ipv4/ipt_addrtype.h +#usr/include/linux/netfilter_ipv4/ipt_ah.h +#usr/include/linux/netfilter_ipv4/ipt_ecn.h +#usr/include/linux/netfilter_ipv4/ipt_realm.h +#usr/include/linux/netfilter_ipv4/ipt_ttl.h +#usr/include/linux/netfilter_ipv4/nf_nat.h +#usr/include/linux/netfilter_ipv6 +#usr/include/linux/netfilter_ipv6.h +#usr/include/linux/netfilter_ipv6/ip6_tables.h +#usr/include/linux/netfilter_ipv6/ip6t_HL.h +#usr/include/linux/netfilter_ipv6/ip6t_LOG.h +#usr/include/linux/netfilter_ipv6/ip6t_REJECT.h +#usr/include/linux/netfilter_ipv6/ip6t_ah.h +#usr/include/linux/netfilter_ipv6/ip6t_frag.h +#usr/include/linux/netfilter_ipv6/ip6t_hl.h +#usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h +#usr/include/linux/netfilter_ipv6/ip6t_mh.h +#usr/include/linux/netfilter_ipv6/ip6t_opts.h +#usr/include/linux/netfilter_ipv6/ip6t_rt.h +#usr/include/linux/netlink.h +#usr/include/linux/netrom.h +#usr/include/linux/nfc.h +#usr/include/linux/nfs.h +#usr/include/linux/nfs2.h +#usr/include/linux/nfs3.h +#usr/include/linux/nfs4.h +#usr/include/linux/nfs4_mount.h +#usr/include/linux/nfs_fs.h +#usr/include/linux/nfs_idmap.h +#usr/include/linux/nfs_mount.h +#usr/include/linux/nfsacl.h +#usr/include/linux/nfsd +#usr/include/linux/nfsd/debug.h +#usr/include/linux/nfsd/export.h +#usr/include/linux/nfsd/nfsfh.h +#usr/include/linux/nfsd/stats.h +#usr/include/linux/nl80211.h +#usr/include/linux/nubus.h +#usr/include/linux/nvram.h +#usr/include/linux/omap3isp.h +#usr/include/linux/omapfb.h +#usr/include/linux/oom.h +#usr/include/linux/param.h +#usr/include/linux/parport.h +#usr/include/linux/patchkey.h +#usr/include/linux/pci.h +#usr/include/linux/pci_regs.h +#usr/include/linux/perf_event.h +#usr/include/linux/personality.h +#usr/include/linux/pfkeyv2.h +#usr/include/linux/pg.h +#usr/include/linux/phantom.h +#usr/include/linux/phonet.h +#usr/include/linux/pkt_cls.h +#usr/include/linux/pkt_sched.h +#usr/include/linux/pktcdvd.h +#usr/include/linux/pmu.h +#usr/include/linux/poll.h +#usr/include/linux/posix_types.h +#usr/include/linux/ppdev.h +#usr/include/linux/ppp-comp.h +#usr/include/linux/ppp_defs.h +#usr/include/linux/pps.h +#usr/include/linux/prctl.h +#usr/include/linux/ptp_clock.h +#usr/include/linux/ptrace.h +#usr/include/linux/qnx4_fs.h +#usr/include/linux/qnxtypes.h +#usr/include/linux/quota.h +#usr/include/linux/radeonfb.h +#usr/include/linux/raid +#usr/include/linux/raid/md_p.h +#usr/include/linux/raid/md_u.h +#usr/include/linux/random.h +#usr/include/linux/raw.h +#usr/include/linux/rds.h +#usr/include/linux/reboot.h +#usr/include/linux/reiserfs_fs.h +#usr/include/linux/reiserfs_xattr.h +#usr/include/linux/resource.h +#usr/include/linux/rfkill.h +#usr/include/linux/romfs_fs.h +#usr/include/linux/rose.h +#usr/include/linux/route.h +#usr/include/linux/rtc.h +#usr/include/linux/rtnetlink.h +#usr/include/linux/scc.h +#usr/include/linux/sched.h +#usr/include/linux/screen_info.h +#usr/include/linux/sdla.h +#usr/include/linux/securebits.h +#usr/include/linux/selinux_netlink.h +#usr/include/linux/sem.h +#usr/include/linux/serial.h +#usr/include/linux/serial_core.h +#usr/include/linux/serial_reg.h +#usr/include/linux/serio.h +#usr/include/linux/shm.h +#usr/include/linux/signal.h +#usr/include/linux/signalfd.h +#usr/include/linux/snmp.h +#usr/include/linux/socket.h +#usr/include/linux/sockios.h +#usr/include/linux/som.h +#usr/include/linux/sonet.h +#usr/include/linux/sonypi.h +#usr/include/linux/sound.h +#usr/include/linux/soundcard.h +#usr/include/linux/spi +#usr/include/linux/spi/spidev.h +#usr/include/linux/stat.h +#usr/include/linux/stddef.h +#usr/include/linux/string.h +#usr/include/linux/sunrpc +#usr/include/linux/sunrpc/debug.h +#usr/include/linux/suspend_ioctls.h +#usr/include/linux/swab.h +#usr/include/linux/synclink.h +#usr/include/linux/sysctl.h +#usr/include/linux/taskstats.h +#usr/include/linux/tc_act +#usr/include/linux/tc_act/tc_csum.h +#usr/include/linux/tc_act/tc_gact.h +#usr/include/linux/tc_act/tc_ipt.h +#usr/include/linux/tc_act/tc_mirred.h +#usr/include/linux/tc_act/tc_nat.h +#usr/include/linux/tc_act/tc_pedit.h +#usr/include/linux/tc_act/tc_skbedit.h +#usr/include/linux/tc_ematch +#usr/include/linux/tc_ematch/tc_em_cmp.h +#usr/include/linux/tc_ematch/tc_em_meta.h +#usr/include/linux/tc_ematch/tc_em_nbyte.h +#usr/include/linux/tc_ematch/tc_em_text.h +#usr/include/linux/tcp.h +#usr/include/linux/telephony.h +#usr/include/linux/termios.h +#usr/include/linux/time.h +#usr/include/linux/times.h +#usr/include/linux/timex.h +#usr/include/linux/tiocl.h +#usr/include/linux/tipc.h +#usr/include/linux/tipc_config.h +#usr/include/linux/toshiba.h +#usr/include/linux/tty.h +#usr/include/linux/types.h +#usr/include/linux/udf_fs_i.h +#usr/include/linux/udp.h +#usr/include/linux/uinput.h +#usr/include/linux/uio.h +#usr/include/linux/ultrasound.h +#usr/include/linux/un.h +#usr/include/linux/unistd.h +#usr/include/linux/usb +#usr/include/linux/usb/audio.h +#usr/include/linux/usb/cdc.h +#usr/include/linux/usb/ch11.h +#usr/include/linux/usb/ch9.h +#usr/include/linux/usb/functionfs.h +#usr/include/linux/usb/g_printer.h +#usr/include/linux/usb/gadgetfs.h +#usr/include/linux/usb/midi.h +#usr/include/linux/usb/tmc.h +#usr/include/linux/usb/video.h +#usr/include/linux/usbdevice_fs.h +#usr/include/linux/utime.h +#usr/include/linux/utsname.h +#usr/include/linux/uvcvideo.h +#usr/include/linux/v4l2-mediabus.h +#usr/include/linux/v4l2-subdev.h +#usr/include/linux/version.h +#usr/include/linux/veth.h +#usr/include/linux/vhost.h +#usr/include/linux/videodev2.h +#usr/include/linux/virtio_9p.h +#usr/include/linux/virtio_balloon.h +#usr/include/linux/virtio_blk.h +#usr/include/linux/virtio_config.h +#usr/include/linux/virtio_console.h +#usr/include/linux/virtio_ids.h +#usr/include/linux/virtio_net.h +#usr/include/linux/virtio_pci.h +#usr/include/linux/virtio_ring.h +#usr/include/linux/virtio_rng.h +#usr/include/linux/vt.h +#usr/include/linux/wait.h +#usr/include/linux/wanrouter.h +#usr/include/linux/watchdog.h +#usr/include/linux/wimax +#usr/include/linux/wimax.h +#usr/include/linux/wimax/i2400m.h +#usr/include/linux/wireless.h +#usr/include/linux/x25.h +#usr/include/linux/xattr.h +#usr/include/linux/xfrm.h +#usr/include/mtd +#usr/include/mtd/inftl-user.h +#usr/include/mtd/mtd-abi.h +#usr/include/mtd/mtd-user.h +#usr/include/mtd/nftl-user.h +#usr/include/mtd/ubi-user.h +#usr/include/rdma +#usr/include/rdma/ib_user_cm.h +#usr/include/rdma/ib_user_mad.h +#usr/include/rdma/ib_user_sa.h +#usr/include/rdma/ib_user_verbs.h +#usr/include/rdma/rdma_netlink.h +#usr/include/rdma/rdma_user_cm.h +#usr/include/scsi +#usr/include/scsi/fc +#usr/include/scsi/fc/fc_els.h +#usr/include/scsi/fc/fc_fs.h +#usr/include/scsi/fc/fc_gs.h +#usr/include/scsi/fc/fc_ns.h +#usr/include/scsi/scsi_bsg_fc.h +#usr/include/scsi/scsi_netlink.h +#usr/include/scsi/scsi_netlink_fc.h +#usr/include/sound +#usr/include/sound/asequencer.h +#usr/include/sound/asound.h +#usr/include/sound/asound_fm.h +#usr/include/sound/emu10k1.h +#usr/include/sound/hdsp.h +#usr/include/sound/hdspm.h +#usr/include/sound/sb16_csp.h +#usr/include/sound/sfnt_info.h +#usr/include/video +#usr/include/video/edid.h +#usr/include/video/sisfb.h +#usr/include/video/uvesafb.h +#usr/include/xen +#usr/include/xen/evtchn.h +#usr/include/xen/privcmd.h diff --git a/config/rootfiles/common/i586/linux2 b/config/rootfiles/common/i586/linux2 deleted file mode 100644 index dac70a6..0000000 --- a/config/rootfiles/common/i586/linux2 +++ /dev/null @@ -1,653 +0,0 @@ -#usr/include/asm -#usr/include/asm-generic -#usr/include/asm-generic/auxvec.h -#usr/include/asm-generic/bitsperlong.h -#usr/include/asm-generic/errno-base.h -#usr/include/asm-generic/errno.h -#usr/include/asm-generic/fcntl.h -#usr/include/asm-generic/int-l64.h -#usr/include/asm-generic/int-ll64.h -#usr/include/asm-generic/ioctl.h -#usr/include/asm-generic/ioctls.h -#usr/include/asm-generic/ipcbuf.h -#usr/include/asm-generic/mman-common.h -#usr/include/asm-generic/mman.h -#usr/include/asm-generic/msgbuf.h -#usr/include/asm-generic/param.h -#usr/include/asm-generic/poll.h -#usr/include/asm-generic/posix_types.h -#usr/include/asm-generic/resource.h -#usr/include/asm-generic/sembuf.h -#usr/include/asm-generic/setup.h -#usr/include/asm-generic/shmbuf.h -#usr/include/asm-generic/shmparam.h -#usr/include/asm-generic/siginfo.h -#usr/include/asm-generic/signal-defs.h -#usr/include/asm-generic/signal.h -#usr/include/asm-generic/socket.h -#usr/include/asm-generic/sockios.h -#usr/include/asm-generic/stat.h -#usr/include/asm-generic/statfs.h -#usr/include/asm-generic/swab.h -#usr/include/asm-generic/termbits.h -#usr/include/asm-generic/termios.h -#usr/include/asm-generic/types.h -#usr/include/asm-generic/ucontext.h -#usr/include/asm-generic/unistd.h -#usr/include/asm/a.out.h -#usr/include/asm/auxvec.h -#usr/include/asm/bitsperlong.h -#usr/include/asm/boot.h -#usr/include/asm/bootparam.h -#usr/include/asm/byteorder.h -#usr/include/asm/debugreg.h -#usr/include/asm/e820.h -#usr/include/asm/errno.h -#usr/include/asm/fcntl.h -#usr/include/asm/ioctl.h -#usr/include/asm/ioctls.h -#usr/include/asm/ipcbuf.h -#usr/include/asm/ist.h -#usr/include/asm/kvm.h -#usr/include/asm/kvm_para.h -#usr/include/asm/ldt.h -#usr/include/asm/mce.h -#usr/include/asm/mman.h -#usr/include/asm/msgbuf.h -#usr/include/asm/msr-index.h -#usr/include/asm/msr.h -#usr/include/asm/mtrr.h -#usr/include/asm/param.h -#usr/include/asm/poll.h -#usr/include/asm/posix_types.h -#usr/include/asm/posix_types_32.h -#usr/include/asm/posix_types_64.h -#usr/include/asm/prctl.h -#usr/include/asm/processor-flags.h -#usr/include/asm/ptrace-abi.h -#usr/include/asm/ptrace.h -#usr/include/asm/resource.h -#usr/include/asm/sembuf.h -#usr/include/asm/setup.h -#usr/include/asm/shmbuf.h -#usr/include/asm/sigcontext.h -#usr/include/asm/sigcontext32.h -#usr/include/asm/siginfo.h -#usr/include/asm/signal.h -#usr/include/asm/socket.h -#usr/include/asm/sockios.h -#usr/include/asm/stat.h -#usr/include/asm/statfs.h -#usr/include/asm/swab.h -#usr/include/asm/termbits.h -#usr/include/asm/termios.h -#usr/include/asm/types.h -#usr/include/asm/ucontext.h -#usr/include/asm/unistd.h -#usr/include/asm/unistd_32.h -#usr/include/asm/unistd_64.h -#usr/include/asm/vm86.h -#usr/include/asm/vsyscall.h -#usr/include/drm -#usr/include/drm/drm.h -#usr/include/drm/drm_mode.h -#usr/include/drm/drm_sarea.h -#usr/include/drm/i810_drm.h -#usr/include/drm/i830_drm.h -#usr/include/drm/i915_drm.h -#usr/include/drm/mga_drm.h -#usr/include/drm/r128_drm.h -#usr/include/drm/radeon_drm.h -#usr/include/drm/savage_drm.h -#usr/include/drm/sis_drm.h -#usr/include/drm/via_drm.h -#usr/include/linux -#usr/include/linux/a.out.h -#usr/include/linux/acct.h -#usr/include/linux/adb.h -#usr/include/linux/adfs_fs.h -#usr/include/linux/affs_hardblocks.h -#usr/include/linux/agpgart.h -#usr/include/linux/aio_abi.h -#usr/include/linux/apm_bios.h -#usr/include/linux/arcfb.h -#usr/include/linux/atalk.h -#usr/include/linux/atm.h -#usr/include/linux/atm_eni.h -#usr/include/linux/atm_he.h -#usr/include/linux/atm_idt77105.h -#usr/include/linux/atm_nicstar.h -#usr/include/linux/atm_tcp.h -#usr/include/linux/atm_zatm.h -#usr/include/linux/atmapi.h -#usr/include/linux/atmarp.h -#usr/include/linux/atmbr2684.h -#usr/include/linux/atmclip.h -#usr/include/linux/atmdev.h -#usr/include/linux/atmioc.h -#usr/include/linux/atmlec.h -#usr/include/linux/atmmpc.h -#usr/include/linux/atmppp.h -#usr/include/linux/atmsap.h -#usr/include/linux/atmsvc.h -#usr/include/linux/audit.h -#usr/include/linux/auto_fs.h -#usr/include/linux/auto_fs4.h -#usr/include/linux/auxvec.h -#usr/include/linux/ax25.h -#usr/include/linux/b1lli.h -#usr/include/linux/baycom.h -#usr/include/linux/bfs_fs.h -#usr/include/linux/binfmts.h -#usr/include/linux/blkpg.h -#usr/include/linux/blktrace_api.h -#usr/include/linux/bpqether.h -#usr/include/linux/bsg.h -#usr/include/linux/byteorder -#usr/include/linux/byteorder/big_endian.h -#usr/include/linux/byteorder/little_endian.h -#usr/include/linux/can -#usr/include/linux/can.h -#usr/include/linux/can/bcm.h -#usr/include/linux/can/error.h -#usr/include/linux/can/netlink.h -#usr/include/linux/can/raw.h -#usr/include/linux/capability.h -#usr/include/linux/capi.h -#usr/include/linux/cciss_ioctl.h -#usr/include/linux/cdk.h -#usr/include/linux/cdrom.h -#usr/include/linux/cgroupstats.h -#usr/include/linux/chio.h -#usr/include/linux/cm4000_cs.h -#usr/include/linux/cn_proc.h -#usr/include/linux/coda.h -#usr/include/linux/coda_psdev.h -#usr/include/linux/coff.h -#usr/include/linux/comstats.h -#usr/include/linux/connector.h -#usr/include/linux/const.h -#usr/include/linux/cramfs_fs.h -#usr/include/linux/cuda.h -#usr/include/linux/cyclades.h -#usr/include/linux/cycx_cfm.h -#usr/include/linux/dcbnl.h -#usr/include/linux/dccp.h -#usr/include/linux/dlm.h -#usr/include/linux/dlm_device.h -#usr/include/linux/dlm_netlink.h -#usr/include/linux/dlm_plock.h -#usr/include/linux/dlmconstants.h -#usr/include/linux/dm-ioctl.h -#usr/include/linux/dm-log-userspace.h -#usr/include/linux/dn.h -#usr/include/linux/dqblk_xfs.h -#usr/include/linux/dvb -#usr/include/linux/dvb/audio.h -#usr/include/linux/dvb/ca.h -#usr/include/linux/dvb/dmx.h -#usr/include/linux/dvb/frontend.h -#usr/include/linux/dvb/net.h -#usr/include/linux/dvb/osd.h -#usr/include/linux/dvb/version.h -#usr/include/linux/dvb/video.h -#usr/include/linux/edd.h -#usr/include/linux/efs_fs_sb.h -#usr/include/linux/elf-em.h -#usr/include/linux/elf-fdpic.h -#usr/include/linux/elf.h -#usr/include/linux/elfcore.h -#usr/include/linux/errno.h -#usr/include/linux/errqueue.h -#usr/include/linux/ethtool.h -#usr/include/linux/eventpoll.h -#usr/include/linux/ext2_fs.h -#usr/include/linux/fadvise.h -#usr/include/linux/falloc.h -#usr/include/linux/fb.h -#usr/include/linux/fcntl.h -#usr/include/linux/fd.h -#usr/include/linux/fdreg.h -#usr/include/linux/fib_rules.h -#usr/include/linux/fiemap.h -#usr/include/linux/filter.h -#usr/include/linux/firewire-cdev.h -#usr/include/linux/firewire-constants.h -#usr/include/linux/flat.h -#usr/include/linux/fs.h -#usr/include/linux/fuse.h -#usr/include/linux/futex.h -#usr/include/linux/gameport.h -#usr/include/linux/gen_stats.h -#usr/include/linux/generic_serial.h -#usr/include/linux/genetlink.h -#usr/include/linux/gfs2_ondisk.h -#usr/include/linux/gigaset_dev.h -#usr/include/linux/hayesesp.h -#usr/include/linux/hdlc -#usr/include/linux/hdlc.h -#usr/include/linux/hdlc/ioctl.h -#usr/include/linux/hdlcdrv.h -#usr/include/linux/hdreg.h -#usr/include/linux/hid.h -#usr/include/linux/hiddev.h -#usr/include/linux/hidraw.h -#usr/include/linux/hpet.h -#usr/include/linux/hysdn_if.h -#usr/include/linux/i2c-dev.h -#usr/include/linux/i2c.h -#usr/include/linux/i2o-dev.h -#usr/include/linux/i8k.h -#usr/include/linux/icmp.h -#usr/include/linux/icmpv6.h -#usr/include/linux/if.h -#usr/include/linux/if_addr.h -#usr/include/linux/if_addrlabel.h -#usr/include/linux/if_arcnet.h -#usr/include/linux/if_arp.h -#usr/include/linux/if_bonding.h -#usr/include/linux/if_bridge.h -#usr/include/linux/if_cablemodem.h -#usr/include/linux/if_ec.h -#usr/include/linux/if_eql.h -#usr/include/linux/if_ether.h -#usr/include/linux/if_fc.h -#usr/include/linux/if_fddi.h -#usr/include/linux/if_frad.h -#usr/include/linux/if_hippi.h -#usr/include/linux/if_infiniband.h -#usr/include/linux/if_link.h -#usr/include/linux/if_ltalk.h -#usr/include/linux/if_packet.h -#usr/include/linux/if_phonet.h -#usr/include/linux/if_plip.h -#usr/include/linux/if_ppp.h -#usr/include/linux/if_pppol2tp.h -#usr/include/linux/if_pppox.h -#usr/include/linux/if_slip.h -#usr/include/linux/if_strip.h -#usr/include/linux/if_tr.h -#usr/include/linux/if_tun.h -#usr/include/linux/if_tunnel.h -#usr/include/linux/if_vlan.h -#usr/include/linux/igmp.h -#usr/include/linux/in.h -#usr/include/linux/in6.h -#usr/include/linux/in_route.h -#usr/include/linux/inet_diag.h -#usr/include/linux/inotify.h -#usr/include/linux/input.h -#usr/include/linux/ioctl.h -#usr/include/linux/ip.h -#usr/include/linux/ip6_tunnel.h -#usr/include/linux/ip_vs.h -#usr/include/linux/ipc.h -#usr/include/linux/ipmi.h -#usr/include/linux/ipmi_msgdefs.h -#usr/include/linux/ipsec.h -#usr/include/linux/ipv6.h -#usr/include/linux/ipv6_route.h -#usr/include/linux/ipx.h -#usr/include/linux/irda.h -#usr/include/linux/irqnr.h -#usr/include/linux/isdn -#usr/include/linux/isdn.h -#usr/include/linux/isdn/capicmd.h -#usr/include/linux/isdn_divertif.h -#usr/include/linux/isdn_ppp.h -#usr/include/linux/isdnif.h -#usr/include/linux/iso_fs.h -#usr/include/linux/ivtv.h -#usr/include/linux/ivtvfb.h -#usr/include/linux/ixjuser.h -#usr/include/linux/jffs2.h -#usr/include/linux/joystick.h -#usr/include/linux/kd.h -#usr/include/linux/kdev_t.h -#usr/include/linux/kernel.h -#usr/include/linux/kernelcapi.h -#usr/include/linux/keyboard.h -#usr/include/linux/keyctl.h -#usr/include/linux/kvm.h -#usr/include/linux/kvm_para.h -#usr/include/linux/limits.h -#usr/include/linux/llc.h -#usr/include/linux/loop.h -#usr/include/linux/lp.h -#usr/include/linux/magic.h -#usr/include/linux/major.h -#usr/include/linux/map_to_7segment.h -#usr/include/linux/matroxfb.h -#usr/include/linux/mempolicy.h -#usr/include/linux/meye.h -#usr/include/linux/mii.h -#usr/include/linux/minix_fs.h -#usr/include/linux/mman.h -#usr/include/linux/mmtimer.h -#usr/include/linux/mqueue.h -#usr/include/linux/mroute.h -#usr/include/linux/mroute6.h -#usr/include/linux/msdos_fs.h -#usr/include/linux/msg.h -#usr/include/linux/mtio.h -#usr/include/linux/n_r3964.h -#usr/include/linux/nbd.h -#usr/include/linux/ncp.h -#usr/include/linux/ncp_fs.h -#usr/include/linux/ncp_mount.h -#usr/include/linux/ncp_no.h -#usr/include/linux/neighbour.h -#usr/include/linux/net.h -#usr/include/linux/net_dropmon.h -#usr/include/linux/netdevice.h -#usr/include/linux/netfilter -#usr/include/linux/netfilter.h -#usr/include/linux/netfilter/nf_conntrack_common.h -#usr/include/linux/netfilter/nf_conntrack_ftp.h -#usr/include/linux/netfilter/nf_conntrack_sctp.h -#usr/include/linux/netfilter/nf_conntrack_tcp.h -#usr/include/linux/netfilter/nf_conntrack_tuple_common.h -#usr/include/linux/netfilter/nfnetlink.h -#usr/include/linux/netfilter/nfnetlink_compat.h -#usr/include/linux/netfilter/nfnetlink_conntrack.h -#usr/include/linux/netfilter/nfnetlink_log.h -#usr/include/linux/netfilter/nfnetlink_queue.h -#usr/include/linux/netfilter/x_tables.h -#usr/include/linux/netfilter/xt_CLASSIFY.h -#usr/include/linux/netfilter/xt_CONNMARK.h -#usr/include/linux/netfilter/xt_CONNSECMARK.h -#usr/include/linux/netfilter/xt_DSCP.h -#usr/include/linux/netfilter/xt_LED.h -#usr/include/linux/netfilter/xt_MARK.h -#usr/include/linux/netfilter/xt_NFLOG.h -#usr/include/linux/netfilter/xt_NFQUEUE.h -#usr/include/linux/netfilter/xt_RATEEST.h -#usr/include/linux/netfilter/xt_SECMARK.h -#usr/include/linux/netfilter/xt_TCPMSS.h -#usr/include/linux/netfilter/xt_TCPOPTSTRIP.h -#usr/include/linux/netfilter/xt_TPROXY.h -#usr/include/linux/netfilter/xt_cluster.h -#usr/include/linux/netfilter/xt_comment.h -#usr/include/linux/netfilter/xt_connbytes.h -#usr/include/linux/netfilter/xt_connlimit.h -#usr/include/linux/netfilter/xt_connmark.h -#usr/include/linux/netfilter/xt_conntrack.h -#usr/include/linux/netfilter/xt_dccp.h -#usr/include/linux/netfilter/xt_dscp.h -#usr/include/linux/netfilter/xt_esp.h -#usr/include/linux/netfilter/xt_hashlimit.h -#usr/include/linux/netfilter/xt_helper.h -#usr/include/linux/netfilter/xt_iprange.h -#usr/include/linux/netfilter/xt_length.h -#usr/include/linux/netfilter/xt_limit.h -#usr/include/linux/netfilter/xt_mac.h -#usr/include/linux/netfilter/xt_mark.h -#usr/include/linux/netfilter/xt_multiport.h -#usr/include/linux/netfilter/xt_osf.h -#usr/include/linux/netfilter/xt_owner.h -#usr/include/linux/netfilter/xt_physdev.h -#usr/include/linux/netfilter/xt_pkttype.h -#usr/include/linux/netfilter/xt_policy.h -#usr/include/linux/netfilter/xt_quota.h -#usr/include/linux/netfilter/xt_rateest.h -#usr/include/linux/netfilter/xt_realm.h -#usr/include/linux/netfilter/xt_recent.h -#usr/include/linux/netfilter/xt_sctp.h -#usr/include/linux/netfilter/xt_state.h -#usr/include/linux/netfilter/xt_statistic.h -#usr/include/linux/netfilter/xt_string.h -#usr/include/linux/netfilter/xt_tcpmss.h -#usr/include/linux/netfilter/xt_tcpudp.h -#usr/include/linux/netfilter/xt_time.h -#usr/include/linux/netfilter/xt_u32.h -#usr/include/linux/netfilter_arp -#usr/include/linux/netfilter_arp.h -#usr/include/linux/netfilter_arp/arp_tables.h -#usr/include/linux/netfilter_arp/arpt_mangle.h -#usr/include/linux/netfilter_bridge -#usr/include/linux/netfilter_bridge.h -#usr/include/linux/netfilter_bridge/ebt_802_3.h -#usr/include/linux/netfilter_bridge/ebt_among.h -#usr/include/linux/netfilter_bridge/ebt_arp.h -#usr/include/linux/netfilter_bridge/ebt_arpreply.h -#usr/include/linux/netfilter_bridge/ebt_ip.h -#usr/include/linux/netfilter_bridge/ebt_limit.h -#usr/include/linux/netfilter_bridge/ebt_log.h -#usr/include/linux/netfilter_bridge/ebt_mark_m.h -#usr/include/linux/netfilter_bridge/ebt_mark_t.h -#usr/include/linux/netfilter_bridge/ebt_nat.h -#usr/include/linux/netfilter_bridge/ebt_pkttype.h -#usr/include/linux/netfilter_bridge/ebt_redirect.h -#usr/include/linux/netfilter_bridge/ebt_stp.h -#usr/include/linux/netfilter_bridge/ebt_ulog.h -#usr/include/linux/netfilter_bridge/ebt_vlan.h -#usr/include/linux/netfilter_bridge/ebtables.h -#usr/include/linux/netfilter_decnet.h -#usr/include/linux/netfilter_ipv4 -#usr/include/linux/netfilter_ipv4.h -#usr/include/linux/netfilter_ipv4/ip_queue.h -#usr/include/linux/netfilter_ipv4/ip_tables.h -#usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h -#usr/include/linux/netfilter_ipv4/ipt_ECN.h -#usr/include/linux/netfilter_ipv4/ipt_LOG.h -#usr/include/linux/netfilter_ipv4/ipt_REJECT.h -#usr/include/linux/netfilter_ipv4/ipt_SAME.h -#usr/include/linux/netfilter_ipv4/ipt_TTL.h -#usr/include/linux/netfilter_ipv4/ipt_ULOG.h -#usr/include/linux/netfilter_ipv4/ipt_addrtype.h -#usr/include/linux/netfilter_ipv4/ipt_ah.h -#usr/include/linux/netfilter_ipv4/ipt_ecn.h -#usr/include/linux/netfilter_ipv4/ipt_realm.h -#usr/include/linux/netfilter_ipv4/ipt_ttl.h -#usr/include/linux/netfilter_ipv6 -#usr/include/linux/netfilter_ipv6.h -#usr/include/linux/netfilter_ipv6/ip6_tables.h -#usr/include/linux/netfilter_ipv6/ip6t_HL.h -#usr/include/linux/netfilter_ipv6/ip6t_LOG.h -#usr/include/linux/netfilter_ipv6/ip6t_REJECT.h -#usr/include/linux/netfilter_ipv6/ip6t_ah.h -#usr/include/linux/netfilter_ipv6/ip6t_frag.h -#usr/include/linux/netfilter_ipv6/ip6t_hl.h -#usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h -#usr/include/linux/netfilter_ipv6/ip6t_mh.h -#usr/include/linux/netfilter_ipv6/ip6t_opts.h -#usr/include/linux/netfilter_ipv6/ip6t_rt.h -#usr/include/linux/netlink.h -#usr/include/linux/netrom.h -#usr/include/linux/nfs.h -#usr/include/linux/nfs2.h -#usr/include/linux/nfs3.h -#usr/include/linux/nfs4.h -#usr/include/linux/nfs4_mount.h -#usr/include/linux/nfs_fs.h -#usr/include/linux/nfs_idmap.h -#usr/include/linux/nfs_mount.h -#usr/include/linux/nfsacl.h -#usr/include/linux/nfsd -#usr/include/linux/nfsd/const.h -#usr/include/linux/nfsd/debug.h -#usr/include/linux/nfsd/export.h -#usr/include/linux/nfsd/nfsfh.h -#usr/include/linux/nfsd/stats.h -#usr/include/linux/nfsd/syscall.h -#usr/include/linux/nl80211.h -#usr/include/linux/nubus.h -#usr/include/linux/nvram.h -#usr/include/linux/oom.h -#usr/include/linux/param.h -#usr/include/linux/parport.h -#usr/include/linux/patchkey.h -#usr/include/linux/pci.h -#usr/include/linux/pci_regs.h -#usr/include/linux/perf_event.h -#usr/include/linux/personality.h -#usr/include/linux/pfkeyv2.h -#usr/include/linux/pg.h -#usr/include/linux/phantom.h -#usr/include/linux/phonet.h -#usr/include/linux/pkt_cls.h -#usr/include/linux/pkt_sched.h -#usr/include/linux/pktcdvd.h -#usr/include/linux/pmu.h -#usr/include/linux/poll.h -#usr/include/linux/posix_types.h -#usr/include/linux/ppdev.h -#usr/include/linux/ppp-comp.h -#usr/include/linux/ppp_defs.h -#usr/include/linux/pps.h -#usr/include/linux/prctl.h -#usr/include/linux/ptrace.h -#usr/include/linux/qnx4_fs.h -#usr/include/linux/qnxtypes.h -#usr/include/linux/quota.h -#usr/include/linux/radeonfb.h -#usr/include/linux/raid -#usr/include/linux/raid/md_p.h -#usr/include/linux/raid/md_u.h -#usr/include/linux/random.h -#usr/include/linux/raw.h -#usr/include/linux/reboot.h -#usr/include/linux/reiserfs_fs.h -#usr/include/linux/reiserfs_xattr.h -#usr/include/linux/resource.h -#usr/include/linux/rfkill.h -#usr/include/linux/romfs_fs.h -#usr/include/linux/rose.h -#usr/include/linux/route.h -#usr/include/linux/rtc.h -#usr/include/linux/rtnetlink.h -#usr/include/linux/scc.h -#usr/include/linux/sched.h -#usr/include/linux/screen_info.h -#usr/include/linux/sdla.h -#usr/include/linux/selinux_netlink.h -#usr/include/linux/sem.h -#usr/include/linux/serial.h -#usr/include/linux/serial_core.h -#usr/include/linux/serial_reg.h -#usr/include/linux/serio.h -#usr/include/linux/shm.h -#usr/include/linux/signal.h -#usr/include/linux/signalfd.h -#usr/include/linux/smb.h -#usr/include/linux/smb_fs.h -#usr/include/linux/smb_mount.h -#usr/include/linux/smbno.h -#usr/include/linux/snmp.h -#usr/include/linux/socket.h -#usr/include/linux/sockios.h -#usr/include/linux/som.h -#usr/include/linux/sonet.h -#usr/include/linux/sonypi.h -#usr/include/linux/sound.h -#usr/include/linux/soundcard.h -#usr/include/linux/spi -#usr/include/linux/spi/spidev.h -#usr/include/linux/stat.h -#usr/include/linux/stddef.h -#usr/include/linux/string.h -#usr/include/linux/sunrpc -#usr/include/linux/sunrpc/debug.h -#usr/include/linux/suspend_ioctls.h -#usr/include/linux/swab.h -#usr/include/linux/synclink.h -#usr/include/linux/sysctl.h -#usr/include/linux/taskstats.h -#usr/include/linux/tc_act -#usr/include/linux/tc_act/tc_gact.h -#usr/include/linux/tc_act/tc_ipt.h -#usr/include/linux/tc_act/tc_mirred.h -#usr/include/linux/tc_act/tc_nat.h -#usr/include/linux/tc_act/tc_pedit.h -#usr/include/linux/tc_act/tc_skbedit.h -#usr/include/linux/tc_ematch -#usr/include/linux/tc_ematch/tc_em_cmp.h -#usr/include/linux/tc_ematch/tc_em_meta.h -#usr/include/linux/tc_ematch/tc_em_nbyte.h -#usr/include/linux/tc_ematch/tc_em_text.h -#usr/include/linux/tcp.h -#usr/include/linux/telephony.h -#usr/include/linux/termios.h -#usr/include/linux/time.h -#usr/include/linux/times.h -#usr/include/linux/timex.h -#usr/include/linux/tiocl.h -#usr/include/linux/tipc.h -#usr/include/linux/tipc_config.h -#usr/include/linux/toshiba.h -#usr/include/linux/tty.h -#usr/include/linux/types.h -#usr/include/linux/udf_fs_i.h -#usr/include/linux/udp.h -#usr/include/linux/uinput.h -#usr/include/linux/uio.h -#usr/include/linux/ultrasound.h -#usr/include/linux/un.h -#usr/include/linux/unistd.h -#usr/include/linux/usb -#usr/include/linux/usb/audio.h -#usr/include/linux/usb/cdc.h -#usr/include/linux/usb/ch9.h -#usr/include/linux/usb/g_printer.h -#usr/include/linux/usb/gadgetfs.h -#usr/include/linux/usb/midi.h -#usr/include/linux/usb/tmc.h -#usr/include/linux/usb/vstusb.h -#usr/include/linux/usbdevice_fs.h -#usr/include/linux/utime.h -#usr/include/linux/utsname.h -#usr/include/linux/version.h -#usr/include/linux/veth.h -#usr/include/linux/videodev.h -#usr/include/linux/videodev2.h -#usr/include/linux/videotext.h -#usr/include/linux/virtio_9p.h -#usr/include/linux/virtio_balloon.h -#usr/include/linux/virtio_blk.h -#usr/include/linux/virtio_config.h -#usr/include/linux/virtio_console.h -#usr/include/linux/virtio_ids.h -#usr/include/linux/virtio_net.h -#usr/include/linux/virtio_pci.h -#usr/include/linux/virtio_ring.h -#usr/include/linux/virtio_rng.h -#usr/include/linux/vt.h -#usr/include/linux/wait.h -#usr/include/linux/wanrouter.h -#usr/include/linux/watchdog.h -#usr/include/linux/wimax -#usr/include/linux/wimax.h -#usr/include/linux/wimax/i2400m.h -#usr/include/linux/wireless.h -#usr/include/linux/x25.h -#usr/include/linux/xattr.h -#usr/include/linux/xfrm.h -#usr/include/mtd -#usr/include/mtd/inftl-user.h -#usr/include/mtd/mtd-abi.h -#usr/include/mtd/mtd-user.h -#usr/include/mtd/nftl-user.h -#usr/include/mtd/ubi-user.h -#usr/include/rdma -#usr/include/rdma/ib_user_mad.h -#usr/include/scsi -#usr/include/scsi/scsi.h -#usr/include/scsi/scsi_bsg_fc.h -#usr/include/scsi/scsi_netlink.h -#usr/include/scsi/scsi_netlink_fc.h -#usr/include/sound -#usr/include/sound/asequencer.h -#usr/include/sound/asound.h -#usr/include/sound/asound_fm.h -#usr/include/sound/emu10k1.h -#usr/include/sound/hdsp.h -#usr/include/sound/hdspm.h -#usr/include/sound/sb16_csp.h -#usr/include/sound/sfnt_info.h -#usr/include/sound/sscape_ioctl.h -#usr/include/video -#usr/include/video/edid.h -#usr/include/video/sisfb.h -#usr/include/video/uvesafb.h -#usr/include/xen -#usr/include/xen/evtchn.h diff --git a/config/rootfiles/common/iptables b/config/rootfiles/common/iptables index af034e8e..d30cbf5 100644 --- a/config/rootfiles/common/iptables +++ b/config/rootfiles/common/iptables @@ -149,9 +149,14 @@ sbin/xtables-multi #usr/include/libnfnetlink/linux_nfnetlink.h #usr/include/libnfnetlink/linux_nfnetlink_compat.h #usr/include/linux/netfilter/Kbuild +#usr/include/linux/netfilter/ipset #usr/include/linux/netfilter/ipset/Kbuild +#usr/include/linux/netfilter/ipset/ip_set.h #usr/include/linux/netfilter/ipset/ip_set_ahash.h +#usr/include/linux/netfilter/ipset/ip_set_bitmap.h #usr/include/linux/netfilter/ipset/ip_set_getport.h +#usr/include/linux/netfilter/ipset/ip_set_hash.h +#usr/include/linux/netfilter/ipset/ip_set_list.h #usr/include/linux/netfilter/ipset/ip_set_timeout.h #usr/include/linux/netfilter/ipset/pfxlen.h #usr/include/linux/netfilter/nf_conntrack_amanda.h @@ -166,8 +171,19 @@ sbin/xtables-multi #usr/include/linux/netfilter/nf_conntrack_sip.h #usr/include/linux/netfilter/nf_conntrack_snmp.h #usr/include/linux/netfilter/nf_conntrack_tftp.h +#usr/include/linux/netfilter/xt_AUDIT.h +#usr/include/linux/netfilter/xt_CHECKSUM.h +#usr/include/linux/netfilter/xt_CT.h +#usr/include/linux/netfilter/xt_IDLETIMER.h #usr/include/linux/netfilter/xt_IMQ.h +#usr/include/linux/netfilter/xt_TEE.h +#usr/include/linux/netfilter/xt_addrtype.h +#usr/include/linux/netfilter/xt_cpu.h +#usr/include/linux/netfilter/xt_devgroup.h +#usr/include/linux/netfilter/xt_ipvs.h #usr/include/linux/netfilter/xt_layer7.h +#usr/include/linux/netfilter/xt_set.h +#usr/include/linux/netfilter/xt_socket.h #usr/include/net/netfilter #usr/include/net/netfilter/nf_conntrack_tuple.h #usr/include/net/netfilter/nf_nat.h diff --git a/config/rootfiles/packages/w_scan b/config/rootfiles/packages/w_scan index 40d3546..7e7d50a 100644 --- a/config/rootfiles/packages/w_scan +++ b/config/rootfiles/packages/w_scan @@ -1,2 +1,2 @@ -opt/vdr/bin/w_scan -opt/vdr/bin/w_scan_start +usr/bin/w_scan +#usr/share/man/man1/w_scan.1 diff --git a/lfs/compat-wireless b/lfs/compat-wireless index 4f94fe8..6c6b791 100644 --- a/lfs/compat-wireless +++ b/lfs/compat-wireless @@ -26,7 +26,7 @@ include Config VERSUFIX=ipfire$(KCFG) -VER = 3.6.2-1-snp +VER = 3.6.6-1-snp ifeq "$(KCFG)" "-xen" KVER = 2.6.32.60 @@ -47,7 +47,7 @@ objects = $(DL_FILE) asix-4.4.0.tar.xz $(DL_FILE) = $(DL_FROM)/$(DL_FILE) asix-4.4.0.tar.xz = $(DL_FROM)/asix-4.4.0.tar.xz -$(DL_FILE)_MD5 = 3adbfc455f883d297e02cac2d8d2c40f +$(DL_FILE)_MD5 = e20f1b5a50095cf3483fd171ea9d3f92 asix-4.4.0.tar.xz_MD5=633609e889de41554826e0e2cd7bffde diff --git a/lfs/initscripts b/lfs/initscripts index c9ff24e..213b46e 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -203,7 +203,9 @@ $(TARGET) : ifeq "$(MACHINE_TYPE)" "arm" rm -vf /etc/rc.d/init.d/{acpid,checkfstab} else - ln -sf ../init.d/acpid /etc/rc.d/rcsysinit.d/S51acpid + ln -sf ../init.d/acpid /etc/rc.d/rc3.d/S12acpid + ln -sf ../init.d/acpid /etc/rc.d/rc0.d/K87acpid + ln -sf ../init.d/acpid /etc/rc.d/rc6.d/K87acpid ln -sf ../init.d/checkfstab /etc/rc.d/rcsysinit.d/S19checkfstab endif diff --git a/lfs/linux b/lfs/linux index 80050cc..dbe0896 100644 --- a/lfs/linux +++ b/lfs/linux @@ -40,16 +40,12 @@ DEPS = "" VERSUFIX=ipfire$(KCFG) -ifeq "$(HEADERS)" "1" ifeq "$(TOOLS)" "1" - TARGET = $(DIR_INFO)/linux-libc-headers-$(VER)-$(VERSUFIX)-tools + TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)-tools HEADERS_PREFIX = /tools else - TARGET = $(DIR_INFO)/linux-libc-headers-$(VER)-$(VERSUFIX) - HEADERS_PREFIX = /usr -endif -else TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX) + HEADERS_PREFIX = /usr endif ifeq "$(MACHINE_TYPE)" "arm" @@ -151,7 +147,7 @@ ifeq "$(KCFG)" "-rpi" cd $(DIR_APP) && xzcat $(DIR_DL)/rpi-patches-$(RPI_PATCHES).patch.xz | patch -Np1 endif -ifeq "$(HEADERS)" "1" +ifeq "$(KCFG)" "-headers" # Install the header files cd $(DIR_APP) && make ARCH=$(HEADERS_ARCH) INSTALL_HDR_PATH=dest headers_install -mkdir -pv $(BUILDROOT)/$(HEADERS_PREFIX)/include diff --git a/lfs/motion b/lfs/motion index d42abaf..fa99ea0 100644 --- a/lfs/motion +++ b/lfs/motion @@ -77,11 +77,19 @@ dist: $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + #Install obsolete V4L1 videodev.h + cp $(DIR_SRC)/config/include/obsolete_videodev.h /usr/include/linux/videodev.h + cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install cp -vf $(DIR_SRC)/config/motion/motion.conf /etc install -v -m 644 $(DIR_SRC)/config/backup/includes/motion \ /var/ipfire/backup/addons/includes/motion + + #Remove obsolete V4L1 videodev.h + rm -f /usr/include/linux/videodev.h + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/vdr b/lfs/vdr index ca8f0da..46ea5d3 100644 --- a/lfs/vdr +++ b/lfs/vdr @@ -89,7 +89,10 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - + + # Install obsolete V4L1 videodev header. + cp $(DIR_SRC)/config/include/obsolete_videodev.h /usr/include/linux/videodev.h + # Accept also DVB_API_VERSION 5 cd $(DIR_APP) && sed -i -e "s|DVB_API_VERSION != 3|& \&\& DVB_API_VERSION != 5|g" dvbdevice.h @@ -120,5 +123,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) ln -sf ../init.d/vdr /etc/rc.d/rc6.d/K40vdr install -v -m 644 $(DIR_SRC)/config/backup/includes/vdr \ /var/ipfire/backup/addons/includes/vdr + + # Remove obsolete V4L1 videodev header. + rm -f /usr/include/linux/videodev.h + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/w_scan b/lfs/w_scan index e58cf50..f6e8b9d 100644 --- a/lfs/w_scan +++ b/lfs/w_scan @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -25,7 +25,7 @@ include Config -VER = 20080105 +VER = 20121111 THISAPP = w_scan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = w_scan -PAK_VER = 1 +PAK_VER = 2 DEPS = "" @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9541244559d2da9442a137f7891d45d3 +$(DL_FILE)_MD5 = 30da05747fed9988e11ebc7745f5e71f install : $(TARGET) @@ -78,10 +78,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch < $(DIR_SRC)/src/patches/w_scan-ipfire.patch - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - -mkdir -pv /opt/vdr/bin - cd $(DIR_APP) && install -m 755 w_scan /opt/vdr/bin/ - cd $(DIR_APP) && install -m 755 w_scan_start.sh /opt/vdr/bin/w_scan_start + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index b60723d..7cf5945 100755 --- a/make.sh +++ b/make.sh @@ -258,7 +258,7 @@ buildtoolchain() { lfsmake1 ccache PASS=1 lfsmake1 binutils PASS=1 lfsmake1 gcc PASS=1 - lfsmake1 linux2 TOOLS=1 HEADERS=1 + lfsmake1 linux TOOLS=1 KCFG="-headers" lfsmake1 glibc lfsmake1 cleanup-toolchain PASS=1 lfsmake1 binutils PASS=2 @@ -294,7 +294,7 @@ buildbase() { LOGFILE="$BASEDIR/log/_build.base.log" export LOGFILE lfsmake2 stage2 - lfsmake2 linux2 HEADERS=1 + lfsmake2 linux KCFG="-headers" lfsmake2 man-pages lfsmake2 glibc lfsmake2 tzdata diff --git a/src/initscripts/init.d/sendsignals b/src/initscripts/init.d/sendsignals index 1f5e07e..58c16c3 100644 --- a/src/initscripts/init.d/sendsignals +++ b/src/initscripts/init.d/sendsignals @@ -23,7 +23,7 @@ case "${1}" in sleep ${KILLDELAY} - if [ "${error_value}" = 0 ]; then + if [ "${error_value}" = 0 -o "${error_value}" = 2 ]; then echo_ok else echo_failure @@ -35,7 +35,7 @@ case "${1}" in sleep ${KILLDELAY} - if [ "${error_value}" = 0 ]; then + if [ "${error_value}" = 0 -o "${error_value}" = 2 ]; then echo_ok else echo_failure diff --git a/src/patches/w_scan-ipfire.patch b/src/patches/w_scan-ipfire.patch deleted file mode 100644 index 69ad359..0000000 --- a/src/patches/w_scan-ipfire.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff -Naur w_scan_start.sh w_scan_start.sh ---- w_scan_start.sh 2008-01-05 19:58:44.000000000 +0100 -+++ w_scan_start.sh 2008-05-14 18:29:21.000000000 +0200 -@@ -6,11 +6,11 @@ - # - 20060812: first version - # - 20060822: many improvements - # cu@vdr-portal --# -+# - 20080514: patches for ipfire by arne_f(a)ipfire.org - ####################################################### - - umask 022 --export PATH="$(pwd):/bin:/usr/bin:/sbin:/usr/sbin" -+export PATH="$(pwd):/bin:/usr/bin:/sbin:/usr/sbin:/opt/vdr/bin" - DATE="$(date +%Y)$(date +%m)$(date +%d)" # $DATE == "YYYYMMDD", i.e. 20060710 - W_SCAN=$(which w_scan 2>/dev/null) - UDEVSTART=$(which udevstart) -@@ -224,7 +224,7 @@ - echo "Checking for ct-vdr style startscript.." - if [ -e /etc/init.d/vdr ]; then # c't-vdr - echo_yes -- $(/etc/init.d/vdr stop) -+ /etc/init.d/vdr stop - stopped=true - else - echo_no -@@ -375,7 +375,7 @@ - - # which generic dvb modules should be always loaded? - MODULES_TO_LOAD="videodev v4l1_compat \ -- v4l2_common video_buf dvb_core ves1820 \ -+ v4l2_common dvb_core ves1820 \ - dvb_ttpci \ - budget_ci budget_av budget_ci budget " - -@@ -661,9 +661,11 @@ - echo -e -n $NORMAL - echo -e -n "\\033[1;34m" - if [ ${WHAT_TO_SCAN:0:2} != 0 ]; then -+ echo ":->W_SCAN $DATE DVB-T" >> channels.conf-$DATE - $W_SCAN >> channels.conf-$DATE - fi -- if [ ${WHAT_TO_SCAN:3:2} != 0 ]; then -+ if [ ${WHAT_TO_SCAN:3:2} != 0 ]; then -+ echo ":->W_SCAN $DATE DVB-C" >> channels.conf-$DATE - $W_SCAN -fc >> channels.conf-$DATE - fi - echo -e -n $NORMAL -@@ -671,55 +673,34 @@ - - function CopyConf () - { -- if [ -s channels.conf-$DATE ]; then -- clear -- echo -e -n $SUCCESS -- echo "****************************************************************" -- echo "* *" -- echo "* w_scan is done. *" -- echo -e "* The output file is called "$FAILURE"channels.conf-$DATE"$SUCCESS". *" -- echo "* Should I copy this to default location for you? [y/n] *" -- echo "* *" -- echo "****************************************************************" -- echo -e -n $NORMAL && tput sgr0 -- read RESPONSE -- echo -e -n $NORMAL -- if [ "$RESPONSE" != "y" ]; then -- echo "Copying channels.conf skipped - okay." -- echo "The channels.conf generated can be found at" -- echo -n -e "\\033[1;34m" -- echo "$(pwd)/channels.conf-$DATE" -- echo "" -- echo -e -n $NORMAL -- else -- if [ -d /etc/vdr ]; then -- mv /etc/vdr/channels.conf /etc/vdr/channels.conf-backup$DATE -- cp channels.conf-$DATE /etc/vdr/channels.conf -- fi -- if [ -d /var/lib/vdr ]; then -- mv /var/lib/vdr/channels.conf /var/lib/vdr/channels.conf-backup$DATE -- cp channels.conf-$DATE /var/lib/vdr/channels.conf -- fi -- fi -- else -- clear -- echo -e -n $FAILURE -- echo "****************************************************************" -- echo "* *" -- echo "* Something went wrong. The channels.conf generated is *EMPTY*!*" -- echo "* To analyze your problem I recommend the command *" -- echo "* './w_scan 2>&1 | tee w_scan.log-dvbt && *" -- echo "* ./w_scan -fc 2>&1 | tee w_scan.log-dvbc' *" -- echo "* *" -- echo "* w_scan will report the problem into the logfiles *" -- echo "* w_scan.log-dvbt and w_scan.log-dvbc. *" -- echo "* *" -- echo "* PRESS ANY KEY TO CONTINUE *" -- echo "****************************************************************" -+ echo -e -n $SUCCESS -+ echo "****************************************************************" -+ echo "* *" -+ echo "* w_scan is done. *" -+ echo -e "* The output file is called "$FAILURE"channels.conf-$DATE"$SUCCESS". *" -+ echo "* Should I copy this to default location for you? [y/n] *" -+ echo "* *" -+ echo "****************************************************************" -+ echo -e -n $NORMAL && tput sgr0 -+ read RESPONSE -+ echo -e -n $NORMAL -+ if [ "$RESPONSE" != "y" ]; then -+ echo "Copying channels.conf skipped - okay." -+ echo "The channels.conf generated can be found at" -+ echo -n -e "\\033[1;34m" -+ echo "$(pwd)/channels.conf-$DATE" -+ echo "" - echo -e -n $NORMAL -- read -+ else -+ if [ -d /opt/vdr/etc ]; then -+ mv /opt/vdr/etc/channels.conf /opt/vdr/etc/channels.conf-backup$DATE -+ cp channels.conf-$DATE /opt/vdr/etc/channels.conf -+ fi -+ if [ -d /var/lib/vdr ]; then -+ mv /var/lib/vdr/channels.conf /var/lib/vdr/channels.conf-backup$DATE -+ cp channels.conf-$DATE /var/lib/vdr/channels.conf -+ fi - fi -- - } - - # the program itself. hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 6fead212add7e93df5a5f9affab71679f438888f
by git＠ipfire.org 13 Nov '12

13 Nov '12

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 6fead212add7e93df5a5f9affab71679f438888f (commit) from 10af520f16fb1019a2bcee3c2101bfaa22f0ccb8 (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 6fead212add7e93df5a5f9affab71679f438888f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Nov 13 12:13:28 2012 +0100 ncurses: Sync shipped terminfo files with IPFire 3. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/ncurses | 236 +++++++++++++++++++------------------- 1 files changed, 118 insertions(+), 118 deletions(-) Difference in files: diff --git a/config/rootfiles/common/ncurses b/config/rootfiles/common/ncurses index b4b7039..dbb30aa 100644 --- a/config/rootfiles/common/ncurses +++ b/config/rootfiles/common/ncurses @@ -990,10 +990,10 @@ usr/lib/libtinfo.so.5.9 #usr/share/terminfo/A #usr/share/terminfo/A/Apple_Terminal #usr/share/terminfo/E -#usr/share/terminfo/E/Eterm -#usr/share/terminfo/E/Eterm-256color -#usr/share/terminfo/E/Eterm-88color -#usr/share/terminfo/E/Eterm-color +usr/share/terminfo/E/Eterm +usr/share/terminfo/E/Eterm-256color +usr/share/terminfo/E/Eterm-88color +usr/share/terminfo/E/Eterm-color #usr/share/terminfo/L #usr/share/terminfo/L/LFT-PC850 #usr/share/terminfo/M @@ -1156,7 +1156,7 @@ usr/lib/libtinfo.so.5.9 #usr/share/terminfo/a/ampex232w #usr/share/terminfo/a/ampex80 #usr/share/terminfo/a/annarbor4080 -#usr/share/terminfo/a/ansi +usr/share/terminfo/a/ansi #usr/share/terminfo/a/ansi+arrows #usr/share/terminfo/a/ansi+csr #usr/share/terminfo/a/ansi+cup @@ -1246,7 +1246,7 @@ usr/lib/libtinfo.so.5.9 #usr/share/terminfo/a/atari_st #usr/share/terminfo/a/atari_st-color #usr/share/terminfo/a/atarist-m -#usr/share/terminfo/a/aterm +usr/share/terminfo/a/aterm #usr/share/terminfo/a/att2300 #usr/share/terminfo/a/att2350 #usr/share/terminfo/a/att4410 @@ -1401,7 +1401,7 @@ usr/lib/libtinfo.so.5.9 #usr/share/terminfo/b/bsdos-pc-nobold #usr/share/terminfo/b/bsdos-ppc #usr/share/terminfo/b/bsdos-sparc -#usr/share/terminfo/b/bterm +usr/share/terminfo/b/bterm #usr/share/terminfo/c #usr/share/terminfo/c/c100 #usr/share/terminfo/c/c100-1p @@ -1471,7 +1471,7 @@ usr/lib/libtinfo.so.5.9 #usr/share/terminfo/c/concept108-w-8 #usr/share/terminfo/c/concept108-w8p #usr/share/terminfo/c/concept108rv4p -#usr/share/terminfo/c/cons25 +usr/share/terminfo/c/cons25 #usr/share/terminfo/c/cons25-debian #usr/share/terminfo/c/cons25-iso-m #usr/share/terminfo/c/cons25-iso8859 @@ -1525,7 +1525,7 @@ usr/lib/libtinfo.so.5.9 #usr/share/terminfo/c/cx100 #usr/share/terminfo/c/cyb110 #usr/share/terminfo/c/cyb83 -#usr/share/terminfo/c/cygwin +usr/share/terminfo/c/cygwin #usr/share/terminfo/c/cygwinB19 #usr/share/terminfo/c/cygwinDBG #usr/share/terminfo/d @@ -1808,7 +1808,7 @@ usr/lib/libtinfo.so.5.9 #usr/share/terminfo/d/dtc300s #usr/share/terminfo/d/dtc382 #usr/share/terminfo/d/dtterm -#usr/share/terminfo/d/dumb +usr/share/terminfo/d/dumb #usr/share/terminfo/d/dw #usr/share/terminfo/d/dw1 #usr/share/terminfo/d/dw2 @@ -1836,8 +1836,8 @@ usr/lib/libtinfo.so.5.9 #usr/share/terminfo/e/ergo4000 #usr/share/terminfo/e/esprit #usr/share/terminfo/e/esprit-am -#usr/share/terminfo/e/eterm -#usr/share/terminfo/e/eterm-color +usr/share/terminfo/e/eterm +usr/share/terminfo/e/eterm-color #usr/share/terminfo/e/ex155 #usr/share/terminfo/e/excel62 #usr/share/terminfo/e/excel62-rv @@ -1879,11 +1879,11 @@ usr/lib/libtinfo.so.5.9 #usr/share/terminfo/g/gator-t #usr/share/terminfo/g/gigi #usr/share/terminfo/g/glasstty -#usr/share/terminfo/g/gnome +usr/share/terminfo/g/gnome #usr/share/terminfo/g/gnome+pcfkeys #usr/share/terminfo/g/gnome-2007 #usr/share/terminfo/g/gnome-2008 -#usr/share/terminfo/g/gnome-256color +usr/share/terminfo/g/gnome-256color #usr/share/terminfo/g/gnome-fc5 #usr/share/terminfo/g/gnome-rh62 #usr/share/terminfo/g/gnome-rh72 @@ -2057,7 +2057,7 @@ usr/lib/libtinfo.so.5.9 #usr/share/terminfo/h/hpterm #usr/share/terminfo/h/hpterm-color #usr/share/terminfo/h/htx11 -#usr/share/terminfo/h/hurd +usr/share/terminfo/h/hurd #usr/share/terminfo/h/hz1000 #usr/share/terminfo/h/hz1420 #usr/share/terminfo/h/hz1500 @@ -2153,7 +2153,7 @@ usr/lib/libtinfo.so.5.9 #usr/share/terminfo/j/jaixterm #usr/share/terminfo/j/jaixterm-m #usr/share/terminfo/j/jerq -#usr/share/terminfo/j/jfbterm +usr/share/terminfo/j/jfbterm #usr/share/terminfo/k #usr/share/terminfo/k/k45 #usr/share/terminfo/k/kaypro @@ -2171,10 +2171,10 @@ usr/lib/libtinfo.so.5.9 #usr/share/terminfo/k/klone+sgr8 #usr/share/terminfo/k/kon #usr/share/terminfo/k/kon2 -#usr/share/terminfo/k/konsole +usr/share/terminfo/k/konsole #usr/share/terminfo/k/konsole+pcfkeys #usr/share/terminfo/k/konsole-16color -#usr/share/terminfo/k/konsole-256color +usr/share/terminfo/k/konsole-256color #usr/share/terminfo/k/konsole-base #usr/share/terminfo/k/konsole-linux #usr/share/terminfo/k/konsole-solaris @@ -2196,15 +2196,15 @@ usr/lib/libtinfo.so.5.9 #usr/share/terminfo/l/lft-pc850 usr/share/terminfo/l/linux #usr/share/terminfo/l/linux-16color -usr/share/terminfo/l/linux-basic +#usr/share/terminfo/l/linux-basic #usr/share/terminfo/l/linux-c #usr/share/terminfo/l/linux-c-nc #usr/share/terminfo/l/linux-koi8 #usr/share/terminfo/l/linux-koi8r -usr/share/terminfo/l/linux-lat -usr/share/terminfo/l/linux-m -usr/share/terminfo/l/linux-nic -usr/share/terminfo/l/linux-vt +#usr/share/terminfo/l/linux-lat +#usr/share/terminfo/l/linux-m +#usr/share/terminfo/l/linux-nic +#usr/share/terminfo/l/linux-vt #usr/share/terminfo/l/linux2.6.26 #usr/share/terminfo/l/lisa #usr/share/terminfo/l/lisaterm @@ -2219,9 +2219,9 @@ usr/share/terminfo/l/linux-vt #usr/share/terminfo/m/m2-nam #usr/share/terminfo/m/mac #usr/share/terminfo/m/mac-w -#usr/share/terminfo/m/mach -#usr/share/terminfo/m/mach-bold -#usr/share/terminfo/m/mach-color +usr/share/terminfo/m/mach +usr/share/terminfo/m/mach-bold +usr/share/terminfo/m/mach-color #usr/share/terminfo/m/macintosh #usr/share/terminfo/m/macterminal-w #usr/share/terminfo/m/mai @@ -2266,7 +2266,7 @@ usr/share/terminfo/l/linux-vt #usr/share/terminfo/m/minix-1.7 #usr/share/terminfo/m/minix-old #usr/share/terminfo/m/minix-old-am -#usr/share/terminfo/m/mlterm +usr/share/terminfo/m/mlterm #usr/share/terminfo/m/mlterm+pcfkeys #usr/share/terminfo/m/mlterm-256color #usr/share/terminfo/m/mm314 @@ -2279,7 +2279,7 @@ usr/share/terminfo/l/linux-vt #usr/share/terminfo/m/mono-emx #usr/share/terminfo/m/morphos #usr/share/terminfo/m/mouse-sun -#usr/share/terminfo/m/mrxvt +usr/share/terminfo/m/mrxvt #usr/share/terminfo/m/mrxvt-256color #usr/share/terminfo/m/ms-vt-utf8 #usr/share/terminfo/m/ms-vt100 @@ -2405,7 +2405,7 @@ usr/share/terminfo/l/linux-vt #usr/share/terminfo/n/next #usr/share/terminfo/n/nextshell #usr/share/terminfo/n/northstar -#usr/share/terminfo/n/nsterm +usr/share/terminfo/n/nsterm #usr/share/terminfo/n/nsterm+7 #usr/share/terminfo/n/nsterm+acs #usr/share/terminfo/n/nsterm+c @@ -2560,7 +2560,7 @@ usr/share/terminfo/l/linux-vt #usr/share/terminfo/p/pc3r-m #usr/share/terminfo/p/pc6300plus #usr/share/terminfo/p/pc7300 -#usr/share/terminfo/p/pcansi +usr/share/terminfo/p/pcansi #usr/share/terminfo/p/pcansi-25 #usr/share/terminfo/p/pcansi-25-m #usr/share/terminfo/p/pcansi-33 @@ -2649,9 +2649,9 @@ usr/share/terminfo/l/linux-vt #usr/share/terminfo/p/pt505-22 #usr/share/terminfo/p/pt505-24 #usr/share/terminfo/p/pty -#usr/share/terminfo/p/putty -#usr/share/terminfo/p/putty-256color -#usr/share/terminfo/p/putty-vt100 +usr/share/terminfo/p/putty +usr/share/terminfo/p/putty-256color +usr/share/terminfo/p/putty-vt100 #usr/share/terminfo/q #usr/share/terminfo/q/qansi #usr/share/terminfo/q/qansi-g @@ -2713,16 +2713,16 @@ usr/share/terminfo/l/linux-vt #usr/share/terminfo/r/rt6221 #usr/share/terminfo/r/rt6221-w #usr/share/terminfo/r/rtpc -#usr/share/terminfo/r/rxvt +usr/share/terminfo/r/rxvt #usr/share/terminfo/r/rxvt+pcfkeys -#usr/share/terminfo/r/rxvt-16color -#usr/share/terminfo/r/rxvt-256color -#usr/share/terminfo/r/rxvt-88color -#usr/share/terminfo/r/rxvt-basic -#usr/share/terminfo/r/rxvt-color -#usr/share/terminfo/r/rxvt-cygwin -#usr/share/terminfo/r/rxvt-cygwin-native -#usr/share/terminfo/r/rxvt-xpm +usr/share/terminfo/r/rxvt-16color +usr/share/terminfo/r/rxvt-256color +usr/share/terminfo/r/rxvt-88color +usr/share/terminfo/r/rxvt-basic +usr/share/terminfo/r/rxvt-color +usr/share/terminfo/r/rxvt-cygwin +usr/share/terminfo/r/rxvt-cygwin-native +usr/share/terminfo/r/rxvt-xpm #usr/share/terminfo/s #usr/share/terminfo/s/s4 #usr/share/terminfo/s/sb1 @@ -2738,11 +2738,11 @@ usr/share/terminfo/l/linux-vt #usr/share/terminfo/s/scoansi-old usr/share/terminfo/s/screen #usr/share/terminfo/s/screen+fkeys -#usr/share/terminfo/s/screen-16color +usr/share/terminfo/s/screen-16color #usr/share/terminfo/s/screen-16color-bce #usr/share/terminfo/s/screen-16color-bce-s #usr/share/terminfo/s/screen-16color-s -#usr/share/terminfo/s/screen-256color +usr/share/terminfo/s/screen-256color #usr/share/terminfo/s/screen-256color-bce #usr/share/terminfo/s/screen-256color-bce-s #usr/share/terminfo/s/screen-256color-s @@ -2757,15 +2757,15 @@ usr/share/terminfo/s/screen-bce #usr/share/terminfo/s/screen-bce.xterm-new usr/share/terminfo/s/screen-s usr/share/terminfo/s/screen-w -#usr/share/terminfo/s/screen.Eterm -#usr/share/terminfo/s/screen.gnome -#usr/share/terminfo/s/screen.konsole +usr/share/terminfo/s/screen.Eterm +usr/share/terminfo/s/screen.gnome +usr/share/terminfo/s/screen.konsole usr/share/terminfo/s/screen.linux -#usr/share/terminfo/s/screen.mlterm -#usr/share/terminfo/s/screen.mrxvt -#usr/share/terminfo/s/screen.rxvt +usr/share/terminfo/s/screen.mlterm +usr/share/terminfo/s/screen.mrxvt +usr/share/terminfo/s/screen.rxvt usr/share/terminfo/s/screen.teraterm -#usr/share/terminfo/s/screen.vte +usr/share/terminfo/s/screen.vte usr/share/terminfo/s/screen.xterm-new usr/share/terminfo/s/screen.xterm-r6 usr/share/terminfo/s/screen.xterm-xfree86 @@ -2785,7 +2785,7 @@ usr/share/terminfo/s/screen3 #usr/share/terminfo/s/st52-old #usr/share/terminfo/s/stv52 #usr/share/terminfo/s/stv52pc -#usr/share/terminfo/s/sun +usr/share/terminfo/s/sun #usr/share/terminfo/s/sun-1 #usr/share/terminfo/s/sun-12 #usr/share/terminfo/s/sun-17 @@ -2873,8 +2873,8 @@ usr/share/terminfo/s/screen3 #usr/share/terminfo/t/tek4404 #usr/share/terminfo/t/teleray #usr/share/terminfo/t/teletec -#usr/share/terminfo/t/teraterm -#usr/share/terminfo/t/teraterm2.3 +usr/share/terminfo/t/teraterm +usr/share/terminfo/t/teraterm2.3 #usr/share/terminfo/t/teraterm4.59 #usr/share/terminfo/t/terminet #usr/share/terminfo/t/terminet1200 @@ -3127,44 +3127,44 @@ usr/share/terminfo/s/screen3 #usr/share/terminfo/v/vt-61 #usr/share/terminfo/v/vt-utf8 usr/share/terminfo/v/vt100 -usr/share/terminfo/v/vt100+ +#usr/share/terminfo/v/vt100+ #usr/share/terminfo/v/vt100+enq -usr/share/terminfo/v/vt100+fnkeys -usr/share/terminfo/v/vt100+keypad -usr/share/terminfo/v/vt100+pfkeys -usr/share/terminfo/v/vt100-am -usr/share/terminfo/v/vt100-bm -usr/share/terminfo/v/vt100-bm-o -usr/share/terminfo/v/vt100-bot-s -usr/share/terminfo/v/vt100-nam -usr/share/terminfo/v/vt100-nam-w +#usr/share/terminfo/v/vt100+fnkeys +#usr/share/terminfo/v/vt100+keypad +#usr/share/terminfo/v/vt100+pfkeys +#usr/share/terminfo/v/vt100-am +#usr/share/terminfo/v/vt100-bm +#usr/share/terminfo/v/vt100-bm-o +#usr/share/terminfo/v/vt100-bot-s +#usr/share/terminfo/v/vt100-nam +#usr/share/terminfo/v/vt100-nam-w usr/share/terminfo/v/vt100-nav -usr/share/terminfo/v/vt100-nav-w -usr/share/terminfo/v/vt100-putty -usr/share/terminfo/v/vt100-s -usr/share/terminfo/v/vt100-s-bot -usr/share/terminfo/v/vt100-s-top -usr/share/terminfo/v/vt100-top-s -usr/share/terminfo/v/vt100-vb -usr/share/terminfo/v/vt100-w -usr/share/terminfo/v/vt100-w-am -usr/share/terminfo/v/vt100-w-nam -usr/share/terminfo/v/vt100-w-nav -usr/share/terminfo/v/vt100nam +#usr/share/terminfo/v/vt100-nav-w +#usr/share/terminfo/v/vt100-putty +#usr/share/terminfo/v/vt100-s +#usr/share/terminfo/v/vt100-s-bot +#usr/share/terminfo/v/vt100-s-top +#usr/share/terminfo/v/vt100-top-s +#usr/share/terminfo/v/vt100-vb +#usr/share/terminfo/v/vt100-w +#usr/share/terminfo/v/vt100-w-am +#usr/share/terminfo/v/vt100-w-nam +#usr/share/terminfo/v/vt100-w-nav +#usr/share/terminfo/v/vt100nam usr/share/terminfo/v/vt102 #usr/share/terminfo/v/vt102+enq -usr/share/terminfo/v/vt102-nsgr -usr/share/terminfo/v/vt102-w +#usr/share/terminfo/v/vt102-nsgr +#usr/share/terminfo/v/vt102-w #usr/share/terminfo/v/vt125 #usr/share/terminfo/v/vt131 #usr/share/terminfo/v/vt132 -usr/share/terminfo/v/vt200 -usr/share/terminfo/v/vt200-8 -usr/share/terminfo/v/vt200-8bit -usr/share/terminfo/v/vt200-js +#usr/share/terminfo/v/vt200 +#usr/share/terminfo/v/vt200-8 +#usr/share/terminfo/v/vt200-8bit +#usr/share/terminfo/v/vt200-js #usr/share/terminfo/v/vt200-old -usr/share/terminfo/v/vt200-w -#usr/share/terminfo/v/vt220 +#usr/share/terminfo/v/vt200-w +usr/share/terminfo/v/vt220 #usr/share/terminfo/v/vt220+keypad #usr/share/terminfo/v/vt220-8 #usr/share/terminfo/v/vt220-8bit @@ -3197,19 +3197,19 @@ usr/share/terminfo/v/vt200-w #usr/share/terminfo/v/vt510 #usr/share/terminfo/v/vt510pc #usr/share/terminfo/v/vt510pcdos -#usr/share/terminfo/v/vt52 +usr/share/terminfo/v/vt52 #usr/share/terminfo/v/vt520 #usr/share/terminfo/v/vt525 #usr/share/terminfo/v/vt61 #usr/share/terminfo/v/vt61.5 -#usr/share/terminfo/v/vte +usr/share/terminfo/v/vte #usr/share/terminfo/v/vte+pcfkeys #usr/share/terminfo/v/vte-2007 #usr/share/terminfo/v/vte-2008 -#usr/share/terminfo/v/vte-256color +usr/share/terminfo/v/vte-256color #usr/share/terminfo/v/vtnt #usr/share/terminfo/v/vv100 -#usr/share/terminfo/v/vwmterm +usr/share/terminfo/v/vwmterm #usr/share/terminfo/w #usr/share/terminfo/w/wren #usr/share/terminfo/w/wrenw @@ -3463,7 +3463,7 @@ usr/share/terminfo/v/vt200-w #usr/share/terminfo/x/xerox-lm #usr/share/terminfo/x/xerox1720 #usr/share/terminfo/x/xerox820 -#usr/share/terminfo/x/xfce +usr/share/terminfo/x/xfce #usr/share/terminfo/x/xiterm #usr/share/terminfo/x/xl83 #usr/share/terminfo/x/xnuppc @@ -3530,42 +3530,42 @@ usr/share/terminfo/x/xterm #usr/share/terminfo/x/xterm+pce2 #usr/share/terminfo/x/xterm+pcf0 #usr/share/terminfo/x/xterm+pcf2 -usr/share/terminfo/x/xterm+pcfkeys +#usr/share/terminfo/x/xterm+pcfkeys #usr/share/terminfo/x/xterm+r6f2 -usr/share/terminfo/x/xterm+sl -usr/share/terminfo/x/xterm+sl-twm +#usr/share/terminfo/x/xterm+sl +#usr/share/terminfo/x/xterm+sl-twm #usr/share/terminfo/x/xterm+vt+edit -#usr/share/terminfo/x/xterm-1002 -#usr/share/terminfo/x/xterm-1003 -#usr/share/terminfo/x/xterm-16color -#usr/share/terminfo/x/xterm-24 +usr/share/terminfo/x/xterm-1002 +usr/share/terminfo/x/xterm-1003 +usr/share/terminfo/x/xterm-16color +usr/share/terminfo/x/xterm-24 usr/share/terminfo/x/xterm-256color usr/share/terminfo/x/xterm-88color -#usr/share/terminfo/x/xterm-8bit -#usr/share/terminfo/x/xterm-basic -#usr/share/terminfo/x/xterm-bold +usr/share/terminfo/x/xterm-8bit +usr/share/terminfo/x/xterm-basic +usr/share/terminfo/x/xterm-bold usr/share/terminfo/x/xterm-color -#usr/share/terminfo/x/xterm-hp -#usr/share/terminfo/x/xterm-new -#usr/share/terminfo/x/xterm-nic -#usr/share/terminfo/x/xterm-noapp -#usr/share/terminfo/x/xterm-old -#usr/share/terminfo/x/xterm-pcolor -#usr/share/terminfo/x/xterm-r5 -#usr/share/terminfo/x/xterm-r6 -#usr/share/terminfo/x/xterm-sco -#usr/share/terminfo/x/xterm-sun -#usr/share/terminfo/x/xterm-utf8 +usr/share/terminfo/x/xterm-hp +usr/share/terminfo/x/xterm-new +usr/share/terminfo/x/xterm-nic +usr/share/terminfo/x/xterm-noapp +usr/share/terminfo/x/xterm-old +usr/share/terminfo/x/xterm-pcolor +usr/share/terminfo/x/xterm-r5 +usr/share/terminfo/x/xterm-r6 +usr/share/terminfo/x/xterm-sco +usr/share/terminfo/x/xterm-sun +usr/share/terminfo/x/xterm-utf8 usr/share/terminfo/x/xterm-vt220 usr/share/terminfo/x/xterm-vt52 -#usr/share/terminfo/x/xterm-xf86-v32 -#usr/share/terminfo/x/xterm-xf86-v33 -#usr/share/terminfo/x/xterm-xf86-v333 -#usr/share/terminfo/x/xterm-xf86-v40 -#usr/share/terminfo/x/xterm-xf86-v43 -#usr/share/terminfo/x/xterm-xf86-v44 -#usr/share/terminfo/x/xterm-xfree86 -#usr/share/terminfo/x/xterm-xi +usr/share/terminfo/x/xterm-xf86-v32 +usr/share/terminfo/x/xterm-xf86-v33 +usr/share/terminfo/x/xterm-xf86-v333 +usr/share/terminfo/x/xterm-xf86-v40 +usr/share/terminfo/x/xterm-xf86-v43 +usr/share/terminfo/x/xterm-xf86-v44 +usr/share/terminfo/x/xterm-xfree86 +usr/share/terminfo/x/xterm-xi #usr/share/terminfo/x/xterm1 #usr/share/terminfo/x/xtermc #usr/share/terminfo/x/xtermm hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 10af520f16fb1019a2bcee3c2101bfaa22f0ccb8
by git＠ipfire.org 12 Nov '12

12 Nov '12

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 10af520f16fb1019a2bcee3c2101bfaa22f0ccb8 (commit) via ef2534611b60a65513bfc61537d711457a497657 (commit) via 919eb671a30a4b3d3ca6ca0886f05bf3ab1a43f0 (commit) from b21b0df6a666936b48592aa825fe1950d32ff21a (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 10af520f16fb1019a2bcee3c2101bfaa22f0ccb8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Nov 12 23:42:08 2012 +0100 grub: create default file. grub will not boot if the file not exist. commit ef2534611b60a65513bfc61537d711457a497657 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Nov 12 23:41:17 2012 +0100 acpid: use acpid for powerbutton shutdown. commit 919eb671a30a4b3d3ca6ca0886f05bf3ab1a43f0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Nov 12 23:40:17 2012 +0100 flash-images: fix grub path. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/i586/grub | 1 + config/rootfiles/common/i586/initscripts | 2 +- lfs/flash-images | 4 ++-- lfs/grub | 5 ++++- src/initscripts/sysconfig/rc.local | 5 ----- 5 files changed, 8 insertions(+), 9 deletions(-) Difference in files: diff --git a/config/rootfiles/common/i586/grub b/config/rootfiles/common/i586/grub index 43084f7..de6a53b 100644 --- a/config/rootfiles/common/i586/grub +++ b/config/rootfiles/common/i586/grub @@ -1,4 +1,5 @@ #boot/grub +boot/grub/default boot/grub/grub.conf boot/grub/ipfire.xpm.gz boot/grub/stage1 diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 3b384c8..8092a16 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -3,7 +3,7 @@ etc/rc.d/helper/getdnsfromdhcpc.pl etc/rc.d/helper/writeipac.pl #etc/rc.d/init.d -#etc/rc.d/init.d/acpid +etc/rc.d/init.d/acpid #etc/rc.d/init.d/alsa #etc/rc.d/init.d/amavisd etc/rc.d/init.d/apache diff --git a/lfs/flash-images b/lfs/flash-images index e43d53e..36a343d 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -120,7 +120,7 @@ ifneq "$(MACHINE_TYPE)" "arm" ln -s grub.conf $(MNThdd)/boot/grub/menu.lst # Copy grub files manually - cp -f $(MNThdd)/usr/share/grub/i386-pc/* $(MNThdd)/boot/grub/ + cp -f $(MNThdd)/usr/lib/grub/i386-pc/* $(MNThdd)/boot/grub/ endif # Setup symlink for partresize at first boot... diff --git a/lfs/grub b/lfs/grub index 8d58099..6850a3a 100644 --- a/lfs/grub +++ b/lfs/grub @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -92,5 +92,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) [ -f $$i ] && cp -f $$i /boot/grub; \ done + # generate default file + grub-set-default 0 + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/initscripts/sysconfig/rc.local b/src/initscripts/sysconfig/rc.local index 5b89b82..83ea8e7 100644 --- a/src/initscripts/sysconfig/rc.local +++ b/src/initscripts/sysconfig/rc.local @@ -20,8 +20,3 @@ ############################################################################### # Used for private calls after boot # ############################################################################### - -# power button shutdown -if grep -q '^button' /proc/modules ; then - ( head -1 /proc/acpi/event | grep -q 'button/power PWRF' && poweroff ) & -fi hooks/post-receive -- IPFire 2.x development tree

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM November 2012