Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package calc for openSUSE:Factory checked in
at 2021-02-09 21:16:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/calc (Old)
and /work/SRC/openSUSE:Factory/.calc.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "calc"
Tue Feb 9 21:16:43 2021 rev:20 rq:870320 version:2.12.7.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/calc/calc.changes 2018-11-30
16:32:20.457366698 +0100
+++ /work/SRC/openSUSE:Factory/.calc.new.28504/calc.changes 2021-02-09
21:16:45.202807166 +0100
@@ -1,0 +2,26 @@
+Thu Feb 4 08:22:25 UTC 2021 - Michael Vetter <mvet...@suse.com>
+
+- Update to 2.12.7.6:
+ * The missing cscript/square.calc file has been restored.
+
+-------------------------------------------------------------------
+Thu Feb 4 08:20:34 UTC 2021 - Michael Vetter <mvet...@suse.com>
+
+- Update to 2.12.7.5:
+ * Requiring calc shell scripts to use -s -f at the end of the
+ initial #! line.
+ * Fixed /tmp/mersenne example in calc(1) man page.
+ * Added make variable ${ARCH_CFLAGS}. The ${ARCH_CFLAGS} is
+ added after ${CCMISC} and before ${EXTRA_CFLAGS} when building
+ the ${CFLAGS} for compiling C code. are ${CC} when compiling
+ C files. The default value is:
+ * By default, the calc history file is located in ~/.calc_history.
+ Now, if the environment variable $CALCHISTFILE is defined
+ and is non-empty, then calc history file will be defined
+ by the $CALCHISTFILE environment variable.
+ * Calc as defined 0^0 as 1. However in the past, 0 raised to
+ an expression that evaluated to zero returned 1. The result
+ was that 0^0 was different than 0^(6-6) or even 0^(0).
+ Now, calc will return 1 for 0^(0) and 0^zero when zero == 0.
+
+-------------------------------------------------------------------
Old:
----
calc-2.12.7.2.tar.bz2
New:
----
calc-2.12.7.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ calc.spec ++++++
--- /var/tmp/diff_new_pack.yhxTL3/_old 2021-02-09 21:16:45.954808020 +0100
+++ /var/tmp/diff_new_pack.yhxTL3/_new 2021-02-09 21:16:45.958808025 +0100
@@ -1,7 +1,7 @@
#
# spec file for package calc
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,19 +12,19 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define soname 2
%define libname libcalc%{soname}
Name: calc
-Version: 2.12.7.2
+Version: 2.12.7.6
Release: 0
Summary: C-style arbitrary precision calculator
License: LGPL-2.1-only
Group: Productivity/Scientific/Math
-Url: http://www.isthe.com/chongo/tech/comp/calc/index.html
+URL: http://www.isthe.com/chongo/tech/comp/calc/index.html
Source0: http://www.isthe.com/chongo/src/calc/%{name}-%{version}.tar.bz2
Source1: http://www.isthe.com/chongo/src/calc/checksum.sha-256
Source2: README.openSUSE
++++++ calc-2.12.7.2.tar.bz2 -> calc-2.12.7.6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/BUGS new/calc-2.12.7.6/BUGS
--- old/calc-2.12.7.2/BUGS 2017-06-02 23:50:17.000000000 +0200
+++ new/calc-2.12.7.6/BUGS 2021-02-03 21:51:34.000000000 +0100
@@ -80,6 +80,54 @@
The output of the alg_config.cal resource file is bogus.
We would welcome a replacement for this code.
+ Calc shell scripts do not read from stdin properly,
+ we all as a number of the cscript examples.
+
+ The argv() function is behaving differently
+ when run in calc shell script mode:
+
+ When calc is run as:
+
+ calc -s a bb ccc
+
+ and given this input on the command prompt:
+
+ print "config(\"program\")=", config("program");
+ print "argv()=", argv();
+ argc = argv();
+ for (i=0; i < argc; ++i) {
+ print "argv(":i:")=", argv(i);
+ }
+
+ calc prints:
+
+ config("program")= calc
+ argv()= 3
+ argv(0)= a
+ argv(1)= bb
+ argv(2)= ccc
+
+ but when it is run as a script called ./simple:
+
+ #!/usr/local/bin/calc -q -s -f
+ print "config(\"program\")=", config("program");
+ print "argv()=", argv();
+ argc = argv();
+ for (i=0; i < argc; ++i) {
+ print "argv(":i:")=", argv(i);
+ }
+
+ under Linux prints:
+
+ config("program")= /usr/bin/calc
+ argv()= 4
+ argv(0)= ./simple
+ argv(1)= a
+ argv(2)= bb
+ argv(3)= ccc
+
+ and under macOS simply enters into interactive mode.
+
We are sure some more bugs exist. When you find them, please let
us know! See the above for details on how to report and were to
EMail your bug reports and hopefully patches to fix them.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/CHANGES new/calc-2.12.7.6/CHANGES
--- old/calc-2.12.7.2/CHANGES 2018-11-28 21:23:08.000000000 +0100
+++ new/calc-2.12.7.6/CHANGES 2021-02-03 21:51:50.000000000 +0100
@@ -15,8 +15,60 @@
\t tab byte 0x09 in ASCII encoding
\v vertical tab byte 0x0b in ASCII encoding
- Fixed a segfault when getpwuid() returned NULL during initialization.
- Thanks goes to baratharon GitHub user for reporting this issue.
+ Fixed a segfault when getpwuid() returned NULL during initialization.
+ Thanks goes to baratharon GitHub user for reporting this issue.
+
+ Requiring calc shell scripts to use -s -f at the end of the
+ initial #! line.
+
+ Fixed /tmp/mersenne example in calc(1) man page.
+
+ Added make variable ${ARCH_CFLAGS}. The ${ARCH_CFLAGS} is
+ added after ${CCMISC} and before ${EXTRA_CFLAGS} when building
+ the ${CFLAGS} for compiling C code. are ${CC} when compiling
+ C files. The default value is:
+
+ ARCH_CFLAGS= -march=native
+
+ which directs C compiler to compile for the native machine.
+ To disable use of '-march=native', set ARCH_CFLAGS to the empty
+ string as in:
+
+ make all ARCH_CFLAGS=
+
+ To make calc RPMs more portable, they are compiled with an
+ empty ARCH_CFLAGS.
+
+ Fixed issues relating to compiling on macOS. Fixed issues
+ where <unistd.h> is needed.
+
+ Fixed typos in help/intro and README.md. <<GitHub guilhermgonzaga>>
+
+ Copied missing description lines from help/intro to README.md
+ "What is calc?" section. <<GitHub guilhermgonzaga>>
+
+ GCC 7 added a warning on fall throughs in case statements. It's
+ enabled by -Wextra and treated as an error due to -Wall so it
+ breaks compilation. See -Wimplicit-fallthrough in the GCC
+ manual. The default value is 3, which means a comment matching
+ some specific regexes is enough to disable the warning.
+ Fixed spaces vs tabs and use FALLTHRU as it's used elsewhere.
+ Fixed one FALLTHRU comment that was inconsistent with others.
+ <<thanks jcul>>
+
+ Fixed minor typo on help/power. <<GitHub thegithubr>>
+
+ By default, the calc history file is located in ~/.calc_history.
+ Now, if the environment variable $CALCHISTFILE is defined
+ and is non-empty, then calc history file will be defined
+ by the $CALCHISTFILE environment variable.
+
+ Calc as defined 0^0 as 1. However in the past, 0 raised to
+ an expression that evaluted to zero returned 1. The result
+ was that 0^0 was different than 0^(6-6) or even 0^(0).
+ Now, calc will return 1 for 0^(0) and 0^zero when zero == 0.
+
+ The missing cscript/square.calc file has been restored.
The following are the changes from calc version 2.12.6.10: to 2.12.7.0:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/Makefile new/calc-2.12.7.6/Makefile
--- old/calc-2.12.7.2/Makefile 2018-11-28 21:12:10.000000000 +0100
+++ new/calc-2.12.7.6/Makefile 2021-02-03 21:52:43.000000000 +0100
@@ -1054,7 +1054,7 @@
# The default calc versions
#
-VERSION= 2.12.7.2
+VERSION= 2.12.7.6
# Names of shared libraries with versions
#
@@ -1116,16 +1116,26 @@
EXTRA_CFLAGS=
EXTRA_LDFLAGS=
+# Architecture compile flags
+#
+# The ARCH_CFLAGS are ${CC} when compiling C files. They follow
+# CCMISC and preceed EXTRA_CFLAGS.
+#
+ARCH_CFLAGS= -march=native
+#ARCH_CFLAGS=
+
# COMMON_CFLAGS are the common ${CC} flags used for all programs, both
# intermediate and final calc and calc related programs
#
#if 0 /* start of skip for non-Gnu makefiles */
ifdef ALLOW_CUSTOM
#endif /* end of skip for non-Gnu makefiles */
-COMMON_CFLAGS= -DCALC_SRC ${ALLOW_CUSTOM} ${CCWARN} ${CCMISC} ${EXTRA_CFLAGS}
+COMMON_CFLAGS= -DCALC_SRC ${ALLOW_CUSTOM} ${CCWARN} \
+ ${CCMISC} ${ARCH_CFLAGS} ${EXTRA_CFLAGS}
#if 0 /* start of skip for non-Gnu makefiles */
else
-COMMON_CFLAGS= -DCALC_SRC -UCUSTOM ${CCWARN} ${CCMISC} ${EXTRA_CFLAGS}
+COMMON_CFLAGS= -DCALC_SRC -UCUSTOM ${CCWARN} \
+ ${CCMISC} ${ARCH_CFLAGS} ${EXTRA_CFLAGS}
endif
#endif /* end of skip for non-Gnu makefiles */
@@ -1900,6 +1910,7 @@
CUSTOM_PASSDOWN= \
ALLOW_CUSTOM="${ALLOW_CUSTOM}" \
AR=${AR} \
+ ARCH_CFLAGS=${ARCH_CFLAGS} \
AWK=${AWK} \
BINDIR="${BINDIR}" \
BLD_TYPE="${BLD_TYPE}" \
@@ -2914,7 +2925,7 @@
${TRUE}; \
fi
-have_offscl.h: have_offscl.c ${MAKE_FILE}
+have_offscl.h: have_offscl.c have_unistd.h ${MAKE_FILE}
${Q} ${RM} -f offscl_tmp have_offscl.h
${Q} echo 'forming have_offscl.h'
${Q} echo '/*' > have_offscl.h
@@ -2954,7 +2965,7 @@
${TRUE}; \
fi
-have_posscl.h: have_posscl.c have_fpos.h ${MAKE_FILE}
+have_posscl.h: have_posscl.c have_fpos.h have_unistd.h ${MAKE_FILE}
${Q} ${RM} -f have_posscl have_posscl.o posscl_tmp have_posscl.h
${Q} echo 'forming have_posscl.h'
${Q} echo '/*' > have_posscl.h
@@ -3210,7 +3221,7 @@
${TRUE}; \
fi
-have_getsid.h: have_getsid.c ${MAKE_FILE}
+have_getsid.h: have_getsid.c have_unistd.h ${MAKE_FILE}
${Q} ${RM} -f getsid_tmp have_getsid.h
${Q} echo 'forming have_getsid.h'
${Q} echo '/*' > have_getsid.h
@@ -3250,7 +3261,7 @@
${TRUE}; \
fi
-have_getpgid.h: have_getpgid.c ${MAKE_FILE}
+have_getpgid.h: have_getpgid.c have_unistd.h ${MAKE_FILE}
${Q} ${RM} -f getpgid_tmp have_getpgid.h
${Q} echo 'forming have_getpgid.h'
${Q} echo '/*' > have_getpgid.h
@@ -3332,7 +3343,7 @@
${TRUE}; \
fi
-have_getprid.h: have_getprid.c ${MAKE_FILE}
+have_getprid.h: have_getprid.c have_unistd.h ${MAKE_FILE}
${Q} ${RM} -f getprid_tmp have_getprid.h
${Q} echo 'forming have_getprid.h'
${Q} echo '/*' > have_getprid.h
@@ -4041,6 +4052,7 @@
@echo 'ALIGN32=${ALIGN32}'; echo ''
@echo 'ALLOW_CUSTOM=${ALLOW_CUSTOM}'; echo ''
@echo 'AR=${AR}'; echo ''
+ @echo 'ARCH_CFLAGS=${ARCH_CFLAGS}'; echo ''
@echo 'AWK=${AWK}'; echo ''
@echo 'BINDIR=${BINDIR}'; echo ''
@echo 'BLD_TYPE=${BLD_TYPE}'; echo ''
@@ -5463,6 +5475,7 @@
hist.o: have_unused.h
hist.o: hist.c
hist.o: hist.h
+hist.o: lib_calc.h
hist.o: longbits.h
hist.o: nametype.h
hist.o: qmath.h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/Makefile.simple
new/calc-2.12.7.6/Makefile.simple
--- old/calc-2.12.7.2/Makefile.simple 2018-11-28 21:35:52.000000000 +0100
+++ new/calc-2.12.7.6/Makefile.simple 2021-02-03 21:56:13.000000000 +0100
@@ -981,7 +981,7 @@
# The default calc versions
#
-VERSION= 2.12.7.2
+VERSION= 2.12.7.6
# Names of shared libraries with versions
#
@@ -1043,10 +1043,19 @@
EXTRA_CFLAGS=
EXTRA_LDFLAGS=
+# Architecture compile flags
+#
+# The ARCH_CFLAGS are ${CC} when compiling C files. They follow
+# CCMISC and preceed EXTRA_CFLAGS.
+#
+ARCH_CFLAGS= -march=native
+#ARCH_CFLAGS=
+
# COMMON_CFLAGS are the common ${CC} flags used for all programs, both
# intermediate and final calc and calc related programs
#
-COMMON_CFLAGS= -DCALC_SRC ${ALLOW_CUSTOM} ${CCWARN} ${CCMISC} ${EXTRA_CFLAGS}
+COMMON_CFLAGS= -DCALC_SRC ${ALLOW_CUSTOM} ${CCWARN} \
+ ${CCMISC} ${ARCH_CFLAGS} ${EXTRA_CFLAGS}
# COMMON_LDFLAGS are the common flags used for linking all programs, both
# intermediate and final calc and calc related programs
@@ -1664,6 +1673,7 @@
CUSTOM_PASSDOWN= \
ALLOW_CUSTOM="${ALLOW_CUSTOM}" \
AR=${AR} \
+ ARCH_CFLAGS=${ARCH_CFLAGS} \
AWK=${AWK} \
BINDIR="${BINDIR}" \
BLD_TYPE="${BLD_TYPE}" \
@@ -2624,7 +2634,7 @@
${TRUE}; \
fi
-have_offscl.h: have_offscl.c ${MAKE_FILE}
+have_offscl.h: have_offscl.c have_unistd.h ${MAKE_FILE}
${Q} ${RM} -f offscl_tmp have_offscl.h
${Q} echo 'forming have_offscl.h'
${Q} echo '/*' > have_offscl.h
@@ -2664,7 +2674,7 @@
${TRUE}; \
fi
-have_posscl.h: have_posscl.c have_fpos.h ${MAKE_FILE}
+have_posscl.h: have_posscl.c have_fpos.h have_unistd.h ${MAKE_FILE}
${Q} ${RM} -f have_posscl have_posscl.o posscl_tmp have_posscl.h
${Q} echo 'forming have_posscl.h'
${Q} echo '/*' > have_posscl.h
@@ -2920,7 +2930,7 @@
${TRUE}; \
fi
-have_getsid.h: have_getsid.c ${MAKE_FILE}
+have_getsid.h: have_getsid.c have_unistd.h ${MAKE_FILE}
${Q} ${RM} -f getsid_tmp have_getsid.h
${Q} echo 'forming have_getsid.h'
${Q} echo '/*' > have_getsid.h
@@ -2960,7 +2970,7 @@
${TRUE}; \
fi
-have_getpgid.h: have_getpgid.c ${MAKE_FILE}
+have_getpgid.h: have_getpgid.c have_unistd.h ${MAKE_FILE}
${Q} ${RM} -f getpgid_tmp have_getpgid.h
${Q} echo 'forming have_getpgid.h'
${Q} echo '/*' > have_getpgid.h
@@ -3042,7 +3052,7 @@
${TRUE}; \
fi
-have_getprid.h: have_getprid.c ${MAKE_FILE}
+have_getprid.h: have_getprid.c have_unistd.h ${MAKE_FILE}
${Q} ${RM} -f getprid_tmp have_getprid.h
${Q} echo 'forming have_getprid.h'
${Q} echo '/*' > have_getprid.h
@@ -3713,6 +3723,7 @@
@echo 'ALIGN32=${ALIGN32}'; echo ''
@echo 'ALLOW_CUSTOM=${ALLOW_CUSTOM}'; echo ''
@echo 'AR=${AR}'; echo ''
+ @echo 'ARCH_CFLAGS=${ARCH_CFLAGS}'; echo ''
@echo 'AWK=${AWK}'; echo ''
@echo 'BINDIR=${BINDIR}'; echo ''
@echo 'BLD_TYPE=${BLD_TYPE}'; echo ''
@@ -5118,6 +5129,7 @@
hist.o: have_unused.h
hist.o: hist.c
hist.o: hist.h
+hist.o: lib_calc.h
hist.o: longbits.h
hist.o: nametype.h
hist.o: qmath.h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/README.md new/calc-2.12.7.6/README.md
--- old/calc-2.12.7.2/README.md 2017-06-02 23:50:17.000000000 +0200
+++ new/calc-2.12.7.6/README.md 2021-02-03 08:46:48.000000000 +0100
@@ -1,6 +1,9 @@
# What is calc?
Calc is an interactive calculator which provides for easy large
+numeric calculations, but which also can be easily programmed
+for difficult or long calculations. It can accept a command line
+argument, in which case it executes that single command and exits.
Otherwise, it enters interactive mode. In this mode, it accepts
commands one at a time, processes them, and displays the answers.
In the simplest case, commands are simply expressions which are
@@ -16,7 +19,7 @@
15
```
-Calc as the usual collection of arithmetic operators +, -, /, * as
+Calc has the usual collection of arithmetic operators +, -, /, * as
well as ^ (exponentiation), % (modulus) and // (integer divide).
For example:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/cal/test8900.cal
new/calc-2.12.7.6/cal/test8900.cal
--- old/calc-2.12.7.2/cal/test8900.cal 2017-06-02 23:50:17.000000000 +0200
+++ new/calc-2.12.7.6/cal/test8900.cal 2021-02-03 10:36:01.000000000 +0100
@@ -2057,7 +2057,12 @@
epsilon(eps);
return 5;
}
- if ((stirling2(10, 5) - (42525)) != 0) {
+ /*
+ * Once, when an expression such as 0^(6-6) returned 0,
+ * then stirling2(10, 5) == 42525. However when we made9
+ * 0^(6-6) == 0^0 == 1, then stirling2(10, 5) == 5102999/120.
+ */
+ if ((stirling2(10, 5) - (5102999/120)) != 0) {
epsilon(eps);
return 6;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/calc.c new/calc-2.12.7.6/calc.c
--- old/calc-2.12.7.2/calc.c 2018-09-30 18:31:40.000000000 +0200
+++ new/calc-2.12.7.6/calc.c 2021-02-03 08:28:29.000000000 +0100
@@ -449,7 +449,7 @@
"\t[-O] [-p] [-q] [-s] [-u] [-v] "
"[--] [calc_cmd ...]\n"
"usage: %s ... -f filename\n"
- "1st cscript line: #/path/to/calc ... -f\n",
+ "1st cscript line: #/path/to/calc ... -s -f\n",
program, program);
exit(20);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/calc.h new/calc-2.12.7.6/calc.h
--- old/calc-2.12.7.2/calc.h 2018-03-04 19:34:17.000000000 +0100
+++ new/calc-2.12.7.6/calc.h 2021-02-03 09:51:42.000000000 +0100
@@ -48,6 +48,7 @@
#define HOME "HOME" /* environment variable for home dir */
#define PAGER "PAGER" /* environment variable for help */
#define SHELL "SHELL" /* environment variable for shell */
+#define CALCHISTFILE "CALCHISTFILE" /* history file environment variable */
#define DEFAULTCALCBINDINGS "bindings" /* default calc bindings file */
#define DEFAULTCALCHELP "help" /* help file that -h prints */
#define DEFAULTSHELL "sh" /* default shell to use */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/calc.man new/calc-2.12.7.6/calc.man
--- old/calc-2.12.7.2/calc.man 2018-09-30 18:22:18.000000000 +0200
+++ new/calc-2.12.7.6/calc.man 2021-02-03 21:51:34.000000000 +0100
@@ -1,5 +1,5 @@
.\"
-.\" Copyright (C) 1999-2007,2014,2018 Landon Curt Noll
+.\" Copyright (C) 1999-2007,2014,2018,2021 Landon Curt Noll
.\"
.\" Calc is open software; you can redistribute it and/or modify it under
.\" the terms of the version 2.1 of the GNU Lesser General Public License
@@ -50,7 +50,7 @@
.RB [ [\-\-]\ calc_cmd\ \&.\|.\|. ]
.in -5n
.sp
-\fI#!${BINDIR}/calc\fP\ [other_flags\ \&...] \fB\-f\fP
+\fI#!${BINDIR}/calc\fP\ [other_flags\ \&...] \fB\-s\fP \fB\-f\fP
.SH DESCRIPTION
\&
.br
@@ -219,24 +219,29 @@
.TP
.B \-f
+This flag is normally only with calc shell scripts.
+.sp 1
This flag is required when using calc in
.BR "shell script mode" .
It must be at the end of the initial
.B #!
-line of the script.
+line of the script
+and must be immedately preceeded by the
+.B \-s
+flag.
.sp 1
-This flag is normally only at the end of a calc shell script.
If the first line of an executable file begins
.B #!
followed by the absolute pathname of the
.B calc
-program and the flag
+program and if the first line ends with the two flags
+.B \-s
.B \-f
as in:
.sp 1
.in +5n
.nf
-\fI#!${BINDIR}/calc\fP\ [other_flags\ \&...] \fB\-f\fP
+\fI#!${BINDIR}/calc\fP\ [other_flags\ \&...] \fB\-s\fP \fB\-f\fP
.fi
.in -5n
.sp 1
@@ -270,7 +275,7 @@
.sp 1
.in +5n
.nf
-\fIcalc\fP\ [other_flags\ \&...] \fB\-f\fP filename
+\fIcalc\fP\ [other_flags\ \&...] \fB\-s\fP \fB\-f\fP filename
.fi
.in -5n
.sp 1
@@ -283,6 +288,16 @@
.B \-f
implies
.BR \-s .
+However in a calc shell script,
+one must include
+.B \-f
+before
+.B \-s
+on the initial
+.B #!
+line.
+
+.sp 1
In addition,
.B \-d
and
@@ -753,25 +768,28 @@
.B #!
followed by the absolute pathname of the
.B calc
-program and the flag
+program and the first line ends with the two flags
+.B \-s
.B \-f
as in:
.sp 1
.in +5n
.nf
-\fI#!${BINDIR}/calc\fP\ [other_flags\ \&...] \fB\-f\fP
+\fI#!${BINDIR}/calc\fP\ [other_flags\ \&...] \fB\-s\fP \fB\-f\fP
.fi
.in -5n
.sp 1
the rest of the file will be processed in
.BR "shell script mode" .
Note that
+.B \-s
.B \-f
must at the end of the initial ``#!'' line.
Any other optional
.B "other_flags"
must come before
the
+.B \-s
.BR \-f .
.sp 1
In
@@ -803,18 +821,26 @@
.sp 1
.in +5n
.nf
-\fI#!${BINDIR}/calc\fP\ \&\fB\-q\fP \fB\-f\fP
-#
-# mersenne - an example of a calc \fBshell script file\fP
+\fI#!${BINDIR}/calc\fP\ \&\fB\-q\fP \&\fB\-s\fP \fB\-f\fP
+
+/* setup */
+argc = argv();
+program = argv(0);
+stderr = files(2);
/* parse args */
-if (argv() != 1) {
- fprintf(files(2), "usage: %s exp\\n", config("program"));
+if (argc != 2) {
+ fprintf(stderr, "usage: %s exp\n", program);
+ abort "must give one exponent arg";
+}
+exp = eval(argv(1));
+if (!isint(exp) || exp < 0) {
+ fprintf(stderr, "%s: exp must be non-negative integer\n", program);
abort "must give one exponent arg";
}
/* print the mersenne number */
-print "2^": argv(0) : "-1 =", 2^eval(argv(0))-1;
+print "2^": exp : "-1 =", 2^exp-1;
.fi
.in -5n
.sp 1
@@ -844,9 +870,9 @@
.sp 1
Note that because
.B \-s
-is assumed in
+is required in
.B "shell script mode"
-and non-dashed args are made available as
+non-dashed args are made available as
strings via the
.BR argv ()
builtin function.
@@ -854,16 +880,16 @@
.sp 1
.in +5n
.nf
-2^eval(argv(0))-1
+2^eval(argv(1))-1
.fi
.in -5n
.sp 1
will print the decimal value of 2^n-1
-but
+whereas
.sp 1
.in +5n
.nf
-2^argv(0)-1
+2^argv(1)-1
.fi
.in -5n
.sp 1
@@ -1077,6 +1103,14 @@
This variable is not used if calc was compiled with GNU-readline support.
In that case, the standard readline mechanisms (see readline(3)) are used.
.sp
+.TP 5
+CALCHISTFILE
+Location of the calc history file.
+.sp
+Default value: ~/.calc_history
+.sp
+This variable is not used if calc was compiled with GNU-readline support.
+.sp
.SH CREDIT
\&
.br
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/calc.spec.in
new/calc-2.12.7.6/calc.spec.in
--- old/calc-2.12.7.2/calc.spec.in 2017-06-02 23:50:17.000000000 +0200
+++ new/calc-2.12.7.6/calc.spec.in 2021-02-03 08:28:29.000000000 +0100
@@ -32,7 +32,7 @@
Summary: Arbitrary precision calculator.
Name: calc
Version: <<<PROJECT_VERSION>>>
-Release: 12
+Release: 13
License: LGPL
Group: Applications/Engineering
Source: http://www.isthe.com/chongo/src/calc/%{name}-%{version}.tar.bz2
@@ -76,48 +76,48 @@
%build
echo '-=- calc.spec beginning make clobber -=-'
-make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} \
+make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} ARCH_CFLAGS= \
CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc \
MANDIR=%{_mandir}/man1 EXT= V=@ clobber
echo '-=- calc.spec ending make clobber -=-'
echo '-=- calc.spec beginning make calc-static-only -=-'
-make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} \
+make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} ARCH_CFLAGS= \
CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc \
MANDIR=%{_mandir}/man1 EXT= V=@ calc-static-only BLD_TYPE=calc-static-only
echo '-=- calc.spec ending make calc-static-only -=-'
echo '-=- calc.spec beginning make rpm-hide-static -=-'
-make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} \
+make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} ARCH_CFLAGS= \
CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc \
MANDIR=%{_mandir}/man1 EXT= V=@ rpm-hide-static
echo '-=- calc.spec ending make rpm-hide-static -=-'
echo '-=- calc.spec beginning make clobber (again) -=-'
-make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} \
+make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} ARCH_CFLAGS= \
CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc \
MANDIR=%{_mandir}/man1 EXT= V=@ clobber
echo '-=- calc.spec ending make clobber (again) -=-'
echo '-=- calc.spec beginning make calc-dynamic-only -=-'
-make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} \
+make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} ARCH_CFLAGS= \
CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc \
MANDIR=%{_mandir}/man1 EXT= V=@ calc-dynamic-only \
BLD_TYPE=calc-dynamic-only LD_SHARE=
echo '-=- calc.spec ending make calc-dynamic-only -=-'
echo '-=- calc.spec beginning make chk -=-'
-make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} \
+make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} ARCH_CFLAGS= \
CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc \
MANDIR=%{_mandir}/man1 EXT= V=@ chk
echo '-=- calc.spec ending make chk -=-'
echo '-=- calc.spec beginning make rpm-unhide-static -=-'
-make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} \
+make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} ARCH_CFLAGS= \
CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc \
MANDIR=%{_mandir}/man1 EXT= V=@ rpm-unhide-static
echo '-=- calc.spec ending make rpm-unhide-static -=-'
echo '-=- calc.spec beginning make rpm-clean-static -=-'
-make -j1 BINDIR=%{_bindir} LIBDIR=%{_libdir} \
+make -j1 BINDIR=%{_bindir} LIBDIR=%{_libdir} ARCH_CFLAGS= \
CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc \
MANDIR=%{_mandir}/man1 EXT= V=@ rpm-clean-static
echo '-=- calc.spec ending make rpm-clean-static -=-'
echo '-=- calc.spec beginning make rpm-chk-static -=-'
-make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} \
+make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} ARCH_CFLAGS= \
CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc \
MANDIR=%{_mandir}/man1 EXT= V=@ rpm-chk-static
echo '-=- calc.spec ending make rpm-chk-static -=-'
@@ -125,7 +125,7 @@
%install
echo '-=- calc.spec beginning make install -=-'
mkdir -p %{_buildroot}
-make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} \
+make -j1 T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} ARCH_CFLAGS= \
CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc \
MANDIR=%{_mandir}/man1 EXT= V=@ install
echo '-=- calc.spec ending make install -=-'
@@ -165,6 +165,12 @@
%attr(644, root, root) %{_libdir}/libcustcalc.a
%changelog
+* Sun Mar 24 2019 cLandon Curt Noll http://www.isthe.com/chongo
+- Release: 13
+- Disable compiling with the default ARCH_CFLAGS= -march=native
+ by clearking the ARCH_CFLAGS value in order to maximize
+ the RPM binary protability.
+
* Mon Sep 01 2014 Landon Curt Noll http://www.isthe.com/chongo
- Release: 12
- Removed use of %{?_smp_mflags}. On Ubuntu 14.04, the -j2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/codegen.c new/calc-2.12.7.6/codegen.c
--- old/calc-2.12.7.2/codegen.c 2017-06-02 23:50:17.000000000 +0200
+++ new/calc-2.12.7.6/codegen.c 2021-02-03 08:46:48.000000000 +0100
@@ -1021,7 +1021,7 @@
return;
}
reread();
- /* fall into default case */
+ /*FALLTHRU*/
default:
rescantoken();
@@ -1384,6 +1384,7 @@
switch (gettoken()) {
case T_RIGHTBRACKET:
rescantoken();
+ /*FALLTHRU*/
case T_COMMA:
addop(OP_ONE);
addop(OP_SUB);
@@ -1394,6 +1395,7 @@
switch(gettoken()) {
case T_RIGHTBRACKET:
rescantoken();
+ /*FALLTHRU*/
case T_COMMA:
continue;
}
@@ -2211,6 +2213,7 @@
scanerror(T_NULL,
"Function calls not allowed "
"as expressions");
+ /*FALLTHRU*/
default:
rescantoken();
return type;
@@ -2248,7 +2251,7 @@
if (autodef != T_GLOBAL && autodef != T_LOCAL &&
autodef != T_STATIC)
autodef = 1;
- /* fall into default case */
+ /*FALLTHRU*/
default:
rescantoken();
usesymbol(name, autodef);
@@ -2277,6 +2280,7 @@
scanerror(T_NULL,
"Function calls not allowed "
"as expressions");
+ /*FALLTHRU*/
default:
rescantoken();
return type;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/config.c new/calc-2.12.7.6/config.c
--- old/calc-2.12.7.2/config.c 2018-10-01 01:11:23.000000000 +0200
+++ new/calc-2.12.7.6/config.c 2021-02-03 08:46:48.000000000 +0100
@@ -909,34 +909,42 @@
case CONFIG_PROGRAM:
math_error("The program config parameter is read-only");
/*NOTREACHED*/
+ abort();
case CONFIG_BASENAME:
math_error("The basename config parameter is read-only");
/*NOTREACHED*/
+ abort();
case CONFIG_WINDOWS:
math_error("The windows config parameter is read-only");
/*NOTREACHED*/
+ abort();
case CONFIG_CYGWIN:
math_error("The cygwin config parameter is read-only");
/*NOTREACHED*/
+ abort();
case CONFIG_COMPILE_CUSTOM:
math_error("The custom config parameter is read-only");
/*NOTREACHED*/
+ abort();
case CONFIG_ALLOW_CUSTOM:
math_error("The allow_custom config parameter is read-only");
/*NOTREACHED*/
+ abort();
case CONFIG_VERSION:
math_error("The version config parameter is read-only");
/*NOTREACHED*/
+ abort();
case CONFIG_BASEB:
math_error("The baseb config parameter is read-only");
/*NOTREACHED*/
+ abort();
case CONFIG_REDECL_WARN:
if (vp->v_type == V_NUM) {
@@ -971,10 +979,12 @@
case CONFIG_HZ:
math_error("The clock tick rate config parameter is read-only");
/*NOTREACHED*/
+ abort();
default:
math_error("Setting illegal config parameter");
/*NOTREACHED*/
+ abort();
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/cscript/4dsphere.calc
new/calc-2.12.7.6/cscript/4dsphere.calc
--- old/calc-2.12.7.2/cscript/4dsphere.calc 2017-06-02 23:50:17.000000000
+0200
+++ new/calc-2.12.7.6/cscript/4dsphere.calc 2021-02-03 08:28:29.000000000
+0100
@@ -10,7 +10,7 @@
* ... ...
* x5 y5 z5 w5 point 5 in R^4
*
- * Copyright (C) 2001,2014 Landon Curt Noll
+ * Copyright (C) 2001,2014,2019 Landon Curt Noll
*
* Calc is open software; you can redistribute it and/or modify it under
* the terms of the version 2.1 of the GNU Lesser General Public License
@@ -37,9 +37,11 @@
* parse args
*/
argc = argv();
-if (argc != 25) {
- fprintf(files(2), "usage: %s x0 y0 z0 w0 x1 y1 z1 w1 ... x5 y5 z5 w5\n",
- argv(0));
+stderr = files(2);
+program = argv(0);
+if (argc != 24) {
+ fprintf(stderr, "usage: %s x0 y0 z0 w0 x1 y1 z1 w1 ... x5 y5 z5 w5\n",
+ program);
exit;
}
x0 = eval(argv(1));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/cscript/Makefile
new/calc-2.12.7.6/cscript/Makefile
--- old/calc-2.12.7.2/cscript/Makefile 2017-06-02 23:50:17.000000000 +0200
+++ new/calc-2.12.7.6/cscript/Makefile 2021-02-03 21:40:01.000000000 +0100
@@ -1,7 +1,7 @@
#
# cscript - makefile for calc shell script files
#
-# Copyright (C) 1999-2006,2014,2017 Landon Curt Noll
+# Copyright (C) 1999-2006,2014,2017,2021 Landon Curt Noll
#
# Calc is open software; you can redistribute it and/or modify it under
# the terms of the version 2.1 of the GNU Lesser General Public License
@@ -199,7 +199,8 @@
simple square
SCRIPT_SRC= 4dsphere.calc fproduct.calc mersenne.calc \
- piforever.calc plus.calc powerterm.calc simple.calc square.calc
+ piforever.calc plus.calc powerterm.calc simple.calc \
+ square.calc
# These files are found (but not built) in the distribution
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/cscript/fproduct.calc
new/calc-2.12.7.6/cscript/fproduct.calc
--- old/calc-2.12.7.2/cscript/fproduct.calc 2017-06-02 23:50:17.000000000
+0200
+++ new/calc-2.12.7.6/cscript/fproduct.calc 2021-02-03 08:28:29.000000000
+0100
@@ -8,7 +8,7 @@
* filename where to write the product, use - for stdout
* term ... terms to multiply
*
- * Copyright (C) 2001,2014 Landon Curt Noll
+ * Copyright (C) 2001,2014,2019 Landon Curt Noll
*
* Calc is open software; you can redistribute it and/or modify it under
* the terms of the version 2.1 of the GNU Lesser General Public License
@@ -35,8 +35,10 @@
* parse args
*/
argc = argv();
+stderr = files(2);
+program = argv(0);
if (argc < 2) {
- fprintf(files(2), "usage: %s term [term ...]\n", argv(0));
+ fprintf(stderr, "usage: %s term [term ...]\n", program);
exit;
}
filename = argv(1);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/cscript/mersenne.calc
new/calc-2.12.7.6/cscript/mersenne.calc
--- old/calc-2.12.7.2/cscript/mersenne.calc 2017-06-02 23:50:17.000000000
+0200
+++ new/calc-2.12.7.6/cscript/mersenne.calc 2021-02-03 08:28:29.000000000
+0100
@@ -2,7 +2,7 @@
/*
* mersenne - print the value of a mersenne number
*
- * Copyright (C) 1999-2007,2014 Landon Curt Noll
+ * Copyright (C) 1999-2007,2014,2019 Landon Curt Noll
*
* Calc is open software; you can redistribute it and/or modify it under
* the terms of the version 2.1 of the GNU Lesser General Public License
@@ -32,16 +32,19 @@
/*
* parse args
*/
-if (argv() != 2) {
- /* we include the name of this script in the error message */
- fprintf(files(2), "usage: %s exp\n", config("program"));
- abort "wrong number of args";
+argc = argv();
+stderr = files(2);
+program = argv(0);
+if (argc != 2) {
+ /* we include the name of this script in the error message */
+ fprintf(stderr, "usage: %s exp\n", program);
+ abort "wrong number of args";
}
-global n = eval(argv(1));
+n = eval(argv(1));
if (!isint(n) || n <= 0) {
- quit "Argument to be a positive integer";
+ quit "Argument to be a positive integer";
}
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/cscript/piforever.calc
new/calc-2.12.7.6/cscript/piforever.calc
--- old/calc-2.12.7.2/cscript/piforever.calc 2017-06-02 23:50:17.000000000
+0200
+++ new/calc-2.12.7.6/cscript/piforever.calc 2021-02-03 08:28:29.000000000
+0100
@@ -1,8 +1,8 @@
-#!/usr/local/src/bin/calc/calc -q -f
+#!/usr/local/src/bin/calc/calc -q -s -f
/*
* piforever - print digits of pi forever (or as long as your mem/cpu allow)
*
- * Copyright (C) 1999-2007,2014 Landon Curt Noll
+ * Copyright (C) 1999-2007,2014,2019 Landon Curt Noll
*
* Calc is open software; you can redistribute it and/or modify it under
* the terms of the version 2.1 of the GNU Lesser General Public License
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/cscript/plus.calc
new/calc-2.12.7.6/cscript/plus.calc
--- old/calc-2.12.7.2/cscript/plus.calc 2017-06-02 23:50:17.000000000 +0200
+++ new/calc-2.12.7.6/cscript/plus.calc 2021-02-03 08:28:29.000000000 +0100
@@ -1,8 +1,8 @@
-#!/usr/local/src/bin/calc/calc -q -f
+#!/usr/local/src/bin/calc/calc -q -s -f
/*
* plus - add two or more arguments together
*
- * Copyright (C) 1999-2007,2014 Landon Curt Noll
+ * Copyright (C) 1999-2007,2014,2019 Landon Curt Noll
*
* Calc is open software; you can redistribute it and/or modify it under
* the terms of the version 2.1 of the GNU Lesser General Public License
@@ -32,10 +32,13 @@
/*
* parse args
*/
-if (argv() < 2) {
- /* we include the name of this script in the error message */
- fprintf(files(2), "usage: %s value ...\n", config("program"));
- abort "not enough args";
+argc = argv();
+stderr = files(2);
+program = argv(0);
+if (argc < 2) {
+ /* we include the name of this script in the error message */
+ fprintf(stderr, "usage: %s value ...\n", program);
+ abort "not enough args";
}
/*
@@ -45,6 +48,6 @@
*/
sum = 0;
for (i=1; i < argv(); ++i) {
- sum += eval(argv(i));
+ sum += eval(argv(i));
}
print sum;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/cscript/powerterm.calc
new/calc-2.12.7.6/cscript/powerterm.calc
--- old/calc-2.12.7.2/cscript/powerterm.calc 2017-06-02 23:50:17.000000000
+0200
+++ new/calc-2.12.7.6/cscript/powerterm.calc 2021-02-03 08:28:29.000000000
+0100
@@ -8,7 +8,7 @@
* base_limit largest base we will consider (def: 10000)
* value value to convert into sums of powers of integers
*
- * Copyright (C) 2001,2014 Landon Curt Noll
+ * Copyright (C) 2001,2014,2019 Landon Curt Noll
*
* Calc is open software; you can redistribute it and/or modify it under
* the powerterm of the version 2.1 of the GNU Lesser General Public License
@@ -35,28 +35,31 @@
/*
* parse args
*/
+argc = argv();
+stderr = files(2);
+program = argv(0);
config("verbose_quit", 0),;
base_lim = 10000; /* default: highest base we will consider */
-if (argv() < 2 || argv() > 3) {
- fprintf(files(2), "usage: %s [base_limit] value\n", argv(0));
+if (argc < 2 || argc > 3) {
+ fprintf(stderr, "usage: %s [base_limit] value\n", program);
exit;
}
-if (argv() == 3) {
+if (argc == 3) {
x = eval(argv(2));
base_lim = eval(argv(1));
} else {
x = eval(argv(1));
}
if (! isint(x)) {
- fprintf(files(2), "%s: value must be an integer\n");
+ fprintf(stderr, "%s: value must be an integer\n", program);
exit;
}
if (! isint(base_lim)) {
- fprintf(files(2), "%s: base limit must be an integer\n");
+ fprintf(stderr, "%s: base limit must be an integer\n", program);
exit;
}
if (base_lim <= 1) {
- fprintf(files(2), "%s: base limit is too small\n");
+ fprintf(stderr, "%s: base limit is too small\n", program);
exit;
}
++base_lim;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/cscript/simple.calc
new/calc-2.12.7.6/cscript/simple.calc
--- old/calc-2.12.7.2/cscript/simple.calc 2017-06-02 23:50:17.000000000
+0200
+++ new/calc-2.12.7.6/cscript/simple.calc 2021-02-03 08:28:29.000000000
+0100
@@ -1,8 +1,8 @@
-#!/usr/local/src/bin/calc/calc -q -f
+#!/usr/local/src/bin/calc/calc -q -s -f
/*
* simple - an example of a simple calc shell script
*
- * Copyright (C) 1999-2007,2014 Landon Curt Noll
+ * Copyright (C) 1999-2007,2014,2019 Landon Curt Noll
*
* Calc is open software; you can redistribute it and/or modify it under
* the terms of the version 2.1 of the GNU Lesser General Public License
@@ -30,3 +30,9 @@
* This is an example of a simple calc shell script.
*/
print "This simple calc shell script works!"
+print "config(\"program\")=", config("program");
+print "argv()=", argv();
+argc = argv();
+for (i=0; i < argc; ++i) {
+ print "argv(":i:")=", argv(i);
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/cscript/square.calc
new/calc-2.12.7.6/cscript/square.calc
--- old/calc-2.12.7.2/cscript/square.calc 2017-06-02 23:50:17.000000000
+0200
+++ new/calc-2.12.7.6/cscript/square.calc 2021-02-03 08:28:29.000000000
+0100
@@ -1,8 +1,8 @@
-#!/usr/local/src/bin/calc/calc -q -f
+#!/usr/local/src/bin/calc/calc -q -s -f
/*
* sqaure - print the squares of input values
*
- * Copyright (C) 2000-2007,2014 Ernest Bowen
+ * Copyright (C) 2000-2007,2014,2019 Ernest Bowen
*
* Calc is open software; you can redistribute it and/or modify it under
* the terms of the version 2.1 of the GNU Lesser General Public License
@@ -33,10 +33,6 @@
* cat file | ./square
* echo "123" | ./square
*
- * Within calc:
- *
- * > read square
- *
* With input from a terminal, there is no prompt but each non-empty
* line of input is evaluated as a calc expression and if it can be
* calculated, the square of the value of that expression is displayed.
@@ -59,6 +55,6 @@
*/
-global s;
-while ((s = prompt("")))
+while (s = fgetline(files(0))) {
print "\t":eval(s)^2;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/custom/Makefile
new/calc-2.12.7.6/custom/Makefile
--- old/calc-2.12.7.2/custom/Makefile 2018-11-28 21:35:02.000000000 +0100
+++ new/calc-2.12.7.6/custom/Makefile 2021-02-03 21:55:32.000000000 +0100
@@ -348,7 +348,7 @@
# The default calc versions
#
-VERSION= 2.12.7.2
+VERSION= 2.12.7.6
# Names of shared libraries with versions
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/custom/Makefile.head
new/calc-2.12.7.6/custom/Makefile.head
--- old/calc-2.12.7.2/custom/Makefile.head 2018-11-28 21:12:10.000000000
+0100
+++ new/calc-2.12.7.6/custom/Makefile.head 2021-02-03 21:52:43.000000000
+0100
@@ -348,7 +348,7 @@
# The default calc versions
#
-VERSION= 2.12.7.2
+VERSION= 2.12.7.6
# Names of shared libraries with versions
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/custom/Makefile.simple
new/calc-2.12.7.6/custom/Makefile.simple
--- old/calc-2.12.7.2/custom/Makefile.simple 2018-11-28 21:35:52.000000000
+0100
+++ new/calc-2.12.7.6/custom/Makefile.simple 2021-02-03 21:56:13.000000000
+0100
@@ -333,7 +333,7 @@
# The default calc versions
#
-VERSION= 2.12.7.2
+VERSION= 2.12.7.6
# Names of shared libraries with versions
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/file.c new/calc-2.12.7.6/file.c
--- old/calc-2.12.7.2/file.c 2018-10-01 01:11:23.000000000 +0200
+++ new/calc-2.12.7.6/file.c 2021-02-03 08:46:48.000000000 +0100
@@ -1021,6 +1021,7 @@
switch (ch) {
case 's':
printstring = TRUE;
+ /*FALLTHRU*/
case 'c':
printchar = TRUE;
case 'd':
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/fposval.c new/calc-2.12.7.6/fposval.c
--- old/calc-2.12.7.2/fposval.c 2017-06-02 23:50:17.000000000 +0200
+++ new/calc-2.12.7.6/fposval.c 2021-02-03 11:23:57.000000000 +0100
@@ -125,7 +125,8 @@
* systems a FILEPOS is not a scalar hince we must memcpy.
*/
printf("#define SWAP_HALF_IN_FILEPOS(dest, src)\t%s\n",
- "memcpy((void *)(dest), (void *)(src), sizeof(FPOS_POS_LEN))");
+ "\\\n\tmemcpy((void *)(dest), (void *)(src), "
+ "sizeof(FPOS_POS_LEN))");
#endif /* HAVE_FILEPOS_SCALAR */
#endif /* CALC_BYTE_ORDER == BIG_ENDIAN */
putchar('\n');
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/have_getpgid.c
new/calc-2.12.7.6/have_getpgid.c
--- old/calc-2.12.7.2/have_getpgid.c 2017-06-02 23:50:17.000000000 +0200
+++ new/calc-2.12.7.6/have_getpgid.c 2021-02-03 08:28:29.000000000 +0100
@@ -1,7 +1,7 @@
/*
* have_getpgid - determine if we have getpgid()
*
- * Copyright (C) 1999 Landon Curt Noll
+ * Copyright (C) 1999,2021 Landon Curt Noll
*
* Calc is open software; you can redistribute it and/or modify it under
* the terms of the version 2.1 of the GNU Lesser General Public License
@@ -39,7 +39,10 @@
*/
#include <sys/types.h>
+#include "have_unistd.h"
+#if defined(HAVE_UNISTD_H)
#include <unistd.h>
+#endif
int
main(void)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/have_getprid.c
new/calc-2.12.7.6/have_getprid.c
--- old/calc-2.12.7.2/have_getprid.c 2017-06-02 23:50:17.000000000 +0200
+++ new/calc-2.12.7.6/have_getprid.c 2021-02-03 08:28:29.000000000 +0100
@@ -1,7 +1,7 @@
/*
* have_getprid - determine if we have getprid()
*
- * Copyright (C) 1999 Landon Curt Noll
+ * Copyright (C) 1999,2021 Landon Curt Noll
*
* Calc is open software; you can redistribute it and/or modify it under
* the terms of the version 2.1 of the GNU Lesser General Public License
@@ -40,7 +40,10 @@
#include <sys/types.h>
+#include "have_unistd.h"
+#if defined(HAVE_UNISTD_H)
#include <unistd.h>
+#endif
int
main(void)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/have_getsid.c
new/calc-2.12.7.6/have_getsid.c
--- old/calc-2.12.7.2/have_getsid.c 2017-06-02 23:50:17.000000000 +0200
+++ new/calc-2.12.7.6/have_getsid.c 2021-02-03 08:28:29.000000000 +0100
@@ -1,7 +1,7 @@
/*
* have_getsid - determine if we have getsid()
*
- * Copyright (C) 1999 Landon Curt Noll
+ * Copyright (C) 1999,2021 Landon Curt Noll
*
* Calc is open software; you can redistribute it and/or modify it under
* the terms of the version 2.1 of the GNU Lesser General Public License
@@ -40,6 +40,10 @@
#include <sys/types.h>
+#include "have_unistd.h"
+#if defined(HAVE_UNISTD_H)
+#include <unistd.h>
+#endif
int
main(void)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/have_memmv.c
new/calc-2.12.7.6/have_memmv.c
--- old/calc-2.12.7.2/have_memmv.c 2017-06-02 23:50:17.000000000 +0200
+++ new/calc-2.12.7.6/have_memmv.c 2021-02-03 08:28:29.000000000 +0100
@@ -1,7 +1,7 @@
/*
* have_memmv - Determine if we have memmove()
*
- * Copyright (C) 1999 Landon Curt Noll
+ * Copyright (C) 1999,2021 Landon Curt Noll
*
* Calc is open software; you can redistribute it and/or modify it under
* the terms of the version 2.1 of the GNU Lesser General Public License
@@ -40,6 +40,7 @@
#include <stdio.h>
+#include <string.h>
#define MOVELEN 3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/have_newstr.c
new/calc-2.12.7.6/have_newstr.c
--- old/calc-2.12.7.2/have_newstr.c 2017-06-02 23:50:17.000000000 +0200
+++ new/calc-2.12.7.6/have_newstr.c 2021-02-03 08:28:29.000000000 +0100
@@ -1,7 +1,7 @@
/*
* have_newstr - Determine if we have a system without ANSI C string functions
*
- * Copyright (C) 1999 Landon Curt Noll
+ * Copyright (C) 1999,2021 Landon Curt Noll
*
* Calc is open software; you can redistribute it and/or modify it under
* the terms of the version 2.1 of the GNU Lesser General Public License
@@ -42,6 +42,7 @@
#include <stdio.h>
+#include <string.h>
#define MOVELEN 3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/have_offscl.c
new/calc-2.12.7.6/have_offscl.c
--- old/calc-2.12.7.2/have_offscl.c 2017-06-02 23:50:17.000000000 +0200
+++ new/calc-2.12.7.6/have_offscl.c 2021-02-03 08:28:29.000000000 +0100
@@ -1,7 +1,7 @@
/*
* have_offscl - determine if we have a scalar off_t element
*
- * Copyright (C) 1999 Landon Curt Noll
+ * Copyright (C) 1999,2021 Landon Curt Noll
*
* Calc is open software; you can redistribute it and/or modify it under
* the terms of the version 2.1 of the GNU Lesser General Public License
@@ -46,6 +46,10 @@
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include "have_unistd.h"
+#if defined(HAVE_UNISTD_H)
+#include <unistd.h>
+#endif
int
main(void)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/have_posscl.c
new/calc-2.12.7.6/have_posscl.c
--- old/calc-2.12.7.2/have_posscl.c 2017-06-02 23:50:17.000000000 +0200
+++ new/calc-2.12.7.6/have_posscl.c 2021-02-03 08:28:29.000000000 +0100
@@ -1,7 +1,7 @@
/*
* have_posscl - determine if we have a scalar FILEPOS element
*
- * Copyright (C) 1999 Landon Curt Noll
+ * Copyright (C) 1999,2021 Landon Curt Noll
*
* Calc is open software; you can redistribute it and/or modify it under
* the terms of the version 2.1 of the GNU Lesser General Public License
@@ -45,6 +45,10 @@
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include "have_unistd.h"
+#if defined(HAVE_UNISTD_H)
+#include <unistd.h>
+#endif
#include "have_fpos.h"
int
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/help/environment
new/calc-2.12.7.6/help/environment
--- old/calc-2.12.7.2/help/environment 2017-06-02 23:50:17.000000000 +0200
+++ new/calc-2.12.7.6/help/environment 2021-02-03 09:42:58.000000000 +0100
@@ -7,7 +7,8 @@
/ ./ ../ ~
- If this variable does not exist, a compiled value
+ If this variable does not exist, or if this
+ variable is an empty string, a compiled value
is used. Typically compiled in value is:
.:./cal:~/cal:${CALC_SHAREDIR}:${CUSTOMCALDIR}
@@ -27,7 +28,8 @@
line), calc searches for files along the :-separated
$CALCRC environment variable.
- If this variable does not exist, a compiled value
+ If this variable does not exist, or if this
+ variable is an empty string, a compiled value
is used. Typically compiled in value is:
${CALC_SHAREDIR}/startup:~/.calcrc:./.calcinit
@@ -66,7 +68,8 @@
This value is taken to be the home directory of the
current user. It is used when files begin with '~/'.
- If this variable does not exist, the home directory password
+ If this variable does not exist, or if this
+ variable is an empty string, the home directory password
entry of the current user is used. If that information
is not available, '.' is used.
@@ -75,7 +78,8 @@
When invoking help, this environment variable is used
to display a help file.
- If this variable does not exist, a compiled value
+ If this variable does not exist, or if this
+ variable is an empty string, a compiled value
is used. Typically compiled in value is something
such as 'more', 'less', 'pg' or 'cat'.
@@ -84,11 +88,20 @@
When a !-command is used, the program indicated by
this environment variable is used.
- If this variable does not exist, a compiled value
+ If this variable does not exist, or if this
+ variable is an empty string, a compiled value
is used. Typically compiled in value is something
such as 'sh' is used.
-## Copyright (C) 1999 Landon Curt Noll
+ CALCHISTFILE
+
+ This value is taken to be the calc history file.
+
+ If this variable does not exist, or if this
+ variable is an empty string, then ~/.calc_history
+ is used.
+
+## Copyright (C) 1999,2021 Landon Curt Noll
##
## Calc is open software; you can redistribute it and/or modify it under
## the terms of the version 2.1 of the GNU Lesser General Public License
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/help/factor
new/calc-2.12.7.6/help/factor
--- old/calc-2.12.7.2/help/factor 2017-06-02 23:50:17.000000000 +0200
+++ new/calc-2.12.7.6/help/factor 2021-02-03 13:31:46.000000000 +0100
@@ -16,7 +16,8 @@
assume n and limit are both nonnegative.
If n has a prime proper factor less than or equal to limit, then
- factor(n, limit) returns the smallest such factor.
+ factor(n, limit) returns the smallest such factor, or 1 if no
+ factor was found below the limit.
NOTE: A proper factor of n>1 is a factor < n. In other words,
for n>1 is not a proper factor of itself. The value 1
@@ -50,7 +51,7 @@
isprime, lfactor, nextcand, nextprime, prevcand, prevprime,
pfact, pix, ptest
-## Copyright (C) 1999-2006 Landon Curt Noll
+## Copyright (C) 1999-2006,2021 Landon Curt Noll
##
## Calc is open software; you can redistribute it and/or modify it under
## the terms of the version 2.1 of the GNU Lesser General Public License
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/help/intro new/calc-2.12.7.6/help/intro
--- old/calc-2.12.7.2/help/intro 2017-06-02 23:50:17.000000000 +0200
+++ new/calc-2.12.7.6/help/intro 2021-02-03 21:51:34.000000000 +0100
@@ -15,7 +15,7 @@
15
- Calc as the usual collection of arithmetic operators +, -, /, *
+ Calc has the usual collection of arithmetic operators +, -, /, *
as well as ^ (exponentiation), % (modulus) and // (integer divide).
For example:
@@ -137,7 +137,7 @@
f2(79)
- will produce;
+ will produce:
1009847364737869270905302433221592504062302663202724609375
@@ -150,7 +150,7 @@
sc(31, 61)
- will produce;
+ will produce:
256772
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/help/power new/calc-2.12.7.6/help/power
--- old/calc-2.12.7.2/help/power 2017-06-02 23:50:17.000000000 +0200
+++ new/calc-2.12.7.6/help/power 2021-02-03 08:46:48.000000000 +0100
@@ -6,7 +6,7 @@
TYPES
x number
- x number
+ y number
eps nonzero real, defaults to epsilon()
return number
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/hist.c new/calc-2.12.7.6/hist.c
--- old/calc-2.12.7.2/hist.c 2018-03-04 19:31:44.000000000 +0100
+++ new/calc-2.12.7.6/hist.c 2021-02-03 09:30:06.000000000 +0100
@@ -51,6 +51,7 @@
#endif
#include "calc.h"
+#include "lib_calc.h"
#include "hist.h"
#include "have_string.h"
@@ -1461,9 +1462,6 @@
*/
-/* name of history file */
-char *my_calc_history = NULL;
-
size_t
hist_getline(char *prompt, char *buf, size_t len)
{
@@ -1504,8 +1502,8 @@
/* only save last number of entries */
stifle_history(HISTORY_LEN);
- if (my_calc_history)
- write_history(my_calc_history);
+ if (calc_history)
+ write_history(calc_history);
}
@@ -1519,10 +1517,12 @@
using_history();
/* name of history file */
- my_calc_history = tilde_expand("~/.calc_history");
+ if (calc_history == NULL) {
+ calc_history = tilde_expand("~/.calc_history");
+ }
/* read previous history */
- read_history(my_calc_history);
+ read_history(calc_history);
atexit(my_stifle_history);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/lib_calc.c new/calc-2.12.7.6/lib_calc.c
--- old/calc-2.12.7.2/lib_calc.c 2018-11-28 21:32:52.000000000 +0100
+++ new/calc-2.12.7.6/lib_calc.c 2021-02-03 09:25:17.000000000 +0100
@@ -145,6 +145,7 @@
char *home = NULL; /* $HOME or default */
char *pager = NULL; /* $PAGER or default */
char *shell = NULL; /* $SHELL or default */
+char *calc_history = NULL; /* $CALCHISTFILE or ~/.calc_history */
int stdin_tty = FALSE; /* TRUE if stdin is a tty */
int havecommands = FALSE; /* TRUE if have one or more cmd args */
long stoponerror = 0; /* >0 => stop, <0 => continue, ==0 => use -c */
@@ -546,6 +547,12 @@
shell = (c ? strdup(c) : NULL);
if (shell == NULL || *shell == '\0')
shell = DEFAULTSHELL;
+
+ /* determine the $CALCHISTFILE value */
+ c = (no_env ? NULL : getenv(CALCHISTFILE));
+ calc_history = (c ? strdup(c) : NULL);
+ if (calc_history == NULL || *calc_history == '\0')
+ calc_history = NULL; /* will use ~/.calc_history */
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/lib_calc.h new/calc-2.12.7.6/lib_calc.h
--- old/calc-2.12.7.2/lib_calc.h 2017-06-02 23:50:17.000000000 +0200
+++ new/calc-2.12.7.6/lib_calc.h 2021-02-03 09:29:39.000000000 +0100
@@ -74,4 +74,9 @@
/* number of parse/scan warnings found */
EXTERN unsigned long calc_warn_cnt;
+/*
+ * calc history file
+ */
+EXTERN char *calc_history;
+
#endif /* !INCLUDE_MATH_ERROR_H */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/opcodes.c new/calc-2.12.7.6/opcodes.c
--- old/calc-2.12.7.2/opcodes.c 2017-06-02 23:50:17.000000000 +0200
+++ new/calc-2.12.7.6/opcodes.c 2021-02-03 08:46:48.000000000 +0100
@@ -4104,6 +4104,7 @@
case OP_QUIT:
freestringconstant(
(long)fp->f_opcodes[pc]);
+ break;
}
/*FALLTHRU*/
case OPLOC:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/qio.c new/calc-2.12.7.6/qio.c
--- old/calc-2.12.7.2/qio.c 2018-11-05 01:16:39.000000000 +0100
+++ new/calc-2.12.7.6/qio.c 2021-02-03 08:46:48.000000000 +0100
@@ -144,6 +144,7 @@
case '-':
sign = -1;
ch = *fmt++;
+ /*FALLTHRU*/
default:
if (('0' <= ch && ch <= '9') ||
ch == '.' || ch == '*') {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/token.c new/calc-2.12.7.6/token.c
--- old/calc-2.12.7.2/token.c 2018-11-05 01:04:39.000000000 +0100
+++ new/calc-2.12.7.6/token.c 2021-02-03 08:46:48.000000000 +0100
@@ -447,6 +447,7 @@
case '\n':
if (!newlines)
break;
+ /*FALLTHRU*/
case EOF:
reread();
scanerror(T_NULL,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/value.c new/calc-2.12.7.6/value.c
--- old/calc-2.12.7.2/value.c 2018-10-19 03:47:04.000000000 +0200
+++ new/calc-2.12.7.6/value.c 2021-02-03 10:20:18.000000000 +0100
@@ -1879,9 +1879,9 @@
*vres = error_value(E_1OVER0);
break;
}
- /* 0 ^ non-neg is zero, including 0^0 */
+ /* 0 ^ non-neg is 1, including 0^0 */
vres->v_type = V_NUM;
- vres->v_num = qlink(&_qzero_);
+ vres->v_num = qlink(&_qone_);
} else if (qisint(real_v2)) {
vres->v_num = qpowi(v1->v_num, real_v2);
} else {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calc-2.12.7.2/version.c new/calc-2.12.7.6/version.c
--- old/calc-2.12.7.2/version.c 2018-11-05 17:57:47.000000000 +0100
+++ new/calc-2.12.7.6/version.c 2021-02-03 21:52:30.000000000 +0100
@@ -1,7 +1,7 @@
/*
* version - determine the version of calc
*
- * Copyright (C) 1999-2018 David I. Bell and Landon Curt Noll
+ * Copyright (C) 1999-2021 David I. Bell and Landon Curt Noll
*
* Primary author: David I. Bell
*
@@ -45,7 +45,7 @@
#define MAJOR_VER 2 /* major library version */
#define MINOR_VER 12 /* minor library version */
#define MAJOR_PATCH 7 /* major software level under library version */
-#define MINOR_PATCH 2 /* minor software level or 0 if not patched */
+#define MINOR_PATCH 6 /* minor software level or 0 if not patched */
/*
@@ -69,7 +69,7 @@
char *Copyright = "\n"
"calc - arbitrary precision calculator\n"
"\n"
- "Copyright (C) 1999-2017 David I. Bell, Landon Curt Noll "
+ "Copyright (C) 1999-2021 David I. Bell, Landon Curt Noll "
"and Ernest Bowen\n"
"\n"
"Initial author: David I. Bell\n"
++++++ checksum.sha-256 ++++++
--- /var/tmp/diff_new_pack.yhxTL3/_old 2021-02-09 21:16:46.990809198 +0100
+++ /var/tmp/diff_new_pack.yhxTL3/_new 2021-02-09 21:16:46.990809198 +0100
@@ -4,28 +4,23 @@
#
# sha256sum filename
#
-3e8045ad32c8b660f9bdc83ecaf005693dbc5cec2dd56c46b84438d2b431dc76
calc-2.12.6.10-12.src.rpm
-923d2527727165c748c3eb9779fe627f3342fa96301291acd78bfdcae022d2a9
calc-2.12.6.10-12.x86_64.rpm
-c861c402f7e5ac36bf1d082ae95f0a4a83ee8b46747bf1ab010e4cab148c20bf
calc-2.12.6.10.tar.bz2
-314b5eaf2edddd675860d3ff287e9b9256ae92cc99083d92a005a0ca11092d95
calc-2.12.6.9-12.src.rpm
-28d0bdded7c61d9dea5592eaef459c76f49555f083b6b887754fbea507711a26
calc-2.12.6.9-12.x86_64.rpm
-6ac100f9ccec40e20838023113ed86c3a0f10037e37b8168bbf85bc11d675313
calc-2.12.6.9.tar.bz2
-a52a53144d55fa6669ad81dd875dc1603e3df9a32a6354f0fdd6626390ec6ebe
calc-2.12.7.0-12.src.rpm
-3fc4cfd94a8a6ea08ac8a594a4c0679d9a0310d654bd8963080a07fd9767f8d8
calc-2.12.7.0-12.x86_64.rpm
-4b48892e11adcd734db67ba135d916d29e0d07db1e32cb4a6e8b56e32e1895c2
calc-2.12.7.0.tar.bz2
716aab14a76d4bf892a0c30c77fa0b3c6b20540b35910e2dfa7855edbc5afd94
calc-2.12.7.1-12.src.rpm
0c3810f8400481aab71ccd2bbdf753fa3eaa6ad2fabadcaadfce1fb84bf03d9a
calc-2.12.7.1-12.x86_64.rpm
eb1dc5dd680019e30264109167e20539fe9ac869049d8b1639781a51d1dea84c
calc-2.12.7.1.tar.bz2
a74bebe6b73d5c51c4b2eed4ed34dff57fa8698dfb9fbb8d1d0a5c393a1001a7
calc-2.12.7.2-12.src.rpm
72d65cd2516502bcb3542286d18f8300acf0217ca93f34116064ed8250adb041
calc-2.12.7.2-12.x86_64.rpm
57af44181ca3af7348c82ee628cfd221677a09fef11a29d2e5667726d5aafc90
calc-2.12.7.2.tar.bz2
-64be52e48955efb1b45055884c0059c764178b40a90689c1f46a560ce2039895
calc-debuginfo-2.12.6.10-12.x86_64.rpm
-924b04b852a300b57fcda68271c58745d576ab3f4207e581c92b8037627518a7
calc-debuginfo-2.12.6.9-12.x86_64.rpm
-002b67677cecd2bcd7b982019c13f3ff1c568daea972c0b78153eda0f42f8b18
calc-debuginfo-2.12.7.0-12.x86_64.rpm
+d4f60143c1243a80b51f7d0e2ce146562d1748073ed0c74b89478606bd5f0464
calc-2.12.7.5-13.src.rpm
+de3586b2af19f8efc15472a8c2206436649b0d6f8682b13ad89afc75e1f6ca17
calc-2.12.7.5-13.x86_64.rpm
+eed12c0907b7aeb60135e474956b6e5c8c5b5eecb19b99f272a5a3d88a91898a
calc-2.12.7.5.tar.bz2
+2c3d9d025f9906aa5c3165d68a6639ec793d66eee5d5a75481e12738b955618f
calc-2.12.7.6-13.src.rpm
+f5aa2dfdbf2e3cd332f8598827dcfea21d57405dba847323ef96dc22921d8db4
calc-2.12.7.6-13.x86_64.rpm
+3e0f27bd6f910f2d556fe5e0fb9b670f16445640fcd157101b26556b2abccec9
calc-2.12.7.6.tar.bz2
d0fbe0a33f3c5f7dcbaf3f5725121feec67aa95d416b0164e92210d9dec928d2
calc-debuginfo-2.12.7.1-12.x86_64.rpm
f95d095cffe5b9e5d575c7e0338a9932f6f97b64a8eff4b5b42cfc5e36f179d3
calc-debuginfo-2.12.7.2-12.x86_64.rpm
-59cdab4780206ead34254de416ccd3b3c33a3e4dd0da34424faeac272a239bc9
calc-devel-2.12.6.10-12.x86_64.rpm
-a27915ff307df638eedb796ba7f121da2e2ed9eb6f7fc2288128eb611951ae5a
calc-devel-2.12.6.9-12.x86_64.rpm
-0e2442340f70be2e2e6650fcbb0f3d23454962b68e38eb2e6349be99412fbbeb
calc-devel-2.12.7.0-12.x86_64.rpm
+ae6ef45776411d33ef01ab8a5a1b9096270436cb239843761cc1385d02bef134
calc-debuginfo-2.12.7.5-13.x86_64.rpm
+610ed3b233c9d4636e95080d6a4d0ae5e4603f0d716005a26b3cb87b2cc60d32
calc-debuginfo-2.12.7.6-13.x86_64.rpm
2b39127026d5f47d4d484de0256c5913474d8309e8ffd3eea0158b4ec0fda462
calc-devel-2.12.7.1-12.x86_64.rpm
b7ecad22ca6dab0ad7a141d829e15665060e27ef85d5bf1b81b4d2c201c39f90
calc-devel-2.12.7.2-12.x86_64.rpm
+4bba1bb9b85fde7a1d365b0ed4df61db23ee16f51ab4342bcbae33ea6864e06f
calc-devel-2.12.7.5-13.x86_64.rpm
+9541d0aa883a4408b69ca453afde0421615782211857d05d062e538311714fd7
calc-devel-2.12.7.6-13.x86_64.rpm
