CVS commit: pkgsrc/databases/kldap

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Thu Sep 29 00:26:01 UTC 2022

Modified Files:
        pkgsrc/databases/kldap: Makefile PLIST distinfo
        pkgsrc/databases/kldap/patches: patch-autotests_testkldap.cpp
            patch-src_ber.cpp

Log Message:
kldap: update to 22.08.1

16 months of development


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/databases/kldap/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/kldap/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/kldap/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/databases/kldap/patches/patch-autotests_testkldap.cpp
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/kldap/patches/patch-src_ber.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/kldap/Makefile
diff -u pkgsrc/databases/kldap/Makefile:1.25 pkgsrc/databases/kldap/Makefile:1.26
--- pkgsrc/databases/kldap/Makefile:1.25        Sun Sep 11 12:51:26 2022
+++ pkgsrc/databases/kldap/Makefile     Thu Sep 29 00:26:00 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2022/09/11 12:51:26 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2022/09/29 00:26:00 markd Exp $
 
 DISTNAME=      kldap-${KAPPSVER}
-PKGREVISION=   9
 CATEGORIES=    databases
 
 HOMEPAGE=      https://community.kde.org/KDE_PIM
@@ -17,6 +16,7 @@ USE_TOOLS+=   msgmerge
 .include "../../databases/openldap-client/buildlink3.mk"
 .include "../../devel/kio/buildlink3.mk"
 .include "../../security/cyrus-sasl/buildlink3.mk"
+.include "../../security/qt5-qtkeychain/buildlink3.mk"
 .include "../../textproc/kcompletion/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/kldap/PLIST
diff -u pkgsrc/databases/kldap/PLIST:1.4 pkgsrc/databases/kldap/PLIST:1.5
--- pkgsrc/databases/kldap/PLIST:1.4    Wed Apr  7 12:28:15 2021
+++ pkgsrc/databases/kldap/PLIST        Thu Sep 29 00:26:00 2022
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2021/04/07 12:28:15 markd Exp $
+@comment $NetBSD: PLIST,v 1.5 2022/09/29 00:26:00 markd Exp $
 include/KF5/KLDAP/KLDAP/AddHostDialog
 include/KF5/KLDAP/KLDAP/Ber
 include/KF5/KLDAP/KLDAP/LdapClient
 include/KF5/KLDAP/KLDAP/LdapClientSearch
 include/KF5/KLDAP/KLDAP/LdapClientSearchConfig
+include/KF5/KLDAP/KLDAP/LdapClientSearchConfigReadConfigJob
+include/KF5/KLDAP/KLDAP/LdapClientSearchConfigWriteConfigJob
 include/KF5/KLDAP/KLDAP/LdapConfigWidget
 include/KF5/KLDAP/KLDAP/LdapConfigureWidget
 include/KF5/KLDAP/KLDAP/LdapConnection
@@ -13,6 +15,7 @@ include/KF5/KLDAP/KLDAP/LdapDefs
 include/KF5/KLDAP/KLDAP/LdapObject
 include/KF5/KLDAP/KLDAP/LdapOperation
 include/KF5/KLDAP/KLDAP/LdapSearch
+include/KF5/KLDAP/KLDAP/LdapSearchClientReadConfigServerJob
 include/KF5/KLDAP/KLDAP/LdapServer
 include/KF5/KLDAP/KLDAP/LdapUrl
 include/KF5/KLDAP/KLDAP/Ldif
@@ -22,6 +25,8 @@ include/KF5/KLDAP/kldap/kldap_export.h
 include/KF5/KLDAP/kldap/ldapclient.h
 include/KF5/KLDAP/kldap/ldapclientsearch.h
 include/KF5/KLDAP/kldap/ldapclientsearchconfig.h
+include/KF5/KLDAP/kldap/ldapclientsearchconfigreadconfigjob.h
+include/KF5/KLDAP/kldap/ldapclientsearchconfigwriteconfigjob.h
 include/KF5/KLDAP/kldap/ldapconfigurewidget.h
 include/KF5/KLDAP/kldap/ldapconfigwidget.h
 include/KF5/KLDAP/kldap/ldapconnection.h
@@ -31,56 +36,28 @@ include/KF5/KLDAP/kldap/ldapdn.h
 include/KF5/KLDAP/kldap/ldapobject.h
 include/KF5/KLDAP/kldap/ldapoperation.h
 include/KF5/KLDAP/kldap/ldapsearch.h
+include/KF5/KLDAP/kldap/ldapsearchclientreadconfigserverjob.h
 include/KF5/KLDAP/kldap/ldapserver.h
 include/KF5/KLDAP/kldap/ldapurl.h
 include/KF5/KLDAP/kldap/ldif.h
