From: ms Date: Fri, 19 Oct 2007 15:21:00 +0000 (+0000) Subject: Alte Stylesheets entfernt. Wir haben ja Themes. X-Git-Tag: v2.3-beta1~306 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=c6fbd6eadf29d4633e10e9a1a1f3ab81282fd6e4 Alte Stylesheets entfernt. Wir haben ja Themes. Ne Menge Pakete geloescht, da wir nicht den Eindruck hatten, dass diese benutzt werden. Initscripts fuer Amavisd-new und Spamassassin gebaut. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@978 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- diff --git a/config/cfgroot/cacert.asc b/config/cfgroot/cacert.asc deleted file mode 100644 index 120f516eb2..0000000000 --- a/config/cfgroot/cacert.asc +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.2 (GNU/Linux) - -mQGiBD8OdRwRBACEr0/NPA88qp8f6KyIMMveLQ1FOuLi0aDQDPybG7u1nrBoi3VI -tSRyfYcdExVxWQjTGd9qbShzXBw2DsxjA6YjiGzWKpVcqtj9uUDpSlylBaoadUzu -Sf3r3IkOHR2QJeC+9v2il30xy5XLMxDRbQYaSmf4uwTlIOUWNn118KpdawCgoNny -p4DR9EvRgCmY5z6IKHA2WscD/AhAKDVHCIAoZHzSB/puNOuVUSKRbIWNAqUAYosz -GRzYWb8O/3Ja4fNb3IMQ1gIsEcnUJFHnzID3pTjqWyiCId/NSX3fLuQxZHZE9n8P -PqlZIvqMrOfCT0RJQa0zTFcrgepnmnHLj7qmtXQZm+YkTvlihOZNtVA4JNzrxDrQ -egkqA/4hr0LezNJfkUhWnbW604p7AmmKK7Hi/ZixAfnxN0adgnV7oC3Q4VM8aB2i -gReSuifluHiaJmf/WsA3KH4bdyLRbagz6dOPkXY8bQKy9yRxQz9oYwudlluYoZXe -gSQI2Jle9U2ENefa9ouvVlsB0he1qzF6VzHXAXpLsANt5smDh7Q0Q0EgQ2VydCBT -aWduaW5nIEF1dGhvcml0eSAoUm9vdCBDQSkgPGdwZ0BjYWNlcnQub3JnPohfBBMR -AgAfBQI/DnUcBQk4ZAkABAsHAwIDFQIDAxYCAQIeAQIXgAAKCRDSuw0BZdD9WEFX -AJ9C6WBcYfTYw1uvZ+N85TPGG5PMKQCcCM1tyULC5J6pfwevywS6cEwfagW5Ag0E -Pw51MBAIANUbl1u0j+mnVJk1fKbJ+Ul6SAYpNtordfgrgrmlnOhMCFcROrCzsaaI -1ehohxMbTnIj0RP0g/KotahAurqB98qzHIxXZMEJSzBE2OCNvlIXqUyT1jwhAUN6 -e71s084Lml84gD4cIr7+2YtwIu+6zrE+YdjfMT1NibM3vmiXaknrk4aADb02ZS5U -iDeRstUO5PG7qVg4umR0HZJ1Ck2U7Kdjaekzzlm0q/vYMZKTYX37NkZRUU0QFLsM -tACEaZnwKf9hMAWJwG1OFyJeLVH8xvzCkI4I+fpAvAQj6LVAh41SHl7EivH6SiTp -/+61idoz/CGqeLBxuex6Z+Y53U54FmcAAwUH/2chzBs1YWFX5LuLGEW3R3UW/wDb -RnYpsSR+pnMBVh18WS0nF08R/SXtb12RsqN5H+GtELOZng6IWL5hhgNaYvF1F4sW -Ezm2nyVmTsu7/DtHLmXtzz1oNLQ9pzJkoqP2pGtPYQKvmiuoNbt+l1prwjt5zn1D -slLn8w0+9/PP1YdKpuZ/189yQP6iYsLHxBxg/50MbSzoFwiT22aJCdF+OJ7zRwDy -GhjnfV7HVwdEDV5rvb7aRolRmZZF2UADSPu52BWT4PI0nVnewAgivyELqVU3Zc3P -aWqmH5BAh22MjbsbXrWZXK/WOfZCNlPVdfHxwFGxnlwsHgmyrkPAs3szJGiITAQY -EQIADAUCPw51MAUJOGQJAAAKCRDSuw0BZdD9WMw8AJwIVUzB2WQJGAbf/aXzCABn -QWdKwACdEWUSf69RZiJgp4oMfXMx0fDEh2I= -=OaPO ------END PGP PUBLIC KEY BLOCK----- diff --git a/config/cfgroot/ipfire.gpg b/config/cfgroot/ipfire.gpg deleted file mode 100644 index a108217712..0000000000 --- a/config/cfgroot/ipfire.gpg +++ /dev/null @@ -1,32 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.6 (GNU/Linux) - -mQGiBEYssZ8RBACcbHcYW+gPbjPFxv4ImlK1FgXV3s65Nnu7V9kghB7AZXterMVM -rZ87sNEw6J3JT32k0e9iBukA1QrshPg3c/mL+2/lMvvxsUW19rj/8ZBCCnP1Svgq -9q0OSJfadbm9b6Ndj06D/3EM+VpY5aI7XgNenh7ZcDbY9m8YDPdu0OF9uwCgltJS -+Pzjr16bJ/VnI549LfIG2KkEAJZWQmLQSXbl4VVEOSyaaJN8ugGBnZtnaL6IBE9K -0FHoZU3GaEOP6L3IUHUzyWsrpC/G44hGPC3xIbr5VG3sJ6hUc3J2rjx1clFdyN6A -bte9EWk1HkRFdaMfDn86vhIjn7znHU4cbvQLIpgB12+y2P/ydqLwyuyf6rV1JEWk -pSXpA/91LnlvICvqompSmrpLKpb+DSe59tr/r5GI36VNnqWt32InmF0N2ceLwG1F -K62M4Tf5/OZOg5m3uoTTHWf355+7NJjyPzT+DYbsuK56TNd/cFPeVdisdteeuINj -3DIC/8H9Y7mvYMAoSNtdA74JrdzGiqH2zSTB/oa/nwDXFekrq7Q2TWljaGFlbCBU -cmVtZXIgKFBha2ZpcmUgU2lnbmluZyBLZXkpIDxwYWtzQGlwZmlyZS5vcmc+iFoE -ExECABoFAkYssZ8CGwMCCwIDFQIDAxYCAQIeAQIXgAAKCRBL3jZMZNlmF0pBAJ95 -S5xzasjMQLpvOWA9E4JG3YJasQCfbNpdZXbZHr7Io7hLR9iJ+OhybfuIawQQEQIA -KwUCRi3ByAWDAeKFAB4aaHR0cDovL3d3dy5jYWNlcnQub3JnL2Nwcy5waHAACgkQ -0rsNAWXQ/VjJhQCfUQh+9wPAlyQVb9gYZ5zgHfqDY1MAn2T/VXH2+acwC4O3oV1W -Ni36NNRpuQINBEYsuJoQCAC6wq4ZMtWRGF/GeTd9l7boo40ulBth8Wr+IBK38XYv -5s+WLiTuuTCM8Thq4eY3MOfO+VXhjQen1S2e8WiZq+c55pDDAKXvBFmVNKcgkK7C -1AW85kY86aspoAK3/vi2pghlXAysTKSoW+WfoCbASDheEJopOkIMehdroraI2zTM -y8AEk+TnbRPzoFNBEYwr3J1GlkegtU3mIPpALDfpL4+HoCgS+7SfAvIlG//C+4W/ -oI/VOYHDdM5zR1av/pVZGpUK4Ao/JBxXMaqsbiP43KytbNuMRsZ+sFDs/ZtmHf1z -6AQ8mnxU0klT4ppU8Nl3hSVcvRacm6wBTvvGEqjkApkPAAMFCACKWJVpzcVAdOMP -aB08qJ+GPSSgxspaSoFPjVN307Pr1Di/ZriC/UVNrq/eUHEIvC1zIx+t3O109qVH -RMWbfCj+4/OBHJ4Ik3Nc5/8v6zaGwixJrkjohF8QLwodqazrjc+W3VsQ5jwfPpLe -DFpd3xHhj5zhXQKN0tCCk435Q/58aMQCK75St3/ymP6NGaE2s7dsXU/BwndgfxJu -Yz8LEK6phJ2t0jBiJJgcjWkoBkq8MhI6wKW6uDU4B/KKGHHLuZHg1ZKum8ASMcti -S980DlSJyfLJnUIio5F/u/csug8bHKq5pA1x+wmsUBhuH66aosNJuz35Bl4nW365 -PoahYtQBiEkEGBECAAkFAkYsuJoCGwwACgkQS942TGTZZhePvwCghewEOgtP7jz8 -d/lFWgeBt75eaM8An1+5yuYvSH+0ITVYC02VN0lbYjVy -=Oda/ ------END PGP PUBLIC KEY BLOCK----- diff --git a/config/rootfiles/packages/amavisd b/config/rootfiles/packages/amavisd index abe6f569c5..1ce76479b2 100644 --- a/config/rootfiles/packages/amavisd +++ b/config/rootfiles/packages/amavisd @@ -1,4 +1,5 @@ etc/amavisd.conf -usr/local/bin/amavisd +etc/init.d/amavisd +usr/bin/amavisd var/amavis var/virusmails diff --git a/config/rootfiles/packages/cftp b/config/rootfiles/packages/cftp deleted file mode 100644 index f57b6e1cf7..0000000000 --- a/config/rootfiles/packages/cftp +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin/cftp -#usr/info/cftp.info diff --git a/config/rootfiles/packages/ethereal b/config/rootfiles/packages/ethereal deleted file mode 100644 index ccb3bbc333..0000000000 --- a/config/rootfiles/packages/ethereal +++ /dev/null @@ -1,182 +0,0 @@ -usr/bin/capinfos -usr/bin/dftest -usr/bin/dumpcap -usr/bin/editcap -usr/bin/idl2eth -usr/bin/mergecap -usr/bin/randpkt -usr/bin/tethereal -usr/bin/text2pcap -#usr/lib/ethereal -#usr/lib/ethereal/plugins -#usr/lib/ethereal/plugins/0.99.0 -#usr/lib/ethereal/plugins/0.99.0/acn.la -usr/lib/ethereal/plugins/0.99.0/acn.so -#usr/lib/ethereal/plugins/0.99.0/agentx.la -usr/lib/ethereal/plugins/0.99.0/agentx.so -#usr/lib/ethereal/plugins/0.99.0/artnet.la -usr/lib/ethereal/plugins/0.99.0/artnet.so -#usr/lib/ethereal/plugins/0.99.0/asn1.la -usr/lib/ethereal/plugins/0.99.0/asn1.so -#usr/lib/ethereal/plugins/0.99.0/ciscosm.la -usr/lib/ethereal/plugins/0.99.0/ciscosm.so -#usr/lib/ethereal/plugins/0.99.0/coseventcomm.la -usr/lib/ethereal/plugins/0.99.0/coseventcomm.so -#usr/lib/ethereal/plugins/0.99.0/cosnaming.la -usr/lib/ethereal/plugins/0.99.0/cosnaming.so -#usr/lib/ethereal/plugins/0.99.0/docsis.la -usr/lib/ethereal/plugins/0.99.0/docsis.so -#usr/lib/ethereal/plugins/0.99.0/enttec.la -usr/lib/ethereal/plugins/0.99.0/enttec.so -#usr/lib/ethereal/plugins/0.99.0/gryphon.la -usr/lib/ethereal/plugins/0.99.0/gryphon.so -#usr/lib/ethereal/plugins/0.99.0/h223.la -usr/lib/ethereal/plugins/0.99.0/h223.so -#usr/lib/ethereal/plugins/0.99.0/irda.la -usr/lib/ethereal/plugins/0.99.0/irda.so -#usr/lib/ethereal/plugins/0.99.0/lwres.la -usr/lib/ethereal/plugins/0.99.0/lwres.so -#usr/lib/ethereal/plugins/0.99.0/mate.la -usr/lib/ethereal/plugins/0.99.0/mate.so -#usr/lib/ethereal/plugins/0.99.0/megaco.la -usr/lib/ethereal/plugins/0.99.0/megaco.so -#usr/lib/ethereal/plugins/0.99.0/mgcp.la -usr/lib/ethereal/plugins/0.99.0/mgcp.so -#usr/lib/ethereal/plugins/0.99.0/opsi.la -usr/lib/ethereal/plugins/0.99.0/opsi.so -#usr/lib/ethereal/plugins/0.99.0/parlay.la -usr/lib/ethereal/plugins/0.99.0/parlay.so -#usr/lib/ethereal/plugins/0.99.0/pcli.la -usr/lib/ethereal/plugins/0.99.0/pcli.so -#usr/lib/ethereal/plugins/0.99.0/profinet.la -usr/lib/ethereal/plugins/0.99.0/profinet.so -#usr/lib/ethereal/plugins/0.99.0/rdm.la -usr/lib/ethereal/plugins/0.99.0/rdm.so -#usr/lib/ethereal/plugins/0.99.0/rlm.la -usr/lib/ethereal/plugins/0.99.0/rlm.so -#usr/lib/ethereal/plugins/0.99.0/rtnet.la -usr/lib/ethereal/plugins/0.99.0/rtnet.so -#usr/lib/ethereal/plugins/0.99.0/rudp.la -usr/lib/ethereal/plugins/0.99.0/rudp.so -#usr/lib/ethereal/plugins/0.99.0/stats_tree.la -usr/lib/ethereal/plugins/0.99.0/stats_tree.so -#usr/lib/ethereal/plugins/0.99.0/tango.la -usr/lib/ethereal/plugins/0.99.0/tango.so -#usr/lib/ethereal/plugins/0.99.0/v5ua.la -usr/lib/ethereal/plugins/0.99.0/v5ua.so -#usr/lib/libethereal.la -usr/lib/libethereal.so -usr/lib/libethereal.so.0 -usr/lib/libethereal.so.0.0.1 -#usr/lib/libwiretap.la -usr/lib/libwiretap.so -usr/lib/libwiretap.so.0 -usr/lib/libwiretap.so.0.0.1 -#usr/man/man1/capinfos.1 -#usr/man/man1/dumpcap.1 -#usr/man/man1/editcap.1 -#usr/man/man1/idl2eth.1 -#usr/man/man1/mergecap.1 -#usr/man/man1/tethereal.1 -#usr/man/man1/text2pcap.1 -#usr/man/man4/ethereal-filter.4 -#usr/share/ethereal -#usr/share/ethereal/AUTHORS-SHORT -usr/share/ethereal/capinfos.html -usr/share/ethereal/cfilters -usr/share/ethereal/colorfilters -usr/share/ethereal/dfilters -#usr/share/ethereal/diameter -usr/share/ethereal/diameter/TGPPSh.xml -usr/share/ethereal/diameter/chargecontrol.xml -usr/share/ethereal/diameter/dictionary.dtd -usr/share/ethereal/diameter/dictionary.xml -usr/share/ethereal/diameter/imscxdx.xml -usr/share/ethereal/diameter/mobileipv4.xml -usr/share/ethereal/diameter/nasreq.xml -usr/share/ethereal/diameter/sunping.xml -#usr/share/ethereal/dtds -usr/share/ethereal/dtds/dc.dtd -usr/share/ethereal/dtds/itunes.dtd -usr/share/ethereal/dtds/rss.dtd -usr/share/ethereal/dtds/smil.dtd -usr/share/ethereal/dumpcap.html -usr/share/ethereal/editcap.html -usr/share/ethereal/ethereal-filter.html -usr/share/ethereal/ethereal.html -#usr/share/ethereal/help -usr/share/ethereal/help/capture_filters.txt -usr/share/ethereal/help/capturing.txt -usr/share/ethereal/help/display_filters.txt -usr/share/ethereal/help/faq.txt -usr/share/ethereal/help/getting_started.txt -usr/share/ethereal/help/overview.txt -usr/share/ethereal/help/toc -usr/share/ethereal/idl2eth.html -usr/share/ethereal/manuf -usr/share/ethereal/mergecap.html -#usr/share/ethereal/radius -usr/share/ethereal/radius/dictionary -usr/share/ethereal/radius/dictionary.3com -usr/share/ethereal/radius/dictionary.3gpp -usr/share/ethereal/radius/dictionary.3gpp2 -usr/share/ethereal/radius/dictionary.acc -usr/share/ethereal/radius/dictionary.alcatel -usr/share/ethereal/radius/dictionary.alteon -usr/share/ethereal/radius/dictionary.altiga -usr/share/ethereal/radius/dictionary.aptis -usr/share/ethereal/radius/dictionary.ascend -usr/share/ethereal/radius/dictionary.bay -usr/share/ethereal/radius/dictionary.bintec -usr/share/ethereal/radius/dictionary.bristol -usr/share/ethereal/radius/dictionary.cablelabs -usr/share/ethereal/radius/dictionary.cabletron -usr/share/ethereal/radius/dictionary.cisco -usr/share/ethereal/radius/dictionary.cisco.bbsm -usr/share/ethereal/radius/dictionary.cisco.vpn3000 -usr/share/ethereal/radius/dictionary.cisco.vpn5000 -usr/share/ethereal/radius/dictionary.colubris -usr/share/ethereal/radius/dictionary.columbia_university -usr/share/ethereal/radius/dictionary.compat -usr/share/ethereal/radius/dictionary.cosine -usr/share/ethereal/radius/dictionary.ericsson -usr/share/ethereal/radius/dictionary.erx -usr/share/ethereal/radius/dictionary.extreme -usr/share/ethereal/radius/dictionary.foundry -usr/share/ethereal/radius/dictionary.freeradius -usr/share/ethereal/radius/dictionary.gandalf -usr/share/ethereal/radius/dictionary.garderos -usr/share/ethereal/radius/dictionary.gemtek -usr/share/ethereal/radius/dictionary.itk -usr/share/ethereal/radius/dictionary.juniper -usr/share/ethereal/radius/dictionary.karlnet -usr/share/ethereal/radius/dictionary.livingston -usr/share/ethereal/radius/dictionary.localweb -usr/share/ethereal/radius/dictionary.merit -usr/share/ethereal/radius/dictionary.microsoft -usr/share/ethereal/radius/dictionary.mikrotik -usr/share/ethereal/radius/dictionary.navini -usr/share/ethereal/radius/dictionary.netscreen -usr/share/ethereal/radius/dictionary.nokia -usr/share/ethereal/radius/dictionary.nomadix -usr/share/ethereal/radius/dictionary.propel -usr/share/ethereal/radius/dictionary.quintum -usr/share/ethereal/radius/dictionary.redback -usr/share/ethereal/radius/dictionary.redcreek -usr/share/ethereal/radius/dictionary.shasta -usr/share/ethereal/radius/dictionary.shiva -usr/share/ethereal/radius/dictionary.sonicwall -usr/share/ethereal/radius/dictionary.springtide -usr/share/ethereal/radius/dictionary.t_systems_nova -usr/share/ethereal/radius/dictionary.telebit -usr/share/ethereal/radius/dictionary.trapeze -usr/share/ethereal/radius/dictionary.tunnel -usr/share/ethereal/radius/dictionary.unisphere -usr/share/ethereal/radius/dictionary.unix -usr/share/ethereal/radius/dictionary.usr -usr/share/ethereal/radius/dictionary.valemount -usr/share/ethereal/radius/dictionary.versanet -usr/share/ethereal/radius/dictionary.wispr -usr/share/ethereal/radius/dictionary.xedia -#usr/share/ethereal/tethereal.html -#usr/share/ethereal/text2pcap.html diff --git a/config/rootfiles/packages/iftop b/config/rootfiles/packages/iftop deleted file mode 100644 index 03b1118446..0000000000 --- a/config/rootfiles/packages/iftop +++ /dev/null @@ -1,2 +0,0 @@ -#usr/man/man8/iftop.8 -usr/sbin/iftop diff --git a/config/rootfiles/packages/mailx b/config/rootfiles/packages/mailx deleted file mode 100644 index 76f2b17d9b..0000000000 --- a/config/rootfiles/packages/mailx +++ /dev/null @@ -1,5 +0,0 @@ -etc/nail.rc -usr/bin/mail -usr/bin/mailx -usr/bin/nail -#usr/share/man/man1/mailx.1 diff --git a/config/rootfiles/packages/spamassassin b/config/rootfiles/packages/spamassassin index 6ad0fb39f5..a4f951d366 100644 --- a/config/rootfiles/packages/spamassassin +++ b/config/rootfiles/packages/spamassassin @@ -1,3 +1,4 @@ +etc/init.d/spamassassin etc/mail #etc/mail/spamassassin #etc/mail/spamassassin/init.pre diff --git a/config/rootfiles/packages/stund b/config/rootfiles/packages/stund deleted file mode 100644 index d86a2b828a..0000000000 --- a/config/rootfiles/packages/stund +++ /dev/null @@ -1 +0,0 @@ -usr/bin/stund diff --git a/config/rootfiles/packages/tftp-hpa b/config/rootfiles/packages/tftp-hpa deleted file mode 100644 index 571af64b42..0000000000 --- a/config/rootfiles/packages/tftp-hpa +++ /dev/null @@ -1,5 +0,0 @@ -#usr/man/man1/tftp.1 -#usr/man/man8/in.tftpd.8 -#usr/man/man8/tftpd.8 -usr/sbin/in.tftpd -var/log/tftpboot diff --git a/html/html/include/content.css b/html/html/include/content.css deleted file mode 100644 index cc3c43b075..0000000000 --- a/html/html/include/content.css +++ /dev/null @@ -1,48 +0,0 @@ -table.list { - width: 100%; - margin: 0; - margin-top: 5px; - border: 1px solid #ccc; - padding: 10px; -} - -table tr.header { - background-image: url(../images/table-header.gif); - background-repeat: no-repeat; - background-color: #e6e6e6; -} - -table.list tr.header td { - font-size: 10px; - padding: 4px; - margin: 0; - font-weight: bold; - border-bottom: 1px solid #ccc; -} - -table.list tr.odd { - background: #fff; - padding: 0; - margin: 0; -} - -table.list tr.even { - background: #eeeced; - padding: 4px; - margin: 0; -} - -table.list tr td { - padding: 4px; - margin: 0; -} - -#page-content a { - text-decoration: underling; - color: #3F5368; -} - -#page-content a:hover { - text-decoration: underline; - color: #000000; -} diff --git a/html/html/include/menu.css b/html/html/include/menu.css deleted file mode 100644 index 87f5d55443..0000000000 --- a/html/html/include/menu.css +++ /dev/null @@ -1,192 +0,0 @@ -#menu-top { - margin-left: 205px; - font-family: verdana, arial, sans-serif; - font-size: xx-small; - /* false value for WinIE4/5 */ - voice-family: "\"}\""; - /* trick WinIE4/5 into thinking rule is over */ - voice-family: inherit; - /* recover from trick */ - /* intended value for better browsers */ - font-weight: bold; - padding: 0; -} - -#menu-top ul { - list-style: none; - padding: 0; - margin: 0; -/* background-color: #000;*/ -} - -#menu-top ul li { - float: left; - background-image: url(../images/menu_top_left.gif); - background-position: top left; - background-repeat: no-repeat; - height: 22px; - padding: 0; - margin: 0; - margin-right: 7px; -} - -#menu-top ul li a { - color: #fff; - text-decoration: none; - line-height: 22px; - padding-left: 7px; - padding-right: 7px; - display: run-in; -} - -#menu-top ul li div.rcorner { - float: left; - background-image: url(../images/menu_top_right.gif); - background-position: top right; - background-repeat: no-repeat; - padding-left: 7px; - padding-right: 7px; -} - -#menu-top ul li.selected div.rcorner { - float: left; - background-image: url(../images/menu_top_right_selected.gif); - background-position: top right; - background-repeat: no-repeat; - padding-left: 7px; - padding-right: 7px; -} - - -#menu-top ul li.selected { - background-image: url(../images/menu_top_left_selected.gif); -} - - -#menu-left { /* for ie55 */ - width: 160px; - background-color: #f2f2f2; - background-image: url(../images/menu_left_top.gif); - background-position: top right; - background-repeat: no-repeat; - font-family: verdana, arial, sans-serif; - font-size: xx-small; - /* false value for WinIE4/5 */ - voice-family: "\"}\""; - /* trick WinIE4/5 into thinking rule is over */ - voice-family: inherit; - /* recover from trick */ - - /* intended value for better browsers */ - font-weight: bold; - padding: 0; - margin-left: 15px; -} - -#menu-left ul -{ - background-image: url(../images/menu_left_bottom.gif); - background-position: bottom left; - background-repeat: no-repeat; - list-style: none; - padding: 7px 0 7px 0; - margin: 0; -/* background-color: #000;*/ -} - - -#menu-left ul ul { - background: none; - /* background-color: #c1c1c1; */ - background-color: #ccc; - margin: 0; - padding: 0; - border-top: 1px solid #ccc; -} - -#menu-left ul li { - margin: 0; - border-bottom: 1px solid #ccc; - border-left: 1px solid #ccc; - border-right: 1px solid #ccc; - padding-left: 15px; -} - -#menu-left ul li:last-child { - border-bottom: 1px solid #f2f2f2; -} - -#menu-left ul li.selected { - background-position: top left; - background: url(../images/menu_left_selected.gif); - background-color: #3F5368; - border-top: 1px solid #222; - border-bottom: 1px solid #222; - border-left: 1px solid #222; - border-right: 1px solid #222; -} - -#menu-left ul li.selected span { - display: none; -} - -#menu-left ul li a { - width: 100%; - color: #555; - text-decoration: none; - padding: 3px 5px 3px 0px; - line-height: 20px; - margin: 0; -} - -#menu-left ul li.selected a { - color: #fff; - text-decoration: none; - padding: 3px 5px 3px 0px; - margin: 0; -} - -#menu-left ul ul li.selected { - background: #6c6c6c; -} - -#menu-subtop ul { - background: none; - background-image: url(../images/heading-back.gif); - background-position: bottom left; - background-repeat: no-repeat; - list-style: none; - border-right: 1px solid #ccc; - padding-left: 30px; - font-size: 10px; - font-weight: bold; - color: #656565; - margin: 0; - margin-bottom: 15px; - line-height: 20px; - display: block; - width: inherit; - height: 20px; -} - -#menu-subtop ul li { - margin: 0; - float: left; - padding-right: 15px; -} - -#menu-subtop ul li a { - text-decoration: underline; - font-weight: normal; -} - -#menu-subtop ul li.selected { - float: left; - padding-right: 15px; -} - -#menu-subtop ul li.selected a { - text-decoration: none; - font-weight: bold; - color: #555555; -} \ No newline at end of file diff --git a/html/html/include/selectbox.js b/html/html/include/selectbox.js deleted file mode 100644 index d57ffdf040..0000000000 --- a/html/html/include/selectbox.js +++ /dev/null @@ -1,61 +0,0 @@ -// =================================================================== -// Author: Matt Kruse -// WWW: http://www.mattkruse.com/ -// -// NOTICE: You may use this code for any purpose, commercial or -// private, without any further permission from the author. You may -// remove this notice from your final code if you wish, however it is -// appreciated by the author if at least my web site address is kept. -// -// You may *NOT* re-distribute this code in any way except through its -// use. That means, you can include it in your product, or your web -// site, or any other form where the code is actually being used. You -// may not put the plain javascript up on your site for download or -// include it in your javascript libraries for download. -// If you wish to share this code with others, please just point them -// to the URL instead. -// Please DO NOT link directly to my .js files from your site. Copy -// the files to your server and use them there. Thank you. -// =================================================================== - -/* SOURCE FILE: selectbox.js */ -function hasOptions(obj){if(obj!=null && obj.options!=null){return true;}return false;} -function selectUnselectMatchingOptions(obj,regex,which,only){if(window.RegExp){if(which == "select"){var selected1=true;var selected2=false;}else if(which == "unselect"){var selected1=false;var selected2=true;}else{return;}var re = new RegExp(regex);if(!hasOptions(obj)){return;}for(var i=0;i(b.text+"")){return 1;}return 0;});for(var i=0;i3){var regex = arguments[3];if(regex != ""){unSelectMatchingOptions(from,regex);}}if(!hasOptions(from)){return;}for(var i=0;i=0;i--){var o = from.options[i];if(o.selected){from.options[i] = null;}}if((arguments.length<3) ||(arguments[2]==true)){sortSelect(from);sortSelect(to);}from.selectedIndex = -1;to.selectedIndex = -1;} -function copySelectedOptions(from,to){var options = new Object();if(hasOptions(to)){for(var i=0;i=0;i--){if(obj.options[i].selected){if(i !=(obj.options.length-1) && ! obj.options[i+1].selected){swapOptions(obj,i,i+1);obj.options[i+1].selected = true;}}}} -function removeSelectedOptions(from){if(!hasOptions(from)){return;}for(var i=(from.options.length-1);i>=0;i--){var o=from.options[i];if(o.selected){from.options[i] = null;}}from.selectedIndex = -1;} -function removeAllOptions(from){if(!hasOptions(from)){return;}for(var i=(from.options.length-1);i>=0;i--){from.options[i] = null;}from.selectedIndex = -1;} -function addOption(obj,text,value,selected){if(obj!=null && obj.options!=null){obj.options[obj.options.length] = new Option(text, value, false, selected);}} - - -/* SOURCE FILE: OptionTransfer.js */ - -function OT_transferLeft(){moveSelectedOptions(this.right,this.left,this.autoSort,this.staticOptionRegex);this.update();} -function OT_transferRight(){moveSelectedOptions(this.left,this.right,this.autoSort,this.staticOptionRegex);this.update();} -function OT_transferAllLeft(){moveAllOptions(this.right,this.left,this.autoSort,this.staticOptionRegex);this.update();} -function OT_transferAllRight(){moveAllOptions(this.left,this.right,this.autoSort,this.staticOptionRegex);this.update();} -function OT_saveRemovedLeftOptions(f){this.removedLeftField = f;} -function OT_saveRemovedRightOptions(f){this.removedRightField = f;} -function OT_saveAddedLeftOptions(f){this.addedLeftField = f;} -function OT_saveAddedRightOptions(f){this.addedRightField = f;} -function OT_saveNewLeftOptions(f){this.newLeftField = f;} -function OT_saveNewRightOptions(f){this.newRightField = f;} -function OT_update(){var removedLeft = new Object();var removedRight = new Object();var addedLeft = new Object();var addedRight = new Object();var newLeft = new Object();var newRight = new Object();for(var i=0;i0){str=str+delimiter;}str=str+val;}return str;} -function OT_setDelimiter(val){this.delimiter=val;} -function OT_setAutoSort(val){this.autoSort=val;} -function OT_setStaticOptionRegex(val){this.staticOptionRegex=val;} -function OT_init(theform){this.form = theform;if(!theform[this.left]){alert("OptionTransfer init(): Left select list does not exist in form!");return false;}if(!theform[this.right]){alert("OptionTransfer init(): Right select list does not exist in form!");return false;}this.left=theform[this.left];this.right=theform[this.right];for(var i=0;i. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.12 - -THISAPP = cftp-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = cftp -PAK_VER = 1 - -DEPS = "" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = e497c2cf060a6906f48ac99f55bedc8a - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - $(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr - cd $(DIR_APP) && make - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/ethereal b/lfs/ethereal deleted file mode 100644 index a8bcc82975..0000000000 --- a/lfs/ethereal +++ /dev/null @@ -1,84 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# 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 3 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, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.99.0 - -THISAPP = ethereal-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = ethereal -PAK_VER = 1 - -DEPS = "" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = f9905b9d347acdc05af664a7553f7f76 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(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 --sysconfdir=/etc --enable-threads - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/ffmpeg b/lfs/ffmpeg deleted file mode 100644 index 5d4ebea39b..0000000000 --- a/lfs/ffmpeg +++ /dev/null @@ -1,89 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# 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 3 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, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.4.9-pre1 - -THISAPP = ffmpeg-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = ffmpeg -PAK_VER = 1 - -DEPS = "libvorbis lame" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = ea5587e3c66d50b1503b82ac4179c303 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ffmpeg-0.4.9-pre1-gcc4-1.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ffmpeg-0.4.9-pre1-amr_fixes-1.patch - cd $(DIR_APP) && sed -i "s/static uint64/const uint64/" libavcodec/liba52/resample_mmx.c - cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared --enable-gpl \ - --enable-pp --enable-pthreads --disable-ffplay \ - --enable-xvid --disable-mmx - cd $(DIR_APP) && make - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/gnupg b/lfs/gnupg index a847eb30ae..c596a5fe44 100644 --- a/lfs/gnupg +++ b/lfs/gnupg @@ -75,7 +75,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install chmod -v 4755 /usr/bin/gpg - #gpg --import $(DIR_SRC)/config/cfgroot/ipfire.gpg - #gpg --import $(DIR_SRC)/config/cfgroot/cacert.asc @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/iftop b/lfs/iftop deleted file mode 100644 index 38d5fcba6d..0000000000 --- a/lfs/iftop +++ /dev/null @@ -1,84 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# 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 3 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, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.17 - -THISAPP = iftop-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = iftop -PAK_VER = 1 - -DEPS = "" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 5e1619b13f8a05af6b5eaf9e9123c35f - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr - cd $(DIR_APP) && make - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/mailx b/lfs/mailx deleted file mode 100644 index 8e2f468601..0000000000 --- a/lfs/mailx +++ /dev/null @@ -1,85 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# 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 3 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, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 12.0 - -THISAPP = mailx-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = mailx -PAK_VER = 1 - -DEPS = "" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 67e8236a73f8a2d85c45cf8a2bdf7af1 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - $(PAKS) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make SENDMAIL=/usr/sbin/sendmail - cd $(DIR_APP) && make PREFIX=/usr UCBINSTALL=/usr/bin/install install - cd $(DIR_APP) && ln -v -sf mailx /usr/bin/mail - cd $(DIR_APP) && ln -v -sf mailx /usr/bin/nail - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/stund b/lfs/stund deleted file mode 100644 index 8855911541..0000000000 --- a/lfs/stund +++ /dev/null @@ -1,83 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# 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 3 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, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.96_Aug13 - -THISAPP = stund_$(VER) -DL_FILE = $(THISAPP).tgz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/stund -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = stund -PAK_VER = 1 - -DEPS = "" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 3273abb1a6f299f4e611b658304faefa - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - $(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make all - cd $(DIR_APP) && cp server /usr/bin/stund - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/tftp-hpa b/lfs/tftp-hpa deleted file mode 100644 index fbf34d76d4..0000000000 --- a/lfs/tftp-hpa +++ /dev/null @@ -1,85 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# 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 3 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, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.42 - -THISAPP = tftp-hpa-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = tftp-hpa -PAK_VER = 1 - -DEPS = "" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 98ecf77f8558b4f562794f71e29fed86 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --without-tcpwrappers - cd $(DIR_APP) && make - cd $(DIR_APP) && make install - -mkdir /var/log/tftpboot - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index dbaa1fc2b0..6124ea77e1 100755 --- a/make.sh +++ b/make.sh @@ -475,7 +475,6 @@ buildipfire() { ipfiremake fetchmail ipfiremake cyrus-imapd ipfiremake openmailadmin - ipfiremake mailx ipfiremake clamav ipfiremake spamassassin ipfiremake amavisd @@ -496,10 +495,8 @@ buildipfire() { ipfiremake mpc ipfiremake xvid ipfiremake libmpeg2 - #ipfiremake ffmpeg ipfiremake videolan ipfiremake libpri - ipfiremake stund ipfiremake asterisk ipfiremake gnump3d ipfiremake libsigc++ @@ -515,12 +512,8 @@ buildipfire() { ipfiremake nfs ipfiremake nmap ipfiremake mbmon - ipfiremake iftop ipfiremake ncftp - ipfiremake cftp ipfiremake etherwake - ipfiremake ethereal - ipfiremake tftp-hpa ipfiremake bwm-ng ipfiremake tripwire ipfiremake sysstat diff --git a/src/initscripts/init.d/amavisd b/src/initscripts/init.d/amavisd new file mode 100644 index 0000000000..115ffe9737 --- /dev/null +++ b/src/initscripts/init.d/amavisd @@ -0,0 +1,45 @@ +#!/bin/sh +######################################################################## +# Begin $rc_base/init.d/amavisd +# +# Description : Amavisd Init Script +# +# Authors : Michael Tremer (ms@ipfire.org) +# +# Version : 01.00 +# +# Notes : +# +######################################################################## + +. /etc/sysconfig/rc +. ${rc_functions} + +case "${1}" in + start) + boot_mesg "Starting AMaViS Daemon..." + loadproc /usr/bin/amavisd + ;; + + stop) + boot_mesg "Stopping AMaViS Daemon..." + killproc /usr/bin/amavisd + ;; + + restart) + ${0} stop + sleep 1 + ${0} start + ;; + + status) + statusproc /usr/bin/amavisd + ;; + + *) + echo "Usage: ${0} {start|stop|restart|status}" + exit 1 + ;; +esac + +# End $rc_base/init.d/amavisd diff --git a/src/initscripts/init.d/spamassasssin b/src/initscripts/init.d/spamassasssin new file mode 100644 index 0000000000..73403a8ece --- /dev/null +++ b/src/initscripts/init.d/spamassasssin @@ -0,0 +1,45 @@ +#!/bin/sh +######################################################################## +# Begin $rc_base/init.d/spamassassin +# +# Description : Spamassassin Init Script +# +# Authors : Michael Tremer (ms@ipfire.org) +# +# Version : 01.00 +# +# Notes : +# +######################################################################## + +. /etc/sysconfig/rc +. ${rc_functions} + +case "${1}" in + start) + boot_mesg "Starting Spamassassin Daemon..." + loadproc -n 10 /usr/bin/spamd -d + ;; + + stop) + boot_mesg "Stopping Spamassassin Daemon..." + killproc /usr/bin/spamd + ;; + + restart) + ${0} stop + sleep 1 + ${0} start + ;; + + status) + statusproc /usr/bin/spamd + ;; + + *) + echo "Usage: ${0} {start|stop|restart|status}" + exit 1 + ;; +esac + +# End $rc_base/init.d/spamassassin diff --git a/src/install+setup/setup/domainname.c b/src/install+setup/setup/domainname.c index 7ecce87276..9aedd9b49d 100644 --- a/src/install+setup/setup/domainname.c +++ b/src/install+setup/setup/domainname.c @@ -1,72 +1,72 @@ -/* IPCop setup program. - * - * This program is distributed under the terms of the GNU General Public - * Licence. See the file COPYING for details. - * - * $Id: domainname.c - * - */ - -#include "setup.h" - -extern FILE *flog; -extern char *mylog; - -extern char **ctr; - -extern int automode; - -int handledomainname(void) -{ - char domainname[STRING_SIZE] = "localdomain"; - struct keyvalue *kv = initkeyvalues(); - char *values[] = { domainname, NULL }; /* pointers for the values. */ - struct newtWinEntry entries[] = - { { "", &values[0], 0,}, { NULL, NULL, 0 } }; - int rc; - int result; - - if (!(readkeyvalues(kv, CONFIG_ROOT "/main/settings"))) - { - freekeyvalues(kv); - errorbox(ctr[TR_UNABLE_TO_OPEN_SETTINGS_FILE]); - return 0; - } - - findkey(kv, "DOMAINNAME", domainname); - - for (;;) - { - rc = newtWinEntries(ctr[TR_DOMAINNAME], ctr[TR_ENTER_DOMAINNAME], - 50, 5, 5, 40, entries, ctr[TR_OK], ctr[TR_CANCEL], NULL); - - if (rc == 1) - { - strcpy(domainname, values[0]); - if (!(strlen(domainname))) - errorbox(ctr[TR_DOMAINNAME_CANNOT_BE_EMPTY]); - else if (strchr(domainname, ' ')) - errorbox(ctr[TR_DOMAINNAME_CANNOT_CONTAIN_SPACES]); - else if (strlen(domainname) != strspn(domainname, - "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-.")) - errorbox(ctr[TR_DOMAINNAME_NOT_VALID_CHARS]); - else - { - replacekeyvalue(kv, "DOMAINNAME", domainname); - writekeyvalues(kv, CONFIG_ROOT "/main/settings"); - writehostsfiles(); - result = 1; - break; - } - } - else - { - result = 0; - break; - } - } - free(values[0]); - freekeyvalues(kv); - - return result; -} +/* IPCop setup program. + * + * This program is distributed under the terms of the GNU General Public + * Licence. See the file COPYING for details. + * + * $Id: domainname.c + * + */ + +#include "setup.h" + +extern FILE *flog; +extern char *mylog; + +extern char **ctr; + +extern int automode; + +int handledomainname(void) +{ + char domainname[STRING_SIZE] = "localdomain"; + struct keyvalue *kv = initkeyvalues(); + char *values[] = { domainname, NULL }; /* pointers for the values. */ + struct newtWinEntry entries[] = + { { "", &values[0], 0,}, { NULL, NULL, 0 } }; + int rc; + int result; + + if (!(readkeyvalues(kv, CONFIG_ROOT "/main/settings"))) + { + freekeyvalues(kv); + errorbox(ctr[TR_UNABLE_TO_OPEN_SETTINGS_FILE]); + return 0; + } + + findkey(kv, "DOMAINNAME", domainname); + + for (;;) + { + rc = newtWinEntries(ctr[TR_DOMAINNAME], ctr[TR_ENTER_DOMAINNAME], + 50, 5, 5, 40, entries, ctr[TR_OK], ctr[TR_CANCEL], NULL); + + if (rc == 1) + { + strcpy(domainname, values[0]); + if (!(strlen(domainname))) + errorbox(ctr[TR_DOMAINNAME_CANNOT_BE_EMPTY]); + else if (strchr(domainname, ' ')) + errorbox(ctr[TR_DOMAINNAME_CANNOT_CONTAIN_SPACES]); + else if (strlen(domainname) != strspn(domainname, + "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-.")) + errorbox(ctr[TR_DOMAINNAME_NOT_VALID_CHARS]); + else + { + replacekeyvalue(kv, "DOMAINNAME", domainname); + writekeyvalues(kv, CONFIG_ROOT "/main/settings"); + writehostsfiles(); + result = 1; + break; + } + } + else + { + result = 0; + break; + } + } + free(values[0]); + freekeyvalues(kv); + + return result; +} diff --git a/src/install+setup/setup/hostname.c b/src/install+setup/setup/hostname.c index 97dc2dea13..0165257367 100644 --- a/src/install+setup/setup/hostname.c +++ b/src/install+setup/setup/hostname.c @@ -1,76 +1,76 @@ -/* SmoothWall setup program. - * - * This program is distributed under the terms of the GNU General Public - * Licence. See the file COPYING for details. - * - * (c) Lawrence Manning, 2001 - * Stuff for setting the hostname. - * - * $Id: hostname.c,v 1.6.2.1 2004/04/14 22:05:41 gespinasse Exp $ - * - */ - -#include "setup.h" - -extern FILE *flog; -extern char *mylog; - -extern char **ctr; - -extern int automode; - -int handlehostname(void) -{ - char hostname[STRING_SIZE] = ""; - struct keyvalue *kv = initkeyvalues(); - char *values[] = { hostname, NULL }; /* pointers for the values. */ - struct newtWinEntry entries[] = - { { "", &values[0], 0,}, { NULL, NULL, 0 } }; - int rc; - int result; - - if (!(readkeyvalues(kv, CONFIG_ROOT "/main/settings"))) - { - freekeyvalues(kv); - errorbox(ctr[TR_UNABLE_TO_OPEN_SETTINGS_FILE]); - return 0; - } - - strcpy(hostname, SNAME); - findkey(kv, "HOSTNAME", hostname); - - for (;;) - { - rc = newtWinEntries(ctr[TR_HOSTNAME], ctr[TR_ENTER_HOSTNAME], - 50, 5, 5, 40, entries, ctr[TR_OK], ctr[TR_CANCEL], NULL); - - if (rc == 1) - { - strcpy(hostname, values[0]); - if (!(strlen(hostname))) - errorbox(ctr[TR_HOSTNAME_CANNOT_BE_EMPTY]); - else if (strchr(hostname, ' ')) - errorbox(ctr[TR_HOSTNAME_CANNOT_CONTAIN_SPACES]); - else if (strlen(hostname) != strspn(hostname, - "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-")) - errorbox(ctr[TR_HOSTNAME_NOT_VALID_CHARS]); - else - { - replacekeyvalue(kv, "HOSTNAME", hostname); - writekeyvalues(kv, CONFIG_ROOT "/main/settings"); - writehostsfiles(); - result = 1; - break; - } - } - else - { - result = 0; - break; - } - } - free(values[0]); - freekeyvalues(kv); - - return result; -} +/* SmoothWall setup program. + * + * This program is distributed under the terms of the GNU General Public + * Licence. See the file COPYING for details. + * + * (c) Lawrence Manning, 2001 + * Stuff for setting the hostname. + * + * $Id: hostname.c,v 1.6.2.1 2004/04/14 22:05:41 gespinasse Exp $ + * + */ + +#include "setup.h" + +extern FILE *flog; +extern char *mylog; + +extern char **ctr; + +extern int automode; + +int handlehostname(void) +{ + char hostname[STRING_SIZE] = ""; + struct keyvalue *kv = initkeyvalues(); + char *values[] = { hostname, NULL }; /* pointers for the values. */ + struct newtWinEntry entries[] = + { { "", &values[0], 0,}, { NULL, NULL, 0 } }; + int rc; + int result; + + if (!(readkeyvalues(kv, CONFIG_ROOT "/main/settings"))) + { + freekeyvalues(kv); + errorbox(ctr[TR_UNABLE_TO_OPEN_SETTINGS_FILE]); + return 0; + } + + strcpy(hostname, SNAME); + findkey(kv, "HOSTNAME", hostname); + + for (;;) + { + rc = newtWinEntries(ctr[TR_HOSTNAME], ctr[TR_ENTER_HOSTNAME], + 50, 5, 5, 40, entries, ctr[TR_OK], ctr[TR_CANCEL], NULL); + + if (rc == 1) + { + strcpy(hostname, values[0]); + if (!(strlen(hostname))) + errorbox(ctr[TR_HOSTNAME_CANNOT_BE_EMPTY]); + else if (strchr(hostname, ' ')) + errorbox(ctr[TR_HOSTNAME_CANNOT_CONTAIN_SPACES]); + else if (strlen(hostname) != strspn(hostname, + "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-")) + errorbox(ctr[TR_HOSTNAME_NOT_VALID_CHARS]); + else + { + replacekeyvalue(kv, "HOSTNAME", hostname); + writekeyvalues(kv, CONFIG_ROOT "/main/settings"); + writehostsfiles(); + result = 1; + break; + } + } + else + { + result = 0; + break; + } + } + free(values[0]); + freekeyvalues(kv); + + return result; +} diff --git a/src/install+setup/setup/timezone.c b/src/install+setup/setup/timezone.c index bdf890354b..d0a848378b 100644 --- a/src/install+setup/setup/timezone.c +++ b/src/install+setup/setup/timezone.c @@ -1,134 +1,134 @@ -/* SmoothWall setup program. - * - * This program is distributed under the terms of the GNU General Public - * Licence. See the file COPYING for details. - * - * (c) Lawrence Manning, 2001 - * Stuff for setting the timezone. - * - * $Id: timezone.c,v 1.4.2.1 2004/04/14 22:05:41 gespinasse Exp $ - * - */ - -#include "setup.h" - -extern FILE *flog; -extern char *mylog; - -extern char **ctr; - -extern int automode; - -#define MAX_FILENAMES 5000 -#define ZONEFILES "/usr/share/zoneinfo/posix" - -static int filenamecount; -static char *filenames[MAX_FILENAMES]; -static char *displaynames[MAX_FILENAMES]; - -static int process(char *prefix, char *path); -static int cmp(const void *s1, const void *s2); - -int handletimezone(void) -{ - int c; - int choice; - char *temp; - struct keyvalue *kv = initkeyvalues(); - int rc; - int result; - char timezone[STRING_SIZE]; - - filenamecount = 0; - - process(ZONEFILES, ""); - filenames[filenamecount] = NULL; - qsort(filenames, filenamecount, sizeof(char *), cmp); - - for (c = 0; filenames[c]; c++) - { - displaynames[c] = malloc(STRING_SIZE); - if ((temp = strstr(filenames[c], ZONEFILES))) - strcpy(displaynames[c], temp + strlen(ZONEFILES) + 1); - else - strcpy(displaynames[c], filenames[c]); - } - displaynames[c] = NULL; - - if (!(readkeyvalues(kv, CONFIG_ROOT "/main/settings"))) - { - freekeyvalues(kv); - errorbox(ctr[TR_UNABLE_TO_OPEN_SETTINGS_FILE]); - return 0; - } - - strcpy(timezone, ZONEFILES "/Europe/Berlin"); - findkey(kv, "TIMEZONE", timezone); - - choice = 0; - for (c = 0; filenames[c]; c++) - { - if (strcmp(timezone, filenames[c]) == 0) - choice = c; - } - - rc = newtWinMenu(ctr[TR_TIMEZONE], ctr[TR_TIMEZONE_LONG], 50, 5, 5, 6, displaynames, &choice, - ctr[TR_OK], ctr[TR_CANCEL], NULL); - - strcpy(timezone, filenames[choice]); - - if (rc != 2) - { - replacekeyvalue(kv, "TIMEZONE", timezone); - writekeyvalues(kv, CONFIG_ROOT "/main/settings"); - unlink("/etc/localtime"); - link(timezone, "/etc/localtime"); - result = 1; - } - else - result = 0; - - for (c = 0; filenames[c]; c++) - { - free(filenames[c]); - free(displaynames[c]); - } - freekeyvalues(kv); - - return result; -} - -static int process(char *prefix, char *path) -{ - DIR *dir; - struct dirent *de; - char newpath[PATH_MAX]; - - snprintf(newpath, PATH_MAX, "%s%s", prefix, path); - - if (!(dir = opendir(newpath))) - { - if (filenamecount > MAX_FILENAMES) - return 1; - - filenames[filenamecount] = (char *) strdup(newpath); - filenamecount++; - return 0; - } - - while ((de = readdir(dir))) - { - if (de->d_name[0] == '.') continue; - snprintf(newpath, PATH_MAX, "%s/%s", path, de->d_name); - process(prefix, newpath); - } - closedir(dir); - - return 1; -} - -/* Small wrapper for use with qsort(). */ -static int cmp(const void *s1, const void *s2) -{ - return (strcmp(* (char **) s1, * (char **) s2)); -} +/* SmoothWall setup program. + * + * This program is distributed under the terms of the GNU General Public + * Licence. See the file COPYING for details. + * + * (c) Lawrence Manning, 2001 + * Stuff for setting the timezone. + * + * $Id: timezone.c,v 1.4.2.1 2004/04/14 22:05:41 gespinasse Exp $ + * + */ + +#include "setup.h" + +extern FILE *flog; +extern char *mylog; + +extern char **ctr; + +extern int automode; + +#define MAX_FILENAMES 5000 +#define ZONEFILES "/usr/share/zoneinfo/posix" + +static int filenamecount; +static char *filenames[MAX_FILENAMES]; +static char *displaynames[MAX_FILENAMES]; + +static int process(char *prefix, char *path); +static int cmp(const void *s1, const void *s2); + +int handletimezone(void) +{ + int c; + int choice; + char *temp; + struct keyvalue *kv = initkeyvalues(); + int rc; + int result; + char timezone[STRING_SIZE]; + + filenamecount = 0; + + process(ZONEFILES, ""); + filenames[filenamecount] = NULL; + qsort(filenames, filenamecount, sizeof(char *), cmp); + + for (c = 0; filenames[c]; c++) + { + displaynames[c] = malloc(STRING_SIZE); + if ((temp = strstr(filenames[c], ZONEFILES))) + strcpy(displaynames[c], temp + strlen(ZONEFILES) + 1); + else + strcpy(displaynames[c], filenames[c]); + } + displaynames[c] = NULL; + + if (!(readkeyvalues(kv, CONFIG_ROOT "/main/settings"))) + { + freekeyvalues(kv); + errorbox(ctr[TR_UNABLE_TO_OPEN_SETTINGS_FILE]); + return 0; + } + + strcpy(timezone, ZONEFILES "/Europe/Berlin"); + findkey(kv, "TIMEZONE", timezone); + + choice = 0; + for (c = 0; filenames[c]; c++) + { + if (strcmp(timezone, filenames[c]) == 0) + choice = c; + } + + rc = newtWinMenu(ctr[TR_TIMEZONE], ctr[TR_TIMEZONE_LONG], 50, 5, 5, 6, displaynames, &choice, + ctr[TR_OK], ctr[TR_CANCEL], NULL); + + strcpy(timezone, filenames[choice]); + + if (rc != 2) + { + replacekeyvalue(kv, "TIMEZONE", timezone); + writekeyvalues(kv, CONFIG_ROOT "/main/settings"); + unlink("/etc/localtime"); + link(timezone, "/etc/localtime"); + result = 1; + } + else + result = 0; + + for (c = 0; filenames[c]; c++) + { + free(filenames[c]); + free(displaynames[c]); + } + freekeyvalues(kv); + + return result; +} + +static int process(char *prefix, char *path) +{ + DIR *dir; + struct dirent *de; + char newpath[PATH_MAX]; + + snprintf(newpath, PATH_MAX, "%s%s", prefix, path); + + if (!(dir = opendir(newpath))) + { + if (filenamecount > MAX_FILENAMES) + return 1; + + filenames[filenamecount] = (char *) strdup(newpath); + filenamecount++; + return 0; + } + + while ((de = readdir(dir))) + { + if (de->d_name[0] == '.') continue; + snprintf(newpath, PATH_MAX, "%s/%s", path, de->d_name); + process(prefix, newpath); + } + closedir(dir); + + return 1; +} + +/* Small wrapper for use with qsort(). */ +static int cmp(const void *s1, const void *s2) +{ + return (strcmp(* (char **) s1, * (char **) s2)); +} diff --git a/tools/sendEmail b/tools/sendEmail index 19b2f8d7fa..bf2d3949de 100755 --- a/tools/sendEmail +++ b/tools/sendEmail @@ -16,8 +16,6 @@ while 1: line = raw_input() except EOFError: break - #if not line: - # break if line.startswith("From: "): fromaddr = line elif line.startswith("To: "):