Accepting request 602385 from Base:System

OBS-URL: https://build.opensuse.org/request/show/602385
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/less?expand=0&rev=54

less-429-strict_aliasing.patch

@@ -1,24 +0,0 @@
-The strict aliasing rules are broken without this patch becase there
-is defined a pointer to the "struct tag" and the structure is defined
-later.
-================================================================================
---- tags.c
-+++ tags.c
-@@ -63,8 +63,6 @@
- 	struct tag *tl_first;
- 	struct tag *tl_last;
- };
--#define TAG_END  ((struct tag *) &taglist)
--static struct taglist taglist = { TAG_END, TAG_END };
- struct tag {
- 	struct tag *next, *prev; /* List links */
- 	char *tag_file;		/* Source file containing the tag */
-@@ -72,6 +70,8 @@
- 	char *tag_pattern;	/* Pattern used to find the tag */
- 	char tag_endline;	/* True if the pattern includes '$' */
- };
-+#define TAG_END  ((struct tag *) &taglist)
-+static struct taglist taglist = { TAG_END, TAG_END };
- static struct tag *curtag;
- 
- #define TAG_INS(tp) \

less-429-terminate.patch

@@ -1,81 +0,0 @@
-Index: edit.c
-===================================================================
---- edit.c.orig	2009-03-30 21:45:51.000000000 +0200
-+++ edit.c	2009-06-03 15:20:08.000000000 +0200
-@@ -152,7 +152,7 @@ back_textlist(tlist, prev)
- /*
-  * Close the current input file.
-  */
--	static void
-+	public void
- close_file()
- {
- 	struct scrpos scrpos;
-Index: funcs.h
-===================================================================
---- funcs.h.orig	2009-06-03 15:17:47.000000000 +0200
-+++ funcs.h	2009-06-03 15:20:08.000000000 +0200
-@@ -97,6 +97,7 @@
- 	public void init_textlist ();
- 	public char * forw_textlist ();
- 	public char * back_textlist ();
-+	public void close_file ();
- 	public int edit ();
- 	public int edit_ifile ();
- 	public int edit_list ();
-Index: signal.c
-===================================================================
---- signal.c.orig	2009-03-30 22:35:36.000000000 +0200
-+++ signal.c	2009-06-03 15:20:08.000000000 +0200
-@@ -37,6 +37,35 @@ extern int quit_on_intr;
- extern long jump_sline_fraction;
- 
- /*
-+ * Terminate signal handler.
-+ */
-+	static RETSIGTYPE
-+terminate(type)
-+	int type;
-+{
-+	/*
-+	 * run $LESSCLOSE if needed
-+	 */
-+	close_file();
-+
-+	/*
-+	 * Clean up the terminal.
-+	 */
-+#ifdef SIGTTOU
-+	LSIGNAL(SIGTTOU, SIG_IGN);
-+#endif
-+	clear_bot();
-+	deinit();
-+	flush();
-+	raw_mode(0);
-+#ifdef SIGTTOU
-+	LSIGNAL(SIGTTOU, SIG_DFL);
-+#endif
-+	LSIGNAL(SIGTERM, SIG_DFL);
-+	kill(getpid(), SIGTERM);
-+}
-+
-+/*
-  * Interrupt signal handler.
-  */
- 	/* ARGSUSED*/
-@@ -147,6 +176,7 @@ init_signals(on)
- 		 * Set signal handlers.
- 		 */
- 		(void) LSIGNAL(SIGINT, u_interrupt);
-+		(void) LSIGNAL(SIGTERM, terminate);
- #if MSDOS_COMPILER==WIN32C
- 		SetConsoleCtrlHandler(wbreak_handler, TRUE);
- #endif
-@@ -168,6 +198,7 @@ init_signals(on)
- 		 * Restore signals to defaults.
- 		 */
- 		(void) LSIGNAL(SIGINT, SIG_DFL);
-+		(void) LSIGNAL(SIGTERM, SIG_DFL);
- #if MSDOS_COMPILER==WIN32C
- 		SetConsoleCtrlHandler(wbreak_handler, FALSE);
- #endif

less-487.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f3dc8455cb0b2b66e0c6b816c00197a71bf6d1787078adeee0bcf2aea4b12706
-size 318488

less-530.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:503f91ab0af4846f34f0444ab71c4b286123f0044a4964f1ae781486c617f2e2
+size 339723

less.changes

@@ -1,3 +1,48 @@
+-------------------------------------------------------------------
+Sun Apr 29 09:04:21 UTC 2018 - kstreitova@suse.com
+
+- update to version 530 [bsc#1091308]
+  * Don't output terminal init sequence if using -F and file fits
+    on one screen.
+  * When using -S, mark truncated lines with a special character.
+    The character can be changed or disabled via the new --rscroll
+    option.
+  * New command M marks the last line displayed on the screen.
+  * New command ESC-m removes a line mark.
+  * Status column (enabled via -J) now shows mark letters.
+  * Status column shows search matches even if highlighting is
+    disabled via -G.
+  * A second ESC-u command will clear search match markers in the
+    status column.
+  * Do same ANSI escape code filtering for tag matching that we do
+    for searching, to help when viewing syntax-highlighted code.
+  * Catch SIGTERM and clean up before exiting.
+  * Fix bug initializing default charset on Windows.
+  * Handle keypad ENTER key correctly if it sends something other
+    than newline.
+  * Fix buffering bug when using stdin with a LESSOPEN pipe.
+  * Update Unicode tables to 2017-03-08.
+  * Pass-thru Unicode formating chars (Cf type) instead of treating
+    them as binary chars. But treat them as binary if -U is set.
+  * Fix erroneous binary file warning when UTF-8 file contains ANSI
+    SGR sequences.
+  * Fix bugs when using LESSOPEN and switching between stdin and
+    other files.
+  * Fix some bugs handling filenames containing shell metacharacters
+  * Fix some memory leaks.
+  * Allow some debugging environment variables to be set in lesskey
+    file.
+  * Code improvements:
+    * Use ANSI prototypes in funcs.h declarations.
+    * Fix some const mismatches.
+    * Remove archaic "register" in variable declarations.
+- remove the following patches (applied upstream)
+  * less-429-strict_aliasing.patch
+  * less-429-terminate.patch
+- renumber patches
+- remove 'make mkhelp' from the specfile as mkhelp.pl is now
+  distributed in the tarball
+
 -------------------------------------------------------------------
 Tue Apr  3 14:12:06 CEST 2018 - kukuk@suse.de
 

less.spec

@@ -17,7 +17,7 @@
 
 
 Name:           less
-Version:        487
+Version:        530
 Release:        0
 Summary:        Text File Browser and Pager Similar to more
 License:        GPL-3.0-or-later OR BSD-2-Clause
@@ -28,13 +28,11 @@ Source1:        README.SUSE
 Source2:        lessopen.sh
 Source3:        lessclose.sh
 Source4:        lesskey.src
-Source5:        http://www.greenwoodsoftware.com/less/less-%{version}.tar.gz.sig
+Source5:        http://www.greenwoodsoftware.com/less/less-%{version}.sig
 Source6:        http://www.greenwoodsoftware.com/less/pubkey.asc#/%{name}.keyring
-Patch22:        less-429-strict_aliasing.patch
+Patch0:         less-429-shell.patch
-Patch24:        less-429-terminate.patch
+Patch1:         less-429-save_line_position.patch
-Patch26:        less-429-shell.patch
+Patch2:         less-429-more.patch
-Patch27:        less-429-save_line_position.patch
-Patch28:        less-429-more.patch
 BuildRequires:  automake
 BuildRequires:  ncurses-devel
 Requires:       file
@@ -48,11 +46,9 @@ start an editor at any time from within less.
 
 %prep
 %setup -q
-%patch22
+%patch0
-%patch24
+%patch1
-%patch26
+%patch2
-%patch27
-%patch28
 #
 # the ./configure script is not writable for the normal user
 # rather fix permissions for all files
@@ -67,8 +63,7 @@ export LDFLAGS="-pie"
 %configure --with-pic
 #
 # regenerate help.c because less.hlp was patched
-make %{?_smp_mflags} mkhelp
+./mkhelp.pl <less.hlp >help.c
-./mkhelp <less.hlp >help.c
 #
 # build less
 make %{?_smp_mflags}