Re: bin/35188

[Peter Postma <peter%pointless.nl@localhost>]

The following reply was made to PR bin/35188; it has been noted by GNATS.

From: Peter Postma <peter%pointless.nl@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: lukem%NetBSD.org@localhost, yamt%NetBSD.org@localhost
Subject: Re: bin/35188
Date: Sat, 14 Jun 2008 15:42:52 +0200

 --gKMricLos+KVdGMg
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 I'm sorry for not paying attention to this PR for such a long time.
 
 I agree with points 2-4 and I'd like to commit the attached diff unless
 you've any objection to that.
 
 I'm not sure about point 1.  NetBSD 3.0 and 4.0 were both shipped with
 a default /etc/pf.conf so I'd prefer to it leave as is to avoid confusion
 in future releases.
 
 -- 
 Peter Postma
 
 --gKMricLos+KVdGMg
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="pf-config.diff"
 
 Index: etc/mtree/special
 ===================================================================
 RCS file: /cvsroot/src/etc/mtree/special,v
 retrieving revision 1.117.2.4
 diff -u -r1.117.2.4 special
 --- etc/mtree/special  14 Jun 2008 11:18:11 -0000      1.117.2.4
 +++ etc/mtree/special  14 Jun 2008 13:32:24 -0000
 @@ -146,6 +146,8 @@
  ./etc/pam.d/xserver           type=file mode=0644
  ./etc/passwd                  type=file mode=0644
  ./etc/passwd.conf             type=file mode=0644 optional
 +./etc/pf.conf                 type=file mode=0644
 +./etc/pf.os                   type=file mode=0444
  ./etc/phones                  type=file mode=0644
  ./etc/postfix                 type=dir  mode=0755 optional
  ./etc/postfix/main.cf         type=file mode=0644 optional
 Index: usr.sbin/pf/etc/Makefile
 ===================================================================
 RCS file: /cvsroot/src/usr.sbin/pf/etc/Makefile,v
 retrieving revision 1.2
 diff -u -r1.2 Makefile
 --- usr.sbin/pf/etc/Makefile   27 Jun 2005 20:32:40 -0000      1.2
 +++ usr.sbin/pf/etc/Makefile   14 Jun 2008 13:33:09 -0000
 @@ -2,8 +2,9 @@
  
  .include <bsd.own.mk>
  
 -FILESDIR=     /etc
 -FILESMODE=    644
 +FILESDIR=             /etc
 +FILESMODE_pf.os=      444
 +FILESMODE_pf.conf=    644
  
  .PATH:        ${NETBSDSRCDIR}/dist/pf/etc
  
 Index: usr.sbin/postinstall/postinstall
 ===================================================================
 RCS file: /cvsroot/src/usr.sbin/postinstall/postinstall,v
 retrieving revision 1.59.2.2
 diff -u -r1.59.2.2 postinstall
 --- usr.sbin/postinstall/postinstall   14 Jun 2008 11:18:11 -0000      1.59.2.2
 +++ usr.sbin/postinstall/postinstall   14 Jun 2008 13:33:09 -0000
 @@ -823,7 +823,10 @@
                        # ${dir} is set by find_file_in_dirlist()
        populate_dir ${op} true \
            ${dir} ${DEST_DIR}/etc 644 \
 -          pf.conf pf.os
 +          pf.conf
 +      failed=$(( ${failed} + $? ))
 +
 +      compare_dir ${op} ${dir} ${DEST_DIR}/etc 444 pf.os
        failed=$(( ${failed} + $? ))
  
        return ${failed}
 
 --gKMricLos+KVdGMg--