summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO16
-rw-r--r--.gitignore2
-rw-r--r--PKGBUILD16
-rw-r--r--buildfiles.patch30
-rw-r--r--cups.patch24
-rw-r--r--mychanges.patch120
6 files changed, 98 insertions, 110 deletions
diff --git a/.SRCINFO b/.SRCINFO
index edefa8f269e6..5d856efcdd60 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Mon May 9 11:54:08 UTC 2016
+# Mon May 9 16:19:52 UTC 2016
pkgbase = cnijfilter-common
pkgdesc = Canon IJ Printer Driver (Common Package)
- pkgver = 4.00
- pkgrel = 3
+ pkgver = 4.10
+ pkgrel = 1
url = http://www.canon-europe.com/support/pixma_software/
install = cnijfilter-common.install
arch = i686
@@ -14,14 +14,14 @@ pkgbase = cnijfilter-common
makedepends = tar
makedepends = make
conflicts = lib32-cnijfilter320
- source = cnijfilter-source-4.00-1.tar.gz::http://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAwNTUxNTAx&cmp=ACB&lang=EN
+ source = cnijfilter-source-4.10-1.tar.gz::http://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAwNTg1ODAx&cmp=ACB&lang=EN
source = cups.patch
source = buildfiles.patch
source = mychanges.patch
- sha512sums = f90a5beec88812f65e8f52f287db8cefbb9c13eabbb7a1117c72d4af238126c282ebbca09ef96f3147d3bd5281f227402ae7564a68d32002eb033833a8080d72
- sha512sums = fe33272a243c164e574db591ccca09ef804c899d66ed2e2e3225cfaab503df016fb8f8c6da9e4989fcd8f38678884c989d87c02e47d95aafb60a776df158c7be
- sha512sums = 9b1081c964c7894eefa8b4d11b04c7eafda208f629a373a09999fe8fe8f5ce85f6a697bb14e20a3b3ce795d578d46fde5a431b3f29eb4f0ee70e67477bf6f4c2
- sha512sums = 4bd4d2854edfacb59e5b54b1eec348a982e25ba28608d1700e25efea9a54339be234ceaa9b6a013245d4135da14b34cd0d01ae91c315e63ff57565cd5ee1363f
+ sha512sums = 58198e92e360c71c95423bfa8278f449eb645245af1b96770323cb6f4b2b7186e5ab326d58377c20627c750d3d8c253addf637f9d18e085b1c89a81d6239ab51
+ sha512sums = 141a78c2353b3864b5a468fb6f4cf74fef5bf53ae75ac8932d6d853adc4044254a5371dcba1d05358b6075b6f38783f580ac7137088b91c10b1e412581144843
+ sha512sums = fb73e2e0653f2654a9c5211b5dc3e06ce24cd2f5bf64a27009f5446e69c7f02d78bb201f15da0f68ad01b1cb4e699c808eccb9df690ffea07b6d5a59ab5629f3
+ sha512sums = 210902afe06240def9d6e662f5c21a8e99eeac6104798230f196e269e07b20b265bd360a15aed921ab73e7aff91c4a8e3212585091d86e89bac42e4b32ed1afd
depends_i686 = libcups
depends_i686 = popt
depends_i686 = libusb
diff --git a/.gitignore b/.gitignore
index ed12ccb853ed..b96695de219c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
pkg/
src/
-cnijfilter-source-4.00-1.tar.gz
+cnijfilter-source-*.tar.gz
*.pkg.tar.xz
*~
diff --git a/PKGBUILD b/PKGBUILD
index ceb4397c5ace..bb42955f8b0b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@
pkgname=('cnijfilter-common')
_pkgname=cnijfilter
-pkgver=4.00
-pkgrel=3
+pkgver=4.10
+pkgrel=1
_pkgreview=1
pkgdesc="Canon IJ Printer Driver (Common Package)"
@@ -29,15 +29,15 @@ makedepends=('autoconf>=2.13' 'automake>=1.6' 'tar' 'make')
install=cnijfilter-common.install
-# File size: 7786960 bytes
-source=("cnijfilter-source-4.00-1.tar.gz::http://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAwNTUxNTAx&cmp=ACB&lang=EN"
+# File size: 7683230 bytes
+source=("cnijfilter-source-4.10-1.tar.gz::http://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAwNTg1ODAx&cmp=ACB&lang=EN"
"cups.patch"
"buildfiles.patch"
"mychanges.patch")
-sha512sums=('f90a5beec88812f65e8f52f287db8cefbb9c13eabbb7a1117c72d4af238126c282ebbca09ef96f3147d3bd5281f227402ae7564a68d32002eb033833a8080d72'
- 'fe33272a243c164e574db591ccca09ef804c899d66ed2e2e3225cfaab503df016fb8f8c6da9e4989fcd8f38678884c989d87c02e47d95aafb60a776df158c7be'
- '9b1081c964c7894eefa8b4d11b04c7eafda208f629a373a09999fe8fe8f5ce85f6a697bb14e20a3b3ce795d578d46fde5a431b3f29eb4f0ee70e67477bf6f4c2'
- '4bd4d2854edfacb59e5b54b1eec348a982e25ba28608d1700e25efea9a54339be234ceaa9b6a013245d4135da14b34cd0d01ae91c315e63ff57565cd5ee1363f')
+sha512sums=('58198e92e360c71c95423bfa8278f449eb645245af1b96770323cb6f4b2b7186e5ab326d58377c20627c750d3d8c253addf637f9d18e085b1c89a81d6239ab51'
+ '141a78c2353b3864b5a468fb6f4cf74fef5bf53ae75ac8932d6d853adc4044254a5371dcba1d05358b6075b6f38783f580ac7137088b91c10b1e412581144843'
+ 'fb73e2e0653f2654a9c5211b5dc3e06ce24cd2f5bf64a27009f5446e69c7f02d78bb201f15da0f68ad01b1cb4e699c808eccb9df690ffea07b6d5a59ab5629f3'
+ '210902afe06240def9d6e662f5c21a8e99eeac6104798230f196e269e07b20b265bd360a15aed921ab73e7aff91c4a8e3212585091d86e89bac42e4b32ed1afd')
prepare() {
cd "${srcdir}/${_pkgname}-source-${pkgver}-${_pkgreview}/"
diff --git a/buildfiles.patch b/buildfiles.patch
index 6cd4846f7f73..403ac1e86e10 100644
--- a/buildfiles.patch
+++ b/buildfiles.patch
@@ -1,14 +1,14 @@
-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
+diff -ruN cnijfilter-source-4.10-1.orig/lgmon2/src/Makefile.am cnijfilter-source-4.10-1/lgmon2/src/Makefile.am
+--- cnijfilter-source-4.10-1.orig/lgmon2/src/Makefile.am 2013-12-24 07:39:15.000000000 +0330
++++ cnijfilter-source-4.10-1/lgmon2/src/Makefile.am 2016-05-09 20:25:06.259953863 +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 -ruN cnijfilter-source-4.10-1.orig/Makefile cnijfilter-source-4.10-1/Makefile
+--- cnijfilter-source-4.10-1.orig/Makefile 2013-12-24 07:39:15.000000000 +0330
++++ cnijfilter-source-4.10-1/Makefile 2016-05-09 20:25:06.259953863 +0430
@@ -14,3 +14,12 @@
install :
target=install; $(scripts)
@@ -22,9 +22,9 @@ diff -ruN cnijfilter-source-4.00-1.orig/Makefile cnijfilter-source-4.00-1/Makefi
+ for dir in "libs" "bscc2sts" "cnijnpr" "cngpij" "cngpijmnt" "pstocanonij" "backend" "backendnet" "cmdtocanonij" "cnijbe" "lgmon2"; 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
+diff -ruN cnijfilter-source-4.10-1.orig/backendnet/configure.in cnijfilter-source-4.10-1/backendnet/configure.in
+--- cnijfilter-source-4.10-1.orig/backendnet/configure.in 2013-12-24 07:39:15.000000000 +0330
++++ cnijfilter-source-4.10-1/backendnet/configure.in 2016-05-09 20:25:06.259953863 +0430
@@ -19,7 +19,8 @@
AC_DEFINE_UNQUOTED(BJLIB_PATH, "$enable_libpath")
AC_SUBST(BJLIB_PATH)
@@ -35,9 +35,9 @@ diff -ruN cnijfilter-source-4.00-1.orig/backendnet/configure.in cnijfilter-sourc
AC_SUBST(ARC)
# Checks for programs.
-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
+diff -ruN cnijfilter-source-4.10-1.orig/cnijfilter/configure.in cnijfilter-source-4.10-1/cnijfilter/configure.in
+--- cnijfilter-source-4.10-1.orig/cnijfilter/configure.in 2013-12-24 07:39:15.000000000 +0330
++++ cnijfilter-source-4.10-1/cnijfilter/configure.in 2016-05-09 20:25:06.259953863 +0430
@@ -43,7 +43,8 @@
esac
AC_SUBST(CNCL_LIB_ID)
@@ -48,9 +48,9 @@ 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
+diff -ruN cnijfilter-source-4.10-1.orig/cnijnpr/configure.in cnijfilter-source-4.10-1/cnijnpr/configure.in
+--- cnijfilter-source-4.10-1.orig/cnijnpr/configure.in 2013-12-24 07:39:15.000000000 +0330
++++ cnijfilter-source-4.10-1/cnijnpr/configure.in 2016-05-09 20:25:06.259953863 +0430
@@ -37,7 +37,8 @@
CFLAGS="-O2"
diff --git a/cups.patch b/cups.patch
index f5535ef14091..19a44b229246 100644
--- a/cups.patch
+++ b/cups.patch
@@ -1,7 +1,7 @@
-diff -ruN cnijfilter-source-4.00-1.orig/backend/src/cnij_backend_common.c cnijfilter-source-4.00-1/backend/src/cnij_backend_common.c
---- cnijfilter-source-4.00-1.orig/backend/src/cnij_backend_common.c 2013-07-17 06:03:45.000000000 +0430
-+++ cnijfilter-source-4.00-1/backend/src/cnij_backend_common.c 2015-08-04 12:29:43.528967207 +0430
-@@ -38,6 +38,7 @@
+diff -ruN cnijfilter-source-4.10-1.orig/backend/src/cnij_backend_common.c cnijfilter-source-4.10-1/backend/src/cnij_backend_common.c
+--- cnijfilter-source-4.10-1.orig/backend/src/cnij_backend_common.c 2013-12-24 07:39:15.000000000 +0330
++++ cnijfilter-source-4.10-1/backend/src/cnij_backend_common.c 2016-05-09 20:25:06.256620531 +0430
+@@ -37,6 +37,7 @@
// CUPS Header
#include <cups/cups.h>
#include <cups/ipp.h>
@@ -9,10 +9,10 @@ diff -ruN cnijfilter-source-4.00-1.orig/backend/src/cnij_backend_common.c cnijfi
// Header file for CANON
#include "cnij_backend_common.h"
-diff -ruN cnijfilter-source-4.00-1.orig/cngpij/cngpij/bjcups.c cnijfilter-source-4.00-1/cngpij/cngpij/bjcups.c
---- cnijfilter-source-4.00-1.orig/cngpij/cngpij/bjcups.c 2013-07-17 06:03:45.000000000 +0430
-+++ cnijfilter-source-4.00-1/cngpij/cngpij/bjcups.c 2015-08-04 12:26:36.445633660 +0430
-@@ -21,6 +21,7 @@
+diff -ruN cnijfilter-source-4.10-1.orig/cngpij/cngpij/bjcups.c cnijfilter-source-4.10-1/cngpij/cngpij/bjcups.c
+--- cnijfilter-source-4.10-1.orig/cngpij/cngpij/bjcups.c 2013-12-24 07:39:15.000000000 +0330
++++ cnijfilter-source-4.10-1/cngpij/cngpij/bjcups.c 2016-05-09 20:25:06.256620531 +0430
+@@ -20,6 +20,7 @@
#include <config.h>
#endif // HAVE_CONFIG_H
@@ -20,10 +20,10 @@ diff -ruN cnijfilter-source-4.00-1.orig/cngpij/cngpij/bjcups.c cnijfilter-source
#include <cups/cups.h>
#include <cups/language.h>
#include <cups/ppd.h>
-diff -ruN cnijfilter-source-4.00-1.orig/cngpijmnt/src/main.c cnijfilter-source-4.00-1/cngpijmnt/src/main.c
---- cnijfilter-source-4.00-1.orig/cngpijmnt/src/main.c 2013-07-17 06:03:45.000000000 +0430
-+++ cnijfilter-source-4.00-1/cngpijmnt/src/main.c 2015-08-04 12:28:27.062300453 +0430
-@@ -21,6 +21,7 @@
+diff -ruN cnijfilter-source-4.10-1.orig/cngpijmnt/src/main.c cnijfilter-source-4.10-1/cngpijmnt/src/main.c
+--- cnijfilter-source-4.10-1.orig/cngpijmnt/src/main.c 2013-12-24 07:39:15.000000000 +0330
++++ cnijfilter-source-4.10-1/cngpijmnt/src/main.c 2016-05-09 20:25:06.259953863 +0430
+@@ -20,6 +20,7 @@
#include <config.h>
#endif // HAVE_CONFIG_H
diff --git a/mychanges.patch b/mychanges.patch
index 87787043b648..c3d639e0e2e8 100644
--- a/mychanges.patch
+++ b/mychanges.patch
@@ -1,7 +1,7 @@
-diff -ruN cnijfilter-source-4.00-1.orig/backendnet/backend/cnijnetlm.c cnijfilter-source-4.00-1/backendnet/backend/cnijnetlm.c
---- cnijfilter-source-4.00-1.orig/backendnet/backend/cnijnetlm.c 2013-07-17 06:03:45.000000000 +0430
-+++ cnijfilter-source-4.00-1/backendnet/backend/cnijnetlm.c 2015-08-04 22:09:45.049007011 +0430
-@@ -253,6 +253,7 @@
+diff -ruN cnijfilter-source-4.10-1.orig/backendnet/backend/cnijnetlm.c cnijfilter-source-4.10-1/backendnet/backend/cnijnetlm.c
+--- cnijfilter-source-4.10-1.orig/backendnet/backend/cnijnetlm.c 2013-12-24 07:39:15.000000000 +0330
++++ cnijfilter-source-4.10-1/backendnet/backend/cnijnetlm.c 2016-05-09 20:25:06.263287197 +0430
+@@ -252,6 +252,7 @@
// waitpid( g_pid, NULL, 0) ; /* child process wait */
child_pid = wait(&child_status);
@@ -9,7 +9,7 @@ diff -ruN cnijfilter-source-4.00-1.orig/backendnet/backend/cnijnetlm.c cnijfilte
if (!WIFEXITED(child_status)){
return( CANON_STS_NG ) ;
-@@ -362,6 +363,9 @@
+@@ -361,6 +362,9 @@
fds.events = POLLOUT;
pollst = poll(&fds, 1, polltime);
@@ -19,10 +19,10 @@ diff -ruN cnijfilter-source-4.00-1.orig/backendnet/backend/cnijnetlm.c cnijfilte
if (fds.revents & POLLOUT){
fseek(tempfp, read_position, SEEK_SET);
-diff -ruN cnijfilter-source-4.00-1.orig/backendnet/lmonitor/cnijnetchk.c cnijfilter-source-4.00-1/backendnet/lmonitor/cnijnetchk.c
---- cnijfilter-source-4.00-1.orig/backendnet/lmonitor/cnijnetchk.c 2013-07-17 06:03:45.000000000 +0430
-+++ cnijfilter-source-4.00-1/backendnet/lmonitor/cnijnetchk.c 2015-08-04 22:15:53.849007431 +0430
-@@ -338,7 +338,7 @@
+diff -ruN cnijfilter-source-4.10-1.orig/backendnet/lmonitor/cnijnetchk.c cnijfilter-source-4.10-1/backendnet/lmonitor/cnijnetchk.c
+--- cnijfilter-source-4.10-1.orig/backendnet/lmonitor/cnijnetchk.c 2013-12-24 07:39:15.000000000 +0330
++++ cnijfilter-source-4.10-1/backendnet/lmonitor/cnijnetchk.c 2016-05-09 20:25:06.263287197 +0430
+@@ -337,7 +337,7 @@
bufsize = (src[0] << 8) + src[1];
buf = (char*)&(src[2]);
@@ -31,10 +31,10 @@ diff -ruN cnijfilter-source-4.00-1.orig/backendnet/lmonitor/cnijnetchk.c cnijfil
if (len > 1023) len = 1023;
keylen = strlen(key);
-diff -ruN cnijfilter-source-4.00-1.orig/bscc2sts/src/langmon.c cnijfilter-source-4.00-1/bscc2sts/src/langmon.c
---- cnijfilter-source-4.00-1.orig/bscc2sts/src/langmon.c 2013-07-17 06:03:45.000000000 +0430
-+++ cnijfilter-source-4.00-1/bscc2sts/src/langmon.c 2015-08-04 22:55:11.575676795 +0430
-@@ -259,7 +259,7 @@
+diff -ruN cnijfilter-source-4.10-1.orig/bscc2sts/src/langmon.c cnijfilter-source-4.10-1/bscc2sts/src/langmon.c
+--- cnijfilter-source-4.10-1.orig/bscc2sts/src/langmon.c 2013-12-24 07:39:15.000000000 +0330
++++ cnijfilter-source-4.10-1/bscc2sts/src/langmon.c 2016-05-09 20:25:06.263287197 +0430
+@@ -258,7 +258,7 @@
static int print_normal()
{
@@ -43,7 +43,7 @@ diff -ruN cnijfilter-source-4.00-1.orig/bscc2sts/src/langmon.c cnijfilter-source
int r_size;
int w_size;
char *buf;
-@@ -275,7 +275,7 @@
+@@ -274,7 +274,7 @@
w_size = write(PRNT_PATH, ptr, r_size);
if(w_size < 0){
/* write error */
@@ -52,10 +52,10 @@ diff -ruN cnijfilter-source-4.00-1.orig/bscc2sts/src/langmon.c cnijfilter-source
goto print_normal_exit;
}
ptr += w_size;
-diff -ruN cnijfilter-source-4.00-1.orig/bscc2sts/src/lm_print.c cnijfilter-source-4.00-1/bscc2sts/src/lm_print.c
---- cnijfilter-source-4.00-1.orig/bscc2sts/src/lm_print.c 2013-07-17 06:03:45.000000000 +0430
-+++ cnijfilter-source-4.00-1/bscc2sts/src/lm_print.c 2015-08-05 01:20:39.122353444 +0430
-@@ -245,13 +245,17 @@
+diff -ruN cnijfilter-source-4.10-1.orig/bscc2sts/src/lm_print.c cnijfilter-source-4.10-1/bscc2sts/src/lm_print.c
+--- cnijfilter-source-4.10-1.orig/bscc2sts/src/lm_print.c 2013-12-24 07:39:15.000000000 +0330
++++ cnijfilter-source-4.10-1/bscc2sts/src/lm_print.c 2016-05-09 20:25:06.266620531 +0430
+@@ -244,13 +244,17 @@
ptr = buf;
/* data print(output) loop */
for(;r_size > 0;r_size -= w_size){
@@ -73,10 +73,10 @@ diff -ruN cnijfilter-source-4.00-1.orig/bscc2sts/src/lm_print.c cnijfilter-sourc
#ifdef DATA_LOG
if(log_hand >=0 && w_size > 0)
write(log_hand, ptr, w_size);
-diff -ruN cnijfilter-source-4.00-1.orig/bscc2sts/src/lm_status.c cnijfilter-source-4.00-1/bscc2sts/src/lm_status.c
---- cnijfilter-source-4.00-1.orig/bscc2sts/src/lm_status.c 2013-07-17 06:03:45.000000000 +0430
-+++ cnijfilter-source-4.00-1/bscc2sts/src/lm_status.c 2015-08-05 01:17:11.799019876 +0430
-@@ -517,7 +517,9 @@
+diff -ruN cnijfilter-source-4.10-1.orig/bscc2sts/src/lm_status.c cnijfilter-source-4.10-1/bscc2sts/src/lm_status.c
+--- cnijfilter-source-4.10-1.orig/bscc2sts/src/lm_status.c 2013-12-24 07:39:15.000000000 +0330
++++ cnijfilter-source-4.10-1/bscc2sts/src/lm_status.c 2016-05-09 20:25:06.266620531 +0430
+@@ -516,7 +516,9 @@
int dev_path = PRNT_PATH;
short cnclerr = -1;
char *cmd_wrbuf = NULL;
@@ -86,7 +86,7 @@ diff -ruN cnijfilter-source-4.00-1.orig/bscc2sts/src/lm_status.c cnijfilter-sour
/* write command buffer */
cmd_wrbuf = (char *)malloc(MAX_STATBUF); /* 4096 */
-@@ -580,7 +582,9 @@
+@@ -579,7 +581,9 @@
/* wait "CNCL_CHECK_START2:response" */
cnclerr = -1;
@@ -96,10 +96,10 @@ diff -ruN cnijfilter-source-4.00-1.orig/bscc2sts/src/lm_status.c cnijfilter-sour
while( cnclerr != CNCL_OK ){
#ifdef DEBUG
fprintf(log_path, "CNCL_CHECK_START2:response @ i : %d\n",i);
-diff -ruN cnijfilter-source-4.00-1.orig/cngpij/cngpij/getipc.c cnijfilter-source-4.00-1/cngpij/cngpij/getipc.c
---- cnijfilter-source-4.00-1.orig/cngpij/cngpij/getipc.c 2013-07-17 06:03:45.000000000 +0430
-+++ cnijfilter-source-4.00-1/cngpij/cngpij/getipc.c 2015-08-04 22:42:47.449009279 +0430
-@@ -61,59 +61,57 @@
+diff -ruN cnijfilter-source-4.10-1.orig/cngpij/cngpij/getipc.c cnijfilter-source-4.10-1/cngpij/cngpij/getipc.c
+--- cnijfilter-source-4.10-1.orig/cngpij/cngpij/getipc.c 2013-12-24 07:39:15.000000000 +0330
++++ cnijfilter-source-4.10-1/cngpij/cngpij/getipc.c 2016-05-09 20:25:06.266620531 +0430
+@@ -60,59 +60,57 @@
while( (client_fd = accept(server_fd, (struct sockaddr *)&sun, &len)) >= 0 )
{
@@ -171,7 +171,7 @@ diff -ruN cnijfilter-source-4.00-1.orig/cngpij/cngpij/getipc.c cnijfilter-source
ret = RET_ERROR;
break;
}
-@@ -121,6 +120,8 @@
+@@ -120,6 +118,8 @@
if(client_fd < 0)
return RET_ERROR;
@@ -180,10 +180,10 @@ diff -ruN cnijfilter-source-4.00-1.orig/cngpij/cngpij/getipc.c cnijfilter-source
close(server_fd);
unlink(sname);
-diff -ruN cnijfilter-source-4.00-1.orig/cngpijmnt/src/getipc.c cnijfilter-source-4.00-1/cngpijmnt/src/getipc.c
---- cnijfilter-source-4.00-1.orig/cngpijmnt/src/getipc.c 2013-07-17 06:03:45.000000000 +0430
-+++ cnijfilter-source-4.00-1/cngpijmnt/src/getipc.c 2015-08-04 22:50:03.965676444 +0430
-@@ -63,59 +63,57 @@
+diff -ruN cnijfilter-source-4.10-1.orig/cngpijmnt/src/getipc.c cnijfilter-source-4.10-1/cngpijmnt/src/getipc.c
+--- cnijfilter-source-4.10-1.orig/cngpijmnt/src/getipc.c 2013-12-24 07:39:15.000000000 +0330
++++ cnijfilter-source-4.10-1/cngpijmnt/src/getipc.c 2016-05-09 20:25:06.266620531 +0430
+@@ -62,59 +62,57 @@
while( (client_fd = accept(server_fd, (struct sockaddr *)&sun, &len)) >= 0 )
{
@@ -255,7 +255,7 @@ diff -ruN cnijfilter-source-4.00-1.orig/cngpijmnt/src/getipc.c cnijfilter-source
ret = RET_ERROR;
break;
}
-@@ -123,6 +121,8 @@
+@@ -122,6 +120,8 @@
if(client_fd < 0)
return RET_ERROR;
@@ -264,10 +264,10 @@ diff -ruN cnijfilter-source-4.00-1.orig/cngpijmnt/src/getipc.c cnijfilter-source
close(server_fd);
unlink(sname);
-diff -ruN cnijfilter-source-4.00-1.orig/cnijnpr/src/cnijnpr.c cnijfilter-source-4.00-1/cnijnpr/src/cnijnpr.c
---- cnijfilter-source-4.00-1.orig/cnijnpr/src/cnijnpr.c 2013-07-17 06:03:45.000000000 +0430
-+++ cnijfilter-source-4.00-1/cnijnpr/src/cnijnpr.c 2015-08-04 23:39:02.832346470 +0430
-@@ -36,6 +36,7 @@
+diff -ruN cnijfilter-source-4.10-1.orig/cnijnpr/src/cnijnpr.c cnijfilter-source-4.10-1/cnijnpr/src/cnijnpr.c
+--- cnijfilter-source-4.10-1.orig/cnijnpr/src/cnijnpr.c 2013-12-24 07:39:15.000000000 +0330
++++ cnijfilter-source-4.10-1/cnijnpr/src/cnijnpr.c 2016-05-09 20:25:06.266620531 +0430
+@@ -35,6 +35,7 @@
#include <sys/sysctl.h>
#include <config.h>
#include <fcntl.h>
@@ -275,49 +275,37 @@ diff -ruN cnijfilter-source-4.00-1.orig/cnijnpr/src/cnijnpr.c cnijfilter-source-
#include <dlfcn.h>
#include "cncl.h"
-@@ -97,7 +98,7 @@
- /* argv[8]: /dev/usb/lp0 */
- /* */
+@@ -96,7 +97,7 @@
+ /* argv[8]: /dev/usb/lp0 */
+ /* */
/**********************************************/
-int main (int argc, const char **argv)
+int main (int argc, const char *argv[])
{
int fd;
int rtn = 0 ;
-@@ -584,7 +585,7 @@
+@@ -583,7 +584,7 @@
/************************************************/
- /* get_printer_devid */
+ /* get_printer_devid */
/************************************************/
-static int get_printer_devid(fdusb)
+static int get_printer_devid(int fdusb)
{
char devid[1024];
char *ivec = NULL;
-diff -ruN cnijfilter-source-4.00-1.orig/lgmon2/src/cnijifusb.c cnijfilter-source-4.00-1/lgmon2/src/cnijifusb.c
---- cnijfilter-source-4.00-1.orig/lgmon2/src/cnijifusb.c 2013-07-17 06:03:45.000000000 +0430
-+++ cnijfilter-source-4.00-1/lgmon2/src/cnijifusb.c 2015-08-04 23:50:15.772347241 +0430
-@@ -651,7 +651,7 @@
- fprintf(stderr, "DEBUG: get_serialNum = %s, know serialnum = %s\n", tmp_serial, serial);
- #endif
-
-- if(strncmp(tmp_serial, serial, sizeof(serial))){
-+ if(strncmp(tmp_serial, serial, sizeof(tmp_serial))){
- return CN_USB_WRITE_ERROR;
- }
- #ifdef _DEBUG_MODE_
-diff -ruN cnijfilter-source-4.00-1.orig/pstocanonij/filter/pstocanonij.c cnijfilter-source-4.00-1/pstocanonij/filter/pstocanonij.c
---- cnijfilter-source-4.00-1.orig/pstocanonij/filter/pstocanonij.c 2013-07-17 06:03:45.000000000 +0430
-+++ cnijfilter-source-4.00-1/pstocanonij/filter/pstocanonij.c 2015-08-04 23:58:38.662347818 +0430
-@@ -388,7 +388,7 @@
- {
- if( !IS_BLANK(*p_code) )
- break;
+diff -ruN cnijfilter-source-4.10-1.orig/pstocanonij/filter/pstocanonij.c cnijfilter-source-4.10-1/pstocanonij/filter/pstocanonij.c
+--- cnijfilter-source-4.10-1.orig/pstocanonij/filter/pstocanonij.c 2013-12-24 07:39:15.000000000 +0330
++++ cnijfilter-source-4.10-1/pstocanonij/filter/pstocanonij.c 2016-05-09 20:25:06.269953863 +0430
+@@ -387,7 +387,7 @@
+ {
+ if( !IS_BLANK(*p_code) )
+ break;
- *p_code++;
+ p_code++;
- }
- while( *p_code != '\0' )
- {
-@@ -1323,7 +1323,7 @@
+ }
+ while( *p_code != '\0' )
+ {
+@@ -1322,7 +1322,7 @@
int exec_filter(char *cmd_buf, int ofd, int fds[2])
{
@@ -326,7 +314,7 @@ diff -ruN cnijfilter-source-4.00-1.orig/pstocanonij/filter/pstocanonij.c cnijfil
int child_pid = -1;
char *filter_param[4];
char shell_buf[256];
-@@ -1363,7 +1363,7 @@
+@@ -1362,7 +1362,7 @@
execv(shell_buf, filter_param);
fprintf(stderr, "execl() error\n");