microsoft
/
CBL-Mariner
зеркало из https://github.com/microsoft/CBL-Mariner.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[main] Removing dependencies on `ghostscript`. (#2108)

This commit is contained in:
Pawel Winogrodzki 2022-02-07 11:43:17 -08:00 коммит произвёл GitHub
Родитель a4da14fc7c
Коммит abdb935b42
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
41 изменённых файлов: 69 добавлений и 7352 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

110
SPECS-EXTENDED/foomatic-db/foomatic-db-device-ids.patch
Просмотреть файл

@ -1,110 +0,0 @@
diff -up foomatic-db-20120103/db/source/PPD/Brother/BR8840_2_GPL.ppd.device-ids-20120103 foomatic-db-20120103/db/source/PPD/Brother/BR8840_2_GPL.ppd
--- foomatic-db-20120103/db/source/PPD/Brother/BR8840_2_GPL.ppd.device-ids-20120103 2012-01-03 00:40:44.000000000 +0000
+++ foomatic-db-20120103/db/source/PPD/Brother/BR8840_2_GPL.ppd 2012-02-24 09:33:37.047452635 +0000
@@ -32,6 +32,7 @@
*ShortNickName: "Brother MFC-8840D BR-Script3"
*ModelName: "Brother MFC-8840D BR-Script3"
*NickName: "Brother MFC-8840D BR-Script3"
+*1284DeviceID: "MFG:Brother;MDL:MFC-8840D;CMD:HBP,PJL,PCL,PCLXL;"
*%==== Basic Device Capabilities =============
*LanguageLevel: "3"
diff -up foomatic-db-20120103/db/source/PPD/Lexmark/Lexmark_C543.ppd.device-ids-20120103 foomatic-db-20120103/db/source/PPD/Lexmark/Lexmark_C543.ppd
--- foomatic-db-20120103/db/source/PPD/Lexmark/Lexmark_C543.ppd.device-ids-20120103 2012-01-03 00:40:44.000000000 +0000
+++ foomatic-db-20120103/db/source/PPD/Lexmark/Lexmark_C543.ppd 2012-02-24 09:33:37.049452637 +0000
@@ -62,7 +62,7 @@
*LXCountPIN: "4"
*LXlowPINchar: "0"
*LXhiPINchar: "9"
-*1284DeviceID: "MFG: Lexmark;MDL: Lexmark C543"
+*1284DeviceID: "MFG:Lexmark International;MDL:Lexmark C543;"
*FreeVM: "252000000"
*VMOption 256Meg: "252000000"
*VMOption 320Meg: "312000000"
diff -up foomatic-db-20120103/db/source/printer/Brother-MFC-8840D.xml.device-ids-20120103 foomatic-db-20120103/db/source/printer/Brother-MFC-8840D.xml
--- foomatic-db-20120103/db/source/printer/Brother-MFC-8840D.xml.device-ids-20120103 2012-02-24 09:33:36.314452298 +0000
+++ foomatic-db-20120103/db/source/printer/Brother-MFC-8840D.xml 2012-02-24 09:33:37.051452638 +0000
@@ -15,7 +15,7 @@
</lang>
<autodetect>
<general>
- <ieee1284>MFG:Brother;MDL:Brother MFC-8840D;</ieee1284>
+ <ieee1284>MFG:Brother;MDL:MFC-8840D;CMD:HBP,PJL,PCL,PCLXL;</ieee1284>
<manufacturer>Brother</manufacturer>
<model>Brother MFC-8840D</model>
</general>
diff -up foomatic-db-20120103/db/source/printer/HP-DeskJet_720C.xml.device-ids-20120103 foomatic-db-20120103/db/source/printer/HP-DeskJet_720C.xml
--- foomatic-db-20120103/db/source/printer/HP-DeskJet_720C.xml.device-ids-20120103 2012-02-24 09:33:36.401452339 +0000
+++ foomatic-db-20120103/db/source/printer/HP-DeskJet_720C.xml 2012-02-24 09:33:37.087452655 +0000
@@ -20,7 +20,7 @@
<commandset>SCP,VLINK</commandset>
<description>Hewlett-Packard DeskJet 720 Series</description>
<manufacturer>HEWLETT-PACKARD</manufacturer>
- <model>DESKJET 720</model>
+ <model>DESKJET 720C</model>
</parallel>
</autodetect>
<functionality>A</functionality>
diff -up foomatic-db-20120103/db/source/printer/HP-LaserJet_M1522nf_MFP.xml.device-ids-20120103 foomatic-db-20120103/db/source/printer/HP-LaserJet_M1522nf_MFP.xml
--- foomatic-db-20120103/db/source/printer/HP-LaserJet_M1522nf_MFP.xml.device-ids-20120103 2012-02-24 09:33:36.411452343 +0000
+++ foomatic-db-20120103/db/source/printer/HP-LaserJet_M1522nf_MFP.xml 2012-02-24 09:33:37.089452655 +0000
@@ -13,6 +13,13 @@
<postscript level="3" />
<pcl level="6" />
</lang>
+ <autodetect>
+ <usb>
+ <commandset>PJL,PML,PCLXL,POSTSCRIPT,PCL</commandset>
+ <manufacturer>Hewlett-Packard</manufacturer>
+ <model>HP LaserJet MFP M1522nf MFP</model>
+ </usb>
+ </autodetect>
<functionality>D</functionality>
<driver>pxlmono</driver>
<drivers>
diff -up foomatic-db-20120103/db/source/printer/Kyocera-FS-1118MFP.xml.device-ids-20120103 foomatic-db-20120103/db/source/printer/Kyocera-FS-1118MFP.xml
--- foomatic-db-20120103/db/source/printer/Kyocera-FS-1118MFP.xml.device-ids-20120103 2012-02-24 09:34:34.375478948 +0000
+++ foomatic-db-20120103/db/source/printer/Kyocera-FS-1118MFP.xml 2012-02-24 09:41:52.635757050 +0000
@@ -19,10 +19,10 @@
</lang>
<autodetect>
<general>
- <ieee1284>MFG:Kyocera;MODEL:Kyocera FS-1118MFP;COMMAND SET: POSTSCRIPT,PJL,PCL</ieee1284>
- <commandset>POSTSCRIPT,PJL,PCL</commandset>
+ <ieee1284>MFG:Kyocera;MODEL:FS-1118MFP;CMD:PCLXL,PostScript Emulation,PCL5E,PJL;</ieee1284>
+ <commandset>CMD:PCLXL,PostScript Emulation,PCL5E,PJL</commandset>
<manufacturer>Kyocera</manufacturer>
- <model>Kyocera FS-1118MFP</model>
+ <model>FS-1118MFP</model>
</general>
</autodetect>
<functionality>A</functionality>
diff -up foomatic-db-20120103/db/source/printer/Lexmark-C543.xml.device-ids-20120103 foomatic-db-20120103/db/source/printer/Lexmark-C543.xml
--- foomatic-db-20120103/db/source/printer/Lexmark-C543.xml.device-ids-20120103 2012-02-24 09:33:36.463452367 +0000
+++ foomatic-db-20120103/db/source/printer/Lexmark-C543.xml 2012-02-24 09:33:37.090452655 +0000
@@ -15,7 +15,7 @@
</lang>
<autodetect>
<general>
- <ieee1284>MFG: Lexmark;MDL: Lexmark C543</ieee1284>
+ <ieee1284>MFG:Lexmark International;MDL:Lexmark C543;</ieee1284>
<manufacturer>Lexmark</manufacturer>
<model>Lexmark C543</model>
</general>
diff -up foomatic-db-20130911/db/source/printer/Brother-HL-2040.xml.device-ids foomatic-db-20130911/db/source/printer/Brother-HL-2040.xml
--- foomatic-db-20130911/db/source/printer/Brother-HL-2040.xml.device-ids 2013-09-11 15:55:21.853642637 +0200
+++ foomatic-db-20130911/db/source/printer/Brother-HL-2040.xml 2013-09-11 15:53:30.775176972 +0200
@@ -15,6 +15,13 @@
<pcl level="5e" />
<pjl />
</lang>
+ <autodetect>
+ <general>
+ <ieee1284>MFG:Brother;MDL:HL-2040 series;CMD:PJL,HBP;</ieee1284>
+ <manufacturer>Brother</manufacturer>
+ <model>Brother HL-2040 series</model>
+ </general>
+ </autodetect>
<functionality>B</functionality>
<driver>hl1250</driver>
<drivers>

23
SPECS-EXTENDED/foomatic-db/foomatic-db-invalid.patch
Просмотреть файл

@ -1,23 +0,0 @@
diff -up foomatic-db-20131218/db/source/driver/Postscript.xml.orig foomatic-db-20131218/db/source/driver/Postscript.xml
--- foomatic-db-20131218/db/source/driver/Postscript.xml.orig 2013-12-18 01:41:18.000000000 +0100
+++ foomatic-db-20131218/db/source/driver/Postscript.xml 2013-12-18 15:09:08.471674405 +0100
@@ -358,9 +358,6 @@
<id>printer/HP-Business_Inkjet_3000</id>
</printer>
<printer>
- <id>printer/HP-Business_Inkjet_9100</id>
- </printer>
- <printer>
<id>printer/HP-Color_LaserJet_2500</id>
</printer>
<printer>
@@ -1066,9 +1063,6 @@
<id>printer/Oce-3155PS</id>
</printer>
<printer>
- <id>printer/Oce-3165</id>
- </printer>
- <printer>
<id>printer/Oce-3165PS</id>
</printer>
<printer>

5
SPECS-EXTENDED/foomatic-db/foomatic-db.signatures.json
Просмотреть файл

@ -1,5 +0,0 @@
{
"Signatures": {
"foomatic-db-4.0-20201104.tar.gz": "08443996af04aa724e71ef2536b5f7c69d07d37327e07f3f258a1f79acc79e1e"
}
}

439
SPECS-EXTENDED/foomatic-db/foomatic-db.spec
Просмотреть файл

