rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

3.13.2

Browse Source
This commit is contained in:
Jiri Popelka 2013-02-14 14:02:14 +01:00
parent fbef66e280
commit ec9980e548
8 changed files with 101 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -51,3 +51,4 @@ hplip-3.10.6.tar.gz
/hplip-3.12.10.tar.gz /hplip-3.12.10.tar.gz
/hplip-3.12.10a.tar.gz /hplip-3.12.10a.tar.gz
/hplip-3.12.11.tar.gz /hplip-3.12.11.tar.gz
/hplip-3.13.2.tar.gz

7
hplip-3.12.11.tar.gz.asc
View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEABECAAYFAlCrVGsACgkQc9dwzaWQR7lb0ACg3RMaZRdPeALex3ClAostXvF8
McMAoO41OLwnkT7Mbl78GPh8kU/Y8Mfy
=9ARz
-----END PGP SIGNATURE-----

7
hplip-3.13.2.tar.gz.asc Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEABECAAYFAlEbwoYACgkQc9dwzaWQR7nTIwCffAuhel9NfIayr90JvCVE+KEa
vbQAn28hbxJ7KjNVKoulFuaqNbscfTJC
=0fDW
-----END PGP SIGNATURE-----

18
hplip-IEEE-1284-4.patch
View File

@ -1,7 +1,7 @@
diff -up hplip-3.12.11/io/hpmud/musb.c.hplip-IEEE-1284-4 hplip-3.12.11/io/hpmud/musb.c diff -up hplip-3.13.2/io/hpmud/musb.c.hplip-IEEE-1284-4 hplip-3.13.2/io/hpmud/musb.c
--- hplip-3.12.11/io/hpmud/musb.c.hplip-IEEE-1284-4 2012-11-20 10:55:09.000000000 +0100 --- hplip-3.13.2/io/hpmud/musb.c.hplip-IEEE-1284-4 2013-02-13 17:38:44.000000000 +0100
+++ hplip-3.12.11/io/hpmud/musb.c 2012-11-27 11:49:16.633107366 +0100 +++ hplip-3.13.2/io/hpmud/musb.c 2013-02-14 12:44:50.594152799 +0100
@@ -712,7 +712,8 @@ static libusb_device *get_libusb_device( @@ -713,7 +713,8 @@ static libusb_device *get_libusb_device(
{ {
if ((altptr->bInterfaceClass == LIBUSB_CLASS_PRINTER ) && /* Printer */ if ((altptr->bInterfaceClass == LIBUSB_CLASS_PRINTER ) && /* Printer */
(altptr->bInterfaceSubClass == 1) && (altptr->bInterfaceSubClass == 1) &&
@ -11,13 +11,3 @@ diff -up hplip-3.12.11/io/hpmud/musb.c.hplip-IEEE-1284-4 hplip-3.12.11/io/hpmud/
{ {
if (is_uri(dev, uri)) if (is_uri(dev, uri))
{ {
@@ -2065,7 +2066,8 @@ int __attribute__ ((visibility ("hidden"
{
if ((altptr->bInterfaceClass == LIBUSB_CLASS_PRINTER ) && /* Printer */
(altptr->bInterfaceSubClass == 1) &&
- (altptr->bInterfaceProtocol == 1 || altptr->bInterfaceProtocol == 2)) /* Unidirectional or Bidirectional*/
+ (altptr->bInterfaceProtocol == 1 || altptr->bInterfaceProtocol == 2
+ || altptr->bInterfaceProtocol == 3)) /* Unidirectional, Bidirectional or 1284.4 */
{
libusb_open(dev, &hd);
if (hd == NULL)

142
hplip-logdir.patch
View File

@ -1,6 +1,6 @@
diff -up hplip-3.12.11/fax/backend/hpfax.py.logdir hplip-3.12.11/fax/backend/hpfax.py diff -up hplip-3.13.2/fax/backend/hpfax.py.logdir hplip-3.13.2/fax/backend/hpfax.py
--- hplip-3.12.11/fax/backend/hpfax.py.logdir 2012-11-20 10:55:06.000000000 +0100 --- hplip-3.13.2/fax/backend/hpfax.py.logdir 2013-02-13 17:38:40.000000000 +0100
+++ hplip-3.12.11/fax/backend/hpfax.py 2012-11-27 10:09:25.298698254 +0100 +++ hplip-3.13.2/fax/backend/hpfax.py 2013-02-14 11:41:25.147140459 +0100
@@ -244,7 +244,7 @@ else: @@ -244,7 +244,7 @@ else:
input_fd = 0 input_fd = 0
@ -10,9 +10,9 @@ diff -up hplip-3.12.11/fax/backend/hpfax.py.logdir hplip-3.12.11/fax/backend/hpf
pipe_name = os.path.join(tmp_dir, "hpfax-pipe-%d" % job_id) pipe_name = os.path.join(tmp_dir, "hpfax-pipe-%d" % job_id)
diff -up hplip-3.12.11/logcapture.py.logdir hplip-3.12.11/logcapture.py diff -up hplip-3.13.2/logcapture.py.logdir hplip-3.13.2/logcapture.py
--- hplip-3.12.11/logcapture.py.logdir 2012-11-20 10:55:15.000000000 +0100 --- hplip-3.13.2/logcapture.py.logdir 2013-02-13 17:38:51.000000000 +0100
+++ hplip-3.12.11/logcapture.py 2012-11-27 10:09:25.298698254 +0100 +++ hplip-3.13.2/logcapture.py 2013-02-14 11:43:52.314127962 +0100
@@ -39,7 +39,7 @@ CUPS_BACKUP_FILE='/etc/cups/cupsd.conf_o @@ -39,7 +39,7 @@ CUPS_BACKUP_FILE='/etc/cups/cupsd.conf_o
LOG_FOLDER_PATH='./' LOG_FOLDER_PATH='./'
LOG_FOLDER_NAME='hplip_troubleshoot_logs' LOG_FOLDER_NAME='hplip_troubleshoot_logs'
@ -22,18 +22,18 @@ diff -up hplip-3.12.11/logcapture.py.logdir hplip-3.12.11/logcapture.py
############ enable_log() function ############ ############ enable_log() function ############
#This function changes CUPS conf log level to debug and restarts CUPS service. #This function changes CUPS conf log level to debug and restarts CUPS service.
@@ -268,7 +268,7 @@ if os.path.exists('/var/log/cups/error_l @@ -266,7 +266,7 @@ if os.path.exists('/var/log/cups/error_l
if sts != 0:
log.error("Failed to capture %s log file."%("/var/log/cups/error_log")) log.error("Failed to capture %s log file."%("/var/log/cups/error_log"))
-File_list, File_list_str = utils.expand_list('/var/log/hp/*.log') -File_list, File_list_str = utils.expand_list('/var/log/hp/*.log')
+File_list, File_list_str = utils.expand_list('%s/*.log'%TMP_DIR) +File_list, File_list_str = utils.expand_list('%s/*.log'%TMP_DIR)
if File_list: if File_list:
sts,out = utils.run('cp -f %s %s'%(File_list_str, LOG_FILES)) sts,out = utils.run('cp -f %s %s'%(File_list_str, LOG_FILES))
if sts != 0: if sts != 0:
diff -up hplip-3.12.11/prnt/filters/hplipjs.c.logdir hplip-3.12.11/prnt/filters/hplipjs.c diff -up hplip-3.13.2/prnt/filters/hplipjs.c.logdir hplip-3.13.2/prnt/filters/hplipjs.c
--- hplip-3.12.11/prnt/filters/hplipjs.c.logdir 2012-11-20 10:50:44.000000000 +0100 --- hplip-3.13.2/prnt/filters/hplipjs.c.logdir 2013-02-13 17:34:05.000000000 +0100
+++ hplip-3.12.11/prnt/filters/hplipjs.c 2012-11-27 10:09:25.299698225 +0100 +++ hplip-3.13.2/prnt/filters/hplipjs.c 2013-02-14 11:41:25.148140445 +0100
@@ -275,7 +275,8 @@ int main (int argc, char **argv) @@ -275,7 +275,8 @@ int main (int argc, char **argv)
{ {
fprintf (stderr, "DEBUG: HPLIPJS: argv[%d] = %s\n", i, argv[i]); fprintf (stderr, "DEBUG: HPLIPJS: argv[%d] = %s\n", i, argv[i]);
@ -44,10 +44,10 @@ diff -up hplip-3.12.11/prnt/filters/hplipjs.c.logdir hplip-3.12.11/prnt/filters/
HPFp = fopen (szPSFile, "w"); HPFp = fopen (szPSFile, "w");
#endif #endif
diff -up hplip-3.12.11/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.12.11/prnt/hpcups/HPCupsFilter.cpp diff -up hplip-3.13.2/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.13.2/prnt/hpcups/HPCupsFilter.cpp
--- hplip-3.12.11/prnt/hpcups/HPCupsFilter.cpp.logdir 2012-11-27 10:09:25.291698453 +0100 --- hplip-3.13.2/prnt/hpcups/HPCupsFilter.cpp.logdir 2013-02-14 11:41:25.139140568 +0100
+++ hplip-3.12.11/prnt/hpcups/HPCupsFilter.cpp 2012-11-27 10:13:34.958640524 +0100 +++ hplip-3.13.2/prnt/hpcups/HPCupsFilter.cpp 2013-02-14 11:48:14.507501338 +0100
@@ -31,16 +31,24 @@ @@ -31,7 +31,9 @@
\*****************************************************************************/ \*****************************************************************************/
#include "HPCupsFilter.h" #include "HPCupsFilter.h"
@ -57,6 +57,7 @@ diff -up hplip-3.12.11/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.12.11/prnt/hp
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/utsname.h> #include <sys/utsname.h>
#include <time.h> #include <time.h>
@@ -39,9 +41,15 @@
#define HP_FILE_VERSION_STR "03.09.08.0" #define HP_FILE_VERSION_STR "03.09.08.0"
@ -67,12 +68,12 @@ diff -up hplip-3.12.11/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.12.11/prnt/hp
{ {
+ env_tmpdir = getenv ("TMPDIR"); + env_tmpdir = getenv ("TMPDIR");
+ if (!env_tmpdir) + if (!env_tmpdir)
+ env_tmpdir = "/var/log/hp/tmp"; + env_tmpdir = "/var/log/hp/tmp";
+ +
openlog("hpcups", LOG_PID, LOG_DAEMON); openlog("hpcups", LOG_PID, LOG_DAEMON);
if (argc < 6 || argc > 7) { if (argc < 6 || argc > 7) {
@@ -583,9 +591,10 @@ int HPCupsFilter::processRasterData(cups @@ -585,9 +593,10 @@ int HPCupsFilter::processRasterData(cups
DRIVER_ERROR err; DRIVER_ERROR err;
int ret_status = 0; int ret_status = 0;
@ -85,7 +86,7 @@ diff -up hplip-3.12.11/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.12.11/prnt/hp
while (cupsRasterReadHeader2(cups_raster, &cups_header)) while (cupsRasterReadHeader2(cups_raster, &cups_header))
@@ -647,13 +656,13 @@ int HPCupsFilter::processRasterData(cups @@ -649,14 +658,14 @@ int HPCupsFilter::processRasterData(cups
if (m_iLogLevel & SAVE_INPUT_RASTERS) if (m_iLogLevel & SAVE_INPUT_RASTERS)
{ {
@ -96,23 +97,24 @@ diff -up hplip-3.12.11/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.12.11/prnt/hp
if (cups_header.cupsColorSpace == CUPS_CSPACE_RGBW || if (cups_header.cupsColorSpace == CUPS_CSPACE_RGBW ||
cups_header.cupsColorSpace == CUPS_CSPACE_RGB) cups_header.cupsColorSpace == CUPS_CSPACE_RGB)
{ {
- snprintf (szFileName, sizeof(szFileName), "/var/log/hp/tmp/hpcupsfilterc_%d.bmp", current_page_number);
+ snprintf (szFileName, sizeof(szFileName), "%s/hpcupsfilterc_%d.bmp", env_tmpdir, current_page_number); - snprintf (szFileName, sizeof(szFileName), "/var/log/hp/tmp/hpcupsfilterc_bmp_%d_XXXXXX", current_page_number);
cfp = fopen (szFileName, "w"); + snprintf (szFileName, sizeof(szFileName), "%s/hpcupsfilterc_bmp_%d_XXXXXX", env_tmpdir, current_page_number);
chmod (szFileName, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); createTempFile(szFileName, &cfp);
} if (cfp)
@@ -661,7 +670,7 @@ int HPCupsFilter::processRasterData(cups {
@@ -667,7 +676,7 @@ int HPCupsFilter::processRasterData(cups
if (cups_header.cupsColorSpace == CUPS_CSPACE_RGBW || if (cups_header.cupsColorSpace == CUPS_CSPACE_RGBW ||
cups_header.cupsColorSpace == CUPS_CSPACE_K) cups_header.cupsColorSpace == CUPS_CSPACE_K)
{ {
- snprintf (szFileName, sizeof(szFileName), "/var/log/hp/tmp/hpcupsfilterk_%d.bmp", current_page_number); - snprintf (szFileName, sizeof(szFileName), "/var/log/hp/tmp/hpcupsfilterk_bmp_%d_XXXXXX", current_page_number);
+ snprintf (szFileName, sizeof(szFileName), "%s/hpcupsfilterk_%d.bmp", env_tmpdir, current_page_number); + snprintf (szFileName, sizeof(szFileName), "%s/hpcupsfilterk_bmp_%d_XXXXXX", env_tmpdir, current_page_number);
kfp = fopen (szFileName, "w"); createTempFile(szFileName, &kfp);
chmod (szFileName, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); if (kfp)
} {
diff -up hplip-3.12.11/prnt/hpcups/LJZjStream.cpp.logdir hplip-3.12.11/prnt/hpcups/LJZjStream.cpp diff -up hplip-3.13.2/prnt/hpcups/LJZjStream.cpp.logdir hplip-3.13.2/prnt/hpcups/LJZjStream.cpp
--- hplip-3.12.11/prnt/hpcups/LJZjStream.cpp.logdir 2012-11-20 10:49:20.000000000 +0100 --- hplip-3.13.2/prnt/hpcups/LJZjStream.cpp.logdir 2013-02-13 17:32:39.000000000 +0100
+++ hplip-3.12.11/prnt/hpcups/LJZjStream.cpp 2012-11-27 10:16:24.878547224 +0100 +++ hplip-3.13.2/prnt/hpcups/LJZjStream.cpp 2013-02-14 11:41:25.149140432 +0100
@@ -42,9 +42,12 @@ @@ -42,9 +42,12 @@
#include "LJZjStream.h" #include "LJZjStream.h"
#include "Utils.h" #include "Utils.h"
@ -141,13 +143,13 @@ diff -up hplip-3.12.11/prnt/hpcups/LJZjStream.cpp.logdir hplip-3.12.11/prnt/hpcu
if (1 != m_pJA->pre_process_raster || !firstpage_cups_header->Duplex){ if (1 != m_pJA->pre_process_raster || !firstpage_cups_header->Duplex){
return NO_ERROR; return NO_ERROR;
diff -up hplip-3.12.11/prnt/hpcups/SystemServices.cpp.logdir hplip-3.12.11/prnt/hpcups/SystemServices.cpp diff -up hplip-3.13.2/prnt/hpcups/SystemServices.cpp.logdir hplip-3.13.2/prnt/hpcups/SystemServices.cpp
--- hplip-3.12.11/prnt/hpcups/SystemServices.cpp.logdir 2012-11-20 10:49:20.000000000 +0100 --- hplip-3.13.2/prnt/hpcups/SystemServices.cpp.logdir 2013-02-13 17:32:39.000000000 +0100
+++ hplip-3.12.11/prnt/hpcups/SystemServices.cpp 2012-11-27 10:09:25.300698197 +0100 +++ hplip-3.13.2/prnt/hpcups/SystemServices.cpp 2013-02-14 11:50:22.597720115 +0100
@@ -30,14 +30,17 @@ @@ -31,14 +31,17 @@
#include "CommonDefinitions.h" #include "CommonDefinitions.h"
#include "SystemServices.h" #include "SystemServices.h"
#include "utils.h"
+#include <limits.h> +#include <limits.h>
+ +
+extern char *env_tmpdir; +extern char *env_tmpdir;
@ -158,15 +160,15 @@ diff -up hplip-3.12.11/prnt/hpcups/SystemServices.cpp.logdir hplip-3.12.11/prnt/
if (iLogLevel & SAVE_PCL_FILE) if (iLogLevel & SAVE_PCL_FILE)
{ {
- char fname[64]; - char fname[64];
- sprintf(fname, "%s/hpcups_job%d.out", "/var/log/hp/tmp",job_id); - sprintf(fname, "%s/hpcups_out_job%d_XXXXXX", "/var/log/hp/tmp",job_id);
+ char fname[PATH_MAX]; + char fname[PATH_MAX];
+ sprintf(fname, "%s/hpcups_job%d.out", env_tmpdir, job_id); + sprintf(fname, "%s/hpcups_out_job%d_XXXXXX", env_tmpdir, job_id);
m_fp = fopen(fname, "w");
chmod(fname, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); createTempFile(fname, &m_fp);
} if (m_fp)
diff -up hplip-3.12.11/prnt/hpijs/hpcupsfax.cpp.logdir hplip-3.12.11/prnt/hpijs/hpcupsfax.cpp diff -up hplip-3.13.2/prnt/hpijs/hpcupsfax.cpp.logdir hplip-3.13.2/prnt/hpijs/hpcupsfax.cpp
--- hplip-3.12.11/prnt/hpijs/hpcupsfax.cpp.logdir 2012-11-20 10:50:48.000000000 +0100 --- hplip-3.13.2/prnt/hpijs/hpcupsfax.cpp.logdir 2013-02-13 17:34:10.000000000 +0100
+++ hplip-3.12.11/prnt/hpijs/hpcupsfax.cpp 2012-11-27 10:09:25.300698197 +0100 +++ hplip-3.13.2/prnt/hpijs/hpcupsfax.cpp 2013-02-14 11:52:05.090292573 +0100
@@ -29,6 +29,7 @@ @@ -29,6 +29,7 @@
POSSIBILITY OF SUCH DAMAGE. POSSIBILITY OF SUCH DAMAGE.
\*****************************************************************************/ \*****************************************************************************/
@ -175,7 +177,7 @@ diff -up hplip-3.12.11/prnt/hpijs/hpcupsfax.cpp.logdir hplip-3.12.11/prnt/hpijs/
#include <sys/stat.h> #include <sys/stat.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -66,6 +67,7 @@ uint16_t (*convert_endian_s)(uint16_t); @@ -67,6 +68,7 @@ uint16_t (*convert_endian_s)(uint16_t);
static int iLogLevel = 1; static int iLogLevel = 1;
char hpFileName[64] ; char hpFileName[64] ;
@ -183,19 +185,20 @@ diff -up hplip-3.12.11/prnt/hpijs/hpcupsfax.cpp.logdir hplip-3.12.11/prnt/hpijs/
#define TIFF_HDR_SIZE 8 #define TIFF_HDR_SIZE 8
#define LITTLE_ENDIAN_MODE I #define LITTLE_ENDIAN_MODE I
@@ -439,9 +441,9 @@ int ProcessTiffData(int fromFD, int toFD @@ -440,10 +442,10 @@ int ProcessTiffData(int fromFD, int toFD
int bytes_written = 0; int bytes_written = 0;
int ret_status = 0; int ret_status = 0;
int bytes_read = 0; int bytes_read = 0;
- char hpTiffFileName[64]; - char hpTiffFileName[64];
+ char hpTiffFileName[PATH_MAX]; + char hpTiffFileName[PATH_MAX];
long input_file_size = 0; long input_file_size = 0;
FILE* pFilePtrFax;
- snprintf(hpTiffFileName,sizeof(hpTiffFileName), "%s/hpliptiffXXXXXX","/var/log/hp/tmp"); - snprintf(hpTiffFileName,sizeof(hpTiffFileName), "%s/hpliptiffXXXXXX","/var/log/hp/tmp");
+ snprintf(hpTiffFileName,sizeof(hpTiffFileName), "%s/hpliptiffXXXXXX",env_tmpdir); + snprintf(hpTiffFileName,sizeof(hpTiffFileName), "%s/hpliptiffXXXXXX",env_tmpdir);
fdTiff = mkstemp (hpTiffFileName); // fdTiff = mkstemp (hpTiffFileName);
@@ -656,6 +658,10 @@ int main (int argc, char **argv) @@ -653,6 +655,10 @@ int main (int argc, char **argv)
/*********** PROLOGUE ***********/ /*********** PROLOGUE ***********/
@ -206,18 +209,18 @@ diff -up hplip-3.12.11/prnt/hpijs/hpcupsfax.cpp.logdir hplip-3.12.11/prnt/hpijs/
GetLogLevel(); GetLogLevel();
openlog("hpcupsfax", LOG_PID, LOG_DAEMON); openlog("hpcupsfax", LOG_PID, LOG_DAEMON);
@@ -679,7 +685,7 @@ int main (int argc, char **argv) @@ -676,7 +682,7 @@ int main (int argc, char **argv)
i++; i++;
} }
- snprintf(hpFileName,sizeof(hpFileName),"%s/hplipfaxLog_XXXXXX","/var/log/hp/tmp"); - snprintf(hpFileName,sizeof(hpFileName),"%s/hplipfaxLog_XXXXXX","/var/log/hp/tmp");
+ snprintf(hpFileName,sizeof(hpFileName),"%s/hplipfaxLog_XXXXXX",env_tmpdir); + snprintf(hpFileName,sizeof(hpFileName),"%s/hplipfaxLog_XXXXXX",env_tmpdir);
fdFax = mkstemp (hpFileName); // fdFax = mkstemp (hpFileName);
if (fdFax < 0) fdFax = createTempFile(hpFileName, &pFilePtrFax);
diff -up hplip-3.12.11/prnt/hpijs/hpijs.cpp.logdir hplip-3.12.11/prnt/hpijs/hpijs.cpp diff -up hplip-3.13.2/prnt/hpijs/hpijs.cpp.logdir hplip-3.13.2/prnt/hpijs/hpijs.cpp
--- hplip-3.12.11/prnt/hpijs/hpijs.cpp.logdir 2012-11-27 10:09:25.288698537 +0100 --- hplip-3.13.2/prnt/hpijs/hpijs.cpp.logdir 2013-02-14 11:41:25.136140608 +0100
+++ hplip-3.12.11/prnt/hpijs/hpijs.cpp 2012-11-27 10:09:25.301698169 +0100 +++ hplip-3.13.2/prnt/hpijs/hpijs.cpp 2013-02-14 11:53:57.972718824 +0100
@@ -29,6 +29,7 @@ @@ -29,6 +29,7 @@
POSSIBILITY OF SUCH DAMAGE. POSSIBILITY OF SUCH DAMAGE.
\*****************************************************************************/ \*****************************************************************************/
@ -226,27 +229,28 @@ diff -up hplip-3.12.11/prnt/hpijs/hpijs.cpp.logdir hplip-3.12.11/prnt/hpijs/hpij
#include <sys/stat.h> #include <sys/stat.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -43,6 +44,8 @@ @@ -44,6 +45,8 @@
#include "hpijs.h"
#include "services.h" #include "services.h"
#include "utils.h"
+static char *env_tmpdir; +static char *env_tmpdir;
+ +
extern void SendDbusMessage (const char *dev, const char *printer, int code, extern void SendDbusMessage (const char *dev, const char *printer, int code,
const char *username, const int jobid, const char *title); const char *username, const int jobid, const char *title);
@@ -96,8 +99,8 @@ void setLogLevel(UXServices *pSS) @@ -97,8 +100,9 @@ void setLogLevel(UXServices *pSS)
if (pSS->m_iLogLevel & SAVE_PCL_FILE) if (pSS->m_iLogLevel & SAVE_PCL_FILE)
{ {
- char szFileName[64]; - char szFileName[64];
- snprintf (szFileName,sizeof(szFileName), "/var/log/hp/tmp/hpijs_%d.out", getpid()); - snprintf (szFileName,sizeof(szFileName), "/var/log/hp/tmp/hpijs_%d_XXXXXX", getpid());
+ char szFileName[PATH_MAX]; + char szFileName[PATH_MAX];
+ snprintf (szFileName,sizeof(szFileName), "%s/hpijs_%d.out", env_tmpdir, getpid()); + snprintf (szFileName,sizeof(szFileName), "%s/hpijs_%d_XXXXXX", env_tmpdir, getpid());
+
createTempFile(szFileName, &pSS->outfp);
pSS->outfp = fopen (szFileName, "w"); // pSS->outfp = fopen (szFileName, "w");
if (pSS->outfp) @@ -590,6 +594,10 @@ int main (int argc, char *argv[], char *
@@ -588,6 +591,10 @@ int main (int argc, char *argv[], char *
int ret, n, i, kn=0, width, k_width; int ret, n, i, kn=0, width, k_width;
int low_marker = 0; int low_marker = 0;
@ -257,7 +261,7 @@ diff -up hplip-3.12.11/prnt/hpijs/hpijs.cpp.logdir hplip-3.12.11/prnt/hpijs/hpij
openlog("hpijs", LOG_PID, LOG_DAEMON); openlog("hpijs", LOG_PID, LOG_DAEMON);
if (argc > 1) if (argc > 1)
@@ -627,8 +634,8 @@ int main (int argc, char *argv[], char * @@ -629,8 +637,8 @@ int main (int argc, char *argv[], char *
setLogLevel(pSS); setLogLevel(pSS);
#ifdef CAPTURE #ifdef CAPTURE
@ -268,9 +272,9 @@ diff -up hplip-3.12.11/prnt/hpijs/hpijs.cpp.logdir hplip-3.12.11/prnt/hpijs/hpij
if ((pSS->InitScript(szCapOutFile, TRUE)) != NO_ERROR) if ((pSS->InitScript(szCapOutFile, TRUE)) != NO_ERROR)
BUG("unable to init capture"); BUG("unable to init capture");
#endif #endif
diff -up hplip-3.12.11/prnt/hpijs/hpijsfax.cpp.logdir hplip-3.12.11/prnt/hpijs/hpijsfax.cpp diff -up hplip-3.13.2/prnt/hpijs/hpijsfax.cpp.logdir hplip-3.13.2/prnt/hpijs/hpijsfax.cpp
--- hplip-3.12.11/prnt/hpijs/hpijsfax.cpp.logdir 2012-11-20 10:50:48.000000000 +0100 --- hplip-3.13.2/prnt/hpijs/hpijsfax.cpp.logdir 2013-02-13 17:34:10.000000000 +0100
+++ hplip-3.12.11/prnt/hpijs/hpijsfax.cpp 2012-11-27 10:09:25.301698169 +0100 +++ hplip-3.13.2/prnt/hpijs/hpijsfax.cpp 2013-02-14 12:38:58.222064812 +0100
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
#ifdef HAVE_LIBHPIP #ifdef HAVE_LIBHPIP
@ -279,9 +283,9 @@ diff -up hplip-3.12.11/prnt/hpijs/hpijsfax.cpp.logdir hplip-3.12.11/prnt/hpijs/h
#include <sys/stat.h> #include <sys/stat.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -270,14 +271,15 @@ int hpijsFaxServer (int argc, char **arg @@ -272,14 +273,15 @@ int hpijsFaxServer (int argc, char **arg
IP_IMAGE_TRAITS traits;
IP_HANDLE hJob; IP_HANDLE hJob;
FILE *pFilePtrFax;
- char hpFileName[64]; - char hpFileName[64];
+ char hpFileName[PATH_MAX]; + char hpFileName[PATH_MAX];

16
hplip-makefile-chgrp.patch
View File

@ -1,26 +1,26 @@
diff -up hplip-3.12.11/Makefile.in.chgrp hplip-3.12.11/Makefile.in diff -up hplip-3.13.2/Makefile.in.chgrp hplip-3.13.2/Makefile.in
--- hplip-3.12.11/Makefile.in.chgrp 2012-11-27 11:40:02.000000000 +0100 --- hplip-3.13.2/Makefile.in.chgrp 2013-02-14 12:40:50.000000000 +0100
+++ hplip-3.12.11/Makefile.in 2012-11-27 11:43:13.857379531 +0100 +++ hplip-3.13.2/Makefile.in 2013-02-14 12:43:46.844042178 +0100
@@ -8866,18 +8866,18 @@ uninstall-am: uninstall-binPROGRAMS unin @@ -8952,18 +8952,18 @@ uninstall-am: uninstall-binPROGRAMS unin
install-dist_hplip_LogDATA: install-dist_hplip_LogDATA:
@FULL_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir) @FULL_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
-@FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) -@FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
+#@FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) +#@FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
@FULL_BUILD_TRUE@ chmod 777 $(DESTDIR)$(hplip_Logdir) @FULL_BUILD_TRUE@ chmod 775 $(DESTDIR)$(hplip_Logdir)
@HPLIP_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir) @HPLIP_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
-@HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) -@HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
+#@HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) +#@HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
@HPLIP_BUILD_TRUE@ chmod 777 $(DESTDIR)$(hplip_Logdir) @HPLIP_BUILD_TRUE@ chmod 775 $(DESTDIR)$(hplip_Logdir)
install-dist_hplip_tmpDATA: install-dist_hplip_tmpDATA:
@FULL_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir) @FULL_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
-@FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) -@FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
+#@FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) +#@FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
@FULL_BUILD_TRUE@ chmod 1777 $(DESTDIR)$(hplip_tmpdir) @FULL_BUILD_TRUE@ chmod 1775 $(DESTDIR)$(hplip_tmpdir)
@HPLIP_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir) @HPLIP_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
-@HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) -@HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
+#@HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) +#@HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
@HPLIP_BUILD_TRUE@ chmod 1777 $(DESTDIR)$(hplip_tmpdir) @HPLIP_BUILD_TRUE@ chmod 1775 $(DESTDIR)$(hplip_tmpdir)
install-dist_cronDATA:$(dist_cron_DATA) install-dist_cronDATA:$(dist_cron_DATA)

10
hplip.spec
View File

@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project Summary: HP Linux Imaging and Printing Project
Name: hplip Name: hplip
Version: 3.12.11 Version: 3.13.2
Release: 2%{?dist} Release: 1%{?dist}
License: GPLv2+ and MIT License: GPLv2+ and MIT
Group: System Environment/Daemons Group: System Environment/Daemons
@ -378,12 +378,12 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%files %files
%doc COPYING doc/* %doc COPYING doc/*
%{_bindir}/hp-align %{_bindir}/hp-align
%{_bindir}/hp-check-plugin
%{_bindir}/hp-clean %{_bindir}/hp-clean
%{_bindir}/hp-colorcal %{_bindir}/hp-colorcal
%{_bindir}/hp-devicesettings %{_bindir}/hp-devicesettings
%{_bindir}/hp-diagnose_plugin %{_bindir}/hp-diagnose_plugin
%{_bindir}/hp-diagnose_queues %{_bindir}/hp-diagnose_queues
%{_bindir}/hp-doctor
%{_bindir}/hp-fab %{_bindir}/hp-fab
%{_bindir}/hp-faxsetup %{_bindir}/hp-faxsetup
%{_bindir}/hp-firmware %{_bindir}/hp-firmware
@ -419,6 +419,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%{_datadir}/hplip/devicesettings.py* %{_datadir}/hplip/devicesettings.py*
%{_datadir}/hplip/diagnose_plugin.py* %{_datadir}/hplip/diagnose_plugin.py*
%{_datadir}/hplip/diagnose_queues.py* %{_datadir}/hplip/diagnose_queues.py*
%{_datadir}/hplip/doctor.py*
%{_datadir}/hplip/fab.py* %{_datadir}/hplip/fab.py*
%{_datadir}/hplip/fax %{_datadir}/hplip/fax
%{_datadir}/hplip/faxsetup.py* %{_datadir}/hplip/faxsetup.py*
@ -519,6 +520,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%postun libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig
%changelog %changelog
* Thu Feb 14 2013 Jiri Popelka <jpopelka@redhat.com> - 3.13.2-1
- 3.13.2
* Wed Jan 16 2013 Jiri Popelka <jpopelka@redhat.com> 3.12.11-2 * Wed Jan 16 2013 Jiri Popelka <jpopelka@redhat.com> 3.12.11-2
- hpijs no longer requires net-snmp (bug #376641, bug #895643). - hpijs no longer requires net-snmp (bug #376641, bug #895643).

2
sources
View File

@ -1 +1 @@
6caadc4a9e49076c284b146e2dce2937 hplip-3.12.11.tar.gz cd7edef6b2df2cdb468b145cd2127e1b hplip-3.13.2.tar.gz