diff options
| author | drochner <drochner@pkgsrc.org> | 2011-04-04 11:00:38 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2011-04-04 11:00:38 +0000 |
| commit | e4eac21886db1e3afe0df4fbc8149bb4c4e33fba (patch) | |
| tree | 75566bb14f39d8478016e70f8ca756737e4a0ce4 | |
| parent | be6c5e7ebd8388d65294ca7228b8cba5aa747ad8 (diff) | |
| download | pkgsrc-e4eac21886db1e3afe0df4fbc8149bb4c4e33fba.tar.gz | |
rename local getline() function to avoid conflict with the libc
provided one in NetBSD-current
| -rw-r--r-- | databases/ldapvi/distinfo | 5 | ||||
| -rw-r--r-- | databases/ldapvi/patches/patch-aa | 13 | ||||
| -rw-r--r-- | databases/ldapvi/patches/patch-ab | 13 | ||||
| -rw-r--r-- | databases/ldapvi/patches/patch-ac | 13 |
4 files changed, 43 insertions, 1 deletions
diff --git a/databases/ldapvi/distinfo b/databases/ldapvi/distinfo index 3a37af777fd..cd8d0d876d8 100644 --- a/databases/ldapvi/distinfo +++ b/databases/ldapvi/distinfo @@ -1,5 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2007/10/11 19:26:39 ghen Exp $ +$NetBSD: distinfo,v 1.2 2011/04/04 11:00:38 drochner Exp $ SHA1 (ldapvi-1.7.tar.gz) = d1cde4cbb618180f9ae0e77c56a1520b8ad61c9a RMD160 (ldapvi-1.7.tar.gz) = f4cd1c2fcfc87e7a9e912269e60280e9ecd82156 Size (ldapvi-1.7.tar.gz) = 119503 bytes +SHA1 (patch-aa) = 7f700c9296c724c8afd72d1cd7d8ca898018208a +SHA1 (patch-ab) = a04bc868aa44f1ac15359cb78858a0f604acb475 +SHA1 (patch-ac) = 493397833801d99f5a7796b7b270e1734a44755a diff --git a/databases/ldapvi/patches/patch-aa b/databases/ldapvi/patches/patch-aa new file mode 100644 index 00000000000..57f68bda1a5 --- /dev/null +++ b/databases/ldapvi/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.1 2011/04/04 11:00:39 drochner Exp $ + +--- common.h.orig 2007-05-05 10:17:26.000000000 +0000 ++++ 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 *lv_getline(char *prompt, char *value); + char *get_password(); + char *append(char *a, char *b); + void *xalloc(size_t size); diff --git a/databases/ldapvi/patches/patch-ab b/databases/ldapvi/patches/patch-ab new file mode 100644 index 00000000000..ba5188153e9 --- /dev/null +++ b/databases/ldapvi/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2011/04/04 11:00:39 drochner Exp $ + +--- misc.c.orig 2007-05-05 10:17:26.000000000 +0000 ++++ misc.c +@@ -315,7 +315,7 @@ write_ldapvi_history() + } + + char * +-getline(char *prompt, char *value) ++lv_getline(char *prompt, char *value) + { + tdialog d; + init_dialog(&d, DIALOG_DEFAULT, prompt, value); diff --git a/databases/ldapvi/patches/patch-ac b/databases/ldapvi/patches/patch-ac new file mode 100644 index 00000000000..9d2c2a91584 --- /dev/null +++ b/databases/ldapvi/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 2011/04/04 11:00:39 drochner Exp $ + +--- ldapvi.c.orig 2007-05-05 10:17:26.000000000 +0000 ++++ 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 = lv_getline("SASL mechanism", bo->sasl_mech); + } + + static int |