imap-sharedlib.patch

   1 diff -urNp -x '*.orig' imap-2007f.org/Makefile imap-2007f/Makefile
   2 --- imap-2007f.org/Makefile     2011-07-23 02:20:21.000000000 +0200
   3 +++ imap-2007f/Makefile 2021-09-29 21:57:46.362676816 +0200
   4 @@ -84,6 +84,7 @@
   5  # lnx  Linux with traditional passwords and crypt() in the C library
   6  #       (see lnp, sl4, sl5, and slx)
   7  # lnp  Linux with Pluggable Authentication Modules (PAM)
   8 +# lnps Linux with Pluggable Authentication Modules (PAM) (with shared libc-client)
   9  # lmd  Mandrake Linux
  10  # lr5  RedHat Enterprise 5 and later (same as lfd)
  11  # lrh  RedHat Linux 7.2 and later
  12 @@ -307,7 +308,7 @@ SPECIALS:
  13
  14  # Note on SCO you may have to set LN to "ln".
  15
  16 -a32 a41 a52 aix bs3 bsi d-g d54 do4 drs epx ga4 gas gh9 ghp ghs go5 gsc gsg gso gul h11 hpp hpx lnp lyn mct mnt nec nto nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx soc sol sos uw2: an
  17 +a32 a41 a52 aix bs3 bsi d-g d54 do4 drs epx ga4 gas gh9 ghp ghs go5 gsc gsg gso gul h11 hpp hpx lnp lnps lyn mct mnt nec nto nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx soc sol sos uw2: an
  18         $(BUILD) BUILDTYPE=$@
  19
  20  # If you use sv4, you may find that it works to move it to use the an process.
  21 diff -urNp -x '*.orig' imap-2007f.org/src/dmail/Makefile imap-2007f/src/dmail/Makefile
  22 --- imap-2007f.org/src/dmail/Makefile   2011-07-23 02:19:57.000000000 +0200
  23 +++ imap-2007f/src/dmail/Makefile       2021-09-29 21:57:46.362676816 +0200
  24 @@ -26,14 +26,14 @@
  25
  26
  27  C = ../c-client
  28 -CCLIENTLIB = $C/c-client.a
  29 +CCLIENTLIB = $C/`cat $C/ARCHIVENAME`
  30  SHELL = /bin/sh
  31
  32  # Get local definitions from c-client directory
  33
  34  CC = `cat $C/CCTYPE`
  35  CFLAGS = -I$C `cat $C/CFLAGS`
  36 -LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
  37 +LDFLAGS = `cat $C/LDFLAGS`
  38
  39  dmail: $(CCLIENTLIB) dmail.o dquota.o
  40         $(CC) $(CFLAGS) -o dmail dmail.o dquota.o $(LDFLAGS)
  41 diff -urNp -x '*.orig' imap-2007f.org/src/imapd/Makefile imap-2007f/src/imapd/Makefile
  42 --- imap-2007f.org/src/imapd/Makefile   2011-07-23 02:20:00.000000000 +0200
  43 +++ imap-2007f/src/imapd/Makefile       2021-09-29 21:57:46.362676816 +0200
  44 @@ -43,12 +43,12 @@ SHELL= /bin/sh
  45  # Get local definitions from c-client directory
  46
  47  C = ../c-client
  48 -CCLIENTLIB = $C/c-client.a
  49 +CCLIENTLIB = $C/`cat $C/ARCHIVENAME`
  50  CC = `cat $C/CCTYPE`
  51  CFLAGS = -I$C `cat $C/CFLAGS` $(NSBD) $(ENBD) -DANOFILE=\"$(ANO)\" \
  52         -DALERTFILE=\"$(ALERT)\" -DNNTPFILE=\"$(NNTP)\" \
  53         -DUSERALERTFILE=\"$(USERALERT)\" -DSHUTDOWNFILE=\"$(SHUTDOWN)\"
  54 -LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
  55 +LDFLAGS = `cat $C/LDFLAGS`
  56
  57  all:   imapd
  58
  59 diff -urNp -x '*.orig' imap-2007f.org/src/ipopd/Makefile imap-2007f/src/ipopd/Makefile
  60 --- imap-2007f.org/src/ipopd/Makefile   2011-07-23 02:20:17.000000000 +0200
  61 +++ imap-2007f/src/ipopd/Makefile       2021-09-29 21:57:46.362676816 +0200
  62 @@ -26,14 +26,14 @@
  63
  64
  65  C = ../c-client
  66 -CCLIENTLIB = $C/c-client.a
  67 +CCLIENTLIB = $C/`cat $C/ARCHIVENAME`
  68  SHELL = /bin/sh
  69
  70  # Get local definitions from c-client directory
  71
  72  CC = `cat $C/CCTYPE`
  73  CFLAGS = -I$C `cat $C/CFLAGS`
  74 -LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
  75 +LDFLAGS = `cat $C/LDFLAGS`
  76
  77  ipopd: ipop2d ipop3d
  78
  79 diff -urNp -x '*.orig' imap-2007f.org/src/mailutil/Makefile imap-2007f/src/mailutil/Makefile
  80 --- imap-2007f.org/src/mailutil/Makefile        2011-07-23 02:19:56.000000000 +0200
  81 +++ imap-2007f/src/mailutil/Makefile    2021-09-29 21:57:46.362676816 +0200
  82 @@ -26,14 +26,14 @@
  83
  84
  85  C = ../c-client
  86 -CCLIENTLIB = $C/c-client.a
  87 +CCLIENTLIB = $C/`cat $C/ARCHIVENAME`
  88  SHELL = /bin/sh
  89
  90  # Get local definitions from c-client directory
  91
  92  CC = `cat $C/CCTYPE`
  93  CFLAGS = -I$C `cat $C/CFLAGS`
  94 -LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
  95 +LDFLAGS = `cat $C/LDFLAGS`
  96
  97  mailutil: $(CCLIENTLIB) mailutil.o
  98         $(CC) $(CFLAGS) -o mailutil mailutil.o $(LDFLAGS)
  99 diff -urNp -x '*.orig' imap-2007f.org/src/mtest/Makefile imap-2007f/src/mtest/Makefile
 100 --- imap-2007f.org/src/mtest/Makefile   2011-07-23 02:20:17.000000000 +0200
 101 +++ imap-2007f/src/mtest/Makefile       2021-09-29 21:57:46.362676816 +0200
 102 @@ -26,14 +26,14 @@
 103
 104
 105  C = ../c-client
 106 -CCLIENTLIB = $C/c-client.a
 107 +CCLIENTLIB = $C/`cat $C/ARCHIVENAME`
 108  SHELL = /bin/sh
 109
 110  # Get local definitions from c-client directory
 111
 112  CC = `cat $C/CCTYPE`
 113  CFLAGS = -I$C `cat $C/CFLAGS`
 114 -LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
 115 +LDFLAGS = `cat $C/LDFLAGS`
 116
 117  all:   mtest
 118
 119 diff -urNp -x '*.orig' imap-2007f.org/src/osdep/unix/Makefile imap-2007f/src/osdep/unix/Makefile
 120 --- imap-2007f.org/src/osdep/unix/Makefile      2021-09-29 21:57:46.299343621 +0200
 121 +++ imap-2007f/src/osdep/unix/Makefile  2021-09-29 21:57:46.362676816 +0200
 122 @@ -189,7 +189,7 @@ a32:        # AIX 3.2 for RS/6000
 123          SPOOLDIR=/var/spool \
 124          RSHPATH=/usr/bin/rsh \
 125          BASECFLAGS="-g -Dunix=1 -D_BSD" \
 126 -        BASELDFLAGS="-lbsd"
 127 +        BASELDFLAGS="../c-client/c-client.a -lbsd"
 128
 129  a41:   # AIX 4.1 for RS/6000
 130         $(BUILD) `$(CAT) SPECIALS` OS=$@ \
 131 @@ -213,12 +213,13 @@ aix:      # AIX/370
 132         $(BUILD) `$(CAT) SPECIALS` OS=$@ \
 133          CRXTYPE=nfs \
 134          BASECFLAGS="-g" \
 135 -        BASELDFLAGS="-lbsd"
 136 +        BASELDFLAGS="../c-client/c-client.a -lbsd"
 137
 138  aos:   # AOS for RT
 139         $(BUILD) `$(CAT) SPECIALS` OS=$@ \
 140          CRXTYPE=nfs \
 141 -        BASECFLAGS="-g -Dconst="
 142 +        BASECFLAGS="-g -Dconst=" \
 143 +        BASELDFLAGS="../c-client/c-client.a"
 144
 145  art:   # AIX 2.2.1 for RT
 146         $(BUILD) `$(CAT) SPECIALS` OS=$@ \
 147 @@ -227,7 +228,8 @@ art:        # AIX 2.2.1 for RT
 148          ACTIVEFILE=/usr/local/news/control/active \
 149          RSHPATH=/bin/rsh \
 150          BASECFLAGS="-g -Dconst= -Dvoid=char" \
 151 -        RANLIB=true
 152 +        RANLIB=true \
 153 +        BASELDFLAGS="../c-client/c-client.a"
 154
 155  asv:   # Altos SVR4
 156         $(BUILD) `$(CAT) SPECIALS` OS=$@ \
 157 @@ -235,7 +237,7 @@ asv:        # Altos SVR4
 158          ACTIVEFILE=/usr/spool/news/active \
 159          RSHPATH=/usr/bin/rcmd \
 160          BASECFLAGS="-Dconst= -DSIGSTOP=SIGKILL" \
 161 -        BASELDFLAGS="-lsocket -lrpc -lgen -lcrypt -lxenix" \
 162 +        BASELDFLAGS="../c-client/c-client.a -lsocket -lrpc -lgen -lcrypt -lxenix" \
 163          RANLIB=true
 164
 165  aux:   # A/UX
 166 @@ -243,6 +245,7 @@ aux:        # A/UX
 167          CRXTYPE=nfs \
 168          MAILSPOOL=/usr/mail \
 169          BASECFLAGS="-g -B/usr/lib/big/ -Dvoid=char -Dconst=" \
 170 +        BASELDFLAGS="../c-client/c-client.a" \
 171          RANLIB=true ARRC="ar -rc"
 172
 173  bs3:   # BSD/i386 3.0 or higher
 174 @@ -251,11 +254,13 @@ bs3:      # BSD/i386 3.0 or higher
 175          SPOOLDIR=/var NEWSSPOOL=/var/news/spool \
 176          ACTIVEFILE=/var/news/etc/active \
 177          RSHPATH=/usr/bin/rsh \
 178 +        BASELDFLAGS="../c-client/c-client.a" \
 179          BASECFLAGS="$(GCCCFLAGS)" CC=shlicc
 180
 181  bsd:   # BSD UNIX
 182         $(BUILD) `$(CAT) SPECIALS` OS=$@ \
 183          CRXTYPE=nfs \
 184 +        BASELDFLAGS="../c-client/c-client.a" \
 185          BASECFLAGS="-g -Dconst="
 186
 187  bsf:   # FreeBSD
 188 @@ -273,6 +278,7 @@ bsi:        # BSD/i386
 189          SPOOLDIR=/var NEWSSPOOL=/var/news/spool \
 190          ACTIVEFILE=/var/news/etc/active \
 191          RSHPATH=/usr/bin/rsh \
 192 +        BASELDFLAGS="../c-client/c-client.a" \
 193          BASECFLAGS="$(GCCCFLAGS)"
 194
 195  bso:   # OpenBSD
 196 @@ -281,6 +287,7 @@ bso:        # OpenBSD
 197          SPOOLDIR=/var \
 198          ACTIVEFILE=/usr/local/news/lib/active \
 199          RSHPATH=/usr/bin/rsh \
 200 +        BASELDFLAGS="../c-client/c-client.a" \
 201          BASECFLAGS="$(GCCCFLAGS)"
 202
 203  cvx:   # Convex
 204 @@ -306,7 +313,7 @@ d-g:        # Data General DG/UX
 205          ACTIVEFILE=/local/news/active \
 206          RSHPATH=/usr/bin/remsh \
 207          BASECFLAGS="-g -Dconst=" \
 208 -        BASELDFLAGS="-lnsl -lsocket" \
 209 +        BASELDFLAGS="../c-client/c-client.a -lnsl -lsocket" \
 210          RANLIB=true
 211
 212  d54:   # Data General DG/UX 5.4
 213 @@ -316,7 +323,7 @@ d54:        # Data General DG/UX 5.4
 214          ACTIVEFILE=/local/news/active \
 215          RSHPATH=/usr/bin/remsh \
 216          BASECFLAGS="-g -Dconst=" \
 217 -        BASELDFLAGS="-lnsl -lsocket" \
 218 +        BASELDFLAGS="../c-client/c-client.a -lnsl -lsocket" \
 219          RANLIB=true
 220
 221  dpx:   # Bull DPX/2
 222 @@ -324,7 +331,7 @@ dpx:        # Bull DPX/2
 223          SIGTYPE=sv4 CHECKPW=sv4 LOGINPW=sv4 \
 224          RSHPATH=/usr/bin/remsh \
 225          BASECFLAGS="-Dconst= -DSYSTEM5 -DSHORT_IDENT" \
 226 -        BASELDFLAGS="-linet" \
 227 +        BASELDFLAGS="../c-client/c-client.a -linet" \
 228          RANLIB=true LN=ln
 229
 230  drs:   # ICL DRS/NX
 231 @@ -334,18 +341,20 @@ drs:      # ICL DRS/NX
 232          ACTIVEFILE=/var/lib/news/active \
 233          RSHPATH=/usr/bin/rsh \
 234          BASECFLAGS="-O" \
 235 -        BASELDFLAGS="-lsocket -lgen" \
 236 +        BASELDFLAGS="../c-client/c-client.a -lsocket -lgen" \
 237          RANLIB=true
 238
 239  do4:   # Apollo Domain/OS sr10.4
 240         $(BUILD) `$(CAT) SPECIALS` OS=$@ \
 241          CRXTYPE=nfs \
 242          BASECFLAGS="-A systype,bsd4.3 -D_APOLLO_SOURCE" \
 243 +        BASELDFLAGS="../c-client/c-client.a" \
 244          RANLIB=true
 245
 246  dyn:   # Dynix
 247         $(BUILD) `$(CAT) SPECIALS` OS=$@ \
 248          CRXTYPE=nfs \
 249 +        BASELDFLAGS="../c-client/c-client.a" \
 250          BASECFLAGS="-g -Dconst="
 251
 252  epx:   # EP/IX
 253 @@ -364,7 +373,7 @@ ga4:        # GCC AIX 4.1 for RS/6000
 254          SPOOLDIR=/var/spool \
 255          RSHPATH=/usr/bin/rsh \
 256          BASECFLAGS="-g -Dunix=1 -D_BSD" \
 257 -        BASELDFLAGS="-ls"
 258 +        BASELDFLAGS="../c-client/c-client.a -ls"
 259
 260  gas:   # GCC Altos SVR4
 261         $(BUILD) `$(CAT) SPECIALS` OS=asv \
 262 @@ -372,7 +381,7 @@ gas:        # GCC Altos SVR4
 263          ACTIVEFILE=/usr/spool/news/active \
 264          RSHPATH=/usr/bin/rcmd \
 265          BASECFLAGS="-g -O -DALTOS_SYSTEM_V -DSIGSTOP=SIGKILL" \
 266 -        BASELDFLAGS="-lsocket -lrpc -lgen -lcrypt -lxenix" \
 267 +        BASELDFLAGS="../c-client/c-client.a -lsocket -lrpc -lgen -lcrypt -lxenix" \
 268          RANLIB=true CC=gcc
 269
 270  gh9:   # GCC HP-UX 9.x
 271 @@ -381,6 +390,7 @@ gh9:        # GCC HP-UX 9.x
 272          MAILSPOOL=/usr/mail \
 273          RSHPATH=/usr/bin/remsh \
 274          BASECFLAGS="$(GCCCFLAGS)" \
 275 +        BASELDFLAGS="../c-client/c-client.a" \
 276          RANLIB=true CC=gcc
 277
 278  ghp:   # GCC HP-UX 10.x
 279 @@ -390,6 +400,7 @@ ghp:        # GCC HP-UX 10.x
 280          ACTIVEFILE=/var/news/active \
 281          RSHPATH=/usr/bin/remsh \
 282          BASECFLAGS="$(GCCCFLAGS)" \
 283 +        BASELDFLAGS="../c-client/c-client.a" \
 284          RANLIB=true CC=gcc
 285
 286  ghs:   # GCC HP-UX with Trusted Computer Base
 287 @@ -399,7 +410,7 @@ ghs:        # GCC HP-UX with Trusted Computer B
 288          ACTIVEFILE=/var/news/active \
 289          RSHPATH=/usr/bin/remsh \
 290          BASECFLAGS="$(GCCCFLAGS)" \
 291 -        BASELDFLAGS="-lnet -lV3 -lsec" \
 292 +        BASELDFLAGS="../c-client/c-client.a -lnet -lV3 -lsec" \
 293          RANLIB=true CC=gcc
 294
 295  go5:   # GCC 2.7.1 (95q4) SCO Open Server 5.0.x
 296 @@ -410,7 +421,7 @@ go5:        # GCC 2.7.1 (95q4) SCO Open Server
 297          ACTIVEFILE=/var/lib/news/active \
 298          RSHPATH=/usr/bin/rcmd \
 299          BASECFLAGS="$(GCCCFLAGS) -I/usr/include -L/lib" \
 300 -        BASELDFLAGS="-lsocket -lprot -lx -ltinfo -lm" \
 301 +        BASELDFLAGS="../c-client/c-client.a -lsocket -lprot -lx -ltinfo -lm" \
 302          RANLIB=true CC=gcc
 303
 304  gsc:   # Santa Cruz Operation
 305 @@ -419,7 +430,7 @@ gsc:        # Santa Cruz Operation
 306          CREATEPROTO=mmdfproto EMPTYPROTO=mmdfproto \
 307          RSHPATH=/usr/bin/rcmd \
 308          BASECFLAGS="$(GCCCFLAGS)" \
 309 -        BASELDFLAGS="-lsocket -lprot -lcrypt_i -lx -los" \
 310 +        BASELDFLAGS="../c-client/c-client.a -lsocket -lprot -lcrypt_i -lx -los" \
 311          RANLIB=true LN=ln CC=gcc
 312
 313  gsg:   # GCC Silicon Graphics
 314 @@ -428,6 +439,7 @@ gsg:        # GCC Silicon Graphics
 315          MAILSPOOL=/usr/mail \
 316          RSHPATH=/usr/bsd/rsh \
 317          BASECFLAGS="$(GCCCFLAGS)" \
 318 +        BASELDFLAGS="../c-client/c-client.a" \
 319          RANLIB=true CC=gcc
 320
 321  gso:   os_sol.h        # GCC Solaris
 322 @@ -437,21 +449,21 @@ gso:      os_sol.h        # GCC Solaris
 323          ACTIVEFILE=/usr/share/news/active \
 324          RSHPATH=/usr/bin/rsh \
 325          BASECFLAGS="$(GCCCFLAGS)" \
 326 -        BASELDFLAGS="-lsocket -lnsl -lgen" \
 327 +        BASELDFLAGS="../c-client/c-client.a -lsocket -lnsl -lgen" \
 328          RANLIB=true CC=gcc
 329
 330  gsu:   # GCC SUN-OS
 331         $(BUILD) `$(CAT) SPECIALS` OS=sun \
 332          CRXTYPE=nfs \
 333          BASECFLAGS="$(GCCCFLAGS)" \
 334 -        BASELDFLAGS="-ldl" \
 335 +        BASELDFLAGS="../c-client/c-client.a -ldl" \
 336          CC=gcc
 337
 338  gul:   # GCC Ultrix
 339         $(BUILD) `$(CAT) SPECIALS` OS=ult \
 340          SIGTYPE=psx CHECKPW=ult CRXTYPE=nfs \
 341          BASECFLAGS="$(GCCCFLAGS)" \
 342 -        BASELDFLAGS="-lauth -lc" \
 343 +        BASELDFLAGS="../c-client/c-client.a -lauth -lc" \
 344          CC=gcc
 345
 346  h11:   # HP-UX 11i
 347 @@ -469,7 +481,7 @@ hpp:        # HP-UX 9.x
 348          MAILSPOOL=/usr/mail \
 349          RSHPATH=/usr/bin/remsh \
 350          BASECFLAGS="-g -Aa -D_HPUX_SOURCE" \
 351 -        BASELDFLAGS="-lnet -lV3" \
 352 +        BASELDFLAGS="../c-client/c-client.a -lnet -lV3" \
 353          RANLIB=true
 354
 355  hpx:   # HP-UX 10.x
 356 @@ -479,7 +491,7 @@ hpx:        # HP-UX 10.x
 357          ACTIVEFILE=/var/news/active \
 358          RSHPATH=/usr/bin/remsh \
 359          BASECFLAGS="-g -Ae" \
 360 -        BASELDFLAGS="-lnet -lV3" \
 361 +        BASELDFLAGS="../c-client/c-client.a -lnet -lV3" \
 362          RANLIB=true
 363
 364  isc:   # Interactive
 365 @@ -488,9 +500,21 @@ isc:       # Interactive
 366          SPOOLDIR=/var/spool MAILSPOOL=/var/mail \
 367          ACTIVEFILE=/var/spool/news/active \
 368          BASECFLAGS="-Xp -D_SYSV3" \
 369 -        BASELDFLAGS="-linet -lnsl_s -lgen -lx -lsec -liberty" \
 370 +        BASELDFLAGS="../c-client/c-client.a -linet -lnsl_s -lgen -lx -lsec -liberty" \
 371          RANLIB=true
 372
 373 +lnps:  # Linux Pluggable Authentication modules (c-client as shared lib)
 374 +       $(BUILD) `cat EXTRASPECIALS` OS=lnx \
 375 +       SIGTYPE=psx CHECKPW=pam CRXTYPE=nfs \
 376 +       SPOOLDIR=/var/spool \
 377 +       ACTIVEFILE=/var/lib/news/active \
 378 +       RSHPATH=/usr/bin/rsh \
 379 +       BASECFLAGS="$(GCCCFLAGS)" \
 380 +       ARCHIVE="libc-client.so" \
 381 +       BASELDFLAGS="$(LDOPT) -L../c-client -lc-client -lpam -ldl -lc" \
 382 +       ARRC="gcc --shared -Wl,-soname,libc-client.so.$(VERSION) -lssl -lcrypto -lpam -ldl -lc -o" \
 383 +       RANLIB=true
 384 +
 385  lnp:   # Linux Pluggable Authentication modules
 386         $(BUILD) `$(CAT) SPECIALS` OS=slx \
 387          SIGTYPE=psx CHECKPW=pam CRXTYPE=nfs \
 388 @@ -498,7 +522,7 @@ lnp:        # Linux Pluggable Authentication mo
 389          ACTIVEFILE=/var/lib/news/active \
 390          RSHPATH=/usr/bin/rsh \
 391          BASECFLAGS="$(GCCCFLAGS)" \
 392 -        BASELDFLAGS="$(PAMLDFLAGS)"
 393 +        BASELDFLAGS="../c-client/c-client.a $(PAMLDFLAGS)"
 394
 395  lnx:   # Linux non-shadow passwords
 396         @echo You are building for traditional Linux *without* shadow
 397 @@ -517,12 +541,13 @@ lyn:      # LynxOS
 398          CRXTYPE=nfs \
 399          RSHPATH=/bin/rsh \
 400          BASECFLAGS="$(GCCCFLAGS)" \
 401 -        BASELDFLAGS=-lbsd \
 402 +        BASELDFLAGS="../c-client/c-client.a -lbsd" \
 403          CC=gcc
 404
 405  mct:   # MachTen - CRXTYPE=nfs doesn't work (at least not on 2.2)
 406         $(BUILD) `$(CAT) SPECIALS` OS=$@ \
 407          SPOOLDIR=/var/spool \
 408 +        BASELDFLAGS="../c-client/c-client.a" \
 409          BASECFLAGS="$(GCCCFLAGS)"
 410
 411  mnt:   # Mint
 412 @@ -540,7 +565,7 @@ neb:        # NetBSD
 413          ACTIVEFILE=/var/db/news/active \
 414          RSHPATH=/usr/bin/rsh \
 415          BASECFLAGS="$(GCCCFLAGS)" \
 416 -        BASELDFLAGS="-lcrypt"
 417 +        BASELDFLAGS="../c-client/c-client.a -lcrypt"
 418
 419  nec:   # NEC UX
 420         $(BUILD) `$(CAT) SPECIALS` OS=sv4 \
 421 @@ -549,7 +574,7 @@ nec:        # NEC UX
 422          ACTIVEFILE=/var/news/lib/active \
 423          RSHPATH=/usr/bin/rsh \
 424          BASECFLAGS="-g -Kopt=2 -KOlimit=2000" \
 425 -        BASELDFLAGS="-lsocket -lnsl -lgen" \
 426 +        BASELDFLAGS="../c-client/c-client.a -lsocket -lnsl -lgen" \
 427          RANLIB=true CC=/usr/abiccs/bin/cc
 428
 429  nto:   # QNX Neutrino RTP
 430 @@ -558,16 +583,19 @@ nto:      # QNX Neutrino RTP
 431          SPOOLDIR=/var/spool \
 432          ACTIVEFILE=/var/lib/news/active \
 433          RSHPATH=/usr/bin/rsh \
 434 +        BASELDFLAGS="../c-client/c-client.a" \
 435          BASECFLAGS="-g -O"
 436
 437  nxt:   # NEXTSTEP
 438         $(BUILD) `$(CAT) SPECIALS` OS=$@ \
 439          CRXTYPE=nfs \
 440 +        BASELDFLAGS="../c-client/c-client.a" \
 441          BASECFLAGS="$(GCCCFLAGS)"
 442
 443  nx3:   # NEXTSTEP 3.0 single threaded
 444         $(BUILD) `$(CAT) SPECIALS` OS=nxt \
 445          CRXTYPE=nfs \
 446 +        BASELDFLAGS="../c-client/c-client.a" \
 447          BASECFLAGS="$(GCCCFLAGS)"
 448         echo "void malloc_singlethreaded (void);" >> linkage.h
 449         echo "  malloc_singlethreaded ();" >> linkage.c
 450 @@ -576,6 +604,7 @@ osf:        # OSF/1
 451         $(BUILD) `$(CAT) SPECIALS` OS=$@ \
 452          SIGTYPE=psx CRXTYPE=nfs \
 453          SPOOLDIR=/var/spool \
 454 +        BASELDFLAGS="../c-client/c-client.a" \
 455          BASECFLAGS="-g3 -w -O2 -Olimit 1500"
 456
 457  # Note: sia_become_user() used by LOGINPW=os4 doesn't seem to work right.  The
 458 @@ -585,6 +614,7 @@ os4:        # OSF/1 (Digital UNIX) 4
 459         $(BUILD) `$(CAT) SPECIALS` OS=$@ \
 460          SIGTYPE=psx CHECKPW=os4 LOGINPW=os4 CRXTYPE=nfs \
 461          SPOOLDIR=/var/spool \
 462 +        BASELDFLAGS="../c-client/c-client.a" \
 463          BASECFLAGS="-g3 -w -std0 -O2"
 464
 465  osx:   # Mac OS X
 466 @@ -592,6 +622,7 @@ osx:        # Mac OS X
 467          CRXTYPE=nfs \
 468          SPOOLDIR=/var/spool MAILSPOOL=/var/mail \
 469          RSHPATH=/usr/bin/rsh \
 470 +        BASELDFLAGS="../c-client/c-client.a" \
 471          BASECFLAGS="$(GCC4CFLAGS)"
 472
 473  ptx:   # PTX
 474 @@ -600,12 +631,13 @@ ptx:      # PTX
 475          MAILSPOOL=/usr/mail \
 476          RSHPATH=/usr/bin/resh \
 477          BASECFLAGS="-Wc,-O3 -Wc,-seq -Dprivate=PRIVATE" \
 478 -        BASELDFLAGS="-lseq -lsec -lsocket -linet -lnsl -lgen" \
 479 +        BASELDFLAGS="../c-client/c-client.a -lseq -lsec -lsocket -linet -lnsl -lgen" \
 480          RANLIB=true
 481
 482  pyr:   # Pyramid
 483         $(BUILD) `$(CAT) SPECIALS` OS=$@ \
 484          CRXTYPE=nfs \
 485 +        BASELDFLAGS="../c-client/c-client.a" \
 486          BASECFLAGS="-g -Dconst="
 487
 488  qnx:   # QNX
 489 @@ -613,12 +645,13 @@ qnx:      # QNX
 490          CHECKPW=psx LOGINPW=old \
 491          RSHPATH=/usr/ucb/rsh \
 492          BASECFLAGS="-Otax -g -Dunix=1 -D_POSIX_SOURCE" \
 493 -        BASELDFLAGS="-g -N128k -llogin -lsocket -lunix"
 494 +        BASELDFLAGS="../c-client/client.a -g -N128k -llogin -lsocket -lunix"
 495
 496  s40:   # SUN-OS 4.0
 497         $(BUILD) `$(CAT) SPECIALS` OS=$@ \
 498          CRXTYPE=nfs \
 499 -        BASECFLAGS="-g -Dconst="
 500 +        BASECFLAGS="-g -Dconst=" \
 501 +        BASELDFLAGS="../c-client.a"
 502
 503  sc5:   # SCO Open Server 5.0
 504         $(BUILD) `$(CAT) SPECIALS` OS=$@ \
 505 @@ -628,7 +661,7 @@ sc5:        # SCO Open Server 5.0
 506          ACTIVEFILE=/var/lib/news/active \
 507          RSHPATH=/usr/bin/rcmd \
 508          BASECFLAGS="-O3 -s -belf" \
 509 -        BASELDFLAGS="-lsocket -lprot -lx -ltinfo -lm" \
 510 +        BASELDFLAGS="../c-client/c-client.a -lsocket -lprot -lx -ltinfo -lm" \
 511          RANLIB=true
 512
 513  sco:   # Santa Cruz Operation
 514 @@ -637,7 +670,7 @@ sco:        # Santa Cruz Operation
 515          CREATEPROTO=mmdfproto EMPTYPROTO=mmdfproto \
 516          RSHPATH=/usr/bin/rcmd \
 517          BASECFLAGS="-O3" \
 518 -        BASELDFLAGS="-lsocket -lprot -lcrypt_i -lx -los" \
 519 +        BASELDFLAGS="../c-client/c-client.a -lsocket -lprot -lcrypt_i -lx -los" \
 520          RANLIB=true LN=ln
 521
 522  # Note: setting _POSIX_SOURCE doesn't seem to build it as of SGI IRIX 5.3
 523 @@ -648,6 +681,7 @@ sgi:        # Silicon Graphics
 524          MAILSPOOL=/usr/mail \
 525          RSHPATH=/usr/bsd/rsh \
 526          BASECFLAGS="-g3 -O2 -Olimit 8192" \
 527 +        BASELDFALGS="../c-client/c-client.a" \
 528          RANLIB=true
 529
 530  sg6:   # Silicon Graphics, IRIX 6.5
 531 @@ -656,6 +690,7 @@ sg6:        # Silicon Graphics, IRIX 6.5
 532          MAILSPOOL=/usr/mail \
 533          RSHPATH=/usr/bsd/rsh \
 534          BASECFLAGS="-g3 -O2 -OPT:Olimit=0 -woff 1110,1116" \
 535 +        BASELDFALGS="../c-client/c-client.a" \
 536          RANLIB=true
 537
 538  # Note: Mark Kaesling says that setluid() isn't in HP-UX with SecureWare.
 539 @@ -667,7 +702,7 @@ shp:        # HP-UX with Trusted Computer Base
 540          ACTIVEFILE=/var/news/active \
 541          RSHPATH=/usr/bin/remsh \
 542          BASECFLAGS="-g -Ae" \
 543 -        BASELDFLAGS="-lnet -lV3 -lsec" \
 544 +        BASELDFLAGS="../c-client/c-client.a -lnet -lV3 -lsec" \
 545          RANLIB=true
 546
 547  slx:   # Secure Linux
 548 @@ -681,7 +716,7 @@ slx:        # Secure Linux
 549          ACTIVEFILE=/var/lib/news/active \
 550          RSHPATH=/usr/bin/rsh \
 551          BASECFLAGS="$(GCCCFLAGS)" \
 552 -        BASELDFLAGS="$(LDOPT) -lpam -ldl -lcrypt"
 553 +        BASELDFLAGS="../c-client/c-client.a $(LDOPT) -lpam -ldl -lcrypt"
 554
 555  sl4:   # Secure Linux using libc4
 556         @echo You are building for libc4 versions of Secure Linux
 557 @@ -693,7 +728,7 @@ sl4:        # Secure Linux using libc4
 558          ACTIVEFILE=/var/lib/news/active \
 559          RSHPATH=/usr/bin/rsh \
 560          BASECFLAGS="$(GCCCFLAGS)" \
 561 -        BASELDFLAGS="-lshadow"
 562 +        BASELDFLAGS="../c-client/c-client.a -lshadow"
 563
 564  sl5:   # Secure Linux using libc5
 565         @echo You are building for libc5 versions of Secure Linux
 566 @@ -704,6 +739,7 @@ sl5:        # Secure Linux using libc5
 567          SPOOLDIR=/var/spool \
 568          ACTIVEFILE=/var/lib/news/active \
 569          RSHPATH=/usr/bin/rsh \
 570 +        BASELDFLAGS="../c-client/c-client.a" \
 571          BASECFLAGS="$(GCCCFLAGS)"
 572
 573  snx:   # Siemens Nixdorf SINIX and Reliant UNIX
 574 @@ -713,7 +749,7 @@ snx:        # Siemens Nixdorf SINIX and Reliant
 575          ACTIVEFILE=/usr/share/news/active \
 576          RSHPATH=/usr/bin/rsh \
 577          BASECFLAGS="-g -D_SYS_CLOCK_H -Dconst=" \
 578 -        BASELDFLAGS="-lsocket -lnsl -lgen" \
 579 +        BASELDFLAGS="../c-client/c-client.a -lsocket -lnsl -lgen" \
 580          RANLIB=true
 581
 582  # Sorry about the -w, but the cretinous SUN Workshop Pro C compiler barfs on
 583 @@ -774,20 +810,20 @@ sol:      os_sol.h        # Solaris
 584          ACTIVEFILE=/usr/share/news/active \
 585          RSHPATH=/usr/bin/rsh \
 586          BASECFLAGS="-g -O2" \
 587 -        BASELDFLAGS="-lsocket -lnsl -lgen" \
 588 +        BASELDFLAGS="../c-client/c-client.a -lsocket -lnsl -lgen" \
 589          RANLIB=true CC=ucbcc
 590
 591  sos:   # Secure OSF/1
 592         $(BUILD) `$(CAT) SPECIALS` OS=$@ \
 593          SIGTYPE=psx CHECKPW=sce LOGINPW=sec CRXTYPE=nfs \
 594          BASECFLAGS="-g3 -w -O2 -Olimit 1500" \
 595 -        BASELDFLAGS="-lsecurity -laud"
 596 +        BASELDFLAGS="../c-client/c-client.a -lsecurity -laud"
 597
 598  ssn:   # Secure SUN-OS
 599         $(BUILD) `$(CAT) SPECIALS` OS=sun \
 600          CHECKPW=ssn CRXTYPE=nfs \
 601          BASECFLAGS="-g -Dconst=" \
 602 -        BASELDFLAGS="-ldl"
 603 +        BASELDFLAGS="../c-client/c-client.a -ldl"
 604
 605  sua:   # Windows Vista Subsystem for UNIX Applications
 606         $(BUILD) `$(CAT) SPECIALS` OS=sua \
 607 @@ -796,13 +832,13 @@ sua:      # Windows Vista Subsystem for UNIX
 608          ACTIVEFILE=/var/lib/news/active \
 609          RSHPATH=/usr/bin/rsh \
 610          BASECFLAGS="-g -O2" \
 611 -        BASELDFLAGS="-lcrypt"
 612 +        BASELDFLAGS="../c-client/c-client.a -lcrypt"
 613
 614  sun:   # SUN-OS
 615         $(BUILD) `$(CAT) SPECIALS` OS=$@ \
 616          CRXTYPE=nfs \
 617          BASECFLAGS="-g -Dconst=" \
 618 -        BASELDFLAGS="-ldl"
 619 +        BASELDFLAGS="../c-client/c-client.a -ldl"
 620
 621  sv2:   # SVR2
 622         @echo You are being *very* optimistic!
 623 @@ -811,7 +847,7 @@ sv2:        # SVR2
 624          MAILSPOOL=/usr/mail \
 625          RSHPATH=/usr/bin/remsh \
 626          BASECFLAGS="-Dconst= -DSYSTEM5 -DSHORT_IDENT -I/usr/ethernet/include" \
 627 -        BASELDFLAGS="-lnet" \
 628 +        BASELDFLAGS="../c-client/c-client.a -lnet" \
 629          RANLIB=true LN=ln
 630
 631  sv4:   # SVR4
 632 @@ -821,14 +857,14 @@ sv4:      # SVR4
 633          ACTIVEFILE=/usr/share/news/active \
 634          RSHPATH=/usr/bin/resh \
 635          BASECFLAGS="-g -Dconst=" \
 636 -        BASELDFLAGS="-lsocket -lnsl -lgen" \
 637 +        BASELDFLAGS="../c-client/c-client.a -lsocket -lnsl -lgen" \
 638          RANLIB=true
 639
 640  ult:   # Ultrix
 641         $(BUILD) `$(CAT) SPECIALS` OS=$@ \
 642          SIGTYPE=psx CHECKPW=ult CRXTYPE=nfs \
 643          BASECFLAGS="-g3 -O2 -Olimit 1500 -Dconst=" \
 644 -        BASELDFLAGS="-lauth -lc"
 645 +        BASELDFLAGS="../c-client/c-client.a -lauth -lc"
 646
 647  uw2:   # UnixWare SVR4.2
 648         $(BUILD) `$(CAT) SPECIALS` OS=sv4 \
 649 @@ -837,18 +873,19 @@ uw2:      # UnixWare SVR4.2
 650          ACTIVEFILE=/var/news/lib/active \
 651          RSHPATH=/usr/bin/rsh \
 652          BASECFLAGS="-g" \
 653 -        BASELDFLAGS="-lsocket -lnsl -lgen" \
 654 +        BASELDFLAGS="../c-client/c-client.a -lsocket -lnsl -lgen" \
 655          RANLIB=true
 656
 657  vul:   # VAX Ultrix
 658         $(BUILD) `$(CAT) SPECIALS` OS=ult \
 659          SIGTYPE=psx CHECKPW=ult CRXTYPE=nfs \
 660          BASECFLAGS="-O2 -Dconst=" \
 661 -        BASELDFLAGS="-lauth -lc"
 662 +        BASELDFLAGS="../c-client/c-client.a -lauth -lc"
 663
 664  vu2:   # VAX Ultrix 2.3, etc.
 665         $(BUILD) `$(CAT) SPECIALS` OS=$@ \
 666          CRXTYPE=nfs \
 667 +        BASELDFLAGS="../c-client/c-client.a" \
 668          BASECFLAGS="-O2 -Dconst= -Dvoid=char"
 669
 670
 671 @@ -870,7 +907,7 @@ $(ARCHIVE): $(BINARIES)
 672  # Cleanup
 673
 674  clean:
 675 -       sh -c '$(RM) auths.c crexcl.c ip_unix.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true'
 676 +       sh -c '$(RM) auths.c crexcl.c ip_unix.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE ARCHIVENAME *FLAGS *TYPE $(ARCHIVE) || true'
 677
 678
 679  # Dependencies
 680 @@ -979,6 +1016,7 @@ onceenv:
 681         echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
 682         echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
 683         echo $(OS) > OSTYPE
 684 +       echo $(ARCHIVE) >ARCHIVENAME
 685         ./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
 686         ./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)
 687         echo "  mail_versioncheck (CCLIENTVERSION);" >> linkage.c
 688 diff -urNp -x '*.orig' imap-2007f.org/src/tmail/Makefile imap-2007f/src/tmail/Makefile
 689 --- imap-2007f.org/src/tmail/Makefile   2011-07-23 02:19:58.000000000 +0200
 690 +++ imap-2007f/src/tmail/Makefile       2021-09-29 21:57:46.362676816 +0200
 691 @@ -26,14 +26,14 @@
 692
 693
 694  C = ../c-client
 695 -CCLIENTLIB = $C/c-client.a
 696 +CCLIENTLIB = $C/`cat $C/ARCHIVENAME`
 697  SHELL = /bin/sh
 698
 699  # Get local definitions from c-client directory
 700
 701  CC = `cat $C/CCTYPE`
 702  CFLAGS = -I$C `cat $C/CFLAGS`
 703 -LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
 704 +LDFLAGS = `cat $C/LDFLAGS`
 705
 706  tmail: $(CCLIENTLIB) tmail.o tquota.o
 707         $(CC) $(CFLAGS) -o tmail tmail.o tquota.o $(LDFLAGS)