Hello community, here is the log from the commit of package syslog-ng checked in at Thu May 31 21:14:37 CEST 2007. -------- --- syslog-ng/syslog-ng.changes 2007-05-14 13:39:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/syslog-ng/syslog-ng.changes 2007-05-30 17:22:00.000000000 +0200 @@ -1,0 +2,13 @@ +Wed May 30 17:21:54 CEST 2007 - mt@suse.de + +- Updated to syslog-ng-1.6.12, fixing negation for the netmask() + filter, increasing hostname buffers to 256 characters, adding + so_rcvbuf option to adjust the afinet receive buffer, forcing + log_fifo_size to an minimum of 1000 elements +- Adopted update_own_hostname and afunix_dest_reconnect patches +- Bug #257101: Fix to log parse errors while reload (SIGHUP). + New patch file: syslog-ng-verbose_reload.dif +- Fixed console destination in default config to use pipe driver, + disabled permission and ownerships for console and xconsole. + +------------------------------------------------------------------- Old: ---- syslog-ng-1.6.11.tar.gz syslog-ng-1.6.11.tar.gz.asc New: ---- syslog-ng-1.6.12.tar.gz syslog-ng-1.6.12.tar.gz.asc syslog-ng-verbose_reload.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syslog-ng.spec ++++++ --- /var/tmp/diff_new_pack.w29081/_old 2007-05-31 21:14:10.000000000 +0200 +++ /var/tmp/diff_new_pack.w29081/_new 2007-05-31 21:14:10.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package syslog-ng (Version 1.6.11) +# spec file for package syslog-ng (Version 1.6.12) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: syslog-ng -BuildRequires: flex gperf klogd libol-devel tcpd-devel -Version: 1.6.11 -Release: 43 +BuildRequires: bison flex gperf klogd libol-devel tcpd-devel +Version: 1.6.12 +Release: 1 License: GNU General Public License (GPL) Group: System/Daemons -Summary: new-generation syslog-daemon +Summary: The new-generation syslog-daemon URL: http://www.balabit.com/products/syslog_ng/ PreReq: %insserv_prereq %fillup_prereq klogd aaa_base Provides: syslog @@ -37,6 +37,7 @@ Patch5: syslog-ng-handle-line.diff Patch6: syslog-ng-filter_checks.dif Patch7: syslog-ng-sigaction.dif +Patch8: syslog-ng-verbose_reload.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -75,6 +76,7 @@ %patch5 -p0 %patch6 -p0 %patch7 -p0 +%patch8 -p0 %{?suse_update_config:%{suse_update_config -f}} %build @@ -246,6 +248,16 @@ /var/adm/fillup-templates/sysconfig.syslog-ng %changelog +* Wed May 30 2007 - mt@suse.de +- Updated to syslog-ng-1.6.12, fixing negation for the netmask() + filter, increasing hostname buffers to 256 characters, adding + so_rcvbuf option to adjust the afinet receive buffer, forcing + log_fifo_size to an minimum of 1000 elements +- Adopted update_own_hostname and afunix_dest_reconnect patches +- Bug #257101: Fix to log parse errors while reload (SIGHUP). + New patch file: syslog-ng-verbose_reload.dif +- Fixed console destination in default config to use pipe driver, + disabled permission and ownerships for console and xconsole. * Mon May 14 2007 - mt@suse.de - Bug #256671: Added reset of the sysconfig SYSLOG_DAEMON variable to "" (autodetect daemon) in rpm postun script. ++++++ syslog-ng-1.6.11.tar.gz -> syslog-ng-1.6.12.tar.gz ++++++ ++++ 16078 lines of diff (skipped) ++++++ syslog-ng-afunix_dest_reconnect.dif ++++++ --- /var/tmp/diff_new_pack.w29081/_old 2007-05-31 21:14:10.000000000 +0200 +++ /var/tmp/diff_new_pack.w29081/_new 2007-05-31 21:14:10.000000000 +0200 @@ -1,10 +1,11 @@ --- src/afunix.c -+++ src/afunix.c 2006/05/29 16:54:31 -@@ -413,7 +413,16 @@ static int do_init_afunix_dest(struct lo ++++ src/afunix.c 2007/05/22 10:40:17 +@@ -412,8 +412,17 @@ static int do_init_afunix_dest(struct lo + else { CAST(unix_address_info, unix_addr, self->super.dest_addr); - close(fd); - werror("Error connecting to AF_UNIX(%S): %z\n", unix_addr->path, strerror(errno)); + close(fd); + if(self->cfg->time_reopen) { + io_callout(self->cfg->backend, + self->cfg->time_reopen, ++++++ syslog-ng.conf.default ++++++ --- syslog-ng/syslog-ng.conf.default 2007-03-03 15:34:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/syslog-ng/syslog-ng.conf.default 2007-05-29 18:13:57.000000000 +0200 @@ -108,10 +108,10 @@ # # Most warning and errors on tty10 and on the xconsole pipe: # -destination console { file("/dev/tty10" group(tty) perm(0620)); }; +destination console { pipe("/dev/tty10" owner(-1) group(-1) perm(-1)); }; log { source(src); filter(f_console); destination(console); }; -destination xconsole { pipe("/dev/xconsole" group(tty) perm(0400)); }; +destination xconsole { pipe("/dev/xconsole" owner(-1) group(-1) perm(-1)); }; log { source(src); filter(f_console); destination(xconsole); }; # Enable this, if you want that root is informed immediately, ++++++ syslog-ng-update_own_hostname.dif ++++++ --- /var/tmp/diff_new_pack.w29081/_old 2007-05-31 21:14:11.000000000 +0200 +++ /var/tmp/diff_new_pack.w29081/_new 2007-05-31 21:14:11.000000000 +0200 @@ -1,5 +1,5 @@ --- src/main.c -+++ src/main.c 2006/02/08 19:06:51 ++++ src/main.c 2007/05/22 10:31:07 @@ -53,6 +53,7 @@ static char cfgfilename[128] = PATH_SYSLOG_NG_CONF; static char pidfilename[128] = PATH_PIDFILE; @@ -8,7 +8,7 @@ /* CLASS: (class -@@ -242,6 +243,7 @@ +@@ -242,6 +243,7 @@ int main_loop(struct syslog_backend *bac res_init(); #endif notice("SIGHUP received, restarting syslog-ng\n"); @@ -17,8 +17,8 @@ set_error_stream(2, 0); set_internal_cfg(NULL); --- src/sources.c -+++ src/sources.c 2006/02/08 19:06:55 -@@ -189,6 +189,11 @@ ++++ src/sources.c 2007/05/22 10:31:07 +@@ -197,6 +197,11 @@ make_log_reader(UINT32 dgram, } /* source_group */ @@ -30,7 +30,7 @@ static struct ol_string *get_source_hostname(struct address_info *a, int usedns, int usefqdn, struct nscache *cache) { -@@ -224,6 +229,12 @@ +@@ -232,6 +237,12 @@ static struct ol_string *get_source_host name = c_format_cstring("%z", hname); } else { @@ -41,5 +41,5 @@ + hostname = NULL; + } if (!hostname) { - char buf[128]; + char buf[256]; if (usefqdn) { ++++++ syslog-ng-verbose_reload.dif ++++++ --- src/cfgfile.c +++ src/cfgfile.c 2007/05/22 10:57:13 @@ -335,8 +335,9 @@ struct syslog_config *make_syslog_config res = yyparse(); fclose(cfg); if (!res) { + /* successfully parsed, verify it */ + linenum = -1; if( verify_filter_rules(self->filters) == 0) { - /* successfully parsed */ self->resources = empty_resource_list(); return self; } --- src/main.c +++ src/main.c 2007/05/22 11:07:00 @@ -209,8 +209,12 @@ int main_loop(struct syslog_backend *bac if (backend->newconfig) { add_socket_to_sources(backend->add_sockets, backend->newconfig->sources); - + io_callout_flush(&backend->super); + if (!debug_flag) { + set_error_stream(2, 0); + set_internal_cfg(NULL); + } s.timeout = backend->configuration->stats_freq; if (s.timeout > 0) @@ -221,7 +225,10 @@ int main_loop(struct syslog_backend *bac } else { backend->super.reloading = 0; - notice("Syntax error reading config file (line %i), using old configuration\n", linenum); + if(linenum == -1) + notice("Verify error reading config file, using old configuration\n"); + else + notice("Syntax error reading config file (line %i), using old configuration\n", linenum); } reload_config = 0; } @@ -247,10 +254,6 @@ int main_loop(struct syslog_backend *bac #endif notice("SIGHUP received, restarting syslog-ng\n"); update_source_hostname(); - if (!debug_flag) { - set_error_stream(2, 0); - set_internal_cfg(NULL); - } reload_config = 1; r.backend = backend; r.state = -1; @@ -502,7 +505,10 @@ int main(int argc, char **argv) backend->configuration = make_syslog_config(cfgfilename, &backend->super); if (!backend->configuration) { - werror("Parse error reading configuration file, exiting. (line %i)\n", linenum); + if(linenum == -1) + werror("Verify error reading configuration file, exiting.\n"); + else + werror("Parse error reading configuration file, exiting. (line %i)\n", linenum); return 1; } if (syntax_only) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de