pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/pkgsrc-2017Q1]: pkgsrc/security Pullup ticket #5381 - requested by sevan



details:   https://anonhg.NetBSD.org/pkgsrc/rev/804dcae902a4
branches:  pkgsrc-2017Q1
changeset: 360344:804dcae902a4
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Mon May 01 09:36:48 2017 +0000

description:
Pullup ticket #5381 - requested by sevan
security/cyrus-sasl: build fix

Revisions pulled up:
- security/cy2-anonymous/Makefile                               1.10
- security/cy2-crammd5/Makefile                                 1.10
- security/cy2-digestmd5/Makefile                               1.20
- security/cy2-gssapi/Makefile                                  1.26
- security/cy2-ldapdb/Makefile                                  1.12
- security/cy2-login/Makefile                                   1.17
- security/cy2-ntlm/Makefile                                    1.28
- security/cy2-otp/Makefile                                     1.21
- security/cy2-plain/Makefile                                   1.10
- security/cy2-scram/Makefile                                   1.8
- security/cy2-sql/Makefile                                     1.34
- security/cyrus-sasl/Makefile                                  1.72
- security/cyrus-sasl/Makefile.common                           1.26
- security/cyrus-saslauthd/Makefile                             1.52

---
   Module Name:    pkgsrc
   Committed By:   jperkin
   Date:           Thu Apr 27 13:56:47 UTC 2017

   Modified Files:
           pkgsrc/security/cy2-anonymous: Makefile
           pkgsrc/security/cy2-crammd5: Makefile
           pkgsrc/security/cy2-digestmd5: Makefile
           pkgsrc/security/cy2-gssapi: Makefile
           pkgsrc/security/cy2-ldapdb: Makefile
           pkgsrc/security/cy2-login: Makefile
           pkgsrc/security/cy2-ntlm: Makefile
           pkgsrc/security/cy2-otp: Makefile
           pkgsrc/security/cy2-plain: Makefile
           pkgsrc/security/cy2-scram: Makefile
           pkgsrc/security/cy2-sql: Makefile
           pkgsrc/security/cyrus-sasl: Makefile Makefile.common
           pkgsrc/security/cyrus-saslauthd: Makefile

   Log Message:
   Fix to use PKG_SYSCONFDIR.  Bump PKGREVISION for all packages using the
   shared Makefile.common.

diffstat:

 security/cy2-anonymous/Makefile     |  3 ++-
 security/cy2-crammd5/Makefile       |  3 ++-
 security/cy2-digestmd5/Makefile     |  4 ++--
 security/cy2-gssapi/Makefile        |  4 ++--
 security/cy2-ldapdb/Makefile        |  4 ++--
 security/cy2-login/Makefile         |  3 ++-
 security/cy2-ntlm/Makefile          |  4 ++--
 security/cy2-otp/Makefile           |  4 ++--
 security/cy2-plain/Makefile         |  3 ++-
 security/cy2-scram/Makefile         |  4 ++--
 security/cy2-sql/Makefile           |  4 ++--
 security/cyrus-sasl/Makefile        |  4 ++--
 security/cyrus-sasl/Makefile.common |  5 ++++-
 security/cyrus-saslauthd/Makefile   |  4 ++--
 14 files changed, 30 insertions(+), 23 deletions(-)

diffs (190 lines):

diff -r ce3d0a180cfd -r 804dcae902a4 security/cy2-anonymous/Makefile
--- a/security/cy2-anonymous/Makefile   Mon May 01 09:34:09 2017 +0000
+++ b/security/cy2-anonymous/Makefile   Mon May 01 09:36:48 2017 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2013/04/06 15:46:38 rodent Exp $
+# $NetBSD: Makefile,v 1.9.32.1 2017/05/01 09:36:48 bsiegert Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-anonymous/}
+PKGREVISION=   1
 COMMENT=       Cyrus SASL ANONYMOUS authentication plugin
 SASL_PLUGIN=   yes
 
diff -r ce3d0a180cfd -r 804dcae902a4 security/cy2-crammd5/Makefile
--- a/security/cy2-crammd5/Makefile     Mon May 01 09:34:09 2017 +0000
+++ b/security/cy2-crammd5/Makefile     Mon May 01 09:36:48 2017 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2013/04/06 15:46:38 rodent Exp $
+# $NetBSD: Makefile,v 1.9.32.1 2017/05/01 09:36:48 bsiegert Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-crammd5/}
+PKGREVISION=   1
 COMMENT=       Cyrus SASL CRAM-MD5 authentication plugin
 SASL_PLUGIN=   yes
 
diff -r ce3d0a180cfd -r 804dcae902a4 security/cy2-digestmd5/Makefile
--- a/security/cy2-digestmd5/Makefile   Mon May 01 09:34:09 2017 +0000
+++ b/security/cy2-digestmd5/Makefile   Mon May 01 09:36:48 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2016/03/05 11:29:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.19.10.1 2017/05/01 09:36:48 bsiegert Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-digestmd5/}
-PKGREVISION=   3
+PKGREVISION=   4
 COMMENT=       Cyrus SASL DIGEST-MD5 authentication plugin
 SASL_PLUGIN=   yes
 
diff -r ce3d0a180cfd -r 804dcae902a4 security/cy2-gssapi/Makefile
--- a/security/cy2-gssapi/Makefile      Mon May 01 09:34:09 2017 +0000
+++ b/security/cy2-gssapi/Makefile      Mon May 01 09:36:48 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2016/12/12 14:22:03 wiz Exp $
+# $NetBSD: Makefile,v 1.25.4.1 2017/05/01 09:36:48 bsiegert Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-gssapi/}
-PKGREVISION=   3
+PKGREVISION=   4
 COMMENT=       Cyrus SASL GSSAPI authentication plugin
 SASL_PLUGIN=   yes
 
diff -r ce3d0a180cfd -r 804dcae902a4 security/cy2-ldapdb/Makefile
--- a/security/cy2-ldapdb/Makefile      Mon May 01 09:34:09 2017 +0000
+++ b/security/cy2-ldapdb/Makefile      Mon May 01 09:36:48 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2016/03/05 11:29:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.11.10.1 2017/05/01 09:36:49 bsiegert Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-ldapdb/}
-PKGREVISION=   3
+PKGREVISION=   4
 COMMENT=       Cyrus SASL LDAPDB authentication plugin
 SASL_PLUGIN=   yes
 
diff -r ce3d0a180cfd -r 804dcae902a4 security/cy2-login/Makefile
--- a/security/cy2-login/Makefile       Mon May 01 09:34:09 2017 +0000
+++ b/security/cy2-login/Makefile       Mon May 01 09:36:48 2017 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2013/04/06 15:46:39 rodent Exp $
+# $NetBSD: Makefile,v 1.16.32.1 2017/05/01 09:36:49 bsiegert Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-login/}
+PKGREVISION=   1
 COMMENT=       Cyrus SASL LOGIN authentication plugin
 SASL_PLUGIN=   yes
 
diff -r ce3d0a180cfd -r 804dcae902a4 security/cy2-ntlm/Makefile
--- a/security/cy2-ntlm/Makefile        Mon May 01 09:34:09 2017 +0000
+++ b/security/cy2-ntlm/Makefile        Mon May 01 09:36:48 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2016/03/05 11:29:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.27.10.1 2017/05/01 09:36:49 bsiegert Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-ntlm/}
-PKGREVISION=   3
+PKGREVISION=   4
 COMMENT=       Cyrus SASL NTLM authentication plugin
 SASL_PLUGIN=   yes
 
diff -r ce3d0a180cfd -r 804dcae902a4 security/cy2-otp/Makefile
--- a/security/cy2-otp/Makefile Mon May 01 09:34:09 2017 +0000
+++ b/security/cy2-otp/Makefile Mon May 01 09:36:48 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2016/03/05 11:29:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.20.10.1 2017/05/01 09:36:49 bsiegert Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-otp/}
-PKGREVISION=   4
+PKGREVISION=   5
 COMMENT=       Cyrus SASL OTP authentication plugin
 SASL_PLUGIN=   yes
 
