update/fix patches and install

The package compiles and installs fine now.

6 files changed, 35 insertions, 510 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ceb2c9414681..e7f8030d189d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,8 +17,8 @@ pkgbase = cnijfilter-mx920
 	source = buildfiles.patch
 	source = mychanges.patch
 	sha512sums = 9ec303dc7209f5534a20e533fc18ec810603f4515655ce67f28f0f35d521185181351fd866d2191939eb02c783b168f637e18888a4e6a1eacc9e93b1b656ebcb
-	sha512sums = af0de981c5610f4001b5ab4d6fb042f48879995c1e1434fa3819e02d2030ceaf35b183f8cbab530435af6d452bb88c23e522c51d20e9cb5c81a7ff6a4c2df915
-	sha512sums = 9b1081c964c7894eefa8b4d11b04c7eafda208f629a373a09999fe8fe8f5ce85f6a697bb14e20a3b3ce795d578d46fde5a431b3f29eb4f0ee70e67477bf6f4c2
+	sha512sums = b46027090fc03f1b6503b4532881dfb49bf69eff342d4eedca6ed8e39f896de0ff8f8c5ae3dc8e9b5645a3dd1029390668a48737ce01d58d1b01b899fad56b4c
+	sha512sums = d827f8725e899cbeeae883141c55c3c1429797ceb3eaa2d11a1ab6602b4221e120f92fdee7d3ffc08cf99692332b73cb9e1da6b8d5631df3a8071dffbfde799e
 	sha512sums = 1cf54862db74f928a3a1ad0316b9940b843dbc4cae95bbb3d93ab317d248788cf844103bc006b4670c27b0f13952301b5907476a6c7d13ebb0cb5c0a942d6182
 	depends_i686 = gtk2
 	depends_i686 = libxml2
