Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-misc/detox/files: detox-1.2.0-format-security.patch
Date: Tue, 23 Jun 2015 07:11:14
Message-Id: 20150623071107.57013A53@oystercatcher.gentoo.org
1 jlec 15/06/23 07:11:07
2
3 Added: detox-1.2.0-format-security.patch
4 Log:
5 Make build format-security save, bug #521084; bump to EAPI=5; drop base.eclass usage
6
7 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)
8
9 Revision Changes Path
10 1.1 app-misc/detox/files/detox-1.2.0-format-security.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/detox/files/detox-1.2.0-format-security.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/detox/files/detox-1.2.0-format-security.patch?rev=1.1&content-type=text/plain
14
15 Index: detox-1.2.0-format-security.patch
16 ===================================================================
17 parse_options_getopt.c | 8 ++++----
18 parse_options_popt.c | 8 ++++----
19 2 files changed, 8 insertions(+), 8 deletions(-)
20
21 diff --git a/parse_options_getopt.c b/parse_options_getopt.c
22 index 1f80966..ea2b266 100644
23 --- a/parse_options_getopt.c
24 +++ b/parse_options_getopt.c
25 @@ -98,9 +98,9 @@ struct detox_options *parse_options_getopt(int argc, char **argv)
26 #endif
27 switch (optcode) {
28 case 'h':
29 - printf(usage_message);
30 + printf("%s", usage_message);
31 printf("\n");
32 - printf(help_message);
33 + printf("%s", help_message);
34 exit(EXIT_SUCCESS);
35
36 case 'f':
37 @@ -138,7 +138,7 @@ struct detox_options *parse_options_getopt(int argc, char **argv)
38 exit(EXIT_SUCCESS);
39
40 case '?':
41 - printf(usage_message);
42 + printf("%s", usage_message);
43 exit(EXIT_SUCCESS);
44
45 case 0:
46 @@ -195,7 +195,7 @@ struct detox_options *parse_options_getopt(int argc, char **argv)
47 }
48 else {
49 #ifndef INLINE_MODE
50 - printf(usage_message);
51 + printf("%s", usage_message);
52 exit(EXIT_FAILURE);
53 #endif
54 }
55 diff --git a/parse_options_popt.c b/parse_options_popt.c
56 index 60dad7a..370c3cc 100644
57 --- a/parse_options_popt.c
58 +++ b/parse_options_popt.c
59 @@ -94,9 +94,9 @@ struct detox_options *parse_options_popt(int argc, const char **argv)
60 while ((c = poptGetNextOpt(optCon)) >= 0) {
61 switch (c) {
62 case 'h':
63 - printf(usage_message);
64 + printf("%s", usage_message);
65 printf("\n");
66 - printf(help_message);
67 + printf("%s", help_message);
68 exit(EXIT_SUCCESS);
69
70 case 'f':
71 @@ -142,7 +142,7 @@ struct detox_options *parse_options_popt(int argc, const char **argv)
72 break;
73
74 case '?':
75 - printf(usage_message);
76 + printf("%s", usage_message);
77 exit(EXIT_SUCCESS);
78
79 }
80 @@ -177,7 +177,7 @@ struct detox_options *parse_options_popt(int argc, const char **argv)
81
82 #ifndef INLINE_MODE
83 if (i == 0) {
84 - fprintf(stderr, usage_message);
85 + fprintf(stderr, "%s", usage_message);
86 exit(EXIT_FAILURE);
87 }
88 #endif