On Fri, Nov 7, 2014 at 9:46 AM, Stuart Henderson <s...@spacehopper.org> wrote: > On 2014-11-07, David Higgs <hig...@gmail.com> wrote: >> I defined the 'svn' port in /etc/services but as of 5.6 this file now >> appears to be unconditionally overwritten during upgrades (previously >> it was handled via sysmerge). >> >> Is there a better mechanism to keep these, or should I just update >> pf.conf to use the numeric port number? The services(5) man page >> doesn't provide any hints. > > There's no mechanism to keep these, I tend to use macros in pf.conf for > ports that aren't in /etc/services. Though in the case of svn I think it > would be reasonable to add it in the file.. > > Any OKs? (with a bonus sort-order fix).
You have mine. > > Index: services > =================================================================== > RCS file: /cvs/src/etc/services,v > retrieving revision 1.89 > diff -u -p -r1.89 services > --- services 15 Jul 2014 15:58:39 -0000 1.89 > +++ services 7 Nov 2014 08:45:48 -0000 > @@ -226,12 +226,13 @@ isisd 2608/tcp # > Quagga/Zebra > netplan 2983/tcp # netplan daemon > eppc 3031/tcp # Remote AppleEvents/PPC > Toolbox > eppc 3031/udp # Remote AppleEvents/PPC > Toolbox > +iscsi 3260/tcp # ISCSI > mysql 3306/tcp # MySQL > iapp 3517/tcp 802-11-iapp # IEEE 802.11f IAPP > -iscsi 3260/tcp # ISCSI > iapp 3517/udp 802-11-iapp # IEEE 802.11f IAPP > daap 3689/tcp # Digital Audio Access > Protocol > daap 3689/udp # Digital Audio Access > Protocol > +svn 3690/tcp # Subversion > sieve 4190/tcp # ManageSieve Protocol > sieve 4190/udp # ManageSieve Protocol > krb524 4444/tcp # Kerberos 5->4 > Ciao, David -- "If you try a few times and give up, you'll never get there. But if you keep at it... There's a lot of problems in the world which can really be solved by applying two or three times the persistence that other people will." -- Stewart Nelson