Attachment 146586 Details for Bug 193196 – Imperfect patch to add staging support and new maintaner for amanda-server/amanda-client

[patch] Imperfect patch to add staging support and new maintaner for amanda-server/amanda-client

amanda-stage-patch.diff (text/plain), 5.53 KB, created by Dylan Leigh on 2014-08-31 09:10:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dylan Leigh

Created: 2014-08-31 09:10:25 UTC

Size: 5.53 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 366242)
>+++ Makefile	(working copy)
>@@ -9,7 +9,7 @@
> MASTER_SITES=	SF/amanda/amanda%20-%20stable/${PORTVERSION}
> PKGNAMESUFFIX?=	-server
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	fbsd@dylanleigh.net
> COMMENT?=	The Advanced Maryland Automatic Network Disk Archiver (server)
> 
> RUN_DEPENDS=	perl-amanda:${PORTSDIR}/misc/amanda-perl-wrapper
>@@ -18,6 +18,10 @@
> WRKSRC=		${WRKDIR}/amanda-${PORTVERSION}
> SLAVEDIRS=	misc/amanda-client
> 
>+# XXX: Required because the port's own install-hook sets setuid when it
>+# installs into stage. This could probably be fixed with a patch.
>+NEED_ROOT=yes
>+
> GNU_CONFIGURE=	yes
> USES=		gmake pkgconfig perl5
> USE_GNOME=	glib20
>@@ -27,7 +31,7 @@
> 		--without-amlibexecdir \
> 		--with-amandahosts --with-fqdn \
> 		--with-dump-honor-nodump \
>-		--prefix=${PREFIX} \
>+		--prefix=${STAGEDIR}/${PREFIX} \
> 		--disable-glibtest \
> 		--with-user=${USERS} --with-group=${AMANDA_GROUP} \
> 		--with-bsdtcp-security --with-bsdudp-security \
>@@ -51,8 +55,8 @@
> .endif
> GROUPS?=	operator amanda
> 
>-AMANDA_GNUTAR_LISTDIR?=	${PREFIX}/var/amanda/gnutar-lists
>-AMANDA_DATES?=		${PREFIX}/var/amanda/amandates
>+AMANDA_GNUTAR_LISTDIR?=	${STAGEDIR}/${PREFIX}/var/amanda/gnutar-lists
>+AMANDA_DATES?=		${STAGEDIR}/${PREFIX}/var/amanda/amandates
> PLIST_SUB=		SHLIBVER=${PORTVERSION} AMANDA_DATES=${AMANDA_DATES}
> 
> # amanda-server/amanda-client common part
>@@ -68,7 +72,6 @@
> S3_DESC=	Enable Amazon S3 device support
> .endif
> 
>-NO_STAGE=	yes
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MGNUTAR}
>@@ -104,30 +107,9 @@
> 
> CONFIGURE_ARGS+=--without-client
> 
>-MAN5=		disklist.5 \
>-		tapelist.5
>-MAN7=		amanda-changers.7 \
>-		amanda-compatibility.7 \
>-		amanda-devices.7 \
>-		amanda-interactivity.7 \
>-		amanda-taperscan.7
>-MAN8=		amaddclient.8 amadmin.8 amaespipe.8 amcheck.8 \
>-		amcheckdb.8 amcheckdump.8 \
>-		amcleanup.8 \
>-		amcleanupdisk.8 \
>-		amcrypt.8 amcryptsimple.8 amcrypt-ossl-asym.8 amcrypt-ossl.8 \
>-		amdevcheck.8 \
>-		amdump.8 amfetchdump.8 amflush.8 amgetconf.8 amgpgcrypt.8 \
>-		amlabel.8 \
>-		amoverview.8 amreport.8 amrestore.8 amrmtape.8 \
>-		amserverconfig.8 amstatus.8 \
>-		amtape.8 amtoc.8 amtapetype.8 \
>-		amvault.8
>-
> .if ${PORT_OPTIONS:MPLOT}
> BUILD_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
> RUN_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
>-MAN8+=		amplot.8
> PLIST_SUB+=	PLOT=''
> CONFIGURE_ARGS+=	--with-gnuplot=${LOCALBASE}/bin/gnuplot
> .else
>@@ -153,8 +135,7 @@
> .endif
> 
> post-install:
>-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
>-	@${CAT} ${PKGMESSAGE}
>+	@${SETENV} PKG_PREFIX=${STAGEDIR}/${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
> 
> # amanda-client part
> .else
>@@ -181,34 +162,11 @@
> CFLAGS=		-DFreeBSD_NO_SNAPSHOT_DUMP=t
> .endif
> 
>-MAN5=		amanda-archive-format.5 \
>-		amanda-client.conf.5 \
>-		amanda.conf.5
>-MAN7=		amanda-applications.7 \
>-		amanda-auth.7 \
>-		amanda-match.7 \
>-		amanda-scripts.7
>-MAN8=		amanda.8 \
>-		amarchiver.8 \
>-		amdump_client.8 \
>-		amgtar.8 \
>-		ampgsql.8 \
>-		amraw.8 \
>-		amrecover.8 \
>-		amsamba.8 \
>-		amservice.8 \
>-		amstar.8 \
>-		amsuntar.8 \
>-		amzfs-sendrecv.8 \
>-		amzfs-snapshot.8 \
>-		script-email.8
>-
> post-install:
> 	${MKDIR} ${AMANDA_GNUTAR_LISTDIR}
> 	${CHOWN} ${USERS}:${AMANDA_GROUP} ${AMANDA_GNUTAR_LISTDIR}
> 	${TOUCH} ${AMANDA_DATES}
> 	${CHOWN} ${USERS}:${AMANDA_GROUP} ${AMANDA_DATES}
>-	${CAT} ${PKGMESSAGE}
> 
> .endif
> 
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 366242)
>+++ pkg-plist	(working copy)
>@@ -104,6 +104,43 @@
> sbin/amtapetype
> sbin/amtoc
> sbin/amvault
>+%%PLOT%%man/man8/amplot.8.gz
>+man/man5/disklist.5.gz
>+man/man5/tapelist.5.gz
>+man/man7/amanda-changers.7.gz
>+man/man7/amanda-compatibility.7.gz
>+man/man7/amanda-devices.7.gz
>+man/man7/amanda-interactivity.7.gz
>+man/man7/amanda-taperscan.7.gz
>+man/man8/amaddclient.8.gz
>+man/man8/amadmin.8.gz
>+man/man8/amaespipe.8.gz
>+man/man8/amcheck.8.gz
>+man/man8/amcheckdb.8.gz
>+man/man8/amcheckdump.8.gz
>+man/man8/amcleanup.8.gz
>+man/man8/amcleanupdisk.8.gz
>+man/man8/amcrypt-ossl-asym.8.gz
>+man/man8/amcrypt-ossl.8.gz
>+man/man8/amcrypt.8.gz
>+man/man8/amcryptsimple.8.gz
>+man/man8/amdevcheck.8.gz
>+man/man8/amdump.8.gz
>+man/man8/amfetchdump.8.gz
>+man/man8/amflush.8.gz
>+man/man8/amgetconf.8.gz
>+man/man8/amgpgcrypt.8.gz
>+man/man8/amlabel.8.gz
>+man/man8/amoverview.8.gz
>+man/man8/amreport.8.gz
>+man/man8/amrestore.8.gz
>+man/man8/amrmtape.8.gz
>+man/man8/amserverconfig.8.gz
>+man/man8/amstatus.8.gz
>+man/man8/amtape.8.gz
>+man/man8/amtapetype.8.gz
>+man/man8/amtoc.8.gz
>+man/man8/amvault.8.gz
> @dirrm %%SITE_PERL%%/auto/Amanda/XferServer
> @dirrm %%SITE_PERL%%/auto/Amanda/Tapelist
> @dirrm %%SITE_PERL%%/auto/Amanda/Logfile
>Index: pkg-plist.client
>===================================================================
>--- pkg-plist.client	(revision 366242)
>+++ pkg-plist.client	(working copy)
>@@ -112,6 +112,27 @@
> sbin/amoldrecover
> sbin/amrecover
> sbin/amservice
>+man/man5/amanda-archive-format.5.gz
>+man/man5/amanda-client.conf.5.gz
>+man/man5/amanda.conf.5.gz
>+man/man7/amanda-applications.7.gz
>+man/man7/amanda-auth.7.gz
>+man/man7/amanda-match.7.gz
>+man/man7/amanda-scripts.7.gz
>+man/man8/amanda.8.gz
>+man/man8/amarchiver.8.gz
>+man/man8/amdump_client.8.gz
>+man/man8/amgtar.8.gz
>+man/man8/ampgsql.8.gz
>+man/man8/amraw.8.gz
>+man/man8/amrecover.8.gz
>+man/man8/amsamba.8.gz
>+man/man8/amservice.8.gz
>+man/man8/amstar.8.gz
>+man/man8/amsuntar.8.gz
>+man/man8/amzfs-sendrecv.8.gz
>+man/man8/amzfs-snapshot.8.gz
>+man/man8/script-email.8.gz
> %%DATADIR%%/COPYRIGHT
> %%DATADIR%%/ChangeLog
> %%DATADIR%%/NEWS

Actions: View | Diff

Attachments on bug 193196: 146586