* [gentoo-commits] gentoo-x86 commit in app-backup/amanda: ChangeLog amanda-3.2.1.ebuild
@ 2010-12-28 22:11 Christian Ruppert (idl0r)
0 siblings, 0 replies; 9+ messages in thread
From: Christian Ruppert (idl0r) @ 2010-12-28 22:11 UTC (permalink / raw
To: gentoo-commits
idl0r 10/12/28 22:11:45
Modified: ChangeLog amanda-3.2.1.ebuild
Log:
Fix libcurl dependency again.
(Portage version: 2.1.9.25/cvs/Linux i686)
Revision Changes Path
1.76 app-backup/amanda/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?rev=1.76&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?rev=1.76&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?r1=1.75&r2=1.76
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- ChangeLog 28 Dec 2010 22:06:33 -0000 1.75
+++ ChangeLog 28 Dec 2010 22:11:45 -0000 1.76
@@ -1,6 +1,9 @@
# ChangeLog for app-backup/amanda
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.75 2010/12/28 22:06:33 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.76 2010/12/28 22:11:45 idl0r Exp $
+
+ 28 Dec 2010; Christian Ruppert <idl0r@gentoo.org> amanda-3.2.1.ebuild:
+ Fix libcurl dependency again.
28 Dec 2010; Christian Ruppert <idl0r@gentoo.org> amanda-3.2.1.ebuild:
Make curl and readline optional.
1.4 app-backup/amanda/amanda-3.2.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?r1=1.3&r2=1.4
Index: amanda-3.2.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- amanda-3.2.1.ebuild 28 Dec 2010 22:06:33 -0000 1.3
+++ amanda-3.2.1.ebuild 28 Dec 2010 22:11:45 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v 1.3 2010/12/28 22:06:33 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v 1.4 2010/12/28 22:11:45 idl0r Exp $
EAPI=3
inherit autotools eutils perl-module
@@ -21,7 +21,8 @@
net-misc/openssh
>=dev-libs/glib-2.26.0
nls? ( virtual/libintl )
- curl? ( >=net-misc/curl-7.10.0 )
+ s3? ( >=net-misc/curl-7.10.0 )
+ !s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
samba? ( net-fs/samba )
kerberos? ( app-crypt/mit-krb5 )
xfs? ( sys-fs/xfsdump )
@@ -243,6 +244,11 @@
# Amazon S3 support
myconf="${myconf} `use_enable s3 s3-device`"
+ # libcurl is required for S3 but otherwise optional
+ if ! use s3; then
+ myconf="${myconf} $(use_with curl libcurl)"
+ fi
+
# Client only, as requested in bug #127725
if use minimal ; then
myconf="${myconf} --without-server"
@@ -270,7 +276,6 @@
econf \
$(use_with readline) \
- $(use_with curl libcurl) \
${myconf}
}
^ permalink raw reply [flat|nested] 9+ messages in thread* [gentoo-commits] gentoo-x86 commit in app-backup/amanda: ChangeLog amanda-3.2.1.ebuild
@ 2011-07-13 13:15 Kacper Kowalik (xarthisius)
0 siblings, 0 replies; 9+ messages in thread
From: Kacper Kowalik (xarthisius) @ 2011-07-13 13:15 UTC (permalink / raw
To: gentoo-commits
xarthisius 11/07/13 13:15:14
Modified: ChangeLog amanda-3.2.1.ebuild
Log:
amd64/ppc/ppc64 stable wrt #359333
(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)
Revision Changes Path
1.83 app-backup/amanda/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?rev=1.83&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?rev=1.83&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?r1=1.82&r2=1.83
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- ChangeLog 25 Apr 2011 14:41:09 -0000 1.82
+++ ChangeLog 13 Jul 2011 13:15:14 -0000 1.83
@@ -1,6 +1,9 @@
# ChangeLog for app-backup/amanda
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.82 2011/04/25 14:41:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.83 2011/07/13 13:15:14 xarthisius Exp $
+
+ 13 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> amanda-3.2.1.ebuild:
+ amd64/ppc/ppc64 stable wrt #359333
25 Apr 2011; Raúl Porcel <armin76@gentoo.org> amanda-3.2.1.ebuild:
sparc stable wrt #359333
1.9 app-backup/amanda/amanda-3.2.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?r1=1.8&r2=1.9
Index: amanda-3.2.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- amanda-3.2.1.ebuild 25 Apr 2011 14:41:09 -0000 1.8
+++ amanda-3.2.1.ebuild 13 Jul 2011 13:15:14 -0000 1.9
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v 1.8 2011/04/25 14:41:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v 1.9 2011/07/13 13:15:14 xarthisius Exp $
EAPI=3
inherit autotools eutils perl-module
@@ -11,7 +11,7 @@
SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
LICENSE="as-is"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
RDEPEND="sys-libs/readline
virtual/inetd
sys-apps/gawk
^ permalink raw reply [flat|nested] 9+ messages in thread* [gentoo-commits] gentoo-x86 commit in app-backup/amanda: ChangeLog amanda-3.2.1.ebuild
@ 2011-04-25 14:41 Raul Porcel (armin76)
0 siblings, 0 replies; 9+ messages in thread
From: Raul Porcel (armin76) @ 2011-04-25 14:41 UTC (permalink / raw
To: gentoo-commits
armin76 11/04/25 14:41:09
Modified: ChangeLog amanda-3.2.1.ebuild
Log:
sparc stable wrt #359333
(Portage version: 2.1.9.45/cvs/Linux ia64)
Revision Changes Path
1.82 app-backup/amanda/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?rev=1.82&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?rev=1.82&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?r1=1.81&r2=1.82
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- ChangeLog 11 Apr 2011 13:31:36 -0000 1.81
+++ ChangeLog 25 Apr 2011 14:41:09 -0000 1.82
@@ -1,6 +1,9 @@
# ChangeLog for app-backup/amanda
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.81 2011/04/11 13:31:36 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.82 2011/04/25 14:41:09 armin76 Exp $
+
+ 25 Apr 2011; Raúl Porcel <armin76@gentoo.org> amanda-3.2.1.ebuild:
+ sparc stable wrt #359333
11 Apr 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> amanda-3.2.1.ebuild:
x86 stable wrt bug #359333
1.8 app-backup/amanda/amanda-3.2.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?r1=1.7&r2=1.8
Index: amanda-3.2.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- amanda-3.2.1.ebuild 11 Apr 2011 13:31:36 -0000 1.7
+++ amanda-3.2.1.ebuild 25 Apr 2011 14:41:09 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v 1.7 2011/04/11 13:31:36 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v 1.8 2011/04/25 14:41:09 armin76 Exp $
EAPI=3
inherit autotools eutils perl-module
@@ -11,7 +11,7 @@
SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
LICENSE="as-is"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 sparc x86"
RDEPEND="sys-libs/readline
virtual/inetd
sys-apps/gawk
^ permalink raw reply [flat|nested] 9+ messages in thread* [gentoo-commits] gentoo-x86 commit in app-backup/amanda: ChangeLog amanda-3.2.1.ebuild
@ 2011-04-11 13:31 PaweA Hajdan (phajdan.jr)
0 siblings, 0 replies; 9+ messages in thread
From: PaweA Hajdan (phajdan.jr) @ 2011-04-11 13:31 UTC (permalink / raw
To: gentoo-commits
phajdan.jr 11/04/11 13:31:36
Modified: ChangeLog amanda-3.2.1.ebuild
Log:
x86 stable wrt bug #359333
(Portage version: 2.1.9.42/cvs/Linux i686)
Revision Changes Path
1.81 app-backup/amanda/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?rev=1.81&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?rev=1.81&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?r1=1.80&r2=1.81
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- ChangeLog 18 Mar 2011 17:51:38 -0000 1.80
+++ ChangeLog 11 Apr 2011 13:31:36 -0000 1.81
@@ -1,6 +1,9 @@
# ChangeLog for app-backup/amanda
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.80 2011/03/18 17:51:38 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.81 2011/04/11 13:31:36 phajdan.jr Exp $
+
+ 11 Apr 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> amanda-3.2.1.ebuild:
+ x86 stable wrt bug #359333
18 Mar 2011; Christian Ruppert <idl0r@gentoo.org>
-files/amanda-inetd.amanda.sample-2.5.1_p3-r1,
1.7 app-backup/amanda/amanda-3.2.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?r1=1.6&r2=1.7
Index: amanda-3.2.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- amanda-3.2.1.ebuild 29 Dec 2010 16:29:58 -0000 1.6
+++ amanda-3.2.1.ebuild 11 Apr 2011 13:31:36 -0000 1.7
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v 1.6 2010/12/29 16:29:58 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v 1.7 2011/04/11 13:31:36 phajdan.jr Exp $
EAPI=3
inherit autotools eutils perl-module
@@ -11,7 +11,7 @@
SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
LICENSE="as-is"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
RDEPEND="sys-libs/readline
virtual/inetd
sys-apps/gawk
^ permalink raw reply [flat|nested] 9+ messages in thread* [gentoo-commits] gentoo-x86 commit in app-backup/amanda: ChangeLog amanda-3.2.1.ebuild
@ 2010-12-29 16:29 Christian Ruppert (idl0r)
0 siblings, 0 replies; 9+ messages in thread
From: Christian Ruppert (idl0r) @ 2010-12-29 16:29 UTC (permalink / raw
To: gentoo-commits
idl0r 10/12/29 16:29:58
Modified: ChangeLog amanda-3.2.1.ebuild
Log:
Remove the --without-krb4-security option since it's no longer valid.
(Portage version: 2.1.9.25/cvs/Linux i686)
Revision Changes Path
1.78 app-backup/amanda/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?rev=1.78&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?rev=1.78&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?r1=1.77&r2=1.78
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- ChangeLog 29 Dec 2010 16:09:02 -0000 1.77
+++ ChangeLog 29 Dec 2010 16:29:58 -0000 1.78
@@ -1,10 +1,11 @@
# ChangeLog for app-backup/amanda
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.77 2010/12/29 16:09:02 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.78 2010/12/29 16:29:58 idl0r Exp $
29 Dec 2010; Christian Ruppert <idl0r@gentoo.org> amanda-3.2.1.ebuild:
Move elog block regarding the AMANDA_SERVER environment variable into
- pkg_setup. Install the sample cronjob only on non-minimal setups.
+ pkg_setup. Install the sample cronjob only on non-minimal setups. Remove the
+ --without-krb4-security option since it's no longer valid.
28 Dec 2010; Christian Ruppert <idl0r@gentoo.org> amanda-3.2.1.ebuild:
Fix libcurl dependency again.
1.6 app-backup/amanda/amanda-3.2.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?r1=1.5&r2=1.6
Index: amanda-3.2.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- amanda-3.2.1.ebuild 29 Dec 2010 16:09:02 -0000 1.5
+++ amanda-3.2.1.ebuild 29 Dec 2010 16:29:58 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v 1.5 2010/12/29 16:09:02 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v 1.6 2010/12/29 16:29:58 idl0r Exp $
EAPI=3
inherit autotools eutils perl-module
@@ -247,10 +247,6 @@
myconf="${myconf} --with-bsdudp-security"
myconf="${myconf} --with-bsdtcp-security"
- # kerberos-security mechanism version 4
- # always disable, per bug #173354
- myconf="${myconf} --without-krb4-security"
-
# kerberos-security mechanism version 5
myconf="${myconf} `use_with kerberos krb5-security`"
^ permalink raw reply [flat|nested] 9+ messages in thread* [gentoo-commits] gentoo-x86 commit in app-backup/amanda: ChangeLog amanda-3.2.1.ebuild
@ 2010-12-29 16:09 Christian Ruppert (idl0r)
0 siblings, 0 replies; 9+ messages in thread
From: Christian Ruppert (idl0r) @ 2010-12-29 16:09 UTC (permalink / raw
To: gentoo-commits
idl0r 10/12/29 16:09:02
Modified: ChangeLog amanda-3.2.1.ebuild
Log:
Move elog block regarding the AMANDA_SERVER environment variable into pkg_setup. Install the sample cronjob only on non-minimal setups.
(Portage version: 2.1.9.25/cvs/Linux i686)
Revision Changes Path
1.77 app-backup/amanda/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?rev=1.77&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?rev=1.77&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?r1=1.76&r2=1.77
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- ChangeLog 28 Dec 2010 22:11:45 -0000 1.76
+++ ChangeLog 29 Dec 2010 16:09:02 -0000 1.77
@@ -1,6 +1,10 @@
# ChangeLog for app-backup/amanda
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.76 2010/12/28 22:11:45 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.77 2010/12/29 16:09:02 idl0r Exp $
+
+ 29 Dec 2010; Christian Ruppert <idl0r@gentoo.org> amanda-3.2.1.ebuild:
+ Move elog block regarding the AMANDA_SERVER environment variable into
+ pkg_setup. Install the sample cronjob only on non-minimal setups.
28 Dec 2010; Christian Ruppert <idl0r@gentoo.org> amanda-3.2.1.ebuild:
Fix libcurl dependency again.
1.5 app-backup/amanda/amanda-3.2.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?r1=1.4&r2=1.5
Index: amanda-3.2.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- amanda-3.2.1.ebuild 28 Dec 2010 22:11:45 -0000 1.4
+++ amanda-3.2.1.ebuild 29 Dec 2010 16:09:02 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v 1.4 2010/12/28 22:11:45 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v 1.5 2010/12/29 16:09:02 idl0r Exp $
EAPI=3
inherit autotools eutils perl-module
@@ -114,6 +114,19 @@
pkg_setup() {
amanda_variable_setup
+
+ # If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
+ # another host than HOSTNAME.
+ if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then
+ elog "You are installing a client-only version of Amanda."
+ elog "You should set the variable \$AMANDA_SERVER to point at your"
+ elog "Amanda-tape-server, otherwise you will have to specify its name"
+ elog "when using amrecover on the client."
+ elog "For example: Use something like"
+ elog "AMANDA_SERVER=\"myserver\" emerge amanda"
+ elog
+ fi
+
enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
}
@@ -318,9 +331,11 @@
newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
fi
- einfo "Installing Sample Daily Cron Job for Amanda"
- insinto /etc/cron.daily
- newins "${MYFILESDIR}/amanda-cron" amanda
+ if ! use minimal; then
+ einfo "Installing Sample Daily Cron Job for Amanda"
+ insinto /etc/cron.daily
+ newins "${MYFILESDIR}/amanda-cron" amanda
+ fi
insinto /etc/amanda
einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
@@ -406,18 +421,6 @@
einfo "If you have migrated safely, please delete /etc/amandates"
fi
- # If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
- # another host than HOSTNAME.
- if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then
- elog "You are installing a client-only version of Amanda."
- elog "You should set the variable \$AMANDA_SERVER to point at your"
- elog "Amanda-tape-server, otherwise you will have to specify its name"
- elog "when using amrecover on the client."
- elog "For example: Use something like"
- elog "AMANDA_SERVER=\"myserver\" emerge amanda"
- elog
- fi
-
einfo "Checking setuid permissions"
amanda_permissions_fix "${ROOT}"
^ permalink raw reply [flat|nested] 9+ messages in thread* [gentoo-commits] gentoo-x86 commit in app-backup/amanda: ChangeLog amanda-3.2.1.ebuild
@ 2010-12-28 22:06 Christian Ruppert (idl0r)
0 siblings, 0 replies; 9+ messages in thread
From: Christian Ruppert (idl0r) @ 2010-12-28 22:06 UTC (permalink / raw
To: gentoo-commits
idl0r 10/12/28 22:06:33
Modified: ChangeLog amanda-3.2.1.ebuild
Log:
Make curl and readline optional.
(Portage version: 2.1.9.25/cvs/Linux i686)
Revision Changes Path
1.75 app-backup/amanda/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?rev=1.75&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?rev=1.75&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?r1=1.74&r2=1.75
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- ChangeLog 28 Dec 2010 00:16:10 -0000 1.74
+++ ChangeLog 28 Dec 2010 22:06:33 -0000 1.75
@@ -1,6 +1,9 @@
# ChangeLog for app-backup/amanda
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.74 2010/12/28 00:16:10 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.75 2010/12/28 22:06:33 idl0r Exp $
+
+ 28 Dec 2010; Christian Ruppert <idl0r@gentoo.org> amanda-3.2.1.ebuild:
+ Make curl and readline optional.
28 Dec 2010; Christian Ruppert <idl0r@gentoo.org> amanda-3.2.1.ebuild:
Fix amandahomedir in amaddclient and amserverconfig to use /var/spool/amanda
1.3 app-backup/amanda/amanda-3.2.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?r1=1.2&r2=1.3
Index: amanda-3.2.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- amanda-3.2.1.ebuild 28 Dec 2010 00:16:10 -0000 1.2
+++ amanda-3.2.1.ebuild 28 Dec 2010 22:06:33 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v 1.2 2010/12/28 00:16:10 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v 1.3 2010/12/28 22:06:33 idl0r Exp $
EAPI=3
inherit autotools eutils perl-module
@@ -21,10 +21,11 @@
net-misc/openssh
>=dev-libs/glib-2.26.0
nls? ( virtual/libintl )
- s3? ( >=net-misc/curl-7.10.0 )
+ curl? ( >=net-misc/curl-7.10.0 )
samba? ( net-fs/samba )
kerberos? ( app-crypt/mit-krb5 )
xfs? ( sys-fs/xfsdump )
+ readline? ( sys-libs/readline )
!minimal? (
virtual/mailx
app-arch/mt-st
@@ -41,7 +42,7 @@
app-text/docbook-xml-dtd
"
-IUSE="gnuplot ipv6 kerberos minimal nls s3 samba xfs"
+IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba xfs"
S="${WORKDIR}/${MY_P}"
@@ -267,7 +268,10 @@
# build manpages
myconf="${myconf} --enable-manpage-build"
- econf ${myconf} || die "econf failed!"
+ econf \
+ $(use_with readline) \
+ $(use_with curl libcurl) \
+ ${myconf}
}
src_compile() {
^ permalink raw reply [flat|nested] 9+ messages in thread* [gentoo-commits] gentoo-x86 commit in app-backup/amanda: ChangeLog amanda-3.2.1.ebuild
@ 2010-12-28 0:16 Christian Ruppert (idl0r)
0 siblings, 0 replies; 9+ messages in thread
From: Christian Ruppert (idl0r) @ 2010-12-28 0:16 UTC (permalink / raw
To: gentoo-commits
idl0r 10/12/28 00:16:10
Modified: ChangeLog amanda-3.2.1.ebuild
Log:
Fix amandahomedir in amaddclient and amserverconfig to use /var/spool/amanda instead of /var/spool/amanda/lib/amanda.
(Portage version: 2.1.9.25/cvs/Linux i686)
Revision Changes Path
1.74 app-backup/amanda/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?rev=1.74&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?rev=1.74&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?r1=1.73&r2=1.74
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- ChangeLog 19 Dec 2010 00:27:37 -0000 1.73
+++ ChangeLog 28 Dec 2010 00:16:10 -0000 1.74
@@ -1,6 +1,10 @@
# ChangeLog for app-backup/amanda
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.73 2010/12/19 00:27:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.74 2010/12/28 00:16:10 idl0r Exp $
+
+ 28 Dec 2010; Christian Ruppert <idl0r@gentoo.org> amanda-3.2.1.ebuild:
+ Fix amandahomedir in amaddclient and amserverconfig to use /var/spool/amanda
+ instead of /var/spool/amanda/lib/amanda.
*amanda-3.2.1 (19 Dec 2010)
1.2 app-backup/amanda/amanda-3.2.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?r1=1.1&r2=1.2
Index: amanda-3.2.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amanda-3.2.1.ebuild 19 Dec 2010 00:27:37 -0000 1.1
+++ amanda-3.2.1.ebuild 28 Dec 2010 00:16:10 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v 1.1 2010/12/19 00:27:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v 1.2 2010/12/28 00:16:10 idl0r Exp $
EAPI=3
inherit autotools eutils perl-module
@@ -160,6 +160,11 @@
cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1
use minimal || cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1
) > "${T}"/amandahosts
+
+ if ! use minimal; then
+ sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
+ server-src/am{addclient,serverconfig}.pl || die
+ fi
}
src_configure() {
^ permalink raw reply [flat|nested] 9+ messages in thread* [gentoo-commits] gentoo-x86 commit in app-backup/amanda: ChangeLog amanda-3.2.1.ebuild
@ 2010-12-19 0:27 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 9+ messages in thread
From: Robin H. Johnson (robbat2) @ 2010-12-19 0:27 UTC (permalink / raw
To: gentoo-commits
robbat2 10/12/19 00:27:37
Modified: ChangeLog
Added: amanda-3.2.1.ebuild
Log:
Version bump.
(Portage version: 2.2.0_alpha6/cvs/Linux x86_64)
Revision Changes Path
1.73 app-backup/amanda/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?rev=1.73&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?rev=1.73&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?r1=1.72&r2=1.73
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v
retrieving revision 1.72
retrieving revision 1.73
diff -p -w -b -B -u -u -r1.72 -r1.73
--- ChangeLog 7 Dec 2010 21:51:20 -0000 1.72
+++ ChangeLog 19 Dec 2010 00:27:37 -0000 1.73
@@ -1,6 +1,11 @@
# ChangeLog for app-backup/amanda
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.72 2010/12/07 21:51:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.73 2010/12/19 00:27:37 robbat2 Exp $
+
+*amanda-3.2.1 (19 Dec 2010)
+
+ 19 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> +amanda-3.2.1.ebuild:
+ Version bump.
*amanda-3.2.0 (07 Dec 2010)
1.1 app-backup/amanda/amanda-3.2.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild?rev=1.1&content-type=text/plain
Index: amanda-3.2.1.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v 1.1 2010/12/19 00:27:37 robbat2 Exp $
EAPI=3
inherit autotools eutils perl-module
MY_P="${P/_}"
DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
HOMEPAGE="http://www.amanda.org/"
SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
LICENSE="as-is"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
RDEPEND="sys-libs/readline
virtual/inetd
sys-apps/gawk
app-arch/tar
>=dev-lang/perl-5.6
app-arch/dump
net-misc/openssh
>=dev-libs/glib-2.26.0
nls? ( virtual/libintl )
s3? ( >=net-misc/curl-7.10.0 )
samba? ( net-fs/samba )
kerberos? ( app-crypt/mit-krb5 )
xfs? ( sys-fs/xfsdump )
!minimal? (
virtual/mailx
app-arch/mt-st
sys-block/mtx
gnuplot? ( sci-visualization/gnuplot )
app-crypt/aespipe
app-crypt/gnupg
)"
DEPEND="${RDEPEND}
dev-util/pkgconfig
nls? ( sys-devel/gettext )
>=app-text/docbook-xsl-stylesheets-1.72.0
app-text/docbook-xml-dtd
"
IUSE="gnuplot ipv6 kerberos minimal nls s3 samba xfs"
S="${WORKDIR}/${MY_P}"
MYFILESDIR="${T}/files"
ENVDIR="/etc/env.d"
ENVDFILE="97amanda"
TMPENVFILE="${T}/${ENVDFILE}"
# This is a complete list of Amanda settings that the ebuild takes from the
# build environment. This allows users to alter the behavior of the package as
# upstream intended, but keeping with Gentoo style. We store a copy of them in
# /etc/env.d/97amanda during the install, so that they are preserved for future
# installed. This variable name must not start with AMANDA_, as we do not want
# it captured into the env file.
ENV_SETTINGS_AMANDA="
AMANDA_GROUP_GID AMANDA_GROUP_NAME
AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS
AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_INDEX
AMANDA_TAR_LISTDIR AMANDA_TAR
AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
AMANDA_CONFIG_NAME AMANDA_TMPDIR"
amanda_variable_setup() {
# Setting vars
local currentamanda
# Grab the current settings
currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
# First we set the defaults
[ -z "${AMANDA_GROUP_GID}" ] && AMANDA_GROUP_GID=87
[ -z "${AMANDA_GROUP_NAME}" ] && AMANDA_GROUP_NAME=amanda
[ -z "${AMANDA_USER_NAME}" ] && AMANDA_USER_NAME=amanda
[ -z "${AMANDA_USER_UID}" ] && AMANDA_USER_UID=87
[ -z "${AMANDA_USER_SH}" ] && AMANDA_USER_SH=/bin/bash
[ -z "${AMANDA_USER_HOMEDIR}" ] && AMANDA_USER_HOMEDIR=/var/spool/amanda
[ -z "${AMANDA_USER_GROUPS}" ] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
# This installs Amanda, with the server. However, it could be a client,
# just specify an alternate server name in AMANDA_SERVER.
[ -z "${AMANDA_SERVER}" ] && AMANDA_SERVER="${HOSTNAME}"
[ -z "${AMANDA_SERVER_TAPE}" ] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
[ -z "${AMANDA_SERVER_INDEX}" ] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
[ -z "${AMANDA_TAR_LISTDIR}" ] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
[ -z "${AMANDA_CONFIG_NAME}" ] && AMANDA_CONFIG_NAME=DailySet1
[ -z "${AMANDA_TMPDIR}" ] && AMANDA_TMPDIR=/var/tmp/amanda
[ -z "${AMANDA_DBGDIR}" ] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
# These are left empty by default
[ -z "${AMANDA_PORTS_UDP}" ] && AMANDA_PORTS_UDP=
[ -z "${AMANDA_PORTS_TCP}" ] && AMANDA_PORTS_TCP=
[ -z "${AMANDA_PORTS_BOTH}" ] && AMANDA_PORTS_BOTH=
[ -z "${AMANDA_PORTS}" ] && AMANDA_PORTS=
# What tar to use
[ -z "${AMANDA_TAR}" ] && AMANDA_TAR=/bin/tar
# Now pull in the old stuff
if [ -f "${ROOT}${ENVDIR}/${ENVDFILE}" ]; then
# We don't just source it as we don't want everything in there.
eval $(egrep "^AMANDA_" "${ROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
fi
# Re-apply the new settings if any
[ -n "${currentamanda}" ] && eval `echo "${currentamanda}"`
}
pkg_setup() {
amanda_variable_setup
enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
}
src_unpack() {
# we do not want the perl src_unpack
base_src_unpack
}
src_prepare() {
# Fix a fun race condition if you use encryption.
# This is one of the reasons you should test your recovery procedures often.
#epatch "${FILESDIR}"/${PN}-2.6.0p2-amcrypt-ossl-asym-race-fix.patch
# gentoo bug 248838, check /sbin stuff before /bin
#epatch "${FILESDIR}"/${PN}-2.6.0_p2-syslocpath.patch
# gentoo bug #331111
sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am
sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am
eautoreconf
# places for us to work in
mkdir -p "${MYFILESDIR}"
# Now we store the settings we just created
set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}"
# Prepare our custom files
einfo "Building custom configuration files"
local i # our iterator
local sedexpr # var for sed expr
sedexpr=''
for i in ${ENV_SETTINGS_AMANDA} ; do
local val
eval "val=\"\${${i}}\""
sedexpr="${sedexpr}s|__${i}__|${val}|g;"
done
# now apply the sed expr
for i in "${FILESDIR}"/amanda-* ; do
sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`"
done
(
cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1
use minimal || cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1
) > "${T}"/amandahosts
}
src_configure() {
# fix bug #36316
addpredict /var/cache/samba/gencache.tdb
[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
source "${TMPENVFILE}"
local myconf
einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
einfo "Using ${AMANDA_SERVER_INDEX} for index server."
myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
einfo "Using ${AMANDA_USER_NAME} for amanda user."
myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
einfo "Using ${AMANDA_TAR} as Tar implementation."
myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
eerror "If you want _both_ UDP and TCP ports, please use only the"
eerror "AMANDA_PORTS environment variable for identical ports, or set"
eerror "AMANDA_PORTS_BOTH."
die "Bad port setup!"
fi
if [ -n "${AMANDA_PORTS_UDP}" ]; then
einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
fi
if [ -n "${AMANDA_PORTS_TCP}" ]; then
einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
fi
if [ -n "${AMANDA_PORTS}" ]; then
einfo "Using ports ${AMANDA_PORTS/,/-}"
myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
fi
# Extras
# Speed option
myconf="${myconf} --with-buffered-dump"
# "debugging" in the configuration is NOT debug in the conventional sense.
# It is actually just useful output in the application, and should remain
# enabled. There are some cases of breakage with MTX tape changers as of
# 2.5.1p2 that it exposes when turned off as well.
myconf="${myconf} --with-debugging"
# Where to put our files
myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
# Samba support
myconf="${myconf} `use_with samba smbclient /usr/bin/smbclient`"
# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
# default
myconf="${myconf} --with-bsd-security"
myconf="${myconf} --with-ssh-security"
myconf="${myconf} --with-bsdudp-security"
myconf="${myconf} --with-bsdtcp-security"
# kerberos-security mechanism version 4
# always disable, per bug #173354
myconf="${myconf} --without-krb4-security"
# kerberos-security mechanism version 5
myconf="${myconf} `use_with kerberos krb5-security`"
# Amazon S3 support
myconf="${myconf} `use_enable s3 s3-device`"
# Client only, as requested in bug #127725
if use minimal ; then
myconf="${myconf} --without-server"
else
# amplot
myconf="${myconf} $(use_with gnuplot)"
fi
# IPv6 fun.
myconf="${myconf} `use_with ipv6`"
# I18N
myconf="${myconf} `use_enable nls`"
# Bug #296634: Perl location
perlinfo
myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
# Bug 296633: --disable-syntax-checks
# Some tests are not safe for production systems
myconf="${myconf} --disable-syntax-checks"
# build manpages
myconf="${myconf} --enable-manpage-build"
econf ${myconf} || die "econf failed!"
}
src_compile() {
# Again, do not want the perl-module src_compile
base_src_compile
}
src_install() {
[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
source ${TMPENVFILE}
einfo "Doing stock install"
# parallel make install b0rked
emake -j1 DESTDIR="${D}" install || die
# Build the envdir file
# Don't forget this..
einfo "Building environment file"
(
echo "# These settings are what was present in the environment when this"
echo "# Amanda was compiled. Changing anything below this comment will"
echo "# have no effect on your application, but it merely exists to"
echo "# preserve them for your next emerge of Amanda"
cat "${TMPENVFILE}" | sed "s,=\$,='',g"
) >> "${MYFILESDIR}/${ENVDFILE}"
# Env.d
einfo "Installing environment config file"
doenvd "${MYFILESDIR}/${ENVDFILE}"
# Lock down next section (up until docs).
insopts -m0640
# Installing Amanda Xinetd Services Definition
einfo "Installing xinetd service file"
insinto /etc/xinetd.d
if use minimal ; then
newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
else
newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
fi
einfo "Installing Sample Daily Cron Job for Amanda"
insinto /etc/cron.daily
newins "${MYFILESDIR}/amanda-cron" amanda
insinto /etc/amanda
einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
doins "${T}/amandahosts"
fperms 600 /etc/amanda/amandahosts
dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts"
insinto "${AMANDA_USER_HOMEDIR}"
einfo "Installing .profile for ${AMANDA_USER_NAME} user"
newins "${MYFILESDIR}/amanda-profile" .profile
insinto /etc/amanda
doins "${S}/example/amanda-client.conf"
if ! use minimal ; then
insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
doins "${S}/example/amanda.conf"
doins "${S}/example/disklist"
keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
fi
keepdir "${AMANDA_TAR_LISTDIR}"
keepdir "${AMANDA_USER_HOMEDIR}/amanda"
keepdir "${AMANDA_TMPDIR}/dumps"
# Just make sure it exists for XFS to work...
use xfs && keepdir /var/xfsdump/inventory
local i
for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
"${AMANDA_TMPDIR}" /etc/amanda; do
einfo "Securing directory (${i})"
fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
done
# Do NOT use -R
fperms 0700 \
"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
"${AMANDA_USER_HOMEDIR}/amanda" \
"${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
/etc/amanda /etc/amanda/${AMANDA_CONFIG_NAME}
einfo "Setting setuid permissions"
amanda_permissions_fix "${D}"
# Relax permissions again
insopts -m0644
# docs
einfo "Installing documentation"
dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING
# our inetd sample
einfo "Installing standard inetd sample"
newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample
# Amanda example configs
einfo "Installing example configurations"
rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes}
mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/"
docinto example1
newdoc "${FILESDIR}/example_amanda.conf" amanda.conf
newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist
newdoc "${FILESDIR}/example_global.conf" global.conf
einfo "Cleaning up dud .la files"
perlinfo
find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f
}
pkg_postinst() {
[ ! -f "${TMPENVFILE}" -a "$EMERGE_FROM" == "binary" ] && \
TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
source "${TMPENVFILE}"
# Migration of amandates from /etc to $localstatedir/amanda
if [ -f "${ROOT}/etc/amandates" -a \
! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then
einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda"
einfo "A backup is also placed at /etc/amandates.orig"
cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig"
mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/"
cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates"
fi
if [ -f "${ROOT}/etc/amandates" ]; then
einfo "If you have migrated safely, please delete /etc/amandates"
fi
# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
# another host than HOSTNAME.
if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then
elog "You are installing a client-only version of Amanda."
elog "You should set the variable \$AMANDA_SERVER to point at your"
elog "Amanda-tape-server, otherwise you will have to specify its name"
elog "when using amrecover on the client."
elog "For example: Use something like"
elog "AMANDA_SERVER=\"myserver\" emerge amanda"
elog
fi
einfo "Checking setuid permissions"
amanda_permissions_fix "${ROOT}"
elog "You should configure Amanda in /etc/amanda now."
elog
elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
elog "and restart xinetd afterwards!"
elog
elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample"
elog "as an example of how to configure your inetd."
elog
elog "NOTICE: If you need raw access to partitions you need to add the"
elog "amanda user to the 'disk' group."
elog
elog "NOTICE: If you have a tape changer, you need to add the amanda user"
elog "to the 'tape' group."
elog
elog "If you use localhost in your disklist your restores may break."
elog "You should replace it with the actual hostname!"
elog "Please also see the syntax changes to amandahosts."
}
# We have had reports of amanda file permissions getting screwed up.
# Losing setuid, becoming too lax etc.
# ONLY root and users in the amanda group should be able to run these binaries!
amanda_permissions_fix() {
local root="$1"
[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
local le="/usr/libexec/amanda"
for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \
"${le}"/rundump "${le}"/runtar "${le}"/dumper \
"${le}"/planner ; do
chown root:${AMANDA_GROUP_NAME} "${root}"/${i}
chmod u=srwx,g=rx,o= "${root}"/${i}
done
}
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2011-07-13 13:15 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-28 22:11 [gentoo-commits] gentoo-x86 commit in app-backup/amanda: ChangeLog amanda-3.2.1.ebuild Christian Ruppert (idl0r)
-- strict thread matches above, loose matches on Subject: below --
2011-07-13 13:15 Kacper Kowalik (xarthisius)
2011-04-25 14:41 Raul Porcel (armin76)
2011-04-11 13:31 PaweA Hajdan (phajdan.jr)
2010-12-29 16:29 Christian Ruppert (idl0r)
2010-12-29 16:09 Christian Ruppert (idl0r)
2010-12-28 22:06 Christian Ruppert (idl0r)
2010-12-28 0:16 Christian Ruppert (idl0r)
2010-12-19 0:27 Robin H. Johnson (robbat2)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox