[gentoo-commits] gentoo-x86 commit in app-admin/rsyslog/files/7-stable: rsyslog-7.4.3-json-c-pkgconfig.patch rsyslog-7.4.3-fix-runtime.patch - gentoo-commits

From:	"Alexys Jacob (ultrabug)" <ultrabug@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] gentoo-x86 commit in app-admin/rsyslog/files/7-stable: rsyslog-7.4.3-json-c-pkgconfig.patch rsyslog-7.4.3-fix-runtime.patch
Date:	Mon, 29 Jul 2013 22:00:43
Message-Id:	`20130729220038.35E452171C@flycatcher.gentoo.org`

1

ultrabug    13/07/29 22:00:38

2

3

  Added:                rsyslog-7.4.3-json-c-pkgconfig.patch

4

                        rsyslog-7.4.3-fix-runtime.patch

5

  Log:

6

  Version bump fix #472484, drop old fix #454564

7

8

  (Portage version: 2.1.12.13/cvs/Linux x86_64, signed Manifest commit with key B658FA13)

9

10

Revision  Changes    Path

11

1.1                  app-admin/rsyslog/files/7-stable/rsyslog-7.4.3-json-c-pkgconfig.patch

12

13

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/files/7-stable/rsyslog-7.4.3-json-c-pkgconfig.patch?rev=1.1&view=markup

14

plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/files/7-stable/rsyslog-7.4.3-json-c-pkgconfig.patch?rev=1.1&content-type=text/plain

15

16

Index: rsyslog-7.4.3-json-c-pkgconfig.patch

17

===================================================================

18

diff --git a/action.c b/action.c

19

index 259fb66..6b52d70 100644

20

--- a/action.c

21

+++ b/action.c

22

@@ -98,7 +98,7 @@

23

 #include <strings.h>

24

 #include <time.h>

25

 #include <errno.h>

26

-#include <json/json.h>

27

+#include <json.h>

28

29

 #include "dirty.h"

30

 #include "template.h"

31

diff --git a/configure.ac b/configure.ac

32

index d6d5c92..1970f60 100644

33

--- a/configure.ac

34

+++ b/configure.ac

35

@@ -33,7 +33,9 @@ PKG_PROG_PKG_CONFIG

36

37

 # modules we require

38

 PKG_CHECK_MODULES(LIBESTR, libestr >= 0.1.5)

39

-PKG_CHECK_MODULES([JSON_C], [json])

40

+PKG_CHECK_MODULES([JSON_C], [json],, [

41

+	PKG_CHECK_MODULES([JSON_C], [json-c])

42

+])

43

44

 case "${host}" in

45

   *-*-linux*)

46

@@ -821,7 +823,7 @@ if test "x$enable_rsyslogrt" = "xyes"; then

47

   RSRT_LIBS1="\$(top_builddir)/runtime/librsyslog.la"

48

fi

49

 AM_CONDITIONAL(ENABLE_RSYSLOGRT, test x$enable_rsyslogrt = xyes)

50

-RSRT_CFLAGS="\$(RSRT_CFLAGS1) \$(LIBESTR_CFLAGS) \$(JSON_C_FLAGS)"

51

+RSRT_CFLAGS="\$(RSRT_CFLAGS1) \$(LIBESTR_CFLAGS) \$(JSON_C_CFLAGS)"

52

 RSRT_LIBS="\$(RSRT_LIBS1) \$(LIBESTR_LIBS) \$(JSON_C_LIBS)"

53

 AC_SUBST(RSRT_CFLAGS1)

54

 AC_SUBST(RSRT_LIBS1)

55

diff --git a/plugins/imkmsg/kmsg.c b/plugins/imkmsg/kmsg.c

56

index 822d3db..172ff4d 100644

57

--- a/plugins/imkmsg/kmsg.c

58

+++ b/plugins/imkmsg/kmsg.c

59

@@ -34,7 +34,7 @@

60

 #include <ctype.h>

61

 #include <sys/klog.h>

62

 #include <sys/sysinfo.h>

63

-#include <json/json.h>

64

+#include <json.h>

65

66

 #include "rsyslog.h"

67

 #include "srUtils.h"

68

diff --git a/plugins/mmaudit/mmaudit.c b/plugins/mmaudit/mmaudit.c

69

index 6b6b804..c7cff2c 100644

70

--- a/plugins/mmaudit/mmaudit.c

71

+++ b/plugins/mmaudit/mmaudit.c

72

@@ -43,7 +43,7 @@

73

 #include <errno.h>

74

 #include <unistd.h>

75

 #include <ctype.h>

76

-#include <json/json.h>

77

+#include <json.h>

78

 #include "conf.h"

79

 #include "syslogd-types.h"

80

 #include "template.h"

81

diff --git a/plugins/mmjsonparse/mmjsonparse.c b/plugins/mmjsonparse/mmjsonparse.c

82

index 35f69aa..b16aef0 100644

83

--- a/plugins/mmjsonparse/mmjsonparse.c

84

+++ b/plugins/mmjsonparse/mmjsonparse.c

85

@@ -35,7 +35,7 @@

86

 #include <errno.h>

87

 #include <unistd.h>

88

 #include <ctype.h>

89

-#include <json/json.h>

90

+#include <json.h>

91

 #include "conf.h"

92

 #include "syslogd-types.h"

93

 #include "template.h"

94

diff --git a/plugins/mmnormalize/mmnormalize.c b/plugins/mmnormalize/mmnormalize.c

95

index fcadc32..f93974a 100644

96

--- a/plugins/mmnormalize/mmnormalize.c

97

+++ b/plugins/mmnormalize/mmnormalize.c

98

@@ -40,7 +40,7 @@

99

 #include <unistd.h>

100

 #include <libestr.h>

101

 #include <libee/libee.h>

102

-#include <json/json.h>

103

+#include <json.h>

104

 #include <liblognorm.h>

105

 #include "conf.h"

106

 #include "syslogd-types.h"

107

diff --git a/plugins/ommongodb/ommongodb.c b/plugins/ommongodb/ommongodb.c

108

index dd99741..64d501d 100644

109

--- a/plugins/ommongodb/ommongodb.c

110

+++ b/plugins/ommongodb/ommongodb.c

111

@@ -33,7 +33,7 @@

112

 #include <stdint.h>

113

 #include <time.h>

114

 #include <mongo.h>

115

-#include <json/json.h>

116

+#include <json.h>

117

 /* For struct json_object_iter, should not be necessary in future versions */

118

 #include <json/json_object_private.h>

119

120

diff --git a/runtime/msg.c b/runtime/msg.c

121

index a227567..e683cdb 100644

122

--- a/runtime/msg.c

123

+++ b/runtime/msg.c

124

@@ -41,7 +41,7 @@

125

 #endif

126

 #include <netdb.h>

127

 #include <libestr.h>

128

-#include <json/json.h>

129

+#include <json.h>

130

 /* For struct json_object_iter, should not be necessary in future versions */

131

 #include <json/json_object_private.h>

132

 #if HAVE_MALLOC_H

133

diff --git a/runtime/msg.h b/runtime/msg.h

134

index 6faf066..ac220b6 100644

135

--- a/runtime/msg.h

136

+++ b/runtime/msg.h

137

@@ -30,7 +30,7 @@

138

139

 #include <pthread.h>

140

 #include <libestr.h>

141

-#include <json/json.h>

142

+#include <json.h>

143

 #include "obj.h"

144

 #include "syslogd-types.h"

145

 #include "template.h"

146

diff --git a/template.c b/template.c

147

index b675255..9cefa05 100644

148

--- a/template.c

149

+++ b/template.c

150

@@ -34,7 +34,7 @@

151

 #include <string.h>

152

 #include <ctype.h>

153

 #include <assert.h>

154

-#include <json/json.h>

155

+#include <json.h>

156

 #include "stringbuf.h"

157

 #include "syslogd-types.h"

158

 #include "template.h"

