ports/81705: www/pserv overwrites user's pserv.conf on update

[Vasil Dimov]

>Number:         81705
>Category:       ports
>Synopsis:       www/pserv overwrites user's pserv.conf on update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 31 10:40:01 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Vasil Dimov
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
DataMax
>Environment:

System: FreeBSD sinanica.bg.datamax 5.4-STABLE FreeBSD 5.4-STABLE #6: Tue May 10 12:46:25 EEST 2005     root at sinanica.bg.datamax:/usr/obj/usr/src/sys/SINANICA-SMP  i386

>Description:

1. www/pserv installs pserv.conf
2. user edits it to his needs
3. user deletes pserv with intention to install a new version.
   pserv.conf is not deleted, because MD5 checksum is not the same
4. user installs the new version of www/pserv and pserv.conf is
   overwritten, loosing user's valuable changes

>How-To-Repeat:

>Fix:

Simply install pserv.conf as pserv.conf.sample

--- pserv_pserv.conf.sample.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/pserv/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile	30 May 2005 16:36:17 -0000	1.10
+++ Makefile	31 May 2005 10:24:42 -0000
@@ -38,7 +38,7 @@
 	${INSTALL_PROGRAM} ${WRKSRC}/sources/pserv ${PREFIX}/sbin/
 	${MKDIR} ${PREFIX}/etc/pserv
 	${INSTALL_DATA} ${WRKSRC}/defaults/mime_types.dat ${PREFIX}/etc/pserv/mime.types
-	${INSTALL_DATA} ${WRKSRC}/defaults/pserv.conf ${PREFIX}/etc/pserv/
+	${INSTALL_DATA} ${WRKSRC}/defaults/pserv.conf ${PREFIX}/etc/pserv/pserv.conf.sample
 	${INSTALL_SCRIPT} ${FILESDIR}/pserv.sh ${PREFIX}/etc/rc.d/
 
 .include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/pserv/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- pkg-plist	30 May 2005 16:36:17 -0000	1.3
+++ pkg-plist	31 May 2005 10:24:42 -0000
@@ -1,5 +1,5 @@
 sbin/pserv
 etc/pserv/mime.types
-etc/pserv/pserv.conf
+etc/pserv/pserv.conf.sample
 etc/rc.d/pserv.sh
 @dirrm etc/pserv
--- pserv_pserv.conf.sample.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: