Mon Jul 30 07:04:29 2012 UTC ()
Add SPECIAL_PERMS entries for binaries the need special perms.
Because of the above change switch all amanda packages to user-destdir
support.


(sbd)
diff -r1.53 -r1.54 pkgsrc/sysutils/amanda-client/Makefile
diff -r1.55 -r1.56 pkgsrc/sysutils/amanda-common/Makefile
diff -r1.35 -r1.36 pkgsrc/sysutils/amanda-common/Makefile.common
diff -r1.28 -r1.29 pkgsrc/sysutils/amanda-plot/Makefile
diff -r1.51 -r1.52 pkgsrc/sysutils/amanda-server/Makefile
cvs diff -r1.53 -r1.54 pkgsrc/sysutils/amanda-client/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/amanda-client/Makefile 2012/07/30 07:00:50 1.53
+++ pkgsrc/sysutils/amanda-client/Makefile 2012/07/30 07:04:29 1.54
@@ -1,37 +1,42 @@ @@ -1,37 +1,42 @@
1# $NetBSD: Makefile,v 1.53 2012/07/30 07:00:50 sbd Exp $ 1# $NetBSD: Makefile,v 1.54 2012/07/30 07:04:29 sbd Exp $
2# 2#
3 3
4PKGNAME= amanda-client-${AMANDA_VERSION} 4PKGNAME= amanda-client-${AMANDA_VERSION}
5PKGREVISION= 2 5PKGREVISION= 2
6SVR4_PKGNAME= amacl 6SVR4_PKGNAME= amacl
7 7
8COMMENT= Client part of Amanda, a network backup system 8COMMENT= Client part of Amanda, a network backup system
9 9
10PKG_DESTDIR_SUPPORT= destdir 10PKG_DESTDIR_SUPPORT= user-destdir
11 11
12USE_TOOLS+= awk:run perl:run 12USE_TOOLS+= awk:run perl:run
13 13
14.include "../../sysutils/amanda-common/Makefile.common" 14.include "../../sysutils/amanda-common/Makefile.common"
15CONFIGURE_ARGS+= --without-server --without-gnuplot 15CONFIGURE_ARGS+= --without-server --without-gnuplot
16 16
17.if !empty(PKG_OPTIONS:Mamanda-smb) 17.if !empty(PKG_OPTIONS:Mamanda-smb)
18CONFIGURE_ARGS+= --with-smbclient 18CONFIGURE_ARGS+= --with-smbclient
19DEPENDS+= {samba>=2.0,ja-samba>=2.0}:../../net/samba 19DEPENDS+= {samba>=2.0,ja-samba>=2.0}:../../net/samba
20.endif 20.endif
21 21
22.if !empty(PKG_OPTIONS:Mamanda-dump-snap) 22.if !empty(PKG_OPTIONS:Mamanda-dump-snap)
23CONFIGURE_ARGS+= --with-dump-use-snapshot --with-rundump 23CONFIGURE_ARGS+= --with-dump-use-snapshot --with-rundump
24.endif 24.endif
25 25
26# Prevent configure script from finding unnecessary libraries. We'll patch 26# Prevent configure script from finding unnecessary libraries. We'll patch
27# the amrecover Makefile to add the readline libraries as it's the only 27# the amrecover Makefile to add the readline libraries as it's the only
28# program that uses readline. (XXX: incorrect, does not happen) 28# program that uses readline. (XXX: incorrect, does not happen)
29# 29#
30CONFIGURE_ENV+= ac_cv_lib_intl_main=no 30CONFIGURE_ENV+= ac_cv_lib_intl_main=no
31CONFIGURE_ENV+= ac_cv_lib_termcap_tgetent=no 31CONFIGURE_ENV+= ac_cv_lib_termcap_tgetent=no
32CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no 32CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no
33CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no 33CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no
34CONFIGURE_ENV+= ac_cv_lib_readline_readline=no 34CONFIGURE_ENV+= ac_cv_lib_readline_readline=no
35 35
 36SPECIAL_PERMS+= libexec/runtar ${AM_PROG_PERMS}
 37SPECIAL_PERMS+= libexec/killpgrp ${AM_PROG_PERMS}
 38SPECIAL_PERMS+= libexec/rundump ${AM_PROG_PERMS}
 39SPECIAL_PERMS+= libexec/calcsize ${AM_PROG_PERMS}
 40
