Geändert:

  * Webinterface Menü bearbeitet.
  * Squid-Error gefixt.
  * Pakfire gefixt, aber noch nicht funktionsfähig!

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@154 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 3fd3a523e444acee3b22e17a30dae06e021c54db..3cabb1f19492f128658265d5fb369faf1a89475d 100644 (file)
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -32,6 +32,7 @@ $Header::colourorange = '#FF9933';
 $Header::colouryellow = '#FFFF00';
 $Header::colourgreen = '#339933';
 $Header::colourblue = '#333399';
 $Header::colouryellow = '#FFFF00';
 $Header::colourgreen = '#339933';
 $Header::colourblue = '#333399';

+$Header::colourovpn = '#339999';

 $Header::colourfw = '#000000';
 $Header::colourvpn = '#990099';
 $Header::colourerr = '#FF0000';
 $Header::colourfw = '#000000';
 $Header::colourvpn = '#990099';
 $Header::colourerr = '#FF0000';


@@ -117,53 +118,41 @@ sub genmenu {
     my $subsystem = \%subsystemhash;
 
     $subsystem->{'01.home'} = {
     my $subsystem = \%subsystemhash;
 
     $subsystem->{'01.home'} = {

-                             'caption' => $tr{'alt home'},
-                             'uri' => '/cgi-bin/index.cgi',
-                             'title' => "$tr{'alt home'}",
-                             'enabled' => 1,
-                             };
-    $subsystem->{'02.netwizard'} = {
-                                  'caption' => $tr{'network configuration'},
-                                  'uri' => '/cgi-bin/netwizard.cgi',
-                                  'title' => "$tr{'network configuration'}",
-                                  'enabled' => 1,
-                                  };
-    $subsystem->{'03.passwords'} = {
-                                  'caption' => $tr{'sspasswords'},
-                                  'uri' => '/cgi-bin/changepw.cgi',
-                                  'title' => "$tr{'sspasswords'}",
-                                  'enabled' => 1,
-                                  };
-    $subsystem->{'04.ssh'} = {
-                            'caption' => $tr{'ssh access'},
-                            'uri' => '/cgi-bin/remote.cgi',
-                            'title' => "$tr{'ssh access'}",
-                            'enabled' => 1,
-                            };
-    $subsystem->{'05.gui'} = {
-                             'caption' => $tr{'gui settings'},
-                             'uri' => '/cgi-bin/gui.cgi',
-                             'title' => "$tr{'gui settings'}",
-                             'enabled' => 1,
-                             };
-    $subsystem->{'06.backup'} = {
-                               'caption' => $tr{'backup'},
-                               'uri' => '/cgi-bin/backup.cgi',
-                               'title' => "$tr{'backup'} / $tr{'restore'}",
-                               'enabled' => 0,
+                               'caption' => $tr{'alt home'},
+                               'uri' => '/cgi-bin/index.cgi',
+                               'title' => "$tr{'alt home'}",
+                               'enabled' => 1,
+                               };
+    $subsystem->{'02.passwords'} = {
+                               'caption' => $tr{'sspasswords'},
+                               'uri' => '/cgi-bin/changepw.cgi',
+                               'title' => "$tr{'sspasswords'}",
+                               'enabled' => 1,
+                               };
+    $subsystem->{'03.ssh'} = {
+                               'caption' => $tr{'ssh access'},
+                               'uri' => '/cgi-bin/remote.cgi',
+                               'title' => "$tr{'ssh access'}",
+                               'enabled' => 1,
+                               };
+    $subsystem->{'04.gui'} = {
+                               'caption' => $tr{'gui settings'},
+                               'uri' => '/cgi-bin/gui.cgi',
+                               'title' => "$tr{'gui settings'}",
+                               'enabled' => 1,
+                               };
+    $subsystem->{'05.shutdown'} = {
+                               'caption' => $tr{'shutdown'},
+                               'uri' => '/cgi-bin/shutdown.cgi',
+                               'title' => "$tr{'shutdown'} / $tr{'reboot'}",
+                               'enabled' => 1,
+                               };
+    $subsystem->{'99.credits'} = {
+                               'caption' => $tr{'credits'},
+                               'uri' => '/cgi-bin/credits.cgi',
+                               'title' => "$tr{'credits'}",
+                               'enabled' => 1,

                                };
                                };

-    $subsystem->{'07.shutdown'} = {
-                                 'caption' => $tr{'shutdown'},
-                                 'uri' => '/cgi-bin/shutdown.cgi',
-                                 'title' => "$tr{'shutdown'} / $tr{'reboot'}",
-                                 'enabled' => 1,
-                                 };
-    $subsystem->{'08.credits'} = {
-                                 'caption' => $tr{'credits'},
-                                 'uri' => '/cgi-bin/credits.cgi',
-                                 'title' => "$tr{'credits'}",
-                                 'enabled' => 1,
-                                 };

 
     my %substatushash = ();
     my $substatus = \%substatushash;
 
     my %substatushash = ();
     my $substatus = \%substatushash;


@@ -174,43 +163,43 @@ sub genmenu {
                                 'enabled' => 1,
                                 };
     $substatus->{'02.networkstatus'} = {
                                 'enabled' => 1,
                                 };
     $substatus->{'02.networkstatus'} = {

-                                 'caption' => $tr{'ssnetwork status'},
-                                 'uri' => '/cgi-bin/netstatus.cgi',
-                                 'title' => "$tr{'network status information'}",
-                                 'enabled' => 1,
-                                 };
+                               'caption' => $tr{'ssnetwork status'},
+                               'uri' => '/cgi-bin/netstatus.cgi',
+                               'title' => "$tr{'network status information'}",
+                               'enabled' => 1,
+                               };

     $substatus->{'03.systemgraphs'} = {
     $substatus->{'03.systemgraphs'} = {

-                                      'caption' => $tr{'system graphs'},
-                                      'uri' => '/cgi-bin/graphs.cgi',
-                                      'novars' => 1,
-                                      'title' => "$tr{'system graphs'}",
-                                      'enabled' => 1,
-                                      };
+                               'caption' => $tr{'system graphs'},
+                               'uri' => '/cgi-bin/graphs.cgi',
+                               'novars' => 1,
+                               'title' => "$tr{'system graphs'}",
+                               'enabled' => 1,
+                               };

     $substatus->{'04.trafficgraphs'} = {
     $substatus->{'04.trafficgraphs'} = {

-                                       'caption' => $tr{'sstraffic graphs'},
-                                       'uri' => '/cgi-bin/graphs.cgi',
-                                       'vars' => 'graph=network',
-                                       'title' => "$tr{'network traffic graphs'}",
-                                       'enabled' => 1,
-                                       };
+                               'caption' => $tr{'sstraffic graphs'},
+                               'uri' => '/cgi-bin/graphs.cgi',
+                               'vars' => 'graph=network',
+                               'title' => "$tr{'network traffic graphs'}",
+                               'enabled' => 1,
+                               };

     $substatus->{'05.proxygraphs'} = {
     $substatus->{'05.proxygraphs'} = {

-                                     'caption' => $tr{'ssproxy graphs'},
-                                     'uri' => '/cgi-bin/proxygraphs.cgi',
-                                     'title' => "$tr{'proxy access graphs'}",
-                                     'enabled' => 1,
-                                     };
+                               'caption' => $tr{'ssproxy graphs'},
+                               'uri' => '/cgi-bin/proxygraphs.cgi',
+                               'title' => "$tr{'proxy access graphs'}",
+                               'enabled' => 1,
+                               };

     $substatus->{'06.connections'} = {
     $substatus->{'06.connections'} = {

-                                     'caption' => $tr{'connections'},
-                                     'uri' => '/cgi-bin/connections.cgi',
-                                     'title' => "$tr{'connections'}",
-                                     'enabled' => 1,
-                                     };
+                               'caption' => $tr{'connections'},
+                               'uri' => '/cgi-bin/connections.cgi',
+                               'title' => "$tr{'connections'}",
+                               'enabled' => 1,
+                               };

     $substatus->{'99.iptfilters'} = {
     $substatus->{'99.iptfilters'} = {

-                                     'caption' => $tr{'iptfilters iptable rules'},
-                                     'uri' => '/cgi-bin/iptfilters.cgi',
-                                     'title' => "$tr{'iptfilters iptable rules'}",
-                                     'enabled' => 1,
-                                     };
+                               'caption' => $tr{'iptfilters iptable rules'},
+                               'uri' => '/cgi-bin/iptfilters.cgi',
+                               'title' => "$tr{'iptfilters iptable rules'}",
+                               'enabled' => 1,
+                               };

 
     my %subnetworkhash = ();
     my $subnetwork = \%subnetworkhash;
 
     my %subnetworkhash = ();
     my $subnetwork = \%subnetworkhash;


