Control: tags 1066357 + patch Control: tags 1066357 + pending Dear maintainer,
I've prepared an NMU for ldapvi (versioned as 1.7-11) and uploaded it to DELAYED/0. Please feel free to tell me if I should delay it longer. Regards. diff -Nru ldapvi-1.7/debian/changelog ldapvi-1.7/debian/changelog --- ldapvi-1.7/debian/changelog 2016-01-12 16:14:50.000000000 -0500 +++ ldapvi-1.7/debian/changelog 2024-04-26 11:15:30.000000000 -0400 @@ -1,3 +1,13 @@ +ldapvi (1.7-11) unstable; urgency=medium + + * Non-maintainer upload. + * debian/control: Avoid using transitional package names. + * debian/control: Add missing dependency sensible-utils (lintian). + * debian/patches/07,08: Add patch to fix FTBFS caused by + Werror=implicit-function-declaration. (Closes: #1066357) + + -- Boyuan Yang <by...@debian.org> Fri, 26 Apr 2024 11:15:30 -0400 + ldapvi (1.7-10) unstable; urgency=medium * Update my name/email address. diff -Nru ldapvi-1.7/debian/control ldapvi-1.7/debian/control --- ldapvi-1.7/debian/control 2016-01-12 10:36:14.000000000 -0500 +++ ldapvi-1.7/debian/control 2024-04-26 11:15:15.000000000 -0400 @@ -2,13 +2,13 @@ Section: text Priority: optional Maintainer: Rhonda D'Vine <rho...@debian.org> -Build-Depends: debhelper (>= 9~), libldap2-dev, libglib2.0-dev, libpopt- dev, libncurses5-dev, libsasl2-dev, libreadline-dev, xsltproc +Build-Depends: debhelper (>= 9~), libldap-dev, libglib2.0-dev, libpopt- dev, libncurses-dev, libsasl2-dev, libreadline-dev, xsltproc Standards-Version: 3.9.6 Homepage: http://www.lichteblau.com/ldapvi/ Package: ldapvi Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, sensible-utils Description: perform an LDAP search and update results using a text editor From a first glance ldapvi looks like ldapsearch: You search for entries in the ldap database. But the results get opened in your preferred editor, and diff -Nru ldapvi-1.7/debian/patches/07_diff.c-Use-public-interface- ldap_bv2dn-instead-of-ld.patch ldapvi-1.7/debian/patches/07_diff.c-Use- public-interface-ldap_bv2dn-instead-of-ld.patch --- ldapvi-1.7/debian/patches/07_diff.c-Use-public-interface-ldap_bv2dn- instead-of-ld.patch 1969-12-31 19:00:00.000000000 -0500 +++ ldapvi-1.7/debian/patches/07_diff.c-Use-public-interface-ldap_bv2dn- instead-of-ld.patch 2024-04-26 11:13:02.000000000 -0400 @@ -0,0 +1,28 @@ +From: Boyuan Yang <by...@debian.org> +Date: Fri, 26 Apr 2024 10:41:33 -0400 +Subject: diff.c: Use public interface ldap_bv2dn instead of ldap_bv2dn_x + +The current openldap ldap_bv2dn_x() function is a private implementation. +The public interface ldap_bv2dn() share almost the same function parameters +except for the context. As a result, it is safe to use the public interface +as a replacement. This solves the FTBFS caused by +-Werror=implicit-function-declaration. + +Bug-Debian: https://bugs.debian.org/1066357 +--- + diff.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/diff.c b/diff.c +index bb000fc..4596662 100644 +--- a/diff.c ++++ b/diff.c +@@ -215,7 +215,7 @@ safe_str2dn(char *str, LDAPDN *out, int flags) + struct berval bv; + bv.bv_val = str; + bv.bv_len = strlen(str); +- ldap_bv2dn_x(&bv, out, flags); ++ ldap_bv2dn(&bv, out, flags); + } + #else + #error oops diff -Nru ldapvi-1.7/debian/patches/08_ftbfs-implicit-function- declaration.patch ldapvi-1.7/debian/patches/08_ftbfs-implicit-function- declaration.patch --- ldapvi-1.7/debian/patches/08_ftbfs-implicit-function- declaration.patch 1969-12-31 19:00:00.000000000 -0500 +++ ldapvi-1.7/debian/patches/08_ftbfs-implicit-function- declaration.patch 2024-04-26 11:15:30.000000000 -0400 @@ -0,0 +1,70 @@ +From: Boyuan Yang <by...@debian.org> +Date: Fri, 26 Apr 2024 10:51:32 -0400 +Subject: Fix ftbfs implicit function declaration + +Also include common.h for error.c for definition of error.c. Needed +for deprecated LDAP function of ldap_perror. + +Bug-Debian: https://bugs.debian.org/1066357 +--- + common.h | 1 + + error.c | 3 +++ + parse.c | 3 +++ + parseldif.c | 2 ++ + 4 files changed, 9 insertions(+) + +diff --git a/common.h b/common.h +index f731e62..714b112 100644 +--- a/common.h ++++ b/common.h +@@ -282,6 +282,7 @@ int adjoin_str(GPtrArray *, char *); + int adjoin_ptr(GPtrArray *, void *); + void init_dialog(tdialog *, enum dialog_mode, char *, char *); + void dialog(char *header, tdialog *, int, int); ++void fdcp(int fdsrc, int fddst); + + /* + * schema.c +diff --git a/error.c b/error.c +index 5924868..345a2bf 100644 +--- a/error.c ++++ b/error.c +@@ -14,6 +14,9 @@ + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ ++ ++#include "common.h" ++ + #include <dirent.h> + #include <errno.h> + #include <fcntl.h> +diff --git a/parse.c b/parse.c +index e171f53..0c6b0ec 100644 +--- a/parse.c ++++ b/parse.c +@@ -16,7 +16,10 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #define _XOPEN_SOURCE ++#define _POSIX_C_SOURCE (200809L) + #include <unistd.h> ++#include <crypt.h> ++#include <stdio.h> + #include "common.h" + + #define fast_g_string_append_c(gstring, c) \ +diff --git a/parseldif.c b/parseldif.c +index 5fb2628..147b095 100644 +--- a/parseldif.c ++++ b/parseldif.c +@@ -16,7 +16,9 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #define _XOPEN_SOURCE ++#define _POSIX_C_SOURCE (200809L) + #include <unistd.h> ++#include <stdio.h> + #include "common.h" + + #define fast_g_string_append_c(gstring, c) \ diff -Nru ldapvi-1.7/debian/patches/series ldapvi- 1.7/debian/patches/series --- ldapvi-1.7/debian/patches/series 2015-06-02 05:12:20.000000000 - 0400 +++ ldapvi-1.7/debian/patches/series 2024-04-26 11:15:30.000000000 - 0400 @@ -4,3 +4,5 @@ 04_manpage-hyphen 05_getline-conflict 06_fix-vim-modeline +07_diff.c-Use-public-interface-ldap_bv2dn-instead-of-ld.patch +08_ftbfs-implicit-function-declaration.patch
signature.asc
Description: This is a digitally signed message part
