From f7dc6720c6794dfbf2ea547ab211fcc531cd0504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Fri, 27 Jan 2017 13:37:29 +0200 Subject: [PATCH 1/3] update pspec.xml --- system/base/bc/pspec.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/system/base/bc/pspec.xml b/system/base/bc/pspec.xml index e3514491..2f90b61a 100644 --- a/system/base/bc/pspec.xml +++ b/system/base/bc/pspec.xml @@ -22,6 +22,8 @@ fedora/bc-1.06.95-memleak.patch fedora/bc-1.06-dc_ibase.patch fedora/bc-1.06.95-matlib.patch + fedora/bc-1.06.95-sigintmasking.patch + fedora/bc-1.06.95-doc.patch From 21713bba8039b1bb2398edc622ea7c797b48d313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Fri, 27 Jan 2017 13:38:16 +0200 Subject: [PATCH 2/3] new patches in fedora... --- .../base/bc/files/fedora/bc-1.06.95-doc.patch | 24 +++++++++++++++++ .../fedora/bc-1.06.95-sigintmasking.patch | 27 +++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 system/base/bc/files/fedora/bc-1.06.95-doc.patch create mode 100644 system/base/bc/files/fedora/bc-1.06.95-sigintmasking.patch diff --git a/system/base/bc/files/fedora/bc-1.06.95-doc.patch b/system/base/bc/files/fedora/bc-1.06.95-doc.patch new file mode 100644 index 00000000..b75f56e3 --- /dev/null +++ b/system/base/bc/files/fedora/bc-1.06.95-doc.patch @@ -0,0 +1,24 @@ +diff -up wrk/doc/bc.1.wrk wrk/doc/bc.1 +--- wrk/doc/bc.1.wrk 2013-10-02 13:36:52.066295450 +0200 ++++ wrk/doc/bc.1 2013-10-02 13:35:22.738553712 +0200 +@@ -174,6 +174,8 @@ The result of the expression is the sum + The result of the expression is the difference of the two expressions. + .IP "expr * expr" + The result of the expression is the product of the two expressions. ++If a and b are the scales of the two expressions, then the scale of the result is: ++min(a+b,max(scale,a,b)) + .IP "expr / expr" + The result of the expression is the quotient of the two expressions. + The scale of the result is the value of the variable \fBscale\fR. +diff -up wrk/doc/bc.texi.wrk wrk/doc/bc.texi +--- wrk/doc/bc.texi.wrk 2013-10-02 13:17:01.743765518 +0200 ++++ wrk/doc/bc.texi 2013-10-02 13:21:04.479870656 +0200 +@@ -290,6 +290,8 @@ The result of the expression is the diff + + @item expr * expr + The result of the expression is the product of the two expressions. ++If a and b are the scales of the two expressions, then the scale of the result is: ++min(a+b,max(@var{scale},a,b)) + + @item expr / expr + The result of the expression is the quotient of the two expressions. diff --git a/system/base/bc/files/fedora/bc-1.06.95-sigintmasking.patch b/system/base/bc/files/fedora/bc-1.06.95-sigintmasking.patch new file mode 100644 index 00000000..c86340ff --- /dev/null +++ b/system/base/bc/files/fedora/bc-1.06.95-sigintmasking.patch @@ -0,0 +1,27 @@ +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. From 1f5eeada3d04068453cd3a59ee7dd4fe1cb0bf86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Fri, 27 Jan 2017 13:39:43 +0200 Subject: [PATCH 3/3] Add files via upload --- system/base/bc/pspec.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/system/base/bc/pspec.xml b/system/base/bc/pspec.xml index 2f90b61a..3a8b8810 100644 --- a/system/base/bc/pspec.xml +++ b/system/base/bc/pspec.xml @@ -41,6 +41,13 @@ + + 2017-01-27 + 1.06.95 + Release Bump + PisiLinux Community + admin@pisilinux.org + 2016-04-27 1.06.95