lwatch-cvs Mailing List for Log Watcher
Brought to you by:
arturcz
Menu
▾
▴
lwatch-cvs — lwatch CVS commit log
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(9) |
Jul
(22) |
Aug
(11) |
Sep
(5) |
Oct
|
Nov
(4) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(5) |
Feb
(29) |
Mar
(85) |
Apr
(45) |
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2004 |
Jan
(30) |
Feb
|
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(55) |
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2005 |
Jan
|
Feb
(10) |
Mar
|
Apr
|
May
|
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
(6) |
Mar
(12) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2010 |
Jan
|
Feb
(15) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Artur R. C. <ar...@us...> - 2010-07-29 17:30:47
|
Update of /cvsroot/lwatch/files/doc In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv25018/doc Modified Files: lwatch.sgml Log Message: Finally, two features are almost ready: - syslog support - run as daemon Index: lwatch.sgml =================================================================== RCS file: /cvsroot/lwatch/files/doc/lwatch.sgml,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** lwatch.sgml 12 Feb 2010 14:37:30 -0000 1.24 --- lwatch.sgml 29 Jul 2010 17:30:34 -0000 1.25 *************** *** 56,61 **** <arg>-o <replaceable>filename</replaceable></arg> <arg>--output <replaceable>filename</replaceable></arg> ! <arg>-sOhv</arg> <arg>--show-unparsed</arg> <arg>--omit-rc</arg> <arg>--help</arg> --- 56,62 ---- <arg>-o <replaceable>filename</replaceable></arg> <arg>--output <replaceable>filename</replaceable></arg> ! <arg>-sdOhv</arg> <arg>--show-unparsed</arg> + <arg>--daemon</arg> <arg>--omit-rc</arg> <arg>--help</arg> *************** *** 117,120 **** --- 118,129 ---- </listitem> </varlistentry> + + <varlistentry> + <term><option>-d</option></term> + <term><option>--daemon</option></term> + <listitem> + <para>run as daemon, detach from control terminal, move to background<!--, this is default, when run as lwatchd --></para> + </listitem> + </varlistentry> <varlistentry> <term><option>-O</option></term> *************** *** 124,127 **** --- 133,137 ---- </listitem> </varlistentry> + <varlistentry> <term><option>-h</option></term> |
|
From: Artur R. C. <ar...@us...> - 2010-07-29 17:30:06
|
Update of /cvsroot/lwatch/files In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv24865 Modified Files: configure.ac Log Message: Finally, two features are almost ready: - syslog support - run as daemon Index: configure.ac =================================================================== RCS file: /cvsroot/lwatch/files/configure.ac,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** configure.ac 28 Feb 2009 16:18:39 -0000 1.53 --- configure.ac 29 Jul 2010 17:29:55 -0000 1.54 *************** *** 32,35 **** --- 32,38 ---- [./configure options]) + AH_TEMPLATE([PIDFILE], + [./configure options]) + AH_TEMPLATE([DEBUG], [Define to 1 if you want to compile with debug support.]) *************** *** 170,173 **** --- 173,181 ---- AC_DEFINE_UNQUOTED(ALLPARAMS,"${ALLPARAMS}") + # temporary FIXME + PIDFILE=/var/run/lwatch.pid + AC_SUBST(PIDFILE) + AC_DEFINE_UNQUOTED(PIDFILE,"${PIDFILE}") + dnl Epilog AC_CONFIG_FILES([src/Makefile doc/Makefile Makefile]) |
|
From: Artur R. C. <ar...@us...> - 2010-07-29 17:03:53
|
Update of /cvsroot/lwatch/files/src In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20964 Modified Files: Makefile.am lwatch.c settings.c settings.h Added Files: daemon.c daemon.h log.c log.h Log Message: Finally, two features are almost ready: - syslog support - run as daemon Index: settings.c =================================================================== RCS file: /cvsroot/lwatch/files/src/settings.c,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** settings.c 11 Feb 2010 18:34:17 -0000 1.38 --- settings.c 29 Jul 2010 17:03:45 -0000 1.39 *************** *** 106,109 **** --- 106,111 ---- " -s, --show-unparsed", "\tshow unparsed lines (like `last message repeated X times')", + " -d, --daemon", + "\trun as daemon (move to background and detach from control terminal", " -O, --omit-rc", "\tdo not read values from config file", *************** *** 126,129 **** --- 128,132 ---- {"output",1,0,'o'}, {"show-unparsed",0,0,'s'}, + {"daemon",0,0,'d'}, {"omit-rc",0,0,'O'}, {"help",0,0,'h'}, *************** *** 172,175 **** --- 175,184 ---- #endif break; + case 'd': + lw_conf.daemon_mode=1; + #ifdef DEBUG + fprintf(stderr,"Run in daemon mode\n"); + #endif + break; case 'O': omit_config=1; --- NEW FILE: daemon.h --- /* daemon.h -- LogWatcher This file is part of the LogWatcher tool. Copyright (C) 2002-2009 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. The LogWatcher 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 the LogWatcher; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Artur R. Czechowski <ar...@he...> http://hell.pl/arturcz/ */ /* * $Id: daemon.h,v 1.1 2010/07/29 17:03:45 arturcz Exp $ * $Source: /cvsroot/lwatch/files/src/daemon.h,v $ */ void daemonize(); Index: settings.h =================================================================== RCS file: /cvsroot/lwatch/files/src/settings.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** settings.h 11 Feb 2010 18:34:17 -0000 1.17 --- settings.h 29 Jul 2010 17:03:45 -0000 1.18 *************** *** 40,43 **** --- 40,44 ---- char *out_file; int show_unparsed; + int daemon_mode; int use_syslog; int log_level; --- NEW FILE: daemon.c --- /* daemon.c - some functions useful for daemonizing the process */ /* * This file is part of the LogWatcher tool. * Copyright (C) 2009,2010 Artur R. Czechowski <ar...@he...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <errno.h> #include <fcntl.h> #include <sys/file.h> #include <sys/types.h> #include <sys/stat.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> #include "config.h" #include "log.h" #define PID_LENGTH 7 const char *pid_file=PIDFILE; static int pidfd=-1; /* Algorithm: if file does not exist create and open it else open it; remember the file descriptor try to lock the file if lock is successfull we are OK if lock failed we assume there is another copy */ int is_another_copy(void) { int res; #ifdef O_CLOEXEC pidfd=open(pid_file, O_RDWR|O_CREAT|O_CLOEXEC|O_SYNC, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); /* mode 644 */ #else pidfd=open(pid_file, O_RDWR|O_CREAT|O_SYNC, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); /* mode 644 */ #endif if(pidfd==-1) { send_log(LOG_ERR,"Cannot open PID file %s. Error [%d] %s\n", pid_file,errno,strerror(errno)); exit(1); } #ifndef O_CLOEXEC res=fcntl(pidfd,F_SETFD,FD_CLOEXEC); if(res==-1) { send_log(LOG_ERR,"Cannot set FD_CLOEXEC flag on PID file %s. " "Error [%d] %s\n", pid_file,errno,strerror(errno)); } #endif send_log(LOG_DEBUG,"Opened PID file, fd=%d\n",pidfd); res=flock(pidfd, LOCK_EX|LOCK_NB); send_log(LOG_DEBUG,"Trying to lock the pidfile with result %d\n",res); if(res==-1) { send_log(LOG_DEBUG,"Extended result is [%d] %s\n", errno,strerror(errno)); if(errno==EWOULDBLOCK) { send_log(LOG_DEBUG,"EWOULDBLOCK - other copy is running"); return 1; } send_log(LOG_ERR,"Cannot lock PID file %s. Error [%d] %s\n", pid_file,errno,strerror(errno)); exit(1); } send_log(LOG_DEBUG,"We can run!\n"); /* At the moment we have exclusive access to the file, that means no other copy is running */ return 0; } void write_pidfile(void) { char pid_string[PID_LENGTH]; int res; if(pidfd==-1) { send_log(LOG_ERR,"PID file is unavailable for some reason. Please see syslog for hints. If still in doubt please send us a bugreport.\n"); exit(1); } if(snprintf(pid_string,PID_LENGTH,"%i\n",getpid())==-1) { send_log(LOG_ERR,"PID_LENGTH should be increased, please, send us a bugreport.\n"); exit(1); } send_log(LOG_DEBUG,"Write PID %s(%d) to file fd=%d\n",pid_string,strlen(pid_string),pidfd); res=write(pidfd,(void*)pid_string,strlen(pid_string)); if(res==-1) { send_log(LOG_ERR,"Cannot write to PID file [%d] %s\n", errno,strerror(errno)); exit(1); } } void release_pidfile() { close(pidfd); unlink(PIDFILE); /* FIXME-ac error handling */ } void daemonize() { send_log(LOG_ERR,"%s %d: daemonize not implemented yet", __FILE__, __LINE__); exit(1); } Index: lwatch.c =================================================================== RCS file: /cvsroot/lwatch/files/src/lwatch.c,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** lwatch.c 11 Feb 2010 18:34:17 -0000 1.29 --- lwatch.c 29 Jul 2010 17:03:45 -0000 1.30 *************** *** 42,45 **** --- 42,46 ---- #include "config.h" #include "control.h" + #include "daemon.h" #include "defaults.h" #include "settings.h" *************** *** 96,99 **** --- 97,104 ---- input.fd=fd; input.events=POLLIN|POLLHUP; + + if(lw_conf.daemon_mode) + daemonize(); + while(loop) { input.revents=0; --- NEW FILE: log.c --- /* log.c - syslog support, output errors */ /* * This file is part of the LogWatcher tool. * Copyright (C) 2003,2010 Artur R. Czechowski <ar...@he...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <stdio.h> #include <stdarg.h> #include <stdlib.h> #include "log.h" #include "settings.h" int logger_subsystem_initialized=1; void start_log(void) { openlog("rrdcollect",LOG_CONS|LOG_PID,LOG_DAEMON); logger_subsystem_initialized=1; } void stop_log(void) { closelog(); logger_subsystem_initialized=0; } void send_log(int prio, char *fmt, ...) { va_list ap; va_start(ap,fmt); if(!logger_subsystem_initialized) { vfprintf(stderr,fmt,ap); fprintf(stderr,"send_log: Fatal error. Logger subsystem uninitialized. Please send a bugreport.\n"); exit(1); } if(prio<=lw_conf.log_level) vsyslog(prio,fmt,ap); va_end(ap); } Index: Makefile.am =================================================================== RCS file: /cvsroot/lwatch/files/src/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Makefile.am 16 Feb 2010 14:10:45 -0000 1.11 --- Makefile.am 29 Jul 2010 17:03:45 -0000 1.12 *************** *** 1,5 **** bin_PROGRAMS = lwatch ! xh = acolors.h control.h defaults.h settings.h strpcre.h yparse.h ! lwatch_SOURCES = acolors.c control.c lwatch.c settings.c strpcre.c yparse.l $(xh) dist_sysconf_DATA = lwatch.conf CLEANFILES = stamp-h.in *~ --- 1,5 ---- bin_PROGRAMS = lwatch ! xh = acolors.h control.h daemon.h defaults.h log.h settings.h strpcre.h yparse.h ! lwatch_SOURCES = acolors.c control.c daemon.c log.c lwatch.c settings.c strpcre.c yparse.l $(xh) dist_sysconf_DATA = lwatch.conf CLEANFILES = stamp-h.in *~ --- NEW FILE: log.h --- /* log.h - syslog support, output errors */ /* * This file is part of the LogWatcher tool. * Copyright (C) 2003,2010 Artur R. Czechowski <ar...@he...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <syslog.h> extern int debuglevel; void start_log(void); void stop_log(void); void send_log(int prio, char *fmt, ...); |
|
From: Artur R. C. <ar...@us...> - 2010-02-16 16:01:31
|
Update of /cvsroot/lwatch/files In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv31612 Modified Files: README.cvs Log Message: autoheader shall be run too Index: README.cvs =================================================================== RCS file: /cvsroot/lwatch/files/README.cvs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** README.cvs 21 Mar 2009 10:34:00 -0000 1.5 --- README.cvs 16 Feb 2010 16:01:22 -0000 1.6 *************** *** 27,31 **** If you have all above installed on your box just run following sequence: ! aclocal && automake && autoconf See README for more information about building lwatch from sources. --- 27,31 ---- If you have all above installed on your box just run following sequence: ! aclocal && autoheader && automake && autoconf See README for more information about building lwatch from sources. |
|
From: Artur R. C. <ar...@us...> - 2010-02-16 15:57:31
|
Update of /cvsroot/lwatch/files In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv28114 Modified Files: ChangeLog Log Message: typo Index: ChangeLog =================================================================== RCS file: /cvsroot/lwatch/files/ChangeLog,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** ChangeLog 16 Feb 2010 14:12:29 -0000 1.45 --- ChangeLog 16 Feb 2010 15:57:23 -0000 1.46 *************** *** 60,64 **** - bugfix: yes and no was negated (arturcz) - some typos corrected (arturcz) ! - build-in default for input file could be replaced during build time (arturcz) - legal stuff required by PCRE (arturcz) --- 60,64 ---- - bugfix: yes and no was negated (arturcz) - some typos corrected (arturcz) ! - built-in default for input file could be replaced during build time (arturcz) - legal stuff required by PCRE (arturcz) |
|
From: Artur R. C. <ar...@us...> - 2010-02-16 15:52:27
|
Update of /cvsroot/lwatch/files In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv23889 Modified Files: TODO Log Message: Won't do a syslog support. It could leads to infinite loop in some cases. Index: TODO =================================================================== RCS file: /cvsroot/lwatch/files/TODO,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** TODO 16 Feb 2010 14:50:11 -0000 1.52 --- TODO 16 Feb 2010 15:52:18 -0000 1.53 *************** *** 2,7 **** $Source$ - - optional syslog support - - debug/error messages should be optionally printed to syslog - signal handling (reload configuration, reexec program) - run as daemon --- 2,5 ---- |
|
From: Artur R. C. <ar...@us...> - 2010-02-16 14:50:19
|
Update of /cvsroot/lwatch/files In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv32741 Modified Files: TODO Log Message: Consider this roadmap rather as a general direction, not detailed promise. Index: TODO =================================================================== RCS file: /cvsroot/lwatch/files/TODO,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** TODO 28 Nov 2009 15:29:14 -0000 1.51 --- TODO 16 Feb 2010 14:50:11 -0000 1.52 *************** *** 2,6 **** $Source$ - Later (for 0.6): - optional syslog support - debug/error messages should be optionally printed to syslog --- 2,5 ---- *************** *** 13,17 **** - allow matching for different part of message in one rule - Later (most probably after 1.0): - extended rules: conditions, nested rules - user defined input format --- 12,15 ---- |
|
From: Artur R. C. <ar...@us...> - 2010-02-16 14:12:37
|
Update of /cvsroot/lwatch/files In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22803 Modified Files: ChangeLog Log Message: Some subtle details to ChangeLog. Index: ChangeLog =================================================================== RCS file: /cvsroot/lwatch/files/ChangeLog,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** ChangeLog 16 Feb 2010 14:10:45 -0000 1.44 --- ChangeLog 16 Feb 2010 14:12:29 -0000 1.45 *************** *** 1,7 **** ! 0.6: - it compiles under GNU/Hurd now - typos in documentation fixed - some updates in README - removed obviously obsoleted information - provide packaging/lwatch.spec to build packages for rpm based ! distributions, thanks to Soeren - revert change made in 0.4 - now we do not create default input_file during make install, this shall be done by the user, administrator --- 1,7 ---- ! 0.6: - it compiles under Debian GNU/Hurd now - typos in documentation fixed - some updates in README - removed obviously obsoleted information - provide packaging/lwatch.spec to build packages for rpm based ! distributions, thanks to Soeren (SF#2945844) - revert change made in 0.4 - now we do not create default input_file during make install, this shall be done by the user, administrator |
|
From: Artur R. C. <ar...@us...> - 2010-02-16 14:10:53
|
Update of /cvsroot/lwatch/files In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22256 Modified Files: ChangeLog Log Message: Do not create named fifo during make install. Let it be done by user, administrator or packager. Index: ChangeLog =================================================================== RCS file: /cvsroot/lwatch/files/ChangeLog,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** ChangeLog 16 Feb 2010 13:48:26 -0000 1.43 --- ChangeLog 16 Feb 2010 14:10:45 -0000 1.44 *************** *** 4,7 **** --- 4,10 ---- - provide packaging/lwatch.spec to build packages for rpm based distributions, thanks to Soeren + - revert change made in 0.4 - now we do not create default input_file + during make install, this shall be done by the user, administrator + or packager 0.5: - permanently remove input_fifo, --fifo and -f |
|
From: Artur R. C. <ar...@us...> - 2010-02-16 14:10:53
|
Update of /cvsroot/lwatch/files/src In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22256/src Modified Files: Makefile.am Log Message: Do not create named fifo during make install. Let it be done by user, administrator or packager. Index: Makefile.am =================================================================== RCS file: /cvsroot/lwatch/files/src/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile.am 22 Mar 2009 17:21:28 -0000 1.10 --- Makefile.am 16 Feb 2010 14:10:45 -0000 1.11 *************** *** 4,9 **** dist_sysconf_DATA = lwatch.conf CLEANFILES = stamp-h.in *~ - - install-data-hook: - mkdir -p `echo $(DESTDIR)@INPUTFILE@ | $(SED) -e 's#/[^/]*$$##'` - mknod $(DESTDIR)@INPUTFILE@ p --- 4,5 ---- |
|
From: Artur R. C. <ar...@us...> - 2010-02-16 13:54:16
|
Update of /cvsroot/lwatch/files/src In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv18812 Removed Files: config.h.in Log Message: This file is generated by autotools. Don't keep it in CVS. --- config.h.in DELETED --- |
|
From: Artur R. C. <ar...@us...> - 2010-02-16 13:51:55
|
Update of /cvsroot/lwatch/files/packaging In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv16901 Added Files: lwatch.spec Log Message: lwatch.spec - closes SF:#2945844 --- NEW FILE: lwatch.spec --- Name: lwatch Version: 0.5 Release: 1%{?dist} Summary: Colourizing a system logs for easier reading. License: GPL URL: http://sourceforge.net/projects/lwatch Source0: http://downloads.sourceforge.net/project/lwatch/lwatch/0.5/lwatch-0.5.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: sed flex docbook-utils pcre-devel Requires: pcre %description Colourizing a system logs for easier reading. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING INSTALL NEWS README TODO ChangeLog %{_bindir}/* %{_mandir}/man?/%{name}* %config(noreplace) %{_sysconfdir}/lwatch.conf %changelog * Thu Feb 04 2010 Soeren grunewald <soe...@gm...> - 0.5-1 - Initial build |
|
From: Artur R. C. <ar...@us...> - 2010-02-16 13:48:38
|
Update of /cvsroot/lwatch/files In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv16075 Modified Files: ChangeLog Makefile.am Log Message: lwatch.spec - closes SF:#2945844 Index: Makefile.am =================================================================== RCS file: /cvsroot/lwatch/files/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.am 4 Jun 2005 23:26:17 -0000 1.6 --- Makefile.am 16 Feb 2010 13:48:26 -0000 1.7 *************** *** 1,3 **** SUBDIRS = src doc ! EXTRA_DIST = contrib/lwatch.jl --- 1,5 ---- SUBDIRS = src doc ! PACKAGING=packaging/lwatch.spec ! ! EXTRA_DIST = contrib/lwatch.jl $(PACKAGING) Index: ChangeLog =================================================================== RCS file: /cvsroot/lwatch/files/ChangeLog,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** ChangeLog 12 Feb 2010 14:55:56 -0000 1.42 --- ChangeLog 16 Feb 2010 13:48:26 -0000 1.43 *************** *** 2,5 **** --- 2,7 ---- - typos in documentation fixed - some updates in README - removed obviously obsoleted information + - provide packaging/lwatch.spec to build packages for rpm based + distributions, thanks to Soeren 0.5: - permanently remove input_fifo, --fifo and -f |
|
From: Artur R. C. <ar...@us...> - 2010-02-16 13:43:03
|
Update of /cvsroot/lwatch/files/packaging In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15168/packaging Log Message: Directory /cvsroot/lwatch/files/packaging added to the repository |
|
From: Artur R. C. <ar...@us...> - 2010-02-12 15:54:22
|
Update of /cvsroot/lwatch/files In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv11674 Modified Files: ChangeLog README Log Message: Removed obviously obsoleted information from README: - email for xinu does not work - lwatch port for OpenBSD does not exist as mentioned in the file - Linux is Linux is Linux, all the same Index: README =================================================================== RCS file: /cvsroot/lwatch/files/README,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** README 15 Dec 2004 08:27:46 -0000 1.28 --- README 12 Feb 2010 14:55:56 -0000 1.29 *************** *** 85,90 **** * Cygwin ! Bartek Tomicki told me that lwatch compiles and runs on cygwin without any ! problemes. You can contact him at xi...@bl... * FreeBSD --- 85,90 ---- * Cygwin ! Bartek 'xinu' Tomicki told me that lwatch compiles and runs on cygwin without ! any problemes. * FreeBSD *************** *** 92,105 **** Use `gmake' instead of `make' ! * OpenBSD ! Aleksander Piotrowski <ale...@ni...> maintains an OpenBSD ! port which is available on http://ports.openbsd.pl/info/sysutils-lwatch.html ! ! * Linux on i386 No additional packages required. - * Linux on other architectures - No experiences. Feedback mostly welcomed. - * Solaris - not tested Read following resources: --- 92,98 ---- Use `gmake' instead of `make' ! * Linux No additional packages required. * Solaris - not tested Read following resources: Index: ChangeLog =================================================================== RCS file: /cvsroot/lwatch/files/ChangeLog,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** ChangeLog 12 Feb 2010 14:43:28 -0000 1.41 --- ChangeLog 12 Feb 2010 14:55:56 -0000 1.42 *************** *** 1,4 **** --- 1,5 ---- 0.6: - it compiles under GNU/Hurd now - typos in documentation fixed + - some updates in README - removed obviously obsoleted information 0.5: - permanently remove input_fifo, --fifo and -f |
|
From: Artur R. C. <ar...@us...> - 2010-02-12 14:43:59
|
Update of /cvsroot/lwatch/files In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv10529 Modified Files: ChangeLog Log Message: Updated ChangeLog Index: ChangeLog =================================================================== RCS file: /cvsroot/lwatch/files/ChangeLog,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** ChangeLog 28 Nov 2009 15:32:34 -0000 1.40 --- ChangeLog 12 Feb 2010 14:43:28 -0000 1.41 *************** *** 1,2 **** --- 1,5 ---- + 0.6: - it compiles under GNU/Hurd now + - typos in documentation fixed + 0.5: - permanently remove input_fifo, --fifo and -f - dumping ./configure flags when run with -v |
|
From: Artur R. C. <ar...@us...> - 2010-02-12 14:37:41
|
Update of /cvsroot/lwatch/files/doc In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv9879 Modified Files: lwatch.conf.sgml lwatch.sgml Log Message: Fix typos. Remove some unneeded comments. Index: lwatch.conf.sgml =================================================================== RCS file: /cvsroot/lwatch/files/doc/lwatch.conf.sgml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** lwatch.conf.sgml 23 Mar 2009 21:15:34 -0000 1.10 --- lwatch.conf.sgml 12 Feb 2010 14:37:30 -0000 1.11 *************** *** 76,80 **** <para><option>output_file</option> - where lwatch output colored data; built-in default is stdout (-), could be overwritten with command line option <option>-o</option></para> <para><option>show_unparsed</option> - by default lwatch ignores ! lines which cannot be splitted into date, host, service and message, set this variable to yes if you would like to see those lines; it is the same as command line option <option>-s</option></para> </refsect2> --- 76,80 ---- <para><option>output_file</option> - where lwatch output colored data; built-in default is stdout (-), could be overwritten with command line option <option>-o</option></para> <para><option>show_unparsed</option> - by default lwatch ignores ! lines which cannot be split into date, host, service and message, set this variable to yes if you would like to see those lines; it is the same as command line option <option>-s</option></para> </refsect2> *************** *** 176,180 **** <itemizedlist mark="dash" spacing="compact"> <listitem><para>fifo must exist</para></listitem> ! <listitem><para>proper name must be put in &conf; or given with -i comand line option</para></listitem> </itemizedlist> </para> --- 176,180 ---- <itemizedlist mark="dash" spacing="compact"> <listitem><para>fifo must exist</para></listitem> ! <listitem><para>proper name must be put in &conf; or given with -i command line option</para></listitem> </itemizedlist> </para> Index: lwatch.sgml =================================================================== RCS file: /cvsroot/lwatch/files/doc/lwatch.sgml,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** lwatch.sgml 23 Mar 2009 21:00:59 -0000 1.23 --- lwatch.sgml 12 Feb 2010 14:37:30 -0000 1.24 *************** *** 84,98 **** </refsect1> - <!-- Piszemy lwatch.conf(5) - <refsect1> - <title>CONFIGURATION FILE</title> - <para>There is no documentation for configuration file as for now. Look at - provided file, there are a lot of comments there.</para> - <para>I am going to make some changes in configuration file before - 1.0-stable release. I will also provide docs about how to configure lwatch - in this release.</para> - </refsect1> - --> - <refsect1> <title>COMMAND LINE OPTIONS</title> --- 84,87 ---- *************** *** 177,181 **** <itemizedlist mark="dash" spacing="compact"> <listitem><para>fifo must exist</para></listitem> ! <listitem><para>proper name must be put in &conf; or given with -i comand line option</para></listitem> </itemizedlist> </para> --- 166,170 ---- <itemizedlist mark="dash" spacing="compact"> <listitem><para>fifo must exist</para></listitem> ! <listitem><para>proper name must be put in &conf; or given with -i command line option</para></listitem> </itemizedlist> </para> |
|
From: Artur R. C. <ar...@us...> - 2010-02-11 18:34:26
|
Update of /cvsroot/lwatch/files/src In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv23508/src Modified Files: config.h.in lwatch.c settings.c settings.h yparse.l Log Message: Do not use the MAXPATHLEN symbol, but allocate (and free) strings dynamically. It shall be buildable on hurd now. Index: settings.c =================================================================== RCS file: /cvsroot/lwatch/files/src/settings.c,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** settings.c 23 Mar 2009 21:18:37 -0000 1.37 --- settings.c 11 Feb 2010 18:34:17 -0000 1.38 *************** *** 145,176 **** switch(c) { case 'C': ! if(strlen(optarg)>MAXPATHLEN) { ! die("Filename too long (%i bytes)\n",strlen(optarg)); ! } else { ! strncpy(lw_conf.conf_file,optarg,MAXPATHLEN); #ifdef DEBUG ! fprintf(stderr,"Configuration file set to: %s\n",lw_conf.conf_file); #endif - } break; case 'i': ! if(strlen(optarg)>MAXPATHLEN) { ! die("Input filename too long (%i bytes)\n",strlen(optarg)); ! } else { ! strncpy(lw_conf.in_file,optarg,MAXPATHLEN); #ifdef DEBUG ! fprintf(stderr,"Input file set to: %s\n",lw_conf.in_file); #endif - } break; case 'o': ! if(strlen(optarg)>MAXPATHLEN) { ! die("Output filename too long (%i bytes)\n",strlen(optarg)); ! } else { ! strncpy(lw_conf.out_file,optarg,MAXPATHLEN); #ifdef DEBUG ! fprintf(stderr,"Output file set to: %s\n",lw_conf.out_file); #endif - } break; case 's': --- 145,168 ---- switch(c) { case 'C': ! lw_conf.conf_file=strdup(optarg); #ifdef DEBUG ! fprintf(stderr,"Configuration file set to: %s\n",lw_conf.conf_file); #endif break; case 'i': ! if(lw_conf.in_file) ! free(lw_conf.in_file); ! lw_conf.in_file=strdup(optarg); #ifdef DEBUG ! fprintf(stderr,"Input file set to: %s\n",lw_conf.in_file); #endif break; case 'o': ! if(lw_conf.out_file) ! free(lw_conf.out_file); ! lw_conf.out_file=strdup(optarg); #ifdef DEBUG ! fprintf(stderr,"Output file set to: %s\n",lw_conf.out_file); #endif break; case 's': *************** *** 210,215 **** if(omit_config) return; ! if(!strlen(lw_conf.conf_file)) ! strncpy(lw_conf.conf_file,DEF_CONF_FILE,MAXPATHLEN); #ifdef DEBUG fprintf(stderr,"Open config file: %s\n",lw_conf.conf_file); --- 202,207 ---- if(omit_config) return; ! if(!lw_conf.conf_file) ! lw_conf.conf_file=strdup(DEF_CONF_FILE); #ifdef DEBUG fprintf(stderr,"Open config file: %s\n",lw_conf.conf_file); *************** *** 286,288 **** --- 278,286 ---- fprintf(stderr,"Freed memory for actions\n"); #endif + if(lw_conf.in_file) + free(lw_conf.in_file); + if(lw_conf.out_file) + free(lw_conf.out_file); + if(lw_conf.conf_file) + free(lw_conf.conf_file); } Index: lwatch.c =================================================================== RCS file: /cvsroot/lwatch/files/src/lwatch.c,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** lwatch.c 21 Mar 2009 10:54:34 -0000 1.28 --- lwatch.c 11 Feb 2010 18:34:17 -0000 1.29 *************** *** 60,67 **** parse_config(); /*** Tymczasowo ***/ ! if(!strlen(lw_conf.in_file)) ! strncpy(lw_conf.in_file,DEF_IN_FILE,MAXPATHLEN); ! if(!strlen(lw_conf.out_file)) ! strncpy(lw_conf.out_file,DEF_OUT_FILE,MAXPATHLEN); /******************/ set_handlers(); --- 60,67 ---- parse_config(); /*** Tymczasowo ***/ ! if(!lw_conf.in_file) ! lw_conf.in_file=strdup(DEF_IN_FILE); ! if(!lw_conf.out_file) ! lw_conf.out_file=strdup(DEF_OUT_FILE); /******************/ set_handlers(); Index: settings.h =================================================================== RCS file: /cvsroot/lwatch/files/src/settings.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** settings.h 23 Mar 2009 21:15:34 -0000 1.16 --- settings.h 11 Feb 2010 18:34:17 -0000 1.17 *************** *** 30,34 **** */ - #include <sys/param.h> /* for MAXPATHLEN */ #include <pcre.h> --- 30,33 ---- *************** *** 37,43 **** struct s_conf { int def_date_color,def_host_color,def_serv_color,def_mesg_color; ! char conf_file[MAXPATHLEN+1]; ! char in_file[MAXPATHLEN+1]; ! char out_file[MAXPATHLEN+1]; int show_unparsed; int use_syslog; --- 36,42 ---- struct s_conf { int def_date_color,def_host_color,def_serv_color,def_mesg_color; ! char *conf_file; ! char *in_file; ! char *out_file; int show_unparsed; int use_syslog; Index: yparse.l =================================================================== RCS file: /cvsroot/lwatch/files/src/yparse.l,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** yparse.l 23 Mar 2009 21:15:34 -0000 1.31 --- yparse.l 11 Feb 2010 18:34:17 -0000 1.32 *************** *** 46,49 **** --- 46,50 ---- int *yyip; char *yypch; + char **yyppch; int lineno=1; *************** *** 70,74 **** %} ! %option noyywrap nounput M_KEYWORD input_file|output_file|show_unparsed|cfg_ver|use_syslog|log_level|rule_action --- 71,75 ---- %} ! %option noyywrap nounput noinput M_KEYWORD input_file|output_file|show_unparsed|cfg_ver|use_syslog|log_level|rule_action *************** *** 107,115 **** <INITIAL>input_file= { PUSH(TEXT); ! yypch=lw_conf.in_file; #ifdef DEBUG strcpy(mymsg,"input_file"); #endif } <INITIAL>rule_action= { PUSH(RULEACTION); --- 108,123 ---- <INITIAL>input_file= { PUSH(TEXT); ! yyppch=&lw_conf.in_file; #ifdef DEBUG strcpy(mymsg,"input_file"); #endif } + <INITIAL>output_file= { + PUSH(TEXT); + yyppch=&lw_conf.out_file; + #ifdef DEBUG + strcpy(mymsg,"output_file"); + #endif + } <INITIAL>rule_action= { PUSH(RULEACTION); *************** *** 120,130 **** } - <INITIAL>output_file= { - PUSH(TEXT); - yypch=lw_conf.out_file; - #ifdef DEBUG - strcpy(mymsg,"output_file"); - #endif - } <INITIAL>show_unparsed= { PUSH(BOOLEAN); --- 128,131 ---- *************** *** 228,236 **** } <TEXT>{TEXT} { ! if(strlen(yytext)>MAXPATHLEN) { ! die("Filename too long: %s\n",yytext); ! } ! if(!strlen(yypch)) { ! strcpy(yypch,yytext); #ifdef DEBUG fprintf(stderr,"Set %s to %s\n",mymsg,yytext); --- 229,234 ---- } <TEXT>{TEXT} { ! if(!*yyppch) { ! *yyppch=strdup(yytext); #ifdef DEBUG fprintf(stderr,"Set %s to %s\n",mymsg,yytext); Index: config.h.in =================================================================== RCS file: /cvsroot/lwatch/files/src/config.h.in,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** config.h.in 28 Nov 2009 15:32:35 -0000 1.19 --- config.h.in 11 Feb 2010 18:34:17 -0000 1.20 *************** *** 108,114 **** #undef PACKAGE_TARNAME - /* Define to the home page for this package. */ - #undef PACKAGE_URL - /* Define to the version of this package. */ #undef PACKAGE_VERSION --- 108,111 ---- |
|
From: Artur R. C. <ar...@us...> - 2009-11-28 15:32:50
|
Update of /cvsroot/lwatch/files/src In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv6926/src Modified Files: config.h.in Log Message: Updated autotools stuff. Get ready for release. Index: config.h.in =================================================================== RCS file: /cvsroot/lwatch/files/src/config.h.in,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** config.h.in 28 Feb 2009 16:18:39 -0000 1.18 --- config.h.in 28 Nov 2009 15:32:35 -0000 1.19 *************** *** 108,111 **** --- 108,114 ---- #undef PACKAGE_TARNAME + /* Define to the home page for this package. */ + #undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION |
|
From: Artur R. C. <ar...@us...> - 2009-11-28 15:32:43
|
Update of /cvsroot/lwatch/files In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv6926 Modified Files: ChangeLog config.guess config.sub Log Message: Updated autotools stuff. Get ready for release. Index: config.guess =================================================================== RCS file: /cvsroot/lwatch/files/config.guess,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** config.guess 7 Jul 2007 15:37:55 -0000 1.7 --- config.guess 28 Nov 2009 15:32:35 -0000 1.8 *************** *** 2,9 **** # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, ! # Inc. ! timestamp='2007-03-06' # This file is free software; you can redistribute it and/or modify it --- 2,9 ---- # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 ! # Free Software Foundation, Inc. ! timestamp='2009-06-10' # This file is free software; you can redistribute it and/or modify it *************** *** 57,62 **** Originally written by Per Bothner. ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 ! Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO --- 57,62 ---- Originally written by Per Bothner. ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, ! 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO *************** *** 171,175 **** eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ ! | grep __ELF__ >/dev/null then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). --- 171,175 ---- eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ ! | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). *************** *** 325,328 **** --- 325,331 ---- sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` *************** *** 331,336 **** echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; ! i86pc:SunOS:5.*:*) ! echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) --- 334,352 ---- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; ! i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) ! eval $set_cc_for_build ! SUN_ARCH="i386" ! # If there is a compiler, see if it is configured for 64-bit objects. ! # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ! # This test works for both compilers. ! if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ! if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ! (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ! grep IS_64BIT_ARCH >/dev/null ! then ! SUN_ARCH="x86_64" ! fi ! fi ! echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) *************** *** 533,537 **** fi exit ;; ! *:AIX:*:[45]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then --- 549,553 ---- fi exit ;; ! *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then *************** *** 641,645 **** if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | ! grep __LP64__ >/dev/null then HP_ARCH="hppa2.0w" --- 657,661 ---- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | ! grep -q __LP64__ then HP_ARCH="hppa2.0w" *************** *** 794,807 **** *:Interix*:[3456]*) case ${UNAME_MACHINE} in ! x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; ! EM64T | authenticamd) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? --- 810,829 ---- *:Interix*:[3456]*) case ${UNAME_MACHINE} in ! x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; ! EM64T | authenticamd | genuineintel) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? *************** *** 834,838 **** exit ;; arm*:Linux:*:*) ! echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; avr32*:Linux:*:*) --- 856,867 ---- exit ;; arm*:Linux:*:*) ! eval $set_cc_for_build ! if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ ! | grep -q __ARM_EABI__ ! then ! echo ${UNAME_MACHINE}-unknown-linux-gnu ! else ! echo ${UNAME_MACHINE}-unknown-linux-gnueabi ! fi exit ;; avr32*:Linux:*:*) *************** *** 857,894 **** echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; ! mips:Linux:*:*) ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #undef CPU ! #undef mips ! #undef mipsel ! #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ! CPU=mipsel ! #else ! #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ! CPU=mips ! #else ! CPU= ! #endif ! #endif ! EOF ! eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' ! /^CPU/{ ! s: ::g ! p ! }'`" ! test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ! ;; ! mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU ! #undef mips64 ! #undef mips64el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ! CPU=mips64el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ! CPU=mips64 #else CPU= --- 886,900 ---- echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; ! mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU ! #undef ${UNAME_MACHINE} ! #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ! CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ! CPU=${UNAME_MACHINE} #else CPU= *************** *** 922,929 **** EV68*) UNAME_MACHINE=alphaev68 ;; esac ! objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level --- 928,938 ---- EV68*) UNAME_MACHINE=alphaev68 ;; esac ! objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level *************** *** 955,960 **** echo x86_64-unknown-linux-gnu exit ;; ! xtensa:Linux:*:*) ! echo xtensa-unknown-linux-gnu exit ;; i*86:Linux:*:*) --- 964,969 ---- echo x86_64-unknown-linux-gnu exit ;; ! xtensa*:Linux:*:*) ! echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) *************** *** 973,987 **** TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; esac # Determine whether the default compiler is a.out or elf --- 982,985 ---- *************** *** 1049,1053 **** echo ${UNAME_MACHINE}-pc-syllable exit ;; ! i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; --- 1047,1051 ---- echo ${UNAME_MACHINE}-pc-syllable exit ;; ! i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; *************** *** 1093,1098 **** # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about ! # the processor, so we play safe by assuming i386. ! echo i386-pc-msdosdjgpp exit ;; Intel:Mach:3*:*) --- 1091,1099 ---- # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about ! # the processor, so we play safe by assuming i586. ! # Note: whatever this is, it MUST be the same as what config.sub ! # prints for the "djgpp" host, or else GDB configury will decide that ! # this is a cross-build. ! echo i586-pc-msdosdjgpp exit ;; Intel:Mach:3*:*) *************** *** 1132,1135 **** --- 1133,1146 ---- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} *************** *** 1144,1148 **** echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; ! PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; --- 1155,1159 ---- echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; ! PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; *************** *** 1207,1210 **** --- 1218,1224 ---- echo i586-pc-beos exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} *************** *** 1315,1318 **** --- 1329,1335 ---- echo ${UNAME_MACHINE}-pc-rdos exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; esac *************** *** 1475,1481 **** download the most up to date version of the config scripts from ! http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess and ! http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub If the version you run ($0) is already up to date, please --- 1492,1498 ---- download the most up to date version of the config scripts from ! http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD and ! http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please Index: config.sub =================================================================== RCS file: /cvsroot/lwatch/files/config.sub,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** config.sub 7 Jul 2007 15:37:55 -0000 1.7 --- config.sub 28 Nov 2009 15:32:35 -0000 1.8 *************** *** 2,9 **** # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, ! # Inc. ! timestamp='2007-01-18' # This file is (in principle) common to ALL GNU software. --- 2,9 ---- # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 ! # Free Software Foundation, Inc. ! timestamp='2009-06-11' # This file is (in principle) common to ALL GNU software. *************** *** 73,78 **** GNU config.sub ($timestamp) ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 ! Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO --- 73,78 ---- GNU config.sub ($timestamp) ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, ! 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO *************** *** 123,126 **** --- 123,127 ---- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os *************** *** 153,156 **** --- 154,160 ---- basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= *************** *** 250,260 **** | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ ! | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ ! | mips64vr | mips64vrel \ | mips64orion | mips64orionel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ --- 254,267 ---- | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ ! | maxq | mb | microblaze | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ ! | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ *************** *** 269,272 **** --- 276,280 ---- | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | moxie \ | mt \ | msp430 \ *************** *** 278,282 **** | pyramid \ | score \ ! | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ --- 286,290 ---- | pyramid \ | score \ ! | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ *************** *** 287,291 **** | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ ! | z8k) basic_machine=$basic_machine-unknown ;; --- 295,299 ---- | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ ! | z8k | z80) basic_machine=$basic_machine-unknown ;; *************** *** 330,341 **** | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ! | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ ! | mips64vr-* | mips64vrel-* \ | mips64orion-* | mips64orionel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ --- 338,352 ---- | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ! | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ ! | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ *************** *** 359,363 **** | pyramid-* \ | romp-* | rs6000-* \ ! | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ --- 370,374 ---- | pyramid-* \ | romp-* | rs6000-* \ ! | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ *************** *** 365,376 **** | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ ! | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ ! | xstormy16-* | xtensa-* \ | ymp-* \ ! | z8k-*) ;; # Recognize the various machine names and aliases which stand --- 376,391 ---- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ ! | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ ! | xstormy16-* | xtensa*-* \ | ymp-* \ ! | z8k-* | z80-*) ! ;; ! # Recognize the basic CPU types without company name, with glob match. ! xtensa*) ! basic_machine=$basic_machine-unknown ;; # Recognize the various machine names and aliases which stand *************** *** 436,439 **** --- 451,458 ---- os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple *************** *** 444,451 **** --- 463,486 ---- os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; c90) basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex *************** *** 476,481 **** os=-unicosmp ;; ! cr16c) ! basic_machine=cr16c-unknown os=-elf ;; --- 511,516 ---- os=-unicosmp ;; ! cr16) ! basic_machine=cr16-unknown os=-elf ;; *************** *** 515,518 **** --- 550,557 ---- os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; djgpp) basic_machine=i586-pc *************** *** 669,672 **** --- 708,719 ---- os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron *************** *** 684,687 **** --- 731,738 ---- os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent *************** *** 810,813 **** --- 861,872 ---- os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti *************** *** 1018,1021 **** --- 1077,1084 ---- os=-coff ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown *************** *** 1093,1096 **** --- 1156,1163 ---- os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none *************** *** 1131,1135 **** basic_machine=we32k-att ;; ! sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; --- 1198,1202 ---- basic_machine=we32k-att ;; ! sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; *************** *** 1201,1208 **** # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ ! | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ ! | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ --- 1268,1276 ---- # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ ! | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ ! | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ *************** *** 1213,1217 **** | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ! | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ --- 1281,1285 ---- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ! | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ *************** *** 1353,1356 **** --- 1421,1427 ---- os=-zvmoe ;; + -dicos*) + os=-dicos + ;; -none) ;; *************** *** 1550,1554 **** vendor=sun ;; ! -aix*) vendor=ibm ;; --- 1621,1625 ---- vendor=sun ;; ! -cnk*|-aix*) vendor=ibm ;; Index: ChangeLog =================================================================== RCS file: /cvsroot/lwatch/files/ChangeLog,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** ChangeLog 23 Mar 2009 21:15:34 -0000 1.39 --- ChangeLog 28 Nov 2009 15:32:34 -0000 1.40 *************** *** 1,3 **** ! pre0.5: - permanently remove input_fifo, --fifo and -f - dumping ./configure flags when run with -v - added contrib/lwatch.jl for sawfish, thanks to Jakub Turski --- 1,3 ---- ! 0.5: - permanently remove input_fifo, --fifo and -f - dumping ./configure flags when run with -v - added contrib/lwatch.jl for sawfish, thanks to Jakub Turski *************** *** 11,14 **** --- 11,16 ---- see lwatch.conf(5) for details, thanks to Julien Sterckeman for idea + - updated config.{sub,guess} + - updated autotools 0.4.1: - manual typos (arturcz) |
|
From: Artur R. C. <ar...@us...> - 2009-11-28 15:29:29
|
Update of /cvsroot/lwatch/files In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv6223 Modified Files: TODO Log Message: Let's release it as is. The other stuff foreseen for 0.5 will be added in minor releases (or not). Index: TODO =================================================================== RCS file: /cvsroot/lwatch/files/TODO,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** TODO 23 Mar 2009 21:31:15 -0000 1.50 --- TODO 28 Nov 2009 15:29:14 -0000 1.51 *************** *** 2,6 **** $Source$ ! Now (for 0.5): - optional syslog support - debug/error messages should be optionally printed to syslog --- 2,6 ---- $Source$ ! Later (for 0.6): - optional syslog support - debug/error messages should be optionally printed to syslog *************** *** 8,13 **** - run as daemon - dealing with ip's in logs - - Later (for 0.6): - timers - counters --- 8,11 ---- |
|
From: Artur R. C. <ar...@us...> - 2009-03-23 21:31:24
|
Update of /cvsroot/lwatch/files In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24568 Modified Files: TODO Log Message: Useful idea from Julien Sterckeman. Index: TODO =================================================================== RCS file: /cvsroot/lwatch/files/TODO,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** TODO 28 Feb 2009 16:43:29 -0000 1.49 --- TODO 23 Mar 2009 21:31:15 -0000 1.50 *************** *** 13,16 **** --- 13,17 ---- - counters - running external program as action + - allow matching for different part of message in one rule Later (most probably after 1.0): |
|
From: Artur R. C. <ar...@us...> - 2009-03-23 21:18:51
|
Update of /cvsroot/lwatch/files/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19580/src Modified Files: settings.c Log Message: Uh, I forgot to check for FIXME. Debug output for default rule action. Index: settings.c =================================================================== RCS file: /cvsroot/lwatch/files/src/settings.c,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** settings.c 23 Mar 2009 21:15:34 -0000 1.36 --- settings.c 23 Mar 2009 21:18:37 -0000 1.37 *************** *** 231,240 **** ***************************************/ #ifdef DEBUG ! fprintf(stderr,"date: %i, host: %i, serv: %i, mesg: %i\n", lw_conf.def_date_color, lw_conf.def_host_color, lw_conf.def_serv_color, ! lw_conf.def_mesg_color); ! /* FIXME dodaÄ output dla koÅczenia */ #endif --- 231,241 ---- ***************************************/ #ifdef DEBUG ! fprintf(stderr,"date: %i, host: %i, serv: %i, mesg: %i, default rule action: %s\n", lw_conf.def_date_color, lw_conf.def_host_color, lw_conf.def_serv_color, ! lw_conf.def_mesg_color, ! (lw_conf.def_action_rule==RULE_EXIT)?"exit":"continue" ! ); #endif |
|
From: Artur R. C. <ar...@us...> - 2009-03-23 21:15:47
|
Update of /cvsroot/lwatch/files In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18648 Modified Files: ChangeLog Log Message: default value for exit/continue on matching rule is configurable now Index: ChangeLog =================================================================== RCS file: /cvsroot/lwatch/files/ChangeLog,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** ChangeLog 28 Feb 2009 16:40:23 -0000 1.38 --- ChangeLog 23 Mar 2009 21:15:34 -0000 1.39 *************** *** 8,11 **** --- 8,14 ---- if you find this functionality vital for you - cfg_ver is obligatory now, consult lwatch.conf(5) + - default value for exit/continue on matching rule is configurable now, + see lwatch.conf(5) for details, thanks to Julien Sterckeman + for idea 0.4.1: - manual typos (arturcz) |
|
From: Artur R. C. <ar...@us...> - 2009-03-23 21:15:45
|
Update of /cvsroot/lwatch/files/doc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18648/doc Modified Files: lwatch.conf.sgml Log Message: default value for exit/continue on matching rule is configurable now Index: lwatch.conf.sgml =================================================================== RCS file: /cvsroot/lwatch/files/doc/lwatch.conf.sgml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** lwatch.conf.sgml 21 Mar 2009 10:54:34 -0000 1.9 --- lwatch.conf.sgml 23 Mar 2009 21:15:34 -0000 1.10 *************** *** 66,69 **** --- 66,70 ---- <title>General options</title> <para><option>cfg_ver</option> - this is obligatory variable and it must be placed as the first option in config file. This variable contains version of configuration file syntax. Current manual describes version 1.</para> + <para><option>rule_action</option> - after successful matching rule lwatch tries to match next one. You can choose to exit after executing matching rule changing this parameter from <option>continue</option> (that's the default) to <option>exit</option>. You can override this global parameter for each rule. See section Actions and modificators.</para> <para><option>use_syslog</option> - if set to yes some messages will be logged through syslog, default is yes</para> <para><option>log_level</option> - how verbose log messages should produce lwatch</para> *************** *** 109,113 **** </literallayout> </para> - <para>For every input line message part is matched against all defined patterns, from top to bottom. For every matched pattern attached actions are run until <option>exit</option> is specified (see below).</para> </refsect2> --- 110,113 ---- *************** *** 118,124 **** <para><option>serv_color</option> - set service name color</para> <para><option>host_color</option> - set hostname color</para> - <para><option>exit</option> - do not match next patterns</para> - <para><option>highlight</option> - highlight matched string with given color (see NOTES)</para> <para><option>ignore</option> - ignore this pattern, do not match next patterns</para> <para><option>match_host</option> - match hostname insted message</para> <para><option>match_service</option> - match service name instead message</para> --- 118,125 ---- <para><option>serv_color</option> - set service name color</para> <para><option>host_color</option> - set hostname color</para> <para><option>ignore</option> - ignore this pattern, do not match next patterns</para> + <para><option>exit</option> - do not match next patterns when <option>rule_action</option> is set to <option>continue</option>, in other case it is superfluous</para> + <para><option>continue</option> - continue with next pattern when <option>rule_action</option> is set to <option>exit</option>, in other case it is superfluous; please note, that if <option>ignore></option> is used in the same action it takes a priority - it makes no sense to match other rules for string that has been ignored</para> + <para><option>highlight</option> - highlight matched string with given color (see NOTES)</para> <para><option>match_host</option> - match hostname insted message</para> <para><option>match_service</option> - match service name instead message</para> |