diff -r ce3d0a180cfd -r 804dcae902a4 security/cy2-plain/Makefile
--- a/security/cy2-plain/Makefile       Mon May 01 09:34:09 2017 +0000
+++ b/security/cy2-plain/Makefile       Mon May 01 09:36:48 2017 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2013/04/06 15:46:39 rodent Exp $
+# $NetBSD: Makefile,v 1.9.32.1 2017/05/01 09:36:49 bsiegert Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-plain/}
+PKGREVISION=   1
 COMMENT=       Cyrus SASL PLAIN authentication plugin
 SASL_PLUGIN=   yes
 
diff -r ce3d0a180cfd -r 804dcae902a4 security/cy2-scram/Makefile
--- a/security/cy2-scram/Makefile       Mon May 01 09:34:09 2017 +0000
+++ b/security/cy2-scram/Makefile       Mon May 01 09:36:48 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2016/03/05 11:29:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.7.10.1 2017/05/01 09:36:49 bsiegert Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-scram/}
-PKGREVISION=   3
+PKGREVISION=   4
 COMMENT=       Cyrus SASL SCRAM authentication plugin
 SASL_PLUGIN=   yes
 
diff -r ce3d0a180cfd -r 804dcae902a4 security/cy2-sql/Makefile
--- a/security/cy2-sql/Makefile Mon May 01 09:34:09 2017 +0000
+++ b/security/cy2-sql/Makefile Mon May 01 09:36:48 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2016/12/04 05:17:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.32.4.1 2017/05/01 09:36:49 bsiegert Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-sql/}
-PKGREVISION=   10
+PKGREVISION=   12
 COMMENT=       Cyrus SASL SQL authentication plugin
 SASL_PLUGIN=   yes
 
diff -r ce3d0a180cfd -r 804dcae902a4 security/cyrus-sasl/Makefile
--- a/security/cyrus-sasl/Makefile      Mon May 01 09:34:09 2017 +0000
+++ b/security/cyrus-sasl/Makefile      Mon May 01 09:36:48 2017 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.71 2016/09/11 06:11:15 richard Exp $
+# $NetBSD: Makefile,v 1.71.6.1 2017/05/01 09:36:49 bsiegert Exp $
 
-PKGREVISION=   5
+PKGREVISION=   6
 COMMENT=       Simple Authentication and Security Layer
 
 .include "Makefile.common"
diff -r ce3d0a180cfd -r 804dcae902a4 security/cyrus-sasl/Makefile.common
--- a/security/cyrus-sasl/Makefile.common       Mon May 01 09:34:09 2017 +0000
+++ b/security/cyrus-sasl/Makefile.common       Mon May 01 09:36:48 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2017/01/19 18:52:23 agc Exp $
+# $NetBSD: Makefile.common,v 1.25.2.1 2017/05/01 09:36:49 bsiegert Exp $
 #
 # used by security/cyrus-sasl/Makefile
 # used by security/cy2-anonymous/Makefile
@@ -33,6 +33,8 @@
 DISTINFO_FILE=         ${.CURDIR}/../cyrus-sasl/distinfo
 PATCHDIR=              ${.CURDIR}/../cyrus-sasl/patches
 
+PKG_SYSCONFSUBDIR=     sasl2
+
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(SASL_PLUGIN) && !empty(SASL_PLUGIN:M[yY][eE][sS])
@@ -51,6 +53,7 @@
 DOCDIR=                        ${PREFIX}/share/doc/cyrus-sasl
 PLUGINDIR=             ${PREFIX}/lib/sasl2
 
+CONFIGURE_ARGS+=       --with-configdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --with-plugindir=${PLUGINDIR:Q}
 CONFIGURE_ARGS+=       --disable-java
 
diff -r ce3d0a180cfd -r 804dcae902a4 security/cyrus-saslauthd/Makefile
--- a/security/cyrus-saslauthd/Makefile Mon May 01 09:34:09 2017 +0000
+++ b/security/cyrus-saslauthd/Makefile Mon May 01 09:36:48 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2016/12/16 15:42:20 hans Exp $
+# $NetBSD: Makefile,v 1.51.4.1 2017/05/01 09:36:49 bsiegert Exp $
 
 PKGNAME=       ${DISTNAME:S/sasl/saslauthd/}
-PKGREVISION=   6
+PKGREVISION=   7
 CONFLICTS+=    cyrus-sasl<2.1.15nb2
 
 .include "../../security/cyrus-sasl/Makefile.common"



Home | Main Index | Thread Index | Old Index