On 2026/09/21 10:43, Stuart Henderson wrote:
> On 2026/09/21 10:28, Larry Moore wrote:
> > Attached is the diff file with the changes, one created using -N and the
> > other using -P, if it helps.
>
> ideally a diff done from the cvs repo with "cvs diff -uNp" is preferred
> (use 'cvs rm' and 'cvs add' to remove/add files as needed).
>
> out of the two you attached, the -P one misses a patch deletion, so the
> -N one is better.
>
> > + install: default
> > +- ${PUTSERVER} -root ${INSTALLROOT} -F ${SBIN} -m 755 -src faxaddmodem.sh
> > -O faxaddmodem
> > +- ${PUTSERVER} -root ${INSTALLROOT} -F ${SBIN} -m 755 -src faxsetup.sh -O
> > faxsetup
> > ++ ${PUTSERVER} -root ${INSTALLROOT} -F ${SBIN} -m ${SBINMODE} -src
> > faxaddmodem.sh -O faxaddmodem
> > ++ ${PUTSERVER} -root ${INSTALLROOT} -F ${SBIN} -m ${SBINMODE} -src
> > faxsetup.sh -O faxsetup
> > + for i in bsdi irix linux; do \
> > +- ${PUTSERVER} -root ${INSTALLROOT} -F ${SBIN} -m 755 \
> > ++ ${PUTSERVER} -root ${INSTALLROOT} -F ${SBIN} -m ${SBINMODE} \
> > + -src ${SRCDIR}/faxsetup.$$i -O faxsetup.$$i; \
> > + done
> > +- ${PUTSERVER} -root ${INSTALLROOT} -F ${SBIN} -m 755 -src probemodem.sh
> > -O probemodem
> > ++ ${PUTSERVER} -root ${INSTALLROOT} -F ${SBIN} -m ${SBINMODE} -src
> > probemodem.sh -O probemodem
> > + ${PUTSAMPLE} -root ${INSTALLROOT} -F ${SPOOL}/etc -m 644 -o xferfaxlog
> > + ${PUTSAMPLE} -root ${INSTALLROOT} -F ${SPOOL}/etc -m 600 -o hosts.hfaxd
> > + for i in ${DIALRULES}; do \
> > + ${PUTSERVER} -root ${INSTALLROOT} -F ${SPOOL}/etc -m 444 -src
> > ${SRCDIR}/$$i \
> > + -idb "config(update)" -O $$i; \
> > + done
> > +- ${PUTSERVER} -root ${INSTALLROOT} -F ${LIBEXEC} -m 755 -O lockname
> > ondelay
> > +- ${PUTSAMPLE} -root ${INSTALLROOT} -F ${SPOOL}/etc -m 644 -idb nostrip \
> > ++ ${PUTSERVER} -root ${INSTALLROOT} -F ${LIBEXEC} -m ${LIBEXECMODE} -O
> > lockname ondelay
> > ++ ${PUTSAMPLE} -root ${INSTALLROOT} -F ${SPOOL}/etc -m 444 -idb nostrip \
> > + -src ${SRCDIR}/lutRS18.pcf -O lutRS18.pcf
> > +- ${PUTSAMPLE} -root ${INSTALLROOT} -F ${SPOOL}/etc -m 644 -idb nostrip \
> > ++ ${PUTSAMPLE} -root ${INSTALLROOT} -F ${SPOOL}/etc -m 444 -idb nostrip \
> > + -src ${SRCDIR}/LiberationSans-25.pcf -O LiberationSans-25.pcf
>
> these are all going to be a total pain to deal with if upstream changes
> anything in the install targets.
>
> is it actually useful to change these from user=rw to user=r as you're
> doing?
>
> for the files in /usr/local/{bin,sbin} which are owned by root:bin
> there's no issue with 755 anyway, that's very common in ports.
>
> for the files in /usr/local/libdata/hylafax which are owned by _hylafax,
> I don't think it's really helping to make them r instead of rw because
> the dir is writable anyway.
I'm going to go ahead and commit my version plus the readme typo fix
and dropping hylafax.rc; can look again at 755 vs 555 if wanted but
I'd prefer to get the rest of it into the tree for now
