From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. eab3759a854442a3846548c9bae62539764796c0 Date: Mon, 02 Jun 2014 21:35:55 +0200 Message-ID: <20140602193555.C6D4221C7E@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3059921850754738172==" List-Id: --===============3059921850754738172== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via eab3759a854442a3846548c9bae62539764796c0 (commit) from 3e611b5e0301de8858cddaa9b9a9d3f8a95f4a39 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit eab3759a854442a3846548c9bae62539764796c0 Author: Arne Fitzenreiter Date: Mon Jun 2 21:34:16 2014 +0200 rootfile updates. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/armv5tel/util-linux | 1 + config/rootfiles/common/i586/util-linux | 2 +- config/rootfiles/packages/icinga | 1 + config/rootfiles/packages/nagios | 2 ++ config/rootfiles/packages/tftpd | 4 ++-- 5 files changed, 7 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/rootfiles/common/armv5tel/util-linux b/config/rootfiles/c= ommon/armv5tel/util-linux index 85b027d..c75b147 100644 --- a/config/rootfiles/common/armv5tel/util-linux +++ b/config/rootfiles/common/armv5tel/util-linux @@ -233,6 +233,7 @@ usr/sbin/rtcwake #usr/share/man/man1/ipcmk.1 #usr/share/man/man1/ipcrm.1 #usr/share/man/man1/ipcs.1 +#usr/share/man/man1/logger.1 #usr/share/man/man1/look.1 #usr/share/man/man1/lscpu.1 #usr/share/man/man1/mcookie.1 diff --git a/config/rootfiles/common/i586/util-linux b/config/rootfiles/commo= n/i586/util-linux index ea3de18..6f31cf6 100644 --- a/config/rootfiles/common/i586/util-linux +++ b/config/rootfiles/common/i586/util-linux @@ -234,6 +234,7 @@ usr/share/bash-completion #usr/share/man/man1/ipcmk.1 #usr/share/man/man1/ipcrm.1 #usr/share/man/man1/ipcs.1 +#usr/share/man/man1/logger.1 #usr/share/man/man1/look.1 #usr/share/man/man1/lscpu.1 #usr/share/man/man1/mcookie.1 @@ -303,4 +304,3 @@ usr/share/bash-completion #usr/share/man/man8/umount.8 #usr/share/man/man8/wdctl.8 #usr/share/man/man8/wipefs.8 - diff --git a/config/rootfiles/packages/icinga b/config/rootfiles/packages/ici= nga index e31b73a..caddac3 100644 --- a/config/rootfiles/packages/icinga +++ b/config/rootfiles/packages/icinga @@ -22,6 +22,7 @@ etc/rc.d/rc3.d/S67icinga etc/rc.d/rc6.d/K33icinga #usr/bin/icinga usr/bin/icingastats +#usr/lib/icinga usr/lib/icinga/p1.pl #usr/lib/icinga/plugins usr/lib/icinga/plugins/check_apt diff --git a/config/rootfiles/packages/nagios b/config/rootfiles/packages/nag= ios index f0200cb..971a360 100644 --- a/config/rootfiles/packages/nagios +++ b/config/rootfiles/packages/nagios @@ -34,6 +34,7 @@ usr/lib/nagios #usr/lib/nagios/check_file_age #usr/lib/nagios/check_flexlm #usr/lib/nagios/check_ftp +#usr/lib/nagios/check_hpjd #usr/lib/nagios/check_http #usr/lib/nagios/check_icmp #usr/lib/nagios/check_ide_smart @@ -69,6 +70,7 @@ usr/lib/nagios #usr/lib/nagios/check_sensors #usr/lib/nagios/check_simap #usr/lib/nagios/check_smtp +#usr/lib/nagios/check_snmp #usr/lib/nagios/check_spop #usr/lib/nagios/check_ssh #usr/lib/nagios/check_ssmtp diff --git a/config/rootfiles/packages/tftpd b/config/rootfiles/packages/tftpd index 55d261b..eb19657 100644 --- a/config/rootfiles/packages/tftpd +++ b/config/rootfiles/packages/tftpd @@ -1,6 +1,6 @@ -etc/rc.d/init.d/tftpd +usr/bin/tftp #usr/man/man1/tftp.1 #usr/man/man8/in.tftpd.8 #usr/man/man8/tftpd.8 usr/sbin/tftpd -#var/tftpboot +etc/rc.d/init.d/tftpd hooks/post-receive -- IPFire 2.x development tree --===============3059921850754738172==--