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

Bug#988434: marked as done ((Future) FTBFS cups-filters with OpenLDAP 2.5)

Your message dated Sun, 16 May 2021 12:33:25 +0000
with message-id <E1liFxV-000G37-CE@fasolo.debian.org>
and subject line Bug#988434: fixed in cups-filters 1.28.8-2
has caused the Debian Bug report #988434,
regarding (Future) FTBFS cups-filters with OpenLDAP 2.5
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
988434: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=988434
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: cups-filters
Version: 1.28.8-1
Tags: patch

Hello,

We are working towards getting the new OpenLDAP version ready (2.5,
which will soon be uploaded to experimental) and noticed that
cups-filters FTBFS with it.  Upstream also noticed it and promptly fixed
the problem.  I took the liberty to grab the patch, apply to the current
version of cups-filters that is in experimental, and now I'm sending you
the debdiff :-).

FWIW, I was planning to create a Merge Request against the project on
salsa, but it looks like the git repository hasn't been updated and
doesn't reflect the current state of the package, so I thought it'd be
better to open this bug.  Let me know if you prefer an MR and I will be
happy to provide it after the repository is updated.

Thanks in advance,

P.S.: The d/changelog entry is not entirely correct because I'm not a
maintainer of the package; feel free to adjust it accordingly.

-- 
Sergio
GPG key ID: 237A 54B1 0287 28BF 00EF  31F4 D0EB 7628 65FC 5E36
Please send encrypted e-mail if possible
https://sergiodj.net/

diff -Nru cups-filters-1.28.8/debian/changelog cups-filters-1.28.8/debian/changelog
--- cups-filters-1.28.8/debian/changelog	2021-03-30 13:18:52.000000000 -0400
+++ cups-filters-1.28.8/debian/changelog	2021-05-12 21:08:23.000000000 -0400
@@ -1,3 +1,11 @@
+cups-filters (1.28.8-2) experimental; urgency=medium
+
+  * d/p/0002-Rename-ldap_connect-due-to-conflict-new-openldap.patch:
+    New patch to rename the "ldap_connect" internal function due to a
+    conflict with the upcoming OpenLDAP 2.5.
+
+ -- Sergio Durigan Junior <sergiodj@debian.org>  Wed, 12 May 2021 21:08:23 -0400
+
 cups-filters (1.28.8-1) experimental; urgency=low
 
   * New 1.28.8 upstream release
diff -Nru cups-filters-1.28.8/debian/patches/0002-Rename-ldap_connect-due-to-conflict-new-openldap.patch cups-filters-1.28.8/debian/patches/0002-Rename-ldap_connect-due-to-conflict-new-openldap.patch
--- cups-filters-1.28.8/debian/patches/0002-Rename-ldap_connect-due-to-conflict-new-openldap.patch	1969-12-31 19:00:00.000000000 -0500
+++ cups-filters-1.28.8/debian/patches/0002-Rename-ldap_connect-due-to-conflict-new-openldap.patch	2021-05-12 21:08:02.000000000 -0400
@@ -0,0 +1,78 @@
+From d8269287647819c96a24a8f345f0f541df45c866 Mon Sep 17 00:00:00 2001
+From: Bhavna2020 <75832214+Bhavna2020@users.noreply.github.com>
+Date: Wed, 12 May 2021 22:32:44 +0530
+Subject: [PATCH] cups-browsed: Renamed ldap_connect() due to conflict in new
+ openldap
+
+Origin: upstream, https://github.com/OpenPrinting/cups-filters/commit/d8269287647819c96a24a8f345f0f541df45c866
+Bug: https://github.com/OpenPrinting/cups-filters/issues/367
+Reviewed-By: Sergio Durigan Junior <sergiodj@debian.org>
+Last-Updated: 2021-05-12
+
+---
+ utils/cups-browsed.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+Index: cups-filters-1.28.8/utils/cups-browsed.c
+===================================================================
+--- cups-filters-1.28.8.orig/utils/cups-browsed.c	2021-05-12 21:04:32.846035015 -0400
++++ cups-filters-1.28.8/utils/cups-browsed.c	2021-05-12 21:06:02.494180831 -0400
+@@ -91,7 +91,7 @@
+ 
+ #ifdef HAVE_LDAP
+ #define LDAP_BROWSE_FILTER "(objectclass=cupsPrinter)"
+-static LDAP *ldap_connect(void);
++static LDAP *ldap_new_connection(void);
+ static LDAP *ldap_reconnect(void);
+ static void ldap_disconnect(LDAP *ld);
+ static int  ldap_search_rec(LDAP *ld, char *base, int scope,
+@@ -4349,11 +4349,11 @@
+ 
+ #ifdef HAVE_LDAP
+ /*
+- * 'ldap_connect()' - Start new LDAP connection
++ * 'ldap_new_connection()' - Start new LDAP connection
+  */
+ 
+ static LDAP *       /* O - LDAP handle */
+-ldap_connect(void)
++ldap_new_connection(void)
+ {
+   int   rc;                       /* LDAP API status */
+   int   version = 3;              /* LDAP version */
+@@ -4373,7 +4373,7 @@
+   */
+ 
+   if (BrowseLDAPCACertFile) {
+-    debug_printf("ldap_connect: Setting CA certificate file \"%s\"\n",
++    debug_printf("ldap_new_connection: Setting CA certificate file \"%s\"\n",
+ 		 BrowseLDAPCACertFile);
+ 
+     if ((rc = ldap_set_option(NULL, LDAP_OPT_X_TLS_CACERTFILE,
+@@ -4434,7 +4434,7 @@
+       ldap_port = LDAP_PORT;
+   }
+ 
+-  debug_printf("ldap_connect: PROT:%s HOST:%s PORT:%d\n",
++  debug_printf("ldap_new_connection: PROT:%s HOST:%s PORT:%d\n",
+ 	       ldap_protocol, ldap_host, ldap_port);
+ 
+  /*
+@@ -4602,7 +4602,7 @@
+ 
+   debug_printf("Try LDAP reconnect...\n");
+ 
+-  TempBrowseLDAPHandle = ldap_connect();
++  TempBrowseLDAPHandle = ldap_new_connection();
+ 
+   if (TempBrowseLDAPHandle != NULL) {
+     if (BrowseLDAPHandle != NULL)
+@@ -11390,7 +11390,7 @@
+        * Open LDAP handle...
+        */
+ 
+-      BrowseLDAPHandle = ldap_connect();
++      BrowseLDAPHandle = ldap_new_connection();
+     }
+ 
+     cupsdUpdateLDAPBrowse();
diff -Nru cups-filters-1.28.8/debian/patches/series cups-filters-1.28.8/debian/patches/series
--- cups-filters-1.28.8/debian/patches/series	2021-03-30 13:18:52.000000000 -0400
+++ cups-filters-1.28.8/debian/patches/series	2021-05-12 21:05:10.000000000 -0400
@@ -1 +1,2 @@
 0001-Force-set-INITDIR-in-configure.ac-instead-of-relying.patch
+0002-Rename-ldap_connect-due-to-conflict-new-openldap.patch

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message --- 
Source: cups-filters
Source-Version: 1.28.8-2
Done: Didier Raboud <odyx@debian.org>

We believe that the bug you reported is fixed in the latest version of
cups-filters, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 988434@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Didier Raboud <odyx@debian.org> (supplier of updated cups-filters package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Sun, 16 May 2021 14:06:54 +0200
Source: cups-filters
Architecture: source
Version: 1.28.8-2
Distribution: experimental
Urgency: low
Maintainer: Debian Printing Team <debian-printing@lists.debian.org>
Changed-By: Didier Raboud <odyx@debian.org>
Closes: 988434
Changes:
 cups-filters (1.28.8-2) experimental; urgency=low
 .
   [ Sergio Durigan Junior ]
   * Backport upstream patch to circumvent conflict with upcoming OpenLDAP 2.5:
     cups-browsed: Renamed ldap_connect() due to conflict in new openldap
     (Closes: #988434)
Checksums-Sha1:
 e9c76809563cd6115a52e1edd187af913225ddca 2930 cups-filters_1.28.8-2.dsc
 77399e45800821f0252896eb8c7b228f9726fa6b 83636 cups-filters_1.28.8-2.debian.tar.xz
Checksums-Sha256:
 632388765d7e3d9eea30fdc63367a80ccc82d064eafcbb2dc996b486c9622578 2930 cups-filters_1.28.8-2.dsc
 245c909eed9dbd1d65a94c9fe418381d86375209ae7d3480aac0501813f3259f 83636 cups-filters_1.28.8-2.debian.tar.xz
Files:
 25796a5c2dea2c163661b0ecb15d0e8f 2930 net optional cups-filters_1.28.8-2.dsc
 f3a6b28b4c34d35db982a13b8a2905ae 83636 net optional cups-filters_1.28.8-2.debian.tar.xz

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEJ3k7rA0YCplkx4gZqcb6xg1jAWkFAmChDSIACgkQqcb6xg1j
AWkx1A//WXi2KTLNLDmwkjVcoejQXhf7N/4jTsaNlx7lvLXPmY4H4ve+JdyAzH6g
rU+tYmqVnXAqXBXJV2iBEYeNyTK8J36hyv20bRQVkIz+THk0k7ma+nzz5jdCntln
DIzjbAH3/NT09ONjTkX8WDOj9Z9djhFTwuqUpXXIfGvzQbhDQ/IgpKu4KrUaTo5R
3g8+Eur4drOSSrLe/4WzpW8Ti+SNCu953yeEYTes9tsY9T104ANVNbTB/coxFNo5
gI+XMHfgpcqv4GZeM3VogloYlQN1wA5MGTm7B2IwncFMnGMkouB/TLKEg/NKZm0a
byp+06AwoxpXrMO+ncpyEmfZaDiC6qQMbyYa3lKc+VNlPN0Wra3Rl4oA6rYCXXT/
U7VaUKEh975fVW4P8yUXkzEJjeMJxc1+b+4EGyArhIBjQY83JFCm2KMCgpolN063
Sw8V77AfPsY6LjQqw0VrQWaKX7kHa4BGaOs0gBluvZ87Tx3xpqvLNhkkzYtXyGJR
rJpQypO+tBjPs9AXnlk4Fv0dpZ17Pyn/fMoFaeSBeTsmfVzPvPNDnINa3YzbkhQg
7UlZRVV43Tl8oGdc1GDLuWH5HnQZ8YJxkGt3mZAeh0w/bkzumg2A2RbrLIs/2FCG
Pp5n/XzYBMbdKeCwT1IFYr1UGRR+qTXzB+8i66CyZO9JWzprmlo=
=6b5z
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: