diff --git a/pspp-0001-Disable-perl-tests-on-i686.patch b/pspp-0001-Disable-perl-tests-on-i686.patch index 89ba310..c8b8656 100644 --- a/pspp-0001-Disable-perl-tests-on-i686.patch +++ b/pspp-0001-Disable-perl-tests-on-i686.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Disable perl tests on i686 Signed-off-by: Peter Lemenkov diff --git a/tests/automake.mk b/tests/automake.mk -index f9bea8fa5..2805f3ee5 100644 +index eb5698738..f1d08dec0 100644 --- a/tests/automake.mk +++ b/tests/automake.mk -@@ -470,8 +470,7 @@ TESTSUITE_AT = \ +@@ -475,8 +475,7 @@ TESTSUITE_AT = \ tests/ui/terminal/main.at \ tests/ui/syntax-gen.at \ tests/utilities/pspp-convert.at \ diff --git a/pspp-0002-Don-t-install-man-page-for-non-existent-app.patch b/pspp-0002-Don-t-install-man-page-for-non-existent-app.patch new file mode 100644 index 0000000..669b0ea --- /dev/null +++ b/pspp-0002-Don-t-install-man-page-for-non-existent-app.patch @@ -0,0 +1,18 @@ +From: Peter Lemenkov +Date: Tue, 6 Sep 2022 12:13:06 +0200 +Subject: [PATCH] Don't install man-page for non-existent app + +Signed-off-by: Peter Lemenkov + +diff --git a/utilities/automake.mk b/utilities/automake.mk +index 047180bf4..601eccf88 100644 +--- a/utilities/automake.mk ++++ b/utilities/automake.mk +@@ -15,7 +15,6 @@ + # along with this program. If not, see . + # + noinst_PROGRAMS += utilities/pspp-dump-sav +-dist_man_MANS += utilities/pspp-dump-sav.1 + utilities_pspp_dump_sav_SOURCES = \ + src/libpspp/integer-format.c \ + src/libpspp/float-format.c \ diff --git a/pspp-0002-pspp-dump-sav-Do-not-install-by-default.patch b/pspp-0002-pspp-dump-sav-Do-not-install-by-default.patch deleted file mode 100644 index c38d2ec..0000000 --- a/pspp-0002-pspp-dump-sav-Do-not-install-by-default.patch +++ /dev/null @@ -1,52 +0,0 @@ -From: Ben Pfaff -Date: Mon, 5 Sep 2022 09:55:08 -0700 -Subject: [PATCH] pspp-dump-sav: Do not install by default. - -People keep fuzzing pspp-dump-sav and reporting vulnerabilities against it, -but hardly anyone uses it (maybe just me). It's not worth the trouble. - -Fixes: #62977. - -diff --git a/doc/pspp-dump-sav.texi b/doc/pspp-dump-sav.texi -index 75d6b161f..1c8cb4020 100644 ---- a/doc/pspp-dump-sav.texi -+++ b/doc/pspp-dump-sav.texi -@@ -13,7 +13,9 @@ - @cindex @command{pspp-dump-sav} - - @command{pspp-dump-sav} is a command-line utility accompanying --@pspp{}. It reads one or more SPSS system files and prints their -+@pspp{}. It is not installed by default, so it may be missing -+from your PSPP installation. -+It reads one or more SPSS system files and prints their - contents. The output format is useful for debugging system file - readers and writers and for discovering how to interpret unknown or - poorly understood records. End users may find the output useful for -diff --git a/utilities/automake.mk b/utilities/automake.mk -index 41c57c733..047180bf4 100644 ---- a/utilities/automake.mk -+++ b/utilities/automake.mk -@@ -14,7 +14,7 @@ - # You should have received a copy of the GNU General Public License - # along with this program. If not, see . - # --bin_PROGRAMS += utilities/pspp-dump-sav -+noinst_PROGRAMS += utilities/pspp-dump-sav - dist_man_MANS += utilities/pspp-dump-sav.1 - utilities_pspp_dump_sav_SOURCES = \ - src/libpspp/integer-format.c \ -diff --git a/utilities/pspp-dump-sav.1 b/utilities/pspp-dump-sav.1 -index 5c3459aa1..d184ac775 100644 ---- a/utilities/pspp-dump-sav.1 -+++ b/utilities/pspp-dump-sav.1 -@@ -32,7 +32,9 @@ pspp\-dump\-sav \- dissect SPSS system file - . - .SH DESCRIPTION - The \fBpspp\-dump\-sav\fR program reads each SPSS system file --\fIfile\fR and prints its contents. The output format is useful for -+\fIfile\fR and prints its contents. It is not installed by -+default, so it may be missing from your PSPP installation. -+The output format is useful for - debugging system file readers and writers and for discovering how to - interpret unknown or poorly understood records. End users may find - the output useful for providing the PSPP developers information about diff --git a/pspp-0003-Don-t-install-man-page-for-non-existent-app.patch b/pspp-0003-Don-t-install-man-page-for-non-existent-app.patch deleted file mode 100644 index 669b0ea..0000000 --- a/pspp-0003-Don-t-install-man-page-for-non-existent-app.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: Peter Lemenkov -Date: Tue, 6 Sep 2022 12:13:06 +0200 -Subject: [PATCH] Don't install man-page for non-existent app - -Signed-off-by: Peter Lemenkov - -diff --git a/utilities/automake.mk b/utilities/automake.mk -index 047180bf4..601eccf88 100644 ---- a/utilities/automake.mk -+++ b/utilities/automake.mk -@@ -15,7 +15,6 @@ - # along with this program. If not, see . - # - noinst_PROGRAMS += utilities/pspp-dump-sav --dist_man_MANS += utilities/pspp-dump-sav.1 - utilities_pspp_dump_sav_SOURCES = \ - src/libpspp/integer-format.c \ - src/libpspp/float-format.c \ diff --git a/pspp.spec b/pspp.spec index a261705..8360867 100644 --- a/pspp.spec +++ b/pspp.spec @@ -1,5 +1,5 @@ Name: pspp -Version: 1.6.2 +Version: 2.0.0 Release: %autorelease Summary: A program for statistical analysis of sampled data License: GPL-3.0-or-later @@ -11,10 +11,8 @@ Source2: pspp-Smake Source3: C2D1AB061656AAC54B5E975485199DE8C6648E90.gpg # FIXME don't know what's going on here. Hopefully nodody uses i686 apps these days. Patch1: pspp-0001-Disable-perl-tests-on-i686.patch -# CVE-2022-39831 -Patch2: pspp-0002-pspp-dump-sav-Do-not-install-by-default.patch -# Follow up to patch2 -patch3: pspp-0003-Don-t-install-man-page-for-non-existent-app.patch +# Follow up to CVE-2022-39831 +patch2: pspp-0002-Don-t-install-man-page-for-non-existent-app.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: cairo-devel diff --git a/sources b/sources index aa7785a..9427e6a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pspp-1.6.2.tar.gz) = fd8b6b23ae4e4a1a560bf4d20c35e761d84dcde2e220648303303f11e9c17d56285a3d5b3c26e7dad44d52ecc82fdf93fdc51a3533ff907f2ca1f1474922e31f -SHA512 (pspp-1.6.2.tar.gz.sig) = 1392bcaec8ab6f94c7234887f93cbf8faf08abd05442f5d2c6bed84e8dc0a59e00414697ed7306c3b91217de93259314b1cffcf1e39bdaa4afdec711c66962f6 +SHA512 (pspp-2.0.0.tar.gz) = 2827523b8f4a2926bb7043cadfd7b226d9bb3907cd3deee0a2724d56049518714406745c1029b64a7b11f3763a51b55f4cb76f733653049a7b54d871f7cc2858 +SHA512 (pspp-2.0.0.tar.gz.sig) = c3341b9c24bed3656e614fe8e575e421672ccac3b4e1bb9ef7a55780c9a7d271fd5a73bcf41fbc46f40836c849b9a69c78bf7439d1c9ebc500dc929ee7db0ba3