@@ -219,7 +208,7 @@ sub genmenu {
                                  'caption' => $tr{'alt dialup'},
                                  'uri' => '/cgi-bin/pppsetup.cgi',
                                  'title' => "$tr{'dialup settings'}",
                                  'caption' => $tr{'alt dialup'},
                                  'uri' => '/cgi-bin/pppsetup.cgi',
                                  'title' => "$tr{'dialup settings'}",

-                                 'enabled' => 0,
+                                 'enabled' => 1,

                                  };
     $subnetwork->{'02.hosts'} = {
                                 'caption' => $tr{'edit hosts'},
                                  };
     $subnetwork->{'02.hosts'} = {
                                 'caption' => $tr{'edit hosts'},


@@ -268,36 +257,31 @@ sub genmenu {
     my %subserviceshash = ();
     my $subservices = \%subserviceshash;
 
     my %subserviceshash = ();
     my $subservices = \%subserviceshash;
 

-    $subservices->{'01.proxy'} = {
-                               'caption' => $tr{'proxy'},
+    $subservices->{'01.proxy'} = {'caption' => $tr{'proxy'},

                                'uri' => '/cgi-bin/proxy.cgi',
                                'title' => "HTTP: $tr{'web proxy configuration'}",
                                'enabled' => 1,
                                };
                                'uri' => '/cgi-bin/proxy.cgi',
                                'title' => "HTTP: $tr{'web proxy configuration'}",
                                'enabled' => 1,
                                };

-    $subservices->{'02.dhcp'} = {
-                                'caption' => $tr{'dhcp server'},
+    $subservices->{'02.dhcp'} = {'caption' => $tr{'dhcp server'},

                                 'uri' => '/cgi-bin/dhcp.cgi',
                                 'title' => "$tr{'dhcp configuration'}",
                                 'enabled' => 1,
                                 };
                                 'uri' => '/cgi-bin/dhcp.cgi',
                                 'title' => "$tr{'dhcp configuration'}",
                                 'enabled' => 1,
                                 };

-    $subservices->{'03.dyndns'} = {
-                                  'caption' => $tr{'dynamic dns'},
-                                  'uri' => '/cgi-bin/ddns.cgi',
-                                  'title' => "$tr{'dynamic dns client'}",
-                                  'enabled' => 1,
-                                };
-    $subservices->{'04.time'} = {
-                                  'caption' => $tr{'time server'},
-                                  'uri' => '/cgi-bin/time.cgi',
-                                  'title' => "$tr{'time server'}",
-                                  'enabled' => 1,
-                                };
-    $subservices->{'05.qos'} = {
-                                   'caption' => 'Quality of Service',
-                                   'uri' => '/cgi-bin/qos.cgi',
-                                   'title' => "$tr{'traffic shaping settings'}",
-                                   'enabled' => 1,
-                                   };
+    $subservices->{'03.dyndns'} = {'caption' => $tr{'dynamic dns'},
+                               'uri' => '/cgi-bin/ddns.cgi',
+                               'title' => "$tr{'dynamic dns client'}",
+                               'enabled' => 1,
+                               };
+    $subservices->{'04.time'} = {'caption' => $tr{'time server'},
+                               'uri' => '/cgi-bin/time.cgi',
+                               'title' => "$tr{'time server'}",
+                               'enabled' => 1,
+                               };
+    $subservices->{'05.qos'} = {'caption' => 'Quality of Service',
+                               'uri' => '/cgi-bin/qos.cgi',
+                               'title' => "$tr{'traffic shaping settings'}",
+                               'enabled' => 1,
+                               };

     $subservices->{'06.ids'} = {'caption' => $tr{'intrusion detection'},
                                'enabled' => 1,
                                'uri' => '/cgi-bin/ids.cgi',
     $subservices->{'06.ids'} = {'caption' => $tr{'intrusion detection'},
                                'enabled' => 1,
                                'uri' => '/cgi-bin/ids.cgi',


@@ -328,13 +312,12 @@ sub genmenu {
                                'enabled' => 1,
                                 };
     $subfirewall->{'04.outgoing'} = {
                                'enabled' => 1,
                                 };
     $subfirewall->{'04.outgoing'} = {

-                                    'caption' => $tr{'outgoing firewall'},
-                                    'uri' => '/cgi-bin/outgoingfw.cgi',
-                                    'title' => "$tr{'outgoing firewall'}",
-                                    'enabled' => 1,
-                                    };
+                               'caption' => $tr{'outgoing firewall'},
+                               'uri' => '/cgi-bin/outgoingfw.cgi',
+                               'title' => "$tr{'outgoing firewall'}",
+                               'enabled' => 1,
+                               };

     
     

-

     my %sublogshash = ();
     my $sublogs = \%sublogshash;
 
     my %sublogshash = ();
     my $sublogs = \%sublogshash;
 


@@ -359,36 +342,31 @@ sub genmenu {
                                 'enabled' => 1
                                 };
     $sublogs->{'05.ids'} = {'caption' => $tr{'ids logs'},
                                 'enabled' => 1
                                 };
     $sublogs->{'05.ids'} = {'caption' => $tr{'ids logs'},

-                           'uri' => '/cgi-bin/logs.cgi/ids.dat',
-                           'title' => "$tr{'intrusion detection system log viewer'}",
-                           'enabled' => 1
-                           };
-    $sublogs->{'06.contentfilter'} = {'caption' => $tr{'content filter logs'},
-                                     'uri' => '/cgi-bin/logs.cgi/dansguardian.dat',
-                                     'title' => "$tr{'content filter log viewer'}",
-                                     'enabled' => 1
-                                     };
+                               'uri' => '/cgi-bin/logs.cgi/ids.dat',
+                               'title' => "$tr{'intrusion detection system log viewer'}",
+                               'enabled' => 1
+                               };

     $sublogs->{'07.urlfilter'} = {
     $sublogs->{'07.urlfilter'} = {

-                                     'caption' => $tr{'urlfilter log'},
-                                     'uri' => '/cgi-bin/logs.cgi/urlfilter.dat',
-                                     'title' => "$tr{'urlfilter log'}",
-                                     'enabled' => 1,
-                                      };
+                               'caption' => $tr{'urlfilter log'},
+                               'uri' => '/cgi-bin/logs.cgi/urlfilter.dat',
+                               'title' => "$tr{'urlfilter log'}",
+                               'enabled' => 1,
+                               };

     $sublogs->{'08.openvpn'} = {'caption' => $tr{'openvpn log'},
     $sublogs->{'08.openvpn'} = {'caption' => $tr{'openvpn log'},

-                                     'uri' => '/cgi-bin/logs.cgi/openvpn.dat',
-                                     'title' => "$tr{'openvpn log'}",
-                                     'enabled' => 1
-                                     };
+                               'uri' => '/cgi-bin/logs.cgi/openvpn.dat',
+                               'title' => "$tr{'openvpn log'}",
+                               'enabled' => 1
+                               };

     $sublogs->{'09.system'} = {'caption' => $tr{'system logs'},
     $sublogs->{'09.system'} = {'caption' => $tr{'system logs'},

-                                     'uri' => '/cgi-bin/logs.cgi/log.dat',
-                                     'title' => "$tr{'system log viewer'}",
-                                     'enabled' => 1
-                                     };
+                               'uri' => '/cgi-bin/logs.cgi/log.dat',
+                               'title' => "$tr{'system log viewer'}",
+                               'enabled' => 1
+                               };

     $sublogs->{'10.userlog'} = {'caption' => $tr{'user proxy logs'},
     $sublogs->{'10.userlog'} = {'caption' => $tr{'user proxy logs'},

-                                      'uri' => '/cgi-bin/logs.cgi/userlog.dat',
-                                      'title' => "$tr{'user log viewer'}",
-                                      'enabled' => 1
-                                       };
+                               'uri' => '/cgi-bin/logs.cgi/userlog.dat',
+                               'title' => "$tr{'user log viewer'}",
+                               'enabled' => 1
+                               };

 
     my %subipfirehash = ();
     my $subipfire = \%subipfirehash;
 
     my %subipfirehash = ();
     my $subipfire = \%subipfirehash;


@@ -416,46 +394,41 @@ sub genmenu {
 
 
     $menu->{'01.system'} = {'caption' => $tr{'alt system'},
 
 
     $menu->{'01.system'} = {'caption' => $tr{'alt system'},

-                           'enabled' => 1,
-                           'subMenu' => $subsystem
-                           };
+                               'enabled' => 1,
+                               'subMenu' => $subsystem
+                               };

     $menu->{'02.status'} = {'caption' => $tr{'status'},
     $menu->{'02.status'} = {'caption' => $tr{'status'},

-                           'enabled' => 1,
-                           'subMenu' => $substatus
-                           };
+                               'enabled' => 1,
+                               'subMenu' => $substatus
+                               };

     $menu->{'03.network'} = {'caption' => $tr{'network'},
     $menu->{'03.network'} = {'caption' => $tr{'network'},

-                            'enabled' => 1,
-                            'subMenu' => $subnetwork
-                            };
+                               'enabled' => 1,
+                               'subMenu' => $subnetwork
+                               };

     $menu->{'04.services'} = {'caption' => $tr{'alt services'},
     $menu->{'04.services'} = {'caption' => $tr{'alt services'},

-                             'enabled' => 1,
-                             'subMenu' => $subservices
-                             };
+                               'enabled' => 1,
+                               'subMenu' => $subservices
+                               };

     $menu->{'05.firewall'} = {'caption' => $tr{'firewall'},
     $menu->{'05.firewall'} = {'caption' => $tr{'firewall'},

-                             'enabled' => 1,
-                             'subMenu' => $subfirewall
-                             };
+                               'enabled' => 1,
+                               'subMenu' => $subfirewall
+                               };

     $menu->{'06.proxy'} = {'caption' => $tr{'alt proxy'},
     $menu->{'06.proxy'} = {'caption' => $tr{'alt proxy'},

-                          'enabled' => 1,
-                          'subMenu' => $subproxy
-                          };
+                               'enabled' => 1,
+                               'subMenu' => $subproxy
+                               };

     $menu->{'07.ipfire'} = {'caption' => 'IPFire',
     $menu->{'07.ipfire'} = {'caption' => 'IPFire',

-                        'enabled' => 1,
-                        'subMenu' => $subvpn
-                        };
+                               'enabled' => 1,
+                               'subMenu' => $subipfire
+                               };

     $menu->{'08.logs'} = {'caption' => $tr{'alt logs'},
     $menu->{'08.logs'} = {'caption' => $tr{'alt logs'},

-                         'enabled' => 1,
-                         'subMenu' => $sublogs
-                         };
+                               'enabled' => 1,
+                               'subMenu' => $sublogs
+                               };

 
     if (! blue_used() && ! orange_used()) {
        $menu->{'05.firewall'}{'subMenu'}->{'03.dmz'}{'enabled'} = 0;
     }
 
     if (! blue_used() && ! orange_used()) {
        $menu->{'05.firewall'}{'subMenu'}->{'03.dmz'}{'enabled'} = 0;
     }

-    if (-e '/etc/FLASH') {
-       $menu{'06.proxy'}{'subMenu'}->{'01.http'}{'subMenu'}->{'01.proxy'}{'enabled'} = 0;  #disable squid
-       $menu{'04.services'}{'subMenu'}->{'05.ids'}{'enabled'} = 0;  #disable ids
-       $menu{'08.logs'}{'subMenu'}->{'05.ids'}{'enabled'} = 0;  #disable ids
-    }

 }
 
 sub showhttpheaders
 }
 
 sub showhttpheaders

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 1e2e3c2aad2a9ddfe692e163c918c66fe35c78dd..c9799f6e3777f36ecc59e89cabc13779277f2bf3 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -172,7 +172,6 @@
   * popt-1.7
   * portmap_5beta
   * postfix-2.2.10
   * popt-1.7
   * portmap_5beta
   * postfix-2.2.10

-  * postfix-2.2.9

   * ppp-2.4.2
   * pptp-1.6.0
   * procinfo-18
   * ppp-2.4.2
   * pptp-1.6.0
   * procinfo-18


@@ -196,7 +195,6 @@
   * spandsp-0.0.2pre25
   * speedtouch-1.2
   * squid-2.5.STABLE13
   * spandsp-0.0.2pre25
   * speedtouch-1.2
   * squid-2.5.STABLE13

-  * squid-2.5.STABLE13_1st

   * squid-graph-3.1
   * startscripts
   * stund_0.96_Aug13
   * squid-graph-3.1
   * startscripts
   * stund_0.96_Aug13

diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi
index ed1d117aeaafa91bb37526a87819493d81c30fa7..9a0f2ac98c97b56ea27c0890d1cee9ff24c7ca15 100644 (file)
--- a/html/cgi-bin/connections.cgi
+++ b/html/cgi-bin/connections.cgi
@@ -84,8 +84,6 @@ if (-e "${General::swroot}/ovpn/settings") {
                push(@network, $tempovpnsubnet[0]);
                push(@masklen, $tempovpnsubnet[1]);
                push(@colour, ${Header::colourovpn} );
                push(@network, $tempovpnsubnet[0]);
                push(@masklen, $tempovpnsubnet[1]);
                push(@colour, ${Header::colourovpn} );

-               push(@ports, '0' );
-               push(@protocols, '' );

 
     if ( ($ovpnsettings{'ENABLED'} eq 'on') && open(IP, "${General::swroot}/red/local-ipaddress") ) {
       # add RED:port / proto
 
     if ( ($ovpnsettings{'ENABLED'} eq 'on') && open(IP, "${General::swroot}/red/local-ipaddress") ) {
       # add RED:port / proto


@@ -95,24 +93,18 @@ if (-e "${General::swroot}/ovpn/settings") {
                  push(@network, $redip );
                push(@masklen, '255.255.255.255' );
                push(@colour, ${Header::colourovpn} );
                  push(@network, $redip );
                push(@masklen, '255.255.255.255' );
                push(@colour, ${Header::colourovpn} );

-               push(@ports, $ovpnsettings{'DDEST_PORT'} );
-               push(@protocols, $ovpnsettings{'DPROTOCOL'} );

     }
     if ( ($ovpnsettings{'ENABLED_BLUE'} eq 'on') && $netsettings{'BLUE_DEV'} ) {
       # add BLUE:port / proto
        push(@network, $netsettings{'BLUE_ADDRESS'} );
        push(@masklen, '255.255.255.255' );
                push(@colour, ${Header::colourovpn} );
     }
     if ( ($ovpnsettings{'ENABLED_BLUE'} eq 'on') && $netsettings{'BLUE_DEV'} ) {
       # add BLUE:port / proto
        push(@network, $netsettings{'BLUE_ADDRESS'} );
        push(@masklen, '255.255.255.255' );
                push(@colour, ${Header::colourovpn} );

-               push(@ports, $ovpnsettings{'DDEST_PORT'} );
-               push(@protocols, $ovpnsettings{'DPROTOCOL'} );

     }
     if ( ($ovpnsettings{'ENABLED_ORANGE'} eq 'on') && $netsettings{'ORANGE_DEV'} ) {
       # add ORANGE:port / proto
        push(@network, $netsettings{'ORANGE_ADDRESS'} );
        push(@masklen, '255.255.255.255' );
                push(@colour, ${Header::colourovpn} );
     }
     if ( ($ovpnsettings{'ENABLED_ORANGE'} eq 'on') && $netsettings{'ORANGE_DEV'} ) {
       # add ORANGE:port / proto
        push(@network, $netsettings{'ORANGE_ADDRESS'} );
        push(@masklen, '255.255.255.255' );
                push(@colour, ${Header::colourovpn} );

-               push(@ports, $ovpnsettings{'DDEST_PORT'} );
-               push(@protocols, $ovpnsettings{'DPROTOCOL'} );

     }
 }
 
     }
 }
 

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 73fbc392bbce3d58e5e190974109dc66477f51e1..81b6ad12ec7a3c679b877e9d821117600a84e2e7 100644 (file)
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -803,18 +803,6 @@ if ($errormessage) {
        &Header::closebox();
 }
 
        &Header::closebox();
 }
 

