Hello community, here is the log from the commit of package ldapvi for openSUSE:Factory checked in at 2016-09-26 12:36:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ldapvi (Old) and /work/SRC/openSUSE:Factory/.ldapvi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ldapvi" Changes: -------- New Changes file: --- /dev/null 2016-09-15 12:42:18.240042505 +0200 +++ /work/SRC/openSUSE:Factory/.ldapvi.new/ldapvi.changes 2016-09-26 12:36:28.000000000 +0200 @@ -0,0 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 8 08:26:17 UTC 2016 - [email protected] + +- Some minor clean-ups in the spec file. +- Introduce 0006-correct-gpl2-text.patch to correct the outdated + GPL v2 license text carried by the package. + +------------------------------------------------------------------- +Wed Sep 7 15:00:40 UTC 2016 - [email protected] + +- added sasl support +- formated the spec file to meet the opensuse standard +- used bjacke package as the base for this package New: ---- 0001-Improved-subprocess.patch 0001-declare-some-void-functions-to-be-really-void.patch 0001-renamed-getline.patch 0001-return-0-instead-of-nothing.patch 0002-improved-subprocess-2.patch 0006-correct-gpl2-text.patch GNUMakefile.in.patch ldapvi-1.7.tar.gz ldapvi.changes ldapvi.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ldapvi.spec ++++++ # # spec file for package ldapvi # # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: ldapvi Version: 1.7 Release: 0.0 License: GPL-2.0 Summary: An interactive LDAP editor for Unix terminals Url: http://www.lichteblau.com/ldapvi Group: Productivity/Networking/LDAP/Utilities Source: http://www.lichteblau.com/download/ldapvi-%{version}.tar.gz # PATCH-FIX-UPSTREAM GNUMakefile.in.patch Patch0: GNUMakefile.in.patch # PATCH-FIX-UPSTREAM 0001-renamed-getline.patch Patch1: 0001-renamed-getline.patch # PATCH-FIX-UPSTREAM 0001-declare-some-void-functions-to-be-really-void.patch Patch2: 0001-declare-some-void-functions-to-be-really-void.patch # PATCH-FIX-UPSTREAM 0001-return-0-instead-of-nothing.patch Patch3: 0001-return-0-instead-of-nothing.patch # PATCH-FIX-UPSTREAM 0001-Improved-subprocess.patch Patch4: 0001-Improved-subprocess.patch # PATCH-FIX-UPSTREAM 0002-improved-subprocess-2.patch Patch5: 0002-improved-subprocess-2.patch Patch6: 0006-correct-gpl2-text.patch BuildRequires: cyrus-sasl-devel BuildRequires: libxslt BuildRequires: openssl-devel BuildRequires: pkgconfig BuildRequires: popt-devel BuildRequires: readline-devel BuildRequires: pkgconfig(glib-2.0) %if 0%{?suse_version} BuildRequires: openldap2-devel %endif %if 0%{?centos_version} || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version} BuildRequires: openldap-devel %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ldapvi is an interactive LDAP client for Unix terminals. Using it, you can update LDAP entries with a text editor. Think of it as vipw(1) for LDAP. %prep %setup -q %patch0 -p0 %patch1 -p2 %patch2 -p2 %patch3 -p2 %patch4 -p2 %patch5 -p2 %patch6 -p1 %build %configure make cd manual make manual.html %install %make_install %files %defattr(-, root, root, 0755) %doc NEWS COPYING manual/manual.html manual/manual.css manual/bg.png %{_bindir}/ldapvi %{_mandir}/man1/ldapvi.1.gz %changelog ++++++ 0001-Improved-subprocess.patch ++++++ >From 2a1131169b102a72f0172b4027aa8931093ac551 Mon Sep 17 00:00:00 2001 From: Ken Stailey <[email protected]> Date: Fri, 27 May 2011 15:10:22 -0400 Subject: [PATCH 1/2] Improved subprocess MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch author: Anders Kaseorg Patch E-mail list URLs: http://lists.askja.de/pipermail/ldapvi/2010-December/000085.html http://lists.askja.de/pipermail/ldapvi/2010-December/000086.html >From exec(3): “The list of arguments must be terminated by a NULL pointer, and, since these are variadic functions, this pointer must be cast (char *) NULL.” This prevents crashes on 64-bit systems, where 0 is a 32-bit integer and (char *) NULL is a 64-bit pointer. Previously when the EDITOR environment variable is set to a command with arguments, such as ‘emacsclient --alternate-editor emacs’, ldapvi would fail to launch the editor: $ ldapvi 26 entries read error (misc.c line 180): No such file or directory editor died error (ldapvi.c line 83): No such file or directory Also setting PAGER to "less -s" or similar had the same effects when you use Action? (v) view LDIF changes or other commands that invoke $PAGER. --- ldapvi/misc.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ldapvi/misc.c b/ldapvi/misc.c index 3b6896e..2e3a1f5 100644 --- a/ldapvi/misc.c +++ b/ldapvi/misc.c @@ -172,9 +172,11 @@ edit(char *pathname, long line) if (line > 0) { char buf[20]; snprintf(buf, 20, "+%ld", line); - execlp(vi, vi, buf, pathname, 0); + execl("/bin/sh", "sh", "-c", "exec $0 \"$@\"", vi, + buf, pathname, (char *) NULL); } else - execlp(vi, vi, pathname, 0); + execl("/bin/sh", "sh", "-c", "exec $0 \"$@\"", vi, + pathname, (char *) NULL); syserr(); } @@ -213,7 +215,7 @@ view(char *pathname) case -1: syserr(); case 0: - execlp(pg, pg, pathname, 0); + execlp(pg, pg, pathname, (char *) NULL); syserr(); } @@ -245,7 +247,7 @@ pipeview(int *fd) close(fds[1]); dup2(fds[0], 0); close(fds[0]); - execlp(pg, pg, 0); + execlp(pg, pg, (char *) NULL); syserr(); } -- 1.7.6 ++++++ 0001-declare-some-void-functions-to-be-really-void.patch ++++++ >From dbfe591cddf3be87088b97c937f7208f269fa7f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= <[email protected]> Date: Thu, 15 Dec 2011 14:49:25 +0100 Subject: [PATCH] declare some void functions to be really void --- ldapvi/misc.c | 2 +- ldapvi/sasl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ldapvi/misc.c b/ldapvi/misc.c index 3b6896e..5c84ced 100644 --- a/ldapvi/misc.c +++ b/ldapvi/misc.c @@ -582,7 +582,7 @@ dialog_rebuild(char *up, char *clreos, putp(up); } -static Keymap +static void set_meta_keymap(Keymap keymap, Keymap meta_keymap) { if (!meta_keymap) diff --git a/ldapvi/sasl.c b/ldapvi/sasl.c index ad338c2..b44c79d 100644 --- a/ldapvi/sasl.c +++ b/ldapvi/sasl.c @@ -120,7 +120,7 @@ process_default(sasl_interact_t *interact, tsasl_defaults *defaults) } } -static int +static void process_result(int id, char *result, tsasl_defaults *defaults) { switch (id) { -- 1.7.6 ++++++ 0001-renamed-getline.patch ++++++ >From 256ced029c235687bfafdffd07be7d47bf7af39b Mon Sep 17 00:00:00 2001 From: David Lichteblau <[email protected]> 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.7.6 ++++++ 0001-return-0-instead-of-nothing.patch ++++++ >From 321de50f1fdad359d3c552c569dc08c1ce36d56c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= <[email protected]> Date: Thu, 15 Dec 2011 15:13:23 +0100 Subject: [PATCH 1/2] return 0 instead of nothing --- ldapvi/ldapvi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ldapvi/ldapvi.c b/ldapvi/ldapvi.c index 7b312f8..77662ac 100644 --- a/ldapvi/ldapvi.c +++ b/ldapvi/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) { -- 1.7.6 ++++++ 0002-improved-subprocess-2.patch ++++++ >From b86fc95ddfb9076e367ecf8e591f74a2b3b9c685 Mon Sep 17 00:00:00 2001 From: Ken Stailey <[email protected]> Date: Fri, 27 May 2011 15:41:48 -0400 Subject: [PATCH 2/2] improved subprocess 2 Patch author: Anders Kaseorg Patch E-mail list URL: http://lists.askja.de/pipermail/ldapvi/2010-December/000087.html This handles PAGER in the same way the last commit handled EDITOR. --- ldapvi/misc.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ldapvi/misc.c b/ldapvi/misc.c index 2e3a1f5..307e1ed 100644 --- a/ldapvi/misc.c +++ b/ldapvi/misc.c @@ -215,7 +215,8 @@ view(char *pathname) case -1: syserr(); case 0: - execlp(pg, pg, pathname, (char *) NULL); + execl("/bin/sh", "sh", "-c", "exec $0 \"$@\"", pg, + pathname, (char *) NULL); syserr(); } @@ -247,7 +248,7 @@ pipeview(int *fd) close(fds[1]); dup2(fds[0], 0); close(fds[0]); - execlp(pg, pg, (char *) NULL); + execl("/bin/sh", "sh", "-c", "exec $0", pg, (char *) NULL); syserr(); } -- 1.7.6 ++++++ 0006-correct-gpl2-text.patch ++++++ diff -rupN ldapvi-1.7/COPYING ldapvi-1.7-patched/COPYING --- ldapvi-1.7/COPYING 2007-05-05 12:17:26.000000000 +0200 +++ ldapvi-1.7-patched/COPYING 2010-03-24 00:34:05.000000000 +0100 @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -15,7 +15,7 @@ software--to make sure the software is f General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -55,8 +55,8 @@ patent must be licensed for everyone's f The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -110,7 +110,7 @@ above, provided that you also meet all o License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy from a designated place, access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -255,7 +255,7 @@ make exceptions for this. Our decision of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -291,7 +291,7 @@ convey the exclusion of warranty; and ea the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 19yy <name of author> + Copyright (C) <year> <name of author> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -303,17 +303,16 @@ the "copyright" line and a pointer to wh MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. @@ -336,5 +335,5 @@ necessary. Here is a sample; alter the This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. ++++++ GNUMakefile.in.patch ++++++ --- ldapvi-1.7/GNUmakefile.in 2007-05-05 11:17:26.000000000 +0100 +++ GNUmakefile.in 2007-07-05 13:34:33.000000000 +0100 @@ -4,6 +4,7 @@ INSTALL:=@INSTALL@ prefix:=@prefix@ exec_prefix:=@exec_prefix@ +datarootdir:=@datarootdir@ all: ldapvi @@ -25,10 +26,9 @@ .PHONY: install install: ldapvi - mkdir -p @bindir@ @mandir@/man1/ @prefix@/share/doc/ldapvi - @INSTALL_PROGRAM@ ldapvi @bindir@ - @INSTALL_PROGRAM@ -m 644 ldapvi.1 @mandir@/man1/ - @INSTALL_PROGRAM@ -m 644 manual/manual.css manual/manual.xml manual/bg.png manual/html.xsl @prefix@/share/doc/ldapvi + mkdir -p $(DESTDIR)@bindir@ $(DESTDIR)@mandir@/man1/ $(DESTDIR)@prefix@/share/doc/ldapvi + @INSTALL_PROGRAM@ ldapvi $(DESTDIR)@bindir@ + @INSTALL_PROGRAM@ -m 644 ldapvi.1 $(DESTDIR)@mandir@/man1/ distclean: rm -rf configure GNUmakefile config.h config.log autom4te.cache config.status
