* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pspp/, sci-mathematics/pspp/files/
@ 2022-06-26 6:27 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-06-26 6:27 UTC (permalink / raw
To: gentoo-commits
commit: 763704f6740d7f1d1d00887c95be8a38015b3447
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 06:20:45 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 06:27:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=763704f6
sci-mathematics/pspp: drop 1.2.0-r1, 1.4.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-mathematics/pspp/Manifest | 2 -
.../pspp/files/pspp-1.2.0-CVE-2018-20230.patch | 134 ---------------------
.../pspp/files/pspp-1.2.0-CVE-2019-9211.patch | 74 ------------
.../pspp/files/pspp-1.2.0-fix-gcc10.patch | 30 -----
.../pspp/files/pspp-1.2.0-fix-overflow.patch | 32 -----
.../pspp/files/pspp-1.2.0-fix-segfaults.patch | 45 -------
.../pspp/files/pspp-1.2.0-fix-tests.patch | 61 ----------
sci-mathematics/pspp/files/pspp-1.2.0-py3.patch | 38 ------
sci-mathematics/pspp/pspp-1.2.0-r1.ebuild | 112 -----------------
sci-mathematics/pspp/pspp-1.4.1.ebuild | 90 --------------
10 files changed, 618 deletions(-)
diff --git a/sci-mathematics/pspp/Manifest b/sci-mathematics/pspp/Manifest
index a74e8e99b3d2..84e479a3e5cf 100644
--- a/sci-mathematics/pspp/Manifest
+++ b/sci-mathematics/pspp/Manifest
@@ -1,3 +1 @@
-DIST pspp-1.2.0.tar.gz 7213194 BLAKE2B f468c6e025f996c9f806fb03e94a4497f02b774c509457cc6295bbefe37abc7e2ecf10d2876c8cff9a979d7a4264c7c185e1cec5fd1d5f2f00f1c6eae4da775e SHA512 49eed2b55f10584abba18ff7d2020fd08691bbc1a3c2f332e6d283e32aa84e0abdae6092d17db9c1a539c63d85ecdfcc2dad40c94a06904b8893a1976e5e48d3
-DIST pspp-1.4.1.tar.gz 7848393 BLAKE2B c9232aa3d4905d4be54ae993db6a4b37b3696c748e15c8ba6c46c7e56f9974aefe597f893fdc5431af237ad3923da1ef271db39e4d94725ccf93f0a0df443ef4 SHA512 c664a6c6f4f1826db396ad776d81cadc791e4f661c603a7f164f70f9571a84cfae6fec116356b3f950991245b2b0dc9805e75193a055a242558cda1209e7830f
DIST pspp-1.6.0.tar.gz 9553836 BLAKE2B 4c12003838d7f6c3613d76626d88b24f4dac4b6f507db54b03be5f09027472704ae8ee6ce44d8756c7cd1e12a65ab836cb1f7d004220df8da47f47af85c4a771 SHA512 c8b746b9ea802a95f048e377b22d723701c5e532358aa3e4993edcc73046c4823c440dd988833b69b4ea84ac6b02a442db7daac415bef4c1081efddd9857982d
diff --git a/sci-mathematics/pspp/files/pspp-1.2.0-CVE-2018-20230.patch b/sci-mathematics/pspp/files/pspp-1.2.0-CVE-2018-20230.patch
deleted file mode 100644
index f0fee070deb6..000000000000
--- a/sci-mathematics/pspp/files/pspp-1.2.0-CVE-2018-20230.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-Upstream: https://git.savannah.gnu.org/cgit/pspp.git/commit/?id=abd1f816ca3b4f382bddf4564ad092aa934f0ccc
-Bug: https://bugs.gentoo.org/679392
-
-From abd1f816ca3b4f382bddf4564ad092aa934f0ccc Mon Sep 17 00:00:00 2001
-From: Ben Pfaff <blp@cs.stanford.edu>
-Date: Tue, 1 Jan 2019 08:36:05 -0800
-Subject: pspp-dump-sav: Issue error message for too-large extension records.
-
-CVE-2018-20230.
----
- NEWS | 2 ++
- utilities/pspp-dump-sav.c | 30 ++++++++++++++++++------------
- 2 files changed, 20 insertions(+), 12 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index 3263062ca..191a9804b 100644
---- a/NEWS
-+++ b/NEWS
-@@ -9,6 +9,8 @@ Changes since 1.2.0:
- * Plain text output is no longer divided into pages, since it is now
- rarely printed on paper.
-
-+ * Bug fix for CVE-2018-20230.
-+
- Changes from 1.0.1 to 1.2.0:
-
- * New experimental command SAVE DATA COLLECTION to save MDD files.
-diff --git a/utilities/pspp-dump-sav.c b/utilities/pspp-dump-sav.c
-index aeb648665..b0001ac61 100644
---- a/utilities/pspp-dump-sav.c
-+++ b/utilities/pspp-dump-sav.c
-@@ -37,6 +37,7 @@
- #include "gl/progname.h"
- #include "gl/version-etc.h"
- #include "gl/xalloc.h"
-+#include "gl/xsize.h"
-
- #define ID_MAX_LEN 64
-
-@@ -99,7 +100,7 @@ static void read_simple_compressed_data (struct sfm_reader *, int max_cases);
- static void read_zlib_compressed_data (struct sfm_reader *);
-
- static struct text_record *open_text_record (
-- struct sfm_reader *, size_t size);
-+ struct sfm_reader *, size_t size, size_t count);
- static void close_text_record (struct text_record *);
- static bool read_variable_to_value_pair (struct text_record *,
- char **key, char **value);
-@@ -735,7 +736,7 @@ read_extra_product_info (struct sfm_reader *r,
- const char *s;
-
- printf ("%08llx: extra product info\n", (long long int) ftello (r->file));
-- text = open_text_record (r, size * count);
-+ text = open_text_record (r, size, count);
- s = text_get_all (text);
- print_string (s, strlen (s));
- close_text_record (text);
-@@ -749,7 +750,7 @@ read_mrsets (struct sfm_reader *r, size_t size, size_t count)
-
- printf ("%08llx: multiple response sets\n",
- (long long int) ftello (r->file));
-- text = open_text_record (r, size * count);
-+ text = open_text_record (r, size, count);
- for (;;)
- {
- const char *name;
-@@ -909,7 +910,7 @@ read_long_var_name_map (struct sfm_reader *r, size_t size, size_t count)
-
- printf ("%08llx: long variable names (short => long)\n",
- (long long int) ftello (r->file));
-- text = open_text_record (r, size * count);
-+ text = open_text_record (r, size, count);
- while (read_variable_to_value_pair (text, &var, &long_name))
- printf ("\t%s => %s\n", var, long_name);
- close_text_record (text);
-@@ -926,7 +927,7 @@ read_long_string_map (struct sfm_reader *r, size_t size, size_t count)
-
- printf ("%08llx: very long strings (variable => length)\n",
- (long long int) ftello (r->file));
-- text = open_text_record (r, size * count);
-+ text = open_text_record (r, size, count);
- while (read_variable_to_value_pair (text, &var, &length_s))
- printf ("\t%s => %d\n", var, atoi (length_s));
- close_text_record (text);
-@@ -1004,7 +1005,7 @@ read_datafile_attributes (struct sfm_reader *r, size_t size, size_t count)
- struct text_record *text;
-
- printf ("%08llx: datafile attributes\n", (long long int) ftello (r->file));
-- text = open_text_record (r, size * count);
-+ text = open_text_record (r, size, count);
- read_attributes (r, text, "datafile");
- close_text_record (text);
- }
-@@ -1196,7 +1197,7 @@ read_variable_attributes (struct sfm_reader *r, size_t size, size_t count)
- struct text_record *text;
-
- printf ("%08llx: variable attributes\n", (long long int) ftello (r->file));
-- text = open_text_record (r, size * count);
-+ text = open_text_record (r, size, count);
- for (;;)
- {
- const char *variable = text_tokenize (text, ':');
-@@ -1389,18 +1390,23 @@ struct text_record
- size_t pos; /* Current position in buffer. */
- };
-
--/* Reads SIZE bytes into a text record for R,
-+/* Reads SIZE * COUNT bytes into a text record for R,
- and returns the new text record. */
- static struct text_record *
--open_text_record (struct sfm_reader *r, size_t size)
-+open_text_record (struct sfm_reader *r, size_t size, size_t count)
- {
- struct text_record *text = xmalloc (sizeof *text);
-- char *buffer = xmalloc (size + 1);
-- read_bytes (r, buffer, size);
-+
-+ if (size_overflow_p (xsum (1, xtimes (size, count))))
-+ sys_error (r, "Extension record too large.");
-+
-+ size_t n_bytes = size * count;
-+ char *buffer = xmalloc (n_bytes + 1);
-+ read_bytes (r, buffer, n_bytes);
- buffer[size] = '\0';
- text->reader = r;
- text->buffer = buffer;
-- text->size = size;
-+ text->size = n_bytes;
- text->pos = 0;
- return text;
- }
---
-cgit v1.2.1
-
diff --git a/sci-mathematics/pspp/files/pspp-1.2.0-CVE-2019-9211.patch b/sci-mathematics/pspp/files/pspp-1.2.0-CVE-2019-9211.patch
deleted file mode 100644
index eb0b84414e88..000000000000
--- a/sci-mathematics/pspp/files/pspp-1.2.0-CVE-2019-9211.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Source: https://git.savannah.gnu.org/cgit/pspp.git/commit/?id=0b842a84353790534a401e09a8d3bdd3d25bc3a6
-Bug: https://bugs.gentoo.org/679392
-
-From 0b842a84353790534a401e09a8d3bdd3d25bc3a6 Mon Sep 17 00:00:00 2001
-From: Ben Pfaff <blp@cs.stanford.edu>
-Date: Wed, 27 Feb 2019 20:11:06 -0800
-Subject: sys-file-writer: Remove assertions based on file position.
-
-These assertions can fail if the underlying file is not a regular file,
-e.g. if it is a device such as /dev/null.
-
-CVE-2019-9211.
-See also https://bugzilla.redhat.com/show_bug.cgi?id=1683499.
-See also https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-9211.
-See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=923417.
----
- src/data/sys-file-writer.c | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/src/data/sys-file-writer.c b/src/data/sys-file-writer.c
-index df5108e2a..bbe58aecd 100644
---- a/src/data/sys-file-writer.c
-+++ b/src/data/sys-file-writer.c
-@@ -953,7 +953,6 @@ write_long_string_value_labels (struct sfm_writer *w,
- const char *encoding = dict_get_encoding (dict);
- size_t n_vars = dict_get_var_cnt (dict);
- size_t size, i;
-- off_t start UNUSED;
-
- /* Figure out the size in advance. */
- size = 0;
-@@ -985,7 +984,6 @@ write_long_string_value_labels (struct sfm_writer *w,
- write_int (w, 1); /* Data item (byte) size. */
- write_int (w, size); /* Number of data items. */
-
-- start = ftello (w->file);
- for (i = 0; i < n_vars; i++)
- {
- struct variable *var = dict_get_var (dict, i);
-@@ -1022,7 +1020,6 @@ write_long_string_value_labels (struct sfm_writer *w,
- free (label);
- }
- }
-- assert (ftello (w->file) == start + size);
- }
-
- static void
-@@ -1032,7 +1029,6 @@ write_long_string_missing_values (struct sfm_writer *w,
- const char *encoding = dict_get_encoding (dict);
- size_t n_vars = dict_get_var_cnt (dict);
- size_t size, i;
-- off_t start UNUSED;
-
- /* Figure out the size in advance. */
- size = 0;
-@@ -1058,7 +1054,6 @@ write_long_string_missing_values (struct sfm_writer *w,
- write_int (w, 1); /* Data item (byte) size. */
- write_int (w, size); /* Number of data items. */
-
-- start = ftello (w->file);
- for (i = 0; i < n_vars; i++)
- {
- struct variable *var = dict_get_var (dict, i);
-@@ -1087,7 +1082,6 @@ write_long_string_missing_values (struct sfm_writer *w,
- write_bytes (w, value_str (value, width), 8);
- }
- }
-- assert (ftello (w->file) == start + size);
- }
-
- static void
---
-cgit v1.2.1
-
diff --git a/sci-mathematics/pspp/files/pspp-1.2.0-fix-gcc10.patch b/sci-mathematics/pspp/files/pspp-1.2.0-fix-gcc10.patch
deleted file mode 100644
index d228ccc42596..000000000000
--- a/sci-mathematics/pspp/files/pspp-1.2.0-fix-gcc10.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Upstream: https://git.savannah.gnu.org/cgit/pspp.git/commit/?id=614bbfbc4be1f4f47d55d3fbee9ae20f3a9955bb
-Gentoo Bug: https://bugs.gentoo.org/708548
-
-commit 614bbfbc4be1f4f47d55d3fbee9ae20f3a9955bb
-Author: Ben Pfaff <blp@cs.stanford.edu>
-Date: Fri Nov 16 20:27:30 2018 -0800
-
- psppire: Fix multiple definitions of align_enum_type and two others.
-
- These were defined in both psppire-dict.c and widgets.c, which causes a
- problem building with -fno-common (which is desirable because it allows
- Address Sanitizer to work better).
-
-diff --git a/src/ui/gui/widgets.c b/src/ui/gui/widgets.c
-index 26a5dac4f..6ce129249 100644
---- a/src/ui/gui/widgets.c
-+++ b/src/ui/gui/widgets.c
-@@ -171,9 +171,9 @@ enum_to_string (const GValue *src, GValue *dest)
-
-
-
--GType align_enum_type;
--GType measure_enum_type;
--GType role_enum_type;
-+extern GType align_enum_type;
-+extern GType measure_enum_type;
-+extern GType role_enum_type;
-
-
- extern const GEnumValue align[];
diff --git a/sci-mathematics/pspp/files/pspp-1.2.0-fix-overflow.patch b/sci-mathematics/pspp/files/pspp-1.2.0-fix-overflow.patch
deleted file mode 100644
index 8c31c5f87020..000000000000
--- a/sci-mathematics/pspp/files/pspp-1.2.0-fix-overflow.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Upstream: https://git.savannah.gnu.org/cgit/pspp.git/commit/?id=be42ce976006feed2a7ba7599ee417c28887af52
-
-From be42ce976006feed2a7ba7599ee417c28887af52 Mon Sep 17 00:00:00 2001
-From: Ben Pfaff <blp@cs.stanford.edu>
-Date: Fri, 22 Feb 2019 17:16:40 -0800
-Subject: pspp-dump-sav; Fix write past end of buffer in corner case.
-
-If count == 0 and size > 0, then n_bytes is 0, buffer is a 1-byte
-allocation, and the assignment to buffer[size] would write to buffer[1]
-(or past it), which is past the end of the allocation.
-
-Found by Address Sanitizer.
----
- utilities/pspp-dump-sav.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/utilities/pspp-dump-sav.c b/utilities/pspp-dump-sav.c
-index 1d8d78c87..70687ebc8 100644
---- a/utilities/pspp-dump-sav.c
-+++ b/utilities/pspp-dump-sav.c
-@@ -1403,7 +1403,7 @@ open_text_record (struct sfm_reader *r, size_t size, size_t count)
- size_t n_bytes = size * count;
- char *buffer = xmalloc (n_bytes + 1);
- read_bytes (r, buffer, n_bytes);
-- buffer[size] = '\0';
-+ buffer[n_bytes] = '\0';
- text->reader = r;
- text->buffer = buffer;
- text->size = n_bytes;
---
-cgit v1.2.1
-
diff --git a/sci-mathematics/pspp/files/pspp-1.2.0-fix-segfaults.patch b/sci-mathematics/pspp/files/pspp-1.2.0-fix-segfaults.patch
deleted file mode 100644
index 03b9d00fe73a..000000000000
--- a/sci-mathematics/pspp/files/pspp-1.2.0-fix-segfaults.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Upstream: https://git.savannah.gnu.org/cgit/pspp.git/commit/?id=df8cf077b2aacb7fe7b33dd8cb90ba57c8681aa0
-
-From df8cf077b2aacb7fe7b33dd8cb90ba57c8681aa0 Mon Sep 17 00:00:00 2001
-From: John Darrington <john@darrington.wattle.id.au>
-Date: Sat, 2 Mar 2019 15:29:39 +0100
-Subject: PSPPIRE: Avoid some segmentation faults when corrupt data is
- encountered.
-
----
- src/ui/gui/psppire-data-store.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c
-index f97b8eaf1..3c2765f5d 100644
---- a/src/ui/gui/psppire-data-store.c
-+++ b/src/ui/gui/psppire-data-store.c
-@@ -183,6 +183,8 @@ psppire_data_store_value_to_string (gpointer unused, PsppireDataStore *store, gi
- g_return_val_if_fail (variable, g_strdup ("???"));
-
- GVariant *vrnt = g_value_get_variant (v);
-+ g_return_val_if_fail (vrnt, g_strdup ("???"));
-+
- union value val;
- value_variant_get (&val, vrnt);
-
-@@ -231,12 +233,14 @@ __get_value (GtkTreeModel *tree_model,
- if (NULL == variable)
- return;
-
-- g_value_init (value, G_TYPE_VARIANT);
--
- gint row = GPOINTER_TO_INT (iter->user_data);
-
- struct ccase *cc = datasheet_get_row (store->datasheet, row);
-
-+ g_return_if_fail (cc);
-+
-+ g_value_init (value, G_TYPE_VARIANT);
-+
- const union value *val = case_data_idx (cc, var_get_case_index (variable));
-
- GVariant *vv = value_variant_new (val, var_get_width (variable));
---
-cgit v1.2.1
-
diff --git a/sci-mathematics/pspp/files/pspp-1.2.0-fix-tests.patch b/sci-mathematics/pspp/files/pspp-1.2.0-fix-tests.patch
deleted file mode 100644
index 1b92572cc820..000000000000
--- a/sci-mathematics/pspp/files/pspp-1.2.0-fix-tests.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Upstream: https://git.savannah.gnu.org/cgit/pspp.git/commit/?id=fe94912b9c8682c4666873b84c83cda88f4c135d
-
-commit fe94912b9c8682c4666873b84c83cda88f4c135d
-Author: Ben Pfaff <blp@cs.stanford.edu>
-Date: Mon Nov 26 06:54:52 2018 -0800
-
- segment: Fix behavior when #! line is not new-line terminated.
-
- The code here is supposed to maintain a invariant that, when it returns a
- nonnegative value, it initializes *type, but it failed to do that when a
- #! line did not end in a new-line. This fixes the problem.
-
- Bug #55101.
- Thanks for Friedrich Beckmann for narrowing down the problem.
- Found by the Debian buildd: https://buildd.debian.org/status/fetch.php?pkg=pspp&arch=arm64&ver=1.2.0-1&stamp=1543183214&raw=0
-
-diff --git a/src/language/lexer/segment.c b/src/language/lexer/segment.c
-index c0a09973c..c607c4bd1 100644
---- a/src/language/lexer/segment.c
-+++ b/src/language/lexer/segment.c
-@@ -92,21 +92,26 @@ segmenter_parse_shbang__ (struct segmenter *s, const char *input, size_t n,
- {
- if (input[1] == '!')
- {
-- int ofs;
--
-- for (ofs = 2; ofs < n; ofs++)
-- if (input[ofs] == '\n')
-- {
-- if (input[ofs] == '\n' && input[ofs - 1] == '\r')
-- ofs--;
--
-- s->state = S_GENERAL;
-- s->substate = SS_START_OF_COMMAND;
-- *type = SEG_SHBANG;
-- return ofs;
-- }
-+ for (int ofs = 2; ; ofs++)
-+ {
-+ if (ofs >= n)
-+ {
-+ if (!eof)
-+ return -1;
-+ }
-+ else if (input[ofs] == '\n')
-+ {
-+ if (input[ofs - 1] == '\r')
-+ ofs--;
-+ }
-+ else
-+ continue;
-
-- return eof ? ofs : -1;
-+ s->state = S_GENERAL;
-+ s->substate = SS_START_OF_COMMAND;
-+ *type = SEG_SHBANG;
-+ return ofs;
-+ }
- }
- }
- else if (!eof)
diff --git a/sci-mathematics/pspp/files/pspp-1.2.0-py3.patch b/sci-mathematics/pspp/files/pspp-1.2.0-py3.patch
deleted file mode 100644
index d2bf940eae64..000000000000
--- a/sci-mathematics/pspp/files/pspp-1.2.0-py3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Upstream: https://git.savannah.gnu.org/cgit/pspp.git/commit/?id=123c3f55a80630655e84f97c9df558d988fa0055
-
-commit 123c3f55a80630655e84f97c9df558d988fa0055
-Author: Ben Pfaff <blp@cs.stanford.edu>
-Date: Mon Nov 19 08:35:23 2018 -0800
-
- test-date-input.py: Make compatible with Python 3.
-
-diff --git a/tests/data/test-date-input.py b/tests/data/test-date-input.py
-index 6ccc2f8f4..cdab260d6 100644
---- a/tests/data/test-date-input.py
-+++ b/tests/data/test-date-input.py
-@@ -50,8 +50,8 @@ def print_all_formats(date, template, formatted, exp_y, exp_m, exp_d,
- global n
- n += 1
- year, month, day, julian, hour, minute, second = date
-- quarter = (month - 1) / 3 + 1
-- week = (julian - 1) / 7 + 1
-+ quarter = (month - 1) // 3 + 1
-+ week = (julian - 1) // 7 + 1
- if year >= 1930 and year < 2030:
- years = ('%d' % year, '%d' % (year % 100))
- else:
-@@ -163,10 +163,10 @@ def print_all_formats(date, template, formatted, exp_y, exp_m, exp_d,
- EPOCH = -577734 # 14 Oct 1582
- expected = (EPOCH - 1
- + 365 * (exp_y - 1)
-- + (exp_y - 1) / 4
-- - (exp_y - 1) / 100
-- + (exp_y - 1) / 400
-- + (367 * exp_m - 362) / 12
-+ + (exp_y - 1) // 4
-+ - (exp_y - 1) // 100
-+ + (exp_y - 1) // 400
-+ + (367 * exp_m - 362) // 12
- + (0 if exp_m <= 2
- else -1 if exp_m >= 2 and is_leap_year(exp_y)
- else -2)
diff --git a/sci-mathematics/pspp/pspp-1.2.0-r1.ebuild b/sci-mathematics/pspp/pspp-1.2.0-r1.ebuild
deleted file mode 100644
index 24268f0ab119..000000000000
--- a/sci-mathematics/pspp/pspp-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit elisp-common python-any-r1 xdg-utils
-
-DESCRIPTION="Program for statistical analysis of sampled data"
-HOMEPAGE="https://www.gnu.org/software/pspp/pspp.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="cairo doc emacs examples gtk ncurses nls perl postgres test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( cairo )"
-
-RDEPEND="
- dev-libs/libxml2:2
- sci-libs/gsl:0=
- sys-devel/gettext
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- sys-libs/zlib
- virtual/libiconv
- cairo? (
- x11-libs/cairo[svg]
- x11-libs/pango
- )
- emacs? ( >=app-editors/emacs-23.1:* )
- gtk? (
- x11-libs/gtk+:3
- x11-libs/gtksourceview:3.0=
- x11-libs/spread-sheet-widget
- cairo? ( dev-util/glib-utils )
- )
- postgres? ( dev-db/postgresql:=[server] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- sys-devel/gettext
- virtual/pkgconfig
- doc? ( virtual/latex-base )
- test? ( ${PYTHON_DEPS} )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-CVE-2018-20230.patch
- "${FILESDIR}"/${P}-CVE-2019-9211.patch
- "${FILESDIR}"/${P}-fix-overflow.patch
- "${FILESDIR}"/${P}-fix-segfaults.patch
- "${FILESDIR}"/${P}-fix-gcc10.patch
- "${FILESDIR}"/${P}-py3.patch
- "${FILESDIR}"/${P}-fix-tests.patch
-)
-
-SITEFILE=50${PN}-gentoo.el
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
- sed -i '/appdata$/s/appdata$/metainfo/' Makefile.in || die
-}
-
-src_configure() {
- econf \
- --disable-static \
- $(use_enable nls) \
- $(use_with cairo) \
- $(use_with gtk gui) \
- $(use_with perl perl-module) \
- $(use_with postgres libpq)
-}
-
-src_compile() {
- default
- if use doc; then
- emake html pdf
- HTML_DOCS=( doc/pspp{,-dev}.html )
- fi
- use emacs && elisp-compile *.el
-}
-
-src_install() {
- default
-
- use doc && dodoc doc/pspp{,-dev}.pdf
- if use examples; then
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
- if use emacs; then
- elisp-install ${PN} *.el *.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- find "${D}" -name '*.la' -type f -delete || die
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/pspp/pspp-1.4.1.ebuild b/sci-mathematics/pspp/pspp-1.4.1.ebuild
deleted file mode 100644
index 06b745ac8406..000000000000
--- a/sci-mathematics/pspp/pspp-1.4.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit python-any-r1 xdg
-
-DESCRIPTION="Program for statistical analysis of sampled data"
-HOMEPAGE="https://www.gnu.org/software/pspp/pspp.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cairo doc examples gtk ncurses nls perl postgres test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( cairo )"
-
-RDEPEND="
- dev-libs/libxml2:2
- sci-libs/gsl:0=
- sys-devel/gettext
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- sys-libs/zlib
- virtual/libiconv
- cairo? (
- x11-libs/cairo[svg]
- x11-libs/pango
- )
- gtk? (
- x11-libs/gtk+:3
- x11-libs/gtksourceview:3.0=
- >=x11-libs/spread-sheet-widget-0.6
- cairo? ( dev-util/glib-utils )
- )
- postgres? ( dev-db/postgresql:=[server] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- sys-devel/gettext
- virtual/pkgconfig
- doc? ( virtual/latex-base )
- test? ( ${PYTHON_DEPS} )"
-
-pkg_pretend() {
- ewarn "Starting with pspp-1.4.0 the pspp-mode emacs package is no longer"
- ewarn "shipped with pspp itself, and should instead be fetched from ELPA:"
- ewarn "https://elpa.gnu.org/packages/pspp-mode.html"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
- sed -i '/appdata$/s/appdata$/metainfo/' Makefile.in || die
-}
-
-src_configure() {
- econf \
- --disable-static \
- $(use_enable nls) \
- $(use_with cairo) \
- $(use_with gtk gui) \
- $(use_with perl perl-module) \
- $(use_with postgres libpq)
-}
-
-src_compile() {
- default
- if use doc; then
- emake html pdf
- HTML_DOCS=( doc/pspp{,-dev}.html )
- fi
-}
-
-src_install() {
- default
-
- use doc && dodoc doc/pspp{,-dev}.pdf
- if use examples; then
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- find "${ED}" -name '*.la' -type f -delete || die
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pspp/, sci-mathematics/pspp/files/
@ 2022-06-26 7:19 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-06-26 7:19 UTC (permalink / raw
To: gentoo-commits
commit: e42969762748853d91279157ca2d851e27da74ed
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 07:18:54 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 07:18:56 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4296976
sci-mathematics/pspp: add note re which
Not backporting it for now b/c not worth the eautoreconf, I guess.
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../pspp/files/pspp-1.6.1-drop-which-tests.patch | 28 ++++++++++++++++++++++
sci-mathematics/pspp/pspp-1.6.1.ebuild | 1 +
2 files changed, 29 insertions(+)
diff --git a/sci-mathematics/pspp/files/pspp-1.6.1-drop-which-tests.patch b/sci-mathematics/pspp/files/pspp-1.6.1-drop-which-tests.patch
new file mode 100644
index 000000000000..5303df4dc2e6
--- /dev/null
+++ b/sci-mathematics/pspp/files/pspp-1.6.1-drop-which-tests.patch
@@ -0,0 +1,28 @@
+https://git.savannah.gnu.org/cgit/pspp.git/commit/?id=f0ac9253e8b84691cec17fc80422993949a91cc1
+
+From f0ac9253e8b84691cec17fc80422993949a91cc1 Mon Sep 17 00:00:00 2001
+From: Friedrich Beckmann <friedrich.beckmann@gmx.de>
+Date: Sun, 26 Jun 2022 09:07:18 +0200
+Subject: tests/atlocal.in - switched from which to command -v
+
+Sam James reported a possible future build problem due to the
+usage of the "which" command:
+
+https://savannah.gnu.org/bugs/?62675
+
+I replace "which" with "command -v" as proposed. Thanks for your
+support.
+
+Closes: 62675
+--- a/tests/atlocal.in
++++ b/tests/atlocal.in
+@@ -71,7 +71,7 @@ alias pspp='pspp --no-statrc'
+ # Avoids error messages during tests if $TERM is set to an unknown terminal.
+ TERM=; unset TERM
+
+-pspp_diff=`which diff`
++pspp_diff=`command -v diff`
+ if test X"$RUNNER" = Xwine; then
+ diff () {
+ $pspp_diff -w "$@"
+cgit v1.1
diff --git a/sci-mathematics/pspp/pspp-1.6.1.ebuild b/sci-mathematics/pspp/pspp-1.6.1.ebuild
index 2fd9cf7edbdb..befeed9034a2 100644
--- a/sci-mathematics/pspp/pspp-1.6.1.ebuild
+++ b/sci-mathematics/pspp/pspp-1.6.1.ebuild
@@ -14,6 +14,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+# Note: can drop test infra + which dep in next release!
IUSE="doc examples gtk ncurses nls perl postgres test"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pspp/, sci-mathematics/pspp/files/
@ 2023-01-01 14:30 Michael Orlitzky
0 siblings, 0 replies; 3+ messages in thread
From: Michael Orlitzky @ 2023-01-01 14:30 UTC (permalink / raw
To: gentoo-commits
commit: 1542309301fd9e3f4e35c8685ef956b6f9f58377
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 31 16:52:55 2022 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Jan 1 14:27:06 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15423093
sci-mathematics/pspp: new revision to fix a few security and QA issues.
We fix CVE-2022-39831 and CVE-2022-39832 the same way upstream did, by
refusing to install the vulnerable program (which was mainly only used
for debugging anyway). We now also use a more accurate LICENSE, and add
a patch to fix underlinking visible with lld/mold.
Bug: https://bugs.gentoo.org/868618
Closes: https://bugs.gentoo.org/732048
Closes: https://bugs.gentoo.org/877751
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
.../pspp/files/pspp-1.6.2-underlinking.patch | 27 +++++++
sci-mathematics/pspp/pspp-1.6.2-r2.ebuild | 88 ++++++++++++++++++++++
2 files changed, 115 insertions(+)
diff --git a/sci-mathematics/pspp/files/pspp-1.6.2-underlinking.patch b/sci-mathematics/pspp/files/pspp-1.6.2-underlinking.patch
new file mode 100644
index 000000000000..c4f3672d6716
--- /dev/null
+++ b/sci-mathematics/pspp/files/pspp-1.6.2-underlinking.patch
@@ -0,0 +1,27 @@
+From 27f3d4cf2a92a91c078e54d9e67af441df140edc Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 31 Dec 2022 22:08:11 -0500
+Subject: [PATCH 1/1] Makefile.in: fix underlinking of liboutput.
+
+This library uses cairo/pango, and needs to be linked with $CAIRO_LIBS
+when using --as-needed and a linker that knows what it's doing.
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index d836b65..217798c 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1837,7 +1837,7 @@ am_src_math_libpspp_math_la_OBJECTS = src/math/chart-geometry.lo \
+ src/math/wilcoxon-sig.lo
+ src_math_libpspp_math_la_OBJECTS = \
+ $(am_src_math_libpspp_math_la_OBJECTS)
+-src_output_liboutput_la_LIBADD =
++src_output_liboutput_la_LIBADD = $(CAIRO_LIBS)
+ am_src_output_liboutput_la_OBJECTS = src/output/liboutput_la-ascii.lo \
+ src/output/liboutput_la-cairo-chart.lo \
+ src/output/liboutput_la-cairo-fsm.lo \
+--
+2.38.2
+
diff --git a/sci-mathematics/pspp/pspp-1.6.2-r2.ebuild b/sci-mathematics/pspp/pspp-1.6.2-r2.ebuild
new file mode 100644
index 000000000000..c6a645b2be9d
--- /dev/null
+++ b/sci-mathematics/pspp/pspp-1.6.2-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit python-any-r1 xdg
+
+DESCRIPTION="Program for statistical analysis of sampled data"
+HOMEPAGE="https://www.gnu.org/software/pspp/pspp.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.3+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples gtk ncurses nls perl postgres"
+
+RDEPEND="
+ dev-libs/libxml2:2
+ sci-libs/gsl:0=
+ sys-devel/gettext
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ sys-libs/zlib
+ virtual/libiconv
+ x11-libs/cairo[svg(+)]
+ x11-libs/pango
+ gtk? (
+ dev-util/glib-utils
+ x11-libs/gtk+:3
+ x11-libs/gtksourceview:4=
+ >=x11-libs/spread-sheet-widget-0.7
+ )
+ postgres? ( dev-db/postgresql:=[server] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ sys-devel/gettext
+ virtual/pkgconfig
+ doc? ( virtual/latex-base )"
+
+PATCHES=( "${FILESDIR}/pspp-1.6.2-underlinking.patch" )
+
+pkg_pretend() {
+ ewarn "Starting with pspp-1.4.0 the pspp-mode emacs package is no longer"
+ ewarn "shipped with pspp itself, and should instead be fetched from ELPA:"
+ ewarn "https://elpa.gnu.org/packages/pspp-mode.html"
+}
+
+src_prepare() {
+ default
+
+ sed -i '/appdata$/s/appdata$/metainfo/' Makefile.in || die
+}
+
+src_configure() {
+ econf \
+ $(use_enable nls) \
+ $(use_with gtk gui) \
+ $(use_with perl perl-module) \
+ $(use_with postgres libpq)
+}
+
+src_compile() {
+ default
+
+ if use doc; then
+ emake html pdf
+ HTML_DOCS=( doc/pspp{,-dev}.html )
+ fi
+}
+
+src_install() {
+ default
+
+ # Mimic the upstream fix for bug 868618. Obsolete when v1.6.3 is
+ # released.
+ rm "${ED}/usr/bin/pspp-dump-sav" || die
+
+ use doc && dodoc doc/pspp{,-dev}.pdf
+ if use examples; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+
+ find "${ED}" -name '*.la' -type f -delete || die
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-01-01 14:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-26 6:27 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pspp/, sci-mathematics/pspp/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-06-26 7:19 Sam James
2023-01-01 14:30 Michael Orlitzky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox