Accepting request 486972 from Base:System

- Update to version 1.07.1: (forwarded request 486969 from pluskalm)

OBS-URL: https://build.opensuse.org/request/show/486972
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bc?expand=0&rev=23

bc-1.06-dc_ibase.patch

@@ -1,6 +1,8 @@
---- bc-1.06/dc/numeric.c.dc_ibase	2007-08-22 08:37:57.000000000 +0200
+Index: dc/numeric.c
-+++ bc-1.06/dc/numeric.c	2007-08-22 08:37:40.000000000 +0200
+===================================================================
-@@ -285,6 +285,8 @@ dc_getnum DC_DECLARG((input, ibase, read
+--- dc/numeric.c.orig
++++ dc/numeric.c
+@@ -307,6 +307,8 @@ dc_getnum DC_DECLARG((input, ibase, read
  	int		digit;
  	int		decimal;
  	int		c;
@@ -9,7 +11,7 @@
  
  	bc_init_num(&tmp);
  	bc_init_num(&build);
-@@ -302,6 +304,9 @@ dc_getnum DC_DECLARG((input, ibase, read
+@@ -324,6 +326,9 @@ dc_getnum DC_DECLARG((input, ibase, read
  	}
  	while (isspace(c))
  		c = (*input)();
@@ -19,7 +21,7 @@
  	for (;;){
  		if (isdigit(c))
  			digit = c - '0';
-@@ -309,10 +314,15 @@ dc_getnum DC_DECLARG((input, ibase, read
+@@ -331,10 +336,15 @@ dc_getnum DC_DECLARG((input, ibase, read
  			digit = 10 + c - 'A';
  		else
  			break;
@@ -36,7 +38,7 @@
  	}
  	if (c == '.'){
  		bc_free_num(&build);
-@@ -321,13 +331,18 @@ dc_getnum DC_DECLARG((input, ibase, read
+@@ -343,13 +353,18 @@ dc_getnum DC_DECLARG((input, ibase, read
  		build = bc_copy_num(_zero_);
  		decimal = 0;
  		for (;;){

bc-1.06.95-matlib.patch

@@ -1,20 +0,0 @@
-diff -urNp bc-1.06.95-orig/bc/storage.c bc-1.06.95/bc/storage.c
---- bc-1.06.95-orig/bc/storage.c	2006-09-05 04:39:31.000000000 +0200
-+++ bc-1.06.95/bc/storage.c	2010-12-22 10:26:43.805250912 +0100
-@@ -99,6 +99,7 @@ more_functions (VOID)
-     {
-       f = &functions[indx];
-       f->f_defined = FALSE;
-+      f->f_void = FALSE;
-       f->f_body = (char *) bc_malloc (BC_START_SIZE);
-       f->f_body_size = BC_START_SIZE;
-       f->f_code_size = 0;
-@@ -179,7 +180,7 @@ more_arrays ()
- 
- 
-   /* Initialize the new elements. */
--  for (; indx < v_count; indx++)
-+  for (; indx < a_count; indx++)
-     arrays[indx] = NULL;
- 
-   /* Free the old elements. */

bc-1.06.95-memleak.patch

@@ -1,26 +0,0 @@
-diff --git a/bc/bc.y b/bc/bc.y
-index 14dc4be..bd91c38 100644
---- a/bc/bc.y
-+++ b/bc/bc.y
-@@ -569,6 +569,7 @@ expression		:  named_expression ASSIGN_OP
- 				    generate (">");
- 				  break;
- 				}
-+			      free($2);
- 			    }
- 			| expression '+' expression
- 			    {
-diff --git a/bc/util.c b/bc/util.c
-index 30beaf9..26e2e85 100644
---- a/bc/util.c
-+++ b/bc/util.c
-@@ -602,8 +602,7 @@ lookup (name, namekind)
-     case FUNCTDEF:
-       if (id->f_name != 0)
- 	{
--	  if (namekind != FUNCT)
--	    free(name);
-+	  free(name);
- 	  /* Check to see if we are redefining a math lib function. */ 
- 	  if (use_math && namekind == FUNCTDEF && id->f_name <= 6)
- 	    id->f_name = next_func++;

bc-1.06.95-sigintmasking.patch

@@ -1,27 +0,0 @@
-Binary files bc-1.06.95-orig/dc/.dc.c.swp and bc-1.06.95/dc/.dc.c.swp differ
-diff -urNp bc-1.06.95-orig/dc/eval.c bc-1.06.95/dc/eval.c
---- bc-1.06.95-orig/dc/eval.c	2006-06-04 13:04:40.000000000 +0200
-+++ bc-1.06.95/dc/eval.c	2011-09-08 15:11:48.815060585 +0200
-@@ -661,7 +661,9 @@ dc_evalfile DC_DECLARG((fp))
- 	int next_negcmp = 0;
- 	dc_data datum;
- 
--	signal(SIGINT, dc_trap_interrupt);
-+    /* Do not mask SIGINT when running from stdin */
-+	if (fp != stdin)
-+      signal(SIGINT, dc_trap_interrupt);
- 	stdin_lookahead = EOF;
- 	for (c=getc(fp); c!=EOF; c=peekc){
- 		peekc = getc(fp);
-diff -urNp bc-1.06.95-orig/doc/dc.texi bc-1.06.95/doc/dc.texi
---- bc-1.06.95-orig/doc/dc.texi	2006-06-11 10:15:54.000000000 +0200
-+++ bc-1.06.95/doc/dc.texi	2011-09-08 15:09:37.032059798 +0200
-@@ -126,6 +126,8 @@ To exit, use @samp{q}.
- (or whatever other keystroke your system uses to generate a @code{SIGINT})
- does not exit;
- it is used to abort macros that are looping, etc.
-+This is not true if running on stdin to prevent accidental user confusion
-+about @kbd{C-c} unfunctionality.
- 
- A reverse-polish calculator stores numbers on a stack.
- Entering a number pushes it on the stack.

bc-1.06.95.tar.bz2

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

bc.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Mon Apr 10 07:39:45 UTC 2017 - mpluskal@suse.com
+
+- Update to version 1.07.1:
+  * Fixed ibase extension causing problems for read()
+  * Fixed parallel make problem.
+  * Fixed dc "Q" comanmd bug.
+- Changes for version 1.07:
+  * Added void functions.
+  * fixes bug in load_code introduced by mathlib string storage in 1.06.
+  * fix to get long options working.
+  * signal code clean-up.
+  * fixed a bug in the AVL tree routines.
+  * fixed math library to work properly when called with ibase not 10.
+  * fixed a symbol table bug when using more than 32 names.
+  * removed a double free.
+  * Added base 17 to 36 for ibase.
+  * Fixed some memory leaks.
+  * Various small tweaks and doc bug fixes.
+- Drop no longer needed patches:
+  * bc-1.06.95-memleak.patch
+  * bc-1.06.95-matlib.patch
+  * bc-1.06.95-sigintmasking.patch
+- Refresh bc-1.06-dc_ibase.patch 
+- Add gpg signature
+
 -------------------------------------------------------------------
 Mon Mar 16 18:42:48 UTC 2015 - mpluskal@suse.com
 

bc.keyring

@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBEmwKfERBACiM/++m+F5//UyzoIZTd/gHxhpWDAQ1XD04P/FxNEOIPtn21MX
+EGLJBdDL+k+SDwjIIwy9JbYSn6kCCL93kw2ZqqPQ6GQkjKkBE4YaOI7FKlIRgY5M
+nHCwvFQQjpXz0U0tG2HuETIHQZPU308BTXIB6FpxERtiZjA1LdA9Un8lGwCg5CO9
+V81S/aOeYfzoyiwi8MwAH50D/2bhyKnsyxOlh/lBBQNn87/pDKUU8D5z9WUJgA5r
+Lr+qBxxtlJK9MSWmZwcd3Sfd9bqJlKLbXPC7zgIg7p08H2A4WpelOL+EL5lG9GeI
+e84ShTKLiI2TzsIlDHgvTzjCS7DBN44ILRrHHdvt1MlpE6mXCacYtTZATWbA8wAg
++FaRA/0fV4qnvj4CFBRyQa9sfxgtqYYp+A9bTeCuxzvel1k4WWWZUwe5UCRi6/+p
+4ze9MAwmXT20b481rl3vkBVOg5WkgCjWSQDxokwig3geaJyFg47TkgG5rh4EWy7g
+JbS0fCQ7ZL0qkaR5eKZsmNb0Tjqf+iiKmwtTBuB90tKXeIa3c7QgUGhpbCBOZWxz
+b24gPHBoaWxuZWxzb25AYWNtLm9yZz6IYAQTEQIAIAUCSbAp8QIbAwYLCQgHAwIE
+FQIIAwQWAgMBAh4BAheAAAoJEIHCT/Evt7FLQjgAn2Qbda57d9o9WqjiVqxJK2OR
+QxRrAJ47zukl3u4kL0FT6e1pfllGPSIDiLkCDQRJsCnxEAgAqN9yTM4v/fZQaikv
+Nm1MoG/Zp/gLpuib+46huz4zoKnuxzjMhSJLSD7u1gmMSDsP/5nrRElgfJg2xxvc
+CD9SomQP7mRHRp2gMtMGdZf4FwunuJg0ZKj8FEdONwqsSyR8apowhZlC9Myh2oJm
+cP14PP3z3QUoue1vxPHT1D6DCw7zd5DETWd9IdoW31wkC5P2YrOlgf6ar+JvVpll
+7kC+f6FfjBBopSxjVWrufdSe4Iu9sKr55wasVye5pZGdlnD2tIoRrChsiQpjXD6T
+Kw5JIXQi3MddE7wvdzj1PM4Mhk9yleH7yyppHWnL8PGokB3i48ly6EEuva1Sd3gJ
+CbsTRwADBQf+OJsZLs3C4bQDfy/+ioVTz3dnEOrI/XNTlDgs926e0zf56Vso6joa
+CdhDcjogC/nIvwVpAnW8LfIASTdDWyiAGWijGMlXaE/+o1e/CcU9GxrT8gy63jCg
+gcJmnWKdLqxGKcxXMGXSt6Zq4WPPXMjcv7l3RIdfozwVal/I6bGdwcdSEIsbNcYo
+HZghfN+efsaviT+iK8LMCRECYh788y+0TPo/7pMdKNAPoh8OzBk7VuwddSfq0CUf
+WzOaj+MS3WB69dvduRwJu1Z4RabkKxQVFMMXljFqpZpufXQTqpnYM86ighddNqea
+zlImRiB3R2wdTTb5LCVi2EjN9B4kLHV7zohJBBgRAgAJBQJJsCnxAhsMAAoJEIHC
+T/Evt7FLAb4An1repSQe+r7u7FBK/0w1NP68xXF4AJ4jSRrErlQb5CHTWtl3DRBC
+OuX0TA==
+=gj0/
+-----END PGP PUBLIC KEY BLOCK-----

bc.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package bc
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -17,17 +17,16 @@
 
 
 Name:           bc
-Version:        1.06.95
+Version:        1.07.1
 Release:        0
 Summary:        GNU Command Line Calculator
 License:        GPL-2.0+
 Group:          Productivity/Scientific/Math
-Url:            http://www.gnu.org/software/bc/
+Url:            https://www.gnu.org/software/bc/
-Source0:        ftp://alpha.gnu.org/pub/gnu/bc/bc-%{version}.tar.bz2
+Source0:        https://ftp.gnu.org/gnu/bc/bc-%{version}.tar.gz
+Source1:        https://ftp.gnu.org/gnu/bc/bc-%{version}.tar.gz.sig
+Source2:        %{name}.keyring
 Patch1:         bc-1.06-dc_ibase.patch
-Patch2:         bc-1.06.95-memleak.patch
-Patch3:         bc-1.06.95-matlib.patch
-Patch4:         bc-1.06.95-sigintmasking.patch
 BuildRequires:  bison
 BuildRequires:  ed
 BuildRequires:  flex
@@ -36,7 +35,6 @@ BuildRequires:  ncurses-devel
 BuildRequires:  readline-devel
 Requires(post): %{install_info_prereq}
 Requires(preun): %{install_info_prereq}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 bc is an interpreter that supports numbers of arbitrary precision and
@@ -58,34 +56,33 @@ and "pushes" its results back onto the stack.
 
 %prep
 %setup -q
-%patch1 -p1 -b .dc_ibase
+%patch1
-%patch2 -p1 -b .memleak
-%patch3 -p1 -b .matlib
-%patch4 -p1 -b .sigintmask
 
 %build
 %configure \
-    --with-readline \
+  --with-readline \
-    --without-libedit
+  --without-libedit
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install
 
 %post
-%install_info --info-dir=%{_infodir} %{_infodir}/bc.info.gz
+%install_info --info-dir=%{_infodir} %{_infodir}/bc.info%{ext_info}
-%install_info --info-dir=%{_infodir} %{_infodir}/dc.info.gz
+%install_info --info-dir=%{_infodir} %{_infodir}/dc.info%{ext_info}
 
 %preun
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/bc.info.gz
+%install_info_delete --info-dir=%{_infodir} %{_infodir}/bc.info%{ext_info}
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/dc.info.gz
+%install_info_delete --info-dir=%{_infodir} %{_infodir}/dc.info%{ext_info}
 
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog NEWS README COPYING.LIB FAQ
 %{_bindir}/bc
 %{_bindir}/dc
-%{_infodir}/*.info*
+%{_infodir}/bc.info%{ext_info}
-%{_mandir}/man1/*
+%{_infodir}/dc.info%{ext_info}
+%{_mandir}/man1/bc.1%{ext_man}
+%{_mandir}/man1/dc.1%{ext_man}
 
 %changelog