diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl index 18a3acec5..929b93f10 100644 --- a/config/qos/makeqosscripts.pl +++ b/config/qos/makeqosscripts.pl @@ -323,9 +323,9 @@ print "\n\t### SET PORT-RULES\n"; print "-d $qossettings{'DIP'} "; } print "-p $qossettings{'PPROT'} "; - if (($qossettings{'QPORT'} ne '') || ($qossettings{'DPORT'} ne '')){ - print "-m multiport "; - } +# if (($qossettings{'QPORT'} ne '') || ($qossettings{'DPORT'} ne '')){ +# print "-m multiport "; +# } if ($qossettings{'QPORT'} ne ''){ print "--sport $qossettings{'QPORT'} "; } @@ -341,9 +341,9 @@ print "\n\t### SET PORT-RULES\n"; print "-d $qossettings{'DIP'} "; } print "-p $qossettings{'PPROT'} "; - if (($qossettings{'QPORT'} ne '') || ($qossettings{'DPORT'} ne '')){ - print "-m multiport "; - } +# if (($qossettings{'QPORT'} ne '') || ($qossettings{'DPORT'} ne '')){ +# print "-m multiport "; +# } if ($qossettings{'QPORT'} ne ''){ print "--sport $qossettings{'QPORT'} "; } @@ -543,9 +543,9 @@ print "\n\t### SET PORT-RULES\n"; print "-d $qossettings{'DIP'} "; } print "-p $qossettings{'PPROT'} "; - if (($qossettings{'QPORT'} ne '') || ($qossettings{'DPORT'} ne '')){ - print "-m multiport "; - } +# if (($qossettings{'QPORT'} ne '') || ($qossettings{'DPORT'} ne '')){ +# print "-m multiport "; +# } if ($qossettings{'QPORT'} ne ''){ print "--sport $qossettings{'QPORT'} "; } @@ -561,9 +561,9 @@ print "\n\t### SET PORT-RULES\n"; print "-d $qossettings{'DIP'} "; } print "-p $qossettings{'PPROT'} "; - if (($qossettings{'QPORT'} ne '') || ($qossettings{'DPORT'} ne '')){ - print "-m multiport "; - } +# if (($qossettings{'QPORT'} ne '') || ($qossettings{'DPORT'} ne '')){ +# print "-m multiport "; +# } if ($qossettings{'QPORT'} ne ''){ print "--sport $qossettings{'QPORT'} "; } diff --git a/config/rootfiles/core/2/files b/config/rootfiles/core/2/files index e71d0fdc2..215ab1112 100644 --- a/config/rootfiles/core/2/files +++ b/config/rootfiles/core/2/files @@ -1,2 +1,5 @@ srv/web/ipfire/cgi-bin/qos.cgi +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/index.cgi var/ipfire/qos/bin/makeqosscripts.pl +etc/sysconfig/rc.local diff --git a/config/rootfiles/core/2/update.sh b/config/rootfiles/core/2/update.sh index a47a7831d..25f0e2626 100644 --- a/config/rootfiles/core/2/update.sh +++ b/config/rootfiles/core/2/update.sh @@ -1,4 +1,4 @@ #!/bin/bash . /opt/pakfire/lib/functions.sh - +mv /etc/sysconfig/rc.local /etc/sysconfig/rc.local.old extract_files diff --git a/config/rootfiles/packages/libvorbis b/config/rootfiles/packages/libvorbis index 5f69cdb6d..5aeeaa49c 100644 --- a/config/rootfiles/packages/libvorbis +++ b/config/rootfiles/packages/libvorbis @@ -6,125 +6,125 @@ #usr/lib/libvorbis.la usr/lib/libvorbis.so usr/lib/libvorbis.so.0 -usr/lib/libvorbis.so.0.3.1 +usr/lib/libvorbis.so.0.4.0 #usr/lib/libvorbisenc.a #usr/lib/libvorbisenc.la usr/lib/libvorbisenc.so usr/lib/libvorbisenc.so.2 -usr/lib/libvorbisenc.so.2.0.2 +usr/lib/libvorbisenc.so.2.0.3 #usr/lib/libvorbisfile.a #usr/lib/libvorbisfile.la usr/lib/libvorbisfile.so usr/lib/libvorbisfile.so.3 -usr/lib/libvorbisfile.so.3.1.1 +usr/lib/libvorbisfile.so.3.2.0 #usr/lib/pkgconfig/vorbis.pc #usr/lib/pkgconfig/vorbisenc.pc #usr/lib/pkgconfig/vorbisfile.pc #usr/share/aclocal/vorbis.m4 -#usr/share/doc/libvorbis-1.1.2 -#usr/share/doc/libvorbis-1.1.2/Vorbis_I_spec.html -#usr/share/doc/libvorbis-1.1.2/Vorbis_I_spec.pdf -#usr/share/doc/libvorbis-1.1.2/components.png -#usr/share/doc/libvorbis-1.1.2/draft-kerr-avt-vorbis-rtp-03.txt -#usr/share/doc/libvorbis-1.1.2/eightphase.png -#usr/share/doc/libvorbis-1.1.2/evenlsp.png -#usr/share/doc/libvorbis-1.1.2/floor1-1.png -#usr/share/doc/libvorbis-1.1.2/floor1-2.png -#usr/share/doc/libvorbis-1.1.2/floor1-3.png -#usr/share/doc/libvorbis-1.1.2/floor1-4.png -#usr/share/doc/libvorbis-1.1.2/floor1_inverse_dB_table.html -#usr/share/doc/libvorbis-1.1.2/floorval.png -#usr/share/doc/libvorbis-1.1.2/fourphase.png -#usr/share/doc/libvorbis-1.1.2/framing.html -#usr/share/doc/libvorbis-1.1.2/helper.html -#usr/share/doc/libvorbis-1.1.2/hufftree-under.png -#usr/share/doc/libvorbis-1.1.2/hufftree.png -#usr/share/doc/libvorbis-1.1.2/index.html -#usr/share/doc/libvorbis-1.1.2/lspmap.png -#usr/share/doc/libvorbis-1.1.2/oddlsp.png -#usr/share/doc/libvorbis-1.1.2/oggstream.html -#usr/share/doc/libvorbis-1.1.2/programming.html -#usr/share/doc/libvorbis-1.1.2/residue-pack.png -#usr/share/doc/libvorbis-1.1.2/residue2.png -#usr/share/doc/libvorbis-1.1.2/squarepolar.png -#usr/share/doc/libvorbis-1.1.2/stereo.html -#usr/share/doc/libvorbis-1.1.2/stream.png -#usr/share/doc/libvorbis-1.1.2/v-comment.html -#usr/share/doc/libvorbis-1.1.2/vorbis-clip.txt -#usr/share/doc/libvorbis-1.1.2/vorbis-errors.txt -#usr/share/doc/libvorbis-1.1.2/vorbis-fidelity.html -#usr/share/doc/libvorbis-1.1.2/vorbis.html -#usr/share/doc/libvorbis-1.1.2/vorbisenc -#usr/share/doc/libvorbis-1.1.2/vorbisenc/index.html -#usr/share/doc/libvorbis-1.1.2/vorbisenc/overview.html -#usr/share/doc/libvorbis-1.1.2/vorbisenc/reference.html -#usr/share/doc/libvorbis-1.1.2/vorbisenc/style.css -#usr/share/doc/libvorbis-1.1.2/vorbisenc/vorbis_encode_ctl.html -#usr/share/doc/libvorbis-1.1.2/vorbisenc/vorbis_encode_init.html -#usr/share/doc/libvorbis-1.1.2/vorbisenc/vorbis_encode_init_vbr.html -#usr/share/doc/libvorbis-1.1.2/vorbisenc/vorbis_info.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile -#usr/share/doc/libvorbis-1.1.2/vorbisfile/OggVorbis_File.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/callbacks.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/chaining_example_c.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/chainingexample.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/crosslap.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/datastructures.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/decoding.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/example.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/exampleindex.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/fileinfo.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/index.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/initialization.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_bitrate.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_bitrate_instant.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_callbacks.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_clear.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_comment.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_crosslap.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_info.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_open.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_open_callbacks.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_pcm_seek.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_pcm_seek_lap.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_pcm_seek_page.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_pcm_seek_page_lap.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_pcm_tell.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_pcm_total.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_raw_seek.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_raw_seek_lap.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_raw_tell.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_raw_total.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_read.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_read_float.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_seekable.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_serialnumber.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_streams.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_test.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_test_callbacks.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_test_open.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_time_seek.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_time_seek_lap.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_time_seek_page.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_time_seek_page_lap.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_time_tell.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/ov_time_total.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/overview.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/reference.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/return.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/seekexample.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/seeking.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/seeking_example_c.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/seeking_test_c.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/seekingexample.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/style.css -#usr/share/doc/libvorbis-1.1.2/vorbisfile/threads.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/vorbis_comment.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/vorbis_info.html -#usr/share/doc/libvorbis-1.1.2/vorbisfile/vorbisfile_example_c.html -#usr/share/doc/libvorbis-1.1.2/vorbisword2.png -#usr/share/doc/libvorbis-1.1.2/wait.png -#usr/share/doc/libvorbis-1.1.2/white-ogg.png -#usr/share/doc/libvorbis-1.1.2/white-xifish.png -#usr/share/doc/libvorbis-1.1.2/window1.png -#usr/share/doc/libvorbis-1.1.2/window2.png +#usr/share/doc/libvorbis-1.2.0 +#usr/share/doc/libvorbis-1.2.0/Vorbis_I_spec.html +#usr/share/doc/libvorbis-1.2.0/Vorbis_I_spec.pdf +#usr/share/doc/libvorbis-1.2.0/components.png +#usr/share/doc/libvorbis-1.2.0/draft-kerr-avt-vorbis-rtp-03.txt +#usr/share/doc/libvorbis-1.2.0/eightphase.png +#usr/share/doc/libvorbis-1.2.0/evenlsp.png +#usr/share/doc/libvorbis-1.2.0/floor1-1.png +#usr/share/doc/libvorbis-1.2.0/floor1-2.png +#usr/share/doc/libvorbis-1.2.0/floor1-3.png +#usr/share/doc/libvorbis-1.2.0/floor1-4.png +#usr/share/doc/libvorbis-1.2.0/floor1_inverse_dB_table.html +#usr/share/doc/libvorbis-1.2.0/floorval.png +#usr/share/doc/libvorbis-1.2.0/fourphase.png +#usr/share/doc/libvorbis-1.2.0/framing.html +#usr/share/doc/libvorbis-1.2.0/helper.html +#usr/share/doc/libvorbis-1.2.0/hufftree-under.png +#usr/share/doc/libvorbis-1.2.0/hufftree.png +#usr/share/doc/libvorbis-1.2.0/index.html +#usr/share/doc/libvorbis-1.2.0/lspmap.png +#usr/share/doc/libvorbis-1.2.0/oddlsp.png +#usr/share/doc/libvorbis-1.2.0/oggstream.html +#usr/share/doc/libvorbis-1.2.0/programming.html +#usr/share/doc/libvorbis-1.2.0/residue-pack.png +#usr/share/doc/libvorbis-1.2.0/residue2.png +#usr/share/doc/libvorbis-1.2.0/squarepolar.png +#usr/share/doc/libvorbis-1.2.0/stereo.html +#usr/share/doc/libvorbis-1.2.0/stream.png +#usr/share/doc/libvorbis-1.2.0/v-comment.html +#usr/share/doc/libvorbis-1.2.0/vorbis-clip.txt +#usr/share/doc/libvorbis-1.2.0/vorbis-errors.txt +#usr/share/doc/libvorbis-1.2.0/vorbis-fidelity.html +#usr/share/doc/libvorbis-1.2.0/vorbis.html +#usr/share/doc/libvorbis-1.2.0/vorbisenc +#usr/share/doc/libvorbis-1.2.0/vorbisenc/index.html +#usr/share/doc/libvorbis-1.2.0/vorbisenc/overview.html +#usr/share/doc/libvorbis-1.2.0/vorbisenc/reference.html +#usr/share/doc/libvorbis-1.2.0/vorbisenc/style.css +#usr/share/doc/libvorbis-1.2.0/vorbisenc/vorbis_encode_ctl.html +#usr/share/doc/libvorbis-1.2.0/vorbisenc/vorbis_encode_init.html +#usr/share/doc/libvorbis-1.2.0/vorbisenc/vorbis_encode_init_vbr.html +#usr/share/doc/libvorbis-1.2.0/vorbisenc/vorbis_info.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile +#usr/share/doc/libvorbis-1.2.0/vorbisfile/OggVorbis_File.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/callbacks.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/chaining_example_c.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/chainingexample.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/crosslap.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/datastructures.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/decoding.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/example.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/exampleindex.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/fileinfo.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/index.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/initialization.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_bitrate.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_bitrate_instant.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_callbacks.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_clear.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_comment.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_crosslap.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_info.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_open.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_open_callbacks.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_pcm_seek.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_pcm_seek_lap.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_pcm_seek_page.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_pcm_seek_page_lap.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_pcm_tell.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_pcm_total.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_raw_seek.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_raw_seek_lap.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_raw_tell.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_raw_total.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_read.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_read_float.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_seekable.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_serialnumber.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_streams.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_test.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_test_callbacks.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_test_open.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_time_seek.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_time_seek_lap.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_time_seek_page.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_time_seek_page_lap.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_time_tell.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/ov_time_total.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/overview.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/reference.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/return.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/seekexample.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/seeking.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/seeking_example_c.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/seeking_test_c.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/seekingexample.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/style.css +#usr/share/doc/libvorbis-1.2.0/vorbisfile/threads.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/vorbis_comment.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/vorbis_info.html +#usr/share/doc/libvorbis-1.2.0/vorbisfile/vorbisfile_example_c.html +#usr/share/doc/libvorbis-1.2.0/vorbisword2.png +#usr/share/doc/libvorbis-1.2.0/wait.png +#usr/share/doc/libvorbis-1.2.0/white-ogg.png +#usr/share/doc/libvorbis-1.2.0/white-xifish.png +#usr/share/doc/libvorbis-1.2.0/window1.png +#usr/share/doc/libvorbis-1.2.0/window2.png diff --git a/config/rootfiles/packages/rtorrent b/config/rootfiles/packages/rtorrent index 6862470d6..2d04ae501 100644 --- a/config/rootfiles/packages/rtorrent +++ b/config/rootfiles/packages/rtorrent @@ -44,7 +44,7 @@ usr/bin/rtorrent #usr/lib/libtorrent.la usr/lib/libtorrent.so usr/lib/libtorrent.so.10 -usr/lib/libtorrent.so.10.0.6 +usr/lib/libtorrent.so.10.0.8 #usr/lib/pkgconfig/libtorrent.pc #usr/include/sigc++-2.0 #usr/include/sigc++-2.0/sigc++ diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 01a2cd16b..276480276 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -29,7 +29,7 @@ * URI-1.35 * Unix-Syslog-0.100 * XML-Parser-2.34 -* alsa-lib-1.0.13 +* alsa-lib-1.0.15 * amavisd-new-2.5.2 * applejuice-0.30 * arping-2.05 @@ -56,6 +56,7 @@ * coreutils-5.96 * cpio-2.6 * cups-1.2.12 +* cups-1.3.4 * curl-7.15.3 * cyrus-imapd-2.2.12 * cyrus-sasl-2.1.21 @@ -99,7 +100,7 @@ * hddtemp-0.3-beta14 * hdparm-7.7 * hplip-2.7.10 -* htop-0.6.2 +* htop-0.7 * httpd-2.2.6 * hwdata * iana-etc-2.10 @@ -139,9 +140,10 @@ * libsigc++-2.0.17 * libtool-1.5.22 * libtorrent-0.11.6 +* libtorrent-0.11.9 * libupnp-1.3.1 * libusb-0.1.12 -* libvorbis-1.1.2 +* libvorbis-1.2.0 * libwww-perl-5.803 * libxml2-2.6.26 * libxslt-1.1.17 @@ -212,8 +214,8 @@ * rp-pppoe-3.8 * rrdtool-1.2.15 * rsync-2.6.9 -* rtorrent-0.7.6 -* samba-3.0.27a +* rtorrent-0.7.9 +* samba-3.0.28 * screen-4.0.3 * sdparm-1.01 * sed-4.1.5 @@ -222,12 +224,15 @@ * slang-1.4.9 * smartmontools-5.36 * snort-2.6.1.4 +* snort-2.8.0.1 * sox-12.18.1 * spandsp-0.0.3pre24 * squashfs3.2-r2 * squid-2.6.STABLE16 +* squid-3.0.STABLE1 * squid-graph-3.2 * squidGuard-1.2.0 +* squidGuard-1.3 * sudo-1.6.8p12 * sysfsutils-1.3.0 * sysklogd-1.4.1 diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 56122658f..e41d3517c 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -263,9 +263,9 @@ if (-e "/etc/snort/snort.conf") { ####################### End added for snort rules control ################################# if ($snortsettings{'RULES'} eq 'subscripted') { - $url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-CURRENT_s.tar.gz"; + $url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.6_s.tar.gz"; } elsif ($snortsettings{'RULES'} eq 'registered') { - $url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-CURRENT.tar.gz"; + $url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.6.tar.gz"; } else { $url="http://www.snort.org/pub-bin/downloads.cgi/Download/comm_rules/Community-Rules-CURRENT.tar.gz"; } diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 207e30455..03272d2eb 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -176,6 +176,7 @@ print < + END ; print </dev/null 2>&1"); } else { system("/usr/local/bin/pakfire disable updates >/dev/null 2>&1"); } - if ($pakfiresettings{'AUTOUPGRADE'} == "on") { + if ($pakfiresettings{'AUTOUPGRADE'} eq 'on') { system("/usr/local/bin/pakfire enable upgrades >/dev/null 2>&1"); } else { system("/usr/local/bin/pakfire disable upgrades >/dev/null 2>&1"); diff --git a/lfs/alsa b/lfs/alsa index a35ee488f..3e946c60f 100644 --- a/lfs/alsa +++ b/lfs/alsa @@ -24,7 +24,7 @@ include Config -VER = 1.0.13 +VER = 1.0.15 THISAPP = alsa-lib-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = alsa -PAK_VER = 1 +PAK_VER = 2 DEPS = "" @@ -45,8 +45,8 @@ objects = $(DL_FILE) alsa-utils-$(VER).tar.bz2 $(DL_FILE) = $(DL_FROM)/$(DL_FILE) alsa-utils-$(VER).tar.bz2 = $(DL_FROM)/alsa-utils-$(VER).tar.bz2 -$(DL_FILE)_MD5 = d55a9d7d2a79d738a1b7a511cffda4b6 -alsa-utils-$(VER).tar.bz2_MD5 = dfe4bb5d3217f3ec662b172ce8397cf0 +$(DL_FILE)_MD5 = 94254ea0d2c966a58184b134e9da29ff +alsa-utils-$(VER).tar.bz2_MD5 = 287f46f891581c15018de4f8c0731575 install : $(TARGET) diff --git a/lfs/cups b/lfs/cups index f6864f16a..c65f379be 100644 --- a/lfs/cups +++ b/lfs/cups @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/cups-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cups -PAK_VER = 1 +PAK_VER = 2 DEPS = "ghostscript" diff --git a/lfs/htop b/lfs/htop index 3934caeba..dfafdcc1b 100644 --- a/lfs/htop +++ b/lfs/htop @@ -24,7 +24,7 @@ include Config -VER = 0.6.2 +VER = 0.7 THISAPP = htop-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = htop -PAK_VER = 1 +PAK_VER = 2 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 995e76b7fd18c05fb7fb5ef10a2166ca +$(DL_FILE)_MD5 = 4afc961fa709167e1b434682897991f9 install : $(TARGET) diff --git a/lfs/libtorrent b/lfs/libtorrent index 93e97f431..087476998 100644 --- a/lfs/libtorrent +++ b/lfs/libtorrent @@ -24,7 +24,7 @@ include Config -VER = 0.11.6 +VER = 0.11.9 THISAPP = libtorrent-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4e16a93fd398cfef1acf1956fb2164b4 +$(DL_FILE)_MD5 = 8974dc9499b382a09fb952cabcfef9a0 install : $(TARGET) diff --git a/lfs/libvorbis b/lfs/libvorbis index 19132e0d1..ebd2be000 100644 --- a/lfs/libvorbis +++ b/lfs/libvorbis @@ -24,15 +24,15 @@ include Config -VER = 1.1.2 +VER = 1.2.0 THISAPP = libvorbis-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = libvorbis -PAK_VER = 1 +PAK_VER = 2 DEPS = "libogg" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 37847626b8e1b53ae79a34714c7b3211 +$(DL_FILE)_MD5 = 7c6e409d7aa1fa8a5481dea571d5bde0 install : $(TARGET) @@ -76,11 +76,11 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make #cd $(DIR_APP) && sed -i.bak -e 's/-mno-ieee-fp//' lib/Makefile cd $(DIR_APP) && make install - cd $(DIR_APP) && install -v -m644 doc/Vorbis* /usr/share/doc/libvorbis-1.1.2 + cd $(DIR_APP) && install -v -m644 doc/Vorbis* /usr/share/doc/libvorbis-1.2.0 @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/rtorrent b/lfs/rtorrent index e1cdba2da..06e566135 100644 --- a/lfs/rtorrent +++ b/lfs/rtorrent @@ -24,7 +24,7 @@ include Config -VER = 0.7.6 +VER = 0.7.9 THISAPP = rtorrent-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = rtorrent -PAK_VER = 1 +PAK_VER = 2 CFLAGS = CXXFLAGS = @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 3eec6e94ed468c4dfed5376f75a89fe4 +$(DL_FILE)_MD5 = 136202fdd540a92aafbcee29f849d228 install : $(TARGET) diff --git a/lfs/squid b/lfs/squid index 5f5cb1d1f..4f48897b5 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 2.6.STABLE16 +VER = 3.0.STABLE1 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 849bee6f269e6c773f215fd4b41de0e3 +$(DL_FILE)_MD5 = ec7458b00a68341854d91e7f6ece56ba install : $(TARGET) diff --git a/lfs/squidguard b/lfs/squidguard index aec5ff0b8..967afb98a 100644 --- a/lfs/squidguard +++ b/lfs/squidguard @@ -24,7 +24,7 @@ include Config -VER = 1.2.0 +VER = 1.3 THISAPP = squidGuard-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c6e2e9112fdbda0602656f94c1ce31fd +$(DL_FILE)_MD5 = d7c2c2e03a2835e4d1c3bef751ace76f install : $(TARGET) @@ -70,7 +70,7 @@ $(subst %,%_MD5,$(objects)) : $(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/squidGuard-$(VER)-ipfire.patch + #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squidGuard-$(VER)-ipfire.patch cd $(DIR_APP) && ./configure --prefix=/usr --datadir=/usr/share \ --sysconfdir=/etc --localstatedir=/var --infodir=/usr/info --mandir=/usr/man \ --with-sg-config=/var/ipfire/urlfilter/squidGuard.conf \ diff --git a/src/initscripts/sysconfig/rc.local b/src/initscripts/sysconfig/rc.local index 90347d79a..5b89b8279 100644 --- a/src/initscripts/sysconfig/rc.local +++ b/src/initscripts/sysconfig/rc.local @@ -23,5 +23,5 @@ # power button shutdown if grep -q '^button' /proc/modules ; then - head -1 /proc/acpi/event | grep -q 'button/power PWRF' && init 0 & + ( head -1 /proc/acpi/event | grep -q 'button/power PWRF' && poweroff ) & fi diff --git a/src/paks/alsa/update.sh b/src/paks/alsa/update.sh index 800823ef5..79af981e8 100644 --- a/src/paks/alsa/update.sh +++ b/src/paks/alsa/update.sh @@ -22,3 +22,7 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh +mv /etc/asound.state /tmp +./uninstall.sh +./install.sh +mv /tmp/asound.state /etc diff --git a/src/paks/cups/update.sh b/src/paks/cups/update.sh index 800823ef5..89c40d0d7 100644 --- a/src/paks/cups/update.sh +++ b/src/paks/cups/update.sh @@ -22,3 +22,5 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh diff --git a/src/paks/default/update.sh b/src/paks/default/update.sh index 800823ef5..89c40d0d7 100644 --- a/src/paks/default/update.sh +++ b/src/paks/default/update.sh @@ -22,3 +22,5 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh