commit 4b3869f538913f087c78726a29a32284c83e574e · pyrox.dev/nixpkgs

+306

pkgs/tools/networking/uwimap/clang-fix.patch

···

       1
       1
       +
       diff -ur a/src/c-client/netmsg.c b/src/c-client/netmsg.c

     

       2
       2
       +
       --- a/src/c-client/netmsg.c	2011-07-22 20:20:18.000000000 -0400

     

       3
       3
       +
       +++ b/src/c-client/netmsg.c	2023-10-17 22:23:29.026638315 -0400

     

       4
       4
       +
       @@ -29,6 +29,7 @@

     

       5
       5
       +
        

     

       6
       6
       +
        #include <stdio.h>

     

       7
       7
       +
        #include <errno.h>

     

       8
       8
       +
       +#include <time.h>

     

       9
       9
       +
        extern int errno;		/* just in case */

     

       10
       10
       +
        #include "c-client.h"

     

       11
       11
       +
        #include "netmsg.h"

     

       12
       12
       +
       diff -ur a/src/c-client/nntp.c b/src/c-client/nntp.c

     

       13
       13
       +
       --- a/src/c-client/nntp.c	2011-07-22 20:20:18.000000000 -0400

     

       14
       14
       +
       +++ b/src/c-client/nntp.c	2023-10-17 22:23:05.195194961 -0400

     

       15
       15
       +
       @@ -29,6 +29,7 @@

     

       16
       16
       +
        

     

       17
       17
       +
        #include <ctype.h>

     

       18
       18
       +
        #include <stdio.h>

     

       19
       19
       +
       +#include <time.h>

     

       20
       20
       +
        #include "c-client.h"

     

       21
       21
       +
        #include "newsrc.h"

     

       22
       22
       +
        #include "netmsg.h"

     

       23
       23
       +
       diff -ur a/src/dmail/dmail.c b/src/dmail/dmail.c

     

       24
       24
       +
       --- a/src/dmail/dmail.c	2011-07-22 20:19:57.000000000 -0400

     

       25
       25
       +
       +++ b/src/dmail/dmail.c	2023-10-17 22:44:23.049223758 -0400

     

       26
       26
       +
       @@ -27,6 +27,7 @@

     

       27
       27
       +
         */

     

       28
       28
       +
        

     

       29
       29
       +
        #include <stdio.h>

     

       30
       30
       +
       +#include <ctype.h>

     

       31
       31
       +
        #include <pwd.h>

     

       32
       32
       +
        #include <errno.h>

     

       33
       33
       +
        extern int errno;		/* just in case */

     

       34
       34
       +
       diff -ur a/src/mlock/mlock.c b/src/mlock/mlock.c

     

       35
       35
       +
       --- a/src/mlock/mlock.c	2011-07-22 20:19:57.000000000 -0400

     

       36
       36
       +
       +++ b/src/mlock/mlock.c	2023-10-17 22:44:44.533985203 -0400

     

       37
       37
       +
       @@ -31,6 +31,9 @@

     

       38
       38
       +
        #include <stdio.h>

     

       39
       39
       +
        #include <sysexits.h>

     

       40
       40
       +
        #include <syslog.h>

     

       41
       41
       +
       +#include <ctype.h>

     

       42
       42
       +
       +#include <time.h>

     

       43
       43
       +
       +#include <unistd.h>

     

       44
       44
       +
        #include <grp.h>

     

       45
       45
       +
        #include <sys/types.h>

     

       46
       46
       +
        #include <sys/file.h>

     

       47
       47
       +
       diff -ur a/src/osdep/unix/dummy.c b/src/osdep/unix/dummy.c

     

       48
       48
       +
       --- a/src/osdep/unix/dummy.c	2011-07-22 20:20:10.000000000 -0400

     

       49
       49
       +
       +++ b/src/osdep/unix/dummy.c	2023-10-17 22:23:17.123963204 -0400

     

       50
       50
       +
       @@ -30,6 +30,7 @@

     

       51
       51
       +
        #include <stdio.h>

     

       52
       52
       +
        #include <ctype.h>

     

       53
       53
       +
        #include <errno.h>

     

       54
       54
       +
       +#include <time.h>

     

       55
       55
       +
        extern int errno;		/* just in case */

     

       56
       56
       +
        #include "mail.h"

     

       57
       57
       +
        #include "osdep.h"

     

       58
       58
       +
       diff -ur a/src/osdep/unix/mbx.c b/src/osdep/unix/mbx.c

     

       59
       59
       +
       --- a/src/osdep/unix/mbx.c	2011-07-22 20:20:11.000000000 -0400

     

       60
       60
       +
       +++ b/src/osdep/unix/mbx.c	2023-10-17 22:25:13.189158845 -0400

     

       61
       61
       +
       @@ -41,6 +41,7 @@

     

       62
       62
       +
        #include "mail.h"

     

       63
       63
       +
        #include "osdep.h"

     

       64
       64
       +
        #include <pwd.h>

     

       65
       65
       +
       +#include <utime.h>

     

       66
       66
       +
        #include <sys/stat.h>

     

       67
       67
       +
        #include <sys/time.h>

     

       68
       68
       +
        #include "misc.h"

     

       69
       69
       +
       diff -ur a/src/osdep/unix/mh.c b/src/osdep/unix/mh.c

     

       70
       70
       +
       --- a/src/osdep/unix/mh.c	2011-07-22 20:20:09.000000000 -0400

     

       71
       71
       +
       +++ b/src/osdep/unix/mh.c	2023-10-17 22:31:50.240740603 -0400

     

       72
       72
       +
       @@ -30,6 +30,7 @@

     

       73
       73
       +
        #include <stdio.h>

     

       74
       74
       +
        #include <ctype.h>

     

       75
       75
       +
        #include <errno.h>

     

       76
       76
       +
       +#include <utime.h>

     

       77
       77
       +
        extern int errno;		/* just in case */

     

       78
       78
       +
        #include "mail.h"

     

       79
       79
       +
        #include "osdep.h"

     

       80
       80
       +
       @@ -103,8 +104,8 @@

     

       81
       81
       +
        	      long options);

     

       82
       82
       +
        long mh_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data);

     

       83
       83
       +
        

     

       84
       84
       +
       -int mh_select (struct direct *name);

     

       85
       85
       +
       -int mh_numsort (const void *d1,const void *d2);

     

       86
       86
       +
       +int mh_select (const struct direct *name);

     

       87
       87
       +
       +int mh_numsort (const struct dirent **d1,const struct dirent **d2);

     

       88
       88
       +
        char *mh_file (char *dst,char *name);

     

       89
       89
       +
        long mh_canonicalize (char *pattern,char *ref,char *pat);

     

       90
       90
       +
        void mh_setdate (char *file,MESSAGECACHE *elt);

     

       91
       91
       +
       @@ -1194,7 +1195,7 @@

     

       92
       92
       +
         * Returns: T to use file name, NIL to skip it

     

       93
       93
       +
         */

     

       94
       94
       +
        

     

       95
       95
       +
       -int mh_select (struct direct *name)

     

       96
       96
       +
       +int mh_select (const struct direct *name)

     

       97
       97
       +
        {

     

       98
       98
       +
          char c;

     

       99
       99
       +
          char *s = name->d_name;

     

       100
       100
       +
       @@ -1209,10 +1210,10 @@

     

       101
       101
       +
         * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2

     

       102
       102
       +
         */

     

       103
       103
       +
        

     

       104
       104
       +
       -int mh_numsort (const void *d1,const void *d2)

     

       105
       105
       +
       +int mh_numsort (const struct dirent **d1,const struct dirent **d2)

     

       106
       106
       +
        {

     

       107
       107
       +
       -  return atoi ((*(struct direct **) d1)->d_name) -

     

       108
       108
       +
       -    atoi ((*(struct direct **) d2)->d_name);

     

       109
       109
       +
       +  return atoi ((*d1)->d_name) -

     

       110
       110
       +
       +    atoi ((*d2)->d_name);

     

       111
       111
       +
        }

     

       112
       112
       +
        

     

       113
       113
       +
        

     

       114
       114
       +
       diff -ur a/src/osdep/unix/mix.c b/src/osdep/unix/mix.c

     

       115
       115
       +
       --- a/src/osdep/unix/mix.c	2011-07-22 20:20:10.000000000 -0400

     

       116
       116
       +
       +++ b/src/osdep/unix/mix.c	2023-10-17 22:35:22.368131654 -0400

     

       117
       117
       +
       @@ -125,7 +125,7 @@

     

       118
       118
       +
        long mix_create (MAILSTREAM *stream,char *mailbox);

     

       119
       119
       +
        long mix_delete (MAILSTREAM *stream,char *mailbox);

     

       120
       120
       +
        long mix_rename (MAILSTREAM *stream,char *old,char *newname);

     

       121
       121
       +
       -int mix_rselect (struct direct *name);

     

       122
       122
       +
       +int mix_rselect (const struct direct *name);

     

       123
       123
       +
        MAILSTREAM *mix_open (MAILSTREAM *stream);

     

       124
       124
       +
        void mix_close (MAILSTREAM *stream,long options);

     

       125
       125
       +
        void mix_abort (MAILSTREAM *stream);

     

       126
       126
       +
       @@ -140,8 +140,8 @@

     

       127
       127
       +
        long mix_ping (MAILSTREAM *stream);

     

       128
       128
       +
        void mix_check (MAILSTREAM *stream);

     

       129
       129
       +
        long mix_expunge (MAILSTREAM *stream,char *sequence,long options);

     

       130
       130
       +
       -int mix_select (struct direct *name);

     

       131
       131
       +
       -int mix_msgfsort (const void *d1,const void *d2);

     

       132
       132
       +
       +int mix_select (const struct direct *name);

     

       133
       133
       +
       +int mix_msgfsort (const struct dirent **d1,const struct dirent **d2);

     

       134
       134
       +
        long mix_addset (SEARCHSET **set,unsigned long start,unsigned long size);

     

       135
       135
       +
        long mix_burp (MAILSTREAM *stream,MIXBURP *burp,unsigned long *reclaimed);

     

       136
       136
       +
        long mix_burp_check (SEARCHSET *set,size_t size,char *file);

     

       137
       137
       +
       @@ -587,7 +587,7 @@

     

       138
       138
       +
         * Returns: T if mix file name, NIL otherwise

     

       139
       139
       +
         */

     

       140
       140
       +
        

     

       141
       141
       +
       -int mix_rselect (struct direct *name)

     

       142
       142
       +
       +int mix_rselect (const struct direct *name)

     

       143
       143
       +
        {

     

       144
       144
       +
          return mix_dirfmttest (name->d_name);

     

       145
       145
       +
        }

     

       146
       146
       +
       @@ -1146,7 +1146,7 @@

     

       147
       147
       +
         * ".mix" with no suffix was used by experimental versions

     

       148
       148
       +
         */

     

       149
       149
       +
        

     

       150
       150
       +
       -int mix_select (struct direct *name)

     

       151
       151
       +
       +int mix_select (const struct direct *name)

     

       152
       152
       +
        {

     

       153
       153
       +
          char c,*s;

     

       154
       154
       +
        				/* make sure name has prefix */

     

       155
       155
       +
       @@ -1165,10 +1165,10 @@

     

       156
       156
       +
         * Returns: -1 if d1 < d2, 0 if d1 == d2, 1 d1 > d2

     

       157
       157
       +
         */

     

       158
       158
       +
        

     

       159
       159
       +
       -int mix_msgfsort (const void *d1,const void *d2)

     

       160
       160
       +
       +int mix_msgfsort (const struct dirent **d1,const struct dirent **d2)

     

       161
       161
       +
        {

     

       162
       162
       +
       -  char *n1 = (*(struct direct **) d1)->d_name + sizeof (MIXNAME) - 1;

     

       163
       163
       +
       -  char *n2 = (*(struct direct **) d2)->d_name + sizeof (MIXNAME) - 1;

     

       164
       164
       +
       +  char *n1 = (*d1)->d_name + sizeof (MIXNAME) - 1;

     

       165
       165
       +
       +  char *n2 = (*d2)->d_name + sizeof (MIXNAME) - 1;

     

       166
       166
       +
          return compare_ulong (*n1 ? strtoul (n1,NIL,16) : 0,

     

       167
       167
       +
        			*n2 ? strtoul (n2,NIL,16) : 0);

     

       168
       168
       +
        }

     

       169
       169
       +
       diff -ur a/src/osdep/unix/mmdf.c b/src/osdep/unix/mmdf.c

     

       170
       170
       +
       --- a/src/osdep/unix/mmdf.c	2011-07-22 20:20:10.000000000 -0400

     

       171
       171
       +
       +++ b/src/osdep/unix/mmdf.c	2023-10-17 22:25:37.095313031 -0400

     

       172
       172
       +
       @@ -33,6 +33,7 @@

     

       173
       173
       +
        #include "mail.h"

     

       174
       174
       +
        #include "osdep.h"

     

       175
       175
       +
        #include <time.h>

     

       176
       176
       +
       +#include <utime.h>

     

       177
       177
       +
        #include <sys/stat.h>

     

       178
       178
       +
        #include "pseudo.h"

     

       179
       179
       +
        #include "fdstring.h"

     

       180
       180
       +
       diff -ur a/src/osdep/unix/mtx.c b/src/osdep/unix/mtx.c

     

       181
       181
       +
       --- a/src/osdep/unix/mtx.c	2011-07-22 20:20:10.000000000 -0400

     

       182
       182
       +
       +++ b/src/osdep/unix/mtx.c	2023-10-17 22:26:48.973160400 -0400

     

       183
       183
       +
       @@ -37,6 +37,7 @@

     

       184
       184
       +
        #include <stdio.h>

     

       185
       185
       +
        #include <ctype.h>

     

       186
       186
       +
        #include <errno.h>

     

       187
       187
       +
       +#include <utime.h>

     

       188
       188
       +
        extern int errno;		/* just in case */

     

       189
       189
       +
        #include "mail.h"

     

       190
       190
       +
        #include "osdep.h"

     

       191
       191
       +
       diff -ur a/src/osdep/unix/mx.c b/src/osdep/unix/mx.c

     

       192
       192
       +
       --- a/src/osdep/unix/mx.c	2011-07-22 20:20:09.000000000 -0400

     

       193
       193
       +
       +++ b/src/osdep/unix/mx.c	2023-10-17 22:33:25.621907970 -0400

     

       194
       194
       +
       @@ -30,6 +30,7 @@

     

       195
       195
       +
        #include <stdio.h>

     

       196
       196
       +
        #include <ctype.h>

     

       197
       197
       +
        #include <errno.h>

     

       198
       198
       +
       +#include <utime.h>

     

       199
       199
       +
        extern int errno;		/* just in case */

     

       200
       200
       +
        #include "mail.h"

     

       201
       201
       +
        #include "osdep.h"

     

       202
       202
       +
       @@ -98,8 +99,8 @@

     

       203
       203
       +
        long mx_append_msg (MAILSTREAM *stream,char *flags,MESSAGECACHE *elt,

     

       204
       204
       +
        		    STRING *st,SEARCHSET *set);

     

       205
       205
       +
        

     

       206
       206
       +
       -int mx_select (struct direct *name);

     

       207
       207
       +
       -int mx_numsort (const void *d1,const void *d2);

     

       208
       208
       +
       +int mx_select (const struct direct *name);

     

       209
       209
       +
       +int mx_numsort (const struct dirent **d1,const struct dirent **d2);

     

       210
       210
       +
        char *mx_file (char *dst,char *name);

     

       211
       211
       +
        long mx_lockindex (MAILSTREAM *stream);

     

       212
       212
       +
        void mx_unlockindex (MAILSTREAM *stream);

     

       213
       213
       +
       @@ -1110,7 +1111,7 @@

     

       214
       214
       +
         * Returns: T to use file name, NIL to skip it

     

       215
       215
       +
         */

     

       216
       216
       +
        

     

       217
       217
       +
       -int mx_select (struct direct *name)

     

       218
       218
       +
       +int mx_select (const struct direct *name)

     

       219
       219
       +
        {

     

       220
       220
       +
          char c;

     

       221
       221
       +
          char *s = name->d_name;

     

       222
       222
       +
       @@ -1125,10 +1126,10 @@

     

       223
       223
       +
         * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2

     

       224
       224
       +
         */

     

       225
       225
       +
        

     

       226
       226
       +
       -int mx_numsort (const void *d1,const void *d2)

     

       227
       227
       +
       +int mx_numsort (const struct dirent **d1,const struct dirent **d2)

     

       228
       228
       +
        {

     

       229
       229
       +
       -  return atoi ((*(struct direct **) d1)->d_name) -

     

       230
       230
       +
       -    atoi ((*(struct direct **) d2)->d_name);

     

       231
       231
       +
       +  return atoi ((*d1)->d_name) -

     

       232
       232
       +
       +    atoi ((*d2)->d_name);

     

       233
       233
       +
        }

     

       234
       234
       +
        

     

       235
       235
       +
        

     

       236
       236
       +
       diff -ur a/src/osdep/unix/news.c b/src/osdep/unix/news.c

     

       237
       237
       +
       --- a/src/osdep/unix/news.c	2011-07-22 20:20:10.000000000 -0400

     

       238
       238
       +
       +++ b/src/osdep/unix/news.c	2023-10-17 22:29:32.461013229 -0400

     

       239
       239
       +
       @@ -76,8 +76,8 @@

     

       240
       240
       +
        long news_delete (MAILSTREAM *stream,char *mailbox);

     

       241
       241
       +
        long news_rename (MAILSTREAM *stream,char *old,char *newname);

     

       242
       242
       +
        MAILSTREAM *news_open (MAILSTREAM *stream);

     

       243
       243
       +
       -int news_select (struct direct *name);

     

       244
       244
       +
       -int news_numsort (const void *d1,const void *d2);

     

       245
       245
       +
       +int news_select (const struct direct *name);

     

       246
       246
       +
       +int news_numsort (const struct dirent **d1,const struct dirent **d2);

     

       247
       247
       +
        void news_close (MAILSTREAM *stream,long options);

     

       248
       248
       +
        void news_fast (MAILSTREAM *stream,char *sequence,long flags);

     

       249
       249
       +
        void news_flags (MAILSTREAM *stream,char *sequence,long flags);

     

       250
       250
       +
       @@ -402,7 +402,7 @@

     

       251
       251
       +
         * Returns: T to use file name, NIL to skip it

     

       252
       252
       +
         */

     

       253
       253
       +
        

     

       254
       254
       +
       -int news_select (struct direct *name)

     

       255
       255
       +
       +int news_select (const struct direct *name)

     

       256
       256
       +
        {

     

       257
       257
       +
          char c;

     

       258
       258
       +
          char *s = name->d_name;

     

       259
       259
       +
       @@ -417,10 +417,10 @@

     

       260
       260
       +
         * Returns: negative if d1 < d2, 0 if d1 == d2, postive if d1 > d2

     

       261
       261
       +
         */

     

       262
       262
       +
        

     

       263
       263
       +
       -int news_numsort (const void *d1,const void *d2)

     

       264
       264
       +
       +int news_numsort (const struct dirent **d1,const struct dirent **d2)

     

       265
       265
       +
        {

     

       266
       266
       +
       -  return atoi ((*(struct direct **) d1)->d_name) -

     

       267
       267
       +
       -    atoi ((*(struct direct **) d2)->d_name);

     

       268
       268
       +
       +  return atoi ((*d1)->d_name) -

     

       269
       269
       +
       +    atoi ((*d2)->d_name);

     

       270
       270
       +
        }

     

       271
       271
       +
        

     

       272
       272
       +
        

     

       273
       273
       +
       diff -ur a/src/osdep/unix/tenex.c b/src/osdep/unix/tenex.c

     

       274
       274
       +
       --- a/src/osdep/unix/tenex.c	2011-07-22 20:20:10.000000000 -0400

     

       275
       275
       +
       +++ b/src/osdep/unix/tenex.c	2023-10-17 22:26:15.349497223 -0400

     

       276
       276
       +
       @@ -42,6 +42,8 @@

     

       277
       277
       +
        #include <stdio.h>

     

       278
       278
       +
        #include <ctype.h>

     

       279
       279
       +
        #include <errno.h>

     

       280
       280
       +
       +#include <time.h>

     

       281
       281
       +
       +#include <utime.h>

     

       282
       282
       +
        extern int errno;		/* just in case */

     

       283
       283
       +
        #include "mail.h"

     

       284
       284
       +
        #include "osdep.h"

     

       285
       285
       +
       diff -ur a/src/osdep/unix/unix.c b/src/osdep/unix/unix.c

     

       286
       286
       +
       --- a/src/osdep/unix/unix.c	2011-07-22 20:20:10.000000000 -0400

     

       287
       287
       +
       +++ b/src/osdep/unix/unix.c	2023-10-17 22:24:46.358134773 -0400

     

       288
       288
       +
       @@ -45,6 +45,7 @@

     

       289
       289
       +
        #include "mail.h"

     

       290
       290
       +
        #include "osdep.h"

     

       291
       291
       +
        #include <time.h>

     

       292
       292
       +
       +#include <utime.h>

     

       293
       293
       +
        #include <sys/stat.h>

     

       294
       294
       +
        #include "unix.h"

     

       295
       295
       +
        #include "pseudo.h"

     

       296
       296
       +
       diff -ur a/src/tmail/tmail.c b/src/tmail/tmail.c

     

       297
       297
       +
       --- a/src/tmail/tmail.c	2011-07-22 20:19:58.000000000 -0400

     

       298
       298
       +
       +++ b/src/tmail/tmail.c	2023-10-17 22:36:32.723585260 -0400

     

       299
       299
       +
       @@ -27,6 +27,7 @@

     

       300
       300
       +
         */

     

       301
       301
       +
        

     

       302
       302
       +
        #include <stdio.h>

     

       303
       303
       +
       +#include <ctype.h>

     

       304
       304
       +
        #include <pwd.h>

     

       305
       305
       +
        #include <errno.h>

     

       306
       306
       +
        extern int errno;		/* just in case */

+9 -4

pkgs/tools/networking/uwimap/default.nix

···

       25
       25
        
           (if stdenv.isDarwin then libkrb5 else pam)  # Matches the make target.

     

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
       -
         patches = [ (fetchpatch {

     

       29
       29
       -
           url = "https://salsa.debian.org/holmgren/uw-imap/raw/dcb42981201ea14c2d71c01ebb4a61691b6f68b3/debian/patches/1006_openssl1.1_autoverify.patch";

     

       30
       30
       -
           sha256 = "09xb58awvkhzmmjhrkqgijzgv7ia381ablf0y7i1rvhcqkb5wga7";

     

       31
       31
       -
         }) ];

     

       28
       28
       +
         patches = [

     

       29
       29
       +
           (fetchpatch {

     

       30
       30
       +
             url = "https://salsa.debian.org/holmgren/uw-imap/raw/dcb42981201ea14c2d71c01ebb4a61691b6f68b3/debian/patches/1006_openssl1.1_autoverify.patch";

     

       31
       31
       +
             sha256 = "09xb58awvkhzmmjhrkqgijzgv7ia381ablf0y7i1rvhcqkb5wga7";

     

       32
       32
       +
           })

     

       33
       33
       +
           # Required to build with newer versions of clang. Fixes call to undeclared functions errors

     

       34
       34
       +
           # and incompatible function pointer conversions.

     

       35
       35
       +
           ./clang-fix.patch

     

       36
       36
       +
         ];

     

       32
       37
        
       

     

       33
       38
        
         postPatch = ''

     

       34
       39
        
           sed -i src/osdep/unix/Makefile -e 's,/usr/local/ssl,${openssl.dev},'