-include/KF5/kldap_version.h
+include/KF5/KLDAP/kldap_version.h
 lib/cmake/KF5Ldap/KF5LdapConfig.cmake
 lib/cmake/KF5Ldap/KF5LdapConfigVersion.cmake
 lib/cmake/KF5Ldap/KF5LdapTargets-noconfig.cmake
 lib/cmake/KF5Ldap/KF5LdapTargets.cmake
 lib/libKF5Ldap.so
 lib/libKF5Ldap.so.5
-lib/libKF5Ldap.so.5.16.3
+lib/libKF5Ldap.so.5.21.1
 qt5/mkspecs/modules/qt_Ldap.pri
 qt5/plugins/kf5/kio/ldap.so
-share/doc/HTML/ca/kioslave5/ldap/index.cache.bz2
-share/doc/HTML/ca/kioslave5/ldap/index.docbook
-share/doc/HTML/de/kioslave5/ldap/index.cache.bz2
-share/doc/HTML/de/kioslave5/ldap/index.docbook
 share/doc/HTML/en/kioslave5/ldap/index.cache.bz2
 share/doc/HTML/en/kioslave5/ldap/index.docbook
-share/doc/HTML/es/kioslave5/ldap/index.cache.bz2
-share/doc/HTML/es/kioslave5/ldap/index.docbook
-share/doc/HTML/et/kioslave5/ldap/index.cache.bz2
-share/doc/HTML/et/kioslave5/ldap/index.docbook
-share/doc/HTML/fr/kioslave5/ldap/index.cache.bz2
-share/doc/HTML/fr/kioslave5/ldap/index.docbook
-share/doc/HTML/gl/kioslave5/ldap/index.cache.bz2
-share/doc/HTML/gl/kioslave5/ldap/index.docbook
-share/doc/HTML/it/kioslave5/ldap/index.cache.bz2
-share/doc/HTML/it/kioslave5/ldap/index.docbook
-share/doc/HTML/ko/kioslave5/ldap/index.cache.bz2
-share/doc/HTML/ko/kioslave5/ldap/index.docbook
-share/doc/HTML/nl/kioslave5/ldap/index.cache.bz2
-share/doc/HTML/nl/kioslave5/ldap/index.docbook
-share/doc/HTML/pt/kioslave5/ldap/index.cache.bz2
-share/doc/HTML/pt/kioslave5/ldap/index.docbook
-share/doc/HTML/pt_BR/kioslave5/ldap/index.cache.bz2
-share/doc/HTML/pt_BR/kioslave5/ldap/index.docbook
-share/doc/HTML/ru/kioslave5/ldap/index.cache.bz2
-share/doc/HTML/ru/kioslave5/ldap/index.docbook
-share/doc/HTML/sr/kioslave5/ldap/index.cache.bz2
-share/doc/HTML/sr/kioslave5/ldap/index.docbook
-share/doc/HTML/sv/kioslave5/ldap/index.cache.bz2
-share/doc/HTML/sv/kioslave5/ldap/index.docbook
-share/doc/HTML/uk/kioslave5/ldap/index.cache.bz2
-share/doc/HTML/uk/kioslave5/ldap/index.docbook
-share/kservices5/ldap.protocol
-share/kservices5/ldaps.protocol
 share/locale/ar/LC_MESSAGES/kio_ldap.mo
 share/locale/ar/LC_MESSAGES/libkldap5.mo
+share/locale/be/LC_MESSAGES/kio_ldap.mo
+share/locale/be/LC_MESSAGES/libkldap5.mo
 share/locale/bg/LC_MESSAGES/kio_ldap.mo
+share/locale/bg/LC_MESSAGES/libkldap5.mo
 share/locale/bs/LC_MESSAGES/kio_ldap.mo
 share/locale/bs/LC_MESSAGES/libkldap5.mo
 share/locale/ca/LC_MESSAGES/kio_ldap.mo
@@ -157,20 +134,25 @@ share/locale/ro/LC_MESSAGES/kio_ldap.mo
 share/locale/ro/LC_MESSAGES/libkldap5.mo
 share/locale/ru/LC_MESSAGES/kio_ldap.mo
 share/locale/ru/LC_MESSAGES/libkldap5.mo
+share/locale/se/LC_MESSAGES/kio_ldap.mo
+share/locale/se/LC_MESSAGES/libkldap5.mo
 share/locale/sk/LC_MESSAGES/kio_ldap.mo
 share/locale/sk/LC_MESSAGES/libkldap5.mo
 share/locale/sl/LC_MESSAGES/kio_ldap.mo
 share/locale/sl/LC_MESSAGES/libkldap5.mo
