From: Arne Fitzenreiter Date: Sat, 5 Sep 2009 10:38:32 +0000 (+0200) Subject: Merge branch 'next' X-Git-Tag: v2.5-core31~50 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=310a18fab33a18d7ebf6b8d9f78ede1ae9606fcc;hp=3fa051a01318bc2c761843a528375d676f0e4c3f Merge branch 'next' --- diff --git a/config/net-snmp/snmpd.conf b/config/netsnmpd/snmpd.conf similarity index 100% rename from config/net-snmp/snmpd.conf rename to config/netsnmpd/snmpd.conf diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts index 8520c72c44..b788bdc507 100644 --- a/config/rootfiles/common/initscripts +++ b/config/rootfiles/common/initscripts @@ -191,4 +191,4 @@ etc/rc.d/rc6.d/K85tmpfs #etc/rc.d/rc0.d/K01miau #etc/rc.d/rc3.d/S99miau #etc/rc.d/rc6.d/K01miau -#etc/rc.d/init.d/net-snmp +#etc/rc.d/init.d/netsnmpd diff --git a/config/rootfiles/oldcore/30/filelists/files b/config/rootfiles/oldcore/30/filelists/files index 917733ff95..164b33fce4 100644 --- a/config/rootfiles/oldcore/30/filelists/files +++ b/config/rootfiles/oldcore/30/filelists/files @@ -1,3 +1,4 @@ +etc/system-release lib/modules/2.6.27.25-ipfire/kernel/drivers/net/e1000e/e1000e.ko lib/modules/2.6.27.25-ipfire/kernel/drivers/net/usb/hso.ko lib/modules/2.6.27.25-ipfire/kernel/drivers/usb/serial/option.ko @@ -13,3 +14,6 @@ srv/web/ipfire/html/themes/maniac/include/style.css opt/pakfire/pakfire usr/bin/curl etc/ppp/ip-up +usr/sbin/grub-install +lib/initcpio/install/virtio +etc/mkinitcpio.conf diff --git a/config/rootfiles/oldcore/30/update.sh b/config/rootfiles/oldcore/30/update.sh index c7eebf948c..9029b14230 100644 --- a/config/rootfiles/oldcore/30/update.sh +++ b/config/rootfiles/oldcore/30/update.sh @@ -67,3 +67,4 @@ fi if [ ! -s "/opt/pakfire/db/uuid" ]; then rm -f /opt/pakfire/db/uuid fi +cp /etc/mkinitcpio.conf /etc/mkinitcpio.conf.org diff --git a/config/rootfiles/packages/cacti b/config/rootfiles/packages/cacti index ba88316b58..1935c5aaf0 100644 --- a/config/rootfiles/packages/cacti +++ b/config/rootfiles/packages/cacti @@ -18,6 +18,7 @@ usr/share/cacti/cli/add_perms.php usr/share/cacti/cli/add_tree.php usr/share/cacti/cli/copy_user.php usr/share/cacti/cli/host_update_template.php +usr/share/cacti/cli/import_template.php usr/share/cacti/cli/poller_data_sources_reapply_names.php usr/share/cacti/cli/poller_graphs_reapply_names.php usr/share/cacti/cli/poller_output_empty.php @@ -35,10 +36,7 @@ usr/share/cacti/data_templates.php #usr/share/cacti/docs #usr/share/cacti/docs/CHANGELOG #usr/share/cacti/docs/CONTRIB -#usr/share/cacti/docs/INSTALL #usr/share/cacti/docs/README -#usr/share/cacti/docs/REQUIREMENTS -#usr/share/cacti/docs/UPGRADE #usr/share/cacti/docs/html #usr/share/cacti/docs/html/LICENSE.html #usr/share/cacti/docs/html/advanced_topics.html @@ -115,7 +113,6 @@ usr/share/cacti/data_templates.php #usr/share/cacti/docs/html/install_windows.html #usr/share/cacti/docs/html/installation.html #usr/share/cacti/docs/html/making_scripts_work_with_cacti.html -#usr/share/cacti/docs/html/manual.css #usr/share/cacti/docs/html/migration_php_scripts_to_script_server.html #usr/share/cacti/docs/html/new_graphs.html #usr/share/cacti/docs/html/operating_principles.html @@ -143,8 +140,8 @@ usr/share/cacti/data_templates.php #usr/share/cacti/docs/html/variables.html #usr/share/cacti/docs/pdf #usr/share/cacti/docs/pdf/README -#usr/share/cacti/docs/text -#usr/share/cacti/docs/text/manual.txt +#usr/share/cacti/docs/txt +#usr/share/cacti/docs/txt/manual.txt usr/share/cacti/gprint_presets.php usr/share/cacti/graph.php usr/share/cacti/graph_image.php @@ -296,24 +293,25 @@ usr/share/cacti/include/treeview/ua.js usr/share/cacti/include/zoom.js usr/share/cacti/index.php #usr/share/cacti/install -#usr/share/cacti/install/0_8_1_to_0_8_2.php -#usr/share/cacti/install/0_8_2_to_0_8_2a.php -#usr/share/cacti/install/0_8_2a_to_0_8_3.php -#usr/share/cacti/install/0_8_3_to_0_8_4.php -#usr/share/cacti/install/0_8_4_to_0_8_5.php -#usr/share/cacti/install/0_8_5a_to_0_8_6.php -#usr/share/cacti/install/0_8_6_to_0_8_6a.php -#usr/share/cacti/install/0_8_6c_to_0_8_6d.php -#usr/share/cacti/install/0_8_6d_to_0_8_6e.php -#usr/share/cacti/install/0_8_6f_to_0_8_6g.php -#usr/share/cacti/install/0_8_6g_to_0_8_6h.php -#usr/share/cacti/install/0_8_6h_to_0_8_6i.php -#usr/share/cacti/install/0_8_6j_to_0_8_7.php -#usr/share/cacti/install/0_8_7_to_0_8_7a.php -#usr/share/cacti/install/0_8_7a_to_0_8_7b.php -#usr/share/cacti/install/0_8_7b_to_0_8_7c.php -#usr/share/cacti/install/0_8_7c_to_0_8_7d.php -#usr/share/cacti/install/0_8_to_0_8_1.php +usr/share/cacti/install/0_8_1_to_0_8_2.php +usr/share/cacti/install/0_8_2_to_0_8_2a.php +usr/share/cacti/install/0_8_2a_to_0_8_3.php +usr/share/cacti/install/0_8_3_to_0_8_4.php +usr/share/cacti/install/0_8_4_to_0_8_5.php +usr/share/cacti/install/0_8_5a_to_0_8_6.php +usr/share/cacti/install/0_8_6_to_0_8_6a.php +usr/share/cacti/install/0_8_6c_to_0_8_6d.php +usr/share/cacti/install/0_8_6d_to_0_8_6e.php +usr/share/cacti/install/0_8_6f_to_0_8_6g.php +usr/share/cacti/install/0_8_6g_to_0_8_6h.php +usr/share/cacti/install/0_8_6h_to_0_8_6i.php +usr/share/cacti/install/0_8_6j_to_0_8_7.php +usr/share/cacti/install/0_8_7_to_0_8_7a.php +usr/share/cacti/install/0_8_7a_to_0_8_7b.php +usr/share/cacti/install/0_8_7b_to_0_8_7c.php +usr/share/cacti/install/0_8_7c_to_0_8_7d.php +usr/share/cacti/install/0_8_7d_to_0_8_7e.php +usr/share/cacti/install/0_8_to_0_8_1.php usr/share/cacti/install/index.php usr/share/cacti/install/install_finish.gif usr/share/cacti/install/install_next.gif @@ -497,6 +495,7 @@ usr/share/cacti/utilities.php #var/cacti #var/cacti/log var/cacti/log/.htaccess +var/cacti/log/.placeholder var/cacti/log/cacti.log #var/cacti/rra var/cacti/rra/.placeholder diff --git a/config/rootfiles/packages/joe b/config/rootfiles/packages/joe new file mode 100644 index 0000000000..ec0e0e26d5 --- /dev/null +++ b/config/rootfiles/packages/joe @@ -0,0 +1,71 @@ +usr/bin/joe +usr/bin/rjoe +usr/share/doc/joe +usr/share/doc/joe/LIST +usr/share/doc/joe/README +usr/share/doc/joe/HINTS +usr/share/doc/joe/ChangeLog +usr/share/doc/joe/HACKING +usr/share/doc/joe/NEWS +usr/share/man/man1/joe.1 +usr/share/man/ru/man1/joe.1 +usr/share/joe +usr/share/joe/lang +usr/share/joe/lang/ru.po +usr/share/joe/lang/de.po +usr/share/joe/lang/fr.po +usr/share/joe/lang/uk.po +usr/share/joe/syntax +usr/share/joe/syntax/c.jsf +usr/share/joe/syntax/perl.jsf +usr/share/joe/syntax/verilog.jsf +usr/share/joe/syntax/conf.jsf +usr/share/joe/syntax/python.jsf +usr/share/joe/syntax/php.jsf +usr/share/joe/syntax/sh.jsf +usr/share/joe/syntax/mail.jsf +usr/share/joe/syntax/pascal.jsf +usr/share/joe/syntax/html.jsf +usr/share/joe/syntax/vhdl.jsf +usr/share/joe/syntax/fortran.jsf +usr/share/joe/syntax/java.jsf +usr/share/joe/syntax/xml.jsf +usr/share/joe/syntax/tcl.jsf +usr/share/joe/syntax/lisp.jsf +usr/share/joe/syntax/csh.jsf +usr/share/joe/syntax/mason.jsf +usr/share/joe/syntax/diff.jsf +usr/share/joe/syntax/asm.jsf +usr/share/joe/syntax/tex.jsf +usr/share/joe/syntax/css.jsf +usr/share/joe/syntax/ocaml.jsf +usr/share/joe/syntax/4gl.jsf +usr/share/joe/syntax/sml.jsf +usr/share/joe/syntax/sql.jsf +usr/share/joe/syntax/awk.jsf +usr/share/joe/syntax/cobol.jsf +usr/share/joe/syntax/sed.jsf +usr/share/joe/syntax/ps.jsf +usr/share/joe/syntax/ada.jsf +usr/share/joe/syntax/troff.jsf +usr/share/joe/syntax/haskell.jsf +usr/share/joe/syntax/rexx.jsf +usr/share/joe/syntax/skill.jsf +usr/share/joe/syntax/lua.jsf +usr/share/joe/syntax/ruby.jsf +usr/share/joe/syntax/m4.jsf +usr/share/joe/syntax/joerc.jsf +usr/share/joe/syntax/spec.jsf +usr/share/joe/syntax/matlab.jsf +usr/share/joe/syntax/jsf.jsf +usr/share/joe/syntax/jsf_check.jsf +usr/share/joe/charmaps +usr/share/joe/charmaps/klingon +usr/etc/joe +usr/etc/joe/joerc +usr/etc/joe/jicerc.ru +usr/etc/joe/jmacsrc +usr/etc/joe/jstarrc +usr/etc/joe/rjoerc +usr/etc/joe/jpicorc +usr/etc/joe/ftyperc diff --git a/config/rootfiles/packages/net-snmp b/config/rootfiles/packages/netsnmpd similarity index 99% rename from config/rootfiles/packages/net-snmp rename to config/rootfiles/packages/netsnmpd index e518e5c147..461c679cfa 100644 --- a/config/rootfiles/packages/net-snmp +++ b/config/rootfiles/packages/netsnmpd @@ -1,6 +1,6 @@ -etc/rc.d/rc0.d/K02net-snmp -etc/rc.d/rc3.d/S65net-snmp -etc/rc.d/rc6.d/K02net-snmp +etc/rc.d/rc0.d/K02netsnmpd +etc/rc.d/rc3.d/S65netsnmpd +etc/rc.d/rc6.d/K02netsnmpd etc/snmpd.conf usr/bin/encode_keychange usr/bin/fixproc @@ -586,4 +586,4 @@ usr/share/snmp/snmpconf-data/snmptrapd-data/logging usr/share/snmp/snmpconf-data/snmptrapd-data/runtime usr/share/snmp/snmpconf-data/snmptrapd-data/snmpconf-config usr/share/snmp/snmpconf-data/snmptrapd-data/traphandle -etc/init.d/net-snmp +etc/init.d/netsnmpd diff --git a/doc/packages-list.txt b/doc/packages-list.txt index fc383fe59d..fab524669e 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -59,7 +59,7 @@ * busybox-1.2.2 * bwm-ng-0.6 * bzip2-1.0.5 -* cacti-0.8.7d +* cacti-0.8.7e * calamaris-2.59 * capi4k-utils-2005-07-18 * ccache-2.4 @@ -149,6 +149,7 @@ * iputils-ss020927 * iw-0.9.15 * java-1.6.0_12-for-ipfire +* joe-3.7 * jpegsrc.v6b * kbd-1.12 * klibc-1.5.14 diff --git a/html/cgi-bin/chpasswd.cgi b/html/cgi-bin/chpasswd.cgi index 5e000f07e5..e9799f0713 100644 --- a/html/cgi-bin/chpasswd.cgi +++ b/html/cgi-bin/chpasswd.cgi @@ -103,7 +103,7 @@ if ($cgiparams{'SUBMIT'} eq $tr{'advproxy chgwebpwd change password'}) $errormessage = $tr{'advproxy errmsg password incorrect'}; goto ERROR; } - $returncode = system("/usr/bin/htpasswd -b $userdb $username $cgiparams{'NEW_PASSWORD_1'}"); + $returncode = system("/usr/sbin/htpasswd -b $userdb $username $cgiparams{'NEW_PASSWORD_1'}"); if ($returncode == 0) { $success = 1; diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi index af0964e104..f1862f1cf0 100644 --- a/html/cgi-bin/urlfilter.cgi +++ b/html/cgi-bin/urlfilter.cgi @@ -2973,7 +2973,7 @@ sub writeconfigfile foreach $category (@categories) { $blacklist = $category; $category =~ s/\//_/g; - if ( $filtersettings{"FILTER_".uc($category)} ne "on" ){next;} + #if ( $filtersettings{"FILTER_".uc($category)} ne "on" ){next;} print FILE "dest $category {\n"; if (-e "$dbdir/$blacklist/domains") { print FILE " domainlist $blacklist\/domains\n"; diff --git a/lfs/cacti b/lfs/cacti index 0206059ca4..4dda25eb5e 100644 --- a/lfs/cacti +++ b/lfs/cacti @@ -24,7 +24,7 @@ include Config -VER = 0.8.7d +VER = 0.8.7e THISAPP = cacti-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cacti -PAK_VER = 1 +PAK_VER = 2 -DEPS = "net-snmp mysql" +DEPS = "netsnmpd mysql" ############################################################################### # Top-level Rules @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0822068bfa547278e94d3143ef9279e0 +$(DL_FILE)_MD5 = 7563a58a57d2c6cc0da28cc341a30969 install : $(TARGET) @@ -85,11 +85,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) install -v -m 755 $(DIR_SRC)/config/cacti/cacti.cron /etc/fcron.cyclic/cacti.cron install -v -m 644 $(DIR_SRC)/config/backup/includes/cacti \ /var/ipfire/backup/addons/includes/cacti - mkdir /var/cacti && mkdir /var/cacti/rra && mkdir /var/cacti/log - mv -vf /usr/share/cacti/log /var/cacti - mv -vf /usr/share/cacti/rra /var/cacti + mkdir -pv /var/cacti || true + mkdir -pv /var/cacti/rra || true + mkdir -pv /var/cacti/log || true + mv -vf /usr/share/cacti/log/* /var/cacti/log/ + mv -vf /usr/share/cacti/rra/* /var/cacti/rra ln -s /var/cacti/log /usr/share/cacti/log ln -s /var/cacti/rra /usr/share/cacti/rra chown -R nobody:nobody /var/cacti/rra /var/cacti/log @rm -rf $(DIR_APP) @$(POSTBUILD) + diff --git a/lfs/joe b/lfs/joe new file mode 100644 index 0000000000..96b215693a --- /dev/null +++ b/lfs/joe @@ -0,0 +1,84 @@ +############################################################################### +# # +# 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 = 3.7 + +THISAPP = joe-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = joe +PAK_VER = 0 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 66de1b073e869ba12abbfcde3885c577 + +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 $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/net-snmp b/lfs/netsnmpd similarity index 90% rename from lfs/net-snmp rename to lfs/netsnmpd index c4d64bdfdc..66fd9df725 100644 --- a/lfs/net-snmp +++ b/lfs/netsnmpd @@ -31,8 +31,8 @@ DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = net-snmp -PAK_VER = 1 +PROG = netsnmpd +PAK_VER = 2 DEPS = "" ############################################################################### @@ -87,11 +87,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --sysconfdir="/etc" cd $(DIR_APP) && make cd $(DIR_APP) && make install - install -v -m644 $(DIR_SRC)/config/net-snmp/snmpd.conf /etc/snmpd.conf - install -v -m755 $(DIR_SRC)/src/initscripts/init.d/net-snmp /etc/init.d/net-snmp - ln -sf ../init.d/net-snmp /etc/rc.d/rc3.d/S65net-snmp - ln -sf ../init.d/net-snmp /etc/rc.d/rc0.d/K02net-snmp - ln -sf ../init.d/net-snmp /etc/rc.d/rc6.d/K02net-snmp + install -v -m644 $(DIR_SRC)/config/netsnmpd/snmpd.conf /etc/snmpd.conf + install -v -m755 $(DIR_SRC)/src/initscripts/init.d/netsnmpd /etc/init.d/netsnmpd + ln -sf ../init.d/netsnmpd /etc/rc.d/rc3.d/S65netsnmpd + ln -sf ../init.d/netsnmpd /etc/rc.d/rc0.d/K02netsnmpd + ln -sf ../init.d/netsnmpd /etc/rc.d/rc6.d/K02netsnmpd @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/sox b/lfs/sox index cad16e55f6..378429d4d1 100644 --- a/lfs/sox +++ b/lfs/sox @@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = sox PAK_VER = 1 -DEPS = "libvorbis lame" +DEPS = "libvorbis" ############################################################################### # Top-level Rules diff --git a/make.sh b/make.sh index 7f68f293d4..cf085774c5 100755 --- a/make.sh +++ b/make.sh @@ -612,7 +612,7 @@ buildipfire() { # ipfiremake x11libs # ipfiremake xen ipfiremake miau - ipfiremake net-snmp + ipfiremake netsnmpd ipfiremake perl-DBI ipfiremake perl-DBD-mysql ipfiremake lcr @@ -622,6 +622,7 @@ buildipfire() { ipfiremake nagiosql ipfiremake iftop ipfiremake motion + ipfiremake joe echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild diff --git a/src/initscripts/init.d/net-snmp b/src/initscripts/init.d/netsnmpd similarity index 100% rename from src/initscripts/init.d/net-snmp rename to src/initscripts/init.d/netsnmpd