36.include "../../sysutils/amanda-common/buildlink3.mk" 41.include "../../sysutils/amanda-common/buildlink3.mk"
37.include "../../mk/bsd.pkg.mk" 42.include "../../mk/bsd.pkg.mk"
cvs diff -r1.55 -r1.56 pkgsrc/sysutils/amanda-common/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/amanda-common/Makefile 2012/07/30 07:03:04 1.55
+++ pkgsrc/sysutils/amanda-common/Makefile 2012/07/30 07:04:29 1.56
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.55 2012/07/30 07:03:04 sbd Exp $ 1# $NetBSD: Makefile,v 1.56 2012/07/30 07:04:29 sbd Exp $
2 2
3PKGNAME= amanda-common-${AMANDA_VERSION} 3PKGNAME= amanda-common-${AMANDA_VERSION}
4SVR4_PKGNAME= amaco 4SVR4_PKGNAME= amaco
5PKGREVISION= 2 5PKGREVISION= 2
6 6
7COMMENT= Common libraries and binaries for Amanda 7COMMENT= Common libraries and binaries for Amanda
8 8
9PKG_DESTDIR_SUPPORT= user-destdir 9PKG_DESTDIR_SUPPORT= user-destdir
10 10
11.include "../../sysutils/amanda-common/Makefile.common" 11.include "../../sysutils/amanda-common/Makefile.common"
12 12
13.if ${OPSYS} == "SunOS" 13.if ${OPSYS} == "SunOS"
14CPPFLAGS+= -D_LARGEFILE64_SOURCE 14CPPFLAGS+= -D_LARGEFILE64_SOURCE
@@ -25,16 +25,14 @@ CONFIGURE_ENV+= ac_cv_lib_ncurses_tgete @@ -25,16 +25,14 @@ CONFIGURE_ENV+= ac_cv_lib_ncurses_tgete
25CONFIGURE_ENV+= ac_cv_lib_readline_readline=no 25CONFIGURE_ENV+= ac_cv_lib_readline_readline=no
26 26
27PKG_GROUPS= ${AMANDA_GROUP} 27PKG_GROUPS= ${AMANDA_GROUP}
28PKG_USERS= ${AMANDA_USER}:${AMANDA_GROUP} 28PKG_USERS= ${AMANDA_USER}:${AMANDA_GROUP}
29 29
30PKG_GECOS.${AMANDA_USER}= Amanda backup user 30PKG_GECOS.${AMANDA_USER}= Amanda backup user
31PKG_SHELL.${AMANDA_USER}= ${SH} 31PKG_SHELL.${AMANDA_USER}= ${SH}
32PKG_HOME.${AMANDA_USER}= ${AMANDA_VAR} 32PKG_HOME.${AMANDA_USER}= ${AMANDA_VAR}
33 33
34OWN_DIRS_PERMS= ${AMANDA_VAR} ${AMANDA_USER} ${AMANDA_GROUP} 0750 34OWN_DIRS_PERMS= ${AMANDA_VAR} ${AMANDA_USER} ${AMANDA_GROUP} 0750
35OWN_DIRS_PERMS+= ${AMANDA_VAR}/gnutar-lists ${AMANDA_USER} ${AMANDA_GROUP} 0750 35OWN_DIRS_PERMS+= ${AMANDA_VAR}/gnutar-lists ${AMANDA_USER} ${AMANDA_GROUP} 0750
36OWN_DIRS_PERMS+= ${VARBASE}/log/amanda ${AMANDA_USER} ${AMANDA_GROUP} 0750 36OWN_DIRS_PERMS+= ${VARBASE}/log/amanda ${AMANDA_USER} ${AMANDA_GROUP} 0750
37 37
38INSTALL_MAKE_FLAGS+= SETUID_GROUP=${ROOT_GROUP} 
39 
40.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"
cvs diff -r1.35 -r1.36 pkgsrc/sysutils/amanda-common/Makefile.common (expand / switch to unified diff)

