sendmail-makefile.patch

   1 diff -Nur sendmail-8.12.0.orig/cf/cf/Makefile sendmail-8.12.0/cf/cf/Makefile
   2 --- sendmail-8.12.0.orig/cf/cf/Makefile Mon Aug 20 17:16:48 2001
   3 +++ sendmail-8.12.0/cf/cf/Makefile      Wed Sep 26 01:33:48 2001
   4 @@ -76,10 +76,10 @@
   5  install-cf:  install-sendmail-cf install-submit-cf
   6
   7  install-sendmail-cf: $(CF).cf
   8 -       $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(CF).cf ${DESTDIR}$(MAILDIR)/sendmail.cf
   9 +       $(INSTALL) -c -m $(CFMODE) $(CF).cf ${DESTDIR}$(MAILDIR)/sendmail.cf
  10
  11  install-submit-cf: $(SUBMIT).cf
  12 -       $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(SUBMIT).cf ${DESTDIR}$(MAILDIR)/submit.cf
  13 +       $(INSTALL) -c -m $(CFMODE) $(SUBMIT).cf ${DESTDIR}$(MAILDIR)/submit.cf
  14
  15  depend:
  16
  17 diff -Nur sendmail-8.12.0.orig/sendmail/Makefile.m4 sendmail-8.12.0/sendmail/Makefile.m4
  18 --- sendmail-8.12.0.orig/sendmail/Makefile.m4   Sat Jun 16 18:54:49 2001
  19 +++ sendmail-8.12.0/sendmail/Makefile.m4        Wed Sep 26 01:35:09 2001
  20 @@ -11,7 +11,7 @@
  21
  22  dnl hack: /etc/mail is not defined as "location of .cf" in the build system
  23  define(`bldTARGET_INST_DEP', ifdef(`confINST_DEP', `confINST_DEP',
  24 -`/etc/mail/submit.cf ${MSPQ}'))dnl
  25 +`${DESTDIR}/etc/mail/submit.cf ${DESTDIR}${MSPQ}'))dnl
  26  define(`bldTARGET_LINKS', ifdef(`confLINKS', `confLINKS',
  27  `${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat')
  28  )dnl
  29 @@ -36,14 +36,14 @@
  30  statistics:
  31         ${CP} /dev/null statistics
  32
  33 -/etc/mail/submit.cf:
  34 +${DESTDIR}/etc/mail/submit.cf:
  35         @echo "Please read INSTALL if anything fails while installing the binary."
  36         @echo "/etc/mail/submit.cf will be installed now."
  37         cd ${SRCDIR}/cf/cf && make install-submit-cf
  38
  39  MSPQ=ifdef(`confMSP_QUEUE_DIR', `confMSP_QUEUE_DIR', `/var/spool/clientmqueue')
  40
  41 -${MSPQ}:
  42 +${DESTDIR}${MSPQ}:
  43         @echo "Please read INSTALL if anything fails while installing the binary."
  44         @echo "You must have setup a new user ${MSPQOWN} and a new group ${GBINGRP}"
  45         @echo "as explained in sendmail/SECURITY."
  46 @@ -61,7 +61,7 @@
  47  divert(bldTARGETS_SECTION)
  48
  49  install-set-user-id: bldCURRENT_PRODUCT ifdef(`confNO_HELPFILE_INSTALL',, `install-hf') ifdef(`confNO_STATISTICS_INSTALL',, `install-st') ifdef(`confNO_MAN_BUILD',, `install-docs')
  50 -       ${INSTALL} -c -o ${S`'BINOWN} -g ${S`'BINGRP} -m ${S`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR}
  51 +       ${INSTALL} -c -m ${S`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR}
  52         for i in ${sendmailTARGET_LINKS}; do \
  53                 rm -f $$i; \
  54                 ln -s ${M`'BINDIR}/sendmail $$i; \
  55 @@ -69,7 +69,7 @@
  56
  57  define(`confMTA_LINKS', `${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat')
  58  install-sm-mta: bldCURRENT_PRODUCT
  59 -       ${INSTALL} -c -o ${M`'BINOWN} -g ${M`'BINGRP} -m ${M`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR}/sm-mta
  60 +       ${INSTALL} -c -m ${M`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR}/sm-mta
  61         for i in confMTA_LINKS; do \
  62                 rm -f $$i; \
  63                 ln -s ${M`'BINDIR}/sm-mta $$i; \