Attachment 182602 Details for Bug 217365 – Updated patch

[patch] Updated patch

amanda.diff.txt (text/plain), 4.72 KB, created by Thomas Zander on 2017-05-14 20:22:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Zander

Created: 2017-05-14 20:22:28 UTC

Size: 4.72 KB

patch

obsolete

>Index: misc/amanda-server/Makefile
>===================================================================
>--- misc/amanda-server/Makefile	(revision 440896)
>+++ misc/amanda-server/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	amanda
>-PORTVERSION=	3.3.6
>-PORTREVISION=	5
>+PORTVERSION=	3.3.9
> PORTEPOCH=	1
> CATEGORIES=	misc
> MASTER_SITES=	SF/amanda/amanda%20-%20stable/${PORTVERSION}
>@@ -32,7 +31,7 @@
> 		--with-user=${USERS} --with-group=${AMANDA_GROUP} \
> 		--with-bsdtcp-security --with-bsdudp-security \
> 		--with-ssh-security \
>-		--disable-installperms
>+		--disable-installperms --with-security-file=${ETCDIR}/security.conf
> CONFIGURE_ENV=	PERL=${LOCALBASE}/bin/perl-amanda
> PKG_MESSAGE=	${WRKDIR}/pkg-message
> SUB_FILES=	pkg-message
>Index: misc/amanda-server/distinfo
>===================================================================
>--- misc/amanda-server/distinfo	(revision 440896)
>+++ misc/amanda-server/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (amanda-3.3.6.tar.gz) = 832594503a99bd5587f6c645c7af945f565506dc35e2660763d33beef2d4d01c
>-SIZE (amanda-3.3.6.tar.gz) = 4571518
>+SHA256 (amanda-3.3.9.tar.gz) = 2520b95ca96f1d521d582b7c94bd631486e7029eda1de8e1887d74b323549a41
>+SIZE (amanda-3.3.9.tar.gz) = 4673301
>Index: misc/amanda-server/files/patch-perl__Makefile.in
>===================================================================
>--- misc/amanda-server/files/patch-perl__Makefile.in	(revision 440896)
>+++ misc/amanda-server/files/patch-perl__Makefile.in	(nonexistent)
>@@ -1,39 +0,0 @@
>---- perl/Makefile.in.orig	2014-07-09 16:23:26.000000000 +0200
>-+++ perl/Makefile.in	2014-09-12 16:42:55.653005667 +0200
>-@@ -1812,13 +1812,15 @@
>- # PACKAGE: Amanda::Extract
>- 
>- # PACKAGE: Amanda::Script
>-+@WANT_CLIENT_TRUE@am__append_xfer = Amanda/Xfer.pm
>-+@WANT_CLIENT_TRUE@am__append_const = Amanda/Constants.pm
>- Amanda_DATA = Amanda/Archive.pm Amanda/Process.pm $(am__append_4) \
>- 	Amanda/Feature.pm $(am__append_6) Amanda/ClientService.pm \
>--	$(am__append_7) Amanda/Xfer.pm $(am__append_10) \
>-+	$(am__append_7) $(am__append_xfer) $(am__append_10) \
>- 	$(am__append_13) Amanda/BigIntCompat.pm Amanda/Debug.pm \
>- 	Amanda/Config.pm Amanda/Util.pm Amanda/Header.pm \
>- 	Amanda/Tests.pm Amanda/MainLoop.pm Amanda/Paths.pm \
>--	Amanda/Constants.pm Amanda/Script_App.pm Amanda/Extract.pm \
>-+	$(am__append_const) Amanda/Script_App.pm Amanda/Extract.pm \
>- 	$(am__append_16) $(am__append_17) Amanda/Script.pm
>- 
>- # PACKAGE: Amanda::Archive
>-@@ -1947,12 +1949,12 @@
>- @WANT_SERVER_TRUE@Amanda_DB_DATA = Amanda/DB/Catalog.pm
>- 
>- # PACKAGE: Amanda::Xfer
>--libXferdir = $(amperldir)/auto/Amanda/Xfer
>--libXfer_LTLIBRARIES = libXfer.la
>--libXfer_la_SOURCES = Amanda/Xfer.c $(AMGLUE_SWG)
>--libXfer_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
>--libXfer_la_LIBADD = amglue/libamglue.la \
>--	$(top_builddir)/xfer-src/libamxfer.la
>-+@WANT_CLIENT_TRUE@libXferdir = $(amperldir)/auto/Amanda/Xfer
>-+@WANT_CLIENT_TRUE@libXfer_LTLIBRARIES = libXfer.la
>-+@WANT_CLIENT_TRUE@libXfer_la_SOURCES = Amanda/Xfer.c $(AMGLUE_SWG)
>-+@WANT_CLIENT_TRUE@libXfer_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
>-+@WANT_CLIENT_TRUE@libXfer_la_LIBADD = amglue/libamglue.la \
>-+@WANT_CLIENT_TRUE@	$(top_builddir)/xfer-src/libamxfer.la
>- 
>- 
>- # PACKAGE: Amanda::NDMP
>
>Property changes on: misc/amanda-server/files/patch-perl__Makefile.in
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: misc/amanda-server/pkg-plist
>===================================================================
>--- misc/amanda-server/pkg-plist	(revision 440896)
>+++ misc/amanda-server/pkg-plist	(working copy)
>@@ -3,6 +3,7 @@
> @comment
> @comment plist for misc/amanda-server below
> @comment
>+%%SERVER_ONLY%%%%ETCDIR%%/amanda-security.conf
> %%SERVER_ONLY%%lib/amanda/libamdevice-%%SHLIBVER%%.so
> %%SERVER_ONLY%%lib/amanda/libamdevice.a
> %%SERVER_ONLY%%lib/amanda/libamdevice.so
>@@ -33,6 +34,7 @@
> %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Interactivity/tty.pm
> %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Interactivity/tty_email.pm
> %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Logfile.pm
>+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Message.pm
> %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Recovery/Clerk.pm
> %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Recovery/Planner.pm
> %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Recovery/Scan.pm
>@@ -258,6 +260,7 @@
> %%CLIENT_ONLY%%man/man5/amanda-archive-format.5.gz
> %%CLIENT_ONLY%%man/man5/amanda-client.conf.5.gz
> %%CLIENT_ONLY%%man/man5/amanda.conf.5.gz
>+%%CLIENT_ONLY%%man/man5/amanda-security.conf.5.gz
> %%CLIENT_ONLY%%man/man7/amanda-applications.7.gz
> %%CLIENT_ONLY%%man/man7/amanda-auth.7.gz
> %%CLIENT_ONLY%%man/man7/amanda-match.7.gz

Flags:

riggs: maintainer-approval? (fbsd)

Actions: View | Diff

Attachments on bug 217365: 180305 | 182602