rpms/sysklogd/devel sysklogd-1.4.2rh-includeFacPri.patch, 1.1, 1.2 sysklogd.spec, 1.52, 1.53

[fedora-cvs-commits at redhat.com]

Author: pvrabec

Update of /cvs/dist/rpms/sysklogd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18195

Modified Files:
	sysklogd-1.4.2rh-includeFacPri.patch sysklogd.spec 
Log Message:
some fixes of previous release (#223573)


sysklogd-1.4.2rh-includeFacPri.patch:
 sysklogd.8 |    6 ++++++
 syslogd.c  |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 59 insertions(+), 5 deletions(-)

Index: sysklogd-1.4.2rh-includeFacPri.patch
===================================================================
RCS file: /cvs/dist/rpms/sysklogd/devel/sysklogd-1.4.2rh-includeFacPri.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sysklogd-1.4.2rh-includeFacPri.patch	26 Mar 2007 10:08:36 -0000	1.1
+++ sysklogd-1.4.2rh-includeFacPri.patch	11 Apr 2007 15:52:41 -0000	1.2
@@ -1,5 +1,5 @@
 --- sysklogd-1.4.2rh/sysklogd.8.includeFacPri	2007-02-26 10:46:08.000000000 +0100
-+++ sysklogd-1.4.2rh/sysklogd.8	2007-03-26 11:53:35.000000000 +0200
++++ sysklogd-1.4.2rh/sysklogd.8	2007-04-11 17:46:34.000000000 +0200
 @@ -172,6 +172,12 @@
  no domain would be cut, you will have to specify two domains like:
  .BR "\-s north.de:infodrom.north.de" .
@@ -13,8 +13,8 @@
  .B "\-v"
  Print version and exit.
  .TP
---- sysklogd-1.4.2rh/syslogd.c.includeFacPri	2007-03-26 11:46:00.000000000 +0200
-+++ sysklogd-1.4.2rh/syslogd.c	2007-03-26 11:56:50.000000000 +0200
+--- sysklogd-1.4.2rh/syslogd.c.includeFacPri	2007-04-11 17:46:34.000000000 +0200
++++ sysklogd-1.4.2rh/syslogd.c	2007-04-11 17:47:30.000000000 +0200
 @@ -755,6 +755,8 @@
  char	**LocalHosts = NULL;	/* these hosts are logged with their hostname */
  int	NoHops = 1;		/* Can we bounce syslog messages through an
@@ -103,14 +103,23 @@
 +		v->iov_base = fp_buf;
 +		v->iov_len = strlen(fp_buf);
 +	} else {
-+		v->iov_base = " ";
-+		v->iov_len = 1;
++		v->iov_base = "";
++		v->iov_len = 0;
 +	}
 +	v++;
 +
  	v->iov_base = f->f_prevhost;
  	v->iov_len = strlen(v->iov_base);
  	v++;
+@@ -1865,7 +1913,7 @@
+ 		else {
+ 			f->f_time = now;
+ 			(void) snprintf(line, sizeof(line), "<%d>%s\n", f->f_prevpri, \
+-				(char *) iov[4].iov_base);
++				(char *) iov[5].iov_base);
+ 			l = strlen(line);
+ 			if (l > MAXLINE)
+ 				l = MAXLINE;
 @@ -1929,7 +1977,7 @@
  		if (f->f_file == -1)
  			break;


Index: sysklogd.spec
===================================================================
RCS file: /cvs/dist/rpms/sysklogd/devel/sysklogd.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sysklogd.spec	26 Mar 2007 10:08:36 -0000	1.52
+++ sysklogd.spec	11 Apr 2007 15:52:41 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: System logging and kernel message trapping daemons
 Name: sysklogd
 Version: 1.4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.infodrom.org/projects/sysklogd/
@@ -103,6 +103,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Apr 11 2007 Peter Vrabec <pvrabec at redhat.com> 1.4.2-4
+- some fixes of previous release (#223573)
+
 * Mon Mar 26 2007 Peter Vrabec <pvrabec at redhat.com> 1.4.2-3
 - include priority/facility in message (#223573)