diff --git a/config/ovpn/openssl/ovpn.cnf b/config/ovpn/openssl/ovpn.cnf index 8643ea741..d82c04b90 100644 --- a/config/ovpn/openssl/ovpn.cnf +++ b/config/ovpn/openssl/ovpn.cnf @@ -1,5 +1,5 @@ HOME = . -RANDFILE = /var/ipcop/ovpn/ca/.rnd +RANDFILE = /var/ipfire/ovpn/ca/.rnd oid_section = new_oids [ new_oids ] @@ -8,7 +8,7 @@ oid_section = new_oids default_ca = openvpn [ openvpn ] -dir = /var/ipcop/ovpn +dir = /var/ipfire/ovpn certs = $dir/certs crl_dir = $dir/crl database = $dir/certs/index.txt diff --git a/doc/packages-list.txt b/doc/packages-list.txt index c9799f6e3..f84b460c1 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -194,7 +194,7 @@ * snort-2.3.3 * spandsp-0.0.2pre25 * speedtouch-1.2 - * squid-2.5.STABLE13 + * squid-2.5.STABLE14 * squid-graph-3.1 * startscripts * stund_0.96_Aug13 diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index a8cc23f7d..6f016f86f 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -29,20 +29,370 @@ print <
Besuchen sie uns auf http://www.ipfire.org/

Visit us on http://www.ipfire.org/

-

IPFire is based on IPFire and Smoothwall. Many thanks to its developers for this great piece of software.
+
IPFire is based on IPCop and Smoothwall. Many thanks to its developers for this great piece of software.

Credits:
Projektleiter - Michael Tremer (m.s.tremer\@gmail.com)
Projektmitglied & Sponsor - Detlef Lampart (info\@delaco.de)
-Projektmitglied & Webinterfacedesign - Benedikt Correll +Projektmitglied & Supporter - Silvio Rechenbach +(sr\@tne.de)
+Webinterfacedesign & Inspiration - Benedikt Correll (benedikt_correll\@hotmail.com)
-...to be continued +Sponsor - Karsten Rechenbach +(email\@fehlt.com)
+Betatester - Sebastian Winter +(sebastian.winter\@gmail.com)