-if (($advproxyversion lt $latest) && (-e $sysupdflagfile)) { unlink($sysupdflagfile); }
-
-if (!-e $sysupdflagfile) {
-       &Header::openbox('100%', 'left', $Lang::tr{'advproxy update notification'});
-       print "<table width='100%' cellpadding='5'>\n";
-       print "<tr>\n";
-       print "<td bgcolor='$hintcolour' class='base'>$Lang::tr{'advproxy update information'}</td>";
-       print "</tr>\n";
-       print "</table>\n";
-       &Header::closebox();
-}
-

 # ===================================================================
 #  Main settings
 # ===================================================================
 # ===================================================================
 #  Main settings
 # ===================================================================

diff --git a/lfs/configroot b/lfs/configroot
index 102dc550520da074c2147686726319e90e957a04..65bea4c166720d745554118ae7d560723ce5f8f4 100644 (file)
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -60,7 +60,7 @@ $(TARGET) :
        for i in auth/users backup/include.user backup/exclude.user \
            certs/index.txt ddns/config ddns/noipsettings ddns/settings ddns/ipcache dhcp/settings \
            dhcp/fixleases dhcp/advoptions dmzholes/config ethernet/aliases ethernet/settings \
        for i in auth/users backup/include.user backup/exclude.user \
            certs/index.txt ddns/config ddns/noipsettings ddns/settings ddns/ipcache dhcp/settings \
            dhcp/fixleases dhcp/advoptions dmzholes/config ethernet/aliases ethernet/settings \