--- pkgsrc/sysutils/amanda-common/Makefile.common 2012/07/30 07:03:04 1.35
+++ pkgsrc/sysutils/amanda-common/Makefile.common 2012/07/30 07:04:29 1.36
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.35 2012/07/30 07:03:04 sbd Exp $ 1# $NetBSD: Makefile.common,v 1.36 2012/07/30 07:04:29 sbd Exp $
2 2
3# used by sysutils/amanda-common/Makefile 3# used by sysutils/amanda-common/Makefile
4# used by sysutils/amanda-client/Makefile 4# used by sysutils/amanda-client/Makefile
5# used by sysutils/amanda-server/Makefile 5# used by sysutils/amanda-server/Makefile
6# used by sysutils/amanda-plot/Makefile 6# used by sysutils/amanda-plot/Makefile
7 7
8COMMONDIR= ../../sysutils/amanda-common 8COMMONDIR= ../../sysutils/amanda-common
9.include "${COMMONDIR}/version.mk" 9.include "${COMMONDIR}/version.mk"
10 10
11DISTNAME= amanda-${AMANDA_VERSION} 11DISTNAME= amanda-${AMANDA_VERSION}
12CATEGORIES= sysutils 12CATEGORIES= sysutils
13MASTER_SITES?= ${MASTER_SITE_SOURCEFORGE:=amanda/} 13MASTER_SITES?= ${MASTER_SITE_SOURCEFORGE:=amanda/}
14 14
@@ -23,38 +23,43 @@ AMANDA_GROUP?= sysadmin @@ -23,38 +23,43 @@ AMANDA_GROUP?= sysadmin
23.else 23.else
24# NetBSD, Linux and Darwin 24# NetBSD, Linux and Darwin
25AMANDA_GROUP?= operator 25AMANDA_GROUP?= operator
26.endif 26.endif
27 27
28AMANDA_USER?= amandabackup 28AMANDA_USER?= amandabackup
29AMANDA_TMP?= /tmp/amanda 29AMANDA_TMP?= /tmp/amanda
30AMANDA_VAR?= ${VARBASE}/amanda 30AMANDA_VAR?= ${VARBASE}/amanda
31 31
32PKG_GROUPS_VARS+= AMANDA_GROUP 32PKG_GROUPS_VARS+= AMANDA_GROUP
33PKG_USERS_VARS+= AMANDA_USER 33PKG_USERS_VARS+= AMANDA_USER
34BUILD_DEFS+= AMANDA_TMP AMANDA_USER AMANDA_GROUP AMANDA_VAR VARBASE 34BUILD_DEFS+= AMANDA_TMP AMANDA_USER AMANDA_GROUP AMANDA_VAR VARBASE
35 35
 36AM_PROG_PERMS= ${REAL_ROOT_USER} ${AMANDA_GROUP} 4510
 37
