b6bcd8cd34
* daemontools and dmraid is kept at -Np0
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
80 lines
1.8 KiB
Diff
80 lines
1.8 KiB
Diff
Description: Fix FTBFS with gcc-10
|
|
Bug-Debian: https://bugs.debian.org/957136
|
|
Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=1799282
|
|
Author: Axel Beckert <abe@debian.org>
|
|
Forwarded: no
|
|
|
|
--- a/dpid/dpid.h
|
|
+++ b/dpid/dpid.h
|
|
@@ -25,10 +25,10 @@
|
|
|
|
/*! \TODO: Should read this from dillorc */
|
|
#define SRS_NAME "dpid.srs"
|
|
-char *srs_name;
|
|
+extern char *srs_name;
|
|
|
|
/*! dpid's service request socket file descriptor */
|
|
-int srs_fd;
|
|
+extern int srs_fd;
|
|
|
|
/*! plugin state information
|
|
*/
|
|
@@ -49,19 +49,19 @@
|
|
};
|
|
|
|
/*! Number of available plugins */
|
|
-int numdpis;
|
|
+extern int numdpis;
|
|
|
|
/*! Number of sockets being watched */
|
|
-int numsocks;
|
|
+extern int numsocks;
|
|
|
|
/*! State information for each plugin. */
|
|
-struct dp *dpi_attr_list;
|
|
+extern struct dp *dpi_attr_list;
|
|
|
|
/*! service served for each plugin */
|
|
-Dlist *services_list;
|
|
+extern Dlist *services_list;
|
|
|
|
/*! Set of sockets watched for connections */
|
|
-fd_set sock_set;
|
|
+extern fd_set sock_set;
|
|
|
|
/*! Set to 1 by the SIGCHLD handler dpi_sigchld */
|
|
extern volatile sig_atomic_t caught_sigchld;
|
|
--- a/dpid/main.c
|
|
+++ b/dpid/main.c
|
|
@@ -31,6 +31,17 @@
|
|
#include "../dpip/dpip.h"
|
|
|
|
sigset_t mask_sigchld;
|
|
+char *srs_name;
|
|
+int srs_fd;
|
|
+int numdpis;
|
|
+int numsocks;
|
|
+struct dp *dpi_attr_list;
|
|
+Dlist *services_list;
|
|
+fd_set sock_set;
|
|
+enum {
|
|
+ no_errors,
|
|
+ dpid_srs_addrinuse /* dpid service request socket address already in use */
|
|
+} dpi_errno;
|
|
|
|
|
|
/* Start a dpi filter plugin after accepting the pending connection
|
|
--- a/dpid/dpid_common.h
|
|
+++ b/dpid/dpid_common.h
|
|
@@ -38,10 +38,7 @@
|
|
|
|
|
|
/*! Error codes for dpid */
|
|
-enum {
|
|
- no_errors,
|
|
- dpid_srs_addrinuse /* dpid service request socket address already in use */
|
|
-} dpi_errno;
|
|
+extern enum dpi_errno;
|
|
|
|
/*! Intended for identifying dillo plugins
|
|
* and related files
|