Attachment 161740 Details for Bug 203566 – Patch

[patch] Patch

vqadmin.patch (text/plain), 3.22 KB, created by Dmitry Marakasov on 2015-10-05 20:40:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2015-10-05 20:40:57 UTC

Size: 3.22 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 398658)
>+++ Makefile	(working copy)
>@@ -24,8 +24,6 @@
> 		--enable-htmldir=${STAGEDIR}${PREFIX}/${WEBDATADIR} \
> 		--enable-qmaildir=${QMAIL_PREFIX}
> 
>-.include <bsd.port.pre.mk>
>-
> PLIST_SUB+=	CGIBINDIR=${CGIBINDIR} WEBDATADIR=${WEBDATADIR}
> 
> post-patch:
>@@ -32,4 +30,4 @@
> 	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
> 		${WRKSRC}/Makefile.in
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: files/patch-Makefile.in
>===================================================================
>--- files/patch-Makefile.in	(revision 398658)
>+++ files/patch-Makefile.in	(working copy)
>@@ -1,7 +1,7 @@
>---- Makefile.in.orig	Sat Jan 18 12:25:01 2003
>-+++ Makefile.in	Sat Jan 18 12:26:45 2003
>-@@ -120,7 +120,7 @@
>- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I. 
>+--- Makefile.in.orig	2003-09-17 21:21:38 UTC
>++++ Makefile.in
>+@@ -120,7 +120,7 @@ vqadmin_LDFLAGS =
>+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
>  CPPFLAGS = @CPPFLAGS@
>  LDFLAGS = @LDFLAGS@
> -LIBS = @LIBS@
>@@ -9,3 +9,36 @@
>  depcomp =
>  am__depfiles_maybe =
>  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
>+@@ -527,32 +527,12 @@ install-data-local:
>+ 		cp vqadmin.acl     @cgibindir@/vqadmin ; \
>+ 	fi
>+ 
>+-	chown              @vpopuser@ @cgibindir@/vqadmin
>+-	chgrp              @vpopgroup@ @cgibindir@/vqadmin
>+-	chown -R           @vpopuser@ @cgibindir@/vqadmin/*
>+-	chgrp -R           @vpopgroup@ @cgibindir@/vqadmin/*
>+-	chown root         @cgibindir@/vqadmin/vqadmin.cgi
>+-	chgrp `id -g root` @cgibindir@/vqadmin/vqadmin.cgi
>+-	chmod u+s,g+s      @cgibindir@/vqadmin/vqadmin.cgi 
>+-	chmod 755          @cgibindir@/vqadmin
>+-	chmod 755          @cgibindir@/vqadmin/html
>+-
>+-	chown              @vpopuser@ @wwwroot@/images/vqadmin
>+-	chgrp              @vpopgroup@ @wwwroot@/images/vqadmin
>+-	chown -R           @vpopuser@ @wwwroot@/images/vqadmin/*
>+-	chgrp -R           @vpopgroup@ @wwwroot@/images/vqadmin/*
>+-	chmod 755          @wwwroot@/images/vqadmin
>+-
>+ 	if test -f @cgibindir@/vqadmin/.htaccess ; then \
>+ 		echo ".htaccess file already in place" ; \
>+ 	else \
>+ 		cp htaccess        @cgibindir@/vqadmin/.htaccess ; \
>+ 	fi
>+ 
>+-	chown nobody       @cgibindir@/vqadmin/.htaccess
>+-	chmod u+rw         @cgibindir@/vqadmin/.htaccess
>+-	chmod go+r         @cgibindir@/vqadmin/.htaccess
>+-
>+ acl.o: config.h
>+ cedit.o: config.h
>+ cgi.o: config.h
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 398658)
>+++ pkg-plist	(working copy)
>@@ -1,5 +1,7 @@
> bin/vqadmin
>-%%CGIBINDIR%%/vqadmin/.htaccess
>+@owner vpopmail
>+@group vchkpw
>+@(nobody,,644) %%CGIBINDIR%%/vqadmin/.htaccess
> %%CGIBINDIR%%/vqadmin/html/add_alias_domain.html
> %%CGIBINDIR%%/vqadmin/html/add_domain.html
> %%CGIBINDIR%%/vqadmin/html/add_domain_body.html
>@@ -37,5 +39,10 @@
> %%CGIBINDIR%%/vqadmin/html/view_domain.html
> %%CGIBINDIR%%/vqadmin/html/view_user.html
> %%CGIBINDIR%%/vqadmin/vqadmin.acl
>-%%CGIBINDIR%%/vqadmin/vqadmin.cgi
>+@(root,wheel,6755) %%CGIBINDIR%%/vqadmin/vqadmin.cgi
> %%WEBDATADIR%%/images/vqadmin/vqadmin.css
>+@dir(,,755) %%WEBDATADIR%%/images/vqadmin
>+@dir(,,755) %%CGIBINDIR%%/vqadmin/html
>+@dir(,,755) %%CGIBINDIR%%/vqadmin
>+@owner
>+@group

Actions: View | Diff

Attachments on bug 203566: 161740