Add patch to fix FTBFS with GCC 10
Closes: #957136
Axel Beckert
4 years ago
|
0 |
dillo (3.0.5-7) UNRELEASED; urgency=medium
|
|
1 |
|
|
2 |
* Add patch to fix FTBFS with GCC 10. (Closes: #957136)
|
|
3 |
|
|
4 |
-- Axel Beckert <abe@debian.org> Sat, 18 Apr 2020 05:35:10 +0200
|
|
5 |
|
| 0 | 6 |
dillo (3.0.5-6) unstable; urgency=medium
|
| 1 | 7 |
|
| 2 | 8 |
* Add patch to fix DuckDuckGo shortcut to make result links
|
|
0 |
Description: Fix FTBFS with gcc-10
|
|
1 |
Bug-Debian: https://bugs.debian.org/957136
|
|
2 |
Author: Axel Beckert <abe@debian.org>
|
|
3 |
Forwarded: no
|
|
4 |
|
|
5 |
--- a/dpid/dpid.h
|
|
6 |
+++ b/dpid/dpid.h
|
|
7 |
@@ -25,10 +25,10 @@
|
|
8 |
|
|
9 |
/*! \TODO: Should read this from dillorc */
|
|
10 |
#define SRS_NAME "dpid.srs"
|
|
11 |
-char *srs_name;
|
|
12 |
+extern char *srs_name;
|
|
13 |
|
|
14 |
/*! dpid's service request socket file descriptor */
|
|
15 |
-int srs_fd;
|
|
16 |
+extern int srs_fd;
|
|
17 |
|
|
18 |
/*! plugin state information
|
|
19 |
*/
|
|
20 |
@@ -49,19 +49,19 @@
|
|
21 |
};
|
|
22 |
|
|
23 |
/*! Number of available plugins */
|
|
24 |
-int numdpis;
|
|
25 |
+extern int numdpis;
|
|
26 |
|
|
27 |
/*! Number of sockets being watched */
|
|
28 |
-int numsocks;
|
|
29 |
+extern int numsocks;
|
|
30 |
|
|
31 |
/*! State information for each plugin. */
|
|
32 |
-struct dp *dpi_attr_list;
|
|
33 |
+extern struct dp *dpi_attr_list;
|
|
34 |
|
|
35 |
/*! service served for each plugin */
|
|
36 |
-Dlist *services_list;
|
|
37 |
+extern Dlist *services_list;
|
|
38 |
|
|
39 |
/*! Set of sockets watched for connections */
|
|
40 |
-fd_set sock_set;
|
|
41 |
+extern fd_set sock_set;
|
|
42 |
|
|
43 |
/*! Set to 1 by the SIGCHLD handler dpi_sigchld */
|
|
44 |
extern volatile sig_atomic_t caught_sigchld;
|
|
45 |
--- a/dpid/main.c
|
|
46 |
+++ b/dpid/main.c
|
|
47 |
@@ -31,6 +31,17 @@
|
|
48 |
#include "../dpip/dpip.h"
|
|
49 |
|
|
50 |
sigset_t mask_sigchld;
|
|
51 |
+char *srs_name;
|
|
52 |
+int srs_fd;
|
|
53 |
+int numdpis;
|
|
54 |
+int numsocks;
|
|
55 |
+struct dp *dpi_attr_list;
|
|
56 |
+Dlist *services_list;
|
|
57 |
+fd_set sock_set;
|
|
58 |
+enum {
|
|
59 |
+ no_errors,
|
|
60 |
+ dpid_srs_addrinuse /* dpid service request socket address already in use */
|
|
61 |
+} dpi_errno;
|
|
62 |
|
|
63 |
|
|
64 |
/* Start a dpi filter plugin after accepting the pending connection
|
|
65 |
--- a/dpid/dpid_common.h
|
|
66 |
+++ b/dpid/dpid_common.h
|
|
67 |
@@ -38,10 +38,7 @@
|
|
68 |
|
|
69 |
|
|
70 |
/*! Error codes for dpid */
|
|
71 |
-enum {
|
|
72 |
- no_errors,
|
|
73 |
- dpid_srs_addrinuse /* dpid service request socket address already in use */
|
|
74 |
-} dpi_errno;
|
|
75 |
+extern enum dpi_errno;
|
|
76 |
|
|
77 |
/*! Intended for identifying dillo plugins
|
|
78 |
* and related files
|
| 1 | 1 |
move-helper-tools-to-libexec.patch
|
| 2 | 2 |
fix-perl-shebang.patch
|
| 3 | 3 |
fix-duckduckgo-shortcut-in-dillorc.patch
|
|
4 |
fix-FTBFS-with-gcc-10.patch
|