@ -1,439 +0,0 @@
Vendor: Microsoft Corporation
Distribution: Mariner
%global dbver_rel 4.0
# When you change dbver_snap, rebuild also foomatic against this build to pick up new IEEE 1284 Device IDs.
# The postscriptdriver tags get put onto foomatic, because that's there the actual CUPS driver lives.
%global dbver_snap 20201104
Summary: Database of printers and printer drivers
Name: foomatic-db
Version: %{dbver_rel}
Release: 69%{?dist}
License: GPLv2+
Requires: %{name}-filesystem = %{version}-%{release}
Requires: %{name}-ppds = %{version}-%{release}
Source0: http://www.openprinting.org/download/foomatic/foomatic-db-%{dbver_rel}-%{dbver_snap}.tar.gz
Patch1: foomatic-db-device-ids.patch
Patch2: foomatic-db-invalid.patch
Url: http://www.openprinting.org
BuildArch: noarch
# Make sure we get postscriptdriver tags.
BuildRequires: python3-cups
# Build requires cups so that configure knows where to put PPDs.
BuildRequires: cups
# uses make
BuildRequires: make
# Build requires for perl
BuildRequires: perl-interpreter
# we needed sed for prep phase - removing perl from ppds
BuildRequires: sed
%description
This is the database of printers, printer drivers, and driver options
for Foomatic.
The site http://www.openprinting.org/ is based on this database.
%package filesystem
Summary: Directory layout for the foomatic package
License: Public Domain
%description filesystem
Directory layout for the foomatic package.
%package ppds
Summary: PPDs from printer manufacturers
License: GPLv2+ and MIT
# We ship a symlink in a directory owned by cups
BuildRequires: cups
Requires: cups
Requires: sed
Requires: %{name}-filesystem = %{version}-%{release}
%description ppds
PPDs from printer manufacturers.
%prep
%setup -q -n foomatic-db-%{dbver_snap}
find -type d | xargs chmod g-s
pushd db/source
# For gutenprint printers, use gutenprint-ijs-simplified.5.2.
for i in printer/*.xml
do
perl -pi -e 's,>gutenprint<,>gutenprint-ijs-simplified.5.2<,' $i
done
# Remove references to SpliX (Samsung/Xerox/Dell)
find printer -name '*.xml' |xargs grep -l "<driver>splix"|xargs rm -vf
rm -f driver/splix.xml
# Remove references to foo2zjs, foo2oak, foo2hp and foo2qpdl (bug #208851).
# foo2zjs-z1, foo2zjs-z2, foo2zjs-z3 (bug #967930)
# foo2lava, foo2kyo, foo2xqx (bug #438319)
# foo2slx and foo2hiperc (bug #518267)
# foo2hbpl2 (bug #970393)
# foo2hiperc-z1
for x in zjs zjs-z1 zjs-z2 zjs-z3 oak oak-z1 hp qpdl lava kyo xqx slx hiperc hiperc-z1 hbpl2
do
find printer -name '*.xml' |xargs grep -l "<driver>foo2${x}"|xargs rm -vf
rm -f driver/foo2${x}.xml opt/foo2${x}-*
done
# Binaries for these were previously provided by printer-filters, but aren't anymore (bug #972740)
for x in lm1100 pentaxpj pbm2l2030 pbm2l7k lex5700 lex7000 c2050 c2070 cjet
do
find printer -name '*.xml' |xargs grep -l "<driver>${x}</driver>"|xargs rm -vf
rm -vf driver/${x}.xml opt/${x}-*
done
# Same for all these.
for x in drv_x125 ml85p pbm2lwxl pbmtozjs bjc800j m2300w m2400w
do
find printer -name '*.xml' |xargs grep -l "<driver>${x}</driver>"|xargs rm -vf
rm -vf driver/${x}.xml opt/${x}-*
done
# Remove Samsung-CLP-610/620 (bug #967930), they're in foo2qpdl
find printer -name '*.xml' |grep -E 'Samsung-CLP-610|Samsung-CLP-620'|xargs rm -vf
# This one is part of foo2zjs
find printer -name '*.xml' |grep -E 'KONICA_MINOLTA-magicolor_2430_DL'|xargs rm -vf
# Remove Brother P-touch (bug #560610, comment #10)
rm -vf driver/ptouch.xml
rm -vf printer/Brother-PT-*.xml
rm -vf printer/Brother-QL-*.xml
rm -vf opt/Brother-Ptouch-*.xml
popd
# foomatic-db patches
# Don't use "-b" when patching PPD files as the backups will be packaged.
# Device IDs for:
# Brother MFC-8840D (#678065)
# HP LaserJet M1522nf MFP (#745499)
# Lexmark C453 (#770169)
# HP DeskJet 720C (bug #797099)
# Kyocera FS-1118MFP (bug #782377)
# Brother HL-2040 (bug #999040)
%patch1 -p1
# These can't be generated at all (bug #866476)
%patch2 -p1
# Use sed instead of perl in the PPDs (bug #512739).
find db/source/PPD -type f -name '*.ppd' -exec sed -i 's,perl -p,sed,g' {} +
%build
%configure
make PREFIX=%{_prefix}
%install
make DESTDIR=%buildroot PREFIX=%{_prefix} \
install
# Remove ghostscript UPP drivers that are gone in 7.07
rm -f %{buildroot}%{_datadir}/foomatic/db/source/driver/{bjc6000a1,PM760p,PM820p,s400a1,sharp,Stc670pl,Stc670p,Stc680p,Stc760p,Stc777p,Stp720p,Stp870p}.upp.xml
find %{buildroot}%{_datadir}/foomatic/db/source/ -type f | xargs chmod 0644
mkdir %{buildroot}%{_datadir}/foomatic/db/source/PPD/Custom
rm -f %{buildroot}%{_datadir}/foomatic/db/source/PPD/Kyocera/*.htm \
%{buildroot}%{_datadir}/cups/model/3-distribution
# Convert absolute symlink to relative.
rm -f %{buildroot}%{_datadir}/cups/model/foomatic-db-ppds
ln -sf ../../foomatic/db/source/PPD %{buildroot}%{_datadir}/cups/model/foomatic-db-ppds
%files filesystem
%dir %{_datadir}/foomatic/
%dir %{_datadir}/foomatic/db/
%dir %{_datadir}/foomatic/db/source/
%dir %{_datadir}/foomatic/db/source/driver/
%dir %{_datadir}/foomatic/db/source/opt/
%dir %{_datadir}/foomatic/db/source/printer/
%dir %{_datadir}/foomatic/db/source/PPD/
%files
%doc db/source/PPD/Kyocera/*.htm
%doc README
%{_datadir}/foomatic/db/oldprinterids
%{_datadir}/foomatic/db/source/printer/*
%{_datadir}/foomatic/db/source/driver/*
%{_datadir}/foomatic/db/source/opt/*
%{_datadir}/foomatic/xmlschema
%files ppds
%doc COPYING
%{_datadir}/foomatic/db/source/PPD/*
%{_datadir}/cups/model/foomatic-db-ppds
%changelog
* Thu Oct 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 4.0-69
- Initial CBL-Mariner import from Fedora 33 (license: MIT).
- Converting the 'Release' tag to the '[number].[distribution]' format.
* Thu Nov 05 2020 Zdenek Dohnal <zdohnal@redhat.com> - 4.0-68.20201104
- updated to foomatic-db-4.0-20201104
- make is no longer in buildroot by default
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-67.20200526
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue May 26 2020 Zdenek Dohnal <zdohnal@redhat.com> - 4.0-66.20200526
- Updated to foomatic-db-4.0-20200526
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-65.20190128
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-64.20190128
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-63.20190128
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Jan 28 2019 Zdenek Dohnal <zdohnal@redhat.com> - 4.0-62.20190128
- Updated to foomatic-db-4.0-20190128
* Tue Jul 24 2018 Zdenek Dohnal <zdohnal@redhat.com> - 4.0-61.20180228
- 1603992 - foomatic-db: FTBFS in Fedora rawhide
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-60.20180228
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon May 28 2018 Zdenek Dohnal <zdohnal@redhat.com> - 4.0-59.20180228
- 1582865, 1470547 - remove foo2hiperc-z1
* Wed Feb 28 2018 Zdenek Dohnal <zdohnal@redhat.com> - 4.0-58.20180228
- Updated to foomatic-db-4.0-20180228
* Thu Feb 08 2018 Zdenek Dohnal <zdohnal@redhat.com> - 4.0-57.20180102
- remove old stuff https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/MRWOMRZ6KPCV25EFHJ2O67BCCP3L4Y6N/
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-56.20180102
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Wed Jan 03 2018 Zdenek Dohnal <zdohnal@redhat.com> - 4.0-55.20180102
- Updated to foomatic-db-4.0-20180102
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-54.20170503
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Thu May 04 2017 Zdenek Dohnal <zdohnal@redhat.com> - 4.0-53.20170503
- Updated to foomatic-db-4.0-20170503
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-52.20161003
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Tue Oct 04 2016 Zdenek Dohnal <zdohnal@redhat.com> - 4.0-51.20161003
- Updated to foomatic-db-4.0-20161003
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-50.20150819
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Thu Nov 26 2015 Jiri Popelka <jpopelka@redhat.com> - 4.0-49.20150819
- BuildRequires: python3-cups
* Fri Nov 13 2015 Jiri Popelka <jpopelka@redhat.com> - 4.0-48.20150819
- make filesystem sub-package own more dirs (#970393#c22)
* Tue Sep 15 2015 Jiri Popelka <jpopelka@redhat.com> - 4.0-47.20150819
- Updated to foomatic-db-4.0-20150819
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0-46.20150415
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Thu May 21 2015 Jiri Popelka <jpopelka@redhat.com> - 4.0-45.20150415
- Updated to foomatic-db-4.0-20150415
* Mon Jul 07 2014 Jiri Popelka <jpopelka@redhat.com> - 4.0-44.20140707
- Updated to foomatic-db-4.0-20140707
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0-43.20131218
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Wed Dec 18 2013 Jiri Popelka <jpopelka@redhat.com> - 4.0-42.20131218
- Remove references to splix and KONICA_MINOLTA-magicolor_2430_DL (bug #970393)
* Wed Dec 18 2013 Jiri Popelka <jpopelka@redhat.com> - 4.0-41.20131218
- Remove references to invalid printers (bug #866476, bug #972740)
- Remove references to foo2hbpl (bug #970393)
- Updated to foomatic-db-4.0-20131218
* Wed Sep 11 2013 Jiri Popelka <jpopelka@redhat.com> - 4.0-40.20130911
- Updated to foomatic-db-4.0-20130911
- Device ID for Brother HL-2040 (bug #999040)
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0-39.20130604
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Tue Jun 04 2013 Jiri Popelka <jpopelka@redhat.com> - 4.0-38.20130604
- Remove some file conflicts (bug #967930)
- Updated to foomatic-db-4.0-20130604
* Tue May 07 2013 Jiri Popelka <jpopelka@redhat.com> - 4.0-37.20130507
- Updated to foomatic-db-4.0-20130507
- Removed old 'Obsoletes: oki4linux'
* Tue Mar 12 2013 Jiri Popelka <jpopelka@redhat.com> - 4.0-36.20130312
- Updated to foomatic-db-4.0-20130312
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0-35.20121011
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Thu Oct 11 2012 Jiri Popelka <jpopelka@redhat.com> 4.0-34.20120719
- Updated to foomatic-db-4.0-20121011
* Thu Jul 19 2012 Jiri Popelka <jpopelka@redhat.com> 4.0-33.20120719
- Updated to foomatic-db-4.0-20120719
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0-32.20120103
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Fri Feb 24 2012 Tim Waugh <twaugh@redhat.com> 4.0-31.20120103
- Device IDs for:
- HP DeskJet 720C (bug #797099)
- Kyocera FS-1118MFP (bug #782377)
* Wed Jan 04 2012 Jiri Popelka <jpopelka@redhat.com> 4.0-30.20120103
- Updated to foomatic-db-4.0-20120103
- spec modernized
- Device IDs for:
- Brother MFC-8840D (#678065)
- HP LaserJet M1522nf MFP (#745499)
- Lexmark C453 (#770169)
* Tue Jun 14 2011 Tim Waugh <twaugh@redhat.com> 4.0-29.20110614
- Updated to foomatic-db-4.0-20110614.
* Mon Feb 21 2011 Tim Waugh <twaugh@redhat.com> 4.0-28.20110221
- Updated to foomatic-db-4.0-20110221.
- No longer need hpijs data.
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0-27.20101123
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Fri Jan 28 2011 Tim Waugh <twaugh@redhat.com> 4.0-26.20101123
- Rebuilt to pick up postscriptdriver tags now that python-cups
provides the machinery for this.
- Build requires cups so that configure knows where to put PPDs.
* Wed Jan 19 2011 Jiri Popelka <jpopelka@redhat.com> 4.0-25.20101123
- Removed Brother P-touch (bug #560610, comment #10)
* Mon Dec 06 2010 Jiri Popelka <jpopelka@redhat.com> 4.0-24.20101123
- The pycups requirement is now python-cups.
* Mon Dec 06 2010 Jiri Popelka <jpopelka@redhat.com> 4.0-23.20101123
- Device IDs for:
- HP Deskjet D4100 (bug #658091)
- HP Color LaserJet CM4730 MFP (bug #658838)
- HP LaserJet 4050/4100/4350/5100/8000/P3005 (bug #659041)
- HP Color LaserJet 2500/3700/4550/4650/4700/5550 (bug #659042)
* Tue Nov 23 2010 Jiri Popelka <jpopelka@redhat.com> 4.0-22.20101123
- Updated to foomatic-db-4.0-20101123 (bug #655238).
- Device ID for Canon iR 3225 (bug #651500).
* Wed Nov 03 2010 Jiri Popelka <jpopelka@redhat.com> 4.0-21.20100819
- Remove wrong Device ID for Canon iR 3170C (bug #617493).
* Fri Aug 20 2010 Jiri Popelka <jpopelka@redhat.com> 4.0-20.20100819
- Removed printer/Samsung-CLP-300|315.xml (bug #625505).
- Removed references to foo2oak-z1.
* Thu Aug 19 2010 Jiri Popelka <jpopelka@redhat.com> 4.0-19.20100819
- Updated to foomatic-db-4.0-20100819, foomatic-db-hpijs-20090901.tar.gz
- Device ID for Canon iR 3170C (bug #617493).
* Mon Jul 12 2010 Jiri Popelka <jpopelka@redhat.com> 4.0-18.20100204
- Moved COPYING file to ppds sub-package.
* Mon May 17 2010 Tim Waugh <twaugh@redhat.com> 4.0-17.20100204
- Don't ship backup files.
* Sun May 16 2010 Tim Waugh <twaugh@redhat.com> 4.0-16.20100204
- Device IDs for another 1302 Ricoh PPDs.
* Thu May 6 2010 Tim Waugh <twaugh@redhat.com> 4.0-15.20100204
- Device IDs for:
- HP Color LaserJet 2605dn (bug #583909).
- HP DeskJet F300 (bug #585644).
- HP OfficeJet 6200 (bug #215063).
- HP PSC 1400 (bug #586381).
- Ricoh Aficio MP C3500 (bug #589527).
- Ricoh Aficio SP C420DN (bug #589533).
* Fri Apr 16 2010 Tim Waugh <twaugh@redhat.com> 4.0-14.20100204
- Device IDs for:
- Canon BJC-4100 (bug #583060)
- HP Color LaserJet 3800 (bug #581936).
- HP DeskJet D2300 (bug #580341).
- HP DeskJet F2100 (bug #579245).
- HP OfficeJet 7300 (bug #577897).
- Lexmark E120 (bug #577881).
- HP DeskJet 1280 (bug #577870).
- HP PhotoSmart 7400 (bug #577866).
- Brother HL-2140 (bug #577863).
- HP OfficeJet 6200 (bug #215063).
- HP PSC 2400 (bug #188419).
* Fri Mar 26 2010 Tim Waugh <twaugh@redhat.com> 4.0-13.20100204
- Device IDs for HP PhotoSmart 2570, HP DeskJet 959C and HP OfficeJet
Pro K550 (bug #577280, bug #577293, bug #577296).
* Thu Mar 25 2010 Tim Waugh <twaugh@redhat.com> 4.0-12.20100402
- Fixed missing units in driver margins (bug #576370).
* Fri Mar 19 2010 Tim Waugh <twaugh@redhat.com> 4.0-11.20100402
- Device ID for Kyocera Mita FS-1020D (bug #575063).
* Thu Feb 4 2010 Tim Waugh <twaugh@redhat.com> 4.0-10.20100402
- Rebuild for postscriptdriver tags.
* Thu Feb 4 2010 Tim Waugh <twaugh@redhat.com> 4.0-9.20100402
- Updated to foomatic-db-4.0-20100402.
* Fri Dec 4 2009 Tim Waugh <twaugh@redhat.com> 4.0-8.20091126
- Added foomatic-db-hpijs tarball back in.
* Thu Nov 26 2009 Tim Waugh <twaugh@redhat.com> 4.0-7.20091126
- Updated to foomatic-db-4.0-20091126 (bug #538994).
* Thu Aug 20 2009 Tim Waugh <twaugh@redhat.com> 4.0-6.20090819
- Removed references to foo2slx and foo2hiperc (bug #518267).
* Wed Aug 19 2009 Tim Waugh <twaugh@redhat.com> 4.0-5.20090819
- Updated to foomatic-db-4.0-20090819.
- Removed deprecated foomatic-db-hpijs tarball.
- Use buildroot macro throughout.
* Tue Aug 18 2009 Tim Waugh <twaugh@redhat.com> 4.0-4.20090702
- Use stcolor driver for Epson Stylus Color 200 (bug #513676).
* Mon Aug 17 2009 Tim Waugh <twaugh@redhat.com> 4.0-3.20090702
- License for ppds sub-package should include GPLv2+.
- Ship COPYING file in main package.
- Added filesystem sub-package for directory ownership.
* Mon Aug 3 2009 Tim Waugh <twaugh@redhat.com> 4.0-2.20090702
- Move foomatic-db-ppds symlink to ppds sub-package.
- Use sed instead of perl in raster PPDs (bug #512739).
- Removed code to convert old-style printer IDs (there are none).
- Ship README file.
* Mon Aug 3 2009 Tim Waugh <twaugh@redhat.com> 4.0-1.20090702
- Split database out from main foomatic package.

41
SPECS-EXTENDED/foomatic/0001-Recognize-fractional-numbers-in-PageSize.patch
Просмотреть файл

@ -1,41 +0,0 @@
From 75de02d9065b6280482d7cd011e9462badb19f83 Mon Sep 17 00:00:00 2001
From: Andreas Gruenbacher <agruenba@redhat.com>
Date: Thu, 30 Jan 2020 23:08:23 +0100
Subject: [PATCH] Recognize fractional numbers in PageSize
Right now, fractional numbers (fractional pt sizes) aren't allowed in
PageSize values even though they are perfectly fine in PPD files. In
contrast, the values foomatic puts into the *ImageableArea and
*PaperDimension definitions it generates are fractional. So allow
fractional numbers in PageSize values as well.
---
lib/Foomatic/DB.pm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/Foomatic/DB.pm b/lib/Foomatic/DB.pm
index 90389b3..39739aa 100644
--- a/lib/Foomatic/DB.pm
+++ b/lib/Foomatic/DB.pm
@@ -5533,7 +5533,7 @@ sub getppd ( $ $ $ ) {
# option.
my $size = $v->{'driverval'};
if ($size =~ /([\d\.]+)x([\d\.]+)([a-z]+)\b/) {
- # 2 positive integers separated by
+ # 2 positive numbers separated by
# an 'x' with a unit
my $w = $1;
my $h = $2;
@@ -5551,8 +5551,8 @@ sub getppd ( $ $ $ ) {
$w = sprintf("%.2f", $w) if $w =~ /\./;
$h = sprintf("%.2f", $h) if $h =~ /\./;
$size = "$w $h";
- } elsif (($size =~ /(\d+)[x\s]+(\d+)/) ||
- # 2 positive integers separated by
+ } elsif (($size =~ /([\d\.]+)[x\s]+([\d\.]+)/) ||
+ # 2 positive numbers separated by
# whitespace or an 'x'
($size =~ /\-dDEVICEWIDTHPOINTS\=(\d+)\s+\-dDEVICEHEIGHTPOINTS\=(\d+)/)) {
# "-dDEVICEWIDTHPOINTS=..."/"-dDEVICEHEIGHTPOINTS=..."
--
2.25.4

360
SPECS-EXTENDED/foomatic/foomatic-manpages.patch
Просмотреть файл

@ -1,360 +0,0 @@
diff -up foomatic-db-engine-4.0.11/foomatic-cleanupdrivers.1.in.manpages foomatic-db-engine-4.0.11/foomatic-cleanupdrivers.1.in
--- foomatic-db-engine-4.0.11/foomatic-cleanupdrivers.1.in.manpages 2014-08-28 14:48:37.799189679 +0100
+++ foomatic-db-engine-4.0.11/foomatic-cleanupdrivers.1.in 2014-08-28 14:48:37.799189679 +0100
@@ -0,0 +1,16 @@
+.\" This -*- nroff -*- source file is part of foomatic.
+.\"
+.TH FOOMATIC-CLEANUPDRIVERS 1 "2014-08-21" "Foomatic Project"
+.SH NAME
+foomatic-cleanupdrivers \- Remove driver entries with no command line
+.SH SYNOPSIS
+.HP \w'\fBfoomatic-cleanupdrivers\fR\ 'u
+\fBfoomatic-cleanupdrivers\fR [\fIDBDIR\fR]
+
+.SH DESCRIPTION
+.PP
+The \fBfoomatic\-cleanupdrivers\fR command removes all driver XML
+files which have an empty command line.
+
+.PP
+It is not intended to be called directly by the user.
diff -up foomatic-db-engine-4.0.11/foomatic-datafile.1.manpages foomatic-db-engine-4.0.11/foomatic-datafile.1
--- foomatic-db-engine-4.0.11/foomatic-datafile.1.manpages 2014-08-28 14:48:37.799189679 +0100
+++ foomatic-db-engine-4.0.11/foomatic-datafile.1 2014-08-28 14:48:37.799189679 +0100
@@ -0,0 +1 @@
+.so man1/foomatic-ppdfile.1
diff -up foomatic-db-engine-4.0.11/foomatic-extract-text.1.in.manpages foomatic-db-engine-4.0.11/foomatic-extract-text.1.in
--- foomatic-db-engine-4.0.11/foomatic-extract-text.1.in.manpages 2014-08-28 14:48:37.799189679 +0100
+++ foomatic-db-engine-4.0.11/foomatic-extract-text.1.in 2014-08-28 14:48:37.799189679 +0100
@@ -0,0 +1,16 @@
+.\" This -*- nroff -*- source file is part of foomatic.
+.\"
+.TH FOOMATIC-EXTRACT-TEXT 1 "2014-08-21" "Foomatic Project"
+.SH NAME
+foomatic-extract-text \- Generate .po files from Foomatic UI strings
+.SH SYNOPSIS
+.HP \w'\fBfoomatic-extract-text\fR\ 'u
+\fBfoomatic-extract-text\fR
+
+.SH DESCRIPTION
+.PP
+The \fBfoomatic\-extract\-text\fR command generates .po files from the
+UI strings in the currently installed Foomatic database.
+
+.PP
+It is not intended to be called directly by the user.
diff -up foomatic-db-engine-4.0.11/foomatic-fix-xml.1.in.manpages foomatic-db-engine-4.0.11/foomatic-fix-xml.1.in
--- foomatic-db-engine-4.0.11/foomatic-fix-xml.1.in.manpages 2014-08-28 14:48:37.799189679 +0100
+++ foomatic-db-engine-4.0.11/foomatic-fix-xml.1.in 2014-08-28 14:48:37.799189679 +0100
@@ -0,0 +1,14 @@
+.\" This -*- nroff -*- source file is part of foomatic.
+.\"
+.TH FOOMATIC-FIX-XML 1 "2014-08-21" "Foomatic Project"
+.SH NAME
+foomatic-fix-xml \- Remove leading blank lines from Foomatic database
+.SH SYNOPSIS
+.HP \w'\fBfoomatic-fix-xml\fR\ 'u
+\fBfoomatic-fix-xml\fR [\fIDBDIR\fR]
+
+.SH DESCRIPTION
+.PP
+Use the \fBfoomatic\-fix\-xml\fR command if you have compiled
+foomatic-perl-data against libxml 1.x and you have old database
+entries with a leading blank line.
diff -up foomatic-db-engine-4.0.11/foomatic-nonumericalids.1.in.manpages foomatic-db-engine-4.0.11/foomatic-nonumericalids.1.in
--- foomatic-db-engine-4.0.11/foomatic-nonumericalids.1.in.manpages 2014-08-28 14:48:37.800189684 +0100
+++ foomatic-db-engine-4.0.11/foomatic-nonumericalids.1.in 2014-08-28 14:48:37.800189684 +0100
@@ -0,0 +1,17 @@
+.\" This -*- nroff -*- source file is part of foomatic.
+.\"
+.TH FOOMATIC-NONUMERICALIDS 1 "2014-08-21" "Foomatic Project"
+.SH NAME
+foomatic-nonumericalids \- Convert numerical printer IDS to clear-text IDs
+.SH SYNOPSIS
+.HP \w'\fBfoomatic-nonumericalids\fR\ 'u
+\fBfoomatic-nonumericalids\fR
+
+.SH DESCRIPTION
+.PP
+This script changes all old cryptic numerical printer IDs from the old
+PostGreSQL time to clear-text printer IDs in the installed Foomatic
+database.
+
+.PP
+It is very unlikely you need to do this.
diff -up foomatic-db-engine-4.0.11/foomatic-ppd-to-xml.1.in.manpages foomatic-db-engine-4.0.11/foomatic-ppd-to-xml.1.in
--- foomatic-db-engine-4.0.11/foomatic-ppd-to-xml.1.in.manpages 2014-08-28 14:48:37.800189684 +0100
+++ foomatic-db-engine-4.0.11/foomatic-ppd-to-xml.1.in 2014-08-28 14:48:37.800189684 +0100
@@ -0,0 +1,104 @@
+.\" This -*- nroff -*- source file is part of foomatic.
+.\"
+.TH FOOMATIC-PPD-TO-XML 1 "2014-08-21" "Foomatic Project"
+.SH NAME
+foomatic-ppd-to-xml \- Generate Foomatic printer XML from a PPD
+.SH SYNOPSIS
+.HP \w'\fBfoomatic-ppd-to-xml\fR\ 'u
+\fBfoomatic-ppd-to-xml\fR \fIOPTIONS\FR [\fIDRIVER\fR:]\fIPPD\fR [[\fIDRIVER\fR:]\fIPPD\fR ...]
+.HP \w'\fBfoomatic-ppd-to-xml\fR\ 'u
+\fBfoomatic-ppd-to-xml\fR \-h
+
+.SH DESCRIPTION
+The first form of the
+.B foomatic-ppd-to-xml
+command creates Foomatic printer XML corresponding to a given PPD
+file.
+
+.PP
+If \fIDRIVER\fR is specified, it is the driver to which the PPD file
+should get assigned. If not supplied, the first driver in the driver
+list supplied via the \fB\-d\fR option is used. Note that the PPD files
+have to be supplied to different drivers, so drivers need to be
+specified if using more than one PPD.
+
+.PP
+The second form prints a help message and exits.
+
+.SS Options
+.TP 5
+\fB\-d\fR \fIDRIVERS\fR
+Comma-separated list of drivers with which the printer works. First
+driver is the one for which the PPD file is. If not otherwise stated
+by the \fB\-r\fR option, this is also the recommended driver. Drivers
+already specified together with PPDs do not need to be specified with
+this option again. The option is not needed if drivers are specified
+for all PPDs.
+
+.TP 5
+\fB\-r\fR \fIDRIVER\fR
+Recommended driver.
+
+.TP 5
+\fB\-p\fR \fIPDLS\fR
+Comma-separated list of known Page Description Languages (PDLs) which
+the printer supports. This will add all suitable drivers to the XML
+entry. Currently supported are: Postscript, PCLXL, PCL6, PCL5e, PCL5c,
+PCL5, and PCL4.
+
+.TP 5
+\fB\-l\fR
+Add a link to the PPD file to the driver entry in the XML file.
+
+.TP 5
+\fB\-b\fR \fIDIRECTORY\fR
+Base directory for a relative link to the PPD. If the base directory
+is given, the link set via the \fB\-l\fR option is relative to this
+directory (and not relative to the current directory). With a base
+directory given the \fIPPD\fR can also be given relative to this
+directory.
+
+.TP 5
+\fB\-D\fR
+Add only the driver requested by \fB\-d\fR and \fB\-r\fR to the driver
+list in the XML file, do not add drivers based on PDLs, not even on
+the PDLs supplied by the \fB\-p\fR option.
+
+.TP 5
+\fB\-c\fR \fICOMMENT\fR
+Add the given comment to the comment field of the XML file. Comments
+are in HTML.
+
+.TP 5
+\fB\-C\fR
+Suppress any default comments (max paper width, pages per minute,
+automatically generated XML, ...). Does not suppress the comment
+supplied with \fB\-c\fR.
+
+.TP 5
+\fB\-f\fR \fIDIRECTORY\fR
+Directory in which to write the resulting XML file. The name of the
+file will be the printer ID with the ".xml" extension.
+
+.TP 5
+\fB\-n\fR
+Do not write modified versions of existing XML files, only create XML
+files for printers for which there is no XML file yet.
+
+.TP 5
+\fB\-x\fR
+Create XML files independent of whether or not there are already XML
+files for the printers covered by the PPD. This makes the process
+vastly faster if you have PPD files for printers which are definitely
+not yet in the Foomatic database.
+
+.SH EXIT STATUS
+\fBfoomatic-ppd-to-xml\fR returns 0 on success, 1 otherwise.
+
+.SH BUGS
+None so far.
+
+Please post bug reports on
+
+http://lists.freestandards.org/mailman/listinfo/printing-foomatic
+
diff -up foomatic-db-engine-4.0.11/foomatic-preferred-driver.8.in.manpages foomatic-db-engine-4.0.11/foomatic-preferred-driver.8.in
--- foomatic-db-engine-4.0.11/foomatic-preferred-driver.8.in.manpages 2014-08-28 14:48:59.729304630 +0100
+++ foomatic-db-engine-4.0.11/foomatic-preferred-driver.8.in 2014-08-28 15:00:59.291077529 +0100
@@ -1,25 +1,16 @@
.\" This -*- nroff -*- source file is part of foomatic.
.\"
-.TH FOOMATIC-PREFERRED-DRIVER 8 "2001-05-07" "Foomatic Project"
+.TH FOOMATIC-PREFERRED-DRIVER 8 "2014-08-28" "Foomatic Project"
.SH NAME
-foomatic-preferred-driver \- <put a short description here>
+foomatic-preferred-driver \- set default drivers in Foomatic database
.SH SYNOPSIS
.B foomatic-preferred-driver
-.\"[\fIOPTION\fR]...
-[To be edited]
-
-.SH SEE ALSO
-.IR foomatic-XXX (1),
-
-.SH EXIT STATUS
-.B foomatic-preferred-driver
-returns ...
-
-.SH AUTHOR
-Manfred Wassmann <\fImanolo@NCC-1701.B.Shuttle.de\fR> for the foomatic
-project using output from the associated binary.
-
-.SH BUGS
-This manpage contains no useful information.
+.SH DESCRIPTION
+.PP
+This command reads the printer database overview and puts default
+driver entries (<driver>..</driver>) into every printer's XML database
+entry.
+.PP
+It is very unlikely you need to do this.
diff -up foomatic-db-engine-4.0.11/foomatic-printermap-to-gutenprint-xml.1.in.manpages foomatic-db-engine-4.0.11/foomatic-printermap-to-gutenprint-xml.1.in
--- foomatic-db-engine-4.0.11/foomatic-printermap-to-gutenprint-xml.1.in.manpages 2014-08-28 14:48:37.800189684 +0100
+++ foomatic-db-engine-4.0.11/foomatic-printermap-to-gutenprint-xml.1.in 2014-08-28 14:48:37.800189684 +0100
@@ -0,0 +1,18 @@
+.\" This -*- nroff -*- source file is part of foomatic.
+.\"
+.TH FOOMATIC-PRINTERMAP-TO-GUTENPRINT-XML 1 "2014-08-21" "Foomatic Project"
+.SH NAME
+foomatic-printermap-to-gutenprint-xml \- Updates Gutenprint driver XML file
+.SH SYNOPSIS
+.HP \w'\fBfoomatic-printermap-to-gutenprint-xml\fR\ 'u
+\fBfoomatic-printermap-to-gutenprint-xml\fR
+
+.SH DESCRIPTION
+.PP
+This command updates the driver XML file for the Gutenprint driver to
+the state of the foomatic-printermap file in the Gutenprint source
+tree. Used to update the driver XML file for Gutenprint in the
+OpenPrinting database.
+
+.PP
+It is very unlikely you need to do this.
diff -up foomatic-db-engine-4.0.11/foomatic-replaceoldprinterids.1.in.manpages foomatic-db-engine-4.0.11/foomatic-replaceoldprinterids.1.in
--- foomatic-db-engine-4.0.11/foomatic-replaceoldprinterids.1.in.manpages 2014-08-28 14:48:37.800189684 +0100
+++ foomatic-db-engine-4.0.11/foomatic-replaceoldprinterids.1.in 2014-08-28 14:48:37.800189684 +0100
@@ -0,0 +1,18 @@
+.\" This -*- nroff -*- source file is part of foomatic.
+.\"
+.TH FOOMATIC-REPLACEOLDPRINTERIDS 1 "2014-08-21" "Foomatic Project"
+.SH NAME
+foomatic-replaceoldprinterids \- Replace references to old printer IDs
+.SH SYNOPSIS
+.HP \w'\fBfoomatic-replaceoldprinterids\fR\ 'u
+\fBfoomatic-replaceoldprinterids\fR
+
+.SH DESCRIPTION
+.PP
+Replaces references to old numerical or otherwise obsolete printer IDs
+in arbitrary file. By default it uses the db/oldprinterids file of the
+current Foomatic database as translation table, but you can use
+arbitrary translation tables.
+
+.PP
+It is very unlikely you need to use this.
diff -up foomatic-db-engine-4.0.11/foomatic-searchprinter.1.in.manpages foomatic-db-engine-4.0.11/foomatic-searchprinter.1.in
--- foomatic-db-engine-4.0.11/foomatic-searchprinter.1.in.manpages 2014-08-28 14:48:37.800189684 +0100
+++ foomatic-db-engine-4.0.11/foomatic-searchprinter.1.in 2014-08-28 14:48:37.800189684 +0100
@@ -0,0 +1,82 @@
+.\" This -*- nroff -*- source file is part of foomatic.
+.\"
+.TH FOOMATIC-SEARCHPRINTER 1 "2014-08-21" "Foomatic Project"
+.SH NAME
+foomatic-searchprinter \- Search Foomatic database
+.SH SYNOPSIS
+.HP \w'\fBfoomatic-searchprinter\fR\ 'u
+\fBfoomatic-searchprinter\fR [\-m\fIM\fR] [\-d\FID\fR] \fISEARCHTERM\fR
+.HP \w'\fBfoomatic-searchprinter\fR\ 'u
+\fBfoomatic-searchprinter\fR \-h
+
+.SH DESCRIPTION
+This command displays Foomatic database entries matching \fISEARCHTERM\fR.
+
+.SS Options
+.PP
+\fB\-m\fR\fIM\fR
+.RS 4
+Search mode:
+.PP
+\fIM\fR = 0
+.RS 4
+Match everything (default)
+.RE
+.PP
+\fIM\fR = 1
+.RS 4
+No matches on only the manufacturer
+.RE
+.PP
+\fIM\fR = 2
+.RS 4
+No matches on only the manufacturer or only the model
+.RE
+.PP
+\fIM\fR = 3
+.RS 4
+Exact matches of device ID, make/model, or Foomatic ID plus matches of
+the page description language in the device ID to appropriate
+"Generic" printers
+.RE
+.PP
+\fIM\fR = 4
+.RS 4
+Exact matches of device ID, make/model, or Foomatic ID only
+.RE
+.RE
+
+.PP
+\fB\-d\fR\fID\fR
+.RS 4
+Display results:
+.PP
+\fID\fR = 0
+.RS 4
+Everything
+.RE
+.PP
+\fID\fR = 1
+.RS 4
+Only best match class (default)
+.RE
+.PP
+\fID\fR = 2
+.RS 4
+Only best match
+.RE
+.RE
+
+.PP
+\fB\-h\fR
+.RS 4
+Show help message and exit.
+.RE
+
+.SH BUGS
+None so far.
+
+Please post bug reports on
+
+http://lists.freestandards.org/mailman/listinfo/printing-foomatic
+

5
SPECS-EXTENDED/foomatic/foomatic.signatures.json
Просмотреть файл

@ -1,5 +0,0 @@
{
"Signatures": {
"foomatic-db-engine-4.0.13.tar.gz": "b5c89027aa26967d2e6db62e2af7db0c4039d2480d4fbf2476a6ddcf609a5faf"
}
}

1357
SPECS-EXTENDED/foomatic/foomatic.spec
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

21
SPECS-EXTENDED/gstreamer1/gstreamer1.spec
Просмотреть файл

@ -2,8 +2,6 @@ Vendor: Microsoft Corporation
Distribution: Mariner
%global majorminor 1.0
%bcond_with tex_docs
#global gitrel 140
#global gitcommit a70055b58568f7304ba46bd8742232337013487b
#global shortcommit %(c=%{gitcommit}; echo ${c:0:5})
@ -15,10 +13,10 @@ Distribution: Mariner
Name: gstreamer1
Version: 1.16.2
Release: 4%{?dist}
Release: 5%{?dist}
Summary: GStreamer streaming media framework runtime
License: LGPLv2+
License: GPLv2+
URL: http://gstreamer.freedesktop.org/
%if 0%{?gitrel}
# git clone git://anongit.freedesktop.org/gstreamer/gstreamer
@ -51,17 +49,6 @@ BuildRequires: chrpath
### documentation requirements
BuildRequires: gtk-doc >= 1.3
BuildRequires: libxslt
%if %{with tex_docs}
BuildRequires: openjade
BuildRequires: texlive-jadetex
BuildRequires: docbook-style-dsssl
BuildRequires: docbook-style-xsl
BuildRequires: docbook-utils
BuildRequires: transfig
BuildRequires: netpbm-progs
BuildRequires: texlive-dvips
BuildRequires: ghostscript
%endif
%description
GStreamer is a streaming media framework, based on graphs of filters which
@ -214,6 +201,10 @@ install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer
%changelog
* Fri Feb 04 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.16.2-5
- Removing docs to drop dependency on 'ghostscript'.
- License verified.
* Thu Oct 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.16.2-4
- Converting the 'Release' tag to the '[number].[distribution]' format.

40
SPECS-EXTENDED/libtheora/libtheora.spec
Просмотреть файл

@ -1,12 +1,9 @@
Vendor: Microsoft Corporation
Distribution: Mariner
# enable bootstrap mode (e.g. disables doc generation)
%global bootstrap 1
Name: libtheora
Version: 1.1.1
Release: 27%{?dist}
Release: 28%{?dist}
Summary: Theora Video Compression Codec
License: BSD
URL: http://www.theora.org
@ -20,12 +17,6 @@ BuildRequires: autoconf automake libtool
BuildRequires: libogg-devel >= 1.1
BuildRequires: libvorbis-devel
BuildRequires: SDL-devel libpng-devel
%if 0%{?bootstrap}
Obsoletes: %{name}-devel-docs < %{version}-%{release}
%else
BuildRequires: doxygen
BuildRequires: tetex-latex transfig
%endif
%description
Theora is Xiph.Org's first publicly released video codec, intended
@ -51,17 +42,6 @@ Provides: theora-exp-devel
The libtheora-devel package contains the header files needed to develop
applications with libtheora.
%if ! 0%{?bootstrap}
%package devel-docs
Summary: Documentation for developing Theora applications
BuildArch: noarch
%description devel-docs
The libtheora-devel-docs package contains the documentation needed
to develop applications with libtheora.
%endif
%package -n theora-tools
Summary: Command line tools for Theora videos
Requires: %{name}%{?_isa} = %{version}-%{release}
@ -91,11 +71,6 @@ sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
%if ! 0%{?bootstrap}
make -C doc/spec %{?_smp_mflags}
%endif
%install
%make_install
@ -113,7 +88,8 @@ install -m 755 examples/.libs/png2theora $RPM_BUILD_ROOT/%{_bindir}/png2theora
%files
%doc README COPYING
%license COPYING LICENSE
%doc README
%{_libdir}/*.so.*
%files devel
@ -121,17 +97,15 @@ install -m 755 examples/.libs/png2theora $RPM_BUILD_ROOT/%{_bindir}/png2theora
%{_libdir}/*.so
%{_libdir}/pkgconfig/theora*.pc
%if ! 0%{?bootstrap}
%files devel-docs
%doc doc/libtheora/html doc/vp3-format.txt doc/spec/Theora.pdf
%doc doc/color.html doc/draft-ietf-avt-rtp-theora-00.txt
%endif
%files -n theora-tools
%{_bindir}/*
%changelog
* Fri Feb 04 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.1.1-28
- Removing docs to drop dependency on 'transfig' (requires 'ghostscript' not available in CBL-Mariner).
- License verified.
* Mon Nov 01 2021 Muhammad Falak <mwani@microsft.com> - 1.1.1-27
- Remove epoch

56
SPECS-EXTENDED/libtomcrypt/libtomcrypt.spec
Просмотреть файл

@ -1,32 +1,15 @@
Vendor: Microsoft Corporation
Distribution: Mariner
%if 0%{?fedora}
%global _with_docs 1
%endif
Summary: A comprehensive, portable cryptographic toolkit
Name: libtomcrypt
Version: 1.18.2
Release: 7%{?dist}
Summary: A comprehensive, portable cryptographic toolkit
License: Public Domain or WTFPL
URL: http://www.libtom.net/
Release: 8%{?dist}
License: Public Domain OR WTFPL
Vendor: Microsoft Corporation
Distribution: Mariner
URL: https://www.libtom.net/
Source0: https://github.com/libtom/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
BuildRequires: libtommath-devel >= 1.0
BuildRequires: libtool
%{?_with_docs:
BuildRequires: ghostscript
BuildRequires: texlive-latex-bin-bin
BuildRequires: texlive-makeindex-bin
BuildRequires: texlive-mfware-bin
BuildRequires: tex(cmr10.tfm)
BuildRequires: tex(fancyhdr.sty)
BuildRequires: tex(hyphen.tex)
BuildRequires: tex(mf.mf)
}
%description
A comprehensive, modular and portable cryptographic toolkit that provides
developers with a vast array of well known published block ciphers, one-way hash
@ -36,7 +19,7 @@ cryptography and a plethora of other routines.
Designed from the ground up to be very simple to use. It has a modular and
standard API that allows new ciphers, hashes and PRNGs to be added or removed
without change to the overall end application. It features easy to use functions
and a complete user manual which has many source snippet examples.
and a complete user manual which has many source snippet examples.
%package devel
Summary: Development files for %{name}
@ -46,17 +29,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%{?_with_docs:
%package doc
Summary: Documentation files for %{name}
BuildArch: noarch
Provides: %{name}-doc = %{version}-%{release}
Obsoletes: %{name}-doc < 1.17-19
%description doc
The %{name}-doc package contains documentation for use with %{name}.
}
%prep
%setup -q
@ -69,9 +41,6 @@ export EXTRALIBS="-ltommath"
export CFLAGS="%{build_cflags} -DLTM_DESC -DUSE_LTM"
%make_build V=1 -f makefile.shared library
%make_build V=1 -f makefile.shared test
%{?_with_docs:
%make_build V=1 -f makefile docs
}
%check
./test
@ -80,7 +49,7 @@ export CFLAGS="%{build_cflags} -DLTM_DESC -DUSE_LTM"
%make_install INSTALL_OPTS="-m 755" INCPATH="%{_includedir}" LIBPATH="%{_libdir}" -f makefile.shared
# Remove unneeded files
find %{buildroot} -name '*.la' -delete
find %{buildroot} -type f -name "*.la" -delete -print
find %{buildroot} -name '*.a' -delete
# Fix pkgconfig path
@ -100,12 +69,11 @@ sed -i \
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%{?_with_docs:
%files doc
%doc doc/crypt.pdf
}
%changelog
* Fri Feb 04 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.18.2-8
- Removing docs to drop dependency on 'ghostscript'.
- License verified.
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.18.2-7
- Initial CBL-Mariner import from Fedora 32 (license: MIT).

52
SPECS-EXTENDED/libtommath/libtommath.spec
Просмотреть файл

@ -1,32 +1,15 @@
%bcond_with docs
Vendor: Microsoft Corporation
Distribution: Mariner
Summary: A portable number theoretic multiple-precision integer library
Name: libtommath
Version: 1.1.0
Release: 3%{?dist}
Summary: A portable number theoretic multiple-precision integer library
Release: 4%{?dist}
License: Public Domain
URL: http://www.libtom.net/
Vendor: Microsoft Corporation
Distribution: Mariner
URL: https://www.libtom.net/
Source0: https://github.com/libtom/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
BuildRequires: libtool
%if %{with docs}
BuildRequires: ghostscript
BuildRequires: libtiff-tools
BuildRequires: texlive-dvips-bin
BuildRequires: ghostscript-tools-dvipdf
BuildRequires: texlive-latex-bin-bin
BuildRequires: texlive-makeindex-bin
BuildRequires: texlive-mfware-bin
BuildRequires: texlive-updmap-map
BuildRequires: tex(cmr10.tfm)
BuildRequires: tex(fancyhdr.sty)
BuildRequires: tex(hyphen.tex)
%endif
%description
A free open source portable number theoretic multiple-precision integer library
written entirely in C. (phew!). The library is designed to provide a simple to
@ -41,17 +24,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
The %{name}-devel package contains libraries and header files for developing
applications that use %{name}.
%if %{with docs}
%package doc
Summary: Documentation files for %{name}
BuildArch: noarch
Provides: %{name}-doc = %{version}-%{release}
Obsoletes: %{name}-doc < 0.42-1
%description doc
The %{name}-doc package contains PDF documentation for using %{name}.
%endif
%prep
%setup -q
# Fix permissions on installed library
@ -65,14 +37,11 @@ sed -i \
%build
%set_build_flags
%make_build V=1 CFLAGS="$CFLAGS -I./" -f makefile.shared
%if %{with docs}
make V=1 -f makefile poster manual docs
%endif
%install
%make_install V=1 CFLAGS="$CFLAGS -I./" PREFIX=%{_prefix} LIBPATH=%{_libdir} -f makefile.shared
find %{buildroot} -name '*.la' -delete
find %{buildroot} -type f -name "*.la" -delete -print
find %{buildroot} -name '*.a' -delete
%ldconfig_scriptlets
@ -86,12 +55,11 @@ find %{buildroot} -name '*.a' -delete
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%if %{with docs}
%files doc
%doc doc/bn.pdf doc/poster.pdf doc/tommath.pdf
%endif
%changelog
* Fri Feb 04 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.1.0-4
- Removing docs to drop dependency on 'ghostscript'.
- License verified.
* Mon Jun 14 2021 Thomas Crain <thcrain@microsoft.com> - 1.1.0-3
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
- Conditionally build documentation, and turn off documentation building by default

16
SPECS-EXTENDED/netpbm/netpbm.spec
Просмотреть файл

@ -1,7 +1,7 @@
Summary: A library for handling different graphics file formats
Name: netpbm
Version: 10.90.00
Release: 2%{?dist}
Release: 3%{?dist}
# See copyright_summary for details
License: BSD and GPLv2 and IJG and MIT and Public Domain
Vendor: Microsoft Corporation
@ -12,7 +12,7 @@ URL: http://netpbm.sourceforge.net/
# svn checkout https://svn.code.sf.net/p/netpbm/code/userguide netpbm-%%{version}/userguide
# svn checkout https://svn.code.sf.net/p/netpbm/code/trunk/test netpbm-%%{version}/test
# and removing the .svn directories ( find -name "\.svn" -type d -print0 | xargs -0 rm -rf )
Source0: netpbm-%{version}.tar.xz
Source0: https://svn.code.sf.net/p/netpbm/code/advanced#/%{name}-%{version}.tar.xz
Patch0: netpbm-security-scripts.patch
Patch1: netpbm-security-code.patch
Patch2: netpbm-ppmfadeusage.patch
@ -40,7 +40,6 @@ BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex, gcc, jbigkit-
BuildRequires: perl-generators, python3, jasper-devel, libxml2-devel
BuildRequires: perl(Config), perl(Cwd), perl(English), perl(Fcntl), perl(File::Basename)
BuildRequires: perl(strict)
BuildRequires: ghostscript
%description
The netpbm package contains a library of functions which support
@ -63,7 +62,6 @@ to have the netpbm package installed.
%package progs
Summary: Tools for manipulating graphics files in netpbm supported formats
Requires: ghostscript
Requires: netpbm = %{version}-%{release}
%description progs
@ -156,8 +154,6 @@ if [ "%{_libdir}" != "/usr/lib" ]; then
mv %{buildroot}/usr/lib/lib* %{buildroot}%{_libdir}
fi
cp -af lib/libnetpbm.a %{buildroot}%{_libdir}/libnetpbm.a
mkdir -p %{buildroot}%{_datadir}
mv userguide/man %{buildroot}%{_mandir}
@ -208,8 +204,8 @@ export PBM_BINPREFIX=%{buildroot}%{_bindir}
popd
%files
%doc doc/copyright_summary doc/COPYRIGHT.PATENT doc/HISTORY README
%license doc/GPL_LICENSE.txt
%doc doc/HISTORY README
%license doc/copyright_summary doc/COPYRIGHT.PATENT doc/GPL_LICENSE.txt
%{_libdir}/lib*.so.*
%files devel
@ -228,6 +224,10 @@ popd
%doc userguide/*
%changelog
* Fri Feb 04 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 10.90.00-3
- Removing dependency on 'ghostscript'.
- License verified.
* Wed Mar 31 2021 Henry Li <lihl@microsoft.com> - 10.90.00-2
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
- Remove libX11-devel from build requirement

894
SPECS-EXTENDED/pnm2ppa/pbm2ppa-20000205.diff
Просмотреть файл

@ -1,894 +0,0 @@
diff -up pbm2ppa-0.8.6/CALIBRATION.20000205 pbm2ppa-0.8.6/CALIBRATION
--- pbm2ppa-0.8.6/CALIBRATION.20000205 1998-08-22 14:44:07.000000000 +0100
+++ pbm2ppa-0.8.6/CALIBRATION 2008-09-24 15:15:53.000000000 +0100
@@ -10,9 +10,22 @@ during this procedure (like 600)]
The 'pbmtpg' program generates a full-page (8.5"x11") test pattern in
pbmraw (P4) format on stdout. The output may be fed directly into pbm2ppa
in order to print a calibration pattern on your printer with commands such as:
+Assuming you printer is on /dev/lp0
- pbmtpg | pbm2ppa > /dev/lp1
+ pbmtpg | pbm2ppa > /dev/lp0
( as root )
+(Note: /dev/lp0 is the default device for the primary parallel port on systems
+with 2.2.x or later Linux kernels; it is /dev/lp1 on systems with
+older Linux 2.0.x kernels)
+
+For other papersizes, the command must specify a valid size, for both
+pbmtpg and pbm2ppa:
+
+ pbmtpg -a4 | pbm2ppa -s a4 > /dev/lp0
+ pbmtpg -legal | pbm2ppa -s legal > /dev/lp0
+ pbmtpg -letter | pbm2ppa -s letter > /dev/lp0
+
+For A4, US Legal of US Letter (default).
- or -
@@ -33,3 +46,7 @@ paper. Also, the margins should be able
causing the printer to choke with 'blinking lights syndrome'.
[TODO: Add shearing adjustments to pbm2ppa and explain here]
+
+
+
+
diff -up pbm2ppa-0.8.6/defaults.1000.h.20000205 pbm2ppa-0.8.6/defaults.1000.h
--- pbm2ppa-0.8.6/defaults.1000.h.20000205 1998-08-22 14:44:12.000000000 +0100
+++ pbm2ppa-0.8.6/defaults.1000.h 2008-09-24 15:17:47.000000000 +0100
@@ -1,19 +0,0 @@
-/* defaults.h
- * Default printer values. Edit these and recompile if so desired.
- * [Note: a /etc/pbm2ppa.conf file will override these]
- */
-#ifndef _DEFAULTS_H
-#define _DEFAULTS_H
-
-#define DEFAULT_PRINTER ( HP1000 )
-
-/* Refer to CALIBRATION file about these settings */
-#define DEFAULT_X_OFFSET ( 100 )
-#define DEFAULT_Y_OFFSET ( -650 )
-
-#define DEFAULT_TOP_MARGIN ( 150 )
-#define DEFAULT_LEFT_MARGIN ( 150 )
-#define DEFAULT_RIGHT_MARGIN ( 150 )
-#define DEFAULT_BOTTOM_MARGIN ( 150 )
-
-#endif
diff -up pbm2ppa-0.8.6/defaults.720.h.20000205 pbm2ppa-0.8.6/defaults.720.h
--- pbm2ppa-0.8.6/defaults.720.h.20000205 1998-08-22 14:44:12.000000000 +0100
+++ pbm2ppa-0.8.6/defaults.720.h 2008-09-24 15:17:47.000000000 +0100
@@ -1,19 +0,0 @@
-/* defaults.h
- * Default printer values. Edit these and recompile if so desired.
- * [Note: a /etc/pbm2ppa.conf file will override these]
- */
-#ifndef _DEFAULTS_H
-#define _DEFAULTS_H
-
-#define DEFAULT_PRINTER ( HP720 )
-
-/* Refer to CALIBRATION file about these settings */
-#define DEFAULT_X_OFFSET ( 169 )
-#define DEFAULT_Y_OFFSET ( -569 )
-
-#define DEFAULT_TOP_MARGIN ( 150 )
-#define DEFAULT_LEFT_MARGIN ( 150 )
-#define DEFAULT_RIGHT_MARGIN ( 150 )
-#define DEFAULT_BOTTOM_MARGIN ( 150 )
-
-#endif
diff -up pbm2ppa-0.8.6/defaults.820.h.20000205 pbm2ppa-0.8.6/defaults.820.h
--- pbm2ppa-0.8.6/defaults.820.h.20000205 1998-08-22 14:44:12.000000000 +0100
+++ pbm2ppa-0.8.6/defaults.820.h 2008-09-24 15:17:47.000000000 +0100
@@ -1,19 +0,0 @@
-/* defaults.h
- * Default printer values. Edit these and recompile if so desired.
- * [Note: a /etc/pbm2ppa.conf file will override these]
- */
-#ifndef _DEFAULTS_H
-#define _DEFAULTS_H
-
-#define DEFAULT_PRINTER ( HP820 )
-
-/* Refer to CALIBRATION file about these settings */
-#define DEFAULT_X_OFFSET ( 75 )
-#define DEFAULT_Y_OFFSET ( -500 )
-
-#define DEFAULT_TOP_MARGIN ( 80 )
-#define DEFAULT_LEFT_MARGIN ( 80 )
-#define DEFAULT_RIGHT_MARGIN ( 80 )
-#define DEFAULT_BOTTOM_MARGIN ( 150 )
-
-#endif
diff -up /dev/null pbm2ppa-0.8.6/defaults.h
--- /dev/null 2008-09-24 08:53:03.196006296 +0100
+++ pbm2ppa-0.8.6/defaults.h 2008-09-24 15:15:53.000000000 +0100
@@ -0,0 +1,53 @@
+/* defaults.h
+ * Default printer values. Edit these and recompile if so desired.
+ * [Note: a /etc/pbm2ppa.conf file will override these]
+ */
+
+#ifndef _DEFAULTS_H
+#define _DEFAULTS_H
+
+#ifndef DEFAULT_PRINTER
+#define DEFAULT_PRINTER ( HP720 )
+#endif
+
+/* for HP720 series */
+/* Refer to CALIBRATION file about these settings */
+#define HP720_X_OFFSET ( 169 )
+#define HP720_Y_OFFSET ( -569 )
+
+#define HP720_TOP_MARGIN ( 150 )
+#define HP720_LEFT_MARGIN ( 150 )
+#define HP720_RIGHT_MARGIN ( 150 )
+#define HP720_BOTTOM_MARGIN ( 150 )
+
+/* for HP820 series */
+/* Refer to CALIBRATION file about these settings */
+#define HP820_X_OFFSET ( 75 )
+#define HP820_Y_OFFSET ( -500 )
+
+#define HP820_TOP_MARGIN ( 80 )
+#define HP820_LEFT_MARGIN ( 80 )
+#define HP820_RIGHT_MARGIN ( 80 )
+#define HP820_BOTTOM_MARGIN ( 150 )
+
+/* for HP1000 series */
+/* Refer to CALIBRATION file about these settings */
+#define HP1000_X_OFFSET ( 100 )
+#define HP1000_Y_OFFSET ( -650 )
+
+#define HP1000_TOP_MARGIN ( 150 )
+#define HP1000_LEFT_MARGIN ( 150 )
+#define HP1000_RIGHT_MARGIN ( 150 )
+#define HP1000_BOTTOM_MARGIN ( 150 )
+
+#endif
+
+
+
+
+
+
+
+
+
+
diff -up pbm2ppa-0.8.6/INSTALL.20000205 pbm2ppa-0.8.6/INSTALL
--- pbm2ppa-0.8.6/INSTALL.20000205 1998-10-19 02:27:16.000000000 +0100
+++ pbm2ppa-0.8.6/INSTALL 2008-09-24 15:15:53.000000000 +0100
@@ -1,6 +1,6 @@
Overview
--------
-This file contains some quick notes on installation in general. For a
+ This file contains some quick notes on installation in general. For a
complete step-by-step instruction on how to install pbm2ppa for your
printer, please see INSTALL-MORE. (It was written for the 820, but it
should work for all supported models) Thanks to Michael Buehlmann for
@@ -9,14 +9,19 @@ writing that guide!
Compilation
-----------
To compile, you should simply run 'make' with the series of your
-printer. The following options are supported:
+printer. This will set the default printer to the HP720 series.
+To specify a different default printyer, the following options are supported:
make 720 # for 720 series - e.g. 722C
make 820 # for 820 series - e.g. 820Cse
make 1000 # for 1000 series
-If you choose to recompile for a different printer series, you must 'make
-clean' first.
+ If you choose to recompile for a different default printer series,
+you must 'make clean' first. However, the default printer choice
+selected at compilation time can be overridden with e.g., the
+"pbm2pppa -v 820 ..." command line option, or specified by e.g.,
+a "version 820" entry in the /etc/pbm2ppa.conf file.
+Type "pbm2ppa -h" to see the list of options.
Installation
------------
@@ -26,17 +31,23 @@ but you might want to tweak them). See
The other binary created, pbm2ppa, is a converter from a PBM
image to a stream of PPA data that can be sent directly to the printer.
-The PBM image is expected to be 600 dpi, 8.5"x11". These files can be
+The PBM image is expected to be 600 dpi, and the paper size
+can be 8.5"x11" (US Letter), 8.5"x14" (US Legal) or A4. These files can be
generated with ghostscript. Both the pbm and pbmraw devices are supported.
pbmraw is MUCH faster, so use it if you have it available!
+IMPORTANT: the PAPERSIZE option passed to ghostscript must match
+the paper size specified for pbm2ppa.
+Valid papersizes are: "letter" = "us" , "legal" , and "a4" .
Use
---
- To print a postscript file with this program, I use a simple
-shell script:
+ To print a postscript file with this program, on US Letter
+paper and a HP 710/720 series printer, I use a simple shell script:
-cat $1 | gs -sDEVICE=pbm -q -dNOPAUSE -r600 -sOutputFile=- - | \
-pbm2ppa - - | lpr
+cat $1 | gs -sDEVICE=pbm -q -dNOPAUSE -r600 -sPAPERSIZE=letter -sOutputFile=- - | \
+pbm2ppa -s letter -v 720 - - | lpr -l
+
+Valid printer versions are "720", "820" and "1000".
You can also set up a printer filter. See the documentation for
your print spooler for information on how to do that, or look in
diff -up pbm2ppa-0.8.6/INSTALL-MORE.20000205 pbm2ppa-0.8.6/INSTALL-MORE
--- pbm2ppa-0.8.6/INSTALL-MORE.20000205 1998-10-19 02:27:17.000000000 +0100
+++ pbm2ppa-0.8.6/INSTALL-MORE 2008-09-24 15:15:53.000000000 +0100
@@ -36,14 +36,21 @@ or put in your printer number (720, 820
file).
-2. To adjust the paper size to DIN A4, use the -s a4 option to pbm2ppa or
+2. To adjust the paper size to US Legal (8.5"x14"), use the -s legal option
+to pbm2ppa or change your pbm2ppa.conf file to read "papersize legal"
+To adjust the paper size to DIN A4, use the -s a4 option to pbm2ppa or
change your pbm2ppa.conf file to read "papersize a4" (see step 5).
-
+For US Letter (8.5"x11") paper is the default; "-s us", "-s letter",
+"papersize us" and "papersize letter" also specif this size.
3. You can now calibrate the printer with
-For US size paper:
+For US Letter size paper:
# pbmtpg | pbm2ppa > /dev/lp1 ( as root )
+or
+# pbmtpg -letter | pbm2ppa > /dev/lp1 ( as root )
+For US Legal size paper:
+# pbmtpg -legal | pbm2ppa -s a4 > /dev/lp1 ( as root )
For A4 size paper:
# pbmtpg -a4 | pbm2ppa -s a4 > /dev/lp1 ( as root )
diff -up pbm2ppa-0.8.6/Makefile.20000205 pbm2ppa-0.8.6/Makefile
--- pbm2ppa-0.8.6/Makefile.20000205 1998-10-11 16:17:16.000000000 +0100
+++ pbm2ppa-0.8.6/Makefile 2008-09-24 15:15:53.000000000 +0100
@@ -1,36 +1,23 @@
CC=gcc
-CFLAGS=-Wall -O2
+CFLAGS=-Wall -O2
LDFLAGS=
+PRINTER=HP720
-default:
- @echo Please specify the type of printer you wish to compile this
- @echo software for. Supported options are:
- @echo
- @echo make 720
- @echo make 820
- @echo make 1000
- @echo
- @exit
+default: all
-720.h:
- cp defaults.720.h defaults.h
+720: PRINTER=HP720
+720: all
-820.h:
- cp defaults.820.h defaults.h
+820: PRINTER=HP820
+820: all
-1000.h:
- cp defaults.1000.h defaults.h
+1000: PRINTER=HP1000
+1000: all
-720: 720.h all
-
-820: 820.h all
-
-1000: 1000.h all
-
-all: defaults.h pbm2ppa pbmtpg
+all: pbm2ppa pbmtpg
clean:
- rm -f *.o *~ pbmtpg pbm2ppa defaults.h
+ rm -f *.o *~ pbmtpg pbm2ppa
pbm2ppa: pbm2ppa.o ppa.o pbm.o cutswath.o
$(CC) $(LDFLAGS) -o pbm2ppa pbm2ppa.o ppa.o pbm.o cutswath.o
@@ -39,4 +26,11 @@ pbmtpg: pbmtpg.o
$(CC) $(CFLAGS) -o pbmtpg pbmtpg.o -lm
.c.o: $*.c ppa.h pbm.h
- $(CC) $(CFLAGS) -c $*.c
+ $(CC) $(CFLAGS) -DDEFAULT_PRINTER=$(PRINTER) -c $*.c
+
+
+
+
+
+
+
diff -up /dev/null pbm2ppa-0.8.6/pbm2ppa.1
--- /dev/null 2008-09-24 08:53:03.196006296 +0100
+++ pbm2ppa-0.8.6/pbm2ppa.1 2008-09-24 15:15:53.000000000 +0100
@@ -0,0 +1,135 @@
+.TH pnm2ppa "5 Feb 2000"
+.SH NAME
+pbm2ppa - convert portable bitmap (PBM) to HP's Printing Performance Architecture (PPA) file format
+.SH SYNOPSIS
+pbm2ppa [options] [ <\fIinfile\fR] > [ <\fIoutfile\fR]> ] ]
+
+.SH DESCRIPTION
+Reads portable bitmap (PBM) format as input. Outputs a stream suitable for
+processing by Hewlett-Packard's range of Printing Performance Architecture
+(PPA) printers.
+pnm2ppa supports the HP 710c, 712c, 720c, 722c, 820c, and 1000c
+series printers.
+.PP
+(Portable bitmap (PBM) format output can be produced from PostScript(tm) input
+by the GhostScript driver "pbmraw".)
+.PP
+
+
+.SH OPTIONS
+.\"{{{ infile
+.IP "\fB\\fIinfile\fR \fP"
+Input file \fIinfile\fR is either a path to a file or device, or '-' to indicate stdin (defaults to stdin)
+.\"}}}
+
+
+.\"{{{ outfile
+.IP "\fB\\fIoutfile\fR \fP"
+Output file \fIoutfile\fR is either a path to a file or device, or '-' to indicate stdout (defaults to stdout)
+.\"}}}
+
+
+.\"{{{ -b bottommargin
+.IP "\fB\-b \fIbottommargin\fR\fP"
+Sets the bottom margin \fIbottommargin\fR in units of 1/600 inches (e.g., -b 150 = 0.25")
+.\"}}}
+
+
+.\"{{{ -d
+.IP "\fB\-d\fP"
+Displays the current configuration
+.\"}}}
+
+
+.\"{{{ -f configfile
+.IP "\fB\-f \fIconfigfile\fR\fP"
+Overrides reading the configuration from /etc/pnm2ppa.conf, and uses
+\fIconfigfile\fR instead.
+.\"}}}
+
+
+.\"{{{ -h
+.IP "\fB\-h\fP"
+Displays program usage
+.\"}}}
+
+
+
+.\"{{{ -l leftmargin
+.IP "\fB\-l \fIleftmargin\fR\fP"
+Sets the left margin \fIleftmargin\fR in units of 1/600 inches (e.g., -l 150 = 0.25")
+.\"}}}
+
+
+.\"{{{ -r rightmargin
+.IP "\fB\-r \fIrightmargin\fR\fP"
+Sets the right margin \fIrightmargin\fR in units of 1/600 inches (e.g., -r 150 = 0.25")
+.\"}}}
+
+.\"{{{ -s papersize
+.IP "\fB\-s \fIpapersize\fR\fP"
+Sets the paper size. Possible values for \fIpapersize\fR are \fBa4\fP (A4),
+\fBletter\fP or \fBus\fP (US Letter, 8.5"x11"), and \fBlegal\fR (US Legal,
+8.5"x14").
+The default is US Letter.
+.\"}}}
+
+.\"{{{ -t topmargin
+.IP "\fB\-t \fItopmargin\fR\fP"
+Sets the top margin \fItopmargin\fR in units of 1/600 inches (ie -t 150 = 0.25")
+.\"}}}
+
+.\"{{{ -v printertype
+.IP "\fB\-v \fIprintertype\fP"
+Selects the printer model. Possible values of \fIprintertype\fR are:
+\fB710\fP, \fB712\fP, \fB720\fP, \fB722\fP, \fB820\fP and \fB1000\fP.
+The default is the HP DeskJet 7X0 Series (710, 712, 720, 722).
+.\"}}}
+
+
+.\"{{{ -x xoffset
+.IP "\fB\-x \fIxoffset\fR\fP"
+Sets the x-offset \fBxoffset\fR from the left of the page. Units are 1/600 inches
+.\"}}}
+
+.\"{{{ -y yoffset
+.IP "\fB\-y \fIyoffset\fR\fP"
+Sets the y-offset \fByoffset\fR from the top of the page. Units are 1/600 inches
+.\"}}}
+
+
+.SH NOTES
+The configuration file is read in first. Command line arguments then modify the resulting definitions.
+.PP
+The -x and -y options accumulate. The -v option resets all definitions back to
+an inbuilt default for that printer and should be used before subsequent -b -l -r, -t, -x, and -y arguments.
+.SH "SEE ALSO"
+pbm(5)
+
+.SH FILES
+
+.\"{{{ /etc/pbm2ppa.conf
+.IP "\fB\fI/etc/pbm2ppa.conf\fR\fP"
+Default configuration file
+.\"}}}
+
+
+.SH AUTHOR
+This code is licensed under the GNU Public License version 2. See
+LICENSE for details.
+.PP
+(c) 1998 Tim Norman
+.PP
+.SH HISTORY
+This program was written by Tim Norman. It originally
+supported black and white output on the 820 series. This program is
+almost obsolete; its successor pnm2ppa will support color printing.
+.SH BUGS
+This is a stable driver, but does not support color printing.
+
+
+
+
+
+
+
diff -up pbm2ppa-0.8.6/pbm2ppa.c.20000205 pbm2ppa-0.8.6/pbm2ppa.c
--- pbm2ppa-0.8.6/pbm2ppa.c.20000205 1998-09-16 01:00:27.000000000 +0100
+++ pbm2ppa-0.8.6/pbm2ppa.c 2008-09-24 15:15:53.000000000 +0100
@@ -17,10 +17,15 @@
/* Paper sizes in 600ths of an inch. */
-/* US is 8.5 in by 11 in */
+/* US Letter is 8.5 in by 11 in */
-#define USWIDTH (5100)
-#define USHEIGHT (6600)
+#define LETTERWIDTH (5100)
+#define LETTERHEIGHT (6600)
+
+/* US Legal is 8.5 in by 14 in */
+
+#define LEGALWIDTH (5100)
+#define LEGALHEIGHT (8400)
/* A4 is 210 mm by 297 mm == 8.27 in by 11.69 in */
@@ -121,16 +126,35 @@ int print_pbm (FILE *in)
void set_printer_specific_defaults()
{
- printer.x_offset=DEFAULT_X_OFFSET;
- printer.y_offset=DEFAULT_Y_OFFSET;
switch(printer.version)
{
case HP720:
+ printer.x_offset=HP720_X_OFFSET;
+ printer.y_offset=HP720_Y_OFFSET;
+ printer.top_margin=HP720_TOP_MARGIN;
+ printer.left_margin=HP720_LEFT_MARGIN;
+ printer.right_margin=HP720_RIGHT_MARGIN;
+ printer.bottom_margin=HP720_BOTTOM_MARGIN;
printer.marg_diff=2;
printer.bufsize = 200*1024;
break;
case HP820:
+ printer.x_offset=HP820_X_OFFSET;
+ printer.y_offset=HP820_Y_OFFSET;
+ printer.top_margin=HP820_TOP_MARGIN;
+ printer.left_margin=HP820_LEFT_MARGIN;
+ printer.right_margin=HP820_RIGHT_MARGIN;
+ printer.bottom_margin=HP820_BOTTOM_MARGIN;
+ printer.marg_diff=0x62;
+ printer.bufsize = 100*1024;
+ break;
case HP1000:
+ printer.x_offset=HP1000_X_OFFSET;
+ printer.y_offset=HP1000_Y_OFFSET;
+ printer.top_margin=HP1000_TOP_MARGIN;
+ printer.left_margin=HP1000_LEFT_MARGIN;
+ printer.right_margin=HP1000_RIGHT_MARGIN;
+ printer.bottom_margin=HP1000_BOTTOM_MARGIN;
printer.marg_diff=0x62;
printer.bufsize = 100*1024;
break;
@@ -144,15 +168,17 @@ void show_usage(char* prog)
{
printf("usage: %s [ options ] [ <infile> [ <outfile> ] ]\n\n",prog);
printf(" Prints a pbm- or pbmraw-format <infile> to HP720/820/1000-format <outfile>.\n\n");
- printf(" -v <version> printer version (720, 820, or 1000)\n");
- printf(" -x <xoff> vertical offset adjustment in 1\"/600\n");
- printf(" -y <yoff> horizontal offset adjustment in 1\"/600\n");
- printf(" -t <topmarg> top margin in 1\"/600 (default: 150 = 0.25\")\n");
- printf(" -l <leftmarg> left margin in 1\"/600 (default: 150 = 0.25\")\n");
- printf(" -r <rightmarg> right margin in 1\"/600 (default: 150 = 0.25\")\n");
- printf(" -b <botmarg> bottom margin in 1\"/600 (default: 150 = 0.25\")\n");
- printf(" -s <paper> paper size (us, a4, default: us)\n");
+ printf(" -b <margin> bottom margin in 1\"/600 (default: 150 = 0.25\")\n");
+ printf(" -d dumps the configuration to stdout");
printf(" -f <cfgfile> read <cfgfile> as parameters\n\n");
+ printf(" -h displays this help text");
+ printf(" -l <margin> left margin in 1\"/600 (default: 150 = 0.25\")\n");
+ printf(" -r <margin> right margin in 1\"/600 (default: 150 = 0.25\")\n");
+ printf(" -s <paper> paper size (us,letter,legal,a4, default: us)\n");
+ printf(" -t <margin> top margin in 1\"/600 (default: 150 = 0.25\")\n");
+ printf(" -v <model> printer model (710, 712, 720, 722, 820, or 1000)\n");
+ printf(" -x <offset> vertical offset adjustment in 1\"/600\n");
+ printf(" -y <offset> horizontal offset adjustment in 1\"/600\n");
printf(" The -x and -y options accumulate. The -v option resets the horizontal and\n");
printf(" vertical adjustments to an internal default. <infile> and <outfile> default\n");
printf(" to stdin and stdout. '-' is a synonym for stdin and stdout.\n\n");
@@ -173,7 +199,13 @@ void show_usage(char* prog)
void parm_version(char* arg)
{
- if(!strcasecmp(arg,"hp720") || !strcmp(arg,"720"))
+ if(!strcasecmp(arg,"hp710") || !strcmp(arg,"710"))
+ printer.version=HP720;
+ else if(!strcasecmp(arg,"hp712") || !strcmp(arg,"712"))
+ printer.version=HP720;
+ else if(!strcasecmp(arg,"hp720") || !strcmp(arg,"720"))
+ printer.version=HP720;
+ else if(!strcasecmp(arg,"hp722") || !strcmp(arg,"722"))
printer.version=HP720;
else if(!strcasecmp(arg,"hp820") || !strcmp(arg,"820"))
printer.version=HP820;
@@ -191,7 +223,10 @@ void parm_iversion(int arg)
{
switch(arg)
{
+ case 710:
+ case 712:
case 720:
+ case 722:
printer.version=HP720;
break;
case 820:
@@ -262,10 +297,15 @@ void read_config_file(char* fname)
printer.bottom_margin=value;
else if(!strncmp(key,"papersize",len))
{
- if(!strcmp(buf,"us"))
+ if(!strcmp(buf,"us") || !strcmp(buf,"letter"))
+ {
+ Width = LETTERWIDTH;
+ Height = LETTERHEIGHT;
+ }
+ else if(!strcmp(buf,"legal"))
{
- Width = USWIDTH;
- Height = USHEIGHT;
+ Width = LEGALWIDTH;
+ Height = LEGALHEIGHT;
}
else if(!strcmp(buf,"a4"))
{
@@ -313,15 +353,9 @@ int main (int argc, char *argv[])
FILE *in=stdin, *out=stdout;
struct stat tmpstat;
- printer.version = DEFAULT_PRINTER;
- printer.x_offset = DEFAULT_X_OFFSET;
- printer.y_offset = DEFAULT_Y_OFFSET;
- printer.top_margin = DEFAULT_TOP_MARGIN;
- printer.left_margin = DEFAULT_LEFT_MARGIN;
- printer.right_margin = DEFAULT_RIGHT_MARGIN;
- printer.bottom_margin = DEFAULT_BOTTOM_MARGIN;
- Width = USWIDTH;
- Height = USHEIGHT;
+ printer.version = DEFAULT_PRINTER;
+ Width = LETTERWIDTH;
+ Height = LETTERHEIGHT;
set_printer_specific_defaults();
if(!stat(defaultcfgfile,&tmpstat))
@@ -356,10 +390,15 @@ int main (int argc, char *argv[])
else if(!strcmp(argv[argn],"-s"))
{
argn++;
- if(!strcmp(argv[argn],"us"))
+ if(!strcmp(argv[argn],"us") || !strcmp(argv[argn],"letter"))
{
- Width = USWIDTH;
- Height = USHEIGHT;
+ Width = LETTERWIDTH;
+ Height = LETTERHEIGHT;
+ }
+ else if(!strcmp(argv[argn],"legal"))
+ {
+ Width = LEGALWIDTH;
+ Height = LEGALHEIGHT;
}
else if(!strcmp(argv[argn],"a4"))
{
@@ -414,3 +453,4 @@ int main (int argc, char *argv[])
return print_pbm (in);
}
+
diff -up /dev/null pbm2ppa-0.8.6/pbm2ppa.conf
--- /dev/null 2008-09-24 08:53:03.196006296 +0100
+++ pbm2ppa-0.8.6/pbm2ppa.conf 2008-09-24 15:15:53.000000000 +0100
@@ -0,0 +1,58 @@
+# Sample configuration file for the HP720/HP820/HP1000 PPA Printers
+#
+# This file will be automatically read upon startup if it's placed in
+# /etc/pbm2ppa.conf
+#
+
+# uncomment options (remove "#" at beginning of line) to activate them
+
+#valid printer versions are 710, 712, 720, 722. 820, 100
+# 710 = 712 = 720 = 722: HP DeskJet 710C, 712C, 720C, 722C (default)
+# 820: HP DeskJet 820Cse, 820Cxi
+# 1000: HP DeskJet 1000Cse, 1000Cxi
+#version 720
+#version 820
+#version 1000
+#
+
+# valid papersizes are us, letter, legal, a4
+# US Letter (8.5"x11"): us, letter (default)
+# US Legal (8.5"x14"): legal
+# A4 : a4
+#papersize letter
+#papersize legal
+#papersize a4
+
+
+#Defaults for 720 series:
+# X-offset, Y-Offset: (Adjust these for your printer, see CALIBRATE)
+#xoff 169
+#yoff -569
+# 1/4 inch margins all around (at 600 DPI)
+#top 150
+#bottom 150
+#left 150
+#right 150
+
+#Defaults for 820 series:
+# X-offset, Y-Offset: (Adjust these for your printer, see CALIBRATE)
+#xoff 75
+#yoff -500
+# 1/4 inch margins all around (at 600 DPI)
+#top 80
+#bottom 150
+#left 80
+#right 80
+
+#Defaults for 820 series:
+# X-offset, Y-Offset: (Adjust these for your printer, see CALIBRATE)
+#xoff 100
+#yoff -650
+# 1/4 inch margins all around (at 600 DPI)
+#top 150
+#bottom 150
+#left 150
+#right 150
+
+
+
diff -up pbm2ppa-0.8.6/pbm2ppa.conf.hp1000.20000205 pbm2ppa-0.8.6/pbm2ppa.conf.hp1000
--- pbm2ppa-0.8.6/pbm2ppa.conf.hp1000.20000205 1998-10-19 02:27:19.000000000 +0100
+++ pbm2ppa-0.8.6/pbm2ppa.conf.hp1000 2008-09-24 15:17:47.000000000 +0100
@@ -1,18 +0,0 @@
-# Sample configuration file for the HP720
-#
-# This file will be automatically read upon startup if it's placed in
-# /etc/pbm2ppa.conf
-#
-
-version 1000
-
-papersize us
-
-xoff 100 # \ Adjust these for your printer.
-yoff -650 # / (see CALIBRATE)
-
-# 1/4 inch margins all around (at 600 DPI)
-top 150
-bottom 150
-left 150
-right 150
diff -up pbm2ppa-0.8.6/pbm2ppa.conf.hp720.20000205 pbm2ppa-0.8.6/pbm2ppa.conf.hp720
--- pbm2ppa-0.8.6/pbm2ppa.conf.hp720.20000205 1998-10-19 02:27:20.000000000 +0100
+++ pbm2ppa-0.8.6/pbm2ppa.conf.hp720 2008-09-24 15:17:47.000000000 +0100
@@ -1,18 +0,0 @@
-# Sample configuration file for the HP720
-#
-# This file will be automatically read upon startup if it's placed in
-# /etc/pbm2ppa.conf
-#
-
-version 720
-
-papersize us
-
-xoff 169 # \ Adjust these for your printer.
-yoff -569 # / (see CALIBRATE)
-
-# 1/4 inch margins all around (at 600 DPI)
-top 150
-bottom 150
-left 150
-right 150
diff -up pbm2ppa-0.8.6/pbm2ppa.conf.hp820.20000205 pbm2ppa-0.8.6/pbm2ppa.conf.hp820
--- pbm2ppa-0.8.6/pbm2ppa.conf.hp820.20000205 1998-10-19 02:27:21.000000000 +0100
+++ pbm2ppa-0.8.6/pbm2ppa.conf.hp820 2008-09-24 15:17:47.000000000 +0100
@@ -1,18 +0,0 @@
-# Sample configuration file for the HP820
-#
-# This file will be automatically read upon startup if it's placed in
-# /etc/pbm2ppa.conf
-#
-
-version 820
-
-papersize us
-
-xoff 75 # \ Adjust these for your printer.
-yoff -500 # / (see CALIBRATE)
-
-# 1/4 inch margins all around (at 600 DPI)
-top 80
-bottom 150
-left 80
-right 80
diff -up pbm2ppa-0.8.6/pbmtpg.c.20000205 pbm2ppa-0.8.6/pbmtpg.c
--- pbm2ppa-0.8.6/pbmtpg.c.20000205 1998-09-16 01:00:28.000000000 +0100
+++ pbm2ppa-0.8.6/pbmtpg.c 2008-09-24 15:15:53.000000000 +0100
@@ -1,13 +1,19 @@
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
-/* Support both US and A4. */
+/* Support US Letter, Legal, and A4. */
-/* US is 8.5 in by 11 in */
+/* US Letter is 8.5 in by 11 in */
-#define USWIDTH (5100)
-#define USHEIGHT (6600)
+#define LETTERWIDTH (5100)
+#define LETTERHEIGHT (6600)
+
+/* US Legal is 8.5 in by 14 in */
+
+#define LEGALWIDTH (5100)
+#define LEGALHEIGHT (8400)
/* A4 is 210 mm by 297 mm == 8.27 in by 11.69 in */
@@ -137,8 +143,24 @@ int main(int argc,char** argv)
char buf[128];
char *progname = *argv;
- Width = USWIDTH;
- Height = USHEIGHT;
+ Width = LETTERWIDTH;
+ Height = LETTERHEIGHT;
+ if(argc>1 && strcmp(argv[1], "-letter")==0)
+ {
+ Width = LETTERWIDTH;
+ Height = LETTERHEIGHT;
+ argc--;
+ argv++;
+ }
+
+ if(argc>1 && strcmp(argv[1], "-legal")==0)
+ {
+ Width = LEGALWIDTH;
+ Height = LEGALHEIGHT;
+ argc--;
+ argv++;
+ }
+
if(argc>1 && strcmp(argv[1], "-a4")==0)
{
Width = A4WIDTH;
@@ -146,6 +168,9 @@ int main(int argc,char** argv)
argc--;
argv++;
}
+
+
+
Pwidth = (Width+7)/8;
bitmap = (char *)malloc(Pwidth*Height);
@@ -192,6 +217,7 @@ int main(int argc,char** argv)
return 1;
}
+ Width = 8*Pwidth ; /* here need 8*Pwidth as the Width ! */
printf("P4\n%d %d\n",Width,Height);
for(x=0; x<Pwidth*Height; x++)
@@ -199,3 +225,10 @@ int main(int argc,char** argv)
return 0;
}
+
+
+
+
+
+
+
diff -up pbm2ppa-0.8.6/README.REDHAT.20000205 pbm2ppa-0.8.6/README.REDHAT
--- pbm2ppa-0.8.6/README.REDHAT.20000205 1998-08-22 14:48:40.000000000 +0100
+++ pbm2ppa-0.8.6/README.REDHAT 2008-09-24 15:15:53.000000000 +0100
@@ -1,12 +1,28 @@
-RedHat users may find the following tip from Panayotis Vryonis <vrypan@hol.gr>
-helpful!
+The best way to integrate support for the HP PPA Printers into RedHat's
+Linux Print System Manager (printtool) is to replace e.g., the
+rhs-printfilters-1.57-3 RPM package that comes with Red Hat 6.1,
+with a PPA-aware version from the pnm2ppa project whic h has a
+homepage at http://www.sourceforge.net/projects/?group_id=1322
-Here is a tip to intergrate HP720C support in RedHat's printtool:
+At the time of writing, the latest release is
+ rhs-printfilters-1.57-4ppa1
+This package includes support for both pbm2ppa and the new
+color driver pnm2ppa.
-Install pbm2ppa. Copy pbm2ppa to /usr/bin.
-Edit "printerdb" (in my system it is found in
-/usr/lib/rhs/rhs-printfilters )
-and append the following lines:
+ -------------------------------------
+
+If for some reason, they cannot use this PPA-aware version of
+rhs-printfilters, RedHat users may still find the following tip from
+Panayotis Vryonis <vrypan@hol.gr> helpful!
+It will work with the standard rhs-printfilters that comes with the
+Red Hat release:
+
+ Here is a tip to integrate HP720C support in RedHat's printtool:
+
+ Install pbm2ppa. Copy pbm2ppa to /usr/bin.
+ Edit "printerdb" (in my system it is found in
+ /usr/lib/rhs/rhs-printfilters )
+ and append the following lines:
----------------------Cut here
-------------------------------------------
StartEntry: DeskJet720C
@@ -23,7 +39,11 @@ StartEntry: DeskJet720C
EndEntry
--------------------------------------------------------------------------
-Now you can add an HP720C printer just like any other, using printtool.
+ Now you can add an HP720C printer just like any other, using printtool.
+
+ [Author's (P. Vryonis) Note: The same should work for the 820 and
+ 1000, but it hasn't been tested. Also, use the pbmraw GSDriver if
+ you have it; it's faster. ]
+
+
-[Author's Note: The same should work for the 820 and 1000, but it hasn't
-been tested. Also, use the pbmraw GSDriver if you have it; it's faster. ]

52
SPECS-EXTENDED/pnm2ppa/pnm2ppa-coverity-return-local.patch
Просмотреть файл

@ -1,52 +0,0 @@
diff -up pnm2ppa-1.04/calibrate_ppa.c.coverity-return-local pnm2ppa-1.04/calibrate_ppa.c
--- pnm2ppa-1.04/calibrate_ppa.c.coverity-return-local 2000-11-11 22:22:38.000000000 +0000
+++ pnm2ppa-1.04/calibrate_ppa.c 2011-05-20 16:04:23.233425268 +0100
@@ -75,7 +75,7 @@ main (int argc, char *argv[])
BOOLEAN gamma = false ;
FILE *outFile = NULL ;
int testPattern = 0;
- char *out_filepath = NULL;
+ char out_filepath[MAXPATHLEN];
char c;
static struct option long_opts[] = {
{"gamma",0,0,'g'},
@@ -157,9 +157,7 @@ main (int argc, char *argv[])
{
if ( strlen(optarg) < MAXPATHLEN )
{
- char filepath[MAXPATHLEN];
- strncpy(filepath, optarg, MAXPATHLEN);
- out_filepath = filepath ;
+ strncpy(out_filepath, optarg, MAXPATHLEN);
use_stdout = false ;
}
}
diff -up pnm2ppa-1.04/pnm2ppa.c.coverity-return-local pnm2ppa-1.04/pnm2ppa.c
--- pnm2ppa-1.04/pnm2ppa.c.coverity-return-local 2000-11-11 19:53:03.000000000 +0000
+++ pnm2ppa-1.04/pnm2ppa.c 2011-05-20 16:04:23.234425246 +0100
@@ -145,20 +145,15 @@ print_pnm (FILE * fptr)
char *
readPath(char *input )
{
- char File_path[MAXPATHLEN];
char *path = NULL;
/* security audit ajv 20001007; be very careful with input strings!*/
if (strlen(input) < MAXPATHLEN )
{
- if ( strncpy (File_path, input, MAXPATHLEN ))
- {
- /*
- a user-specifed file *File_path may later be opened;
- should any extra validation of this be performed now ?
- */
- path = File_path;
- return path;
- }
+ path = strdup(input);
+ /*
+ a user-specifed file *path may later be opened;
+ should any extra validation of this be performed now ?
+ */
}
else
{

25
SPECS-EXTENDED/pnm2ppa/pnm2ppa-gcc10.patch
Просмотреть файл

@ -1,25 +0,0 @@
diff --git a/syslog.c b/syslog.c
index e70f12c..af067e2 100644
--- a/syslog.c
+++ b/syslog.c
@@ -27,6 +27,7 @@
#include "global.h"
+char syslog_message[128];
/*
For some reason, BeOS doesn't seem to implement syslog(), even though it is
diff --git a/syslog.h b/syslog.h
index 7d0e436..5c1accd 100644
--- a/syslog.h
+++ b/syslog.h
@@ -39,7 +39,7 @@
#include <syslog.h>
#endif
-char syslog_message[128];
+extern char syslog_message[128];
extern size_t message_size ;
void wrap_syslog( int, char *, char *);

52
SPECS-EXTENDED/pnm2ppa/pnm2ppa-ldflags.patch
Просмотреть файл

@ -1,52 +0,0 @@
diff -up pnm2ppa-1.04/Makefile.ldflags pnm2ppa-1.04/Makefile
--- pnm2ppa-1.04/Makefile.ldflags 2018-03-01 15:38:09.225582684 +0100
+++ pnm2ppa-1.04/Makefile 2018-03-01 15:50:34.307261745 +0100
@@ -11,7 +11,6 @@ INSTALL=install
# production build
CFLAGS=$(RPM_OPT_FLAGS) -DNDEBUG
-LDFLAGS=-lm
OBJS = pnm2ppa.o syslog.o ppa.o image.o dither.o cutswath.o hash_ink.o gamma.o
SRC = pnm2ppa.c syslog.c ppa.c image.c dither.c cutswath.c hash_ink.c gamma.c
@@ -108,10 +107,10 @@ uninstall:
rm -f $(CONFDIR)/pnm2ppa.conf
pnm2ppa: $(OBJS)
- $(CC) $(LDFLAGS) $(CFLAGS) -o pnm2ppa $(OBJS)
+ $(CC) -lm $(LDFLAGS) $(CFLAGS) -o pnm2ppa $(OBJS)
calibrate_ppa: calibrate_ppa.o pnmtools.o gamma.o
- $(CC) $(LDFLAGS) $(CFLAGS) -o calibrate_ppa calibrate_ppa.o pnmtools.o gamma.o
+ $(CC) -lm $(LDFLAGS) $(CFLAGS) -o calibrate_ppa calibrate_ppa.o pnmtools.o gamma.o
calibrate_ppa.o: calibrate_ppa.c global.h image.h defaults.h pnmtools.h
$(CC) $(CFLAGS) -c calibrate_ppa.c
@@ -144,7 +143,7 @@ syslog.o: syslog.c syslog.h global.h
$(CC) $(CFLAGS) -c syslog.c
make_hash_ink: make_hash_ink.c palette.h hash_ink.h
- $(CC) $(CFLAGS) -o make_hash_ink make_hash_ink.c
+ $(CC) $(CFLAGS) -lm $(LDFLAGS) -o make_hash_ink make_hash_ink.c
hash_ink.c: make_hash_ink
./make_hash_ink 4 3 > hash_ink.c
diff -up pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile.ldflags pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile
--- pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile.ldflags 2018-03-01 15:38:09.226582676 +0100
+++ pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile 2018-03-01 15:53:22.016739424 +0100
@@ -1,6 +1,5 @@
CC=gcc
CFLAGS=$(RPM_OPT_FLAGS)
-LDFLAGS=
PRINTER=HP720
default: all
@@ -23,7 +22,7 @@ pbm2ppa: pbm2ppa.o ppa.o pbm.o cutswath.
$(CC) $(LDFLAGS) -o pbm2ppa pbm2ppa.o ppa.o pbm.o cutswath.o
pbmtpg: pbmtpg.o
- $(CC) $(CFLAGS) -o pbmtpg pbmtpg.o -lm
+ $(CC) $(CFLAGS) $(LDFLAGS) -o pbmtpg pbmtpg.o -lm
.c.o: $*.c ppa.h pbm.h
$(CC) $(CFLAGS) -DDEFAULT_PRINTER=$(PRINTER) -c $*.c

13
SPECS-EXTENDED/pnm2ppa/pnm2ppa-optargs-read.patch
Просмотреть файл

@ -1,13 +0,0 @@
diff --git a/pnm2ppa.c b/pnm2ppa.c
index 4ae36ce..0d60fbb 100644
--- a/pnm2ppa.c
+++ b/pnm2ppa.c
@@ -604,7 +604,7 @@ main (int argc, char *argv[])
int i, opt_index;
FILE *in = NULL, *out = NULL, *gf = NULL;
struct stat tmpstat;
- char c;
+ int c;
BOOLEAN get_Gamma = true;
char *gammaFile=NULL;

33
SPECS-EXTENDED/pnm2ppa/pnm2ppa-redhat.patch
Просмотреть файл

@ -1,33 +0,0 @@
diff -up pnm2ppa-1.04/Makefile.rh pnm2ppa-1.04/Makefile
--- pnm2ppa-1.04/Makefile.rh 2000-11-02 18:33:08.000000000 +0000
+++ pnm2ppa-1.04/Makefile 2008-09-24 15:18:26.000000000 +0100
@@ -10,7 +10,7 @@ CC=gcc
INSTALL=install
# production build
-CFLAGS=-Wall -pedantic -O2 -g -DNDEBUG
+CFLAGS=$(RPM_OPT_FLAGS) -DNDEBUG
LDFLAGS=-lm
OBJS = pnm2ppa.o syslog.o ppa.o image.o dither.o cutswath.o hash_ink.o gamma.o
SRC = pnm2ppa.c syslog.c ppa.c image.c dither.c cutswath.c hash_ink.c gamma.c
diff -up pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile.rh pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile
--- pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile.rh 2008-09-24 15:18:26.000000000 +0100
+++ pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile 2008-09-24 15:18:26.000000000 +0100
@@ -1,5 +1,5 @@
CC=gcc
-CFLAGS=-Wall -O2
+CFLAGS=$(RPM_OPT_FLAGS)
LDFLAGS=
PRINTER=HP720
diff -up pnm2ppa-1.04/pnm2ppa.conf.rh pnm2ppa-1.04/pnm2ppa.conf
--- pnm2ppa-1.04/pnm2ppa.conf.rh 2000-10-28 16:02:57.000000000 +0100
+++ pnm2ppa-1.04/pnm2ppa.conf 2008-09-24 15:18:26.000000000 +0100
@@ -12,7 +12,6 @@
# will be used. The printer version can also be set with the command line
# option e.g., "-v 720".
-version ERROR # PNM2PPA WIIL *NOT* WORK UNTIUL THIS ENTRY IS REMOVED!!!!
#version 720 # 710, 712, 722 also acceptable
#version 820
#version 1000

6
SPECS-EXTENDED/pnm2ppa/pnm2ppa.signatures.json
Просмотреть файл

@ -1,6 +0,0 @@
{
"Signatures": {
"pnm2ppa-1.04.tar.gz": "2a506ffca82db5b4d1cc59c03d1b5925b7aa60355844cc633a14ec8b237e0446",
"ppa-0.8.6.tar.gz": "823924fc569d80332b287a5581beeea140b980ff247a9d43b41352155747b97a"
}
}

304
SPECS-EXTENDED/pnm2ppa/pnm2ppa.spec
Просмотреть файл

@ -1,304 +0,0 @@
Vendor: Microsoft Corporation
Distribution: Mariner
Name: pnm2ppa
Summary: Drivers for printing to HP PPA printers
Version: 1.04
Release: 50%{?dist}
URL: http://sourceforge.net/projects/pnm2ppa
Source: http://download.sourceforge.net/pnm2ppa/pnm2ppa-%{version}.tar.gz
# Following sourcelink is dead currently.
Source1: http://www.httptech.com/ppa/files/ppa-0.8.6.tar.gz
# Upstream sync.
Patch2: pbm2ppa-20000205.diff
# Use RPM_OPT_FLAGS.
Patch3: pnm2ppa-redhat.patch
# Don't return a local variable out of scope (bug #704568).
Patch4: pnm2ppa-coverity-return-local.patch
# add ldflags to Makefile
Patch5: pnm2ppa-ldflags.patch
# FTBFS with GCC 10
Patch6: pnm2ppa-gcc10.patch
# fix argument reading for non x86_64 archs - use int instead of char
Patch7: pnm2ppa-optargs-read.patch
License: GPLv2+
# gcc is no longer in buildroot by default
BuildRequires: gcc
# foomatic is needed for using the filters in CUPS
Requires: foomatic
%description
Pnm2ppa is a color driver for HP PPA host-based printers such as the
HP710C, 712C, 720C, 722C, 820Cse, 820Cxi, 1000Cse, and 1000Cxi.
Pnm2ppa accepts Ghostscript output in PPM format and sends it to the
printer in PPA format.
Install pnm2ppa if you need to print to a PPA printer.
%prep
%setup -q
#pbm2ppa source
%setup -q -T -D -a 1
%patch2 -p0 -b .20000205
%patch3 -p1 -b .rh
%patch4 -p1 -b .coverity-return-local
%patch5 -p1 -b .ldflags
%patch6 -p1 -b .gcc10
%patch7 -p1 -b .optargs-read
for file in docs/en/LICENSE pbm2ppa-0.8.6/LICENSE; do
sed "s|\r||g" $file > $file.new && \
touch -r $file $file.new && \
mv $file.new $file
done
%build
# set redhat build flags
%set_build_flags
%make_build
pushd pbm2ppa-0.8.6
%make_build
popd
%install
install -d $RPM_BUILD_ROOT%{_bindir}
install -d $RPM_BUILD_ROOT%{_sysconfdir}
install -d $RPM_BUILD_ROOT%{_mandir}/man1
make INSTALLDIR=$RPM_BUILD_ROOT%{_bindir} CONFDIR=$RPM_BUILD_ROOT%{_sysconfdir} \
MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1 install
install -p -m 0755 utils/Linux/detect_ppa $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 utils/Linux/test_ppa $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 pbm2ppa-0.8.6/pbm2ppa $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 pbm2ppa-0.8.6/pbmtpg $RPM_BUILD_ROOT%{_bindir}
install -p -m 0644 pbm2ppa-0.8.6/pbm2ppa.conf $RPM_BUILD_ROOT%{_sysconfdir}
install -p -m 0644 pbm2ppa-0.8.6/pbm2ppa.1 $RPM_BUILD_ROOT%{_mandir}/man1
chmod 644 docs/en/LICENSE
mkdir -p pbm2ppa
for file in CALIBRATION CREDITS INSTALL INSTALL-MORE LICENSE README ; do
install -p -m 0644 pbm2ppa-0.8.6/$file pbm2ppa/$file
done
%files
%license docs/en/LICENSE
%doc docs/en/CREDITS docs/en/INSTALL docs/en/README
%doc docs/en/RELEASE-NOTES docs/en/TODO
%doc docs/en/INSTALL.REDHAT.txt docs/en/COLOR.txt docs/en/CALIBRATION.txt
%doc docs/en/INSTALL.REDHAT.html docs/en/COLOR.html docs/en/CALIBRATION.html
%doc test.ps
%doc pbm2ppa
%{_bindir}/pnm2ppa
%{_bindir}/pbm2ppa
%{_bindir}/pbmtpg
%{_bindir}/calibrate_ppa
%{_bindir}/test_ppa
%{_bindir}/detect_ppa
%{_mandir}/man1/pnm2ppa.1*
%{_mandir}/man1/pbm2ppa.1*
%config(noreplace) %{_sysconfdir}/pnm2ppa.conf
%config(noreplace) %{_sysconfdir}/pbm2ppa.conf
%changelog
* Mon Nov 01 2021 Muhammad Falak <mwani@microsft.com> - 1.04-50
- Remove epoch
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1:1.04-49
- Initial CBL-Mariner import from Fedora 33 (license: MIT).
* Tue Aug 04 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1:1.04-48
- fix argument reading for non x86_64 archs - use int instead of char
* Mon Aug 03 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1:1.04-47
- add foomatic as a dependency, because pnm2ppa drivers are not available as a driver without it
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.04-46
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Feb 03 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1:1.04-45
- FTBFS with GCC 10
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.04-44
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.04-43
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.04-42
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Jul 24 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1:1.04-41
- correcting license
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.04-40
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Jul 11 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1:1.04-39
- ship license in %%license tag
* Thu Mar 01 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1:1.04-38
- 1548734 - pnm2ppa: Partial Fedora build flags injection
* Mon Feb 19 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1:1.04-37
- gcc is no longer in buildroot by default
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.04-36
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Feb 08 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1:1.04-35
- remove old stuff https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/MRWOMRZ6KPCV25EFHJ2O67BCCP3L4Y6N/
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.04-34
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.04-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.04-32
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.04-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.04-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.04-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.04-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.04-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.04-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Tue Oct 23 2012 Tim Waugh <twaugh@redhat.com> - 1:1.04-25
- Fixed license tag. pnm2ppa is GPLv2+; pbm2ppa is GPLv2.
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.04-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.04-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Fri May 20 2011 Tim Waugh <twaugh@redhat.com> - 1:1.04-22
- Don't return a local variable out of scope (bug #704568).
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.04-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Tue Oct 05 2010 Parag Nemade <paragn AT fedoraproject.org> - 1:1.04-20
- Merge-review cleanup (#226303)
* Fri Mar 5 2010 Tim Waugh <twaugh@redhat.com> - 1:1.04-19
- Consistent use of macros.
- Removed ancient obsoletes tag.
- Clean buildroot in install section not prep section.
- Make setup quiet.
- Use noreplace for config files.
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.04-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.04-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Wed Sep 24 2008 Tim Waugh <twaugh@redhat.com> 1:1.04-16
- Removed patch fuzz.
* Wed Feb 13 2008 Tim Waugh <twaugh@redhat.com> 1:1.04-15
- Rebuild for GCC 4.3.
* Wed Aug 29 2007 Tim Waugh <twaugh@redhat.com> 1:1.04-14
- Added dist tag.
- Fixed summary.
- Better buildroot tag.
- More specific license tag.
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1:1.04-13.2.2
- rebuild
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1:1.04-13.2.1
- bump again for double-long bug on ppc(64)
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1:1.04-13.2
- rebuilt for new gcc4.1 snapshot and glibc changes
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
- rebuilt
* Wed Mar 16 2005 Tim Waugh <twaugh@redhat.com> 1:1.04-13
- Rebuild for new GCC.
* Wed Feb 9 2005 Tim Waugh <twaugh@redhat.com> 1:1.04-12
- s/Copyright:/License:/.
- s/Serial:/Epoch:/.
- Rebuilt.
* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Thu Feb 19 2004 Tim Waugh <twaugh@redhat.com>
- rebuilt
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
- rebuilt
* Wed Nov 20 2002 Tim Powers <timp@redhat.com>
- rebuild in current collinst
* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
- automated rebuild
* Thu May 23 2002 Tim Powers <timp@redhat.com>
- automated rebuild
* Wed Jan 09 2002 Tim Powers <timp@redhat.com>
- automated rebuild
* Sun Jun 24 2001 Elliot Lee <sopwith@redhat.com>
- Bump release + rebuild.
* Mon Dec 11 2000 Crutcher Dunnavant <crutcher@redhat.com>
- Upgrade to 1.04, editied the pbm2ppa patch to add <string.h>
- to pbmtpg.c, which uses strmp, edited the redhat patch to
- apply cleanly.
* Thu Aug 17 2000 Bill Nottingham <notting@redhat.com>
- tweak summary
* Thu Aug 3 2000 Bill Nottingham <notting@redhat.com>
- build upstream package
* Tue Jul 11 2000 Duncan Haldane <duncan_haldane@users.sourceforge.net>
- updated for 1.0 release.
* Mon Jul 10 2000 Florian La Roche <Florian.LaRoche@redhat.com>
- remove execute bits from config file and man-page
* Sun Apr 09 2000 <duncan_haldane@users.sourceforge.net>
- added optional updated rhs-printfilter files
* Thu Feb 10 2000 Bill Nottingham <notting@redhat.com>
- adopt upstream package
* Sun Feb 6 2000 <duncan_haldane@users.sourceforge.net>
- new pnm2ppa release, and add pbm2ppa driver.
* Thu Jan 6 2000 <duncan_haldane@users.sourceforge.net>
- created rpm

15
SPECS-EXTENDED/rcs/rcs-5.8-build-tweaks.patch
Просмотреть файл

@ -1,15 +0,0 @@
diff -up ./man/Makefile.in.build-tweaks ./man/Makefile.in
--- ./man/Makefile.in.build-tweaks 2013-05-06 09:28:45.000000000 +0200
+++ ./man/Makefile.in 2013-05-10 23:03:36.975917262 +0200
@@ -1237,9 +1237,9 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
dist_man_MANS = ci.1 co.1 ident.1 merge.1 rcs.1 rcsclean.1 \
- rcsdiff.1 rcsfile.5 rcsmerge.1 rlog.1
+ rcsdiff.1 rcsfile.5 rcsmerge.1 rlog.1 rcsfreeze.1
-dist_noinst_MANS = rcsfreeze.1
+#dist_noinst_MANS = rcsfreeze.1
BUILT_SOURCES = REL $(dist_noinst_MANS)
bits = b-base \
b-emptylogmessage \

11
SPECS-EXTENDED/rcs/rcs-5.9.4-t810_disable.patch
Просмотреть файл

@ -1,11 +0,0 @@
diff -up rcs-5.9.4/tests/known-failures.in.t810_disable rcs-5.9.4/tests/known-failures.in
--- rcs-5.9.4/tests/known-failures.in.t810_disable 2018-03-27 14:48:15.344270665 +0200
+++ rcs-5.9.4/tests/known-failures.in 2018-03-27 14:48:55.305831852 +0200
@@ -134,6 +134,7 @@ exit 0
;; t805 under OSX (see "bletcherous hack" above)
* 5.9.4
+ t810 ; ‘ci -l -d -T’ => RCS file mtime set to epoch
* end matter
*** Local variables:

5
SPECS-EXTENDED/rcs/rcs.signatures.json
Просмотреть файл

@ -1,5 +0,0 @@
{
"Signatures": {
"rcs-5.9.4.tar.xz": "063d5a0d7da1821754b80c639cdae2c82b535c8ff4131f75dc7bbf0cd63a5dff"
}
}

276
SPECS-EXTENDED/rcs/rcs.spec
Просмотреть файл

@ -1,276 +0,0 @@
Vendor: Microsoft Corporation
Distribution: Mariner
Summary: Revision Control System (RCS) file version management tools
Name: rcs
Version: 5.9.4
Release: 14%{?dist}
License: GPLv3+
URL: http://www.gnu.org/software/rcs/
Source: ftp://ftp.gnu.org/gnu/rcs/%{name}-%{version}.tar.xz
Patch0: rcs-5.8-build-tweaks.patch
# TODO
Patch1: rcs-5.9.4-t810_disable.patch
# for bundled(gnulib) see https://fedorahosted.org/fpc/ticket/174
Provides: bundled(gnulib)
BuildRequires: gcc
BuildRequires: autoconf
BuildRequires: groff
BuildRequires: ghostscript
BuildRequires: ed
BuildRequires: texinfo
Requires: diffutils
%description
The Revision Control System (RCS) is a system for managing multiple
versions of files. RCS automates the storage, retrieval, logging,
identification and merging of file revisions. RCS is useful for text
files that are revised frequently (for example, programs,
documentation, graphics, papers and form letters).
The rcs package should be installed if you need a system for managing
different versions of files.
%prep
%setup -q
%patch0 -p1 -b .build-tweaks
# TODO
%patch1 -p1 -b .t810_disable
autoconf
%build
%if "%{version}" <= "5.9.4"
# FIXME: Package suffers from c11/inline issues
# Fall back to c99
# Proper fix would be to fix the source-code
CFLAGS="${RPM_OPT_FLAGS} -std=c99"
%endif
%configure --with-diffutils
make %{?_smp_mflags}
%install
make DESTDIR=$RPM_BUILD_ROOT install
install -m 755 src/rcsfreeze $RPM_BUILD_ROOT%{_bindir}
rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
%check
make check XFAIL_TESTS="`tests/known-failures %{version}`"
%files
%doc ChangeLog COPYING THANKS NEWS README
%{_bindir}/*
%{_mandir}/man[15]/*
%{_infodir}/*
%changelog
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 5.9.4-14
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.4-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.4-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.4-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.4-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Mar 27 2018 Matej Mužila <mmuzial@redhat.com> - 5.9.4-9
- Disable t810 test
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.4-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.4-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Sun Jul 05 2015 Ralf Corsépius <corsepiu@fedoraproject.org> - 5.9.4-3
- Append -stc=c99 to CFLAGS (Fix FTBFS).
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.9.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sat Jan 24 2015 Matej Muzila <mmuzila@redhat.com> - 5.9.4-1
- Update to upstream 5.9.4
* Tue Sep 30 2014 Matej Muzila <mmuzila@redhat.com> - 5.9.3-1
- Update to upstream 5.9.3
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.9.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.9.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Tue Dec 3 2013 Honza Horak <hhorak@redhat.com> - 5.9.2-2
- Explicitly require texinfo during build
* Fri Nov 29 2013 Honza Horak <hhorak@redhat.com> - 5.9.2-1
- Update to upstream 5.9.2
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.9.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Fri May 10 2013 Honza Horak <hhorak@redhat.com> - 5.9.0-1
- Update to upstream 5.9.0
* Thu Apr 4 2013 Honza Horak <hhorak@redhat.com> - 5.8.2-1
- Update to upstream 5.8.2
- Fix some man page vs. help incompatibilities
* Thu Jan 24 2013 Honza Horak <hhorak@redhat.com> - 5.8.1-5
- Remove sendmail from build requirements, it's not configured to be used
Related: #903368
* Fri Nov 23 2012 Honza Horak <hhorak@redhat.com> - 5.8.1-4
- Use make DESTDIR=... install instead of %%make_install
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.8.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Thu Jun 07 2012 Honza Horak <hhorak@redhat.com> - 5.8.1-2
- Provides: bundled(gnulib) added, as per #821786
- minor spec file clean up
- install-info run in postin/postun
* Wed Jun 06 2012 Honza Horak <hhorak@redhat.com> - 5.8.1-1
- Update to upstream 5.8.1
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Thu Sep 08 2011 Honza Horak <hhorak@redhat.com> - 5.8-1
- Update to upstream 5.8
- Dropped patches -security, -DESTDIR and -option that are not needed
anymore
- Run tests in %%check
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.7-37
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Mon Jan 11 2010 Ville Skyttä <ville.skytta at iki.fi> - 5.7-36
- Add dependency on diffutils.
- Apply build tweaks patch from Debian (incl installing rcsfreeze).
- BuildRequire autoconf instead of automake.
- Actually configure instead of shipping a pregenerated conf.h (#226356).
- Ship docs as PDF rather than troff source.
- Run test suite during build.
- Include COPYING.
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.7-35
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.7-34
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Wed Sep 3 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 5.7-33
- fix license tag
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 5.7-32
- Autorebuild for GCC 4.3
* Tue Jul 17 2007 Jiri Moskovcak <jmoskovc@redhat.com> - 5.7-31
- Addded support for new svn syntax.
- Resolves: #247998
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 5.7-30.1
- rebuild
* Mon Jun 12 2006 Jesse Keating <jkeating@redhat.com> - 5.7-30
- Add missing BR automake
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 5.7-29.2.1
- bump again for double-long bug on ppc(64)
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 5.7-29.2
- rebuilt for new gcc4.1 snapshot and glibc changes
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
- rebuilt
* Mon Oct 10 2005 Phil Knirsch <pknirsch@redhat.com> 5.7-29
- Fixed bug with obsolete and changed -u option for diff (#165071)
* Wed Mar 02 2005 Phil Knirsch <pknirsch@redhat.com> 5.7-28
- bump release and rebuild with gcc 4
* Sun Feb 13 2005 Florian La Roche <laroche@redhat.com> 5.7-27
- add spec change from #144485
* Tue Sep 21 2004 Phil Knirsch <pknirsch@redhat.com> 5.7-26
- rebuilt
* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com> 5.7-25
- rebuilt
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com> 5.7-24
- rebuilt
* Wed Feb 04 2004 Phil Knirsch <pknirsch@redhat.com> 5.7-23
- Switched copyright to license. :-)
* Fri Oct 31 2003 Phil Knirsch <pknirsch@redhat.com> 5.7-22
- Included sameuserlocks patch from James Olin Oden (#107947).
* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
- rebuilt
* Wed Dec 11 2002 Tim Powers <timp@redhat.com> 5.7-19
- rebuild on all arches
* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
- automated rebuild
* Thu May 23 2002 Tim Powers <timp@redhat.com>
- automated rebuild
* Wed Jan 09 2002 Tim Powers <timp@redhat.com>
- automated rebuild
* Sun Jun 24 2001 Elliot Lee <sopwith@redhat.com>
- Bump release + rebuild.
* Fri Jan 05 2001 Preston Brown <pbrown@redhat.com>
- tmpfile security patch from Olaf Kirch <okir@lst.de>
* Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
- automatic rebuild
* Thu Jun 15 2000 Jeff Johnson <jbj@redhat.com>
- FHS packaging.
* Mon Feb 7 2000 Jeff Johnson <jbj@redhat.com>
- compress man pages.
* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com>
- auto rebuild in the new build environment (release 10)
* Tue May 05 1998 Prospector System <bugs@redhat.com>
- translations modified for de, fr, tr
* Tue Oct 21 1997 Cristian Gafton <gafton@redhat.com>
- fixed the spec file; added BuildRoot
* Fri Jul 18 1997 Erik Troan <ewt@redhat.com>
-built against glibc

11
SPECS-EXTENDED/sendmail/sendmail.spec
Просмотреть файл

@ -21,7 +21,7 @@ Distribution: Mariner
Summary: A widely used Mail Transport Agent (MTA)
Name: sendmail
Version: 8.15.2
Release: 45%{?dist}
Release: 46%{?dist}
License: Sendmail
URL: http://www.sendmail.org/
@ -104,7 +104,6 @@ Patch33: sendmail-8.15.2-gcc-10-fix.patch
BuildRequires: libdb-devel
BuildRequires: libnsl2-devel
BuildRequires: groff
BuildRequires: ghostscript
BuildRequires: m4
BuildRequires: systemd
BuildRequires: gcc
@ -301,8 +300,6 @@ for i in $DIRS; do
popd
done
make -C doc/op op.pdf
%install
# create directories
for d in %{_bindir} %{_sbindir} %{_includedir}/libmilter \
@ -369,7 +366,6 @@ install -p -m 644 RELEASE_NOTES %{buildroot}%{_docdir}/sendmail
gzip -9 %{buildroot}%{_docdir}/sendmail/RELEASE_NOTES
# install docs for sendmail-doc
install -m 644 doc/op/op.pdf %{buildroot}%{_docdir}/sendmail
install -p -m 644 sendmail/README %{buildroot}%{_docdir}/sendmail/README.sendmail
install -p -m 644 sendmail/SECURITY %{buildroot}%{_docdir}/sendmail
install -p -m 644 smrsh/README %{buildroot}%{_docdir}/sendmail/README.smrsh
@ -707,12 +703,15 @@ exit 0
%{_docdir}/sendmail/README.sendmail
%{_docdir}/sendmail/README.smrsh
%{_docdir}/sendmail/SECURITY
%{_docdir}/sendmail/op.pdf
%dir %{_docdir}/sendmail/contrib
%attr(0644,root,root) %{_docdir}/sendmail/contrib/*
%changelog
* Fri Feb 04 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 8.15.2-46
- Removing dependency on 'ghostscript'.
- License verified.
* Fri Apr 30 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 8.15.2-45
- Making binaries paths compatible with CBL-Mariner's paths.

77
SPECS-EXTENDED/transfig/0001-Embed-png-and-jpeg-images-unchanged-into-pdfs.patch
Просмотреть файл

@ -1,77 +0,0 @@
From 841c88cdd31eece97a929fbc01902a33d6168b00 Mon Sep 17 00:00:00 2001
From: Thomas Loimer <thomas.loimer@tuwien.ac.at>
Date: Sun, 10 Nov 2019 22:53:23 +0100
Subject: [PATCH 1/8] Embed png and jpeg images unchanged into pdfs
Before, with the "-dAutoFilterColorImages=false -dColorImageFilter=/DCTEncode"
switches to pdf, png-files were re-encoded to jpegs.
---
CHANGES | 9 ++++++++-
fig2dev/dev/genpdf.c | 6 ++----
version.m4 | 6 +++---
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/CHANGES b/CHANGES
index 2a9c1fb..2cdfda0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,14 @@ Changes to fig2dev
===============================================================================
Version 3.2
===============================================================================
-Patchlevel 7b (Oct 2019)
+Patchlevel Xx (Xxx 20xx)
+
+BUGS FIXED:
+ o Embed images in pdfs with their original compression type, i.e., leave
+ the gs switch "-dAutoFilterColorImages" at its default value "true".
+
+-------------------------------------
+Patchlevel 7b (Nov 2019)
NEW FEATURES:
o A X color database is not needed, but can be provided. The location of
diff --git a/fig2dev/dev/genpdf.c b/fig2dev/dev/genpdf.c
index d5b3a5a..1ddaa40 100644
--- a/fig2dev/dev/genpdf.c
+++ b/fig2dev/dev/genpdf.c
@@ -91,10 +91,8 @@ genpdf_start(F_compound *objects)
*/
/* -o ... is equivalent to -dBATCH -dNOPAUSE, see ghostscript Use.htm
and -dBATCH is equivalent to -c quit */
- sprintf(com, "%s -q -sAutoRotatePages=None "
- "-dAutoFilterColorImages=false -dColorImageFilter=/DCTEncode "
- "-sDEVICE=pdfwrite -dPDFSETTINGS=/prepress -o '%s' -",
- GSEXE, ofile);
+ sprintf(com, "%s -q -sAutoRotatePages=None -sDEVICE=pdfwrite "
+ "-dPDFSETTINGS=/prepress -o '%s' -", GSEXE, ofile);
(void) signal(SIGPIPE, pdf_broken_pipe);
if ((tfp = popen(com, "w")) == 0) {
fprintf(stderr, "fig2dev: Cannot open pipe to ghostscript\n");
diff --git a/version.m4 b/version.m4
index faf88ad..fa546d9 100644
--- a/version.m4
+++ b/version.m4
@@ -2,7 +2,7 @@ dnl Fig2dev: Translate Fig code to various Devices
dnl Copyright (c) 1991 by Micah Beck
dnl Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
dnl Parts Copyright (c) 1989-2015 by Brian V. Smith
-dnl Parts Copyright (c) 2015-2018 by Thomas Loimer
+dnl Parts Copyright (c) 2015-2019 by Thomas Loimer
dnl
dnl Any party obtaining a copy of these files is granted, free of charge, a
dnl full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -22,8 +22,8 @@ dnl Thus, configure.ac can remain unchanged between different versions.
dnl The values in this file are set by update_version_m4 if
dnl ./configure is called with --enable_versioning.
-m4_define([FIG_VERSION], [3.2.7b])
+m4_define([FIG_VERSION], [3.2.7b-dev])
dnl AC_INIT does not have access to shell variables.
dnl Therefore, define RELEASEDATE as a macro.
-m4_define([RELEASEDATE], [Oct 2019])
+m4_define([RELEASEDATE], [Nov 2019])
--
2.24.1

71
SPECS-EXTENDED/transfig/0002-Allow-fig-2-text-ending-with-multiple-A-ticket-55.patch
Просмотреть файл

@ -1,71 +0,0 @@
From 19db5fe6f77ebad91af4b4ef0defd61bd0bb358f Mon Sep 17 00:00:00 2001
From: Thomas Loimer <thomas.loimer@tuwien.ac.at>
Date: Wed, 4 Dec 2019 17:56:04 +0100
Subject: [PATCH 2/8] Allow fig 2 text ending with multiple ^A, ticket #55
---
CHANGES | 2 ++
fig2dev/read.c | 4 ++--
fig2dev/tests/read.at | 11 +++++++++++
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/CHANGES b/CHANGES
index 2cdfda0..edd0843 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,8 @@ Version 3.2
Patchlevel Xx (Xxx 20xx)
BUGS FIXED:
+ Ticket numbers refer to https://sourceforge.net/p/mcj/tickets/#.
+ o Allow Fig v2 text strings ending with multiple ^A. Ticket #55.
o Embed images in pdfs with their original compression type, i.e., leave
the gs switch "-dAutoFilterColorImages" at its default value "true".
diff --git a/fig2dev/read.c b/fig2dev/read.c
index af84531..09bd17d 100644
--- a/fig2dev/read.c
+++ b/fig2dev/read.c
@@ -3,7 +3,7 @@
* Copyright (c) 1991 by Micah Beck
* Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
* Parts Copyright (c) 1989-2015 by Brian V. Smith
- * Parts Copyright (c) 2015-2018 by Thomas Loimer
+ * Parts Copyright (c) 2015-2019 by Thomas Loimer
*
* Any party obtaining a copy of these files is granted, free of charge, a
* full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -1328,7 +1328,7 @@ read_textobject(FILE *fp)
If we do not find the CONTROL-A on this line then this must
be a multi-line text object and we will have to read more. */
- n = sscanf(buf,"%*d%d%d%lf%d%d%d%lf%d%lf%lf%d%d%[^\1]%[\1]",
+ n = sscanf(buf,"%*d%d%d%lf%d%d%d%lf%d%lf%lf%d%d%[^\1]%1[\1]",
&t->type, &t->font, &t->size, &t->pen,
&t->color, &t->depth, &t->angle,
&t->flags, &t->height, &t->length,
diff --git a/fig2dev/tests/read.at b/fig2dev/tests/read.at
index a606de0..c36d07a 100644
--- a/fig2dev/tests/read.at
+++ b/fig2dev/tests/read.at
@@ -359,6 +359,17 @@ EOF
], 0, ignore)
AT_CLEANUP
+AT_SETUP([allow text ending with multiple ^A, ticket #55])
+AT_KEYWORDS([read.c])
+AT_CHECK([fig2dev -L box <<EOF
+#FIG 2
+1200 2
+4 2 0 0 1 0 0 390 306 110 376 639 5 Text
+EOF
+], 1, ignore, [Invalid text object at line 2.
+])
+AT_CLEANUP
+
AT_BANNER([Dynamically allocate picture file name.])
AT_SETUP([prepend fig file path to picture file name])
--
2.24.1

89
SPECS-EXTENDED/transfig/0003-Reject-huge-arrow-types-ticket-57.patch
Просмотреть файл

@ -1,89 +0,0 @@
From 3065abc7b4f740ed6532322843531317de782a26 Mon Sep 17 00:00:00 2001
From: Thomas Loimer <thomas.loimer@tuwien.ac.at>
Date: Tue, 10 Dec 2019 13:17:36 +0100
Subject: [PATCH 3/8] Reject huge arrow types, ticket #57
An arrow type being large enough would pass the test for
a valid type by integer overflow.
---
CHANGES | 1 +
fig2dev/arrow.c | 13 ++++++++-----
fig2dev/tests/read.at | 12 ++++++++++++
3 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/CHANGES b/CHANGES
index edd0843..964dc84 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ Patchlevel Xx (Xxx 20xx)
BUGS FIXED:
Ticket numbers refer to https://sourceforge.net/p/mcj/tickets/#.
+ o Reject huge arrow types causing integer overflow. Ticket #57.
o Allow Fig v2 text strings ending with multiple ^A. Ticket #55.
o Embed images in pdfs with their original compression type, i.e., leave
the gs switch "-dAutoFilterColorImages" at its default value "true".
diff --git a/fig2dev/arrow.c b/fig2dev/arrow.c
index a8e7fd0..34bcf18 100644
--- a/fig2dev/arrow.c
+++ b/fig2dev/arrow.c
@@ -1,9 +1,10 @@
/*
* Fig2dev: Translate Fig code to various Devices
- * Copyright (c) 1985 by Supoj Sutantavibul
* Copyright (c) 1991 by Micah Beck
- * Parts Copyright (c) 1989-2002 by Brian V. Smith
- * Parts Copyright (c) 2015-2018 by Thomas Loimer
+ * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
+ * Parts Copyright (c) 1989-2015 by Brian V. Smith
+ * Parts Copyright (c) 2015-2019 by Thomas Loimer
+ *
*
* Any party obtaining a copy of these files is granted, free of charge, a
* full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -78,7 +79,9 @@ make_arrow(int type, int style, double thickness, double wid, double ht)
{
F_arrow *a;
- if (style < 0 || style > 1 || type < 0 || (type + 1) * 2 > NUMARROWS)
+ if (style < 0 || style > 1 || type < 0 ||
+ /* beware of int overflow */
+ type > NUMARROWS || (type + 1) * 2 > NUMARROWS)
return NULL;
if (NULL == (Arrow_malloc(a))) {
put_msg(Err_mem);
@@ -90,7 +93,7 @@ make_arrow(int type, int style, double thickness, double wid, double ht)
a->type = type;
a->style = style;
- a->thickness = thickness*THICK_SCALE;
+ a->thickness = thickness * THICK_SCALE;
a->wid = wid;
a->ht = ht;
return a;
diff --git a/fig2dev/tests/read.at b/fig2dev/tests/read.at
index c36d07a..e9a71a3 100644
--- a/fig2dev/tests/read.at
+++ b/fig2dev/tests/read.at
@@ -135,6 +135,18 @@ A single point with a backward arrow - remove the arrow.
])
AT_CLEANUP
+AT_SETUP([reject huge arrow-type, ticket #57])
+AT_KEYWORDS(arrow.c arrow)
+AT_CHECK([fig2dev -L box <<EOF
+FIG_FILE_TOP
+2 1 0 1 -1 -1 50 -1 -1 0. 0 0 0 1 0 2
+ 10000000000000 0 1 60 120
+0 0 600 0
+EOF
+], 1, ignore, [Invalid forward arrow at line 11.
+])
+AT_CLEANUP
+
AT_SETUP([reject negative font type])
AT_KEYWORDS(read.c font)
AT_CHECK([fig2dev -L box <<EOF
--
2.24.1

85
SPECS-EXTENDED/transfig/0004-Convert-polygons-with-too-few-points-to-polylines.patch
Просмотреть файл

@ -1,85 +0,0 @@
From c379fe50574e5b5dd6e17f15d8473c5713d1b823 Mon Sep 17 00:00:00 2001
From: Thomas Loimer <thomas.loimer@tuwien.ac.at>
Date: Wed, 11 Dec 2019 21:36:46 +0100
Subject: [PATCH 4/8] Convert polygons with too few points to polylines
As a side effect, this also fixes ticket #56.
---
CHANGES | 1 +
fig2dev/read.c | 16 ++++++++++++++++
fig2dev/tests/read.at | 11 +++++++++++
3 files changed, 28 insertions(+)
diff --git a/CHANGES b/CHANGES
index 964dc84..b2f7006 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ Patchlevel Xx (Xxx 20xx)
BUGS FIXED:
Ticket numbers refer to https://sourceforge.net/p/mcj/tickets/#.
+ o Convert polygons having too few points to polylines. Ticket #56.
o Reject huge arrow types causing integer overflow. Ticket #57.
o Allow Fig v2 text strings ending with multiple ^A. Ticket #55.
o Embed images in pdfs with their original compression type, i.e., leave
diff --git a/fig2dev/read.c b/fig2dev/read.c
index 09bd17d..9500091 100644
--- a/fig2dev/read.c
+++ b/fig2dev/read.c
@@ -793,8 +793,10 @@ read_ellipseobject(void)
/*
* Sanitize line objects. Return 0 on success, -1 otherwise.
* On error, call free_linestorage(l) after sanitize_lineobject().
+ *
* polylines: remove fill, if less than 3 points
* remove arrows, if only one point
+ * polygons: convert to polyline if less than 3 unique points
* rectangles, polygons: last point must coincide with first point
* rectangle: convert to polygon, if not 5 points
* rectangle with rounded corners: error, if not 5 points
@@ -854,6 +856,20 @@ sanitize_lineobject(
q->y = l->points->y;
}
+ if (l->type == T_POLYGON) {
+ int npts;
+
+ q = l->points;
+ for (npts = 1; q->next && npts < 4; q = q->next)
+ ++npts;
+ if (npts < 4 ) {
+ put_msg("A polygon with %d points at line %d - convert to a polyline.",
+ npts, line_no);
+ l->type = T_POLYLINE;
+ return 0;
+ }
+ }
+
if (l->type == T_BOX || l->type == T_ARC_BOX || l->type == T_PIC_BOX) {
int npts = 1;
for (q = l->points; q->next; q = q->next)
diff --git a/fig2dev/tests/read.at b/fig2dev/tests/read.at
index e9a71a3..4ef8747 100644
--- a/fig2dev/tests/read.at
+++ b/fig2dev/tests/read.at
@@ -147,6 +147,17 @@ EOF
])
AT_CLEANUP
+AT_SETUP([convert short polygon to polyline, ticket #56])
+AT_KEYWORDS(read.c polygon)
+AT_CHECK([fig2dev -L ptk <<EOF
+FIG_FILE_TOP
+2 3 0 1 -1 -1 50 -1 -1 0.0 0 0 -1 0 0 1
+ 0 0
+EOF
+], 0, ignore, [A polygon with 1 points at line 11 - convert to a polyline.
+])
+AT_CLEANUP
+
AT_SETUP([reject negative font type])
AT_KEYWORDS(read.c font)
AT_CHECK([fig2dev -L box <<EOF
--
2.24.1

324
SPECS-EXTENDED/transfig/0005-Correctly-scan-embedded-pdfs-for-MediaBox-value.patch
Просмотреть файл

@ -1,324 +0,0 @@
From f116dfdff70c6a289a86e93f6b2fe64a54198534 Mon Sep 17 00:00:00 2001
From: Thomas Loimer <thomas.loimer@tuwien.ac.at>
Date: Sat, 14 Dec 2019 23:10:04 +0100
Subject: [PATCH 5/8] Correctly scan embedded pdfs for /MediaBox value
This applies two patches from the opensuse source rpm,
https://download.opensuse.org/repositories/openSUSE:/Factory/standard/src/xfig-3.2.7b-1.1.src.rpm
transfig.3.2.5-binderman.dif and transfig.3.2.5d-mediaboxrealnb.dif.
---
CHANGES | 1 +
fig2dev/dev/readeps.c | 31 ++++++++------
fig2dev/tests/Makefile.am | 15 ++++---
fig2dev/tests/bitmaps.at | 5 +++
fig2dev/tests/data/cross.pdf | 62 +++++++++++++++++++++++++++
fig2dev/tests/test2.c | 82 ++++++++++++++++++++++++++++++++++++
transfig/sys.c | 3 ++
7 files changed, 182 insertions(+), 17 deletions(-)
create mode 100644 fig2dev/tests/data/cross.pdf
create mode 100644 fig2dev/tests/test2.c
diff --git a/CHANGES b/CHANGES
index b2f7006..4a414fa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ Patchlevel Xx (Xxx 20xx)
BUGS FIXED:
Ticket numbers refer to https://sourceforge.net/p/mcj/tickets/#.
+ o Correctly scan embedded pdfs for /MediaBox value.
o Convert polygons having too few points to polylines. Ticket #56.
o Reject huge arrow types causing integer overflow. Ticket #57.
o Allow Fig v2 text strings ending with multiple ^A. Ticket #55.
diff --git a/fig2dev/dev/readeps.c b/fig2dev/dev/readeps.c
index ec25504..502f4bb 100644
--- a/fig2dev/dev/readeps.c
+++ b/fig2dev/dev/readeps.c
@@ -1,7 +1,9 @@
/*
* Fig2dev: Translate Fig code to various Devices
- * Parts Copyright (c) 1989-2007 by Brian V. Smith
- * Parts Copyright (c) 2015-2017 by Thomas Loimer
+ * Copyright (c) 1991 by Micah Beck
+ * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
+ * Parts Copyright (c) 1989-2015 by Brian V. Smith
+ * Parts Copyright (c) 2015-2019 by Thomas Loimer
*
* Any party obtaining a copy of these files is granted, free of charge, a
* full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -83,18 +85,23 @@ read_eps_pdf(FILE *file, int filetype, F_pic *pic, int *llx, int* lly,
while (fgets(buf, BUFSIZ, file) != NULL) {
/* look for /MediaBox for pdf file */
if (pdf_flag) {
- if (!strncmp(buf, "/MediaBox", 9)) { /* look for the MediaBox spec */
- c = strchr(buf, '[') + 1;
- if (c && sscanf(c, "%d %d %d %d", llx, lly, &urx, &ury) < 4)
- {
- *llx = *lly = 0;
- urx = paperdef[0].width*72;
- ury = paperdef[0].height*72;
- put_msg("Bad MediaBox in imported PDF file %s, assuming %s size",
- pic->file, metric? "A4" : "Letter" );
+ for (c = buf; (c = strchr(c,'/')); ++c) {
+ if (!strncmp(c, "/MediaBox", 9)) {
+ c = strchr(c, '[');
+ if (c && sscanf(c + 1, "%d %d %d %d",
+ llx, lly, &urx, &ury) < 4) {
+ *llx = *lly = 0;
+ urx = paperdef[0].width*72;
+ ury = paperdef[0].height*72;
+ put_msg("Bad MediaBox in imported PDF file %s, assuming %s size",
+ pic->file, metric? "A4" : "Letter" );
+ }
+ pic->bit_size.x = urx - (*llx);
+ pic->bit_size.y = ury - (*lly);
+ break;
}
}
- /* look for bounding box for EPS file */
+ /* look for bounding box for EPS file */
} else if (!nested && !strncmp(buf, "%%BoundingBox:", 14)) {
c = buf + 14;
/* skip past white space */
diff --git a/fig2dev/tests/Makefile.am b/fig2dev/tests/Makefile.am
index 4b83e0b..389f984 100644
--- a/fig2dev/tests/Makefile.am
+++ b/fig2dev/tests/Makefile.am
@@ -4,7 +4,7 @@
# Copyright (c) 1991 by Micah Beck
# Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
# Parts Copyright (c) 1989-2015 by Brian V. Smith
-# Parts Copyright (c) 2015-2018 by Thomas Loimer
+# Parts Copyright (c) 2015-2019 by Thomas Loimer
#
# Any party obtaining a copy of these files is granted, free of charge, a
# full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -16,7 +16,7 @@
# and this permission notice remain intact.
# fig2dev/tests/Makefile.am
-# Author: Thomas Loimer, 2016-2018.
+# Author: Thomas Loimer, 2016-2019.
# testsuite and package.m4 must be distributed, hence they are
@@ -39,8 +39,8 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
echo 'm4_define([AT_PACKAGE_URL], [@PACKAGE_URL@])'; \
} >'$(srcdir)/package.m4'
-check_PROGRAMS = test1
-# test1 calls malloc(). AC_FUNC_MALLOC may replace malloc() by rpl_malloc()
+check_PROGRAMS = test1 test2
+# test1 called malloc(). AC_FUNC_MALLOC may replace malloc() by rpl_malloc()
# which is defined in malloc.o. The latter is contained in $(LIBOBJS) in
# ${LIBOBJDIR}. Specifically, ./configure CFLAGS="-fsanitize=address" causes
# this replacment. Unfortunately, using test1_LDADD, causes make distcheck to
@@ -54,9 +54,14 @@ check_PROGRAMS = test1
# keep the definitions below in sync with those in ../dev/Makefile.am
if ENABLE_I18N
-AM_CPPFLAGS = -DI18N_DATADIR="\"$(i18ndir)\""
+test1_CPPFLAGS = -DI18N_DATADIR="\"$(i18ndir)\""
endif
+test2_CPPFLAGS = -I$(top_srcdir)/fig2dev
+test2_LDADD = $(top_builddir)/fig2dev/dev/readeps.$(OBJEXT)
+test2_DEPENDENCIES = $(test2_LDADD)
+
+
check-local: atconfig $(TESTSUITE) atlocal
$(SHELL) '$(TESTSUITE)' INSTALLCHECK=no $(TESTSUITEFLAGS)
diff --git a/fig2dev/tests/bitmaps.at b/fig2dev/tests/bitmaps.at
index 91d5b54..1fea0f8 100644
--- a/fig2dev/tests/bitmaps.at
+++ b/fig2dev/tests/bitmaps.at
@@ -235,3 +235,8 @@ EOF`
# 1433 on ubuntu 16.04.2 with ghostscript 9.18
AT_CHECK([test $blackpixels -gt 1431 && test $blackpixels -lt 1494])
AT_CLEANUP
+
+AT_SETUP([find /MediaBox in pdf file])
+AT_KEYWORDS(pdf)
+AT_CHECK(["$abs_builddir"/test2 "$srcdir/data/cross.pdf"], 0, ignore)
+AT_CLEANUP
diff --git a/fig2dev/tests/data/cross.pdf b/fig2dev/tests/data/cross.pdf
new file mode 100644
index 0000000..e1e7e4d
--- /dev/null
+++ b/fig2dev/tests/data/cross.pdf
@@ -0,0 +1,62 @@
+%PDF-1.4
+5 0 obj
+<</Length 6 0 R/Filter /FlateDecode>>
+stream
+xœMŠ± €0 {Oñ'Qüxj`
+R
+Ö$„Ð'<27>n‡i‚=¼^št±B ZÂ)†AÜÔ„×Ð’{4ñLõDDÖæؾçWÞ§°j_ã.³Œrdô?endstream
+endobj
+6 0 obj
+91
+endobj
+4 0 obj
+<</Type/Page/MediaBox [0 0 72 72]
+/Parent 3 0 R
+/Resources<</ProcSet[/PDF]
+/ExtGState 8 0 R
+>>
+/Contents 5 0 R
+>>
+endobj
+3 0 obj
+<< /Type /Pages /Kids [
+4 0 R
+] /Count 1
+>>
+endobj
+1 0 obj
+<</Type /Catalog /Pages 3 0 R
+>>
+endobj
+7 0 obj
+<</Type/ExtGState
+/BM/Normal
+/OPM 1
+/TK true>>endobj
+8 0 obj
+<</R7
+7 0 R>>
+endobj
+2 0 obj
+<</Producer(GPL Ghostscript 9.27)
+/CreationDate(D:20191110165654+01'00')
+/ModDate(D:20191110165654+01'00')
+/Creator( XeTeX 2019.11.10:1656)>>endobj
+xref
+0 9
+0000000000 65535 f
+0000000376 00000 n
+0000000514 00000 n
+0000000317 00000 n
+0000000188 00000 n
+0000000009 00000 n
+0000000170 00000 n
+0000000424 00000 n
+0000000485 00000 n
+trailer
+<< /Size 10 /Root 1 0 R /Info 2 0 R
+/ID [<EAB28CF54E276D36634D7BBB3C4603B7><EAB28CF54E276D36634D7BBB3C4603B7>]
+>>
+startxref
+670
+%%EOF
diff --git a/fig2dev/tests/test2.c b/fig2dev/tests/test2.c
new file mode 100644
index 0000000..04e92d7
--- /dev/null
+++ b/fig2dev/tests/test2.c
@@ -0,0 +1,82 @@
+/*
+ * Fig2dev: Translate Fig code to various Devices
+ * Copyright (c) 1991 by Micah Beck
+ * Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
+ * Parts Copyright (c) 1989-2015 by Brian V. Smith
+ * Parts Copyright (c) 2015-2019 by Thomas Loimer
+ *
+ * Any party obtaining a copy of these files is granted, free of charge, a
+ * full and unrestricted irrevocable, world-wide, paid up, royalty-free,
+ * nonexclusive right and license to deal in this software and documentation
+ * files (the "Software"), including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense and/or sell copies
+ * of the Software, and to permit persons who receive copies from any such
+ * party to do so, with the only requirement being that the above copyright
+ * and this permission notice remain intact.
+ *
+ */
+
+/*
+ * test2.c: Check, whether read_pdf() finds the bounding box of a pdf file.
+ * Author: Thomas Loimer, 2019-12-14
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "bool.h"
+#include "object.h"
+
+/* the function to be tested, in $(top_srcdir)/fig2dev/dev/readeps.c */
+extern int read_pdf(FILE *file, int type, F_pic *pic, int *llx, int *lly);
+
+/* symbols that are needed when calling read_pdf() */
+int urx = 0;
+int ury = 0;
+int metric = 0;
+FILE *tfp;
+const struct _paperdef /* from fig2dev.h */
+{
+ char *name;
+ int width;
+ int height;
+} paperdef[1] = {{"letter", 8, 12}};
+
+
+void put_msg(const char *fmt, const char *file, const char *size)
+{
+ fprintf(stderr, fmt, file, size);
+}
+
+int
+main(int argc, char *argv[])
+{
+ (void) argc;
+ int llx = -1;
+ int lly = -1;
+ FILE *file;
+ F_pic pic;
+
+ tfp = stdout;
+ pic.file = argv[1];
+
+ file = fopen(argv[1], "rb");
+ if (file == NULL) {
+ fprintf(stderr, "Test file %s not found.\n", argv[1]);
+ exit(EXIT_FAILURE);
+ }
+
+ if (read_pdf(file, 0, &pic, &llx, &lly) == 1 &&
+ pic.bit_size.x != 10 && pic.bit_size.y != 10) {
+ fprintf(stdout, "read_pdf found: width = %d, height = %d\n",
+ pic.bit_size.x, pic.bit_size.y);
+ exit(EXIT_SUCCESS);
+ } else {
+ exit(EXIT_FAILURE);
+ }
+}
diff --git a/transfig/sys.c b/transfig/sys.c
index c070ee6..30e8d3d 100644
--- a/transfig/sys.c
+++ b/transfig/sys.c
@@ -2,6 +2,8 @@
* TransFig: Facility for Translating Fig code
* Copyright (c) 1991 by Micah Beck
* Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
+ * Parts Copyright (c) 1989-2015 by Brian V. Smith
+ * Parts Copyright (c) 2015-2019 by Thomas Loimer
*
* Any party obtaining a copy of these files is granted, free of charge, a
* full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -39,6 +41,7 @@ sysls(void)
i += 1;
c = fgetc(ls);
}
+ pclose(ls);
sysbuf[i] = '\0';
return sysbuf;
}
--
2.24.1

30
SPECS-EXTENDED/transfig/0006-fig2dev-version-prints-version-information.patch
Просмотреть файл

@ -1,30 +0,0 @@
From 560e633910a28f81b6607cf81e53026ac96034bf Mon Sep 17 00:00:00 2001
From: Thomas Loimer <thomas.loimer@tuwien.ac.at>
Date: Sun, 15 Dec 2019 21:32:18 +0100
Subject: [PATCH 6/8] "fig2dev --version" prints version information
---
fig2dev/fig2dev.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/fig2dev/fig2dev.c b/fig2dev/fig2dev.c
index 0866a71..479b484 100644
--- a/fig2dev/fig2dev.c
+++ b/fig2dev/fig2dev.c
@@ -218,6 +218,13 @@ get_args(int argc, char *argv[])
if (argc == 1)
fprintf(stderr, Usage, prog, prog);
+
+ /* print the version, for the comfort of the autotest tests */
+ if (!strcmp(argv[1], "--version")) {
+ printf("fig2dev Version %s\n", PACKAGE_VERSION);
+ exit(EXIT_SUCCESS);
+ }
+
/* sum of all arguments */
while ((c = fig_getopt(argc, argv, ARGSTRING)) != EOF) {
--
2.24.1

173
SPECS-EXTENDED/transfig/0007-Use-getopt-from-standard-libraries-if-available.patch
Просмотреть файл

@ -1,173 +0,0 @@
From 93795dd396730c80e63767dede7777f4cb7dc383 Mon Sep 17 00:00:00 2001
From: Thomas Loimer <thomas.loimer@tuwien.ac.at>
Date: Sun, 15 Dec 2019 21:34:34 +0100
Subject: [PATCH 7/8] Use getopt() from standard libraries, if available
---
configure.ac | 10 +++++-----
fig2dev/Makefile.am | 2 +-
fig2dev/Nmakefile | 6 +++---
fig2dev/fig2dev.c | 12 +++++++-----
fig2dev/{ => lib}/getopt.c | 12 +++---------
5 files changed, 19 insertions(+), 23 deletions(-)
rename fig2dev/{ => lib}/getopt.c (91%)
diff --git a/configure.ac b/configure.ac
index e88b27a..8e955ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_COPYRIGHT([Fig2dev: Translate Fig code to various Devices
Copyright (c) 1991 by Micah Beck
Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
Parts Copyright (c) 1989-2015 by Brian V. Smith
-Parts Copyright (c) 2015-2018 by Thomas Loimer
+Parts Copyright (c) 2015-2019 by Thomas Loimer
Any party obtaining a copy of these files is granted, free of charge, a
full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -19,7 +19,7 @@ and this permission notice remain intact.
#
# configure.ac
-# Author: Thomas Loimer, 2015-2018.
+# Author: Thomas Loimer, 2015-2019.
#
dnl Define m4 variables for use in AC_INIT and AC_DEFINE below.
@@ -366,9 +366,9 @@ AS_IF([test "$tl_cv_func__setmode" = yes],
# Check for functions and, if not found, use the corresponding
# replacement, e.g., strstr.c, in the top srcdir. Sets, e.g.,
-# HAVE_STRSTR. Any modern system should have these functions, so
-# this are obsolete checks.
-AC_REPLACE_FUNCS([isascii strstr strchr strrchr strcasecmp strncasecmp \
+# HAVE_STRSTR. Except possibly getopt(), any modern system should have these
+# functions, so all except one are obsolete checks.
+AC_REPLACE_FUNCS([getopt isascii strstr strchr strrchr strcasecmp strncasecmp \
strdup strndup])
# Place the replacement functions into this dir.
diff --git a/fig2dev/Makefile.am b/fig2dev/Makefile.am
index d00ac54..70ae569 100644
--- a/fig2dev/Makefile.am
+++ b/fig2dev/Makefile.am
@@ -39,7 +39,7 @@ bin_PROGRAMS = fig2dev
fig2dev_SOURCES = alloc.h arrow.c bool.h bound.h bound.c colors.h colors.c \
creationdate.h creationdate.c drivers.h fig2dev.h fig2dev.c free.h free.c \
iso2tex.c localmath.h localmath.c object.h read1_3.c read.h read.c \
- trans_spline.h trans_spline.c pi.h getopt.c
+ trans_spline.h trans_spline.c pi.h
# CONFIG_HEADER is config.h, which contains PACKAGE_VERSION. If that
# changes, fig2dev should take up the new version string.
diff --git a/fig2dev/Nmakefile b/fig2dev/Nmakefile
index 7623e40..bba38c9 100644
--- a/fig2dev/Nmakefile
+++ b/fig2dev/Nmakefile
@@ -2,7 +2,7 @@
# Copyright (c) 1991 by Micah Beck
# Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
# Parts Copyright (c) 1989-2015 by Brian V. Smith
-# Parts Copyright (c) 2015-2018 by Thomas Loimer
+# Parts Copyright (c) 2015-2019 by Thomas Loimer
#
# Any party obtaining a copy of these files is granted, free of charge, a
# full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -14,7 +14,7 @@
# and this permission notice remain intact.
# fig2dev/Nmakefile
-# Author: Thomas Loimer, 2018.
+# Author: Thomas Loimer, 2018, 2019.
#############################################################
#
@@ -84,7 +84,7 @@ CFLAGS = /I. /Idev /nologo /W1 /DWIN32 /D_BIND_TO_CURRENT_VCLIBS_VERSION=1 \
REPL_LIBS = lib/strndup.c
FIG2DEV_SRCS = arrow.c bound.c colors.c creationdate.c fig2dev.c free.c \
- getopt.c iso2tex.c localmath.c read.c read1_3.c trans_spline.c \
+ iso2tex.c localmath.c read.c read1_3.c trans_spline.c \
dev/asc85ec.c dev/genbitmaps.c dev/genbox.c dev/gencgm.c dev/gendxf.c \
dev/genemf.c dev/genepic.c dev/gengbx.c dev/genge.c dev/genibmgl.c \
dev/genlatex.c dev/genmap.c dev/genmf.c dev/genmp.c dev/genpdf.c \
diff --git a/fig2dev/fig2dev.c b/fig2dev/fig2dev.c
index 479b484..d8c5e2a 100644
--- a/fig2dev/fig2dev.c
+++ b/fig2dev/fig2dev.c
@@ -29,6 +29,7 @@
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
+#include <unistd.h>
#include <locale.h>
/* In Windows, _setmode() is declared in <io.h>, O_BINARY in <fcntl.h>. It
* accepts two arguments and sets file mode to text or binary. */
@@ -44,10 +45,11 @@
#include "bound.h"
#include "read.h"
-/* the three lines below could go into a getopt.h file */
-extern int fig_getopt(int nargc, char **nargv, char *ostr); /* getopt.c */
-extern char *optarg; /* getopt.c */
-extern int optind; /* getopt.c */
+#ifndef HAVE_GETOPT
+extern int getopt(int argc, char *argv[], const char *ostr);
+extern char *optarg;
+extern int optind;
+#endif
char Err_badarg[] = "Argument -%c unknown to %s driver.";
char Err_mem[] = "Running out of memory.";
@@ -226,7 +228,7 @@ get_args(int argc, char *argv[])
}
/* sum of all arguments */
- while ((c = fig_getopt(argc, argv, ARGSTRING)) != EOF) {
+ while ((c = getopt(argc, argv, ARGSTRING)) != EOF) {
/* global (all drivers) option handling */
switch (c) {
diff --git a/fig2dev/getopt.c b/fig2dev/lib/getopt.c
similarity index 91%
rename from fig2dev/getopt.c
rename to fig2dev/lib/getopt.c
index 867a9fe..f3d1845 100644
--- a/fig2dev/getopt.c
+++ b/fig2dev/lib/getopt.c
@@ -2,8 +2,8 @@
* Fig2dev: Translate Fig code to various Devices
* Copyright (c) 1991 by Micah Beck
* Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
- * Parts Copyright (c) 1989-2007 by Brian V. Smith
- * Parts Copyright (c) 2015-2017 by Thomas Loimer
+ * Parts Copyright (c) 1989-2015 by Brian V. Smith
+ * Parts Copyright (c) 2015-2019 by Thomas Loimer
*
* Any party obtaining a copy of these files is granted, free of charge, a
* full and unrestricted irrevocable, world-wide, paid up, royalty-free,
@@ -37,12 +37,6 @@
#include <stdio.h>
#include <string.h>
-/*
-#ifndef lint
-static char sccsfid[] = "@(#) getopt.c 5.0 (UTZoo) 1985";
-#endif
-*/
-
#define ARGCH (int)':'
#define BADCH (int)'?'
#define EMSG ""
@@ -59,7 +53,7 @@ char *optarg; /* argument associated with option */
fputc(optc,stderr); fputc('\n',stderr); return BADCH
int
-fig_getopt(int nargc, char **nargv, char *ostr)
+getopt(int nargc, char **nargv, const char *ostr)
{
static char *place = EMSG; /* option letter processing */
char *oli; /* option letter list index */
--
2.24.1

1857
SPECS-EXTENDED/transfig/0008-Replace-most-calls-to-fgets-by-getline-in-read.c.patch
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

12
SPECS-EXTENDED/transfig/fix-header.patch
Просмотреть файл

@ -1,12 +0,0 @@
diff --git a/fig2dev/read.c b/fig2dev/read.c
index af84531..8daa25b 100644
--- a/fig2dev/read.c
+++ b/fig2dev/read.c
@@ -38,6 +38,7 @@
#include "free.h"
#include "read.h"
#include "trans_spline.h"
+#include <stddef.h>
extern F_arrow *make_arrow(int type, int style, /* arrow.c */
double thickness, double wid, double ht);

11
SPECS-EXTENDED/transfig/transfig-LICENSE.txt
Просмотреть файл

@ -1,11 +0,0 @@
Copyright (c) 1991 by Micah Beck
Parts Copyright (c) 1985-1988 by Supoj Sutanthavibul
Any party obtaining a copy of these files is granted, free of charge, a
full and unrestricted irrevocable, world-wide, paid up, royalty-free,
nonexclusive right and license to deal in this software and documentation
files (the "Software"), including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense and/or sell copies
of the Software, and to permit persons who receive copies from any such
party to do so, with the only requirement being that the above copyright
and this permission notice remain intact.

6
SPECS-EXTENDED/transfig/transfig.signatures.json
Просмотреть файл

@ -1,6 +0,0 @@
{
"Signatures": {
"fig2dev-3.2.7b.tar.xz": "47dc1b4420a1bc503b3771993e19cdaf75120d38be6548709f7d84f7b07d68b2",
"transfig-LICENSE.txt": "7c264e7f086f1dd7cb1d31bef7d0de25044b57601ee9b163b4b81cd7aa3b715b"
}
}

377
SPECS-EXTENDED/transfig/transfig.spec
Просмотреть файл

@ -1,377 +0,0 @@
Name: transfig
Version: 3.2.7b
Release: 4%{?dist}
Summary: Utility for converting FIG files (made by xfig) to other formats
License: MIT
Vendor: Microsoft Corporation
Distribution: Mariner
URL: https://sourceforge.net/projects/mcj/
Source0: http://downloads.sourceforge.net/mcj/fig2dev-%{version}.tar.xz
Source1: %{name}-LICENSE.txt
# Patches from upstream for CVE-2019-19746 and CVE-2019-19797 + deps
Patch1: 0001-Embed-png-and-jpeg-images-unchanged-into-pdfs.patch
Patch2: 0002-Allow-fig-2-text-ending-with-multiple-A-ticket-55.patch
Patch3: 0003-Reject-huge-arrow-types-ticket-57.patch
Patch4: 0004-Convert-polygons-with-too-few-points-to-polylines.patch
Patch5: 0005-Correctly-scan-embedded-pdfs-for-MediaBox-value.patch
Patch6: 0006-fig2dev-version-prints-version-information.patch
Patch7: 0007-Use-getopt-from-standard-libraries-if-available.patch
Patch8: 0008-Replace-most-calls-to-fgets-by-getline-in-read.c.patch
Patch9: fix-header.patch
Requires: ghostscript
Requires: bc
Requires: netpbm-progs
BuildRequires: gcc libtool
BuildRequires: libpng-devel
BuildRequires: libjpeg-devel
BuildRequires: ghostscript
%description
The transfig utility creates a makefile which translates FIG (created
by xfig) or PIC figures into a specified LaTeX graphics language (for
example, PostScript(TM)). Transfig is used to create TeX documents
which are portable (i.e., they can be printed in a wide variety of
environments).
Install transfig if you need a utility for translating FIG or PIC
figures into certain graphics languages.
%prep
%autosetup -p1 -n fig2dev-%{version}
autoreconf -i
# Fix the manpage not being in UTF-8
iconv -f ISO-8859-15 -t UTF-8 man/fig2dev.1.in -o fig2dev.1.in.new
touch -r man/fig2dev.1.in fig2dev.1.in.new
mv fig2dev.1.in.new man/fig2dev.1.in
cp %{SOURCE1} ./LICENSE.txt
%build
%configure --enable-transfig
%make_build
%install
%make_install
%files
%license LICENSE.txt
%doc CHANGES transfig/doc/manual.pdf
%{_bindir}/transfig
%{_bindir}/fig2dev
%{_bindir}/fig2ps2tex
%{_bindir}/pic2tpic
%{_datadir}/fig2dev/i18n/*.ps
%{_mandir}/man1/*.1.gz
%changelog
* Fri Dec 10 2021 Thomas Crain <thcrain@microsoft.com> - 3.2.7b-5
- License verified
* Thu Oct 28 2021 Muhammad Falak <mwani@microsft.com> - 3.2.7b-4
- Remove epoch
* Wed Mar 31 2021 Henry Li <lihl@microsoft.com> - 1:3.2.7b-3
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
- Remove libXpm-devel from build requirement
- Add patch to include stddef.h
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.2.7b-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Jan 15 2020 Hans de Goede <hdegoede@redhat.com> - 1:3.2.7b-1
- New upstream release 3.2.7b
- Add patch fixing CVE-2019-19746 (rhbz#1787040)
- Add patch fixing CVE-2019-19797 (rhbz#1786726)
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.2.7a-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Tue Jun 18 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1:3.2.7a-2
- Add BR: ghostscript to fix ghostscript detection (#1720868)
* Thu Jun 06 2019 Ondrej Dubaj <odubaj@redhat.com> - 1:3.2.7a-1
- Updated to version 3.2.7a
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.2.6a-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Jul 16 2018 Honza Horak <hhorak@redhat.com> - 1:3.2.6a-5
- Remove license GPLv3+
* Sun Jul 15 2018 Honza Horak <hhorak@redhat.com> - 1:3.2.6a-4
- Add license GPLv3+
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.2.6a-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.2.6a-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Tue Nov 21 2017 Hans de Goede <hdegoede@redhat.com> - 3.2.6a-1
- New upstream release 3.2.6a
- Add patch fixing CVE-2017-16899 (rhbz#1515695)
* Tue Nov 07 2017 Adam Jackson <ajax@redhat.com> - 3.2.6-6
- Remove unnecessary BuildRequires: imake
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.2.6-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.2.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.2.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Mon Sep 19 2016 Tomas Repik <trepik@redhat.com> - 1:3.2.6-2
- added missing requires for netpbm-progs (RHBZ#1371667)
* Fri Aug 12 2016 Jozef Mlich <imlich@fit.vutbr.cz> - 1:3.2.6-1
- Resolves #1366524
rebase to fig2dev 3.2.6
* Thu Mar 31 2016 Tomas Repik <trepik@redhat.com> - 1:3.2.5d-18
- reading alpha channel of png files properly (#1282615)
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.2.5d-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.2.5d-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.2.5d-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.2.5d-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Tue Dec 03 2013 Kamil Dudka <kdudka@redhat.com> - 1:3.2.5d-13
- make it compile with -Werror=format-security (#1037365)
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.2.5d-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Wed May 15 2013 Kamil Dudka <kdudka@redhat.com> - 1:3.2.5d-11
- install man pages using the correct file name suffix
- provide the fig2ps2tex.sh man page as a symlink
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.2.5d-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Tue Aug 28 2012 Kamil Dudka <kdudka@redhat.com> - 1:3.2.5d-9
- fix specfile issues reported by the fedora-review script
* Thu Aug 09 2012 Kamil Dudka <kdudka@redhat.com> - 1:3.2.5d-8
- fix buffer overflow on loading a malformed .fig file (CVE-2009-4227)
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.2.5d-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Tue Feb 14 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 1:3.2.5d-6
- add Gentoo patch to fix compilation with libpng 1.5
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.2.5d-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 1:3.2.5d-4
- Rebuild for new libpng
* Tue Aug 09 2011 Kamil Dudka <kdudka@redhat.com> - 1:3.2.5d-3
- fix crash of fig2dev on a failure of ghostscript (#728825)
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.2.5d-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Thu Nov 04 2010 Kamil Dudka <kdudka@redhat.com> - 1:3.2.5d-1
- new upstream release (#546623)
* Wed Mar 03 2010 Kamil Dudka <kdudka@redhat.com> - 1:3.2.5c-1
- new upstream release
- patch to generate comments compliant with DSC 3.0, thanks to Ian Dall
(#558380)
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.2.5-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Tue May 5 2009 Ville Skyttä <ville.skytta at iki.fi> - 1:3.2.5-7
- Get rid of csh dependency, add missing one on bc (#435993).
- Build with $RPM_OPT_FLAGS (#329831).
- Convert specfile to UTF-8.
- Add URL, fix source URL.
- Escape macros in changelog.
- Improve summary.
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.2.5-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Sat Dec 20 2008 Ralf Corsépius <corsepiu@fedoraproject.org> - 1:3.2.5-5
- Add transfig-3.2.5-bitmap.patch, tweak permission on sources (BZ #209865).
* Wed Sep 10 2008 Stepan Kasal <skasal@redhat.com> - 1:3.2.5-4
- remove transfig.3.2.4-pstex.patch, which reintroduced #164140
at the update to 3.2.5
* Mon Sep 8 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1:3.2.5-3
- fix license tag
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1:3.2.5-2
- Autorebuild for GCC 4.3
* Mon Apr 16 2007 Than Ngo <than@redhat.com> - 1:3.2.5-1.fc7
- 3.2.5
* Wed Aug 16 2006 Stepan Kasal <skasal@redhat.com> - 1:3.2.4-16
- Require ghostscript; fig2dev calls it.
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1:3.2.4-15.1
- rebuild
* Tue May 16 2006 Than Ngo <than@redhat.com> 3.2.4-15
- fix #164140, transfig creates wrong dependencies for -L pstex
* Tue May 16 2006 Than Ngo <than@redhat.com> 3.2.4-14
- fix #191825, buildrequire on imake
- fix #173748, fig2dev still refers to /usr/X11R6/lib/X11/rgb.txt
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1:3.2.4-13.2
- bump again for double-long bug on ppc(64)
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1:3.2.4-13.1
- rebuilt for new gcc4.1 snapshot and glibc changes
* Mon Dec 19 2005 Than Ngo <than@redhat.com> 3.2.4-13
- fix build problem with modular X
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
- rebuilt
* Tue Nov 15 2005 Than Ngo <than@redhat.com> 1:3.2.4-12
- fix for modular X
* Sat Mar 05 2005 Than Ngo <than@redhat.com> 1:3.2.4-11
- rebuild
* Tue Nov 30 2004 Than Ngo <than@redhat.com> 1:3.2.4-10
- fix compiler warnings #111394
- fix broken language selection #114849
* Tue Nov 30 2004 Than Ngo <than@redhat.com> 1:3.2.4-9
- add patch to fix getrgb #117099
* Mon Oct 18 2004 Miloslav Trmac <mitr@redhat.com> - 1:3.2.4-8
- Fix at least a few obvious instances of C abuse (partly #74594 with patch by
Sysoltsev Slawa)
- Drop -Dcfree=free fix, not needed with current version
* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Tue Jun 17 2003 Than Ngo <than@redhat.com> 3.2.4-4
- patch build problem
* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Fri May 23 2003 Jeremy Katz <katzj@redhat.com> 1:3.2.4-2
- fix build with gcc 3.3
* Tue May 6 2003 Than Ngo <than@redhat.com> 3.2.4-1
- 3.2.4
* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
- rebuilt
* Mon Nov 18 2002 Than Ngo <than@redhat.com> 3.2.3d-8
- Added a patch file from d.binderman@virgin.net (bug #77980)
* Wed Jul 31 2002 Than Ngo <than@redhat.com> 3.2.3d-7
- fig2dev crashes with more than 1 gif files (bug #69917)
* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
- automated rebuild
* Fri Jun 14 2002 han Ngo <than@redhat.com> 3.2.3d-5
- fhs fixes (bug #66732)
* Thu May 23 2002 Tim Powers <timp@redhat.com>
- automated rebuild
* Wed Jan 09 2002 Tim Powers <timp@redhat.com>
- automated rebuild
* Mon Jul 23 2001 Than Ngo <than@redhat.com>
- fix build dependencies (bug #49725)
- Copyright -> License
* Fri Jun 15 2001 Than Ngo <than@redhat.com>
- update to 3.2.3d release (Bug # 44742)
* Tue May 29 2001 Than Ngo <than@redhat.com>
- update to 3.2.3d beta2
* Fri Apr 13 2001 Than Ngo <than@redhat.com>
- fix core dump when using LDAP auth
- update ftp site
* Mon Dec 18 2000 Yukihiro Nakai <ynakai@redhat.com>
- Enable Japanese
* Sat Aug 05 2000 Than Ngo <than@redhat.de>
- update to 3.2.3c (Bug fixed release)
* Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
- automatic rebuild
* Tue Jun 13 2000 Trond Eivind Glomsrød <teg@redhat.com>
- make it build as nobody. Imake sucks.
- include LATEX.AND.XFIG
- use %%{_tmppath}
* Wed Apr 26 2000 Matt Wilson <msw@redhat.com>
- add enable_japanese option, disable it for now.
* Sun Apr 16 2000 Bryan C. Andregg <bandregg@redhat.com>
- new version to support -b and -g which xfig uses
* Mon Feb 7 2000 Bill Nottingham <notting@redhat.com>
- handle compressed manpages
* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com>
- auto rebuild in the new build environment (release 3)
* Wed Dec 30 1998 Cristian Gafton <gafton@redhat.com>
- build for glibc 2.1
* Tue Jul 7 1998 Jeff Johnson <jbj@redhat.com>
- update to 3.2.1.
* Sat Jun 27 1998 Jeff Johnson <jbj@redhat.com>
- add %%clean.
* Mon Apr 27 1998 Prospector System <bugs@redhat.com>
- translations modified for de, fr, tr
* Thu Nov 13 1997 Otto Hammersmith <otto@redhat.com>
- fixed problem with Imakefile for fig2dev not including $(XLIB)
- build rooted.
* Fri Oct 24 1997 Otto Hammersmith <otto@redhat.com>
- recreated the glibc patch that is needed for an alpha build, missed it
building on the intel.
* Tue Oct 21 1997 Otto Hammersmith <otto@redhat.com>
- updated version
- fixed source url
* Fri Jul 18 1997 Erik Troan <ewt@redhat.com>
- built against glibc

2
SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md
Просмотреть файл

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

5
SPECS/LICENSES-AND-NOTICES/data/licenses.json
Просмотреть файл

@ -270,8 +270,6 @@
"fmt",
"fontawesome-fonts",
"fontpackages",
"foomatic",
"foomatic-db",
"fprintd",
"freeglut",
"freeipmi",
@ -1687,7 +1685,6 @@
"pmix",
"pngcrush",
"pngnq",
"pnm2ppa",
"po4a",
"podman",
"poetry",
@ -1988,7 +1985,6 @@
"rarian",
"rasdaemon",
"rasqal",
"rcs",
"rdist",
"rdma-core",
"re2",
@ -2175,7 +2171,6 @@
"tpm-quote-tools",
"tpm-tools",
"tpm2-abrmd-selinux",
"transfig",
"tss2",
"ttembed",
"ttmkfdir",

80
cgmanifest.json
Просмотреть файл

@ -3925,26 +3925,6 @@
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "foomatic",
"version": "4.0.13",
"downloadUrl": "http://www.openprinting.org/download/foomatic/foomatic-db-engine-4.0.13.tar.gz"
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "foomatic-db",
"version": "4.0",
"downloadUrl": "http://www.openprinting.org/download/foomatic/foomatic-db-4.0-20201104.tar.gz"
}
}
},
{
"component": {
"type": "other",
@ -14568,6 +14548,16 @@
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "netpbm",
"version": "10.90.00",
"downloadUrl": "https://svn.code.sf.net/p/netpbm/code/advanced"
}
}
},
{
"component": {
"type": "other",
@ -21629,16 +21619,6 @@
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "pnm2ppa",
"version": "1.04",
"downloadUrl": "http://download.sourceforge.net/pnm2ppa/pnm2ppa-1.04.tar.gz"
}
}
},
{
"component": {
"type": "other",
@ -25429,16 +25409,6 @@
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "rcs",
"version": "5.9.4",
"downloadUrl": "ftp://ftp.gnu.org/gnu/rcs/rcs-5.9.4.tar.xz"
}
}
},
{
"component": {
"type": "other",
@ -25760,16 +25730,6 @@
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "rt-tests",
"version": "1.8",
"downloadUrl": "https://www.kernel.org/pub/linux/utils/rt-tests/older/rt-tests-1.8.tar.xz"
}
}
},
{
"component": {
"type": "other",
@ -25800,6 +25760,16 @@
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "rt-tests",
"version": "1.8",
"downloadUrl": "https://www.kernel.org/pub/linux/utils/rt-tests/older/rt-tests-1.8.tar.xz"
}
}
},
{
"component": {
"type": "other",
@ -28722,16 +28692,6 @@
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "transfig",
"version": "3.2.7b",
"downloadUrl": "http://downloads.sourceforge.net/mcj/fig2dev-3.2.7b.tar.xz"
}
}
},
{
"component": {
"type": "other",