Attachment 144873 Details for Bug 192033 – patch

[patch] patch

mail_dma.diff (text/plain), 5.42 KB, created by Anton Yuzhaninov on 2014-07-22 12:55:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anton Yuzhaninov

Created: 2014-07-22 12:55:10 UTC

Size: 5.42 KB

patch

obsolete

>===> Generating patch
>===> Viewing diff with /usr/local/bin/cdiff
>diff -ruN /usr/ports/mail/dma/Makefile ./Makefile
>--- /usr/ports/mail/dma/Makefile	2014-05-18 03:16:28.246534000 +0000
>+++ ./Makefile	2014-07-22 11:25:01.000000000 +0000
>@@ -35,9 +35,9 @@
> .include <bsd.port.pre.mk>
> 
> .if ${OSVERSION} < 900000
>-EXTRA_PATCHES=	${.CURDIR:H:H}/mail/dma/files/extrapatch-8-spool.c
>+EXTRA_PATCHES=	${FILESDIR}/extrapatch-8-spool.c
> .else
>-EXTRA_PATCHES=  ${.CURDIR:H:H}/mail/dma/files/extrapatch-else-spool.c
>+EXTRA_PATCHES=	${FILESDIR}/extrapatch-else-spool.c
> .endif
> 
> pre-patch:
>@@ -54,15 +54,16 @@
> .endif
> 
> do-install:
>-	${INSTALL} -o root -g mail -m 2555 ${WRKSRC}/dma/dma ${STAGEDIR}/${PREFIX}/libexec
>-	${INSTALL} -o root -g mail -m 4550 \
>-		${WRKSRC}/dma-mbox-create/dma-mbox-create ${STAGEDIR}/${PREFIX}/libexec
>+	${INSTALL} ${WRKSRC}/dma/dma ${STAGEDIR}/${PREFIX}/libexec
>+	${INSTALL} ${WRKSRC}/dma-mbox-create/dma-mbox-create ${STAGEDIR}/${PREFIX}/libexec
>+	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/libexec/*
> 	${INSTALL_MAN} ${WRKSRC}/dma.8 ${STAGEDIR}/${PREFIX}/man/man8/
> 	${MKDIR} ${STAGEDIR}/${PREFIX}/etc/dma
> .for i in ${CONFFILES}
>-	${INSTALL_DATA} -m 0644 ${WRKSRC}/${i} ${STAGEDIR}/${PREFIX}/etc/dma/${i}.sample
>+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}/${PREFIX}/etc/dma/${i}.sample
> .endfor
>-	${CHMOD} o-r ${STAGEDIR}/${PREFIX}/etc/dma/auth.conf.sample
>-	${INSTALL} -d -o root -g mail -m 770 ${STAGEDIR}/var/spool/dma
>+
>+post-install:
>+	${MKDIR} ${STAGEDIR}/var/spool/dma
> 
> .include <bsd.port.post.mk>
>diff -ruN /usr/ports/mail/dma/mail_dma.diff ./mail_dma.diff
>--- /usr/ports/mail/dma/mail_dma.diff	1970-01-01 00:00:00.000000000 +0000
>+++ ./mail_dma.diff	2014-07-22 12:54:02.000000000 +0000
>@@ -0,0 +1 @@
>+===> Generating patch
>diff -ruN /usr/ports/mail/dma/pkg-install ./pkg-install
>--- /usr/ports/mail/dma/pkg-install	1970-01-01 00:00:00.000000000 +0000
>+++ ./pkg-install	2014-07-22 12:29:29.000000000 +0000
>@@ -0,0 +1,9 @@
>+#!/bin/sh
>+
>+case $2 in
>+POST-INSTALL)
>+	# pkg_tools compatibility
>+	# should be removed after 2014-09-01
>+	install -dv -o root -g mail -m 770 /var/spool/dma
>+	;;
>+esac
>diff -ruN /usr/ports/mail/dma/pkg-plist ./pkg-plist
>--- /usr/ports/mail/dma/pkg-plist	2014-05-18 01:53:30.665567000 +0000
>+++ ./pkg-plist	2014-07-22 12:28:47.000000000 +0000
>@@ -1,9 +1,19 @@
>+@group mail
>+@mode 2555
> libexec/dma
>+@mode 4550
> libexec/dma-mbox-create
>-@sample etc/dma/dma.conf.sample
>+@group
>+@mode 640
> @sample etc/dma/auth.conf.sample
>+@mode
>+@sample etc/dma/dma.conf.sample
> man/man8/dma.8.gz
> @dirrmtry etc/dma
> @cwd /
>+@group mail
>+@mode 770
> @dirrmtry var/spool/dma
>+@group
>+@mode
> @cwd %%RESETPREFIX%%
>diff -ruN /usr/ports/mail/dma/ttt ./ttt
>--- /usr/ports/mail/dma/ttt	1970-01-01 00:00:00.000000000 +0000
>+++ ./ttt	2014-07-22 12:44:01.000000000 +0000
>@@ -0,0 +1,84 @@
>+===> Generating patch
>+===> Viewing diff with /usr/local/bin/cdiff
>+diff -ruN /usr/ports/mail/dma/Makefile ./Makefile
>+--- /usr/ports/mail/dma/Makefile	2014-05-18 03:16:28.246534000 +0000
>++++ ./Makefile	2014-07-22 11:25:01.000000000 +0000
>+@@ -35,9 +35,9 @@
>+ .include <bsd.port.pre.mk>
>+ 
>+ .if ${OSVERSION} < 900000
>+-EXTRA_PATCHES=	${.CURDIR:H:H}/mail/dma/files/extrapatch-8-spool.c
>++EXTRA_PATCHES=	${FILESDIR}/extrapatch-8-spool.c
>+ .else
>+-EXTRA_PATCHES=  ${.CURDIR:H:H}/mail/dma/files/extrapatch-else-spool.c
>++EXTRA_PATCHES=	${FILESDIR}/extrapatch-else-spool.c
>+ .endif
>+ 
>+ pre-patch:
>+@@ -54,15 +54,16 @@
>+ .endif
>+ 
>+ do-install:
>+-	${INSTALL} -o root -g mail -m 2555 ${WRKSRC}/dma/dma ${STAGEDIR}/${PREFIX}/libexec
>+-	${INSTALL} -o root -g mail -m 4550 \
>+-		${WRKSRC}/dma-mbox-create/dma-mbox-create ${STAGEDIR}/${PREFIX}/libexec
>++	${INSTALL} ${WRKSRC}/dma/dma ${STAGEDIR}/${PREFIX}/libexec
>++	${INSTALL} ${WRKSRC}/dma-mbox-create/dma-mbox-create ${STAGEDIR}/${PREFIX}/libexec
>++	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/libexec/*
>+ 	${INSTALL_MAN} ${WRKSRC}/dma.8 ${STAGEDIR}/${PREFIX}/man/man8/
>+ 	${MKDIR} ${STAGEDIR}/${PREFIX}/etc/dma
>+ .for i in ${CONFFILES}
>+-	${INSTALL_DATA} -m 0644 ${WRKSRC}/${i} ${STAGEDIR}/${PREFIX}/etc/dma/${i}.sample
>++	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}/${PREFIX}/etc/dma/${i}.sample
>+ .endfor
>+-	${CHMOD} o-r ${STAGEDIR}/${PREFIX}/etc/dma/auth.conf.sample
>+-	${INSTALL} -d -o root -g mail -m 770 ${STAGEDIR}/var/spool/dma
>++
>++post-install:
>++	${MKDIR} ${STAGEDIR}/var/spool/dma
>+ 
>+ .include <bsd.port.post.mk>
>+diff -ruN /usr/ports/mail/dma/pkg-install ./pkg-install
>+--- /usr/ports/mail/dma/pkg-install	1970-01-01 00:00:00.000000000 +0000
>++++ ./pkg-install	2014-07-22 12:29:29.000000000 +0000
>+@@ -0,0 +1,9 @@
>++#!/bin/sh
>++
>++case $2 in
>++POST-INSTALL)
>++	# pkg_tools compatibility
>++	# should be removed after 2014-09-01
>++	install -dv -o root -g mail -m 770 /var/spool/dma
>++	;;
>++esac
>+diff -ruN /usr/ports/mail/dma/pkg-plist ./pkg-plist
>+--- /usr/ports/mail/dma/pkg-plist	2014-05-18 01:53:30.665567000 +0000
>++++ ./pkg-plist	2014-07-22 12:28:47.000000000 +0000
>+@@ -1,9 +1,19 @@
>++@group mail
>++@mode 2555
>+ libexec/dma
>++@mode 4550
>+ libexec/dma-mbox-create
>+-@sample etc/dma/dma.conf.sample
>++@group
>++@mode 640
>+ @sample etc/dma/auth.conf.sample
>++@mode
>++@sample etc/dma/dma.conf.sample
>+ man/man8/dma.8.gz
>+ @dirrmtry etc/dma
>+ @cwd /
>++@group mail
>++@mode 770
>+ @dirrmtry var/spool/dma
>++@group
>++@mode
>+ @cwd %%RESETPREFIX%%
>+diff -ruN /usr/ports/mail/dma/ttt ./ttt
>+--- /usr/ports/mail/dma/ttt	1970-01-01 00:00:00.000000000 +0000
>++++ ./ttt	2014-07-22 12:44:01.000000000 +0000
>+@@ -0,0 +1 @@
>++===> Generating patch
>+====> Cleaning up
>+===> Done
>====> Cleaning up
>===> Done

Actions: View | Diff

Attachments on bug 192033: 144873 | 150858