END ; +&Header::closebox(); +&Header::openbox('100%', 'left', 'GPL'); +print < + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. +END &Header::closebox(); &Header::closebigbox(); diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 9aa77d6ef..5f6ac8bb4 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -6,8 +6,6 @@ # # (c) The SmoothWall Team # -# $Id: index.cgi,v 1.15.2.18 2005/09/17 13:51:47 gespinasse Exp $ -# use strict; @@ -15,7 +13,7 @@ use strict; #use warnings; #use CGI::Carp 'fatalsToBrowser'; -require 'CONFIG_ROOT/general-functions.pl'; +require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; @@ -26,6 +24,7 @@ my %netsettings=(); my %ddnssettings=(); my $warnmessage = ''; my $refresh = ''; +my $ipaddr=''; &Header::showhttpheaders(); @@ -45,69 +44,139 @@ if ($connstate =~ /$Lang::tr{'dod waiting'}/ || -e "${General::swroot}/main/refr $refresh = ""; } +my $c; +my $maxprofiles = 5; +my @profilenames = (); + +for ($c = 1; $c <= $maxprofiles; $c++) +{ + my %temppppsettings = (); + $temppppsettings{'PROFILENAME'} = ''; + &General::readhash("${General::swroot}/ppp/settings-$c", \%temppppsettings); + $profilenames[$c] = $temppppsettings{'PROFILENAME'}; +} +my %selected; +for ($c = 1; $c <= $maxprofiles; $c++) { + $selected{'PROFILE'}{$c} = ''; +} +$selected{'PROFILE'}{$pppsettings{'PROFILE'}} = "selected='selected'"; +my $dialButtonDisabled = "disabled='disabled'"; + + &Header::openpage($Lang::tr{'main page'}, 1, $refresh); &Header::openbigbox('', 'center'); &Header::openbox('100%', 'center', &Header::cleanhtml(`/bin/uname -n`,"y")); -# hide buttons only when pppsettings mandatory used and not valid -if ( ( $pppsettings{'VALID'} eq 'yes' ) || - ( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ ) ) { - print < - -
- -
-    -
- -
-    -
- -
- -END - ; -} - -print ""; -if ( !( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ ) ) { - print "$Lang::tr{'current profile'} $pppsettings{'PROFILENAME'}
\n"; -} - -if ( ( $pppsettings{'VALID'} eq 'yes'&& $modemsettings{'VALID'} eq 'yes' ) || - ( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ )) { - print $connstate; - print "\n"; +if ( ( $pppsettings{'VALID'} eq 'yes'&& $modemsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ )) { if ($connstate =~ /$Lang::tr{'connected'}/) { - my $fetch_ip='nothing'; if ($ddnssettings{'BEHINDROUTER'} eq 'FETCH_IP') { if (open(IPADDR,"${General::swroot}/ddns/ipcache")) { - $fetch_ip = ; + $ipaddr = ; close IPADDR; - chomp ($fetch_ip); - my $host_name = (gethostbyaddr(pack("C4", split(/\./, $fetch_ip)), 2))[0]; - print "
$Lang::tr{'ip address'} (internet): $fetch_ip
$Lang::tr{'ipfires hostname'} (internet): $host_name
"; + chomp ($ipaddr); } } if (open(IPADDR,"${General::swroot}/red/local-ipaddress")) { my $ipaddr = ; close IPADDR; chomp ($ipaddr); - if ($ipaddr ne $fetch_ip){ #do not show info twice - my $host_name = (gethostbyaddr(pack("C4", split(/\./, $ipaddr)), 2))[0]; - print "
$Lang::tr{'ip address'}: $ipaddr
$Lang::tr{'ipfires hostname'}: $host_name
"; - } } } - } elsif ($modemsettings{'VALID'} eq 'no') { print "$Lang::tr{'modem settings have errors'}\n \n"; } else { print "$Lang::tr{'profile has errors'}\n \n"; } +if ( $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ ) { + $ipaddr = $netsettings{'RED_ADDRESS'}; +} + +print < + +
+ +
+ + + + + + - - - -
$Lang::tr{'network'} + IP + $Lang::tr{'status'} + +
$Lang::tr{'internet'}:
+ 		$ipaddr $connstate +
+
$Lang::tr{'profile'}: + +
+ 		+ + +
+ +
+
+ +
+
+END + } else { + print "$Lang::tr{'profile has errors'}\n \n"; + } + +print < +
+ $Lang::tr{'lan'}: + $netsettings{'GREEN_ADDRESS'} + +END + if (`ifconfig | grep $netsettings{'GREEN_DEV'}`) { print "Online"; } else { print "Offline"; } +print < +
$Lang::tr{'wireless'}:
+ 		$netsettings{'BLUE_ADDRESS'} + +END + if (`ifconfig | grep $netsettings{'BLUE_DEV'}`) { print "Online"; } else { print "Offline"; } +print <$Lang::tr{'dmz'}:
+ 		$netsettings{'ORANGE_ADDRESS'} + +END + if (`ifconfig | grep $netsettings{'ORANGE_DEV'}`) { print "Online"; } else { print "Offline"; } +print <$Lang::tr{'vpn'}:
+ 		N/A + +END + if (`ifconfig | grep ipsec0`) { print "Online"; } else { print "Offline"; } +print <OpenVPN:
+ 		N/A + +END + if (`ifconfig | grep tun0`) { print "Online"; } else { print "Offline"; } +print < +END # Memory usage warning my @free = `/usr/bin/free`; @@ -180,58 +249,6 @@ print "

\n"; &Header::closebox(); -&Header::openbox('100%', 'left', $Lang::tr{'quick control'}); -# read in the profile names into @profilenames. -my $c; -my $maxprofiles = 5; -my @profilenames = (); - -for ($c = 1; $c <= $maxprofiles; $c++) -{ - my %temppppsettings = (); - $temppppsettings{'PROFILENAME'} = ''; - &General::readhash("${General::swroot}/ppp/settings-$c", \%temppppsettings); - $profilenames[$c] = $temppppsettings{'PROFILENAME'}; -} -my %selected; -for ($c = 1; $c <= $maxprofiles; $c++) { - $selected{'PROFILE'}{$c} = ''; -} -$selected{'PROFILE'}{$pppsettings{'PROFILE'}} = "selected='selected'"; - -print < -
-
- $Lang::tr{'profile'}: - -
- 		-
- -
-
-END -&Header::closebox(); - &Header::closebigbox(); &Header::closepage(); diff --git a/lfs/openvpn b/lfs/openvpn index c0a00f70c..65747db4e 100644 --- a/lfs/openvpn +++ b/lfs/openvpn @@ -88,5 +88,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) chmod 660 /var/log/ovpnserver.log chmod 700 /var/ipfire/ovpn/certs chmod 700 /var/ipfire/ovpn/n2nconf + -cd $(DIR_APP) && find /var/ipfire/ovpn -name .svn -exec rm -rf {} \; @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/samba b/lfs/samba index e7b3d9d75..ff4fdb50f 100644 --- a/lfs/samba +++ b/lfs/samba @@ -106,19 +106,19 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # cd $(DIR_APP)/source && install -v -m644 ../docs/*.pdf /usr/share/doc/samba-3.0.22 # cd $(DIR_APP)/source && ln -v -s ../../samba/swat /usr/share/doc/samba-3.0.22 echo "swat 901/tcp" >> /etc/services - echo "# Begin /var/ipfire/xinetd.d/swat" >> /var/ipfire/xinetd.d/swat - echo "" >> /var/ipfire/xinetd.d/swat - echo "service swat" >> /var/ipfire/xinetd.d/swat - echo "{" >> /var/ipfire/xinetd.d/swat - echo " port = 901" >> /var/ipfire/xinetd.d/swat - echo " socket_type = stream" >> /var/ipfire/xinetd.d/swat - echo " wait = no" >> /var/ipfire/xinetd.d/swat - echo " only_from = 127.0.0.1" >> /var/ipfire/xinetd.d/swat - echo " user = root" >> /var/ipfire/xinetd.d/swat - echo " server = /usr/sbin/swat" >> /var/ipfire/xinetd.d/swat - echo " log_on_failure += USERID" >> /var/ipfire/xinetd.d/swat - echo "}" >> /var/ipfire/xinetd.d/swat - echo "" >> /var/ipfire/xinetd.d/swat - echo "# End /var/ipfire/xinetd.d/swat" >> /var/ipfire/xinetd.d/swat + echo "# Begin /var/ipfire/xinetd/xinetd.d/swat" >> /var/ipfire/xinetd/xinetd.d/swat + echo "" >> /var/ipfire/xinetd/xinetd.d/swat + echo "service swat" >> /var/ipfire/xinetd/xinetd.d/swat + echo "{" >> /var/ipfire/xinetd/xinetd.d/swat + echo " port = 901" >> /var/ipfire/xinetd/xinetd.d/swat + echo " socket_type = stream" >> /var/ipfire/xinetd/xinetd.d/swat + echo " wait = no" >> /var/ipfire/xinetd/xinetd.d/swat + echo " only_from = 127.0.0.1" >> /var/ipfire/xinetd/xinetd.d/swat + echo " user = root" >> /var/ipfire/xinetd/xinetd.d/swat + echo " server = /usr/sbin/swat" >> /var/ipfire/xinetd/xinetd.d/swat + echo " log_on_failure += USERID" >> /var/ipfire/xinetd/xinetd.d/swat + echo "}" >> /var/ipfire/xinetd/xinetd.d/swat + echo "" >> /var/ipfire/xinetd/xinetd.d/swat + echo "# End /var/ipfire/xinetd/xinetd.d/swat" >> /var/ipfire/xinetd/xinetd.d/swat @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/squid b/lfs/squid index b933de272..cbae8e039 100644 --- a/lfs/squid +++ b/lfs/squid @@ -18,12 +18,6 @@ # Makefiles are based on LFSMake, which is # # Copyright (C) 2002 Rod Roard # # # -# Modifications by: # -# ??-12-2003 Mark Wormgoor < mark@wormgoor.com> # -# - Modified Makefile for IPCop build # -# # -# $Id: squid,v 1.4.2.21 2005/10/24 22:19:58 gespinasse Exp $ -# # ############################################################################### ############################################################################### @@ -32,11 +26,11 @@ include Config -VER = 2.5.STABLE13 +VER = 2.5.STABLE14 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = http://www.squid-cache.org/Versions/v2/2.5 +DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -48,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 3e64468e123be1246d17486dab6bee87 +$(DL_FILE)_MD5 = f413e0b887a5f9b2a75350243ed5564c install : $(TARGET) diff --git a/lfs/xinetd b/lfs/xinetd index 6eaffeb9d..4e381d680 100644 --- a/lfs/xinetd +++ b/lfs/xinetd @@ -78,21 +78,21 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ./configure --prefix=/usr --with-loadavg --sysconfdir=/var/ipfire/xinetd cd $(DIR_APP) && make cd $(DIR_APP) && make install - cd $(DIR_APP) && install -v -d -m755 /var/ipfire/xinetd.d - echo "# Begin /var/ipfire/xinetd" > /var/ipfire/xinetd.conf - echo "# Configuration file for xinetd" >> /var/ipfire/xinetd.conf - echo "#" >> /var/ipfire/xinetd.conf - echo "defaults" >> /var/ipfire/xinetd.conf - echo "{" >> /var/ipfire/xinetd.conf - echo " instances = 60" >> /var/ipfire/xinetd.conf - echo " log_type = SYSLOG daemon" >> /var/ipfire/xinetd.conf - echo " log_on_success = HOST PID USERID" >> /var/ipfire/xinetd.conf - echo " log_on_failure = HOST USERID" >> /var/ipfire/xinetd.conf - echo " cps = 25 30" >> /var/ipfire/xinetd.conf - echo "}" >> /var/ipfire/xinetd.conf - echo "# All service files are stored in the /var/ipfire/xinetd.d directory" >> /var/ipfire/xinetd.conf - echo "#" >> /var/ipfire/xinetd.conf - echo "includedir /var/ipfire/xinetd.d" >> /var/ipfire/xinetd.conf - echo "# End /var/ipfire/xinetd" >> /var/ipfire/xinetd.conf + cd $(DIR_APP) && install -v -d -m755 /var/ipfire/xinetd/xinetd.d + echo "# Begin /var/ipfire/xinetd/xinetd.conf" > /var/ipfire/xinetd/xinetd.conf + echo "# Configuration file for xinetd" >> /var/ipfire/xinetd/xinetd.conf + echo "#" >> /var/ipfire/xinetd/xinetd.conf + echo "defaults" >> /var/ipfire/xinetd/xinetd.conf + echo "{" >> /var/ipfire/xinetd/xinetd.conf + echo " instances = 60" >> /var/ipfire/xinetd/xinetd.conf + echo " log_type = SYSLOG daemon" >> /var/ipfire/xinetd/xinetd.conf + echo " log_on_success = HOST PID USERID" >> /var/ipfire/xinetd/xinetd.conf + echo " log_on_failure = HOST USERID" >> /var/ipfire/xinetd/xinetd.conf + echo " cps = 25 30" >> /var/ipfire/xinetd/xinetd.conf + echo "}" >> /var/ipfire/xinetd/xinetd.conf + echo "# All service files are stored in the /var/ipfire/xinetd/xinetd.d directory" >> /var/ipfire/xinetd/xinetd.conf + echo "#" >> /var/ipfire/xinetd/xinetd.conf + echo "includedir /var/ipfire/xinetd/xinetd.d" >> /var/ipfire/xinetd/xinetd.conf + echo "# End /var/ipfire/xinetd/xinetd.conf" >> /var/ipfire/xinetd/xinetd.conf @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/pakfire/lib/get_mirror.sh b/src/pakfire/lib/get_mirror.sh index 5ccf8260e..2a9e9054c 100644 --- a/src/pakfire/lib/get_mirror.sh +++ b/src/pakfire/lib/get_mirror.sh @@ -1,37 +1,25 @@ -#!/bin/bash - ############################################################################################ # Version 0.1a, Copyright (C) 2006 by IPFire.org # # IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen. # ############################################################################################ -# Haupt-URL -http=$(get_conf.sh H_MIRROR) - -# Ziel-Verzeichnis -dest=$(get_conf.sh HOME) - -# URL-Zerleger -URL_ZERL=$(get_conf.sh URL_ZERL) - -# Host-Tester -HOST_TEST=$(get_conf.sh HOST_TEST) +get_mirror() { # Testen ob Server erreichbar ist -if ! $HOST_TEST $($URL_ZERL $http get_host) >/dev/null 2>&1 +if ! $HOST_TEST $($URL_ZERL $H_MIRROR get_host) >/dev/null 2>&1 then exit 1 fi # Ins Verzeichnis wechseln -cd $dest +cd $HOME # Überprüfen ob File schon vorhanden ist -if [ -e ${dest}$($URL_ZERL $http get_file) ] - then rm ${dest}$($URL_ZERL $http get_file) +if [ -e $HOME/$($URL_ZERL $H_MIRROR get_file) ] + then rm $HOME/$($URL_ZERL $H_MIRROR get_file) fi # File herunterladen -if /usr/bin/wget -q $http >/dev/null 2>&1 +if /usr/bin/wget -q $H_MIRROR >/dev/null 2>&1 then cd - exit 0 @@ -40,4 +28,5 @@ if /usr/bin/wget -q $http >/dev/null 2>&1 exit 1 fi +} ################################### EOF #################################################### diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire index 7ccc83503..b1c40a916 100644 --- a/src/pakfire/pakfire +++ b/src/pakfire/pakfire @@ -4,11 +4,13 @@ # IPFire ist freie Software, die Sie unter bestimmten Bedingungen weitergeben dürfen. # ############################################################################################ -case "$1" in +. /etc/pakfire.conf +. $HOME/lib/get_mirror.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 +case "$1" in + update) get_mirror + get_list + check_pak ;; *) 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 e00c2322f..d1036368f 100644 --- a/src/pakfire/pakfire.conf +++ b/src/pakfire/pakfire.conf @@ -4,7 +4,7 @@ ############################################################################################ # Home Verzeichnis von Pakman -HOME=/opt/pakfire/ +HOME=/opt/pakfire # Verionsfile von IPFire VERS=/etc/ipfire_vers