diff options
author | sbd <sbd@pkgsrc.org> | 2012-07-30 07:04:29 +0000 |
---|---|---|
committer | sbd <sbd@pkgsrc.org> | 2012-07-30 07:04:29 +0000 |
commit | e7c149a4f48afeeb8a477e587ce61fd41591aca0 (patch) | |
tree | e674e69a325fa5ee98e0c11cefe002f128f5a614 | |
parent | 2014d097ba0e81c5785b28a88096a1add3a21d4b (diff) | |
download | pkgsrc-e7c149a4f48afeeb8a477e587ce61fd41591aca0.tar.gz |
Add SPECIAL_PERMS entries for binaries the need special perms.
Because of the above change switch all amanda packages to user-destdir
support.
-rw-r--r-- | sysutils/amanda-client/Makefile | 9 | ||||
-rw-r--r-- | sysutils/amanda-common/Makefile | 4 | ||||
-rw-r--r-- | sysutils/amanda-common/Makefile.common | 7 | ||||
-rw-r--r-- | sysutils/amanda-plot/Makefile | 4 | ||||
-rw-r--r-- | sysutils/amanda-server/Makefile | 8 |
5 files changed, 22 insertions, 10 deletions
diff --git a/sysutils/amanda-client/Makefile b/sysutils/amanda-client/Makefile index bd67e20da5a..05eec47d969 100644 --- a/sysutils/amanda-client/Makefile +++ b/sysutils/amanda-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2012/07/30 07:00:50 sbd Exp $ +# $NetBSD: Makefile,v 1.54 2012/07/30 07:04:29 sbd Exp $ # PKGNAME= amanda-client-${AMANDA_VERSION} @@ -7,7 +7,7 @@ SVR4_PKGNAME= amacl COMMENT= Client part of Amanda, a network backup system -PKG_DESTDIR_SUPPORT= destdir +PKG_DESTDIR_SUPPORT= user-destdir USE_TOOLS+= awk:run perl:run @@ -33,5 +33,10 @@ CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no CONFIGURE_ENV+= ac_cv_lib_readline_readline=no +SPECIAL_PERMS+= libexec/runtar ${AM_PROG_PERMS} +SPECIAL_PERMS+= libexec/killpgrp ${AM_PROG_PERMS} +SPECIAL_PERMS+= libexec/rundump ${AM_PROG_PERMS} +SPECIAL_PERMS+= libexec/calcsize ${AM_PROG_PERMS} + .include "../../sysutils/amanda-common/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile index 81005406c0e..cf692e327eb 100644 --- a/sysutils/amanda-common/Makefile +++ b/sysutils/amanda-common/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2012/07/30 07:03:04 sbd Exp $ +# $NetBSD: Makefile,v 1.56 2012/07/30 07:04:29 sbd Exp $ PKGNAME= amanda-common-${AMANDA_VERSION} SVR4_PKGNAME= amaco @@ -35,6 +35,4 @@ OWN_DIRS_PERMS= ${AMANDA_VAR} ${AMANDA_USER} ${AMANDA_GROUP} 0750 OWN_DIRS_PERMS+= ${AMANDA_VAR}/gnutar-lists ${AMANDA_USER} ${AMANDA_GROUP} 0750 OWN_DIRS_PERMS+= ${VARBASE}/log/amanda ${AMANDA_USER} ${AMANDA_GROUP} 0750 -INSTALL_MAKE_FLAGS+= SETUID_GROUP=${ROOT_GROUP} - .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common index 9f3e1179c95..50fdaf9a829 100644 --- a/sysutils/amanda-common/Makefile.common +++ b/sysutils/amanda-common/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.35 2012/07/30 07:03:04 sbd Exp $ +# $NetBSD: Makefile.common,v 1.36 2012/07/30 07:04:29 sbd Exp $ # used by sysutils/amanda-common/Makefile # used by sysutils/amanda-client/Makefile @@ -33,6 +33,8 @@ PKG_GROUPS_VARS+= AMANDA_GROUP PKG_USERS_VARS+= AMANDA_USER BUILD_DEFS+= AMANDA_TMP AMANDA_USER AMANDA_GROUP AMANDA_VAR VARBASE +AM_PROG_PERMS= ${REAL_ROOT_USER} ${AMANDA_GROUP} 4510 + USE_LIBTOOL= yes USE_TOOLS+= gzip:run gtar:run @@ -56,5 +58,8 @@ CONFIGURE_ARGS+= --with-bsd-security CONFIGURE_ARGS+= --with-bsdtcp-security CONFIGURE_ARGS+= --with-bsdudp-security CONFIGURE_ARGS+= --with-dump-honor-nodump +CONFIGURE_ARGS+= --disable-installperms + +INSTALL_MAKE_FLAGS+= SETUID_GROUP=${ROOT_GROUP} .include "../../sysutils/amanda-common/options.mk" diff --git a/sysutils/amanda-plot/Makefile b/sysutils/amanda-plot/Makefile index 68bcc660d81..defe53c1189 100644 --- a/sysutils/amanda-plot/Makefile +++ b/sysutils/amanda-plot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2012/07/30 07:00:12 sbd Exp $ +# $NetBSD: Makefile,v 1.29 2012/07/30 07:04:29 sbd Exp $ # PKGNAME= amanda-plot-${AMANDA_VERSION} @@ -7,7 +7,7 @@ SVR4_PKGNAME= amapl COMMENT= Visualizes the behavior of Amanda, a network backup system -PKG_DESTDIR_SUPPORT= destdir +PKG_DESTDIR_SUPPORT= user-destdir DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot DEPENDS+= amanda-server-${AMANDA_VERSION}{,nb[0-9]*}:../../sysutils/amanda-server diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile index 864cdbe8c31..73e7a6ac904 100644 --- a/sysutils/amanda-server/Makefile +++ b/sysutils/amanda-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2012/07/30 07:00:50 sbd Exp $ +# $NetBSD: Makefile,v 1.52 2012/07/30 07:04:29 sbd Exp $ PKGNAME= amanda-server-${AMANDA_VERSION} PKGREVISION= 2 @@ -6,7 +6,7 @@ SVR4_PKGNAME= amase COMMENT= Server part of Amanda, a network backup system -PKG_DESTDIR_SUPPORT= destdir +PKG_DESTDIR_SUPPORT= user-destdir .include "../../sysutils/amanda-common/Makefile.common" @@ -30,5 +30,9 @@ PLIST_VARS+= scsi PLIST.scsi= yes .endif +SPECIAL_PERMS+= sbin/amcheck ${AM_PROG_PERMS} +SPECIAL_PERMS+= libexec/planner ${AM_PROG_PERMS} +SPECIAL_PERMS+= libexec/dumper ${AM_PROG_PERMS} + .include "../../sysutils/amanda-common/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |