]> git.pld-linux.org Git - packages/sblim-sfcb.git/blob - gcc10.patch
- fix building with gcc 10+, fix files, rebuild with openssl 3.0.0, rel 5
[packages/sblim-sfcb.git] / gcc10.patch
1 diff -ur sblim-sfcb-1.4.9/control.c sblim-sfcb-1.4.9-gcc10/control.c
2 --- sblim-sfcb-1.4.9/control.c  2021-10-13 21:37:49.873825576 +0200
3 +++ sblim-sfcb-1.4.9-gcc10/control.c    2021-10-13 21:36:53.004046593 +0200
4 @@ -79,6 +79,7 @@
5  int             httpProcIdX;
6  long            httpReqHandlerTimeout;
7   
8 +const char      * sfcBrokerStart;
9  /**
10   * Kindly null terminate, always, even if might overwrite
11   * the last char of the truncated string. 
12 diff -ur sblim-sfcb-1.4.9/control.h sblim-sfcb-1.4.9-gcc10/control.h
13 --- sblim-sfcb-1.4.9/control.h  2014-11-25 02:43:10.000000000 +0100
14 +++ sblim-sfcb-1.4.9-gcc10/control.h    2021-10-13 21:36:42.564087988 +0200
15 @@ -28,7 +28,7 @@
16  int             getControlULong(char *id, unsigned long *val);
17  int             getControlNum(char *id, long *val);
18  int             getControlBool(char *id, int *val);
19 -const char      * sfcBrokerStart;
20 +extern const char      * sfcBrokerStart;
21  
22  #endif
23  /* MODELINES */
24 diff -ur sblim-sfcb-1.4.9/default.reg sblim-sfcb-1.4.9-gcc10/default.reg
25 --- sblim-sfcb-1.4.9/default.reg        2014-11-25 03:06:53.000000000 +0100
26 +++ sblim-sfcb-1.4.9-gcc10/default.reg  2021-10-13 21:37:07.817321652 +0200
27 @@ -20,12 +20,12 @@
28     unload: never
29     namespace: root/interop
30  #
31 -#[$ProfileProvider$]
32 -#   provider: ProfileProvider
33 -#   location: sfcProfileProvider
34 -#   type: method
35 -#   unload: never
36 -#   namespace: root/interop
37 +[$ProfileProvider$]
38 +   provider: ProfileProvider
39 +   location: sfcProfileProvider
40 +   type: method
41 +   unload: never
42 +   namespace: root/interop
43  #
44  [$QualifierProvider$]
45     provider: QualifierProvider
46 diff -ur sblim-sfcb-1.4.9/providerMgr.c sblim-sfcb-1.4.9-gcc10/providerMgr.c
47 --- sblim-sfcb-1.4.9/providerMgr.c      2014-11-25 02:43:12.000000000 +0100
48 +++ sblim-sfcb-1.4.9-gcc10/providerMgr.c        2021-10-13 21:35:30.974379261 +0200
49 @@ -53,6 +53,8 @@
50  #define SFCB_ASM(x)
51  #endif
52  
53 +sigset_t mask, old_mask;
54 +
55  static pthread_mutex_t resultsocketMutex = PTHREAD_MUTEX_INITIALIZER;
56  
57  extern CMPIBroker *Broker;
58 diff -ur sblim-sfcb-1.4.9/providerMgr.h sblim-sfcb-1.4.9-gcc10/providerMgr.h
59 --- sblim-sfcb-1.4.9/providerMgr.h      2014-11-25 02:43:12.000000000 +0100
60 +++ sblim-sfcb-1.4.9-gcc10/providerMgr.h        2021-10-13 21:34:41.104590547 +0200
61 @@ -398,7 +398,7 @@
62  BinResponseHdr *invokeProvider(BinRequestContext * ctx);
63  void            freeResponseHeaders(BinResponseHdr ** resp,
64                                      BinRequestContext * ctx);
65 -sigset_t mask, old_mask;
66 +extern sigset_t mask, old_mask;
67  
68  #endif
69  /* MODELINES */
70 diff -ur sblim-sfcb-1.4.9/trace.c sblim-sfcb-1.4.9-gcc10/trace.c
71 --- sblim-sfcb-1.4.9/trace.c    2014-11-25 02:43:17.000000000 +0100
72 +++ sblim-sfcb-1.4.9-gcc10/trace.c      2021-10-13 21:33:31.551564675 +0200
73 @@ -52,6 +52,7 @@
74  int             providerProcess = 0;
75  int             idleThreadId = 0;
76  int             terminating = 0;
77 +int             colorTrace;
78  
79  int             _sfcb_debug = 0;
80  unsigned long   _sfcb_trace_mask = 0;
81 diff -ur sblim-sfcb-1.4.9/trace.h sblim-sfcb-1.4.9-gcc10/trace.h
82 --- sblim-sfcb-1.4.9/trace.h    2021-10-13 21:37:49.873825576 +0200
83 +++ sblim-sfcb-1.4.9-gcc10/trace.h      2021-10-13 21:33:28.871576855 +0200
84 @@ -131,7 +131,7 @@
85  #define CYAN            6
86  #define WHITE           7
87  void            changeTextColor(int reset);
88 -int             colorTrace;
89 +extern int             colorTrace;
90  
91  #define MAX_MSG_SIZE 1024       /* max length of trace message */
92  
This page took 0.069727 seconds and 3 git commands to generate.