Re: CVS: cvs.openbsd.org: src

On Sun, April 29, 2018 00:25, Stuart Henderson wrote:
> It needs more of a change than that, the syntax is different.
>

Hi!
It uses /usr/bin/mail so it is safe to drop embedded smtp (see
/etc/apcupsd/apccontrol) and I doubt someone tweaked it to use
other mailers instead of its default.So no tweaks for MESSAGE
are needed, IMO.
Thanks for noticing it!
OK kirby@

> --
> Sent from a phone, apologies for poor formatting.
> On 28 April 2018 18:30:32 Vadim Zhukov <persgray@gmail.com> wrote:
>
>> 2018-04-28 19:54 GMT+03:00 Eric Faurot <eric@openbsd.org>:
>> > CVSROOT: /cvs
>> > Module name: src
>> > Changes by: eric@cvs.openbsd.org 2018/04/28 10:54:11
>> >
>> > Modified files:
>> > usr.sbin/smtpd : Makefile
>> >
>> > Log message:
>> > link smtp(1) to the build
>> >
>> > ok deraadt@
>>
>> Some care would be needed for apcupsd port, which installs
>> /usr/local/sbin/smtp. IIUC, it does the same thing as /usr/bin/smtp
>> and port could just stop installing it. The existing smtp users could
>> be affected, though, so I propose the following patch. Any better
>> ideas/objections/okays?
>>
>> --
>> WBR,
>> Vadim Zhukov
>>
>>
>> Index: Makefile
>> ===================================================================
>> RCS file: /cvs/ports/sysutils/apcupsd/Makefile,v
>> retrieving revision 1.38
>> diff -u -p -r1.38 Makefile
>> --- Makefile 12 Jan 2018 14:05:10 -0000 1.38
>> +++ Makefile 28 Apr 2018 17:27:33 -0000
>> @@ -9,7 +9,7 @@ PKGNAME-main = ${DISTNAME}
>> PKGNAME-cgi = ${DISTNAME:S/-/-cgi-/}
>> PKGNAME-x11 = ${DISTNAME:S/-/-x11-/}
>> REVISION = 1
>> -REVISION-main = 2
>> +REVISION-main = 3
>>
>> CATEGORIES = sysutils
>>
>> @@ -108,5 +108,6 @@ post-install:
>> ${WRKINST}/${WEB_ROOT}/cgi-bin/apcupsd/
>> cd ${PREFIX}/share; chown -R root:wheel doc/apcupsd examples/apcupsd
>> chmod 755 ${PREFIX}/sbin/apcupsctl
>> + rm -f ${PREFIX}/sbin/smtp
>>
>> .include <bsd.port.mk>
>> Index: pkg/MESSAGE-main
>> ===================================================================
>> RCS file: pkg/MESSAGE-main
>> diff -N pkg/MESSAGE-main
>> --- /dev/null 1 Jan 1970 00:00:00 -0000
>> +++ pkg/MESSAGE-main 28 Apr 2018 17:27:33 -0000
>> @@ -0,0 +1,2 @@
>> +The ${LOCALBASE}/sbin/smtp from this package is gone since OpenBSD 6.4.
>> +Any scripts using it should now use the /usr/bin/smtp instead.
>> Index: pkg/PLIST-main
>> ===================================================================
>> RCS file: /cvs/ports/sysutils/apcupsd/pkg/PLIST-main,v
>> retrieving revision 1.9
>> diff -u -p -r1.9 PLIST-main
>> --- pkg/PLIST-main 22 Jan 2015 21:23:30 -0000 1.9
>> +++ pkg/PLIST-main 28 Apr 2018 17:27:33 -0000
>> @@ -14,7 +14,6 @@
>> @mode
>> @owner
>> sbin/apcupsctl
>> -@bin sbin/smtp
>> @comment share/applications/
>> @group
>> share/doc/apcupsd/
>
>
>
>