diff --git a/.gitignore b/.gitignore index 4196255..9caad59 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ hplip-3.10.6.tar.gz /hplip-3.14.1.tar.gz /hplip-3.14.3.tar.gz /hplip-3.14.4.tar.gz +/hplip-3.14.6.tar.gz diff --git a/hplip-3.14.4.tar.gz.asc b/hplip-3.14.4.tar.gz.asc deleted file mode 100644 index 6d314a4..0000000 --- a/hplip-3.14.4.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iEYEABECAAYFAlM+jW8ACgkQc9dwzaWQR7n+2wCfXptHk0qzrbrh4zl20WZ2zibb -v6IAn1fBYSZwVTLCAhbgDXiHwhLcDPTJ -=ksSW ------END PGP SIGNATURE----- diff --git a/hplip-3.14.6.tar.gz.asc b/hplip-3.14.6.tar.gz.asc new file mode 100644 index 0000000..3fbd840 --- /dev/null +++ b/hplip-3.14.6.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iEYEABECAAYFAlONbUsACgkQc9dwzaWQR7nu0gCgpq2dT7qvrkIbaIarjUdX+EbC +F5UAn3C6ZjcYma+F2hAuqC4973F6fAf1 +=cteQ +-----END PGP SIGNATURE----- diff --git a/hplip-logdir.patch b/hplip-logdir.patch index d66bb75..6d970fd 100644 --- a/hplip-logdir.patch +++ b/hplip-logdir.patch @@ -1,7 +1,7 @@ -diff -up hplip-3.14.3/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.14.3/prnt/hpcups/HPCupsFilter.cpp ---- hplip-3.14.3/prnt/hpcups/HPCupsFilter.cpp.logdir 2014-03-07 10:10:48.512355710 +0100 -+++ hplip-3.14.3/prnt/hpcups/HPCupsFilter.cpp 2014-03-07 10:15:27.912460207 +0100 -@@ -604,7 +605,7 @@ int HPCupsFilter::processRasterData(cups +diff -up hplip-3.14.6/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.14.6/prnt/hpcups/HPCupsFilter.cpp +--- hplip-3.14.6/prnt/hpcups/HPCupsFilter.cpp.logdir 2014-06-05 13:33:05.426719552 +0200 ++++ hplip-3.14.6/prnt/hpcups/HPCupsFilter.cpp 2014-06-05 13:33:05.432719467 +0200 +@@ -604,7 +604,7 @@ int HPCupsFilter::processRasterData(cups char hpPreProcessedRasterFile[MAX_FILE_PATH_LEN]; //temp file needed to store raster data with swaped pages. @@ -10,15 +10,15 @@ diff -up hplip-3.14.3/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.14.3/prnt/hpcu while (cupsRasterReadHeader2(cups_raster, &cups_header)) -diff -up hplip-3.14.3/prnt/hpcups/SystemServices.cpp.logdir hplip-3.14.3/prnt/hpcups/SystemServices.cpp ---- hplip-3.14.3/prnt/hpcups/SystemServices.cpp.logdir 2014-03-07 10:10:48.539355334 +0100 -+++ hplip-3.14.3/prnt/hpcups/SystemServices.cpp 2014-03-07 10:18:16.632107853 +0100 +diff -up hplip-3.14.6/prnt/hpcups/SystemServices.cpp.logdir hplip-3.14.6/prnt/hpcups/SystemServices.cpp +--- hplip-3.14.6/prnt/hpcups/SystemServices.cpp.logdir 2014-06-05 13:33:05.432719467 +0200 ++++ hplip-3.14.6/prnt/hpcups/SystemServices.cpp 2014-06-05 13:34:05.742861168 +0200 @@ -38,7 +38,7 @@ SystemServices::SystemServices(int iLogL - if (iLogLevel & SAVE_PCL_FILE) + if (iLogLevel & SAVE_OUT_FILE) { char fname[MAX_FILE_PATH_LEN]; -- sprintf(fname, "%s/hp_%s_cups_out_job%d_XXXXXX",CUPS_TMP_DIR, user_name, job_id); -+ snprintf(fname, sizeof(fname), "%s/hp_%s_cups_out_job%d_XXXXXX",CUPS_TMP_DIR, user_name, job_id); +- sprintf(fname, "%s/hpcups_%s_out_job%d_XXXXXX",CUPS_TMP_DIR, user_name, job_id); ++ snprintf(fname, sizeof(fname), "%s/hpcups_%s_out_job%d_XXXXXX",CUPS_TMP_DIR, user_name, job_id); createTempFile(fname, &m_fp); if (m_fp) diff --git a/hplip.spec b/hplip.spec index e4a80b0..d014520 100644 --- a/hplip.spec +++ b/hplip.spec @@ -6,8 +6,8 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 3.14.4 -Release: 5%{?dist} +Version: 3.14.6 +Release: 1%{?dist} License: GPLv2+ and MIT Url: http://hplip.sourceforge.net/ @@ -478,6 +478,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %postun libs -p /sbin/ldconfig %changelog +* Thu Jun 05 2014 Jiri Popelka - 3.14.6-1 +- 3.14.6 + * Thu May 22 2014 Jiri Popelka - 3.14.4-5 - Treat logging before importing of logger module (bug #984699). diff --git a/sources b/sources index d459ec2..e47b332 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6e8d53fb2284271505d2e1706c01f6c5 hplip-3.14.4.tar.gz +ec14b3bf3ac17a7c00b96e51d4c38114 hplip-3.14.6.tar.gz