36USE_LIBTOOL= yes 38USE_LIBTOOL= yes
37USE_TOOLS+= gzip:run gtar:run 39USE_TOOLS+= gzip:run gtar:run
38 40
39GNU_CONFIGURE= yes 41GNU_CONFIGURE= yes
40CONFIGURE_ENV+= ac_cv_path_GZIP=${TOOLS_GZIP_CMD:Q} 42CONFIGURE_ENV+= ac_cv_path_GZIP=${TOOLS_GZIP_CMD:Q}
41CONFIGURE_ENV+= GNUTAR=${TOOLS_GTAR:Q} 43CONFIGURE_ENV+= GNUTAR=${TOOLS_GTAR:Q}
42CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 44CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
43CONFIGURE_ARGS+= --localstatedir=${AMANDA_VAR:Q} 45CONFIGURE_ARGS+= --localstatedir=${AMANDA_VAR:Q}
44CONFIGURE_ARGS+= --with-tmpdir=${AMANDA_TMP:Q} 46CONFIGURE_ARGS+= --with-tmpdir=${AMANDA_TMP:Q}
45CONFIGURE_ARGS+= --with-gnutar-listdir=${AMANDA_VAR:Q}/gnutar-lists 47CONFIGURE_ARGS+= --with-gnutar-listdir=${AMANDA_VAR:Q}/gnutar-lists
46CONFIGURE_ARGS+= --with-debugging=${VARBASE:Q}/log/amanda 48CONFIGURE_ARGS+= --with-debugging=${VARBASE:Q}/log/amanda
47CONFIGURE_ARGS+= --with-user=${AMANDA_USER:Q} 49CONFIGURE_ARGS+= --with-user=${AMANDA_USER:Q}
48CONFIGURE_ARGS+= --with-group=${AMANDA_GROUP:Q} 50CONFIGURE_ARGS+= --with-group=${AMANDA_GROUP:Q}
49CONFIGURE_ARGS+= --with-owner=${REAL_ROOT_USER:Q} 51CONFIGURE_ARGS+= --with-owner=${REAL_ROOT_USER:Q}
50CONFIGURE_ARGS+= --with-mmap 52CONFIGURE_ARGS+= --with-mmap
51CONFIGURE_ARGS+= --with-index-server=localhost 53CONFIGURE_ARGS+= --with-index-server=localhost
52CONFIGURE_ARGS+= --with-tape-server=localhost 54CONFIGURE_ARGS+= --with-tape-server=localhost
53CONFIGURE_ARGS+= --with-assertions 55CONFIGURE_ARGS+= --with-assertions
54CONFIGURE_ARGS+= --with-amandahosts 56CONFIGURE_ARGS+= --with-amandahosts
55CONFIGURE_ARGS+= --with-bsd-security 57CONFIGURE_ARGS+= --with-bsd-security
56CONFIGURE_ARGS+= --with-bsdtcp-security 58CONFIGURE_ARGS+= --with-bsdtcp-security
57CONFIGURE_ARGS+= --with-bsdudp-security 59CONFIGURE_ARGS+= --with-bsdudp-security
58CONFIGURE_ARGS+= --with-dump-honor-nodump 60CONFIGURE_ARGS+= --with-dump-honor-nodump
 61CONFIGURE_ARGS+= --disable-installperms
 62
 63INSTALL_MAKE_FLAGS+= SETUID_GROUP=${ROOT_GROUP}
59 64
60.include "../../sysutils/amanda-common/options.mk" 65.include "../../sysutils/amanda-common/options.mk"
cvs diff -r1.28 -r1.29 pkgsrc/sysutils/amanda-plot/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/amanda-plot/Makefile 2012/07/30 07:00:12 1.28
+++ pkgsrc/sysutils/amanda-plot/Makefile 2012/07/30 07:04:29 1.29
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: Makefile,v 1.28 2012/07/30 07:00:12 sbd Exp $ 1# $NetBSD: Makefile,v 1.29 2012/07/30 07:04:29 sbd Exp $
2# 2#
3 3
4PKGNAME= amanda-plot-${AMANDA_VERSION} 4PKGNAME= amanda-plot-${AMANDA_VERSION}
5PKGREVISION= 1 5PKGREVISION= 1
6SVR4_PKGNAME= amapl 6SVR4_PKGNAME= amapl
7 7
8COMMENT= Visualizes the behavior of Amanda, a network backup system 8COMMENT= Visualizes the behavior of Amanda, a network backup system
9 9
10PKG_DESTDIR_SUPPORT= destdir 10PKG_DESTDIR_SUPPORT= user-destdir
11 11
12DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot 12DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot
13DEPENDS+= amanda-server-${AMANDA_VERSION}{,nb[0-9]*}:../../sysutils/amanda-server 13DEPENDS+= amanda-server-${AMANDA_VERSION}{,nb[0-9]*}:../../sysutils/amanda-server
14 14
15.include "../../sysutils/amanda-common/Makefile.common" 15.include "../../sysutils/amanda-common/Makefile.common"
16 16
17CONFIGURE_ARGS+= --without-client 17CONFIGURE_ARGS+= --without-client
18CONFIGURE_ARGS+= --without-restore 18CONFIGURE_ARGS+= --without-restore
19CONFIGURE_ARGS+= --without-amrecover 19CONFIGURE_ARGS+= --without-amrecover
20CONFIGURE_ENV+= GNUPLOT="${LOCALBASE}/bin/gnuplot" 20CONFIGURE_ENV+= GNUPLOT="${LOCALBASE}/bin/gnuplot"
21 21
22.include "../../mk/bsd.pkg.mk" 22.include "../../mk/bsd.pkg.mk"
cvs diff -r1.51 -r1.52 pkgsrc/sysutils/amanda-server/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/amanda-server/Makefile 2012/07/30 07:00:50 1.51
+++ pkgsrc/sysutils/amanda-server/Makefile 2012/07/30 07:04:29 1.52
@@ -1,34 +1,38 @@ @@ -1,34 +1,38 @@
1# $NetBSD: Makefile,v 1.51 2012/07/30 07:00:50 sbd Exp $ 1# $NetBSD: Makefile,v 1.52 2012/07/30 07:04:29 sbd Exp $
2 2
3PKGNAME= amanda-server-${AMANDA_VERSION} 3PKGNAME= amanda-server-${AMANDA_VERSION}
4PKGREVISION= 2 4PKGREVISION= 2
5SVR4_PKGNAME= amase 5SVR4_PKGNAME= amase
6 6
7COMMENT= Server part of Amanda, a network backup system 7COMMENT= Server part of Amanda, a network backup system
8 8
9PKG_DESTDIR_SUPPORT= destdir 9PKG_DESTDIR_SUPPORT= user-destdir
10 10
11.include "../../sysutils/amanda-common/Makefile.common" 11.include "../../sysutils/amanda-common/Makefile.common"
12 12
13USE_TOOLS+= awk:run perl:run mail:run 13USE_TOOLS+= awk:run perl:run mail:run
14 14
15DEPENDS+= p5-Perl4-CoreLibs-[0-9]*:../../devel/p5-Perl4-CoreLibs 15DEPENDS+= p5-Perl4-CoreLibs-[0-9]*:../../devel/p5-Perl4-CoreLibs
16 16
17# Prevent configure script from finding unnecessary libraries. 17# Prevent configure script from finding unnecessary libraries.
18# 18#
19CONFIGURE_ENV+= ac_cv_lib_intl_main=no 19CONFIGURE_ENV+= ac_cv_lib_intl_main=no
20CONFIGURE_ENV+= ac_cv_lib_termcap_tgetent=no 20CONFIGURE_ENV+= ac_cv_lib_termcap_tgetent=no
21CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no 21CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no
22CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no 22CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no
23CONFIGURE_ENV+= ac_cv_lib_readline_readline=no 23CONFIGURE_ENV+= ac_cv_lib_readline_readline=no
24 24
25CONFIGURE_ENV+= MAILER=${TOOLS_PATH.mail} 25CONFIGURE_ENV+= MAILER=${TOOLS_PATH.mail}
26CONFIGURE_ARGS+= --without-client --without-gnuplot 26CONFIGURE_ARGS+= --without-client --without-gnuplot
27 27
28PLIST_VARS+= scsi 28PLIST_VARS+= scsi
29.if ${OPSYS} != "SunOS" 29.if ${OPSYS} != "SunOS"
30PLIST.scsi= yes 30PLIST.scsi= yes
31.endif 31.endif
32 32
 33SPECIAL_PERMS+= sbin/amcheck ${AM_PROG_PERMS}
 34SPECIAL_PERMS+= libexec/planner ${AM_PROG_PERMS}
 35SPECIAL_PERMS+= libexec/dumper ${AM_PROG_PERMS}
 36
33.include "../../sysutils/amanda-common/buildlink3.mk" 37.include "../../sysutils/amanda-common/buildlink3.mk"
34.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"