Re: prozilla security update

[Geert Hendrickx <ghen%telenet.be@localhost>]

On Thu, Oct 06, 2005 at 05:09:58PM +0200, Thomas Klausner wrote:
> On Thu, Oct 06, 2005 at 05:08:22PM +0200, Geert Hendrickx wrote:
> > >From wip/prozilla/TODO: 
> > > 1.3.7.4 (and perhaps earlier versions) have a security
> > > problem. Package should be updated.
> > > 
> > > http://genesys.ro/pipermail/prozilla/2005-September/000790.html
> > 
> > A fix is included in that mail, so I propose we just incorporate that in
> > patches/.  Diff attached, shall I commit this?  
> 
> Sounds ok.

Done.  

> > And btw, this package includes etc/ files in PLIST, I'll fix that too.  
> 
> Please do that.

Is this the right way to do that?  I dropped the config-file-installing
part from the packages Makefile and did it manually in the pkgsrc Makefile.
Or is the proper way to teach the package to install it in ${EGDIR} itself?  

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/prozilla/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile    6 Oct 2005 15:14:40 -0000       1.6
+++ Makefile    6 Oct 2005 15:30:17 -0000
@@ -14,5 +14,12 @@
 GNU_CONFIGURE=         yes
 USE_TOOLS+=            gmake
 
+EGDIR=                 ${PREFIX}/share/examples/prozilla
+CONF_FILES=            ${EGDIR}/prozilla.conf ${PKG_SYSCONFDIR}/prozilla.conf
+
+post-install:
+       ${INSTALL_DATA_DIR} ${EGDIR}
+       ${INSTALL_DATA} ${WRKSRC}/prozrc.sample ${EGDIR}/prozilla.conf
+
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/prozilla/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- PLIST       21 Jun 2004 07:05:51 -0000      1.1.1.1
+++ PLIST       6 Oct 2005 15:30:17 -0000
@@ -1,6 +1,6 @@
 @comment $NetBSD$
 bin/proz
-etc/prozilla.conf
-etc/prozilla.conf-sample
 man/man1/proz.1
 man/man1/prozilla.1
+share/examples/prozilla/prozilla.conf
+@dirrm share/examples/prozilla
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/prozilla/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo    6 Oct 2005 15:14:40 -0000       1.6
+++ distinfo    6 Oct 2005 15:30:17 -0000
@@ -11,3 +11,4 @@
 SHA1 (patch-af) = c9909eb506a78a5af6d564c309fd9306b0005da3
 SHA1 (patch-ag) = 815718d056df484e5cfce8d03020494cb0fb2be7
 SHA1 (patch-ah) = fdb7aca2dd1378dab31ce6e1251b4ae531b62d20
+SHA1 (patch-ai) = 16eae21f6f88da6b09e03c131e413484c38ee272

with patch-ai:
$NetBSD$

--- Makefile.in.orig    2005-10-06 17:26:44.000000000 +0200
+++ Makefile.in
@@ -367,10 +367,6 @@ installdirs mostlyclean-generic distclea
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-install:
-        $(INSTALL) -d $(sysconfdir)
-       if [ ! -e $(sysconfdir)/prozilla.conf ]; then cp prozrc.sample 
$(sysconfdir)/prozilla.conf; fi; cp prozrc.sample 
$(sysconfdir)/prozilla.conf-sample
-
 #Rule to build tar-gzipped distribution package
 $(PACKAGE)-$(VERSION).tar.gz: dist
 

        Geert


-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
pkgsrc-wip-discuss mailing list
pkgsrc-wip-discuss%lists.sourceforge.net@localhost
https://lists.sourceforge.net/lists/listinfo/pkgsrc-wip-discuss