[packages/ldapvi] Rel 16; fix build
arekm
arekm at pld-linux.org
Wed Dec 3 20:01:38 CET 2025
commit 0d1ab4f335cd995aa3bc89c3c01168d4c99aa9e8
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Dec 3 20:01:30 2025 +0100
Rel 16; fix build
build.patch | 21 ++
ldapvi-debian.patch | 522 ++++++++++++++++++++++++++++++++++++++++++++++++
ldapvi-vim-syntax.patch | 18 --
ldapvi.spec | 9 +-
4 files changed, 548 insertions(+), 22 deletions(-)
---
diff --git a/ldapvi.spec b/ldapvi.spec
index 777b3a8..28b5d4c 100644
--- a/ldapvi.spec
+++ b/ldapvi.spec
@@ -2,13 +2,13 @@ Summary: LDAP LDIF Editor
Summary(pl.UTF-8): Edytor LDAP LDIF
Name: ldapvi
Version: 1.7
-Release: 15
+Release: 16
License: GPL v2
Group: Networking/Utilities
Source0: http://www.lichteblau.com/download/%{name}-%{version}.tar.gz
# Source0-md5: 6dc2f5441ac5f1e2b5b036e3521012cc
-Patch0: %{name}-getline.patch
-Patch1: %{name}-vim-syntax.patch
+Patch0: %{name}-debian.patch
+Patch1: build.patch
URL: http://www.lichteblau.com/ldapvi/
BuildRequires: autoconf
BuildRequires: automake
@@ -34,13 +34,14 @@ z powrotem w LDAP-ie.
%setup -q
%patch -P0 -p1
%patch -P1 -p1
+
sed -i -e 's#curses ncurses#tinfo curses ncurses#g' configure.in
%build
%{__aclocal}
%{__autoconf}
%configure \
- CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
+ CFLAGS="-DLDAP_DEPRECATED=1 %{rpmcflags} -I/usr/include/ncurses"
%{__make}
%install
diff --git a/build.patch b/build.patch
new file mode 100644
index 0000000..f61ce3b
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,21 @@
+--- ldapvi-1.7/ldapvi.c~ 2025-12-03 19:48:51.000000000 +0100
++++ ldapvi-1.7/ldapvi.c 2025-12-03 19:50:26.260986848 +0100
+@@ -1233,7 +1233,7 @@ write_config(LDAP *ld, FILE *f, cmdline
+ f);
+ for (i = 0; i < basedns->len; i++) {
+ if (basedns->len > 1) fputc('#', f);
+- fprintf(f, "BASE %s\n", g_ptr_array_index(basedns, i));
++ fprintf(f, "BASE %s\n", (gchar *)g_ptr_array_index(basedns, i));
+ }
+ } else {
+ if (!cmdline->discover)
+--- ldapvi-1.7/port.c~ 2025-12-03 19:54:45.000000000 +0100
++++ ldapvi-1.7/port.c 2025-12-03 20:00:20.277048682 +0100
+@@ -35,6 +35,7 @@
+ #if defined(HAVE_OPENSSL)
+ #include <openssl/sha.h>
+ #include <openssl/md5.h>
++#include <openssl/rand.h>
+ #elif defined(HAVE_GNUTLS)
+ #include <gnutls/gnutls.h>
+ #include <gnutls/openssl.h>
diff --git a/ldapvi-debian.patch b/ldapvi-debian.patch
new file mode 100644
index 0000000..74cfa26
--- /dev/null
+++ b/ldapvi-debian.patch
@@ -0,0 +1,522 @@
+Description: disable libcrypto due to bug/licensing isssues
+Author: David Lichteblau <david at lichteblau.com>
+
+Index: ldapvi-1.7/config.h.in
+===================================================================
+--- ldapvi-1.7.orig/config.h.in
++++ ldapvi-1.7/config.h.in
+@@ -5,5 +5,6 @@
+ #undef HAVE_OPENSSL
+ #undef HAVE_GNUTLS
+ #undef HAVE_SHA1
++#undef HAVE_MD5
+ #undef RAND_PSEUDO_BYTES
+ #undef HAVE_SASL
+Index: ldapvi-1.7/configure
+===================================================================
+--- ldapvi-1.7.orig/configure
++++ ldapvi-1.7/configure
+@@ -4836,6 +4836,8 @@ _ACEOF
+ _ACEOF
+
+ ;;
++ none)
++ ;;
+ *)
+ { { echo "$as_me:$LINENO: error: invalid value --with-libcrypto=$with_libcrypto, expected openssl or gnutls" >&5
+ echo "$as_me: error: invalid value --with-libcrypto=$with_libcrypto, expected openssl or gnutls" >&2;}
+@@ -4937,6 +4939,100 @@ fi
+ done
+
+
++for ac_func in MD5
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++ For example, HP-UX 11i <limits.h> declares gettimeofday. */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++ which can conflict with char $ac_func (); below.
++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ <limits.h> exists even on freestanding compilers. */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++ to always fail with ENOSYS. Some functions are actually named
++ something starting with __ and the normal name is an alias. */
++#if defined __stub_$ac_func || defined __stub___$ac_func
++choke me
++#endif
++
++int
++main ()
++{
++return $ac_func ();
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ eval "$as_ac_var=yes"
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ eval "$as_ac_var=no"
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++fi
++ac_res=`eval echo '${'$as_ac_var'}'`
++ { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++ cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++done
++
++
+ for ac_func in RAND_pseudo_bytes
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+Index: ldapvi-1.7/configure.in
+===================================================================
+--- ldapvi-1.7.orig/configure.in
++++ ldapvi-1.7/configure.in
+@@ -73,11 +73,14 @@ case $with_libcrypto in
+ AC_DEFINE(HAVE_GNUTLS)
+ AC_DEFINE(SHA_DIGEST_LENGTH,20)
+ ;;
++ none)
++ ;;
+ *)
+ AC_MSG_ERROR([invalid value --with-libcrypto=$with_libcrypto, expected openssl or gnutls])
+ ;;
+ esac
+ AC_CHECK_FUNCS([SHA1])
++AC_CHECK_FUNCS([MD5])
+ AC_CHECK_FUNCS([RAND_pseudo_bytes])
+
+ AC_CHECK_LIB([crypt],[main])
+Index: ldapvi-1.7/port.c
+===================================================================
+--- ldapvi-1.7.orig/port.c
++++ ldapvi-1.7/port.c
+@@ -39,7 +39,7 @@
+ #include <gnutls/gnutls.h>
+ #include <gnutls/openssl.h>
+ #else
+-#error oops
++#warning Compiling without cryptographic routines.
+ #endif
+
+ #ifndef HAVE_RAND_PSEUDO_BYTES
+@@ -148,15 +148,21 @@ g_string_append_ssha(GString *string, ch
+ int
+ g_string_append_md5(GString *string, char *key)
+ {
++#ifdef HAVE_MD5
+ unsigned char tmp[MD5_DIGEST_LENGTH];
+ MD5((unsigned char *) key, strlen(key), tmp);
+ g_string_append_base64(string, tmp, sizeof(tmp));
+ return 1;
++#else
++ puts("Sorry, MD5 support not linked into ldapvi.");
++ return 0;
++#endif
+ }
+
+ int
+ g_string_append_smd5(GString *string, char *key)
+ {
++#ifdef HAVE_MD5
+ unsigned char rand[4];
+ unsigned char tmp[MD5_DIGEST_LENGTH + sizeof(rand)];
+ MD5_CTX MD5context;
+@@ -172,4 +178,8 @@ g_string_append_smd5(GString *string, ch
+ g_string_append_base64(string, tmp, sizeof(tmp));
+
+ return 1;
++#else
++ puts("Sorry, SMD5 support not linked into ldapvi.");
++ return 0;
++#endif
+ }
+Description: use sensible-{editor,pager} instead of vi and less
+Forwarded: not-needed
+Bug-Debian: http://bugs.debian.org/367995
+Author: Rhonda D'Vine <rhonda at debian.org>
+
+Index: ldapvi-1.7/misc.c
+===================================================================
+--- ldapvi-1.7.orig/misc.c
++++ ldapvi-1.7/misc.c
+@@ -163,7 +163,9 @@ edit(char *pathname, long line)
+
+ vi = getenv("VISUAL");
+ if (!vi) vi = getenv("EDITOR");
+- if (!vi) vi = "vi";
++ /* changed from "vi" as fallback to "sensible-editor" which is what
++ * Debian really uses (closes: #367995) */
++ if (!vi) vi = "sensible-editor";
+
+ switch ( (childpid = fork())) {
+ case -1:
+@@ -204,7 +206,9 @@ view(char *pathname)
+ char *clear = tigetstr("clear");
+
+ pg = getenv("PAGER");
+- if (!pg) pg = "less";
++ /* changed from "less" as fallback to "sensible-pager" which is what
++ * Debian really uses */
++ if (!pg) pg = "sensible-pager";
+
+ if (!invalidp(clear))
+ putp(clear);
+Description: adds the posibility to use an unpaged --help output
+Origin: upstream, commit:fcee00ee
+Bug-Debian: http://bugs.debian.org/424978
+Author: David Lichteblau <david at lichteblau.com>
+
+Index: ldapvi-1.7/arguments.c
+===================================================================
+--- ldapvi-1.7.orig/arguments.c
++++ ldapvi-1.7/arguments.c
+@@ -115,7 +115,7 @@ enum ldapvi_option_numbers {
+ OPTION_NOQUESTIONS, OPTION_LDAPSEARCH, OPTION_LDAPMODIFY,
+ OPTION_LDAPDELETE, OPTION_LDAPMODDN, OPTION_LDAPMODRDN, OPTION_ADD,
+ OPTION_CONFIG, OPTION_READ, OPTION_LDAP_CONF, OPTION_BIND,
+- OPTION_BIND_DIALOG
++ OPTION_BIND_DIALOG, OPTION_UNPAGED_HELP
+ };
+
+ static struct poptOption options[] = {
+@@ -170,14 +170,17 @@ static struct poptOption options[] = {
+ {"ldapdelete", 0, 0, 0, OPTION_LDAPDELETE, 0, 0},
+ {"ldapmoddn", 0, 0, 0, OPTION_LDAPMODDN, 0, 0},
+ {"ldapmodrdn", 0, 0, 0, OPTION_LDAPMODRDN, 0, 0},
++ {"unpaged-help", 0, 0, 0, OPTION_UNPAGED_HELP, 0, 0},
+ {0, 0, 0, 0, 0}
+ };
+
+
++static int usage_pagerp = 1;
++
+ void
+ usage(int fd, int rc)
+ {
+- if (fd == -1 && rc == 0 && isatty(1)) {
++ if (usage_pagerp && fd == -1 && rc == 0 && isatty(1)) {
+ int fd;
+ int pid = pipeview(&fd);
+ write(fd, USAGE, strlen(USAGE));
+@@ -479,6 +482,9 @@ parse_argument(int c, char *arg, cmdline
+ case OPTION_LDAP_CONF:
+ result->profileonlyp = 0;
+ break;
++ case OPTION_UNPAGED_HELP:
++ usage_pagerp = 0;
++ break;
+ case 'p':
+ parse_configuration(arg, result, ctrls);
+ break;
+Index: ldapvi-1.7/manual/manual.xml
+===================================================================
+--- ldapvi-1.7.orig/manual/manual.xml
++++ ldapvi-1.7/manual/manual.xml
+@@ -718,6 +718,10 @@ wofuer was das doch gleich da?
+ suppress-configuration="suppress-configuration">
+ Print help on command line arguments.
+ </parameter>
++ <parameter long="unpaged-help" brief="Disable pager for --help">
++ Disable the use of a pager
++ for <a href="#parameter-rename"><tt>--help</tt></a>.
++ </parameter>
+ <parameter long="deleteoldrdn" brief="Delete the old RDN">
+ When changing the relative distinguished name to a new attribute
+ value, delete the old attribute value instead of keeping it.
+Index: ldapvi-1.7/NEWS
+===================================================================
+--- ldapvi-1.7.orig/NEWS
++++ ldapvi-1.7/NEWS
+@@ -1,3 +1,6 @@
++1.8 2007-mm-dd
++ - new configuration option `unpaged-help'
++
+ 1.7 2007-05-05
+ - Fixed buffer overrun in home_filename(), thanks to Thomas Friebel.
+
+Description: escape the dashes so they don't become hyphens
+Author: Rhonda D'Vine <rhonda at debian.org>
+
+Index: ldapvi-1.7/ldapvi.1
+===================================================================
+--- ldapvi-1.7.orig/ldapvi.1
++++ ldapvi-1.7/ldapvi.1
+@@ -41,7 +41,7 @@ Disable or enable SASL.
+ .TP
+ \fB\-\-bind\-dialog\fR [never,auto,always]
+ Interactive login dialog.
+-.SS "SASL options (these parameters set --bind sasl):"
++.SS "SASL options (these parameters set \-\-bind sasl):"
+ .HP
+ \fB\-I\fR, \fB\-\-sasl\-interactive\fR Set \fB\-\-bind\-dialog\fR always.
+ .TP
+@@ -177,10 +177,10 @@ Report bugs to "ldapvi at lists.askja.de".
+ Assuming a suitably configured LDAP library, run ldapvi without arguments
+ to see all entries available.
+
+-Otherwise, try `ldapvi -h HOSTNAME --discover' to query the ROOT DSE for
++Otherwise, try `ldapvi \-h HOSTNAME \-\-discover' to query the ROOT DSE for
+ available naming contexts.
+
+-Once that works, run `ldapvi -h HOSTNAME --discover --config' to
++Once that works, run `ldapvi \-h HOSTNAME \-\-discover \-\-config' to
+ generate sample configuration that can be pasted into ~/.ldaprc or
+ /etc/ldap/ldap.conf.
+
+Index: ldapvi-1.7/ldapvi.1.in
+===================================================================
+--- ldapvi-1.7.orig/ldapvi.1.in
++++ ldapvi-1.7/ldapvi.1.in
+@@ -2,10 +2,10 @@
+ Assuming a suitably configured LDAP library, run ldapvi without arguments
+ to see all entries available.
+
+-Otherwise, try `ldapvi -h HOSTNAME --discover' to query the ROOT DSE for
++Otherwise, try `ldapvi \-h HOSTNAME \-\-discover' to query the ROOT DSE for
+ available naming contexts.
+
+-Once that works, run `ldapvi -h HOSTNAME --discover --config' to
++Once that works, run `ldapvi \-h HOSTNAME \-\-discover \-\-config' to
+ generate sample configuration that can be pasted into ~/.ldaprc or
+ /etc/ldap/ldap.conf.
+
+Description: rename internal getline function to avoid conflict
+Origin: upstream, commit:bf7af39b
+Bug-Debian: http://bugs.debian.org/552868
+Author: David Lichteblau <david at lichteblau.com>
+
+Index: ldapvi-1.7/common.h
+===================================================================
+--- ldapvi-1.7.orig/common.h
++++ ldapvi-1.7/common.h
+@@ -273,7 +273,7 @@ void pipeview_wait(int pid);
+ char *home_filename(char *name);
+ void read_ldapvi_history(void);
+ void write_ldapvi_history(void);
+-char *getline(char *prompt, char *value);
++char *ldapvi_getline(char *prompt, char *value);
+ char *get_password();
+ char *append(char *a, char *b);
+ void *xalloc(size_t size);
+Index: ldapvi-1.7/misc.c
+===================================================================
+--- ldapvi-1.7.orig/misc.c
++++ ldapvi-1.7/misc.c
+@@ -319,7 +319,7 @@ write_ldapvi_history()
+ }
+
+ char *
+-getline(char *prompt, char *value)
++ldapvi_getline(char *prompt, char *value)
+ {
+ tdialog d;
+ init_dialog(&d, DIALOG_DEFAULT, prompt, value);
+Index: ldapvi-1.7/ldapvi.c
+===================================================================
+--- ldapvi-1.7.orig/ldapvi.c
++++ ldapvi-1.7/ldapvi.c
+@@ -470,7 +470,7 @@ change_mechanism(bind_options *bo)
+ bo->authmethod = LDAP_AUTH_SASL;
+ puts("Switching to SASL authentication.");
+ }
+- bo->sasl_mech = getline("SASL mechanism", bo->sasl_mech);
++ bo->sasl_mech = ldapvi_getline("SASL mechanism", bo->sasl_mech);
+ }
+
+ static int
+Description: use fileencoding in vim modeline instead of encoding
+ The encoding setting is not allowed in modeline in recent vim versions,
+ so switch to fileencoding instead.
+Origin: http://lists.askja.de/pipermail/ldapvi/2011-January/000088.html
+Bug-Debian: http://bugs.debian.org/688129, http://bugs.debian.org/663121
+Author: Devin J. Pohly <djpohly at gmail.com>
+
+--- a/ldapvi.c
++++ b/ldapvi.c
+@@ -1414,7 +1414,7 @@
+ int nlines = 0;
+
+ if (print_binary_mode == PRINT_UTF8 && !cmdline->ldif) {
+- fputs("# -*- coding: utf-8 -*- vim:encoding=utf-8:\n", s);
++ fputs("# -*- coding: utf-8 -*- vim:fileencoding=utf-8:\n", s);
+ nlines++;
+ }
+ if (cmdline->ldif) {
+From: Boyuan Yang <byang at 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
+From: Boyuan Yang <byang at 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) \
+From: Philipp Kern <pkern at debian.org>
+Subject: Return 0 when the SASL file does not exist
+
+gcc-14 requires that functions that return an int actually do so, so the
+bare "return" is no longer legit.
+
+Bug-Debian: https://bugs.debian.org/1075132
+
+Index: ldapvi-1.7/ldapvi.c
+===================================================================
+--- ldapvi-1.7.orig/ldapvi.c
++++ ldapvi-1.7/ldapvi.c
+@@ -1465,7 +1465,7 @@ copy_sasl_output(FILE *out, char *sasl)
+ int line = 0;
+ int c;
+
+- if (lstat(sasl, &st) == -1) return;
++ if (lstat(sasl, &st) == -1) return 0;
+ if ( !(in = fopen(sasl, "r"))) syserr();
+
+ if (st.st_size > 0) {
diff --git a/ldapvi-vim-syntax.patch b/ldapvi-vim-syntax.patch
deleted file mode 100644
index fb030bd..0000000
--- a/ldapvi-vim-syntax.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- ldapvi-1.7/ldapvi.c~ 2010-10-01 11:04:21.118669165 +0200
-+++ ldapvi-1.7/ldapvi.c 2010-10-01 11:08:51.905669166 +0200
-@@ -1413,10 +1413,11 @@
- {
- int nlines = 0;
-
-- if (print_binary_mode == PRINT_UTF8 && !cmdline->ldif) {
-- fputs("# -*- coding: utf-8 -*- vim:encoding=utf-8:\n", s);
-- nlines++;
-- }
-+ if (print_binary_mode == PRINT_UTF8 && !cmdline->ldif)
-+ fputs("# -*- coding: utf-8 -*- vim:encoding=utf-8:filetype=ldif:\n", s);
-+ else
-+ fputs("# vim:filetype=ldif:\n", s);
-+ nlines++;
- if (cmdline->ldif) {
- fputs("# " RFC_2849_URL "\n" "# " MANUAL_LDIF_URL "\n", s);
- nlines += 2;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ldapvi.git/commitdiff/0d1ab4f335cd995aa3bc89c3c01168d4c99aa9e8
More information about the pld-cvs-commit
mailing list