.enscript.metadata

@@ -1,2 +0,0 @@
-1f1e97a2ebb3d77f48c57487fe39e64139fb2beb SOURCES/enscript-1.6.6.tar.gz
-afa9a5f21681cc139f78cba9373c0e69c545981e SOURCES/enscript-ruby-1.6.4.tar.gz

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1,2 +1,4 @@
-SOURCES/enscript-1.6.6.tar.gz
+enscript-php-1.6.4.st
-SOURCES/enscript-ruby-1.6.4.tar.gz
+enscript-ruby-1.6.4.tar.gz
+enscript-1.6.5.2.tar.gz
+/enscript-1.6.6.tar.gz

ci.fmf

@@ -0,0 +1 @@
+resultsdb-testcase: separate

enscript-CVE-vasnprintf.patch

@@ -0,0 +1,15 @@
+diff --git a/intl/vasnprintf.c b/intl/vasnprintf.c
+index 4a8e7f0..65ade71 100644
+--- a/intl/vasnprintf.c
++++ b/intl/vasnprintf.c
+@@ -758,7 +758,9 @@ convert_to_decimal (mpn_t a, size_t extra_zeroes)
+   size_t a_len = a.nlimbs;
+   /* 0.03345 is slightly larger than log(2)/(9*log(10)).  */
+   size_t c_len = 9 * ((size_t)(a_len * (GMP_LIMB_BITS * 0.03345f)) + 1);
+-  char *c_ptr = (char *) malloc (xsum (c_len, extra_zeroes));
++  /* We need extra_zeroes bytes for zeroes, followed by c_len bytes for the
++     digits of a, followed by 1 byte for the terminating NUL.  */
++  char *c_ptr = (char *) malloc (xsum (xsum (extra_zeroes, c_len), 1));
+   if (c_ptr != NULL)
+     {
+       char *d_ptr = c_ptr;

enscript.spec

@@ -1,8 +1,14 @@
 Summary: A plain ASCII to PostScript converter
 Name: enscript
 Version: 1.6.6
-Release: 17%{?dist}
+Release: 36%{?dist}
-License: GPLv3+ and LGPLv2+ and GPLv2+
+# compat/regex.h,strerror.c,xalloc.{c,h} - GPL-2.0-or-later
+# states/gram.{c,h}, intl/plural.c - GPL-3.0-or-later WITH Bison-exception-2.2
+# intl/hash-string.c - LGPL-2.1-or-later
+# compat/*, intl/* - LGPL-2.0-or-later
+# afmlib/*, compat/gettext.h, docs/texinfo.tex, src/*, states/*, w32/* - GPL-3.0-or-later
+# (unshipped) - ylwrap - GPL-2.0-or-later
+License: LGPL-2.0-or-later AND GPL-3.0-or-later AND GPL-2.0-or-later AND GPL-3.0-or-later WITH Bison-exception-2.2 AND LGPL-2.1-or-later
 URL: http://www.gnu.org/software/enscript
 # Tarball exists nowhere. You have to obtain it via:
 # $ git clone git://git.savannah.gnu.org/enscript.git
@@ -24,18 +30,31 @@ Patch12:enscript-rh477382.patch
 Patch13:enscript-build.patch
 Patch14:enscript-manfixes.patch
 Patch15: enscript-bufpos-crash.patch
+# 1664367 - adding support for 2 other encodings, enscript cannot print f.e. euro symbol
+# without it
+# rhbz: https://bugzilla.redhat.com/show_bug.cgi?id=1664367
+# upstream patch: http://lists.gnu.org/archive/html/bug-enscript/2018-04/msg00008.html
 Patch16: 0001-enscript-newencodings.patch
-
+# enscript bundles some gnulib source files, so some issues or CVEs in gnulib can be
-Requires(preun): /sbin/install-info
+# present in enscript
-Requires(post): /sbin/install-info
+# gnulib CVE: https://bugzilla.redhat.com/show_bug.cgi?id=1635896
-Obsoletes: nenscript < 1.13++-13
+Patch17: enscript-CVE-vasnprintf.patch
-Provides: nenscript = 1.13++-13
 
 # gcc is no longer in buildroot by default
 BuildRequires: gcc
+# uses make
+BuildRequires: make
 BuildRequires: autoconf, automake, gettext
 BuildRequires: gettext-devel
 
+# our downstreamed gnulib bundles some gnulib files, so we need to provide
+# this one. I'm not sure why we have gnulib files there, because upstream
+# does not have these files. The correct way would be to extract these files,
+# fix Makefiles to link correct gnulib and requires gnulib-'something' in spec
+# file, but enscript is lowly used+low maintenance+mostly dead upstream package,
+# so there is a little merit of doing it...
+Provides: bundled(gnulib)
+
 %description
 GNU enscript is a free replacement for Adobe's Enscript
 program. Enscript converts ASCII files to PostScript(TM) and spools
@@ -45,14 +64,17 @@ includes many options for customizing printouts
 
 %prep
 %setup -q
-%patch3 -p1 -b .locale
+%patch -P 3 -p1 -b .locale
-%patch8 -p1 -b .wrap_header
+%patch -P 8 -p1 -b .wrap_header
-%patch10 -p1 -b .rh457720
+%patch -P 10 -p1 -b .rh457720
-%patch12 -p1 -b .rh477382
+%patch -P 12 -p1 -b .rh477382
-%patch13 -p1 -b .build
+%patch -P 13 -p1 -b .build
-%patch14 -p1 -b .manfixes
+%patch -P 14 -p1 -b .manfixes
-%patch15 -p1 -b .bufpos-crash
+%patch -P 15 -p1 -b .bufpos-crash
-%patch16 -p1 -b .newencodings
+# 1664367 - [RFE] Add support for 885915 encoding in enscript
+%patch -P 16 -p1 -b .newencodings
+# CVE in gnulib
+%patch -P 17 -p1 -b .vasnprintf
 
 %{__tar} -C states/hl -zxf %{SOURCE1} ruby.st
 install -pm 644 %{SOURCE2} states/hl/php.st
@@ -61,12 +83,12 @@ install -pm 644 %{SOURCE2} states/hl/php.st
 autoreconf -fiv
 export CPPFLAGS='-DPROTOTYPES'
 %configure --with-media=Letter
-make %{?_smp_mflags}
+%make_build
 
 
 %install
 mkdir -p %{buildroot}%{_datadir}/locale/{de,es,fi,fr,nl,sl}/LC_MESSAGES
-make DESTDIR=%{buildroot} install
+%make_install
 rm -f %{buildroot}%{_datadir}/info/dir
 
 %find_lang %name
@@ -89,19 +111,7 @@ for all in README THANKS; do
 	mv $all.new $all
 done
 
-%preun
-if [ $1 = 0 ]; then
-    [ -f %{_infodir}/%{name}.info.gz ] && \
-      /sbin/install-info --delete %{_infodir}/%{name}.info.gz \
-	%{_infodir}/dir || :
-fi
-
-%post
-[ -f %{_infodir}/%{name}.info.gz ] && \
-  /sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || :
-
 %files -f %{name}.lang -f share.list
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING docs/FAQ.html NEWS README README.ESCAPES THANKS TODO
 %{_bindir}/*
 %{_mandir}/man1/*
@@ -110,12 +120,74 @@ fi
 %config(noreplace) %{_sysconfdir}/enscript.cfg
 
 %changelog
-* Fri Jun 07 2019 Zdenek Dohnal <zdohnal@redhat.com> - 1.6.6-17
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.6.6-36
-- 1664366 - [RFE] Add support for 885915 encoding in enscript
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
 
-* Tue Jul 24 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1.6.6-16
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.6.6-35
+- Bump release for June 2024 mass rebuild
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.6-34
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.6-33
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Oct 27 2023 Zdenek Dohnal <zdohnal@redhat.com> - 1.6.6-32
+- SPDX license scan and migration
+- %%patch macro migration
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.6-31
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.6-30
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.6-29
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.6-28
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.6-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.6-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Nov 05 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1.6.6-25
+- make is no longer in buildroot by default
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.6-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 1.6.6-23
+- Use make macros
+- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.6-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.6-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.6-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Jan 29 2019 Zdenek Dohnal <zdohnal@redhat.com> - 1.6.6-19
+- 1664367 - [RFE] Add support for 885915 encoding in enscript
+- remove old Obsoletes/Provides
+- fix gnulib CVE
+
+* Tue Jul 24 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1.6.6-18
 - correcting license
 
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.6-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Mon Jun 18 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1.6.6-16
+- remove install-info, info package does it now automatically when any package puts a file into %%_infodir
+
 * Mon Feb 19 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1.6.6-15
 - gcc is no longer in buildroot by default
 

gating.yaml

@@ -0,0 +1,25 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_testing
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
+ 
+#Rawhide
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_stable
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
+ 
+#gating rhel
+--- !Policy
+product_versions:
+  - rhel-*
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}

plans.fmf

@@ -0,0 +1,36 @@
+/tier1-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/enscript.git
+      name: /plans/tier1/internal
+
+/tier1-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/enscript.git
+      name: /plans/tier1/public
+
+/tier2-tier3-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/enscript.git
+      name: /plans/tier2-tier3/internal
+
+/tier2-tier3-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/enscript.git
+      name: /plans/tier2-tier3/public
+
+/others-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/enscript.git
+      name: /plans/others/internal
+
+/others-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/enscript.git
+      name: /plans/others/public
+

sources

@@ -0,0 +1,3 @@
+f3a0083638ac3fddc493d44b6515182a  enscript-php-1.6.4.st
+fa9c837b2a258716411f6df827d36eb3  enscript-ruby-1.6.4.tar.gz
+3acc242b829adacabcaf28533f049afd  enscript-1.6.6.tar.gz