libs/uw-imap/patches/001-fix_Makefiles_and_shlib.patch

   1 --- a/Makefile  2017-11-13 01:13:36.340236114 +0200
   2 +++ b/Makefile  2017-11-13 01:34:56.869682313 +0200
   3 @@ -638,10 +638,6 @@
   4         @echo + yourself, try adding IP6=4 to the make command line.
   5         @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
   6         @echo
   7 -       @echo Do you want to build with IPv6 anyway?  Type y or n please:
   8 -       @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make noip6;exit 1);; esac'
   9 -       @echo OK, I will remember that you really want to build with IPv6.
  10 -       @echo You will not see this message again.
  11         @$(TOUCH) ip6
  12
  13  noip6:
  14 @@ -678,20 +674,18 @@
  15         $(TOOLS)/$@ "$(LN)" src/tmail tmail
  16         $(LN) $(TOOLS)/$@ .
  17
  18 -build: OSTYPE rebuild rebuildclean bundled
  19 +build: OSTYPE rebuild rebuildclean
  20
  21  OSTYPE:
  22         @$(MAKE) ip$(IP)
  23         @echo Building c-client for $(BUILDTYPE)...
  24         @$(TOUCH) SPECIALS
  25 -       echo `$(CAT) SPECIALS` $(EXTRASPECIALS) > c-client/SPECIALS
  26         $(CD) c-client;$(MAKE) $(BUILDTYPE) EXTRACFLAGS='$(EXTRACFLAGS)'\
  27          EXTRALDFLAGS='$(EXTRALDFLAGS)'\
  28          EXTRADRIVERS='$(EXTRADRIVERS)'\
  29          EXTRAAUTHENTICATORS='$(EXTRAAUTHENTICATORS)'\
  30          PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE) IP=$(IP)\
  31 -        $(SPECIALS) $(EXTRASPECIALS)
  32 -       echo $(BUILDTYPE) > OSTYPE
  33 +        $(SPECIALS) $(EXTRASPECIALS) OSTYPE=$(BUILDTYPE)
  34         $(TOUCH) rebuild
  35
  36  rebuild:
  37 --- a/src/osdep/unix/Makefile   2017-11-13 01:37:58.674011768 +0200
  38 +++ b/src/osdep/unix/Makefile   2017-11-13 03:30:18.204908962 +0200
  39 @@ -96,11 +96,11 @@
  40  LOGINPW=std
  41  SIGTYPE=bsd
  42  CRXTYPE=std
  43 -ACTIVEFILE=/usr/lib/news/active
  44 -SPOOLDIR=/usr/spool
  45 +ACTIVEFILE=/var/lib/news/active
  46 +SPOOLDIR=/var/spool
  47  MAILSPOOL=$(SPOOLDIR)/mail
  48  NEWSSPOOL=$(SPOOLDIR)/news
  49 -RSHPATH=/usr/ucb/rsh
  50 +RSHPATH=/usr/bin/rsh
  51  MD5PWD=/etc/cram-md5.pwd
  52  # Tries one of the test alternatives below if not specified.
  53  LOCKPGM=
  54 @@ -154,7 +154,7 @@
  55   dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
  56   rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
  57   unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o
  58 -CFLAGS=-g
  59 +CFLAGS=$(BASECFLAGS) $(EXTRACFLAGS) -DCHUNKSIZE=$(CHUNKSIZE)
  60
  61  CAT=cat
  62  MAKE=make
  63 @@ -162,6 +162,16 @@
  64  RM=rm -rf
  65  SH=sh
  66
  67 +OSCFLAGS= $(SSLCFLAGS) \
  68 +        -DCREATEPROTO=$(CREATEPROTO) -DEMPTYPROTO=$(EMPTYPROTO) \
  69 +        -DMD5ENABLE=\"$(MD5PWD)\" -DMAILSPOOL=\"$(MAILSPOOL)\" \
  70 +        -DANONYMOUSHOME=\"$(MAILSPOOL)/anonymous\" \
  71 +        -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
  72 +        -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" \
  73 +        -DLOCKPGM1=\"$(LOCKPGM1)\" -DLOCKPGM2=\"$(LOCKPGM2)\" \
  74 +        -DLOCKPGM3=\"$(LOCKPGM3)\"
  75 +
  76 +LDFLAGS= $(BASELDFLAGS) $(EXTRALDFLAGS) $(SSLLDFLAGS)
  77
  78  # Primary build command
  79
  80 @@ -174,7 +184,7 @@
  81  # Here if no make argument established
  82
  83  missing: osdep.h
  84 -       $(MAKE) all `$(CAT) SPECIALS`
  85 +       $(MAKE) all $(SPECIALS)
  86
  87  osdep.h:
  88         @echo You must specify what type of system
  89 @@ -674,7 +684,7 @@
  90         @echo You are building for libc6/glibc versions of Secure Linux
  91         @echo If you want libc5 versions you must use sl5 instead!
  92         @echo If you want libc4 versions you must use sl4 instead!
  93 -       $(BUILD) `$(CAT) SPECIALS` OS=$@ \
  94 +       $(BUILD) $(SPECIALS) OS=$@ \
  95          SIGTYPE=psx CHECKPW=psx CRXTYPE=nfs \
  96          SPOOLDIR=/var/spool \
  97          ACTIVEFILE=/var/lib/news/active \
  98 @@ -863,7 +873,7 @@
  99         @$(SH) ARCHIVE
 100
 101  .c.o:
 102 -       `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c
 103 +       $(CC) -c $(CFLAGS) $*.c
 104
 105
 106  # Cleanup
 107 @@ -922,8 +932,8 @@
 108         @echo If you get No such file error messages for files x509.h, ssl.h,
 109         @echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL
 110         @echo is not installed on your system.  Either install OpenSSL first
 111 -       @echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none
 112 -       `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c
 113 +       @echo or build with command: make $(OSTYPE) SSLTYPE=none
 114 +       $(CC) -c $(CFLAGS) $(OSCFLAGS) -c osdep.c
 115
 116  osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c
 117         $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c
 118 @@ -962,21 +972,14 @@
 119
 120  # Once-only environment setup
 121
 122 -once:  onceenv ckp$(PASSWDTYPE) ssl$(SSLTYPE) osdep.c
 123 +once:  ssl$(SSLTYPE) onceenv ckp$(PASSWDTYPE) osdep.c
 124
 125  onceenv:
 126         @echo Once-only environment setup...
 127 -       echo $(CC) > CCTYPE
 128 -       echo $(BASECFLAGS) '$(EXTRACFLAGS)' -DCHUNKSIZE=$(CHUNKSIZE) > CFLAGS
 129 -       echo -DCREATEPROTO=$(CREATEPROTO) -DEMPTYPROTO=$(EMPTYPROTO) \
 130 -        -DMD5ENABLE=\"$(MD5PWD)\" -DMAILSPOOL=\"$(MAILSPOOL)\" \
 131 -        -DANONYMOUSHOME=\"$(MAILSPOOL)/anonymous\" \
 132 -        -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
 133 -        -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" \
 134 -        -DLOCKPGM1=\"$(LOCKPGM1)\" -DLOCKPGM2=\"$(LOCKPGM2)\" \
 135 -        -DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS
 136 -       echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
 137         echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
 138 +       echo "$(OSCFLAGS)" > OSCFLAGS
 139 +       echo "$(CC) $(CFLAGS) $(OSCFLAGS) -shared  -Wl,-soname,libc-client.so \
 140 +       -o $(SHLIBNAME) $(BINARIES) $(LDFLAGS)" >> ARCHIVE
 141         echo $(OS) > OSTYPE
 142         ./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
 143         ./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)
 144 @@ -1055,7 +1058,6 @@
 145  sbasic:        # UNIX OpenSSL
 146         @echo Building with SSL
 147         $(LN) ssl_unix.c osdepssl.c
 148 -       echo $(SSLCFLAGS) >> OSCFLAGS
 149         echo "  ssl_onceonlyinit ();" >> linkage.c
 150
 151  snopwd:        # Plaintext disable
 152 @@ -1063,13 +1065,12 @@
 153         echo "  mail_parameters (NIL,SET_DISABLEPLAINTEXT,(void *) 2);" >> linkage.c
 154
 155  sldunix:# Normal UNIX SSL load flags
 156 -       echo $(SSLLDFLAGS) >> LDFLAGS
 157 +       @echo Normal UNIX SSL load flags
 158
 159
 160  sldsco:        # SCO SSL load flags
 161  # Note: Tim Rice says that SSL has to be lunk before other libraries on SCO.
 162 -       echo $(SSLLDFLAGS) `cat LDFLAGS` > LDFLAGS.tmp
 163 -       mv LDFLAGS.tmp LDFLAGS
 164 +       @echo SCO SSL load flags
 165
 166
 167  # A monument to a hack of long ago and far away...