imap-sharedlib.patch

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