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 <sergi...@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+bhavna2...@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 <sergi...@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
signature.asc
Description: PGP signature
