diff options
| author | jlam <jlam@pkgsrc.org> | 2005-12-21 04:17:53 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-12-21 04:17:53 +0000 |
| commit | 35c81ab2cdd4dc34713777d8a1e8b3d20216dc17 (patch) | |
| tree | 0ef0ad88e38cd87d86994cf62eb6fc4a1ccbe893 /net/samba | |
| parent | 183c016e0d992c99895096aff19aa182fa625f1b (diff) | |
| download | pkgsrc-35c81ab2cdd4dc34713777d8a1e8b3d20216dc17.tar.gz | |
Fix PR pkg/32080 by adding a non-conflicting definition for
load_rc_config_var so that platforms with older versions of /etc/rc.subr
can run smbd.sh and winbindd.sh without updating /etc/rc.subr.
Bump PKGREVISION to 3.
Diffstat (limited to 'net/samba')
| -rw-r--r-- | net/samba/Makefile | 4 | ||||
| -rwxr-xr-x | net/samba/files/smbd.sh | 15 | ||||
| -rw-r--r-- | net/samba/files/winbindd.sh | 15 |
3 files changed, 30 insertions, 4 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile index 52ce2512cb9..391cb414b1f 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.153 2005/12/17 05:20:22 jlam Exp $ +# $NetBSD: Makefile,v 1.154 2005/12/21 04:17:53 jlam Exp $ .include "Makefile.mirrors" DISTNAME= samba-3.0.20b PKGNAME= samba-3.0.20.2 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= net MASTER_SITES= ${SAMBA_MIRRORS:=old-versions/} DIST_SUBDIR= ${DISTNAME} diff --git a/net/samba/files/smbd.sh b/net/samba/files/smbd.sh index a253a8292a3..1103bd83ab6 100755 --- a/net/samba/files/smbd.sh +++ b/net/samba/files/smbd.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: smbd.sh,v 1.11 2005/11/14 08:05:27 jlam Exp $ +# $NetBSD: smbd.sh,v 1.12 2005/12/21 04:17:53 jlam Exp $ # # PROVIDE: smbd # REQUIRE: nmbd @@ -16,6 +16,19 @@ extra_commands="reload" command_args="-D" # _must_ start as daemon from rc.d; # add more flags through ${${name}_flags} +# load_rc_config_var() from /etc/rc.subr on the netbsd-3 branch, for +# the benefit of platforms with older versions of /etc/rc.subr. +# +load_rc_config_var() +{ + eval $(eval '( + load_rc_config '$1' >/dev/null; + if [ -n "${'$2'}" -o "${'$2'-UNSET}" != "UNSET" ]; then + echo '$2'=\'\''${'$2'}\'\''; + fi + )' ) +} + load_rc_config $name load_rc_config_var nmbd nmbd run_rc_command "$1" diff --git a/net/samba/files/winbindd.sh b/net/samba/files/winbindd.sh index 91b3f9c649f..61207980a1c 100644 --- a/net/samba/files/winbindd.sh +++ b/net/samba/files/winbindd.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: winbindd.sh,v 1.2 2005/11/14 08:05:27 jlam Exp $ +# $NetBSD: winbindd.sh,v 1.3 2005/12/21 04:17:53 jlam Exp $ # # PROVIDE: winbindd # REQUIRE: nmbd @@ -15,6 +15,19 @@ required_files="@SAMBA_ETCDIR@/smb.conf" extra_commands="reload" command_args="-B" +# load_rc_config_var() from /etc/rc.subr on the netbsd-3 branch, for +# the benefit of platforms with older versions of /etc/rc.subr. +# +load_rc_config_var() +{ + eval $(eval '( + load_rc_config '$1' >/dev/null; + if [ -n "${'$2'}" -o "${'$2'-UNSET}" != "UNSET" ]; then + echo '$2'=\'\''${'$2'}\'\''; + fi + )' ) +} + load_rc_config $name load_rc_config_var nmbd nmbd run_rc_command "$1" |