diff options
| author | christos <christos@pkgsrc.org> | 2005-01-09 06:33:28 +0000 |
|---|---|---|
| committer | christos <christos@pkgsrc.org> | 2005-01-09 06:33:28 +0000 |
| commit | 026f7481f024789b3b7624ac2105270bbdd356e1 (patch) | |
| tree | f12c98b8ef6652a91dfb60fc7c13ad3cc81a8a43 /net | |
| parent | ac4530442a1d612a1f72223a16aed24eb0532080 (diff) | |
| download | pkgsrc-026f7481f024789b3b7624ac2105270bbdd356e1.tar.gz | |
Fix the pam build: lunix defines both the portable
PAM_AUTHTOK_RECOVERY_ERR and the non-portable PAM_AUTHTOK_RECOVER_ERR as 21,
and you guessed which samba decided to use. Bump the version to nb2.
Diffstat (limited to 'net')
| -rw-r--r-- | net/samba/Makefile | 4 | ||||
| -rw-r--r-- | net/samba/distinfo | 3 | ||||
| -rw-r--r-- | net/samba/patches/patch-aa | 35 |
3 files changed, 39 insertions, 3 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile index 38d52778681..76cb24c8752 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.137 2004/12/28 02:47:47 reed Exp $ +# $NetBSD: Makefile,v 1.138 2005/01/09 06:33:28 christos Exp $ DISTNAME= samba-3.0.10 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net MASTER_SITES= ftp://ftp.samba.org/pub/samba/old-versions/ \ ftp://ring.asahi-net.or.jp/pub/net/samba/old-versions/ \ diff --git a/net/samba/distinfo b/net/samba/distinfo index 9f102da0618..89d855766f5 100644 --- a/net/samba/distinfo +++ b/net/samba/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.40 2004/12/17 18:55:47 tron Exp $ +$NetBSD: distinfo,v 1.41 2005/01/09 06:33:28 christos Exp $ SHA1 (samba-3.0.10.tar.gz) = 1cb80bbd9feb7da85aac64bd308a52c662b1cc8a Size (samba-3.0.10.tar.gz) = 15176926 bytes +SHA1 (patch-aa) = 20af8aaf492ee550254a007a05cdec20eb699c27 SHA1 (patch-ab) = c5f352a07774b8e2873c2ac3b3de3ba4cb12bf5e SHA1 (patch-ac) = fc0d15f371a9c3544499f6a6cd830b52b34ff644 SHA1 (patch-ad) = 8a99e5f898eb3c466b07b5bbb9f0c7e28e385ea0 diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa new file mode 100644 index 00000000000..97931c49159 --- /dev/null +++ b/net/samba/patches/patch-aa @@ -0,0 +1,35 @@ +$NetBSD: patch-aa,v 1.29 2005/01/09 06:33:28 christos Exp $ + +--- nsswitch/pam_winbind.c.orig 2004-10-25 17:04:57.000000000 -0400 ++++ nsswitch/pam_winbind.c 2005-01-09 01:17:21.000000000 -0500 +@@ -338,10 +338,10 @@ + item = NULL; + return PAM_SUCCESS; + } else if (on(WINBIND_USE_FIRST_PASS_ARG, ctrl)) { +- return PAM_AUTHTOK_RECOVER_ERR; /* didn't work */ ++ return PAM_AUTHTOK_RECOVERY_ERR; /* didn't work */ + } else if (on(WINBIND_USE_AUTHTOK_ARG, ctrl) + && off(WINBIND__OLD_PASSWORD, ctrl)) { +- return PAM_AUTHTOK_RECOVER_ERR; ++ return PAM_AUTHTOK_RECOVERY_ERR; + } + } + /* +@@ -394,7 +394,7 @@ + if (!resp[i - 1].resp + || strcmp(token, resp[i - 1].resp)) { + _pam_delete(token); /* mistyped */ +- retval = PAM_AUTHTOK_RECOVER_ERR; ++ retval = PAM_AUTHTOK_RECOVERY_ERR; + _make_remark(pamh ,PAM_ERROR_MSG, MISTYPED_PASS); + } + } +@@ -413,7 +413,7 @@ + + } else { + retval = (retval == PAM_SUCCESS) +- ? PAM_AUTHTOK_RECOVER_ERR : retval; ++ ? PAM_AUTHTOK_RECOVERY_ERR : retval; + } + } + |