From bcf21317290e5c0f9ff1eea964ed47d6ea8135eb Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Jul 08 2013 15:04:22 +0000 Subject: import sane-frontends-1.0.14-17.el7.src.rpm --- diff --git a/.sane-frontends.metadata b/.sane-frontends.metadata new file mode 100644 index 0000000..e5b822d --- /dev/null +++ b/.sane-frontends.metadata @@ -0,0 +1 @@ +063e11df3e32d7a43161fd37026a4dc601d5482d SOURCES/sane-frontends-1.0.14.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/sane-frontends-1.0.14-array-out-of-bounds.patch b/SOURCES/sane-frontends-1.0.14-array-out-of-bounds.patch new file mode 100644 index 0000000..f5c11a2 --- /dev/null +++ b/SOURCES/sane-frontends-1.0.14-array-out-of-bounds.patch @@ -0,0 +1,40 @@ +commit c4cb247732767aed76502069d0b3040c4c4e5123 +Author: Nils Philippsen +Date: Fri Jul 31 16:21:53 2009 +0200 + + patch: array-out-of-bounds + + Squashed commit of the following: + + commit 337bcefaa7a67931095b74317a266a1244978ab6 + Author: Nils Philippsen + Date: Fri Jul 31 16:03:28 2009 +0200 + + fix array subscript out of bounds errors (#133121) + +diff --git a/src/xcam.c b/src/xcam.c +index 2d494a5..f6859b7 100644 +--- a/src/xcam.c ++++ b/src/xcam.c +@@ -1289,7 +1289,7 @@ save_frame_button (GtkWidget * widget, gpointer client_data, + + /* test for pnm formats */ + strncpy (testfilename, preferences.filename, sizeof (testfilename)); +- testfilename[sizeof (testfilename)] = 0; ++ testfilename[sizeof (testfilename) - 1] = 0; + g_strreverse (testfilename); + if (!((!strncmp (testfilename, "mnp.", 4)) || + (!strncmp (testfilename, "mgp.", 4)) || +diff --git a/src/xscanimage.c b/src/xscanimage.c +index a36324f..065923d 100644 +--- a/src/xscanimage.c ++++ b/src/xscanimage.c +@@ -1284,7 +1284,7 @@ scan_dialog (GtkWidget * widget, gpointer call_data) + { /* We are running in standalone mode */ + /* test for pnm formats */ + strncpy (testfilename, preferences.filename, sizeof (testfilename)); +- testfilename[sizeof (testfilename)] = 0; ++ testfilename[sizeof (testfilename) - 1] = 0; + g_strreverse (testfilename); + if (!((!strncmp (testfilename, "mnp.", 4)) || + (!strncmp (testfilename, "mgp.", 4)) || diff --git a/SOURCES/sane-frontends-1.0.14-sane-backends-1.0.20.patch b/SOURCES/sane-frontends-1.0.14-sane-backends-1.0.20.patch new file mode 100644 index 0000000..15bd6a1 --- /dev/null +++ b/SOURCES/sane-frontends-1.0.14-sane-backends-1.0.20.patch @@ -0,0 +1,31 @@ +commit ddd90b1502a263d03938b1e45a57684d576993ba +Author: Nils Philippsen +Date: Fri Jul 31 16:25:58 2009 +0200 + + patch: sane-backends-1.0.20 + + Squashed commit of the following: + + commit 0c84326fa37bb309481c4d2658ab6cb17c9f0e85 + Author: Nils Philippsen + Date: Fri Jul 31 16:18:59 2009 +0200 + + use SANE_CAP_ALWAYS_SETTABLE only if available + +diff --git a/src/gtkglue.c b/src/gtkglue.c +index ba5cbf5..ec81f45 100644 +--- a/src/gtkglue.c ++++ b/src/gtkglue.c +@@ -1476,8 +1476,12 @@ gsg_set_sensitivity (GSGDialog * dialog, int sensitive) + || opt->type == SANE_TYPE_GROUP || !dialog->element[i].widget) + continue; + ++#ifdef SANE_CAP_ALWAYS_SETTABLE + if (!(opt->cap & SANE_CAP_ALWAYS_SETTABLE)) + gtk_widget_set_sensitive (dialog->element[i].widget, sensitive); ++#else ++ gtk_widget_set_sensitive (dialog->element[i].widget, sensitive); ++#endif + } + } + diff --git a/SOURCES/sane-frontends-1.0.14-xcam-man.patch b/SOURCES/sane-frontends-1.0.14-xcam-man.patch new file mode 100644 index 0000000..c28ec3a --- /dev/null +++ b/SOURCES/sane-frontends-1.0.14-xcam-man.patch @@ -0,0 +1,43 @@ +From 3ec2c43dc3ef177cc2be266881892ec7d23753fe Mon Sep 17 00:00:00 2001 +From: Nils Philippsen +Date: Mon, 8 Jul 2013 16:35:03 +0200 +Subject: [PATCH] patch: xcam-man + +Squashed commit of the following: + +commit 6b21756dac4f6ddce5beb0aaf0b135ab882b9cfa +Author: Nils Philippsen +Date: Mon Jul 8 16:28:30 2013 +0200 + + describe correct option names in xcam man page + + (cherry picked from commit 7e079e377174826453a1041719fb347d69d3ba5f) +--- + doc/xcam.man | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/doc/xcam.man b/doc/xcam.man +index 036bcb3..020445e 100644 +--- a/doc/xcam.man ++++ b/doc/xcam.man +@@ -4,7 +4,7 @@ + xcam - a graphical camera frontend for SANE + .SH SYNOPSIS + .B xcam +-.RB [ --buffer | -B ] ++.RB [ --buffersize | -B ] + .RB [ --version | -V ] + .RB [ --help | -h ] + +@@ -30,7 +30,7 @@ presents a menu listing of all known and available devices. + .SH OPTIONS + .PP + If the +-.B --Buffer (-B) ++.B --buffersize (-B) + option is given, + .B xcam + will use a 1024 kByte input buffer instead of the default 32 kByte. +-- +1.8.3.1 + diff --git a/SPECS/sane-frontends.spec b/SPECS/sane-frontends.spec new file mode 100644 index 0000000..3d934d6 --- /dev/null +++ b/SPECS/sane-frontends.spec @@ -0,0 +1,241 @@ +Name: sane-frontends +Version: 1.0.14 +Release: 17%{?dist} +Summary: Graphical frontend to SANE +URL: http://www.sane-project.org +Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz +# Fix array subscript out of bounds errors (#133121). +# Upstream commit 5113e3de39846a8226909088ad5c1aa4969f3030 and commit +# 7336b064653026171a715dfaf803693b638c67a5 (partial) +Patch0: sane-frontends-1.0.14-array-out-of-bounds.patch +# Fix building with sane-backends >= 1.0.20. +# Upstream commit 5e96223e497538d06e18d8e84b774c4a35f654b4 (partial) and commit +# c554cfce37e37a33f94a9051afe2062c4759072b +Patch1: sane-frontends-1.0.14-sane-backends-1.0.20.patch +# Describe correct option names in xcam man page. +# Upstream commit 7e079e377174826453a1041719fb347d69d3ba5f +Patch2: sane-frontends-1.0.14-xcam-man.patch +License: GPLv2+ +Group: Applications/System +BuildRequires: gtk2-devel +BuildRequires: sane-backends-devel >= 1.0.19-15 + +%description +This packages includes the scanadf and xcam programs. + +%prep +%setup -q +%patch0 -p1 -b .array-out-of-bounds +%patch1 -p1 -b .sane-backends-1.0.20 +%patch2 -p1 -b .xcam-man + +%build +%configure --with-gnu-ld --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} +make %{?_smp_mflags} + +%install +make DESTDIR=%{buildroot} install + +# Not xscanimage; use xsane instead. +rm -f %{buildroot}%{_bindir}/xscanimage +rm -f %{buildroot}%{_mandir}/man1/xscanimage* +rm -f %{buildroot}%{_datadir}/sane/sane-style.rc + +%files +%doc AUTHORS COPYING README +%{_bindir}/* +%{_mandir}/man1/* +# there is no desktop file for xcam because while it is a GUI program it is +# intended to be used from the command line + +%changelog +* Mon Jul 08 2013 Nils Philippsen - 1.0.14-17 +- add comments to patches +- describe correct option names in xcam man page + +* Thu Feb 14 2013 Fedora Release Engineering - 1.0.14-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sat Jul 21 2012 Fedora Release Engineering - 1.0.14-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Apr 03 2012 Nils Philippsen - 1.0.14-14 +- clean up: + - don't BR: gimp-devel, R: sane-backends + - get rid of buildroot, %%makeinstall and %%clean section + - dont obsolete/provide "sane" (ancient) + +* Tue Jan 10 2012 Nils Philippsen - 1.0.14-13 +- rebuild for gcc 4.7 + +* Mon Nov 07 2011 Nils Philippsen - 1.0.14-12 +- rebuild (libpng) + +* Wed Feb 09 2011 Fedora Release Engineering - 1.0.14-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Feb 26 2010 Nils Philippsen - 1.0.14-10 +- add missing documentation files AUTHORS, COPYING, README +- don't distribute sane-style.rc +- use %%buildroot consistently +- explain missing xcam.desktop file + +* Mon Aug 03 2009 Nils Philippsen 1.0.14-9 +- remove ExcludeArch: s390 s390x + +* Fri Jul 31 2009 Nils Philippsen 1.0.14-8 +- replace badcode with array-out-of-bounds patch +- fix compilation with sane-backends-1.0.20 + +* Sun Jul 26 2009 Fedora Release Engineering - 1.0.14-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Mar 02 2009 Nils Philippsen 1.0.14-6 +- don't require libieee2384-devel, libjpeg-devel but require fixed + sane-backends-devel for building + +* Wed Feb 25 2009 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Sep 4 2008 Tom "spot" Callaway - 1.0.14-5 +- fix license tag + +* Tue Feb 19 2008 Fedora Release Engineering - 1.0.14-4 +- Autorebuild for GCC 4.3 + +* Tue Apr 24 2007 Nils Philippsen 1.0.14-3 +- merge review (#226389): + - add version info to obsoletes/provides + - no config files in /usr + - use %%configure macro +- add dist tag + +* Thu Mar 15 2007 Karsten Hopp 1.0.14-2 +- rebuild with current gtk2 to add png support (#232013) + +* Wed Jul 12 2006 Jesse Keating - 1.0.14-1.2.2 +- rebuild + +* Fri Feb 10 2006 Jesse Keating - 1.0.14-1.2.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 1.0.14-1.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Mon Nov 21 2005 Nils Philippsen 1.0.14-1 +- version 1.0.14 +- fix build requires +- update badcode patch + +* Wed Mar 2 2005 Tim Waugh 1.0.13-2 +- Rebuild for new GCC. + +* Mon Nov 8 2004 Tim Waugh 1.0.13-1 +- 1.0.13. + +* Mon Sep 27 2004 Tim Waugh 1.0.12-4 +- Fixed mistaken array op (bug #133121). + +* Sat Jun 19 2004 Jeremy Katz - 1.0.12-3 +- remove no longer valid requires on old gtk+ and gimp + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Wed Jun 2 2004 Tim Waugh 1.0.12-1 +- 1.0.12. + +* Wed May 12 2004 Tim Waugh +- s/ftp.mostang.com/ftp.sane-project.org/. + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Oct 21 2003 Florian La Roche +- BuildReq: libieee1284-devel, it seems to get picked up if available + +* Mon Sep 29 2003 Tim Waugh +- Updated URL. + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Tue Apr 29 2003 Tim Waugh 1.0.11-1 +- 1.0.11. + +* Mon Mar 24 2003 Tim Waugh 1.0.10-2 +- Don't require a specific version of sane-backends. + +* Thu Mar 20 2003 Tim Waugh 1.0.10-1 +- 1.0.10. + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Fri Oct 25 2002 Tim Waugh 1.0.9-1 +- 1.0.9. + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu Jun 20 2002 Tim Waugh 1.0.8-3 +- Don't explicitly strip binaries (bug #62565). + +* Wed Jun 12 2002 Tim Waugh 1.0.8-2 +- Rebuild to fix bug #66129. + +* Tue May 28 2002 Tim Waugh 1.0.8-1 +- 1.0.8. + +* Sun May 26 2002 Tim Powers +- automated rebuild + +* Wed May 22 2002 Tim Waugh 1.0.8-0.20020522.1 +- Update to CVS. Release expected before the end of the month. +- Don't ship xscanimage any longer. + +* Thu Feb 21 2002 Tim Waugh 1.0.7-2 +- Rebuild in new environment. + +* Mon Feb 4 2002 Tim Waugh 1.0.7-1 +- 1.0.7. + +* Sun Jan 27 2002 Tim Waugh 1.0.7-0.beta2.1 +- 1.0.7-beta2. + +* Wed Jan 23 2002 Tim Waugh 1.0.7-0.beta1.1 +- 1.0.7-beta1. +- No longer need the fpe patch. + +* Fri Nov 30 2001 Tim Waugh 1.0.6-2 +- Fix a floating point exception (bug #56536). + +* Mon Nov 5 2001 Tim Waugh 1.0.6-1 +- 1.0.6. + +* Sun Jul 1 2001 Tim Waugh 1.0.5-1 +- 1.0.5. +- Change Copyright: to License:. + +* Thu Jun 7 2001 Tim Waugh 1.0.5-0.20010605 +- CVS snapshot 2001-06-05. +- Don't install xscanimage plug-in symlinks. The old sane package never + used to do this, and it looks confusing in gimp if you also have + xsane-gimp (which is better) installed. xscanimage works stand-alone + anyhow. + +* Sun Jun 3 2001 Tim Waugh 1.0.5-0.20010603.1000 +- CVS snapshot 2001-06-03 10:00. + +* Sat Jun 2 2001 Tim Waugh 1.0.5-0.20010530 +- Built for Red Hat Linux. +- CVS snapshot 2001-05-30. + +* Mon Jan 08 2001 Francis Galiegue 1.0.4-2mdk + +- Summary now capitalised +- BuildRequires: sane (for sane-config) +