* [gentoo-commits] repo/gentoo:master commit in: net-nds/ldapvi/files/, net-nds/ldapvi/
@ 2024-05-12 5:16 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-05-12 5:16 UTC (permalink / raw
To: gentoo-commits
commit: 9998cdf862f9b0a486bf36922cdc2f08d4cac44d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 12 05:15:41 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 12 05:15:57 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9998cdf8
net-nds/ldapvi: fix modern C issue
Thanks to NHO.
Closes: https://bugs.gentoo.org/885885
Closes: https://bugs.gentoo.org/921256
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../ldapvi/files/ldapvi-1.7-posix-unlocked.patch | 23 ++++++++
net-nds/ldapvi/ldapvi-1.7_p20101214-r7.ebuild | 63 ++++++++++++++++++++++
2 files changed, 86 insertions(+)
diff --git a/net-nds/ldapvi/files/ldapvi-1.7-posix-unlocked.patch b/net-nds/ldapvi/files/ldapvi-1.7-posix-unlocked.patch
new file mode 100644
index 000000000000..167a2ce95b2f
--- /dev/null
+++ b/net-nds/ldapvi/files/ldapvi-1.7-posix-unlocked.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/885885
+--- a/parse.c
++++ b/parse.c
+@@ -15,7 +15,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+-#define _XOPEN_SOURCE
++#define _XOPEN_SOURCE 700
+ #include <unistd.h>
+ #include <crypt.h>
+ #include <stdio.h>
+--- a/parseldif.c
++++ b/parseldif.c
+@@ -15,7 +15,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+-#define _XOPEN_SOURCE
++#define _XOPEN_SOURCE 700
+ #include <unistd.h>
+ #include <stdio.h>
+ #include "common.h"
diff --git a/net-nds/ldapvi/ldapvi-1.7_p20101214-r7.ebuild b/net-nds/ldapvi/ldapvi-1.7_p20101214-r7.ebuild
new file mode 100644
index 000000000000..f370745a1ef8
--- /dev/null
+++ b/net-nds/ldapvi/ldapvi-1.7_p20101214-r7.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Manage LDAP entries with a text editor"
+HOMEPAGE="http://www.lichteblau.com/ldapvi/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+S="${WORKDIR}"/${P}/${PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="gnutls sasl"
+
+RDEPEND="
+ dev-libs/popt
+ dev-libs/glib:2
+ sys-libs/readline:=
+ sys-libs/ncurses:=
+ virtual/libcrypt:=
+ gnutls? (
+ net-libs/gnutls:=
+ net-nds/openldap[gnutls]
+ )
+ !gnutls? (
+ dev-libs/openssl:=
+ net-nds/openldap[ssl]
+ )
+ sasl? ( dev-libs/cyrus-sasl:2[ssl] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.7-fix-implicit-function-declarations.patch"
+ "${FILESDIR}/${PN}-1.7-fix-missing-on_exit-musl.patch"
+ "${FILESDIR}/${PN}-1.7-posix-unlocked.patch"
+)
+
+src_prepare() {
+ default
+
+ # bug #459478
+ sed -i \
+ -e '/^AC_SEARCH_LIBS/s:curses ncurses:curses ncurses tinfo:' \
+ configure.in || die
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --with-libcrypto=$(usex gnutls gnutls openssl)
+}
+
+src_install() {
+ dobin ldapvi
+ doman ldapvi.1
+ dodoc NEWS manual/{bg.png,html.xsl,manual.{css,xml}}
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-nds/ldapvi/files/, net-nds/ldapvi/
@ 2023-10-01 7:47 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-10-01 7:47 UTC (permalink / raw
To: gentoo-commits
commit: 00a1ff40983440d2d0f7ea744b64a98e2e500d38
Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Sat Sep 30 17:31:21 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 1 07:45:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00a1ff40
net-nds/ldapvi: Fix call to undeclared function on_exit
Closes: https://bugs.gentoo.org/898066
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31513
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../ldapvi-1.7-fix-missing-on_exit-musl.patch | 61 +++++++++++++++++++++
net-nds/ldapvi/ldapvi-1.7_p20101214-r6.ebuild | 62 ++++++++++++++++++++++
2 files changed, 123 insertions(+)
diff --git a/net-nds/ldapvi/files/ldapvi-1.7-fix-missing-on_exit-musl.patch b/net-nds/ldapvi/files/ldapvi-1.7-fix-missing-on_exit-musl.patch
new file mode 100644
index 000000000000..b883e412d327
--- /dev/null
+++ b/net-nds/ldapvi/files/ldapvi-1.7-fix-missing-on_exit-musl.patch
@@ -0,0 +1,61 @@
+Use internal on_exit function as on_exit is not available on musl libc Bug: https://bugs.gentoo.org/898066
+--- a/common.h
++++ b/common.h
+@@ -372,3 +372,7 @@ void sasl_defaults_free(tsasl_defaults *sd);
+ int ldapvi_sasl_interact(LDAP *ld, unsigned flags, void *defaults, void *p);
+
+ void fdcp(int fdsrc, int fddst);
++
++#ifndef HAVE_ON_EXIT
++int on_exit(void (*function)(int, void *), void *arg);
++#endif
+--- a/ldapvi.c
++++ b/ldapvi.c
+@@ -17,6 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
++#include <stdio.h>
+ #include <curses.h>
+ #include <signal.h>
+ #include <term.h>
+--- a/misc.c
++++ b/misc.c
+@@ -15,6 +15,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
++#include <stdio.h>
+ #include <curses.h>
+ #include <term.h>
+ #include "common.h"
+--- a/parse.c
++++ b/parse.c
+@@ -18,6 +18,7 @@
+ #define _XOPEN_SOURCE
+ #include <unistd.h>
+ #include <crypt.h>
++#include <stdio.h>
+ #include "common.h"
+
+ #define fast_g_string_append_c(gstring, c) \
+--- a/parseldif.c
++++ b/parseldif.c
+@@ -17,6 +17,7 @@
+ */
+ #define _XOPEN_SOURCE
+ #include <unistd.h>
++#include <stdio.h>
+ #include "common.h"
+
+ #define fast_g_string_append_c(gstring, c) \
+--- a/port.c
++++ b/port.c
+@@ -31,6 +31,7 @@
+ #include <unistd.h>
+
+ #include "config.h"
++#include "common.h"
+
+ #if defined(HAVE_OPENSSL)
+ #include <openssl/sha.h>
diff --git a/net-nds/ldapvi/ldapvi-1.7_p20101214-r6.ebuild b/net-nds/ldapvi/ldapvi-1.7_p20101214-r6.ebuild
new file mode 100644
index 000000000000..13736b4b86ef
--- /dev/null
+++ b/net-nds/ldapvi/ldapvi-1.7_p20101214-r6.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Manage LDAP entries with a text editor"
+HOMEPAGE="http://www.lichteblau.com/ldapvi/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+S="${WORKDIR}"/${P}/${PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="gnutls sasl"
+
+RDEPEND="
+ dev-libs/popt
+ dev-libs/glib:2
+ sys-libs/readline:=
+ sys-libs/ncurses:=
+ virtual/libcrypt:=
+ gnutls? (
+ net-libs/gnutls:=
+ net-nds/openldap[gnutls]
+ )
+ !gnutls? (
+ dev-libs/openssl:=
+ net-nds/openldap[ssl]
+ )
+ sasl? ( dev-libs/cyrus-sasl:2[ssl] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.7-fix-implicit-function-declarations.patch"
+ "${FILESDIR}/${PN}-1.7-fix-missing-on_exit-musl.patch"
+)
+
+src_prepare() {
+ default
+
+ # bug #459478
+ sed -i \
+ -e '/^AC_SEARCH_LIBS/s:curses ncurses:curses ncurses tinfo:' \
+ configure.in || die
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --with-libcrypto=$(usex gnutls gnutls openssl)
+}
+
+src_install() {
+ dobin ldapvi
+ doman ldapvi.1
+ dodoc NEWS manual/{bg.png,html.xsl,manual.{css,xml}}
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-nds/ldapvi/files/, net-nds/ldapvi/
@ 2018-05-09 15:33 Mikle Kolyada
0 siblings, 0 replies; 3+ messages in thread
From: Mikle Kolyada @ 2018-05-09 15:33 UTC (permalink / raw
To: gentoo-commits
commit: 963eb89009a01bae4a873feb310d6d58998ef887
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed May 9 15:32:37 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed May 9 15:33:15 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=963eb890
net-nds/ldapvi: Drop old
Package-Manager: Portage-2.3.24, Repoman-2.3.6
net-nds/ldapvi/Manifest | 1 -
net-nds/ldapvi/files/ldapvi-1.7+glibc-2.10.patch | 39 ----------------------
net-nds/ldapvi/files/ldapvi-1.7-vim-encoding.patch | 13 --------
net-nds/ldapvi/ldapvi-1.7-r1.ebuild | 39 ----------------------
4 files changed, 92 deletions(-)
diff --git a/net-nds/ldapvi/Manifest b/net-nds/ldapvi/Manifest
index 7e0a71e91f2..01a179e7e04 100644
--- a/net-nds/ldapvi/Manifest
+++ b/net-nds/ldapvi/Manifest
@@ -1,2 +1 @@
-DIST ldapvi-1.7.tar.gz 119503 BLAKE2B a04c52d1d113e4d8afcda12e648cd89d71a6f247ff400bbc7c68597fa4046de58bb0611746df5fb6e9df31ac8a3ad94d1df431d46912185d37d63fa8d24392e3 SHA512 4b38cee0763aa33703afbd5e358a458b1468abf58e43ea885879b2117bc1c0bbc375d91c6a43467ec08035b8b3b7dd4b024f2937c37741c7a5513ea9192aed36
DIST ldapvi-1.7_p20101214.tar.bz2 1490491 BLAKE2B 21bb7b6113e89ce848e7a8efcec063dbfe9c32331c1125456a96dc6edc4e09d17245307a041a7d7804fac20bcce5b38677d719fb53d993fb874134bbd4d4df19 SHA512 2d2a744a36364793f406f37ecf6e546914d697457dec37b81544f4979f4c692756b2a1c3ea6fcbaba5e3238b2bf758ab3e0bd9a9a0794c4da734d65286bd5925
diff --git a/net-nds/ldapvi/files/ldapvi-1.7+glibc-2.10.patch b/net-nds/ldapvi/files/ldapvi-1.7+glibc-2.10.patch
deleted file mode 100644
index df2a20c7124..00000000000
--- a/net-nds/ldapvi/files/ldapvi-1.7+glibc-2.10.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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/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
-Index: ldapvi-1.7/misc.c
-===================================================================
---- ldapvi-1.7.orig/misc.c
-+++ ldapvi-1.7/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);
diff --git a/net-nds/ldapvi/files/ldapvi-1.7-vim-encoding.patch b/net-nds/ldapvi/files/ldapvi-1.7-vim-encoding.patch
deleted file mode 100644
index d9431bed2de..00000000000
--- a/net-nds/ldapvi/files/ldapvi-1.7-vim-encoding.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-From https://bugzilla.redhat.com/show_bug.cgi?id=691958
-
---- ldapvi-1.7/ldapvi.c
-+++ ldapvi-1.7/ldapvi.c
-@@ -1414,7 +1414,7 @@ write_file_header(FILE *s, cmdline *cmdline)
- 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 -*- \n", s);
- nlines++;
- }
- if (cmdline->ldif) {
diff --git a/net-nds/ldapvi/ldapvi-1.7-r1.ebuild b/net-nds/ldapvi/ldapvi-1.7-r1.ebuild
deleted file mode 100644
index 0aebcb27665..00000000000
--- a/net-nds/ldapvi/ldapvi-1.7-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="Manage LDAP entries with a text editor"
-HOMEPAGE="http://www.lichteblau.com/ldapvi/"
-SRC_URI="http://www.lichteblau.com/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ~sparc x86"
-IUSE="ssl"
-
-RDEPEND="sys-libs/ncurses
- >=net-nds/openldap-2.2
- dev-libs/popt
- >=dev-libs/glib-2
- sys-libs/readline
- ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}+glibc-2.10.patch"
- epatch "${FILESDIR}/${P}-vim-encoding.patch"
-}
-
-src_configure() {
- econf $(use_with ssl libcrypto openssl) || die
-}
-
-src_install() {
- dobin ldapvi || die
- doman ldapvi.1 || die
- dodoc NEWS manual/{bg.png,html.xsl,manual.{css,xml}} || die
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-05-12 5:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-12 5:16 [gentoo-commits] repo/gentoo:master commit in: net-nds/ldapvi/files/, net-nds/ldapvi/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-10-01 7:47 Sam James
2018-05-09 15:33 Mikle Kolyada
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox