diff options
author | obache <obache@pkgsrc.org> | 2011-01-25 09:07:58 +0000 |
---|---|---|
committer | obache <obache@pkgsrc.org> | 2011-01-25 09:07:58 +0000 |
commit | d2a8e181a1e6e5347f3e3a503f421a9fe3de6876 (patch) | |
tree | d5bdf5658627aff96d2f92f540499a262d9550e3 /security | |
parent | adc5718b6a5e667f97c40df83935d557af741bd1 (diff) | |
download | pkgsrc-d2a8e181a1e6e5347f3e3a503f421a9fe3de6876.tar.gz |
* Note comments to patch files.
* detect recent OpenPAM correctly
* catch getopt(3) with `int' for platforms that char will never be -1.
Bump PKGREVISION.
Diffstat (limited to 'security')
-rw-r--r-- | security/pam-af/Makefile | 3 | ||||
-rw-r--r-- | security/pam-af/distinfo | 7 | ||||
-rw-r--r-- | security/pam-af/patches/patch-aa | 5 | ||||
-rw-r--r-- | security/pam-af/patches/patch-ab | 14 | ||||
-rw-r--r-- | security/pam-af/patches/patch-ac | 15 | ||||
-rw-r--r-- | security/pam-af/patches/patch-ad | 15 | ||||
-rw-r--r-- | security/pam-af/patches/patch-ae | 16 |
7 files changed, 70 insertions, 5 deletions
diff --git a/security/pam-af/Makefile b/security/pam-af/Makefile index f790a9dcac3..f3db60a19f6 100644 --- a/security/pam-af/Makefile +++ b/security/pam-af/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2010/05/17 02:55:18 obache Exp $ +# $NetBSD: Makefile,v 1.4 2011/01/25 09:07:58 obache Exp $ DISTNAME= pam_af-1.0.1 PKGNAME= ${DISTNAME:S/_/-/} +PKGREVISION= 1 CATEGORIES= security MASTER_SITES= http://mbsd.msk.ru/dist/ EXTRACT_SUFX= .tar.bz2 diff --git a/security/pam-af/distinfo b/security/pam-af/distinfo index a5d961c16c6..e4bf2c0cd6b 100644 --- a/security/pam-af/distinfo +++ b/security/pam-af/distinfo @@ -1,7 +1,10 @@ -$NetBSD: distinfo,v 1.3 2008/06/12 02:14:44 joerg Exp $ +$NetBSD: distinfo,v 1.4 2011/01/25 09:07:58 obache Exp $ SHA1 (pam_af-1.0.1.tar.bz2) = f953e50791db0d13f124ce0346f1db43b9d0bafa RMD160 (pam_af-1.0.1.tar.bz2) = 6fd33ef36b810eac58a59cd6ae0eb918548205e3 Size (pam_af-1.0.1.tar.bz2) = 18006 bytes SHA1 (patch-aa) = 121c46c9a00c6973d5d9b5588dadb24e7c9f4289 -SHA1 (patch-ab) = 160c9a9a43506389abaccd7d5aa6c16f96511a46 +SHA1 (patch-ab) = 73ad53728866995e38100a0619cc51518d459363 +SHA1 (patch-ac) = cad89316d267c510c3f4570b037cdbefd2713b0b +SHA1 (patch-ad) = 024b781043f164f1a638a625d1ab37861f3cec15 +SHA1 (patch-ae) = 87efcf6ddc1d8072767d6f7462422f60be7649e4 diff --git a/security/pam-af/patches/patch-aa b/security/pam-af/patches/patch-aa index 337f9085142..b6b56343fe2 100644 --- a/security/pam-af/patches/patch-aa +++ b/security/pam-af/patches/patch-aa @@ -1,4 +1,7 @@ -$NetBSD: patch-aa,v 1.2 2008/06/12 02:14:44 joerg Exp $ +$NetBSD: patch-aa,v 1.3 2011/01/25 09:07:58 obache Exp $ + +* for PKGSRC layout +* treat *BSDs same as FreeBSD. --- Makefile.orig 2006-11-07 00:26:58.000000000 +0000 +++ Makefile diff --git a/security/pam-af/patches/patch-ab b/security/pam-af/patches/patch-ab index 148385d1e8b..5674b4ea348 100644 --- a/security/pam-af/patches/patch-ab +++ b/security/pam-af/patches/patch-ab @@ -1,4 +1,7 @@ -$NetBSD: patch-ab,v 1.1 2008/06/01 08:09:38 obache Exp $ +$NetBSD: patch-ab,v 1.2 2011/01/25 09:07:58 obache Exp $ + +* LOG_AUTHPRIV is not in Solaris, use LOG_AUTH instead. +* Recent OpemPAM define `OPENPAM', not `_OPENPAM'. --- pam_af.c.orig 2006-11-07 00:05:53.000000000 +0000 +++ pam_af.c @@ -12,3 +15,12 @@ $NetBSD: patch-ab,v 1.1 2008/06/01 08:09:38 obache Exp $ #include <assert.h> #include <ndbm.h> +@@ -53,7 +56,7 @@ + + #include <security/pam_appl.h> + #include <security/pam_modules.h> +-#ifdef _OPENPAM ++#if defined(_OPENPAM) || defined(OPENPAM) + # include <security/openpam.h> + # include <security/pam_mod_misc.h> + #endif diff --git a/security/pam-af/patches/patch-ac b/security/pam-af/patches/patch-ac new file mode 100644 index 00000000000..82552cdaa71 --- /dev/null +++ b/security/pam-af/patches/patch-ac @@ -0,0 +1,15 @@ +$NetBSD: patch-ac,v 1.1 2011/01/25 09:07:58 obache Exp $ + +* Recent OpemPAM define `OPENPAM', not `_OPENPAM'. + +--- common/pam_af.h.orig 2005-10-16 15:55:28.000000000 +0000 ++++ common/pam_af.h +@@ -37,7 +37,7 @@ + #define CFGDB "/etc/pam_af.conf" + #define CFGDB_PERM (S_IRUSR | S_IWUSR) + +-#ifdef _OPENPAM ++#if defined(_OPENPAM) || defined(OPENPAM) + # define PAM_AF_LOG(...) \ + PAM_LOG(__VA_ARGS__) + # define PAM_AF_LOGERR(...) \ diff --git a/security/pam-af/patches/patch-ad b/security/pam-af/patches/patch-ad new file mode 100644 index 00000000000..e7dcf4c92a0 --- /dev/null +++ b/security/pam-af/patches/patch-ad @@ -0,0 +1,15 @@ +$NetBSD: patch-ad,v 1.1 2011/01/25 09:07:58 obache Exp $ + +* Recent OpemPAM define `OPENPAM', not `_OPENPAM'. + +--- common/subr.c.orig 2006-11-07 00:22:37.000000000 +0000 ++++ common/subr.c +@@ -66,7 +66,7 @@ + # define LOGERR(...) warnx(__VA_ARGS__) + #else /* !PAM_AF_DEFS */ + # include <security/pam_appl.h> +-# ifdef _OPENPAM ++# if defined(_OPENPAM) || defined(OPENPAM) + # include <security/pam_mod_misc.h> + # include <security/openpam.h> + # endif diff --git a/security/pam-af/patches/patch-ae b/security/pam-af/patches/patch-ae new file mode 100644 index 00000000000..5c4956c4061 --- /dev/null +++ b/security/pam-af/patches/patch-ae @@ -0,0 +1,16 @@ +$NetBSD: patch-ae,v 1.1 2011/01/25 09:07:58 obache Exp $ + +* catch `getopt' with `int' to cath `-1' correctly. + +--- pam_af_tool/pam_af_tool.c.orig 2005-10-15 13:26:37.000000000 +0000 ++++ pam_af_tool/pam_af_tool.c +@@ -199,7 +199,8 @@ handle_ruleadd(argc, argv) + datum key, data; + struct myaddrinfo *res, *res0; + char buf[1024], *tmp; +- char ch, *ep; ++ int ch; ++ char *ep; + int flags = 0, dbflags; + int ret; + |