-           isdn/settings main/hosts main/settings optionsfw/settings patches/available patches/installed \
+           isdn/settings main/hosts main/settings optionsfw/settings pakfire/settings patches/available patches/installed \

            portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
            ppp/settings-5 ppp/settings proxy/settings remote/settings shaping/settings \
            shaping/config snort/settings vpn/config vpn/settings vpn/ipsec.conf \
            portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
            ppp/settings-5 ppp/settings proxy/settings remote/settings shaping/settings \
            shaping/config snort/settings vpn/config vpn/settings vpn/ipsec.conf \

diff --git a/lfs/fetchmail b/lfs/fetchmail
index fbaa749baba23a8330b5674b75d43635fc99951d..7a1be86f275ed9ebd6fd5e644b83ae66997305d6 100644 (file)
--- a/lfs/fetchmail
+++ b/lfs/fetchmail
@@ -75,7 +75,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)

-       cd $(DIR_APP) && ./configure --prefix=/usr --with-ssl --disable-nls # --enable-fallback=procmail
+       cd $(DIR_APP) && ./configure --prefix=/usr --with-ssl --disable-nls --enable-fallback=procmail

        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
        echo "set logfile /var/log/fetchmail.log" > ~/.fetchmailrc
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
        echo "set logfile /var/log/fetchmail.log" > ~/.fetchmailrc

diff --git a/lfs/stage2 b/lfs/stage2
index 178cda57ae791b9d511136baecd5b3cf94bfbb6f..81ac2145c06e10d0a22cda2f6671b3cb60c46383 100644 (file)
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -102,4 +102,7 @@ $(TARGET) :
        -mkdir -m 1775 -p /var/patches
        chown -R root:nobody /var/patches
 
        -mkdir -m 1775 -p /var/patches
        chown -R root:nobody /var/patches
 

+       # Versionsfile
+       echo -n "$(VERSION)" > /etc/ipfire_vers
+

        @$(POSTBUILD)
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 49d58a08900acc89f517425e22e81822b6b6375e..4719b2c354242df8a0b308ca10e0a54d239db8f7 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -639,6 +639,8 @@ buildipcop() {
   ipcopmake Archive-Zip
   ipcopmake GeoIP
   ipcopmake fwhits
   ipcopmake Archive-Zip
   ipcopmake GeoIP
   ipcopmake fwhits

+  ipcopmake berkeley
+  ipcopmake BerkeleyDB ## The Perl module

   ipcopmake noip_updater
   ipcopmake ntp
   ipcopmake oinkmaster
   ipcopmake noip_updater
   ipcopmake ntp
   ipcopmake oinkmaster


@@ -650,6 +652,9 @@ buildipcop() {
   ipcopmake setup
   ipcopmake snort
   #ipcopmake speedycgi
   ipcopmake setup
   ipcopmake snort
   #ipcopmake speedycgi

+  ipcopmake saslauthd PASS=1
+  ipcopmake openldap
+  ipcopmake saslauthd PASS=2

   ipcopmake squid
   ipcopmake squid-graph
   ipcopmake tcpdump
   ipcopmake squid
   ipcopmake squid-graph
   ipcopmake tcpdump


@@ -662,8 +667,6 @@ buildipcop() {
   ipcopmake pakfire
   ipcopmake startscripts
 ## Zuerst die Libs und dann die Programme. Ordnung muss sein!
   ipcopmake pakfire
   ipcopmake startscripts
 ## Zuerst die Libs und dann die Programme. Ordnung muss sein!

-  ipcopmake berkeley
-  ipcopmake BerkeleyDB ## The Perl module

   ipcopmake java
   ipcopmake libtiff
   ipcopmake libjpeg
   ipcopmake java
   ipcopmake libtiff
   ipcopmake libjpeg


@@ -676,9 +679,6 @@ buildipcop() {
   ipcopmake xampp
   ipcopmake pam
   ipcopmake pammysql
   ipcopmake xampp
   ipcopmake pam
   ipcopmake pammysql

-  ipcopmake saslauthd PASS=1
-  ipcopmake openldap
-  ipcopmake saslauthd PASS=2

   ipcopmake xinetd
   ipcopmake ghostscript
   ipcopmake cups
   ipcopmake xinetd
   ipcopmake ghostscript
   ipcopmake cups


@@ -1075,7 +1075,7 @@ gettoolchain)
                        echo "`date -u '+%b %e %T'`: toolchain md5 ok" | tee -a $LOGFILE
                        echo "`date -u '+%b %e %T'`: Uncompressing toolchain" | tee -a $LOGFILE
                        cd $BASEDIR && tar xfz cache/$PACKAGE.tar.gz -C .
                        echo "`date -u '+%b %e %T'`: toolchain md5 ok" | tee -a $LOGFILE
                        echo "`date -u '+%b %e %T'`: Uncompressing toolchain" | tee -a $LOGFILE
                        cd $BASEDIR && tar xfz cache/$PACKAGE.tar.gz -C .

-                       rm -vf $BASEDIR/cache/$PACKAGE.{tar.gz,md5}
+                       rm -f $BASEDIR/cache/$PACKAGE.{tar.gz,md5}

                else
                        exiterror "$PACKAGE.md5 did not match, check downloaded package"
                fi
                else
                        exiterror "$PACKAGE.md5 did not match, check downloaded package"
                fi

diff --git a/src/ROOTFILES.i386 b/src/ROOTFILES.i386
index 53ebddd375c0e8b109ea12e2a0392c16755149d8..4222681a14fc043701ad5573197a8f3dc4c116be 100644 (file)
--- a/src/ROOTFILES.i386
+++ b/src/ROOTFILES.i386
@@ -23294,6 +23294,37 @@ etc/squid/squid.conf
 #usr/lib/squid/cachemgr.cgi
 #usr/lib/squid/diskd
 #usr/lib/squid/errors
 #usr/lib/squid/cachemgr.cgi
 #usr/lib/squid/diskd
 #usr/lib/squid/errors

+#usr/lib/squid/errors/Azerbaijani
+#usr/lib/squid/errors/Azerbaijani/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/Azerbaijani/ERR_CACHE_ACCESS_DENIED
+#usr/lib/squid/errors/Azerbaijani/ERR_CACHE_MGR_ACCESS_DENIED
+#usr/lib/squid/errors/Azerbaijani/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/Azerbaijani/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/Azerbaijani/ERR_DNS_FAIL
+#usr/lib/squid/errors/Azerbaijani/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/Azerbaijani/ERR_FTP_DISABLED
+#usr/lib/squid/errors/Azerbaijani/ERR_FTP_FAILURE
+#usr/lib/squid/errors/Azerbaijani/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/Azerbaijani/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/Azerbaijani/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/Azerbaijani/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/Azerbaijani/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/Azerbaijani/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/Azerbaijani/ERR_INVALID_REQ
+#usr/lib/squid/errors/Azerbaijani/ERR_INVALID_RESP
+#usr/lib/squid/errors/Azerbaijani/ERR_INVALID_URL
+#usr/lib/squid/errors/Azerbaijani/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/Azerbaijani/ERR_NO_RELAY
+#usr/lib/squid/errors/Azerbaijani/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/Azerbaijani/ERR_READ_ERROR
+#usr/lib/squid/errors/Azerbaijani/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/Azerbaijani/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/Azerbaijani/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/Azerbaijani/ERR_TOO_BIG
+#usr/lib/squid/errors/Azerbaijani/ERR_UNSUP_REQ
+#usr/lib/squid/errors/Azerbaijani/ERR_URN_RESOLVE
+#usr/lib/squid/errors/Azerbaijani/ERR_WRITE_ERROR
+#usr/lib/squid/errors/Azerbaijani/ERR_ZERO_SIZE_OBJECT

 #usr/lib/squid/errors/Bulgarian
 #usr/lib/squid/errors/Bulgarian/ERR_ACCESS_DENIED
 #usr/lib/squid/errors/Bulgarian/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/Bulgarian
 #usr/lib/squid/errors/Bulgarian/ERR_ACCESS_DENIED
 #usr/lib/squid/errors/Bulgarian/ERR_CACHE_ACCESS_DENIED


@@ -23573,7 +23604,7 @@ usr/lib/squid/errors/English
 #usr/lib/squid/errors/French/ERR_URN_RESOLVE
 #usr/lib/squid/errors/French/ERR_WRITE_ERROR
 #usr/lib/squid/errors/French/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/French/ERR_URN_RESOLVE
 #usr/lib/squid/errors/French/ERR_WRITE_ERROR
 #usr/lib/squid/errors/French/ERR_ZERO_SIZE_OBJECT

-#usr/lib/squid/errors/German
+usr/lib/squid/errors/German

 #usr/lib/squid/errors/German/ERR_ACCESS_DENIED
 #usr/lib/squid/errors/German/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/German/ERR_CACHE_MGR_ACCESS_DENIED
 #usr/lib/squid/errors/German/ERR_ACCESS_DENIED
 #usr/lib/squid/errors/German/ERR_CACHE_ACCESS_DENIED
 #usr/lib/squid/errors/German/ERR_CACHE_MGR_ACCESS_DENIED


@@ -24226,12 +24257,14 @@ usr/lib/squid/msnt_auth
 usr/lib/squid/ncsa_auth
 usr/lib/squid/ntlm_auth
 usr/lib/squid/smb_auth
 usr/lib/squid/ncsa_auth
 usr/lib/squid/ntlm_auth
 usr/lib/squid/smb_auth

+usr/lib/squid/smb_auth.pl

 usr/lib/squid/smb_auth.sh
 usr/lib/squid/smb_auth.sh

+usr/lib/squid/squid_ldap_auth

 usr/lib/squid/unlinkd
 usr/lib/squid/unlinkd

-usr/lib/squid/wb_ntlmauth

 usr/sbin/squid
 #usr/share/man/man8/cachemgr.cgi.8
 #usr/share/man/man8/squid.8
 usr/sbin/squid
 #usr/share/man/man8/cachemgr.cgi.8
 #usr/share/man/man8/squid.8

+#usr/share/man/man8/squid_ldap_auth.8

 var/log/cache
 var/log/squid
 var/log/squid/access.log
 var/log/cache
 var/log/squid
 var/log/squid/access.log

diff --git a/src/pakfire/lib/check_pak.sh b/src/pakfire/lib/check_pak.sh
index 3e5c4f44e6332bcccab647c5b90f2d6f825cd290..0cddbff9bef7cd6c4b33eb9a8818c6ba24ba1a25 100644 (file)
--- a/src/pakfire/lib/check_pak.sh
+++ b/src/pakfire/lib/check_pak.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh

 ############################################################################################
 # Version 0.1a, Copyright (C) 2006  by IPFire.org                                                #
 # IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen.      #
 ############################################################################################
 # Version 0.1a, Copyright (C) 2006  by IPFire.org                                                #
 # IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen.      #

diff --git a/src/pakfire/lib/get_conf.sh b/src/pakfire/lib/get_conf.sh
index ffef70e05c3ea0e42c63966ddfe2edc6e46ad81d..0d61f1a5742404d8094743693bd634a68c237e4b 100644 (file)
--- a/src/pakfire/lib/get_conf.sh
+++ b/src/pakfire/lib/get_conf.sh
@@ -5,7 +5,7 @@
 ############################################################################################
 
 # Conf File festlegen
 ############################################################################################
 
 # Conf File festlegen

-CONF_FILE=/opt/pakfire/pakfire.conf
+CONF_FILE=/etc/pakfire.conf

 
 if [ -r $CONF_FILE ]
 then 
 
 if [ -r $CONF_FILE ]
 then 

diff --git a/src/pakfire/lib/get_mirror.sh b/src/pakfire/lib/get_mirror.sh
index e12c517c25615cfcda820181aaac7437dec0c81e..5ccf8260e1844dcf62f07b67d1e75e971a1adfdd 100644 (file)
--- a/src/pakfire/lib/get_mirror.sh
+++ b/src/pakfire/lib/get_mirror.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
 #!/bin/bash

+

 ############################################################################################
 # Version 0.1a, Copyright (C) 2006  by IPFire.org                                                #
 # IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen.      #
 ############################################################################################
 # Version 0.1a, Copyright (C) 2006  by IPFire.org                                                #
 # IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen.      #

diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire
index af00031aa5e9c9aea109c54a5555fb1a41784d5c..7ccc83503c1255a7e99963ff23c3eff04e73b971 100644 (file)
--- a/src/pakfire/pakfire
+++ b/src/pakfire/pakfire
@@ -6,9 +6,9 @@
 
 case "$1" in
 
 
 case "$1" in
 

-       update)         $(get_conf.sh HOME)/lib/get_mirror.sh
-                       $(get_conf.sh HOME)/lib/get_list.sh
-                       $(get_conf.sh HOME)/lib/check_pak.sh
+       update)         $(lib/get_conf.sh HOME)/lib/get_mirror.sh
+                       $(lib/get_conf.sh HOME)/lib/get_list.sh
+                       $(lib/get_conf.sh HOME)/lib/check_pak.sh

        ;;
 
        *) echo -e "IPFire - Pakfire\nHilfe:\npakfire install [Paket]\t- Installiert ein neues Paket.\npakfire update\t\t- Lädt die Liste aller Pakete neu.\npakfire remove [Paket]\t- Deinstalliert ein Paket.\npakfire upgrade\t\t- Überprüft nach neuen Updates."
        ;;
 
        *) echo -e "IPFire - Pakfire\nHilfe:\npakfire install [Paket]\t- Installiert ein neues Paket.\npakfire update\t\t- Lädt die Liste aller Pakete neu.\npakfire remove [Paket]\t- Deinstalliert ein Paket.\npakfire upgrade\t\t- Überprüft nach neuen Updates."

diff --git a/src/pakfire/pakfire.conf b/src/pakfire/pakfire.conf
index 7974f512400f6cae5e63927fcfc8e313835e2373..e00c2322f6fad490f60e561b3c49714d6905bf77 100644 (file)
--- a/src/pakfire/pakfire.conf
+++ b/src/pakfire/pakfire.conf
@@ -1,6 +1,56 @@
-VERS=1.4-beta-1
-HOME=/opt/pakfire
-H_MIRROR=http://mirror.ipfire.org/pakfire
-HOST_TEST=ping -c 5 
+############################################################################################
+# Version 0.1a, Copyright (C) 2006  Peter Schaelchli Für IPFire besteht KEINERLEI GARANTIE;#
+# IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen;      #
+############################################################################################
+
+# Home Verzeichnis von Pakman
+HOME=/opt/pakfire/
+
+# Verionsfile von IPFire
+VERS=/etc/ipfire_vers
+
+# URL Mirrorfile
+PURL=/opt/pakfire/patch.http
+
+# LOG_file

 LOG=/var/log/pakfire.log
 LOG=/var/log/pakfire.log

-LIST_NAME=paklist
+
+# Filename der Patchliste
+LIST_NAME=packages_list.txt
+
+# Zielverzeichnis der Patchliste
+DEST_DIR=/opt/pakfire/list/
+
+# Update Verzeichnis
+UP_DIR=/opt/pakfire/updates/
+
+# Verzeichnis mit nicht installierten Paketen
+NIP_DIR=/opt/pakfire/notinstalled/
+
+# Verzeichnis mit Installierten Paketen
+IP_DIR=/opt/pakfire/installed/
+
+# Download Zielverzeichnis
+DOWN_DEST=/opt/pakfire/download/
+
+# Haupt- Mirrorliste
+H_MIRROR=http://mirror.ipfire.org/packages/files.http
+
+# URL Zerlegungs- Script
+URL_ZERL=/opt/pakfire/url_zerl.sh
+
+# Host Tester
+HOST_TEST=/opt/pakfire/test_host.sh
+
+# Paket Filenamen festlegen
+# Das eigentliche Paket
+PAK_PROG=prog.tar.gz
+# Abhängigkeits Liste
+PAK_ABH=abh.txt
+# Installer Script
+PAK_INST=install.sh
+# Uninstaller Script
+PAK_UNINST=uninstall.sh
+
+# Cacheverzeichnis
+CACHE_DIR=/opt/pakfire/cache/