+share/locale/sq/LC_MESSAGES/libkldap5.mo
 share/locale/sr/LC_MESSAGES/kio_ldap.mo
 share/locale/sr/LC_MESSAGES/libkldap5.mo
 share/locale/sv/LC_MESSAGES/kio_ldap.mo
 share/locale/sv/LC_MESSAGES/libkldap5.mo
+share/locale/ta/LC_MESSAGES/kio_ldap.mo
 share/locale/tr/LC_MESSAGES/kio_ldap.mo
 share/locale/tr/LC_MESSAGES/libkldap5.mo
 share/locale/ug/LC_MESSAGES/kio_ldap.mo
 share/locale/ug/LC_MESSAGES/libkldap5.mo
 share/locale/uk/LC_MESSAGES/kio_ldap.mo
 share/locale/uk/LC_MESSAGES/libkldap5.mo
+share/locale/vi/LC_MESSAGES/kio_ldap.mo
 share/locale/zh_CN/LC_MESSAGES/kio_ldap.mo
 share/locale/zh_CN/LC_MESSAGES/libkldap5.mo
 share/locale/zh_TW/LC_MESSAGES/kio_ldap.mo

Index: pkgsrc/databases/kldap/distinfo
diff -u pkgsrc/databases/kldap/distinfo:1.7 pkgsrc/databases/kldap/distinfo:1.8
--- pkgsrc/databases/kldap/distinfo:1.7 Tue Oct 26 10:09:21 2021
+++ pkgsrc/databases/kldap/distinfo     Thu Sep 29 00:26:00 2022
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:09:21 nia Exp $
+$NetBSD: distinfo,v 1.8 2022/09/29 00:26:00 markd Exp $
 
-BLAKE2s (kldap-20.12.3.tar.xz) = 2b022a3fc2ace95aff4366058ca6defa33129eec5fad03ceed9101256d975e2c
-SHA512 (kldap-20.12.3.tar.xz) = d1220afdd157de224fd65306f1b77f80c1adbe195307bea51c6de5234e9a94122b2c24d38e050ad5dd1a9597b5f7f0f65ea5de73a38c4a309d5692691ed09d54
-Size (kldap-20.12.3.tar.xz) = 164652 bytes
-SHA1 (patch-autotests_testkldap.cpp) = 7994aba5bc9e45fd2ec1ebd3bf2e918fb912e560
-SHA1 (patch-src_ber.cpp) = 66f9a33a6dd9680f582dd8e9662c2dd3e0bf9e71
+BLAKE2s (kldap-22.08.1.tar.xz) = 159bd5cf2ea8c9a88717421fc6cde724000d5a046317657dc3c2a03d7430dbd1
+SHA512 (kldap-22.08.1.tar.xz) = c0725d2481475f7bc95bdae7c8dd01ae3de7e8a0c7b459df7390533e393d0bab768e68f4b159e2343711c0dd2c659980c860c6eae113d1cb65857eadef7fbe23
+Size (kldap-22.08.1.tar.xz) = 173056 bytes
+SHA1 (patch-autotests_testkldap.cpp) = 47d427e93c6606a8eaa294a31bb8b6024878ac56
+SHA1 (patch-src_ber.cpp) = 19a9bb9f037c89692f1bf0d5aef653f7ec67437b
 SHA1 (patch-src_ber.h) = 022a1c3ca4f77c4cc2ecfcc09d6153179a0d7977
 SHA1 (patch-src_ldapcontrol.cpp) = e0cfe8f2c7b1f4f68d77ac1e4bd1bb33e017b43c

Index: pkgsrc/databases/kldap/patches/patch-autotests_testkldap.cpp
diff -u pkgsrc/databases/kldap/patches/patch-autotests_testkldap.cpp:1.1 pkgsrc/databases/kldap/patches/patch-autotests_testkldap.cpp:1.2
--- pkgsrc/databases/kldap/patches/patch-autotests_testkldap.cpp:1.1    Tue Feb 18 16:49:13 2020
+++ pkgsrc/databases/kldap/patches/patch-autotests_testkldap.cpp        Thu Sep 29 00:26:00 2022
@@ -1,8 +1,8 @@
-$NetBSD: patch-autotests_testkldap.cpp,v 1.1 2020/02/18 16:49:13 joerg Exp $
+$NetBSD: patch-autotests_testkldap.cpp,v 1.2 2022/09/29 00:26:00 markd Exp $
 