159

diff --git a/template.h b/template.h

160

index 318db6f..87a1c77 100644

161

--- a/template.h

162

+++ b/template.h

163

@@ -30,7 +30,7 @@

164

 #ifndef	TEMPLATE_H_INCLUDED

165

 #define	TEMPLATE_H_INCLUDED 1

166

167

-#include <json/json.h>

168

+#include <json.h>

169

 #include <libestr.h>

170

 #include "regexp.h"

171

 #include "stringbuf.h"

1.1                  app-admin/rsyslog/files/7-stable/rsyslog-7.4.3-fix-runtime.patch

176

177

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/files/7-stable/rsyslog-7.4.3-fix-runtime.patch?rev=1.1&view=markup

178

plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/files/7-stable/rsyslog-7.4.3-fix-runtime.patch?rev=1.1&content-type=text/plain

179

180

Index: rsyslog-7.4.3-fix-runtime.patch

181

===================================================================

182

diff --git a/runtime/Makefile.am b/runtime/Makefile.am

183

index dea06fe..34384be 100644

184

--- a/runtime/Makefile.am

185

+++ b/runtime/Makefile.am

186

@@ -97,12 +97,13 @@ librsyslog_la_SOURCES = \

187

#

188

189

 if WITH_MODDIRS

190

-librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/:$(moddirs)\" $(PTHREADS_CFLAGS) -I\$(top_srcdir)/tools

191

+librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/:$(moddirs)\"

192

 else

193

-librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/\" -I$(top_srcdir) $(PTHREADS_CFLAGS) -I\$(top_srcdir)/tools -I\$(top_srcdir)/grammar

194

+librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/\" -I\$(top_srcdir) -I\$(top_srcdir)/grammar

195

 endif

196

 #librsyslog_la_LDFLAGS = -module -avoid-version

197

-librsyslog_la_LIBADD =  $(DL_LIBS) $(RT_LIBS)

198

+librsyslog_la_CPPFLAGS += $(PTHREADS_CFLAGS) $(LIBEE_CFLAGS) $(LIBUUID_CFLAGS) $(JSON_C_CFLAGS) -I\$(top_srcdir)/tools

199

+librsyslog_la_LIBADD =  $(DL_LIBS) $(RT_LIBS) $(LIBEE_LIBS) $(LIBUUID_LIBS) $(JSON_C_LIBS)

200

201

#

202

 # regular expression support

1	ultrabug 13/07/29 22:00:38
2
3	Added: rsyslog-7.4.3-json-c-pkgconfig.patch
4	rsyslog-7.4.3-fix-runtime.patch
5	Log:
6	Version bump fix #472484, drop old fix #454564
7
8	(Portage version: 2.1.12.13/cvs/Linux x86_64, signed Manifest commit with key B658FA13)
9
10	Revision Changes Path
11	1.1 app-admin/rsyslog/files/7-stable/rsyslog-7.4.3-json-c-pkgconfig.patch
12
13	file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/files/7-stable/rsyslog-7.4.3-json-c-pkgconfig.patch?rev=1.1&view=markup
14	plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/files/7-stable/rsyslog-7.4.3-json-c-pkgconfig.patch?rev=1.1&content-type=text/plain
15
16	Index: rsyslog-7.4.3-json-c-pkgconfig.patch
17	===================================================================
18	diff --git a/action.c b/action.c
19	index 259fb66..6b52d70 100644
20	--- a/action.c
21	+++ b/action.c
22	@@ -98,7 +98,7 @@
23	#include <strings.h>
24	#include <time.h>
25	#include <errno.h>
26	-#include <json/json.h>
27	+#include <json.h>
28
29	#include "dirty.h"
30	#include "template.h"
31	diff --git a/configure.ac b/configure.ac
32	index d6d5c92..1970f60 100644
33	--- a/configure.ac
34	+++ b/configure.ac
35	@@ -33,7 +33,9 @@ PKG_PROG_PKG_CONFIG
36
37	# modules we require
38	PKG_CHECK_MODULES(LIBESTR, libestr >= 0.1.5)
39	-PKG_CHECK_MODULES([JSON_C], [json])
40	+PKG_CHECK_MODULES([JSON_C], [json],, [
41	+ PKG_CHECK_MODULES([JSON_C], [json-c])
42	+])
43
44	case "${host}" in
45	--linux*)
46	@@ -821,7 +823,7 @@ if test "x$enable_rsyslogrt" = "xyes"; then
47	RSRT_LIBS1="\$(top_builddir)/runtime/librsyslog.la"
48	fi
49	AM_CONDITIONAL(ENABLE_RSYSLOGRT, test x$enable_rsyslogrt = xyes)
50	-RSRT_CFLAGS="\$(RSRT_CFLAGS1) \$(LIBESTR_CFLAGS) \$(JSON_C_FLAGS)"
51	+RSRT_CFLAGS="\$(RSRT_CFLAGS1) \$(LIBESTR_CFLAGS) \$(JSON_C_CFLAGS)"
52	RSRT_LIBS="\$(RSRT_LIBS1) \$(LIBESTR_LIBS) \$(JSON_C_LIBS)"
53	AC_SUBST(RSRT_CFLAGS1)
54	AC_SUBST(RSRT_LIBS1)
55	diff --git a/plugins/imkmsg/kmsg.c b/plugins/imkmsg/kmsg.c
56	index 822d3db..172ff4d 100644
57	--- a/plugins/imkmsg/kmsg.c
58	+++ b/plugins/imkmsg/kmsg.c
59	@@ -34,7 +34,7 @@
60	#include <ctype.h>
61	#include <sys/klog.h>
62	#include <sys/sysinfo.h>
63	-#include <json/json.h>
64	+#include <json.h>
65
66	#include "rsyslog.h"
67	#include "srUtils.h"
68	diff --git a/plugins/mmaudit/mmaudit.c b/plugins/mmaudit/mmaudit.c
69	index 6b6b804..c7cff2c 100644
70	--- a/plugins/mmaudit/mmaudit.c
71	+++ b/plugins/mmaudit/mmaudit.c
72	@@ -43,7 +43,7 @@
73	#include <errno.h>
74	#include <unistd.h>
75	#include <ctype.h>
76	-#include <json/json.h>
77	+#include <json.h>
78	#include "conf.h"
79	#include "syslogd-types.h"
80	#include "template.h"
81	diff --git a/plugins/mmjsonparse/mmjsonparse.c b/plugins/mmjsonparse/mmjsonparse.c
82	index 35f69aa..b16aef0 100644
83	--- a/plugins/mmjsonparse/mmjsonparse.c
84	+++ b/plugins/mmjsonparse/mmjsonparse.c
85	@@ -35,7 +35,7 @@
86	#include <errno.h>
87	#include <unistd.h>
88	#include <ctype.h>
89	-#include <json/json.h>
90	+#include <json.h>
91	#include "conf.h"
92	#include "syslogd-types.h"
93	#include "template.h"
94	diff --git a/plugins/mmnormalize/mmnormalize.c b/plugins/mmnormalize/mmnormalize.c
95	index fcadc32..f93974a 100644
96	--- a/plugins/mmnormalize/mmnormalize.c
97	+++ b/plugins/mmnormalize/mmnormalize.c
98	@@ -40,7 +40,7 @@
99	#include <unistd.h>
100	#include <libestr.h>
101	#include <libee/libee.h>
102	-#include <json/json.h>
103	+#include <json.h>
104	#include <liblognorm.h>
105	#include "conf.h"
106	#include "syslogd-types.h"
107	diff --git a/plugins/ommongodb/ommongodb.c b/plugins/ommongodb/ommongodb.c
108	index dd99741..64d501d 100644
109	--- a/plugins/ommongodb/ommongodb.c
110	+++ b/plugins/ommongodb/ommongodb.c
111	@@ -33,7 +33,7 @@
112	#include <stdint.h>
113	#include <time.h>
114	#include <mongo.h>
115	-#include <json/json.h>
116	+#include <json.h>
117	/* For struct json_object_iter, should not be necessary in future versions */
118	#include <json/json_object_private.h>
119
120	diff --git a/runtime/msg.c b/runtime/msg.c
121	index a227567..e683cdb 100644
122	--- a/runtime/msg.c
123	+++ b/runtime/msg.c
124	@@ -41,7 +41,7 @@
125	#endif
126	#include <netdb.h>
127	#include <libestr.h>
128	-#include <json/json.h>
129	+#include <json.h>
130	/* For struct json_object_iter, should not be necessary in future versions */
131	#include <json/json_object_private.h>
132	#if HAVE_MALLOC_H
133	diff --git a/runtime/msg.h b/runtime/msg.h
134	index 6faf066..ac220b6 100644
135	--- a/runtime/msg.h
136	+++ b/runtime/msg.h
137	@@ -30,7 +30,7 @@
138
139	#include <pthread.h>
140	#include <libestr.h>
141	-#include <json/json.h>
142	+#include <json.h>
143	#include "obj.h"
144	#include "syslogd-types.h"
145	#include "template.h"
146	diff --git a/template.c b/template.c
147	index b675255..9cefa05 100644
148	--- a/template.c
149	+++ b/template.c
150	@@ -34,7 +34,7 @@
151	#include <string.h>
152	#include <ctype.h>
153	#include <assert.h>
154	-#include <json/json.h>
155	+#include <json.h>
156	#include "stringbuf.h"
157	#include "syslogd-types.h"
158	#include "template.h"
159	diff --git a/template.h b/template.h
160	index 318db6f..87a1c77 100644
161	--- a/template.h
162	+++ b/template.h
163	@@ -30,7 +30,7 @@
164	#ifndef TEMPLATE_H_INCLUDED
165	#define TEMPLATE_H_INCLUDED 1
166
167	-#include <json/json.h>
168	+#include <json.h>
169	#include <libestr.h>
170	#include "regexp.h"
171	#include "stringbuf.h"
172
173
174
175	1.1 app-admin/rsyslog/files/7-stable/rsyslog-7.4.3-fix-runtime.patch
176
177	file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/files/7-stable/rsyslog-7.4.3-fix-runtime.patch?rev=1.1&view=markup
178	plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/files/7-stable/rsyslog-7.4.3-fix-runtime.patch?rev=1.1&content-type=text/plain
179
180	Index: rsyslog-7.4.3-fix-runtime.patch
181	===================================================================
182	diff --git a/runtime/Makefile.am b/runtime/Makefile.am
183	index dea06fe..34384be 100644
184	--- a/runtime/Makefile.am
185	+++ b/runtime/Makefile.am
186	@@ -97,12 +97,13 @@ librsyslog_la_SOURCES = \
187	#
188
189	if WITH_MODDIRS
190	-librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/:$(moddirs)\" $(PTHREADS_CFLAGS) -I\$(top_srcdir)/tools
191	+librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/:$(moddirs)\"
192	else
193	-librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/\" -I$(top_srcdir) $(PTHREADS_CFLAGS) -I\$(top_srcdir)/tools -I\$(top_srcdir)/grammar
194	+librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/\" -I\$(top_srcdir) -I\$(top_srcdir)/grammar
195	endif
196	#librsyslog_la_LDFLAGS = -module -avoid-version
197	-librsyslog_la_LIBADD = $(DL_LIBS) $(RT_LIBS)
198	+librsyslog_la_CPPFLAGS += $(PTHREADS_CFLAGS) $(LIBEE_CFLAGS) $(LIBUUID_CFLAGS) $(JSON_C_CFLAGS) -I\$(top_srcdir)/tools
199	+librsyslog_la_LIBADD = $(DL_LIBS) $(RT_LIBS) $(LIBEE_LIBS) $(LIBUUID_LIBS) $(JSON_C_LIBS)
200
201	#
202	# regular expression support

Gentoo Archives: gentoo-commits