[hplip/f14/master] 3.11.1
Jiří Popelka
jpopelka at fedoraproject.org
Mon Jan 24 12:03:38 UTC 2011
commit 2347ef53a222eccf9d99c74b69af1e60aebd6b50
Author: Jiri Popelka <jpopelka at redhat.com>
Date: Mon Jan 24 12:29:13 2011 +0100
3.11.1
.gitignore | 1 +
hplip-3.10.9.tar.gz.asc | 7 -------
hplip-3.11.1.tar.gz.asc | 7 +++++++
hplip-addgroup.patch | 14 --------------
hplip-addprinter.patch | 20 ++++++++++----------
hplip-cups-web.patch | 24 ------------------------
hplip-dbglog-newline.patch | 38 +++++++++++++++++++-------------------
hplip-fax-ppd.patch | 14 +++++++++-----
hplip-openPPD.patch | 24 ------------------------
hplip.spec | 23 +++++++----------------
sources | 2 +-
11 files changed, 54 insertions(+), 120 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5834cf8..b4add93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@ hpcups-update-ppds.sh
hplip-3.10.5.tar.gz
hplip-3.10.6.tar.gz
/hplip-3.10.9.tar.gz
+/hplip-3.11.1.tar.gz
diff --git a/hplip-3.11.1.tar.gz.asc b/hplip-3.11.1.tar.gz.asc
new file mode 100644
index 0000000..a3eb048
--- /dev/null
+++ b/hplip-3.11.1.tar.gz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEABECAAYFAk02dTEACgkQc9dwzaWQR7msfACeN0/IyBLgGwKxteNK9eK1xR0W
+b8kAn0nZXFOzvtEx+NHZ7N4STBngZXpI
+=rQyC
+-----END PGP SIGNATURE-----
diff --git a/hplip-addprinter.patch b/hplip-addprinter.patch
index f278a18..df8d34f 100644
--- a/hplip-addprinter.patch
+++ b/hplip-addprinter.patch
@@ -1,11 +1,11 @@
-diff -up hplip-3.10.9/prnt/cupsext/cupsext.c~ hplip-3.10.9/prnt/cupsext/cupsext.c
---- hplip-3.10.9/prnt/cupsext/cupsext.c~ 2010-11-12 10:35:59.316957426 +0000
-+++ hplip-3.10.9/prnt/cupsext/cupsext.c 2010-11-12 15:58:27.467044126 +0000
+diff -up hplip-3.11.1/prnt/cupsext/cupsext.c.addprinter hplip-3.11.1/prnt/cupsext/cupsext.c
+--- hplip-3.11.1/prnt/cupsext/cupsext.c.addprinter 2011-01-19 06:15:27.000000000 +0100
++++ hplip-3.11.1/prnt/cupsext/cupsext.c 2011-01-24 12:24:01.000000000 +0100
@@ -510,6 +510,7 @@ PyObject * addPrinter( PyObject * self,
- strcpy( info, name );
-
- /* Connect to the HTTP server */
-+ cupsSetUser ("root");
- if ( ( http = httpConnectEncrypt( cupsServer(), ippPort(), cupsEncryption() ) ) == NULL )
- {
- r = 0;
+ strcpy( info, name );
+
+ /* Connect to the HTTP server */
++ cupsSetUser ("root");
+ if ( ( http = httpConnectEncrypt( cupsServer(), ippPort(), cupsEncryption() ) ) == NULL )
+ {
+ r = 0;
diff --git a/hplip-dbglog-newline.patch b/hplip-dbglog-newline.patch
index 00b4623..c6a969d 100644
--- a/hplip-dbglog-newline.patch
+++ b/hplip-dbglog-newline.patch
@@ -1,16 +1,16 @@
-diff -up hplip-3.10.5/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.10.5/prnt/hpcups/HPCupsFilter.cpp
---- hplip-3.10.5/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline 2010-05-17 15:00:02.000000000 +0200
-+++ hplip-3.10.5/prnt/hpcups/HPCupsFilter.cpp 2010-05-17 15:00:02.000000000 +0200
-@@ -350,7 +350,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu
+diff -up hplip-3.11.1/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.11.1/prnt/hpcups/HPCupsFilter.cpp
+--- hplip-3.11.1/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline 2011-01-24 12:01:19.000000000 +0100
++++ hplip-3.11.1/prnt/hpcups/HPCupsFilter.cpp 2011-01-24 12:08:38.000000000 +0100
+@@ -352,7 +352,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu
(attr->value != NULL)) {
strncpy(m_JA.printer_platform, attr->value, sizeof(m_JA.printer_platform)-1);
if (m_iLogLevel & BASIC_LOG) {
- dbglog("HPCUPS: found Printer Platform, it is - %s", attr->value);
+ dbglog("HPCUPS: found Printer Platform, it is - %s\n", attr->value);
}
- }
-
-@@ -365,7 +365,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu
+ if(strcmp(m_JA.printer_platform, "ljzjscolor") == 0)
+ {
+@@ -372,7 +372,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu
}
strncpy(m_JA.printer_language, attr->value, sizeof(m_JA.printer_language)-1);
if (m_iLogLevel & BASIC_LOG) {
@@ -19,7 +19,7 @@ diff -up hplip-3.10.5/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.10.5/p
}
// Fill in the other PCL header info
-@@ -410,14 +410,14 @@ DRIVER_ERROR HPCupsFilter::startPage (cu
+@@ -417,14 +417,14 @@ DRIVER_ERROR HPCupsFilter::startPage (cu
{
if (err == PLUGIN_LIBRARY_MISSING)
fputs ("STATE: +hplip.plugin-error\n", stderr);
@@ -36,7 +36,7 @@ diff -up hplip-3.10.5/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.10.5/p
}
m_pPrinterBuffer = new BYTE[cups_header->cupsWidth * 4 + 32];
-@@ -503,7 +503,7 @@ int HPCupsFilter::StartPrintJob(int arg
+@@ -510,7 +510,7 @@ int HPCupsFilter::StartPrintJob(int arg
close(fd);
}
if (m_iLogLevel & BASIC_LOG)
@@ -45,7 +45,7 @@ diff -up hplip-3.10.5/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.10.5/p
closeFilter();
cupsRasterClose(cups_raster);
return 1;
-@@ -513,7 +513,7 @@ int HPCupsFilter::StartPrintJob(int arg
+@@ -520,7 +520,7 @@ int HPCupsFilter::StartPrintJob(int arg
close(fd);
}
if (m_iLogLevel & BASIC_LOG)
@@ -54,9 +54,9 @@ diff -up hplip-3.10.5/prnt/hpcups/HPCupsFilter.cpp.dbglog-newline hplip-3.10.5/p
closeFilter();
cupsRasterClose(cups_raster);
return 0;
-diff -up hplip-3.10.5/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.10.5/prnt/hpcups/Lidil.cpp
---- hplip-3.10.5/prnt/hpcups/Lidil.cpp.dbglog-newline 2010-05-13 01:41:08.000000000 +0200
-+++ hplip-3.10.5/prnt/hpcups/Lidil.cpp 2010-05-17 15:00:02.000000000 +0200
+diff -up hplip-3.11.1/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.11.1/prnt/hpcups/Lidil.cpp
+--- hplip-3.11.1/prnt/hpcups/Lidil.cpp.dbglog-newline 2011-01-19 06:15:27.000000000 +0100
++++ hplip-3.11.1/prnt/hpcups/Lidil.cpp 2011-01-24 12:01:20.000000000 +0100
@@ -103,7 +103,7 @@ DRIVER_ERROR Lidil::Configure(Pipeline *
if (m_pPM->BaseResX != m_pQA->horizontal_resolution ||
m_pPM->BaseResY != m_pQA->vertical_resolution)
@@ -109,9 +109,9 @@ diff -up hplip-3.10.5/prnt/hpcups/Lidil.cpp.dbglog-newline hplip-3.10.5/prnt/hpc
return false;
}
-diff -up hplip-3.10.5/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.10.5/prnt/hpcups/Pcl3.cpp
---- hplip-3.10.5/prnt/hpcups/Pcl3.cpp.dbglog-newline 2010-05-13 01:41:08.000000000 +0200
-+++ hplip-3.10.5/prnt/hpcups/Pcl3.cpp 2010-05-17 15:00:02.000000000 +0200
+diff -up hplip-3.11.1/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.11.1/prnt/hpcups/Pcl3.cpp
+--- hplip-3.11.1/prnt/hpcups/Pcl3.cpp.dbglog-newline 2011-01-19 06:15:27.000000000 +0100
++++ hplip-3.11.1/prnt/hpcups/Pcl3.cpp 2011-01-24 12:01:20.000000000 +0100
@@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3::Configure(Pipeline **
if (!selectPrintMode())
@@ -155,9 +155,9 @@ diff -up hplip-3.10.5/prnt/hpcups/Pcl3.cpp.dbglog-newline hplip-3.10.5/prnt/hpcu
return false;
}
-diff -up hplip-3.10.5/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline hplip-3.10.5/prnt/hpcups/Pcl3Gui.cpp
---- hplip-3.10.5/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline 2010-05-13 01:41:08.000000000 +0200
-+++ hplip-3.10.5/prnt/hpcups/Pcl3Gui.cpp 2010-05-17 15:00:02.000000000 +0200
+diff -up hplip-3.11.1/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline hplip-3.11.1/prnt/hpcups/Pcl3Gui.cpp
+--- hplip-3.11.1/prnt/hpcups/Pcl3Gui.cpp.dbglog-newline 2011-01-19 06:15:27.000000000 +0100
++++ hplip-3.11.1/prnt/hpcups/Pcl3Gui.cpp 2011-01-24 12:01:20.000000000 +0100
@@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3Gui::Configure(Pipeline
if (!selectPrintMode())
diff --git a/hplip-fax-ppd.patch b/hplip-fax-ppd.patch
index b0386d4..ca9cf4d 100644
--- a/hplip-fax-ppd.patch
+++ b/hplip-fax-ppd.patch
@@ -1,17 +1,21 @@
-diff -up hplip-3.10.6/ui/setupform.py.fax-ppd hplip-3.10.6/ui/setupform.py
---- hplip-3.10.6/ui/setupform.py.fax-ppd 2010-08-12 13:08:01.846853509 +0100
-+++ hplip-3.10.6/ui/setupform.py 2010-08-12 13:08:17.813979176 +0100
-@@ -886,13 +886,13 @@ class SetupForm(SetupForm_base):
+diff -up hplip-3.11.1/ui/setupform.py.fax-ppd hplip-3.11.1/ui/setupform.py
+--- hplip-3.11.1/ui/setupform.py.fax-ppd 2011-01-19 06:18:26.000000000 +0100
++++ hplip-3.11.1/ui/setupform.py 2011-01-24 12:00:48.000000000 +0100
+@@ -886,16 +886,16 @@ class SetupForm(SetupForm_base):
QApplication.setOverrideCursor(QApplication.waitCursor)
if self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_MARVELL:
- fax_ppd_name = "HP-Fax3-hplip" # Fixed width (2528 pixels) and 300dpi rendering
+ fax_ppd_name = "HP-Fax3-hpcups" # Fixed width (2528 pixels) and 300dpi rendering
nick = "HP Fax 3"
- if self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_SOAP:
+ if self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_SOAP or self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_LEDMSOAP:
- fax_ppd_name = "HP-Fax2-hplip" # Fixed width (2528 pixels) and 300dpi rendering
+ fax_ppd_name = "HP-Fax2-hpcups" # Fixed width (2528 pixels) and 300dpi rendering
nick = "HP Fax 2"
+ if self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_LEDM:
+- fax_ppd_name = "HP-Fax4-hplip" # Fixed width (1728 pixels) and 200dpi rendering
++ fax_ppd_name = "HP-Fax4-hpcups" # Fixed width (1728 pixels) and 200dpi rendering
+ nick = "HP Fax 4"
else:
- fax_ppd_name = "HP-Fax-hplip" # Standard
+ fax_ppd_name = "HP-Fax-hpcups" # Standard
diff --git a/hplip.spec b/hplip.spec
index c15bf6e..7718244 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
-Version: 3.10.9
-Release: 14%{?dist}
+Version: 3.11.1
+Release: 1%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132
@@ -31,10 +31,8 @@ Patch17: hplip-deviceIDs-ppd.patch
Patch18: hplip-skip-blank-lines.patch
Patch19: hplip-dbglog-newline.patch
Patch20: hplip-no-system-tray.patch
-Patch21: hplip-openPPD.patch
Patch22: hplip-ppd-ImageableArea.patch
Patch23: hplip-network-timeout.patch
-Patch24: hplip-addgroup.patch
Patch25: hplip-raw_deviceID-traceback.patch
Patch26: hplip-UnicodeDecodeError.patch
Patch27: hplip-emit-SIGNAL.patch
@@ -45,8 +43,7 @@ Patch31: hplip-hpaio-segfault.patch
Patch32: hplip-newline.patch
Patch33: hplip-dbus-threads.patch
Patch34: hplip-notification-exception.patch
-Patch35: hplip-cups-web.patch
-Patch36: hplip-CVE-2010-4267.patch
+Patch35: hplip-CVE-2010-4267.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -240,9 +237,6 @@ done
# Wait longer to see if a system tray becomes available (bug #569969).
%patch20 -p1 -b .no-system-tray
-# Prevent segfault in cupsext when opening PPD file (bug #572775).
-%patch21 -p1 -b .openPPD
-
# Fix ImageableArea for Laserjet 8150/9000 (bug #596298).
for ppd_file in $(grep '^diff' %{PATCH22} | cut -d " " -f 4);
do
@@ -257,9 +251,6 @@ done
# Increase timeouts for curl, wget, ping for high latency networks (bug #635388).
%patch23 -p1 -b .network-timeout
-# utils.addgroup() was returning string instead of array (bug #642771).
-%patch24 -p1 -b .addgroup
-
# Fixed traceback on error condition in device.py (bug #628125).
%patch25 -p1 -b .raw_deviceID-traceback
@@ -291,12 +282,9 @@ done
# Catch GError exception when notification showing failed (bug #665577).
%patch34 -p1 -b .notification-exception
-# Fixed "CUPS Web Interface" button (bug #633899).
-%patch35 -p1 -b .cups-web
-
# Applied patch to fix CVE-2010-4267, remote stack overflow
# vulnerability (bug #670252).
-%patch36 -p1 -b .CVE-2010-4267
+%patch35 -p1 -b .CVE-2010-4267
sed -i.duplex-constraints \
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \
@@ -525,6 +513,9 @@ fi
%postun libs -p /sbin/ldconfig
%changelog
+* Mon Jan 24 2011 Jiri Popelka <jpopelka at redhat.com> 3.11.1-1
+- 3.11.1
+
* Mon Jan 17 2011 Tim Waugh <twaugh at redhat.com> - 3.10.9-14
- Applied patch to fix CVE-2010-4267, remote stack overflow
vulnerability (bug #670252).
diff --git a/sources b/sources
index 55c72e4..6b11112 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-609718830a26874fc0ea84a47b8132f3 hplip-3.10.9.tar.gz
+86f63a00c911313206fef6a147f7faad hplip-3.11.1.tar.gz
More information about the scm-commits
mailing list