---- autotests/testkldap.cpp.orig       2020-01-14 16:28:11.689663234 +0000
+--- autotests/testkldap.cpp.orig       2022-08-05 11:31:27.000000000 +0000
 +++ autotests/testkldap.cpp
-@@ -89,37 +89,37 @@ void KLdapTest::testBer()
+@@ -84,37 +84,37 @@ void KLdapTest::testBer()
  
      ainteger = 23543;
  
@@ -21,13 +21,13 @@ $NetBSD: patch-autotests_testkldap.cpp,v
 +    ber6.printf("{V}", &alist2);
 +    ber7.printf("oi{v}O", &aoctetString1, ainteger, &alist2, &aoctetString2);
  
-     //test integer:
+     // test integer:
      bber = ber1;
 -    bber.scanf(QStringLiteral("i"), &binteger);
 +    bber.scanf("i", &binteger);
      QCOMPARE(ainteger, binteger);
  
-     //test octet strings:
+     // test octet strings:
      bber = ber2;
 -    bber.scanf(QStringLiteral("o"), &boctetString1);
 +    bber.scanf("o", &boctetString1);
@@ -41,7 +41,7 @@ $NetBSD: patch-autotests_testkldap.cpp,v
 +    bber.scanf("o", &boctetString3);
      QCOMPARE(aoctetString3, boctetString3);
  
-     //test sequence of octet strings:
+     // test sequence of octet strings:
      bber = ber5;
 -    bber.scanf(QStringLiteral("v"), &blist1);
 +    bber.scanf("v", &blist1);
@@ -52,8 +52,8 @@ $NetBSD: patch-autotests_testkldap.cpp,v
 +    bber.scanf("v", &blist2);
      QCOMPARE(alist2, blist2);
  
-     //complex tests
-@@ -129,7 +129,7 @@ void KLdapTest::testBer()
+     // complex tests
+@@ -124,7 +124,7 @@ void KLdapTest::testBer()
      blist2.clear();
  
      bber = ber7;

Index: pkgsrc/databases/kldap/patches/patch-src_ber.cpp
diff -u pkgsrc/databases/kldap/patches/patch-src_ber.cpp:1.2 pkgsrc/databases/kldap/patches/patch-src_ber.cpp:1.3
--- pkgsrc/databases/kldap/patches/patch-src_ber.cpp:1.2        Wed Apr  7 12:28:15 2021
+++ pkgsrc/databases/kldap/patches/patch-src_ber.cpp    Thu Sep 29 00:26:00 2022
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_ber.cpp,v 1.2 2021/04/07 12:28:15 markd Exp $
+$NetBSD: patch-src_ber.cpp,v 1.3 2022/09/29 00:26:00 markd Exp $
 
---- src/core/ber.cpp.orig      2020-01-14 16:17:11.814803692 +0000
+--- src/core/ber.cpp.orig      2022-08-05 11:31:27.000000000 +0000
 +++ src/core/ber.cpp
-@@ -124,7 +124,7 @@ QByteArray Ber::flatten() const
+@@ -110,7 +110,7 @@ QByteArray Ber::flatten() const
      return ret;
  }
  
@@ -11,10 +11,10 @@ $NetBSD: patch-src_ber.cpp,v 1.2 2021/04
  {
      char fmt[2];
      va_list args;
-@@ -132,8 +132,8 @@ int Ber::printf(QString format, ...)
-     fmt[1] = '\0';
+@@ -119,8 +119,8 @@ int Ber::printf(QString format, ...)
  
-     int i = 0, ret = 0;
+     int i = 0;
+     int ret = 0;
 -    while (i < format.length()) {
 -        fmt[0] = format[i].toLatin1();
 +    while (format[i]) {
@@ -22,7 +22,7 @@ $NetBSD: patch-src_ber.cpp,v 1.2 2021/04
          i++;
          switch (fmt[0]) {
          case 'b':
-@@ -229,7 +229,7 @@ int Ber::printf(QString format, ...)
+@@ -206,7 +206,7 @@ int Ber::printf(QString format, ...)
      return ret;
  }
  
@@ -31,10 +31,10 @@ $NetBSD: patch-src_ber.cpp,v 1.2 2021/04
  {
      char fmt[2];
      va_list args;
-@@ -237,8 +237,8 @@ int Ber::scanf(QString format, ...)
-     fmt[1] = '\0';
+@@ -215,8 +215,8 @@ int Ber::scanf(QString format, ...)
  
-     int i = 0, ret = 0;
+     int i = 0;
+     int ret = 0;
 -    while (i < format.length()) {
 -        fmt[0] = format[i].toLatin1();
 +    while (format[i]) {