Gentoo Archives: gentoo-commits

From: "Michael Sterrett (mr_bones_)" <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-admin/syslog-ng/files/3.4: syslog-ng-3.4.2-compile.patch syslog-ng-3.4.1-autotools.patch syslog-ng-3.4.1-rollup.patch syslog-ng-3.4.2-autotools.patch
Date: Mon, 03 Jun 2013 16:38:33
Message-Id: 20130603163829.8C0DE2171D@flycatcher.gentoo.org
1 mr_bones_ 13/06/03 16:38:29
2
3 Modified: syslog-ng-3.4.1-autotools.patch
4 syslog-ng-3.4.1-rollup.patch
5 Added: syslog-ng-3.4.2-compile.patch
6 syslog-ng-3.4.2-autotools.patch
7 Log:
8 version bump
9
10 (Portage version: 2.1.11.62/cvs/Linux x86_64, unsigned Manifest commit)
11
12 Revision Changes Path
13 1.2 app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-autotools.patch
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-autotools.patch?rev=1.2&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-autotools.patch?rev=1.2&content-type=text/plain
17 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-autotools.patch?r1=1.1&r2=1.2
18
19 Index: syslog-ng-3.4.1-autotools.patch
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-autotools.patch,v
22 retrieving revision 1.1
23 retrieving revision 1.2
24 diff -u -r1.1 -r1.2
25 --- syslog-ng-3.4.1-autotools.patch 8 May 2013 19:59:08 -0000 1.1
26 +++ syslog-ng-3.4.1-autotools.patch 3 Jun 2013 16:38:29 -0000 1.2
27 @@ -1,6 +1,5 @@
28 -diff -ru syslog-ng-3.4.1.orig/configure.in syslog-ng-3.4.1/configure.in
29 ---- syslog-ng-3.4.1.orig/configure.in 2013-01-17 06:43:50.000000000 -0500
30 -+++ syslog-ng-3.4.1/configure.in 2013-05-08 15:47:42.860150947 -0400
31 +--- syslog-ng-3.4.1.orig/configure.in
32 ++++ syslog-ng-3.4.1/configure.in
33 @@ -68,7 +68,7 @@
34 pidfiledir='${localstatedir}'
35 moduledir='${exec_prefix}/lib/syslog-ng'
36 @@ -18,9 +17,8 @@
37 AC_PROG_CC_C99
38 if test "x$ac_cv_prog_cc_c99" = "xno"; then
39 AC_MSG_ERROR("C99 standard compliant C compiler required. Try GCC 3.x or later.")
40 -diff -ru syslog-ng-3.4.1.orig/modules/afmongodb/libmongo-client/configure.ac syslog-ng-3.4.1/modules/afmongodb/libmongo-client/configure.ac
41 ---- syslog-ng-3.4.1.orig/modules/afmongodb/libmongo-client/configure.ac 2013-01-06 15:41:48.000000000 -0500
42 -+++ syslog-ng-3.4.1/modules/afmongodb/libmongo-client/configure.ac 2013-05-08 15:48:09.275208195 -0400
43 +--- syslog-ng-3.4.1.orig/modules/afmongodb/libmongo-client/configure.ac
44 ++++ syslog-ng-3.4.1/modules/afmongodb/libmongo-client/configure.ac
45 @@ -15,7 +15,7 @@
46
47 AC_CONFIG_MACRO_DIR([m4])
48
49
50
51 1.2 app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-rollup.patch
52
53 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-rollup.patch?rev=1.2&view=markup
54 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-rollup.patch?rev=1.2&content-type=text/plain
55 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-rollup.patch?r1=1.1&r2=1.2
56
57 Index: syslog-ng-3.4.1-rollup.patch
58 ===================================================================
59 RCS file: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.1-rollup.patch,v
60 retrieving revision 1.1
61 retrieving revision 1.2
62 diff -u -r1.1 -r1.2
63 --- syslog-ng-3.4.1-rollup.patch 28 Apr 2013 04:50:34 -0000 1.1
64 +++ syslog-ng-3.4.1-rollup.patch 3 Jun 2013 16:38:29 -0000 1.2
65 @@ -1,6 +1,5 @@
66 -diff -ru syslog-ng-3.4.1/contrib/systemd/syslog-ng.service syslog-ng-3.4-master/contrib/systemd/syslog-ng.service
67 ---- syslog-ng-3.4.1/contrib/systemd/syslog-ng.service 2013-01-06 15:38:58.000000000 -0500
68 -+++ syslog-ng-3.4-master/contrib/systemd/syslog-ng.service 2013-04-16 10:11:23.000000000 -0400
69 +--- syslog-ng-3.4.1/contrib/systemd/syslog-ng.service
70 ++++ syslog-ng-3.4-master/contrib/systemd/syslog-ng.service
71 @@ -7,6 +7,7 @@
72 ExecStart=/usr/sbin/syslog-ng -F
73 ExecReload=/bin/kill -HUP $MAINPID
74 @@ -9,9 +8,8 @@
75
76 [Install]
77 WantedBy=multi-user.target
78 -diff -ru syslog-ng-3.4.1/lib/cfg-tree.c syslog-ng-3.4-master/lib/cfg-tree.c
79 ---- syslog-ng-3.4.1/lib/cfg-tree.c 2013-01-06 15:40:30.000000000 -0500
80 -+++ syslog-ng-3.4-master/lib/cfg-tree.c 2013-04-16 10:11:23.000000000 -0400
81 +--- syslog-ng-3.4.1/lib/cfg-tree.c
82 ++++ syslog-ng-3.4-master/lib/cfg-tree.c
83 @@ -588,6 +588,22 @@
84 return FALSE;
85 }
86 @@ -70,9 +68,8 @@
87 }
88
89
90 -diff -ru syslog-ng-3.4.1/lib/control.c syslog-ng-3.4-master/lib/control.c
91 ---- syslog-ng-3.4.1/lib/control.c 2013-01-06 15:40:30.000000000 -0500
92 -+++ syslog-ng-3.4-master/lib/control.c 2013-04-16 10:11:23.000000000 -0400
93 +--- syslog-ng-3.4.1/lib/control.c
94 ++++ syslog-ng-3.4-master/lib/control.c
95 @@ -1,5 +1,5 @@
96 /*
97 - * Copyright (c) 2002-2012 BalaBit IT Ltd, Budapest, Hungary
98 @@ -91,9 +88,8 @@
99 goto destroy_connection;
100 }
101 else
102 -diff -ru syslog-ng-3.4.1/lib/filter.c syslog-ng-3.4-master/lib/filter.c
103 ---- syslog-ng-3.4.1/lib/filter.c 2013-01-06 15:40:30.000000000 -0500
104 -+++ syslog-ng-3.4-master/lib/filter.c 2013-04-16 10:11:23.000000000 -0400
105 +--- syslog-ng-3.4.1/lib/filter.c
106 ++++ syslog-ng-3.4-master/lib/filter.c
107 @@ -46,6 +46,12 @@
108 self->ref_cnt = 1;
109 }
110 @@ -173,9 +169,8 @@
111 msg_debug("Filter rule evaluation result",
112 evt_tag_str("result", res ? "match" : "not-match"),
113 evt_tag_str("rule", self->name),
114 -diff -ru syslog-ng-3.4.1/lib/filter.h syslog-ng-3.4-master/lib/filter.h
115 ---- syslog-ng-3.4.1/lib/filter.h 2013-01-06 15:40:30.000000000 -0500
116 -+++ syslog-ng-3.4-master/lib/filter.h 2013-04-16 10:11:23.000000000 -0400
117 +--- syslog-ng-3.4.1/lib/filter.h
118 ++++ syslog-ng-3.4-master/lib/filter.h
119 @@ -48,6 +48,8 @@
120
121 gboolean filter_expr_eval(FilterExprNode *self, LogMessage *msg);
122 @@ -185,9 +180,8 @@
123 void filter_expr_unref(FilterExprNode *self);
124
125 typedef struct _FilterRE
126 -diff -ru syslog-ng-3.4.1/lib/logmpx.c syslog-ng-3.4-master/lib/logmpx.c
127 ---- syslog-ng-3.4.1/lib/logmpx.c 2013-01-06 15:40:30.000000000 -0500
128 -+++ syslog-ng-3.4-master/lib/logmpx.c 2013-04-16 10:11:23.000000000 -0400
129 +--- syslog-ng-3.4.1/lib/logmpx.c
130 ++++ syslog-ng-3.4-master/lib/logmpx.c
131 @@ -39,9 +39,15 @@
132
133 for (i = 0; i < self->next_hops->len; i++)
134 @@ -206,9 +200,8 @@
135 {
136 self->fallback_exists = TRUE;
137 }
138 -diff -ru syslog-ng-3.4.1/lib/logmsg.h syslog-ng-3.4-master/lib/logmsg.h
139 ---- syslog-ng-3.4.1/lib/logmsg.h 2013-01-06 15:40:30.000000000 -0500
140 -+++ syslog-ng-3.4-master/lib/logmsg.h 2013-04-16 10:11:23.000000000 -0400
141 +--- syslog-ng-3.4.1/lib/logmsg.h
142 ++++ syslog-ng-3.4-master/lib/logmsg.h
143 @@ -1,6 +1,6 @@
144 /*
145 - * Copyright (c) 2002-2012 BalaBit IT Ltd, Budapest, Hungary
146 @@ -231,9 +224,8 @@
147 const gchar *log_msg_get_macro_value(LogMessage *self, gint id, gssize *value_len);
148
149 static inline const gchar *
150 -diff -ru syslog-ng-3.4.1/lib/logpipe.h syslog-ng-3.4-master/lib/logpipe.h
151 ---- syslog-ng-3.4.1/lib/logpipe.h 2013-01-06 15:40:30.000000000 -0500
152 -+++ syslog-ng-3.4-master/lib/logpipe.h 2013-04-16 10:11:23.000000000 -0400
153 +--- syslog-ng-3.4.1/lib/logpipe.h
154 ++++ syslog-ng-3.4-master/lib/logpipe.h
155 @@ -47,6 +47,7 @@
156 /* log statement flags that are copied to the head of a branch */
157 #define PIF_BRANCH_FINAL 0x0004
158 @@ -242,9 +234,8 @@
159
160 /* branch starting with this pipe wants hard flow control */
161 #define PIF_HARD_FLOW_CONTROL 0x0010
162 -diff -ru syslog-ng-3.4.1/lib/logrewrite.c syslog-ng-3.4-master/lib/logrewrite.c
163 ---- syslog-ng-3.4.1/lib/logrewrite.c 2013-01-31 01:58:05.000000000 -0500
164 -+++ syslog-ng-3.4-master/lib/logrewrite.c 2013-04-16 10:11:23.000000000 -0400
165 +--- syslog-ng-3.4.1/lib/logrewrite.c
166 ++++ syslog-ng-3.4-master/lib/logrewrite.c
167 @@ -45,7 +45,7 @@
168 gssize length;
169 const gchar *value;
170 @@ -254,9 +245,8 @@
171 {
172 msg_debug("Rewrite condition unmatched, skipping rewrite",
173 evt_tag_str("value", log_msg_get_value_name(self->value_handle, NULL)),
174 -diff -ru syslog-ng-3.4.1/lib/persist-state.c syslog-ng-3.4-master/lib/persist-state.c
175 ---- syslog-ng-3.4.1/lib/persist-state.c 2013-01-06 15:40:30.000000000 -0500
176 -+++ syslog-ng-3.4-master/lib/persist-state.c 2013-04-28 00:43:29.703864600 -0400
177 +--- syslog-ng-3.4.1/lib/persist-state.c
178 ++++ syslog-ng-3.4-master/lib/persist-state.c
179 @@ -26,6 +26,7 @@
180 #include "serialize.h"
181 #include "messages.h"
182 @@ -273,9 +263,8 @@
183 self->current_key_block = offsetof(PersistFileHeader, initial_key_store);
184 self->current_key_ofs = 0;
185 self->current_key_size = sizeof((((PersistFileHeader *) NULL))->initial_key_store);
186 -diff -ru syslog-ng-3.4.1/modules/dbparser/patterndb.c syslog-ng-3.4-master/modules/dbparser/patterndb.c
187 ---- syslog-ng-3.4.1/modules/dbparser/patterndb.c 2013-01-17 06:43:50.000000000 -0500
188 -+++ syslog-ng-3.4-master/modules/dbparser/patterndb.c 2013-04-16 10:11:23.000000000 -0400
189 +--- syslog-ng-3.4.1/modules/dbparser/patterndb.c
190 ++++ syslog-ng-3.4-master/modules/dbparser/patterndb.c
191 @@ -1302,7 +1302,7 @@
192 log_msg_set_value(msg, match->handle, match->match, match->len);
193 g_free(match->match);
194 @@ -285,9 +274,8 @@
195 {
196 log_msg_set_value_indirect(msg, match->handle, ref_handle, match->type, match->ofs, match->len);
197 }
198 -diff -ru syslog-ng-3.4.1/tests/loggen/loggen.c syslog-ng-3.4-master/tests/loggen/loggen.c
199 ---- syslog-ng-3.4.1/tests/loggen/loggen.c 2013-01-06 15:38:59.000000000 -0500
200 -+++ syslog-ng-3.4-master/tests/loggen/loggen.c 2013-04-16 10:11:23.000000000 -0400
201 +--- syslog-ng-3.4.1/tests/loggen/loggen.c
202 ++++ syslog-ng-3.4-master/tests/loggen/loggen.c
203 @@ -847,6 +847,12 @@
204 {
205 static struct sockaddr_un saun;
206
207
208
209 1.1 app-admin/syslog-ng/files/3.4/syslog-ng-3.4.2-compile.patch
210
211 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.2-compile.patch?rev=1.1&view=markup
212 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.2-compile.patch?rev=1.1&content-type=text/plain
213
214 Index: syslog-ng-3.4.2-compile.patch
215 ===================================================================
216 --- syslog-ng-3.4.1/lib/persist-state.c
217 +++ syslog-ng-3.4-master/lib/persist-state.c
218 @@ -26,6 +26,7 @@
219 #include "serialize.h"
220 #include "messages.h"
221 #include "mainloop.h"
222 +#include "misc.h"
223
224 #include <sys/types.h>
225 #include <unistd.h>
226
227
228
229 1.1 app-admin/syslog-ng/files/3.4/syslog-ng-3.4.2-autotools.patch
230
231 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.2-autotools.patch?rev=1.1&view=markup
232 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng-3.4.2-autotools.patch?rev=1.1&content-type=text/plain
233
234 Index: syslog-ng-3.4.2-autotools.patch
235 ===================================================================
236 --- syslog-ng-3.4.1.orig/configure.in
237 +++ syslog-ng-3.4.1/configure.in
238 @@ -68,7 +68,7 @@
239 pidfiledir='${localstatedir}'
240 moduledir='${exec_prefix}/lib/syslog-ng'
241
242 -AM_CONFIG_HEADER(config.h)
243 +AC_CONFIG_HEADERS(config.h)
244
245 dnl ***************************************************************************
246 dnl Arguments
247 @@ -227,7 +227,6 @@
248 dnl ***************************************************************************
249 dnl Checks for programs.
250 AC_PROG_CC
251 -AM_PROG_CC_STDC
252 AC_PROG_CC_C99
253 if test "x$ac_cv_prog_cc_c99" = "xno"; then
254 AC_MSG_ERROR("C99 standard compliant C compiler required. Try GCC 3.x or later.")
255 --- syslog-ng-3.4.1.orig/modules/afmongodb/libmongo-client/configure.ac
256 +++ syslog-ng-3.4.1/modules/afmongodb/libmongo-client/configure.ac
257 @@ -15,7 +15,7 @@
258
259 AC_CONFIG_MACRO_DIR([m4])
260 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
261 -AM_CONFIG_HEADER(config.h)
262 +AC_CONFIG_HEADERS(config.h)
263
264 AC_ARG_WITH([versioned-symbols], AC_HELP_STRING([--with-versioned-symbols],[Use versioned symbols]),[dnl
265 vsymldflags="-Wl,--version-script,\${srcdir}/libmongo-client.ver -Wl,-O1"
266 @@ -24,7 +24,6 @@
267 dnl ***************************************************************************
268 dnl Checks for programs.
269 AC_PROG_CC
270 -AM_PROG_CC_STDC
271 AC_PROG_MAKE_SET
272 PKG_PROG_PKG_CONFIG
273 LT_INIT([shared])