rpms/ldapvi/F-11 ldapvi-1.7-getline.patch, NONE, 1.1 ldapvi.spec, 1.8, 1.9
Matej Cepl
mcepl at fedoraproject.org
Sat Sep 19 20:41:41 UTC 2009
Author: mcepl
Update of /cvs/pkgs/rpms/ldapvi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10215
Modified Files:
ldapvi.spec
Added Files:
ldapvi-1.7-getline.patch
Log Message:
Fix FTBFS (bug #511746)
ldapvi-1.7-getline.patch:
common.h | 2 +-
ldapvi.c | 2 +-
misc.c | 3 +--
3 files changed, 3 insertions(+), 4 deletions(-)
--- NEW FILE ldapvi-1.7-getline.patch ---
>From 256ced029c235687bfafdffd07be7d47bf7af39b Mon Sep 17 00:00:00 2001
From: David Lichteblau <david at lichteblau.com>
Date: Thu, 18 Jun 2009 20:07:42 +0200
Subject: [PATCH] renamed getline
---
ldapvi/common.h | 2 +-
ldapvi/ldapvi.c | 2 +-
ldapvi/misc.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ldapvi/common.h b/ldapvi/common.h
index 4c264e8..f731e62 100644
--- a/ldapvi/common.h
+++ b/ldapvi/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);
diff --git a/ldapvi/ldapvi.c b/ldapvi/ldapvi.c
index 9d7d77c..7b312f8 100644
--- a/ldapvi/ldapvi.c
+++ b/ldapvi/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
diff --git a/ldapvi/misc.c b/ldapvi/misc.c
index 0a9dba9..3b6896e 100644
--- a/ldapvi/misc.c
+++ b/ldapvi/misc.c
@@ -315,7 +315,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);
--
1.6.3.3
Index: ldapvi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldapvi/F-11/ldapvi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ldapvi.spec 25 Feb 2009 12:49:08 -0000 1.8
+++ ldapvi.spec 19 Sep 2009 20:41:40 -0000 1.9
@@ -1,6 +1,6 @@
Name: ldapvi
Version: 1.7
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: An interactive LDAP client
Group: Applications/Editors
@@ -8,6 +8,7 @@ License: GPLv2+
URL: http://www.lichteblau.com/ldapvi/
Source0: http://www.lichteblau.com/download/ldapvi-%{version}.tar.gz
Patch0: GNUmakefile.in.patch
+Patch1: %{name}-1.7-getline.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: openldap-devel, ncurses-devel, readline-devel, pkgconfig
@@ -21,7 +22,8 @@ it as vipw(1) for LDAP.
%prep
%setup -q
-%patch0 -p0
+%patch0 -p0 -b .gnumk
+%patch1 -p2 -b .getline
%build
@@ -49,6 +51,10 @@ rm -rf %{buildroot}
%changelog
+* Fri Sep 18 2009 Matěj Cepl <mcepl at redhat.com> - 1.7-9
+- Fixed build to cure FTBFS (#511746)
+ Thanks for sharkcz for making the patch
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
More information about the fedora-extras-commits
mailing list