diff --git a/PKGBUILD b/PKGBUILD
index 069ff9e53cd7..f84c95063660 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -31,8 +31,8 @@ source=("http://gdlp01.c-wss.com/gds/1/0100005171/01/cnijfilter-source-3.90-1.ta
 	"buildfiles.patch"
 	"mychanges.patch")
 sha512sums=('9ec303dc7209f5534a20e533fc18ec810603f4515655ce67f28f0f35d521185181351fd866d2191939eb02c783b168f637e18888a4e6a1eacc9e93b1b656ebcb'
-            'af0de981c5610f4001b5ab4d6fb042f48879995c1e1434fa3819e02d2030ceaf35b183f8cbab530435af6d452bb88c23e522c51d20e9cb5c81a7ff6a4c2df915'
-            '9b1081c964c7894eefa8b4d11b04c7eafda208f629a373a09999fe8fe8f5ce85f6a697bb14e20a3b3ce795d578d46fde5a431b3f29eb4f0ee70e67477bf6f4c2'
+            'b46027090fc03f1b6503b4532881dfb49bf69eff342d4eedca6ed8e39f896de0ff8f8c5ae3dc8e9b5645a3dd1029390668a48737ce01d58d1b01b899fad56b4c'
+            'd827f8725e899cbeeae883141c55c3c1429797ceb3eaa2d11a1ab6602b4221e120f92fdee7d3ffc08cf99692332b73cb9e1da6b8d5631df3a8071dffbfde799e'
             '1cf54862db74f928a3a1ad0316b9940b843dbc4cae95bbb3d93ab317d248788cf844103bc006b4670c27b0f13952301b5907476a6c7d13ebb0cb5c0a942d6182')
 
 prepare() {
@@ -48,6 +48,7 @@ prepare() {
 build() {
   cd ${srcdir}/${_pkgname}-source-${pkgver}-${_pkgreview}
 
+  # TODO: it looks like the libaries can also be built for 64 bit natively
   export CC="gcc -m32"
   make mx920
 }
@@ -57,8 +58,8 @@ package() {
   make PACKAGEDIR=${pkgdir} installmx920
 
   install -d ${pkgdir}/usr/lib32/bjlib
-  install -m 644 359/database/* ${pkgdir}/usr/lib32/bjlib/
-  install -s -m 755 359/libs_bin/*.so.* ${pkgdir}/usr/lib32/
+  install -m 644 417/database/* ${pkgdir}/usr/lib32/bjlib/
+  install -s -m 755 417/libs_bin32/*.so.* ${pkgdir}/usr/lib32/
 
   install -D LICENSE-cnijfilter-${pkgver}EN.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-cnijfilter-${pkgver}EN.txt
 }
diff --git a/buildfiles.patch b/buildfiles.patch
index 6cd4846f7f73..6be4adbdb0f2 100644
--- a/buildfiles.patch
+++ b/buildfiles.patch
@@ -1,40 +1,32 @@
-diff -ruN cnijfilter-source-4.00-1.orig/lgmon2/src/Makefile.am cnijfilter-source-4.00-1/lgmon2/src/Makefile.am
---- cnijfilter-source-4.00-1.orig/lgmon2/src/Makefile.am	2013-07-17 06:03:45.000000000 +0430
-+++ cnijfilter-source-4.00-1/lgmon2/src/Makefile.am	2015-08-04 12:35:12.115634249 +0430
-@@ -9,3 +9,4 @@
- CFLAGS = -O2 -Wall -I/usr/include/libusb-1.0 -I./common @XML2_CFLAGS@
- 
- cnijlgmon2_LDADD = -ldl -lusb-1.0 -lcnnet -lxml2
-+cnijlgmon2_LDFLAGS = -L../../com/libs_bin32
-diff -ruN cnijfilter-source-4.00-1.orig/Makefile cnijfilter-source-4.00-1/Makefile
---- cnijfilter-source-4.00-1.orig/Makefile	2013-07-17 06:03:45.000000000 +0430
-+++ cnijfilter-source-4.00-1/Makefile	2015-08-04 13:02:47.675636146 +0430
+diff -aur cnijfilter-source-3.20-1/Makefile cnijfilter-source-3.20-1.new/Makefile
+--- cnijfilter-source-3.20-1/Makefile	2009-04-06 14:19:22.000000000 +0430
++++ cnijfilter-source-3.20-1.new/Makefile	2015-06-24 18:40:20.695615264 +0430
 @@ -14,3 +14,12 @@
  install :
  	target=install; $(scripts)
  
-+common :
-+	for dir in "libs" "bscc2sts" "cnijnpr" "cngpij" "cngpijmnt" "pstocanonij" "backend" "backendnet" "cmdtocanonij" "cnijbe" "lgmon2"; do \
-+	  (cd $$dir; ./autogen.sh --prefix=/usr --enable-libpath=/usr/lib32/bjlib --enable-progpath=/usr/bin --libdir=/usr/lib32; make) || exit 1; \
++mx920 :
++	for dir in "lgmon" "ppd" "cnijfilter" "maintenance" "cngpijmon"; do \
++	  (cd $$dir; ./autogen.sh --prefix=/usr --program-suffix=mx920 --enable-progpath=/usr/bin --libdir=/usr/lib32; make) || exit 1; \
 +	done
 +
-+installcommon :
-+	for dir in "libs" "bscc2sts" "cnijnpr" "cngpij" "cngpijmnt" "pstocanonij" "backend" "backendnet" "cmdtocanonij" "cnijbe" "lgmon2"; do \
++installmx920 :
++	for dir in "ppd" "cnijfilter" "maintenance" "lgmon" "cngpijmon"; do \
 +	  (cd $$dir; make install DESTDIR=${PACKAGEDIR}) || exit 1; \
 +	done
-diff -ruN cnijfilter-source-4.00-1.orig/backendnet/configure.in cnijfilter-source-4.00-1/backendnet/configure.in
---- cnijfilter-source-4.00-1.orig/backendnet/configure.in	2013-07-17 06:03:45.000000000 +0430
-+++ cnijfilter-source-4.00-1/backendnet/configure.in	2015-08-04 16:54:42.385652052 +0430
-@@ -19,7 +19,8 @@
- AC_DEFINE_UNQUOTED(BJLIB_PATH, "$enable_libpath")
- AC_SUBST(BJLIB_PATH)
+diff -ruN cnijfilter-source-4.00-1.orig/lgmon/configure.in cnijfilter-source-4.00-1/backendnet/configure.in
+--- cnijfilter-source-4.00-1.orig/lgmon/configure.in	2013-07-17 06:03:45.000000000 +0430
++++ cnijfilter-source-4.00-1/lgmon/configure.in	2015-08-04 16:54:42.385652052 +0430
+@@ -43,7 +43,8 @@
+ esac
+ AC_SUBST(CNCL_LIB_ID)
  
 -ARC=`getconf LONG_BIT`
 +#ARC=`getconf LONG_BIT`
 +ARC=32
  AC_SUBST(ARC)
  
- # Checks for programs.
+ AC_PROG_CC
 diff -ruN cnijfilter-source-4.00-1.orig/cnijfilter/configure.in cnijfilter-source-4.00-1/cnijfilter/configure.in
 --- cnijfilter-source-4.00-1.orig/cnijfilter/configure.in	2013-07-17 06:03:45.000000000 +0430
 +++ cnijfilter-source-4.00-1/cnijfilter/configure.in	2015-08-04 16:55:56.955652143 +0430
@@ -48,16 +40,16 @@ diff -ruN cnijfilter-source-4.00-1.orig/cnijfilter/configure.in cnijfilter-sourc
  AC_SUBST(ARC)
  
  AC_PROG_CC
-diff -ruN cnijfilter-source-4.00-1.orig/cnijnpr/configure.in cnijfilter-source-4.00-1/cnijnpr/configure.in
---- cnijfilter-source-4.00-1.orig/cnijnpr/configure.in	2013-07-17 06:03:45.000000000 +0430
-+++ cnijfilter-source-4.00-1/cnijnpr/configure.in	2015-08-04 16:56:07.878985490 +0430
-@@ -37,7 +37,8 @@
- 
- CFLAGS="-O2"
+diff -ruN cnijfilter-source-4.00-1.orig/maintenance/configure.in cnijfilter-source-4.00-1/backendnet/configure.in
+--- cnijfilter-source-4.00-1.orig/maintenance/configure.in	2013-07-17 06:03:45.000000000 +0430
++++ cnijfilter-source-4.00-1/maintenance/configure.in	2015-08-04 16:54:42.385652052 +0430
+@@ -19,7 +19,8 @@
+ XML2_CFLAGS=`xml2-config --cflags`
+ AC_SUBST(XML2_CFLAGS)
  
 -ARC=`getconf LONG_BIT`
 +#ARC=`getconf LONG_BIT`
 +ARC=32
  AC_SUBST(ARC)
  
- AC_OUTPUT(Makefile
+ AC_OUTPUT([
diff --git a/cnijfilter-mx920.install b/cnijfilter-mx920.install
index 52a4b11d9a0e..180e3814b775 100644
--- a/cnijfilter-mx920.install
+++ b/cnijfilter-mx920.install
@@ -13,7 +13,7 @@ post_remove() {
 	if [ -x /sbin/ldconfig ]; then
 	  /sbin/ldconfig /usr/lib32
 	fi
-	MODELNUM=359
+	MODELNUM=417
 	for LIBS in "libcnbpcmcm" "libcnbpcnclapi" "libcnbpcnclbjcmd" "libcnbpcnclui" "libcnbpess" "libcnbpo"; do
 	  if [ -h /usr/lib32/${LIBS}${MODELNUM}.so ]; then
 	    rm -f /usr/lib32/${LIBS}${MODELNUM}.so
diff --git a/cups.patch b/cups.patch
index e47a2003df16..1480fc00e0f6 100644
--- a/cups.patch
+++ b/cups.patch
@@ -23,13 +23,13 @@ diff -Nur cnijfilter-source-3.20-1.orig/cngpij/cngpij/bjcups.c cnijfilter-source
 diff -Nur cnijfilter-source-3.20-1.orig/cngpijmon/src/bjcupsmon_cups.c cnijfilter-source-3.20-1/cngpijmon/src/bjcupsmon_cups.c
 --- cnijfilter-source-3.20-1.orig/cngpijmon/src/bjcupsmon_cups.c	2009-04-24 08:12:49.000000000 +0200
 +++ cnijfilter-source-3.20-1/cngpijmon/src/bjcupsmon_cups.c	2012-08-15 15:28:54.618141976 +0200
-@@ -18,7 +18,9 @@
+@@ -18,8 +18,9 @@
   */
  
  /*** Includes ***/
 +#define _IPP_PRIVATE_STRUCTURES 1
  #include <cups/cups.h>
-+#include <cups/ppd.h>
+ #include <cups/ppd.h>
  #include <cups/language.h>
  #include <sys/types.h>
  #include <unistd.h>
diff --git a/mychanges.patch b/mychanges.patch
index 5c2787a5e8d4..aff96396724c 100644
--- a/mychanges.patch
+++ b/mychanges.patch
@@ -1,104 +1,6 @@
-diff -aur cnijfilter-source-3.20-1/backend/src/cnij_usb.c cnijfilter-source-3.20-1.new/backend/src/cnij_usb.c
---- cnijfilter-source-3.20-1/backend/src/cnij_usb.c	2009-04-30 11:10:20.000000000 +0430
-+++ cnijfilter-source-3.20-1.new/backend/src/cnij_usb.c	2013-07-26 00:12:36.279988102 +0430
-@@ -91,15 +91,15 @@
- main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
-      char *argv[])	/* I - Command-line arguments */
- {
--	char	method[255],			/* Method in URI 				   	*/
--			hostname[1024],			/* Hostname 						*/
--			username[255],			/* Username info (not used) 		*/
--			resource[1024],			/* Resource info (device and options) */
--			*options;				/* Pointer to options 				*/
--	int		port;					/* Port number (not used) 			*/
--	FILE	*fp;					/* Print file 						*/
--	int		copies;					/* Number of copies to print 		*/
--	int		fd;						/* USB device 						*/
-+//	char	method[255];			/* Method in URI 			*/
-+//	char	hostname[1024];			/* Hostname 				*/
-+//	char	username[255];			/* Username info (not used) 		*/
-+	char	resource[1024];			/* Resource info (device and options) 	*/
-+	char	*options;			/* Pointer to options 			*/
-+//	int	port;				/* Port number (not used) 		*/
-+	FILE	*fp;				/* Print file 				*/
-+	int	copies;				/* Number of copies to print 		*/
-+	int	fd;				/* USB device 				*/
- 	char	*noent_mes = "INFO: Printer cable not connected or printer power off; will retry in 30 seconds...\n";
- 	char	*busy_mes = "INFO: USB port busy; will retry in 30 seconds...\n";
- 	short	noentmes_len = strlen( noent_mes ) + 1;
-@@ -237,11 +237,11 @@
- 	int	i;			/* Looping var */
- 	int	fd;			/* File descriptor */
- 	char	device[255];		/* Device filename */
--	FILE	*probe;			/* /proc/bus/usb/devices file */
--	char	line[1024],		/* Line from file */
--	*delim,			/* Delimiter in file */
--	make[IPP_MAX_NAME],	/* Make from file */
--	model[IPP_MAX_NAME];	/* Model from file */
-+//	FILE	*probe;			/* /proc/bus/usb/devices file */
-+//	char	line[1024];		/* Line from file */
-+//	char	*delim;			/* Delimiter in file */
-+//	char	make[IPP_MAX_NAME];	/* Make from file */
-+//	char	model[IPP_MAX_NAME];	/* Model from file */
- 	/* Ver.3.20 */
- 	char  des_s[1024];
- 	short model_found = 0;
-diff -aur cnijfilter-source-3.20-1/backendnet/backend/cnijnet.c cnijfilter-source-3.20-1.new/backendnet/backend/cnijnet.c
---- cnijfilter-source-3.20-1/backendnet/backend/cnijnet.c	2009-04-06 14:19:22.000000000 +0430
-+++ cnijfilter-source-3.20-1.new/backendnet/backend/cnijnet.c	2013-07-26 00:12:36.279988102 +0430
-@@ -94,14 +94,14 @@
- main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
-      char *argv[])	/* I - Command-line arguments */
- {
--	char	method[255],			/* Method in URI 				   	*/
--			hostname[1024],			/* Hostname 						*/
--			username[255],			/* Username info (not used) 		*/
--			resource[1024],			/* Resource info (device and options) */
--			*options;				/* Pointer to options 				*/
--	int		port;					/* Port number (not used) 			*/
--	FILE	*fp;					/* Print file 						*/
--	int		copies;					/* Number of copies to print 		*/
-+//	char	method[255];			/* Method in URI 			*/
-+//	char	hostname[1024];			/* Hostname 				*/
-+//	char	username[255];			/* Username info (not used) 		*/
-+	char	resource[1024];			/* Resource info (device and options) 	*/
-+	char	*options;			/* Pointer to options 			*/
-+//	int	port;				/* Port number (not used) 		*/
-+	FILE	*fp;				/* Print file 				*/
-+	int	copies;				/* Number of copies to print 		*/
- 	int 	rtn=0;
- 	
-  /*
 diff -aur cnijfilter-source-3.20-1/backendnet/backend/cnijnetlm.c cnijfilter-source-3.20-1.new/backendnet/backend/cnijnetlm.c
 --- cnijfilter-source-3.20-1/backendnet/backend/cnijnetlm.c	2009-05-21 14:21:18.000000000 +0430
 +++ cnijfilter-source-3.20-1.new/backendnet/backend/cnijnetlm.c	2013-07-26 00:12:36.279988102 +0430
-@@ -79,7 +79,7 @@
- #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
- 
- 	int sts ;									/* function status		*/
--	int utilbyte = 0;
-+//	int utilbyte = 0;
- 
- /*
- * When a signal (SIGTERM/SIGPIPE) is received, printing process
-@@ -145,7 +145,7 @@
- int		net_lgmon_exec( int argc, int mode, FILE *fp, int copies , char *resource, char *user, char *document, char *options ) {
- 	int		rtn ;								/* return status buffer		*/
- 	int		pipe_fds[2] ;						/* pipe disripter			*/
--	struct  sigaction action;
-+//	struct  sigaction action;
- 	
- 	char model_number[64];
- 	int is_direct=0;
-@@ -172,7 +172,7 @@
- 	else if ( g_pid == 0 ) {					/* child process 			*/
- 		static	int		cmd_argv_cnt = 0 ;		/* argument counter			*/
- 		static	char	*cmd_argv[16] ;			/* command argument beffer	*/
--		static  char	*cmd_sh_path = "/bin/sh";	/* shell path			*/
-+//		static  char	*cmd_sh_path = "/bin/sh";	/* shell path			*/
- 		static	char	str_msg[128] ;			/* message beffer			*/
- 		memset( str_msg, 0x00, sizeof(str_msg) ) ;
- 		
 @@ -256,6 +256,7 @@
  		
  		// waitpid( g_pid, NULL, 0) ;		/* child process wait		*/
@@ -121,35 +23,6 @@ diff -aur cnijfilter-source-3.20-1/backendnet/backend/cnijnetlm.c cnijfilter-sou
 diff -aur cnijfilter-source-3.20-1/backendnet/lmonitor/cnijnetchk.c cnijfilter-source-3.20-1.new/backendnet/lmonitor/cnijnetchk.c
 --- cnijfilter-source-3.20-1/backendnet/lmonitor/cnijnetchk.c	2009-06-08 15:19:07.000000000 +0430
 +++ cnijfilter-source-3.20-1.new/backendnet/lmonitor/cnijnetchk.c	2013-07-26 00:12:36.283321388 +0430
-@@ -66,7 +66,7 @@
- 	get_packet_size
- ********************************************************************************/
- int get_packet_size(int model){
--	int i=0;
-+//	int i=0;
- 	PACKETSIZE_TABLE *p=NULL;
- 	PACKETSIZE_TABLE size_table[] = {
- 		{360,	10},
-@@ -153,7 +153,8 @@
- 	sendData
- ********************************************************************************/
- int sendData(CNNLHANDLE hnd, void *buffer, unsigned long size, int sendmode, FILE *fp){
--	unsigned long wsize=0, res_size=0, req_size=0, rsize=0;
-+	unsigned long wsize=0, res_size=0, req_size=0;
-+//	unsigned long rsize=0;
- 	int ret, status;
- 	time_t lastchecktime=0;
- 	
-@@ -194,7 +195,8 @@
- 	char command_buffer[CNCL_MAKECOMMAND_BUF_LEN];
- 	char read_buffer[2048];
- 	static char job_id[16];
--	int dispatch_repeat,i, ret;
-+//	int dispatch_repeat, i;
-+	int ret;
- 	
- 	memset(command_buffer, 0x00, sizeof(command_buffer));
- 	
 @@ -288,7 +290,7 @@
  	bufsize = (src[0] << 8) + src[1]; 
  	buf = (char*)&(src[2]);
@@ -162,21 +35,6 @@ diff -aur cnijfilter-source-3.20-1/backendnet/lmonitor/cnijnetchk.c cnijfilter-s
 diff -aur cnijfilter-source-3.20-1/backendnet/lmonitor/cnijnetprn.c cnijfilter-source-3.20-1.new/backendnet/lmonitor/cnijnetprn.c
 --- cnijfilter-source-3.20-1/backendnet/lmonitor/cnijnetprn.c	2009-06-15 11:39:28.000000000 +0430
 +++ cnijfilter-source-3.20-1.new/backendnet/lmonitor/cnijnetprn.c	2013-07-26 00:12:36.283321388 +0430
-@@ -211,10 +211,11 @@
- ){
- 	int  errcode = 0;
- 	char ipaddr[STRING_SHORT], hostname[STRING_SHORT];
--	unsigned long written_size=0;
-+//	unsigned long written_size=0;
- 	char *rbuffer, *p=NULL;
--	uint32_t len=0, wlen=0;
--	int ret;
-+	uint32_t len=0;
-+//	uint32_t wlen=0;
-+//	int ret;
- 	void *lib_handle = NULL;
- 	char library_path[512];
- 	
 @@ -255,6 +256,8 @@
  		if (CNNL_Config(hnd, CNNL_CONFIG_SET_VERSION, &latest_version, &param_size) != CNNL_RET_SUCCESS){
  			goto error_open;
@@ -268,6 +126,7 @@ diff -aur cnijfilter-source-3.20-1/cngpijmon/cnijnpr/cnijnpr/cnijnpr.c cnijfilte
  #include <net/if.h>
  #include <sys/sysctl.h>
  #include <config.h>
+ #include <fcntl.h>
 +#include <unistd.h>
  
  #include <dlfcn.h>
@@ -279,30 +138,8 @@ diff -aur cnijfilter-source-3.20-1/cngpijmon/cnijnpr/cnijnpr/cnijnpr.c cnijfilte
 -int main (int argc, const char **argv)
 +int main (int argc, char *argv[])
  {
+ 	int		fd;
  	int		rtn = 0 ;
- 	int		wrtn = 0 ;
-diff -aur cnijfilter-source-3.20-1/cngpijmon/src/bjcupsmon_ui.c cnijfilter-source-3.20-1.new/cngpijmon/src/bjcupsmon_ui.c
---- cnijfilter-source-3.20-1/cngpijmon/src/bjcupsmon_ui.c	2009-07-28 11:03:03.000000000 +0430
-+++ cnijfilter-source-3.20-1.new/cngpijmon/src/bjcupsmon_ui.c	2013-07-26 00:12:36.283321388 +0430
-@@ -26,6 +26,7 @@
- 	#include  "support.h"
- #endif
- 
-+#include "interface.h"
- #include "bjcupsmon_common.h"
- #include "bjcupsmon_ui.h"
- #include "bjcupsmon_funcprot.h"
-diff -aur cnijfilter-source-3.20-1/cnijfilter/src/bjfimage.c cnijfilter-source-3.20-1.new/cnijfilter/src/bjfimage.c
---- cnijfilter-source-3.20-1/cnijfilter/src/bjfimage.c	2009-03-26 09:41:05.000000000 +0430
-+++ cnijfilter-source-3.20-1.new/cnijfilter/src/bjfimage.c	2013-07-26 00:12:36.286654674 +0430
-@@ -40,6 +40,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <png.h>
-+#include <string.h>
- 
- #include "cpktypes.h"
- #include "cncl.h"
 diff -aur cnijfilter-source-3.20-1/cnijfilter/src/getipc.c cnijfilter-source-3.20-1.new/cnijfilter/src/getipc.c
 --- cnijfilter-source-3.20-1/cnijfilter/src/getipc.c	2009-03-26 09:41:05.000000000 +0430
 +++ cnijfilter-source-3.20-1.new/cnijfilter/src/getipc.c	2013-07-26 00:12:36.286654674 +0430
@@ -405,28 +242,6 @@ diff -aur cnijfilter-source-3.20-1/lgmon/src/990ifunc.c cnijfilter-source-3.20-1
  }
  
  
-diff -aur cnijfilter-source-3.20-1/lgmon/src/bscc2sts.c cnijfilter-source-3.20-1.new/lgmon/src/bscc2sts.c
---- cnijfilter-source-3.20-1/lgmon/src/bscc2sts.c	2009-04-24 10:49:35.000000000 +0430
-+++ cnijfilter-source-3.20-1.new/lgmon/src/bscc2sts.c	2013-07-26 00:12:36.289987934 +0430
-@@ -202,7 +202,8 @@
-   ,{"MP560",		processformp540}
-   ,{"MP640",		processformp630}
-   ,{"IP4700",		processformp630}
--  ,{ENDTAG, 0}
-+//  ,{ENDTAG, 0}
-+  ,{"\0", 0}
- };
- 
- 
-@@ -236,7 +237,7 @@
- };
- 
-  /* MAXMODELNUM delete */
--  for(i=0; i<modeltable[i].prnname!=ENDTAG; i++){
-+  for(i=0; *(modeltable[i].prnname); i++){
- 	if( strncmp(p_tbl->pr_name, modeltable[i].prnname, strlen(modeltable[i].prnname))==0 ){
- 	  ret = (*modeltable[i].model)(&storeset[0], p_tbl, p_bsccbuf);
- 	  return(ret);
 diff -aur cnijfilter-source-3.20-1/lgmon/src/ip3100func.c cnijfilter-source-3.20-1.new/lgmon/src/ip3100func.c
 --- cnijfilter-source-3.20-1/lgmon/src/ip3100func.c	2009-04-24 10:49:35.000000000 +0430
 +++ cnijfilter-source-3.20-1.new/lgmon/src/ip3100func.c	2013-07-26 00:12:36.289987934 +0430
@@ -466,49 +281,7 @@ diff -aur cnijfilter-source-3.20-1/lgmon/src/ip8600func.c cnijfilter-source-3.20
 diff -aur cnijfilter-source-3.20-1/lgmon/src/langmon.c cnijfilter-source-3.20-1.new/lgmon/src/langmon.c
 --- cnijfilter-source-3.20-1/lgmon/src/langmon.c	2009-05-01 05:29:17.000000000 +0430
 +++ cnijfilter-source-3.20-1.new/lgmon/src/langmon.c	2013-07-26 00:12:36.289987934 +0430
-@@ -49,7 +49,9 @@
- int command_type = NORMAL_COMMAND;
- int ivec_poweroff_flag = NORMAL_POWEROFF;
- 
-+#if 0
- static int   data_end  = 0;             /* print data outputed flag */
-+#endif
- static int   do_cancel = 0;		/* print cancel flag */
- static pid_t data_pid  = 0;		/* data output process id */
- static pid_t stat_pid  = 0;		/* status get process id */
-@@ -68,7 +70,9 @@
- static int print_normal(void);
- static int lm_main_fork(void);
- static int lm_main_cups(void);
-+#if 0
- static int check_signal(void);
-+#endif
- static int check_signal_arrive(void);
- #if 0 /*not use*/
- static int do_prn_com(int, lmsm_socket, int);
-@@ -180,7 +184,7 @@
- 
- static int wait_forked_procs()
- {
--	int child_sm;
-+//	int child_sm;
- 	int child_stat;
- 	int child_data;
- 
-@@ -246,7 +250,7 @@
- 	return 0;
- }
- 
--
-+#if 0
- static int check_signal()
- {
- 	/* SIGTERM/SIGCHILD/SIGINT arrive? */
-@@ -255,10 +259,11 @@
- 
- 	return 0;
- }
-+#endif
+@@ -255,7 +259,7 @@
  
  static int print_normal()
  {
@@ -550,63 +323,6 @@ diff -aur cnijfilter-source-3.20-1/lgmon/src/lm_print.c cnijfilter-source-3.20-1
 diff -aur cnijfilter-source-3.20-1/lgmon/src/lm_status.c cnijfilter-source-3.20-1.new/lgmon/src/lm_status.c
 --- cnijfilter-source-3.20-1/lgmon/src/lm_status.c	2009-07-28 12:46:33.000000000 +0430
 +++ cnijfilter-source-3.20-1.new/lgmon/src/lm_status.c	2013-07-26 00:12:36.289987934 +0430
-@@ -104,7 +104,7 @@
- static int setup_bscc(int dev_path, char *jobIDStr)
- //static int setup_bscc(int dev_path)
- {
--	int i;
-+//	int i;
- 	int error = 0;
- 	int sta = 0;
- 	int count;
-@@ -293,7 +293,7 @@
- {
- 	char *ptr;
- 	unsigned char val = 0;
--	unsigned char work[2];
-+	char work[2];
- 	unsigned int  wk;
- 
- //	ptr = strstr(buf, STR_BST);
-@@ -303,13 +303,13 @@
- 
- 	ptr += strlen(STR_BST);
- 	work[0] = *ptr;
--	work[1] = 0x00;
-+	work[1] = '\0';
- 	sscanf(work, "%x", &wk); /* conv Hex string to value(Hi) */
- 	val = (char)(wk<<4);
- 
- 	ptr++;
- 	work[0] = *ptr;
--	work[1] = 0x00;
-+	work[1] = '\0';
- 	sscanf(work, "%x", &wk); /* conv HEX string to value(Lo) */
- 	val |= (char)wk;
- 
-@@ -402,19 +402,19 @@
- 		if ((ivec = strstr(devid+2, STR_STA)) != NULL){
- 			{
- 				int val = 0;
--				unsigned char work[2];
-+				char work[2];
- 				unsigned int  wk;
- 
- 				ivec = ivec + strlen(STR_STA);
- 
- 				work[0] = *ivec;
--				work[1] = 0x00;
-+				work[1] = '\0';
- 				sscanf(work, "%x", &wk); /* conv Hex string to value(Hi) */
- 				val = (char)(wk<<4);
- 
- 				ivec++;
- 				work[0] = *ivec;
--				work[1] = 0x00;
-+				work[1] = '\0';
- 				sscanf(work, "%x", &wk); /* conv HEX string to value(Lo) */
- 				val |= (char)wk;
- #ifdef DEBUG
 @@ -445,7 +445,9 @@
  	int dev_path = PRNT_PATH;
  	short	cnclerr = -1;
@@ -640,181 +356,9 @@ diff -aur cnijfilter-source-3.20-1/lgmon/src/lm_sub.c cnijfilter-source-3.20-1.n
  			memcpy( &buf[0], &buf2[0], MAX_STATBUF );
  		}
  		else
-diff -aur cnijfilter-source-3.20-1/Makefile cnijfilter-source-3.20-1.new/Makefile
---- cnijfilter-source-3.20-1/Makefile	2009-04-06 14:19:22.000000000 +0430
-+++ cnijfilter-source-3.20-1.new/Makefile	2015-06-24 18:40:20.695615264 +0430
-@@ -14,3 +14,12 @@
- install :
- 	target=install; $(scripts)
- 
-+mp550 :
-+	for dir in "lgmon" "ppd" "cnijfilter" "printui" "cngpijmon"; do \
-+	  (cd $$dir; ./autogen.sh --prefix=/usr --program-suffix=mp550 --enable-progpath=/usr/bin --libdir=/usr/lib32; make) || exit 1; \
-+	done
-+
-+installmp550 :
-+	for dir in "ppd" "cnijfilter" "printui" "lgmon" "cngpijmon"; do \
-+	  (cd $$dir; make install DESTDIR=${PACKAGEDIR}) || exit 1; \
-+	done
-diff -aur cnijfilter-source-3.20-1/ppd/canonmp550.ppd cnijfilter-source-3.20-1.new/ppd/canonmp550.ppd
---- cnijfilter-source-3.20-1/ppd/canonmp550.ppd	2009-06-08 07:12:09.000000000 +0430
-+++ cnijfilter-source-3.20-1.new/ppd/canonmp550.ppd	2013-07-26 00:14:14.439987972 +0430
-@@ -60,7 +60,12 @@
- 
- *OpenUI *Resolution/Output Resolution: PickOne
- *DefaultResolution: 600dpi
--*Resolution 600dpi/600 dpi: "<</HWResolution[600 600]>>setpagedevice"
-+*Resolution 300dpi/300 dpi: "«/HWResolution[300 300]»setpagedevice"
-+*Resolution 600dpi/600 dpi: "«/HWResolution[600 600]»setpagedevice"
-+*Resolution 1200dpi/1200 dpi: "«/HWResolution[1200 1200]»setpagedevice"
-+*Resolution 2400dpi/2400 dpi: "«/HWResolution[2400 2400]»setpagedevice"
-+*Resolution 4800dpi/4800 dpi: "«/HWResolution[4800 4800]»setpagedevice"
-+*Resolution 9600dpi/9600 dpi: "«/HWResolution[9600 9600]»setpagedevice"
- *CloseUI: *Resolution
- 
- *OpenUI *ColorModel/Color Model: PickOne
-@@ -485,3 +490,16 @@
- *%
- *% internalversion : 3.20.01.001
- *%
-+
-+*OpenUI *CNQuality/Quality: PickOne
-+*DefaultCNQuality: 3
-+*CNQuality 2/High: "2"
-+*CNQuality 3/Normal: "3"
-+*CNQuality 4/Standard: "4"
-+*CloseUI: *CNQuality
-+
-+*OpenUI *CNGrayscale/Grayscale: PickOne
-+*DefaultCNGrayscale: false
-+*CNGrayscale false/Off: "false"
-+*CNGrayscale true/On: "true"
-+*CloseUI: *CNGrayscale
-diff -aur cnijfilter-source-3.20-1/printui/src/comdb.c cnijfilter-source-3.20-1.new/printui/src/comdb.c
---- cnijfilter-source-3.20-1/printui/src/comdb.c	2009-04-22 09:20:08.000000000 +0430
-+++ cnijfilter-source-3.20-1.new/printui/src/comdb.c	2013-07-26 00:12:36.293321227 +0430
-@@ -291,8 +291,8 @@
- short GetCurrentInkCartridgeSettings()
- {
- 	int cartridge = GetCurrentnValue(CNCL_INKCARTRIDGESETTINGS);
--	int media_type = GetCurrentnValue(CNCL_MEDIATYPE);
--	int margin_type = GetCurrentnValue(CNCL_MARGINTYPE);
-+//	int media_type = GetCurrentnValue(CNCL_MEDIATYPE);
-+//	int margin_type = GetCurrentnValue(CNCL_MARGINTYPE);
- 
- 	/* Ver.2.70 */
- 	if( cartridge == -1 )
-diff -aur cnijfilter-source-3.20-1/printui/src/usrsizedlg.c cnijfilter-source-3.20-1.new/printui/src/usrsizedlg.c
---- cnijfilter-source-3.20-1/printui/src/usrsizedlg.c	2009-08-28 11:19:09.000000000 +0430
-+++ cnijfilter-source-3.20-1.new/printui/src/usrsizedlg.c	2013-07-26 00:12:36.293321227 +0430
-@@ -33,6 +33,7 @@
- #	include <glade/glade.h>
- #endif
- #include <stdio.h>
-+#include <stdlib.h>
- 
- #include "callbacks.h"
- #ifndef	USE_LIB_GLADE
-diff -aur cnijfilter-source-3.20-1/printui/src/utility.c cnijfilter-source-3.20-1.new/printui/src/utility.c
---- cnijfilter-source-3.20-1/printui/src/utility.c	2009-07-31 09:26:49.000000000 +0430
-+++ cnijfilter-source-3.20-1.new/printui/src/utility.c	2013-07-26 00:12:36.296654567 +0430
-@@ -1329,6 +1329,7 @@
- 	return (RegiInfo[index].regi[page].cnt);
- }
- 
-+void DrawTestPrintPage(GtkWidget *regi_dialog, GdkPixmap *pixmap, HOTSPOT *hotspot, CTRLITEM *ctrlitem, short *items, short group, short kindcnt, short isOddHeight);
- 
- void DrawTestPrintPage2(
- 	GtkWidget *regi_dialog,			
-@@ -3984,6 +3985,7 @@
- 	roller_cleaning_type_a_value = ROLLER_CLENING_TYPE_A_REARTRAY;
- }
- 
-+#if 0
- static void SetRollerCleaningTypeARadiobutton(GtkWidget *widget,short radio_button_value )
- {
- 	GtkWidget	*radio_button = NULL;
-@@ -3994,6 +3996,7 @@
- 									roller_cleaning_type_a_button_name[radio_button_value]);
- 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio_button), TRUE);  
- }
-+#endif
- 
- gboolean
- on_roller_cleaning_type_a1_dialog_delete_event
-diff -aur cnijfilter-source-3.20-1/printui/src/utility.h cnijfilter-source-3.20-1.new/printui/src/utility.h
---- cnijfilter-source-3.20-1/printui/src/utility.h	2009-04-06 15:36:02.000000000 +0430
-+++ cnijfilter-source-3.20-1.new/printui/src/utility.h	2013-07-26 00:12:36.296654567 +0430
-@@ -38,6 +38,7 @@
- void UtilPlateCleaning(LPUIDB uidb);
- void UtilInkCartridgeSet( LPUIDB uidb );
- int UtilMessageBox(char *message, char *title, unsigned int flag);
-+void UtilPaperSourceSetting(LPUIDB uidb);
- 
- void init_autopower_settings(void);			
- void init_autopower_type2_settings(void);	
-@@ -53,6 +54,9 @@
- void init_nozzle_check_type_a_value( void );
- void init_permit_cancel_dialog_value( void );
- 
-+void init_head_alignment_type_a_value( void );
-+void init_check_type_a_value( void );
-+
- #define	ID_OK		1
- #define	ID_CANCEL	2
- #define	ID_ABORT	3
 diff -aur cnijfilter-source-3.20-1/pstocanonij/filter/pstocanonij.c cnijfilter-source-3.20-1.new/pstocanonij/filter/pstocanonij.c
 --- cnijfilter-source-3.20-1/pstocanonij/filter/pstocanonij.c	2009-04-23 14:29:38.000000000 +0430
 +++ cnijfilter-source-3.20-1.new/pstocanonij/filter/pstocanonij.c	2013-07-26 00:12:36.296654567 +0430
-@@ -245,7 +245,7 @@
- 		}
- 
- 		// Retain the PS data in the buffer list.
--		bl = buflist_new(read_buf, read_bytes);
-+		bl = buflist_new((unsigned char *) read_buf, read_bytes);
- 
- 		if( *ps_data == NULL )
- 			*ps_data = bl;
-@@ -295,7 +295,7 @@
- 			{
- 				if( !IS_BLANK(*p_code)  )
- 					break;
--				*p_code++;
-+				p_code++;
- 			}
- 			while( *p_code != '\0' )
- 			{
-@@ -381,7 +381,7 @@
- 
- 	while( (read_bytes = read_line(-1, read_buf, DATA_BUF_SIZE - 1)) > 0 )
- 	{
--		BufList *bl = buflist_new(read_buf, read_bytes);
-+		BufList *bl = buflist_new((unsigned char *) read_buf, read_bytes);
- 
- 		if( *ps_data == NULL )
- 			*ps_data = bl;
-@@ -916,8 +916,8 @@
- 				/* Ver.2.70 : If unit is  "mm" or "cm" , replace pw_mm and pl_mm with lpr command option parameter "p_cups_opt" */
- 				if( !strcmp( lpr_custom_unit , "mm") && ret >= 0 )		/* unit = mm */
- 				{
--					sscanf( lpr_custom_width , "%ld.%2s" , &pw_mm ,&pw_ss_S );
--					sscanf( lpr_custom_height , "%ld.%2s" , &pl_mm , &pl_ss_S );
-+					sscanf( lpr_custom_width , "%ld.%2s" , &pw_mm , pw_ss_S );
-+					sscanf( lpr_custom_height , "%ld.%2s" , &pl_mm , pl_ss_S );
- 
- 					switch( strlen(pw_ss_S) ){
- 						case 1:
-@@ -946,8 +946,8 @@
- 				}
- 				else if( !strcmp( lpr_custom_unit , "cm") && ret >= 0 )	/* unit = cm */
- 				{
--					sscanf( lpr_custom_width , "%ld.%3s" , &pw_mm ,&pw_ss_S );
--					sscanf( lpr_custom_height , "%ld.%3s" , &pl_mm , &pl_ss_S );
-+					sscanf( lpr_custom_width , "%ld.%3s" , &pw_mm ,pw_ss_S );
-+					sscanf( lpr_custom_height , "%ld.%3s" , &pl_mm , pl_ss_S );
- 					
- 					switch( strlen(pw_ss_S) ){
- 						case 1:
 @@ -1198,6 +1198,7 @@
  			close(fds[0]);
  		}
@@ -823,15 +367,3 @@ diff -aur cnijfilter-source-3.20-1/pstocanonij/filter/pstocanonij.c cnijfilter-s
  	return child_pid;
  }
  
-diff -aur cnijfilter-source-3.20-1/cngpij/cngpij/bjcups.c cnijfilter-source-3.20-1.new/cngpij/cngpij/bjcups.c
---- cnijfilter-source-3.20-1/cngpij/cngpij/bjcups.c	2009-06-11 08:40:32.000000000 +0430
-+++ cnijfilter-source-3.20-1.new/cngpij/cngpij/bjcups.c	2015-06-24 19:25:48.822285050 +0430
-@@ -768,7 +769,7 @@
- 	short		canon_backend_flag = 0;
- 	short		add_bidi = 0;
- 	short		add_direct = 0;
--	char 		*p_ppd_name;
-+	const char	*p_ppd_name;
- 	ppd_file_t	*p_ppd;
- 	
-