full remake, copied from oberon2007's

7 files changed, 319 insertions, 510 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e488d133715c..a2578b827014 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,25 @@
 pkgbase = cnijfilter-e510
 	pkgdesc = Canon IJ Printer Driver (For PIXMA E510 series)
 	pkgver = 3.80
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.canon-europe.com/support/consumer_products/products/printers/inkjet/other_pixma/pixma_e514.aspx
-	install = cnijfilter-e510.install
 	arch = i686
 	arch = x86_64
 	license = custom
-	makedepends = autoconf>=2.13
-	makedepends = automake>=1.6
-	makedepends = tar
-	makedepends = make
-	depends = cnijfilter-common>=4.00
+	makedepends = findutils
+	makedepends = gawk
+	depends = libpng<=1.7.0
+	depends = libtiff
+	depends = gtk2
+	depends = popt
 	source = http://gdlp01.c-wss.com/gds/6/0100005266/01/cnijfilter-source-3.80-2.tar.gz
-	source = libpng15.patch
 	source = cups.patch
-	source = buildfiles.patch
-	source = mychanges.patch
+	source = libpng15.patch
+	source = configures.patch
 	sha512sums = 693dad98b8e69bb4bbad3c62a600b0be5073e8765756cd57722038089387ffe532d01daf5a74d3a8aa93fdc14f7de0326b8aa67acce24d105b0dcb25dfd94be5
-	sha512sums = 0d8310867f45721150a870170172d3a0688bfba0267f627a630c105ff965d31f25dbcc31d3795874325bcb8eaeee395bf32b0648a743ff663dea6f977ab9070e
-	sha512sums = b46027090fc03f1b6503b4532881dfb49bf69eff342d4eedca6ed8e39f896de0ff8f8c5ae3dc8e9b5645a3dd1029390668a48737ce01d58d1b01b899fad56b4c
-	sha512sums = c4f36bce601cfc7a88933c480843c945daf0ae71dd07cf261bcd46017b350b9f870c8df5461ee82222e495a118d671b54b510ae42476fc89c38610b2a7c80d8c
-	sha512sums = 1cf54862db74f928a3a1ad0316b9940b843dbc4cae95bbb3d93ab317d248788cf844103bc006b4670c27b0f13952301b5907476a6c7d13ebb0cb5c0a942d6182
-	depends_i686 = gtk2
-	depends_i686 = libxml2
-	makedepends_i686 = gcc
-	makedepends_i686 = popt
-	depends_x86_64 = lib32-gtk2
-	depends_x86_64 = lib32-libxml2
-	makedepends_x86_64 = gcc-multilib
-	makedepends_x86_64 = lib32-popt
+	sha512sums = 447be6afc113074c7401c8ffd603e01d7c127708f0038c5e3bb45c9b63543c477f4ee85806d8b90b886a60312936bfa9bedb19cfef6d688eaedbcd7f1fb9f526
+	sha512sums = 0fb36eca8d6db03e5e55d03a81cf2b6bbcf203529611530429cf727582f83ba1db23165082ba2430ee88075cbcaacb13f9bb384c4fd20b23b91c6dc9d0e9cb09
+	sha512sums = 2a5af45a1978ae37dfb5f6ef7c549be0fed2fc50df8acdb565bf9568fa3c0b2beb4441fef9c49ecf9b22f62acf0dd7cc91e48ab3642d2c26ff10f0cbd8071e13
 
 pkgname = cnijfilter-e510
 
diff --git a/PKGBUILD b/PKGBUILD
index f30b962152a3..61acad3ecddf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,70 +1,115 @@
 # Maintainer: Roman Beslik <me@beroal.in.ua>
-# Contributor: Behnam Momeni <sbmomeni [at the] gmail [dot] com>
+# Contributor: Bernhard Landauer <oberon@manjaro.org>
+# Contributor: Tristelune  <tristelune at archlinux dot info>
 
-pkgname=('cnijfilter-e510')
-_pkgname=cnijfilter
 _model=e510
-_model_dir=403
-
+_pkgname=cnijfilter
+pkgname=cnijfilter-${_model}
 pkgver=3.80
-pkgrel=2
+pkgrel=3
 _pkgreview=2
-
 pkgdesc="Canon IJ Printer Driver (For PIXMA E510 series)"
 url="https://www.canon-europe.com/support/consumer_products/products/printers/inkjet/other_pixma/pixma_e514.aspx"
-
 arch=('i686' 'x86_64')
 license=('custom')
-
-makedepends_x86_64=('gcc-multilib' 'lib32-popt')
-depends_x86_64=('lib32-gtk2' 'lib32-libxml2')
-
-makedepends_i686=('gcc' 'popt')
-depends_i686=('gtk2' 'libxml2')
-
-makedepends=('autoconf>=2.13' 'automake>=1.6' 'tar' 'make')
-depends=("${_pkgname}-common>=4.00")
-
-install=cnijfilter-${_model}.install
-
-source=("http://gdlp01.c-wss.com/gds/6/0100005266/01/${_pkgname}-source-${pkgver}-${_pkgreview}.tar.gz"
-	"libpng15.patch"
-	"cups.patch"
-	"buildfiles.patch"
-	"mychanges.patch")
+depends=('libpng<=1.7.0' 'libtiff' 'gtk2' 'popt')
+makedepends=('findutils' 'gawk')
+_archive_name=${_pkgname}-source-${pkgver}-${_pkgreview}
+source=("http://gdlp01.c-wss.com/gds/6/0100005266/01/${_archive_name}.tar.gz"
+	'cups.patch'
+	'libpng15.patch'
+	'configures.patch')
 sha512sums=('693dad98b8e69bb4bbad3c62a600b0be5073e8765756cd57722038089387ffe532d01daf5a74d3a8aa93fdc14f7de0326b8aa67acce24d105b0dcb25dfd94be5'
-            '0d8310867f45721150a870170172d3a0688bfba0267f627a630c105ff965d31f25dbcc31d3795874325bcb8eaeee395bf32b0648a743ff663dea6f977ab9070e'
-            'b46027090fc03f1b6503b4532881dfb49bf69eff342d4eedca6ed8e39f896de0ff8f8c5ae3dc8e9b5645a3dd1029390668a48737ce01d58d1b01b899fad56b4c'
-            'c4f36bce601cfc7a88933c480843c945daf0ae71dd07cf261bcd46017b350b9f870c8df5461ee82222e495a118d671b54b510ae42476fc89c38610b2a7c80d8c'
-            '1cf54862db74f928a3a1ad0316b9940b843dbc4cae95bbb3d93ab317d248788cf844103bc006b4670c27b0f13952301b5907476a6c7d13ebb0cb5c0a942d6182')
+         '447be6afc113074c7401c8ffd603e01d7c127708f0038c5e3bb45c9b63543c477f4ee85806d8b90b886a60312936bfa9bedb19cfef6d688eaedbcd7f1fb9f526'
+         '0fb36eca8d6db03e5e55d03a81cf2b6bbcf203529611530429cf727582f83ba1db23165082ba2430ee88075cbcaacb13f9bb384c4fd20b23b91c6dc9d0e9cb09'
+         '2a5af45a1978ae37dfb5f6ef7c549be0fed2fc50df8acdb565bf9568fa3c0b2beb4441fef9c49ecf9b22f62acf0dd7cc91e48ab3642d2c26ff10f0cbd8071e13')
 
-prepare() {
-  cd ${srcdir}
-  tar xzf ${_pkgname}-source-${pkgver}-${_pkgreview}.tar.gz
-  cd ${srcdir}/${_pkgname}-source-${pkgver}-${_pkgreview}
+if [ "$CARCH" == "x86_64" ]; then  
+	_libdir=libs_bin64
+else
+	_libdir=libs_bin32
+fi
 
-  patch -p1 -i ${srcdir}/libpng15.patch
-  patch -p1 -i ${srcdir}/cups.patch
-  patch -p1 -i ${srcdir}/buildfiles.patch
-  patch -p1 -i ${srcdir}/mychanges.patch
+prepare() {
+	cd "${_pkgname}-source-${pkgver}-${_pkgreview}"
+	patch -p1 -i ${srcdir}/cups.patch
+	patch -p1 -i ${srcdir}/libpng15.patch
+	patch -p1 -i ${srcdir}/configures.patch
 }
 
 build() {
-  cd ${srcdir}/${_pkgname}-source-${pkgver}-${_pkgreview}
-
-  export CC="gcc -m32"
-  # Required for the glib2
-  export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
-  make ${_model}
+	## Compile and install ${_model} stuff
+	# ppd file
+	cd "${srcdir}/${_archive_name}/ppd"
+	./autogen.sh --prefix=/usr --enable-ppdpath=/usr/share/cups/model --program-suffix=${_model}
+	make 
+	# cnijfilter
+	cd "${srcdir}/${_archive_name}/cnijfilter"
+	./autogen.sh --prefix=/usr --enable-libpath=/usr/lib/bjlib --enable-binpath=/usr/bin --program-suffix=${_model}
+	make 
+	# lgmon
+	cd "${srcdir}/${_archive_name}/lgmon"
+	./autogen.sh --prefix=/usr --enable-progpath=/usr/bin --program-suffix=${_model}
+	make 
+	# cngpijmon
+	cd "${srcdir}/${_archive_name}/cngpijmon"
+	./autogen.sh --prefix=/usr --enable-progpath=/usr/bin --datadir=/usr/share --program-suffix=${_model}
+	make 
+
+	# cngpijmnt
+	cd "${srcdir}/${_archive_name}/cngpijmnt"
+	./autogen.sh --prefix=/usr --enable-progpath=/usr/bin --datadir=/usr/share --program-suffix=${_model}
+	make 
+
+	## Compile common stuff
+	# libs
+	cd "${srcdir}/${_archive_name}/libs"
+	./autogen.sh --prefix=/usr
+	make 
+	# cngpij, pstocanonij, backend
+	for _c in cngpij pstocanonij backend; do
+		cd "${srcdir}/${_archive_name}/${_c}"
+		./autogen.sh --prefix=/usr --enable-progpath=/usr/bin
+		make 
+	done
+	# backendnet
+	cd "${srcdir}/${_archive_name}/backendnet"
+	./autogen.sh --prefix=/usr --enable-progpath=/usr/bin LDFLAGS="-L../../com/${_libdir}"
+	make 
+	# sm sub process
+	cd "${srcdir}/${_archive_name}/cngpijmon/cnijnpr"
+	./autogen.sh --prefix=/usr --enable-progpath=/usr/bin LIBS="-ldl"
+	make 
+	# maintenance
+	cd "${srcdir}/${_archive_name}/maintenance"
+	./autogen.sh --prefix=/usr --datadir=/usr/share --program-suffix=${_model}
+	make 
 }
 
 package() {
-  cd ${srcdir}/cnijfilter-source-${pkgver}-${_pkgreview}
-  make PACKAGEDIR=${pkgdir} install${_model}
-
-  install -d ${pkgdir}/usr/lib32/bjlib
-  install -m 644 ${_model_dir}/database/* ${pkgdir}/usr/lib32/bjlib/
-  install -s -m 755 ${_model_dir}/libs_bin32/*.so.* ${pkgdir}/usr/lib32/
-
-  install -D LICENSE-cnijfilter-${pkgver}EN.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-cnijfilter-${pkgver}EN.txt
+	# get id of printer model	
+	_cmd=$(find ${srcdir}/${_archive_name} -type f -name cif${_model}.conf -path '*[\d]*' -printf '%P' \
+		| gawk -F/ '{print $1}')
+	_id=${_cmd}
+	echo ${pkgdir}
+
+
+	for dir in ppd cnijfilter lgmon cngpijmon cngpijmnt libs cngpij pstocanonij backend backendnet cngpijmon/cnijnpr maintenance; do
+		cd "${srcdir}/${_archive_name}/${dir}"
+		make install DESTDIR="${pkgdir}" 
+	done
+
+	# Install ${_id} libraries
+	install -d ${pkgdir}/usr/lib/
+	cp -P ${srcdir}/${_archive_name}/${_id}/${_libdir}/*so* ${pkgdir}/usr/lib/
+	install -d ${pkgdir}/usr/lib/bjlib/
+	install -m 644 ${srcdir}/${_archive_name}/${_id}/database/* ${pkgdir}/usr/lib/bjlib/
+	# Install common libraries
+	cp -P ${srcdir}/${_archive_name}/com/${_libdir}/*so* ${pkgdir}/usr/lib/
+	install -m 666 ${srcdir}/${_archive_name}/com/ini/* ${pkgdir}/usr/lib/bjlib/
+
+	# Install license file
+	cd ${srcdir}/${_archive_name}
+	install -d ${pkgdir}/usr/share/licenses/${pkgname}/
+	install -m 644 LICENSE-* ${pkgdir}/usr/share/licenses/${pkgname}/
 }
diff --git a/buildfiles.patch b/buildfiles.patch
deleted file mode 100644
index e000decce0ee..000000000000
--- a/buildfiles.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-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)
- 
-+e510 :
-+	for dir in "lgmon" "ppd" "cnijfilter" "maintenance" "cngpijmon"; do \
-+	  (cd $$dir; ./autogen.sh --prefix=/usr --program-suffix=e510 --enable-progpath=/usr/bin --libdir=/usr/lib32; make) || exit 1; \
-+	done
-+
-+installe510 :
-+	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/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)
- 
- 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
-@@ -43,7 +43,8 @@
- esac
- AC_SUBST(CNCL_LIB_ID)
- 
--ARC=`getconf LONG_BIT`
-+#ARC=`getconf LONG_BIT`
-+ARC=32
- AC_SUBST(ARC)
- 
- AC_PROG_CC
-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([
diff --git a/configures.patch b/configures.patch
new file mode 100644
index 000000000000..e9053aca30de
--- /dev/null
+++ b/configures.patch
@@ -0,0 +1,185 @@
+diff -Naur cnijfilter-source-3.80_old/backend/configure.in cnijfilter-source-3.80_new/backend/configure.in
+--- cnijfilter-source-3.80_old/backend/configure.in	2012-03-29 06:50:26.000000000 +0200
++++ cnijfilter-source-3.80_new/backend/configure.in	2013-03-30 19:49:17.676110106 +0100
+@@ -1,8 +1,6 @@
+ AC_INIT(src/cnij_backend_common.c)
+ AM_INIT_AUTOMAKE(backend, 3.80-1)
+ 
+-AM_CONFIG_HEADER(config.h)
+-
+ AC_ARG_ENABLE(progpath)
+ if test "${enable_progpath}" = "" ; then
+    enable_progpath="${ac_default_prefix}/bin"
+diff -Naur cnijfilter-source-3.80_old/backendnet/configure.in cnijfilter-source-3.80_new/backendnet/configure.in
+--- cnijfilter-source-3.80_old/backendnet/configure.in	2012-03-29 06:50:28.000000000 +0200
++++ cnijfilter-source-3.80_new/backendnet/configure.in	2013-03-30 19:49:59.339445829 +0100
+@@ -1,8 +1,6 @@
+ AC_INIT(backend/cnijnetlm.c)
+ AM_INIT_AUTOMAKE(backendnet, 3.80-1)
+ 
+-AM_CONFIG_HEADER(config.h)
+-
+ AC_ARG_ENABLE(progpath)
+ if test "${enable_progpath}" = "" ; then
+    enable_progpath="${ac_default_prefix}/bin"
+diff -Naur cnijfilter-source-3.80_old/cngpij/configure.in cnijfilter-source-3.80_new/cngpij/configure.in
+--- cnijfilter-source-3.80_old/cngpij/configure.in	2012-03-29 06:50:26.000000000 +0200
++++ cnijfilter-source-3.80_new/cngpij/configure.in	2013-03-30 19:50:31.336114459 +0100
+@@ -1,8 +1,6 @@
+ AC_INIT(cngpij/bjcups.c)
+ AM_INIT_AUTOMAKE(cngpij, 3.80-1)
+ 
+-AM_CONFIG_HEADER(config.h)
+-
+ AC_ARG_ENABLE(progpath)
+ if test "${enable_progpath}" = "" ; then
+    enable_progpath="${ac_default_prefix}/bin"
+diff -Naur cnijfilter-source-3.80_old/cngpijmnt/configure.in cnijfilter-source-3.80_new/cngpijmnt/configure.in
+--- cnijfilter-source-3.80_old/cngpijmnt/configure.in	2012-03-29 06:50:26.000000000 +0200
++++ cnijfilter-source-3.80_new/cngpijmnt/configure.in	2013-03-30 20:00:17.019449626 +0100
+@@ -1,7 +1,7 @@
+ AC_INIT(src/main.c)
+ AM_INIT_AUTOMAKE(cngpijmnt, 3.80-1)
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(src/config.h)
+ 
+ AC_ARG_ENABLE(progpath)
+ if test "${enable_progpath}" = "" ; then
+diff -Naur cnijfilter-source-3.80_old/cngpijmnt/src/config.h.in cnijfilter-source-3.80_new/cngpijmnt/src/config.h.in
+--- cnijfilter-source-3.80_old/cngpijmnt/src/config.h.in	1970-01-01 01:00:00.000000000 +0100
++++ cnijfilter-source-3.80_new/cngpijmnt/src/config.h.in	2013-03-30 20:00:39.726117465 +0100
+@@ -0,0 +1 @@
++/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+diff -Naur cnijfilter-source-3.80_old/cngpijmon/cnijnpr/config.h.in cnijfilter-source-3.80_new/cngpijmon/cnijnpr/config.h.in
+--- cnijfilter-source-3.80_old/cngpijmon/cnijnpr/config.h.in	1970-01-01 01:00:00.000000000 +0100
++++ cnijfilter-source-3.80_new/cngpijmon/cnijnpr/config.h.in	2013-03-30 20:05:33.316118236 +0100
+@@ -0,0 +1 @@
++/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+diff -Naur cnijfilter-source-3.80_old/cngpijmon/cnijnpr/configure.in cnijfilter-source-3.80_new/cngpijmon/cnijnpr/configure.in
+--- cnijfilter-source-3.80_old/cngpijmon/cnijnpr/configure.in	2012-03-27 03:36:03.000000000 +0200
++++ cnijfilter-source-3.80_new/cngpijmon/cnijnpr/configure.in	2013-03-30 20:39:06.969468182 +0100
+@@ -1,7 +1,7 @@
+ AC_INIT(configure.in)
+ AM_INIT_AUTOMAKE(cnijnpr, 3.80-1)
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ 
+ AC_ARG_ENABLE(libpath)
+diff -Naur cnijfilter-source-3.80_old/cngpijmon/configure.in cnijfilter-source-3.80_new/cngpijmon/configure.in
+--- cnijfilter-source-3.80_old/cngpijmon/configure.in	2012-03-27 03:36:01.000000000 +0200
++++ cnijfilter-source-3.80_new/cngpijmon/configure.in	2013-03-30 20:01:29.616118397 +0100
+@@ -18,11 +18,10 @@
+ 
+ 
+ AM_INIT_AUTOMAKE(cngpijmon${program_suffix}, 3.80-1)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(src/config.h)
+ 
+ AC_ISC_POSIX
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ 
+ AM_PATH_GTK_2_0(2.0.0, ,
+diff -Naur cnijfilter-source-3.80_old/cngpijmon/src/config.h.in cnijfilter-source-3.80_new/cngpijmon/src/config.h.in
+--- cnijfilter-source-3.80_old/cngpijmon/src/config.h.in	1970-01-01 01:00:00.000000000 +0100
++++ cnijfilter-source-3.80_new/cngpijmon/src/config.h.in	2013-03-30 20:01:59.622786406 +0100
+@@ -0,0 +1 @@
++/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+diff -Naur cnijfilter-source-3.80_old/cnijfilter/configure.in cnijfilter-source-3.80_new/cnijfilter/configure.in
+--- cnijfilter-source-3.80_old/cnijfilter/configure.in	2012-03-22 02:50:19.000000000 +0100
++++ cnijfilter-source-3.80_new/cnijfilter/configure.in	2013-03-30 20:06:35.126120985 +0100
+@@ -25,7 +25,7 @@
+ 
+ 
+ AM_INIT_AUTOMAKE(cif${program_suffix}, 3.80-1)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(src/config.h)
+ 
+ dnl Checks for programs.
+ AC_ISC_POSIX
+@@ -47,7 +47,6 @@
+ AC_SUBST(ARC)
+ 
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ 
+ dnl Checks for libraries.
+ 
+diff -Naur cnijfilter-source-3.80_old/lgmon/configure.in cnijfilter-source-3.80_new/lgmon/configure.in
+--- cnijfilter-source-3.80_old/lgmon/configure.in	2012-03-27 03:47:22.000000000 +0200
++++ cnijfilter-source-3.80_new/lgmon/configure.in	2013-03-30 20:09:18.259454784 +0100
+@@ -9,7 +9,7 @@
+ fi
+ 
+ AM_INIT_AUTOMAKE(lgmon{program_suffix}, 3.80-1)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(src/config.h)
+ dnl AM_MAINTAINER_MODE
+ 
+ AC_DEFINE_UNQUOTED(PACKAGE_PRINTER_MODEL, "${program_suffix}")
+@@ -41,7 +41,6 @@
+ AC_SUBST(ARC)
+ 
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ AC_PROG_RANLIB
+ 
+diff -Naur cnijfilter-source-3.80_old/lgmon/src/config.h.in cnijfilter-source-3.80_new/lgmon/src/config.h.in
+--- cnijfilter-source-3.80_old/lgmon/src/config.h.in	1970-01-01 01:00:00.000000000 +0100
++++ cnijfilter-source-3.80_new/lgmon/src/config.h.in	2013-03-30 20:09:39.996124099 +0100
+@@ -0,0 +1 @@
++/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+diff -Naur cnijfilter-source-3.80_old/libs/configure.in cnijfilter-source-3.80_new/libs/configure.in
+--- cnijfilter-source-3.80_old/libs/configure.in	2012-03-29 06:50:28.000000000 +0200
++++ cnijfilter-source-3.80_new/libs/configure.in	2013-03-30 20:10:09.992788214 +0100
+@@ -1,8 +1,6 @@
+ AC_INIT(paramlist/paramlist.h)
+ AM_INIT_AUTOMAKE(buftool, 1.0.0)
+ 
+-AM_CONFIG_HEADER(config.h)
+-
+ # Checks for programs.
+ AC_PROG_CXX
+ AC_PROG_CC
+diff -Naur cnijfilter-source-3.80_old/maintenance/configure.in cnijfilter-source-3.80_new/maintenance/configure.in
+--- cnijfilter-source-3.80_old/maintenance/configure.in	2012-03-29 09:03:26.000000000 +0200
++++ cnijfilter-source-3.80_new/maintenance/configure.in	2013-03-30 20:13:16.686122979 +0100
+@@ -9,7 +9,7 @@
+ fi
+ 
+ AM_INIT_AUTOMAKE(maintenance${program_suffix}, 3.80-1)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(src/config.h)
+ AM_MAINTAINER_MODE
+ 
+ AC_DEFINE_UNQUOTED(PACKAGE_PRINTER_MODEL, "${program_suffix}")
+@@ -45,7 +45,6 @@
+ 
+ AC_ISC_POSIX
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ 
+ AM_PATH_GTK_2_0(2.6.0, ,
+diff -Naur cnijfilter-source-3.80_old/maintenance/src/config.h.in cnijfilter-source-3.80_new/maintenance/src/config.h.in
+--- cnijfilter-source-3.80_old/maintenance/src/config.h.in	1970-01-01 01:00:00.000000000 +0100
++++ cnijfilter-source-3.80_new/maintenance/src/config.h.in	2013-03-30 20:13:40.726123659 +0100
+@@ -0,0 +1 @@
++/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+diff -Naur cnijfilter-source-3.80_old/pstocanonij/configure.in cnijfilter-source-3.80_new/pstocanonij/configure.in
+--- cnijfilter-source-3.80_old/pstocanonij/configure.in	2012-03-29 06:50:25.000000000 +0200
++++ cnijfilter-source-3.80_new/pstocanonij/configure.in	2013-03-30 20:15:28.832790973 +0100
+@@ -1,8 +1,6 @@
+ AC_INIT(filter/pstocanonij.c)
+ AM_INIT_AUTOMAKE(pstocanonij, 1.0.0)
+ 
+-AM_CONFIG_HEADER(config.h)
+-
+ AC_ARG_ENABLE(progpath)
+ if test "${enable_progpath}" = "" ; then
+    enable_progpath="${ac_default_prefix}/bin"
diff --git a/cups.patch b/cups.patch
index 1480fc00e0f6..ffe2900faf0a 100644
--- a/cups.patch
+++ b/cups.patch
@@ -1,6 +1,6 @@
-diff -Nur cnijfilter-source-3.20-1.orig/backend/src/cnij_backend_common.c cnijfilter-source-3.20-1/backend/src/cnij_backend_common.c
---- cnijfilter-source-3.20-1.orig/backend/src/cnij_backend_common.c	2009-05-27 07:46:41.000000000 +0200
-+++ cnijfilter-source-3.20-1/backend/src/cnij_backend_common.c	2012-08-15 15:28:06.172143834 +0200
+diff -aur cnijfilter-source-3.80_old/backend/src/cnij_backend_common.c cnijfilter-source-3.80_new/backend/src/cnij_backend_common.c
+--- cnijfilter-source-3.80_old/backend/src/cnij_backend_common.c	2012-03-29 06:50:27.000000000 +0200
++++ cnijfilter-source-3.80_new/backend/src/cnij_backend_common.c	2013-03-31 19:49:41.335034142 +0200
 @@ -38,6 +38,7 @@
  // CUPS Header
  #include <cups/cups.h>
@@ -9,9 +9,9 @@ diff -Nur cnijfilter-source-3.20-1.orig/backend/src/cnij_backend_common.c cnijfi
  
  // Header file for CANON
  #include "cnij_backend_common.h"
-diff -Nur cnijfilter-source-3.20-1.orig/cngpij/cngpij/bjcups.c cnijfilter-source-3.20-1/cngpij/cngpij/bjcups.c
---- cnijfilter-source-3.20-1.orig/cngpij/cngpij/bjcups.c	2009-06-11 06:10:32.000000000 +0200
-+++ cnijfilter-source-3.20-1/cngpij/cngpij/bjcups.c	2012-08-15 15:28:06.173143833 +0200
+diff -aur cnijfilter-source-3.80_old/cngpij/cngpij/bjcups.c cnijfilter-source-3.80_new/cngpij/cngpij/bjcups.c
+--- cnijfilter-source-3.80_old/cngpij/cngpij/bjcups.c	2012-04-17 05:39:20.000000000 +0200
++++ cnijfilter-source-3.80_new/cngpij/cngpij/bjcups.c	2013-03-31 19:46:55.918366202 +0200
 @@ -21,6 +21,7 @@
  #include	<config.h>
  #endif	// HAVE_CONFIG_H
@@ -20,10 +20,21 @@ diff -Nur cnijfilter-source-3.20-1.orig/cngpij/cngpij/bjcups.c cnijfilter-source
  #include <cups/cups.h>
  #include <cups/language.h>
  #include <cups/ppd.h>
-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,8 +18,9 @@
+diff -aur cnijfilter-source-3.80_old/cngpijmnt/src/main.c cnijfilter-source-3.80_new/cngpijmnt/src/main.c
+--- cnijfilter-source-3.80_old/cngpijmnt/src/main.c	2012-04-26 11:49:34.000000000 +0200
++++ cnijfilter-source-3.80_new/cngpijmnt/src/main.c	2013-03-31 19:43:50.738364780 +0200
+@@ -21,6 +21,7 @@
+ #include	<config.h>
+ #endif	// HAVE_CONFIG_H
+ 
++#define _IPP_PRIVATE_STRUCTURES 1
+ #include <cups/cups.h>
+ #include <cups/language.h>
+ #include <cups/ppd.h>
+diff -aur cnijfilter-source-3.80_old/cngpijmon/src/bjcupsmon_cups.c cnijfilter-source-3.80_new/cngpijmon/src/bjcupsmon_cups.c
+--- cnijfilter-source-3.80_old/cngpijmon/src/bjcupsmon_cups.c	2012-05-22 11:49:27.000000000 +0200
++++ cnijfilter-source-3.80_new/cngpijmon/src/bjcupsmon_cups.c	2013-03-31 19:37:24.238361808 +0200
+@@ -18,9 +18,11 @@
   */
  
  /*** Includes ***/
@@ -31,5 +42,7 @@ diff -Nur cnijfilter-source-3.20-1.orig/cngpijmon/src/bjcupsmon_cups.c cnijfilte
  #include <cups/cups.h>
  #include <cups/ppd.h>
  #include <cups/language.h>
++#include <cups/ppd.h>
  #include <sys/types.h>
  #include <unistd.h>
+ #include <pwd.h>
diff --git a/libpng15.patch b/libpng15.patch
index f5b3a1b13db5..84d00c2c4323 100644
--- a/libpng15.patch
+++ b/libpng15.patch
@@ -1,6 +1,6 @@
-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 06:11:05.000000000 +0100
-+++ cnijfilter-source-3.20-1.new/cnijfilter/src/bjfimage.c	2012-02-10 09:33:52.512334139 +0100
+diff -aur cnijfilter-source-3.80_old/cnijfilter/src/bjfimage.c cnijfilter-source-3.80_new/cnijfilter/src/bjfimage.c
+--- cnijfilter-source-3.80_old/cnijfilter/src/bjfimage.c	2012-03-22 02:50:19.000000000 +0100
++++ cnijfilter-source-3.80_new/cnijfilter/src/bjfimage.c	2013-03-31 19:27:17.768357145 +0200
 @@ -1520,8 +1520,8 @@
  	short			tmpformat;
  	short			retbyte = 0;
diff --git a/mychanges.patch b/mychanges.patch
deleted file mode 100644
index aff96396724c..000000000000
--- a/mychanges.patch
+++ /dev/null
@@ -1,369 +0,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
-@@ -256,6 +256,7 @@
- 		
- 		// waitpid( g_pid, NULL, 0) ;		/* child process wait		*/
- 		child_pid = wait(&child_status);
-+		(void) child_pid;
- 		
- 		if (!WIFEXITED(child_status)){
- 			return( CANON_STS_NG ) ;
-@@ -365,6 +366,10 @@
- 			fds.events = POLLOUT;
- 			
- 			pollst = poll(&fds, 1, polltime);
-+			if (pollst == -1) {
-+				goto error;
-+			}
-+
- 			
- 			if (fds.revents & POLLOUT){
- 				fseek(tempfp, read_position, SEEK_SET);
-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
-@@ -288,7 +290,7 @@
- 	bufsize = (src[0] << 8) + src[1]; 
- 	buf = (char*)&(src[2]);
- 
--	len = strlen(buf);
-+	len = strnlen(buf, bufsize);
- 	if (len > 1023) len = 1023;
- 	
- 	keylen = strlen(key);
-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
-@@ -255,6 +256,8 @@
- 		if (CNNL_Config(hnd, CNNL_CONFIG_SET_VERSION, &latest_version, &param_size) != CNNL_RET_SUCCESS){
- 			goto error_open;
- 		}
-+
-+		goto find_printer;
- 		
- find_printer:
- 		/* ---------------------------------------------------------------------
-@@ -652,7 +655,7 @@
- 	unsigned long d_time;
- 	fd_set  fds;
- 	struct timeval timeout;
--	int errorcount=0;
-+//	int errorcount=0;
- 	
- 	while (!(mode & CNNL_JOB_CANCELLED)){
- 		timeout.tv_sec = 3;
-@@ -677,7 +680,7 @@
- 				mode |= CNNL_JOB_ERROR;
- 				return 0;
- 			} else {
--				errorcount=0;
-+//				errorcount=0;
- 			}
- 		}
- 	}
-diff -aur cnijfilter-source-3.20-1/cngpij/cngpij/getipc.c cnijfilter-source-3.20-1.new/cngpij/cngpij/getipc.c
---- cnijfilter-source-3.20-1/cngpij/cngpij/getipc.c	2009-04-23 14:26:50.000000000 +0430
-+++ cnijfilter-source-3.20-1.new/cngpij/cngpij/getipc.c	2013-07-26 00:12:36.283321388 +0430
-@@ -61,12 +61,18 @@
- 
- 	while( (client_fd = accept(server_fd, (struct sockaddr *)&sun, &len)) >= 0 )
- 	{
-+#define READ_FD_AND_BREAK_UPON_ERROR(FD, BUF, LEN) \
-+		if ( read(FD, BUF, LEN) == -1 ) \
-+		{ \
-+			ret = RET_ERROR; \
-+			break; \
-+		}
- 		/* read command first */
--		read(client_fd, buf, IPCCMDLEN);
-+		READ_FD_AND_BREAK_UPON_ERROR(client_fd, buf, IPCCMDLEN);
- 
- 		if( strcmp(buf, "PRINT") == 0 )
- 		{											/* PRINT command */
--			read(client_fd, pipc, sizeof(IPCU));
-+			READ_FD_AND_BREAK_UPON_ERROR(client_fd, pipc, sizeof(IPCU));
- 			close(client_fd);
- 			ret = RET_PRINT;
- 			break;
-@@ -79,28 +85,28 @@
- 		}
- 		else if( strcmp(buf, "PDATA") == 0 )
- 		{											/* PDATA command (for maintenance) */
--			read(client_fd, pipc, sizeof(IPCU));
-+			READ_FD_AND_BREAK_UPON_ERROR(client_fd, pipc, sizeof(IPCU));
- 			close(client_fd);
- 			ret = RET_PDATA;
- 			break;
- 		}
- 		else if( strcmp(buf, "POWEROFF") == 0 )
- 		{											/* POWEROFF (for maintenance. added in 09_2h) */
--			read(client_fd, pipc, sizeof(IPCU));
-+			READ_FD_AND_BREAK_UPON_ERROR(client_fd, pipc, sizeof(IPCU));
- 			close(client_fd);
- 			ret = RET_POWEROFF;
- 			break;
- 		}
- 		else if( strcmp(buf, "FDATA") == 0 )
- 		{											/* FDATA command (for maintenance) */
--			read(client_fd, pipc, sizeof(IPCU));
-+			READ_FD_AND_BREAK_UPON_ERROR(client_fd, pipc, sizeof(IPCU));
- 			close(client_fd);
- 			ret = RET_FDATA;
- 			break;
- 		}
- 		else if( strcmp(buf, "WDATA") == 0 )
- 		{											/* WDATA command (for maintenance) */
--			read(client_fd, pipc, sizeof(IPCU));
-+			READ_FD_AND_BREAK_UPON_ERROR(client_fd, pipc, sizeof(IPCU));
- 			close(client_fd);
- 			ret = RET_WDATA;
- 			break;
-diff -aur cnijfilter-source-3.20-1/cngpijmon/cnijnpr/cnijnpr/cnijnpr.c cnijfilter-source-3.20-1.new/cngpijmon/cnijnpr/cnijnpr/cnijnpr.c
---- cnijfilter-source-3.20-1/cngpijmon/cnijnpr/cnijnpr/cnijnpr.c	2009-06-08 11:42:52.000000000 +0430
-+++ cnijfilter-source-3.20-1.new/cngpijmon/cnijnpr/cnijnpr/cnijnpr.c	2015-06-24 19:26:47.455618449 +0430
-@@ -35,6 +35,7 @@
- #include <net/if.h>
- #include <sys/sysctl.h>
- #include <config.h>
- #include <fcntl.h>
-+#include <unistd.h>
- 
- #include <dlfcn.h>
- #include "cncl.h"
-@@ -85,7 +86,7 @@
- /*		argv[6]: modelID                      */
- /*                                            */
- /**********************************************/
--int main (int argc, const char **argv)
-+int main (int argc, char *argv[])
- {
- 	int		fd;
- 	int		rtn = 0 ;
-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
-@@ -63,12 +63,19 @@
- 	if (listen(s, 5))
- 		return RET_ERROR;
- 
--	while ((c = accept(s, (struct sockaddr *)&sun, &adrlen)) >= 0) {
-+	while ((c = accept(s, (struct sockaddr *)&sun, &adrlen)) >= 0)
-+	{
-+#define READ_FD_AND_BREAK_UPON_ERROR(FD, BUF, LEN) \
-+		if ( read(FD, BUF, LEN) == -1 ) \
-+		{ \
-+			ret = RET_ERROR; \
-+			break; \
-+		}
- 		/* read command first */
--		read(c, buf, IPCCMDLEN);
-+		READ_FD_AND_BREAK_UPON_ERROR(c, buf, IPCCMDLEN);
- 
- 		if (strcmp(buf, "PRINT") == 0) {			/* PRINT command */
--			read(c, pipc, sizeof(IPCU));
-+			READ_FD_AND_BREAK_UPON_ERROR(c, pipc, sizeof(IPCU));
- 			close(c);
- 			ret = RET_PRINT;
- 			break;
-@@ -79,13 +86,13 @@
- 			break;
- 		}
- 		else if (strcmp(buf, "PDATA") == 0) {		/* PDATA command (for maintenance) */
--			read(c, pipc, sizeof(IPCU));
-+			READ_FD_AND_BREAK_UPON_ERROR(c, pipc, sizeof(IPCU));
- 			close(c);
- 			ret = RET_PDATA;
- 			break;
- 		}
- 		else if (strcmp(buf, "FDATA") == 0) {		/* FDATA command (to print testpattern) */
--			read(c, pipc, sizeof(IPCU));
-+			READ_FD_AND_BREAK_UPON_ERROR(c, pipc, sizeof(IPCU));
- 			close(c);
- 			ret = RET_FDATA;
- 			break;
-diff -aur cnijfilter-source-3.20-1/lgmon/src/560ifunc.c cnijfilter-source-3.20-1.new/lgmon/src/560ifunc.c
---- cnijfilter-source-3.20-1/lgmon/src/560ifunc.c	2009-04-24 10:49:35.000000000 +0430
-+++ cnijfilter-source-3.20-1.new/lgmon/src/560ifunc.c	2013-07-26 00:12:36.286654674 +0430
-@@ -103,7 +103,7 @@
-   	}
-   	
-   }
--  return(OK);
-+  return ret;
- }
- 
- 
-diff -aur cnijfilter-source-3.20-1/lgmon/src/850ifunc.c cnijfilter-source-3.20-1.new/lgmon/src/850ifunc.c
---- cnijfilter-source-3.20-1/lgmon/src/850ifunc.c	2009-04-24 10:49:35.000000000 +0430
-+++ cnijfilter-source-3.20-1.new/lgmon/src/850ifunc.c	2013-07-26 00:12:36.286654674 +0430
-@@ -103,7 +103,7 @@
-   	}
-   	
-   }
--  return(OK);
-+  return ret;
- }
- 
- 
-diff -aur cnijfilter-source-3.20-1/lgmon/src/860ifunc.c cnijfilter-source-3.20-1.new/lgmon/src/860ifunc.c
---- cnijfilter-source-3.20-1/lgmon/src/860ifunc.c	2009-04-24 10:49:35.000000000 +0430
-+++ cnijfilter-source-3.20-1.new/lgmon/src/860ifunc.c	2013-07-26 00:12:36.286654674 +0430
-@@ -103,7 +103,7 @@
-   	}
-   	
-   }
--  return(OK);
-+  return ret;
- }
- 
- 
-diff -aur cnijfilter-source-3.20-1/lgmon/src/950ifunc.c cnijfilter-source-3.20-1.new/lgmon/src/950ifunc.c
---- cnijfilter-source-3.20-1/lgmon/src/950ifunc.c	2009-04-24 10:49:35.000000000 +0430
-+++ cnijfilter-source-3.20-1.new/lgmon/src/950ifunc.c	2013-07-26 00:12:36.286654674 +0430
-@@ -145,7 +145,7 @@
-   	}
-   	
-   }
--  return(OK);
-+  return ret;
- }
- 
- 
-diff -aur cnijfilter-source-3.20-1/lgmon/src/990ifunc.c cnijfilter-source-3.20-1.new/lgmon/src/990ifunc.c
---- cnijfilter-source-3.20-1/lgmon/src/990ifunc.c	2009-04-24 10:49:35.000000000 +0430
-+++ cnijfilter-source-3.20-1.new/lgmon/src/990ifunc.c	2013-07-26 00:12:36.286654674 +0430
-@@ -145,7 +145,7 @@
-   	}
-   	
-   }
--  return(OK);
-+  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
-@@ -103,7 +103,7 @@
-   	}
-   	
-   }
--  return(OK);
-+  return ret;
- }
- 
- 
-diff -aur cnijfilter-source-3.20-1/lgmon/src/ip4100func.c cnijfilter-source-3.20-1.new/lgmon/src/ip4100func.c
---- cnijfilter-source-3.20-1/lgmon/src/ip4100func.c	2009-04-24 10:49:35.000000000 +0430
-+++ cnijfilter-source-3.20-1.new/lgmon/src/ip4100func.c	2013-07-26 00:12:36.289987934 +0430
-@@ -103,7 +103,7 @@
-   	}
-   	
-   }
--  return(OK);
-+  return ret;
- }
- 
- 
-diff -aur cnijfilter-source-3.20-1/lgmon/src/ip8600func.c cnijfilter-source-3.20-1.new/lgmon/src/ip8600func.c
---- cnijfilter-source-3.20-1/lgmon/src/ip8600func.c	2009-04-24 10:49:35.000000000 +0430
-+++ cnijfilter-source-3.20-1.new/lgmon/src/ip8600func.c	2013-07-26 00:12:36.289987934 +0430
-@@ -145,7 +145,7 @@
-   	}
-   	
-   }
--  return(OK);
-+  return ret;
- }
- 
- 
-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
-@@ -255,7 +259,7 @@
- 
- static int print_normal()
- {
--	int error = 0;
-+//	int error = 0;
- 	int r_size;
- 	int w_size;
- 	char *buf;
-@@ -274,7 +279,7 @@
- 			w_size = write(PRNT_PATH, ptr, r_size);
- 			if(w_size < 0){
- 				/* write error */
--				error = -1;
-+//				error = -1;
- 				goto print_normal_exit;
- 			}
- 			ptr += w_size;
-diff -aur cnijfilter-source-3.20-1/lgmon/src/lm_print.c cnijfilter-source-3.20-1.new/lgmon/src/lm_print.c
---- cnijfilter-source-3.20-1/lgmon/src/lm_print.c	2009-05-18 09:44:51.000000000 +0430
-+++ cnijfilter-source-3.20-1.new/lgmon/src/lm_print.c	2013-07-26 00:12:36.289987934 +0430
-@@ -245,13 +245,17 @@
- 		ptr = buf;
- 		/* data print(output) loop */
- 		for(;r_size > 0;r_size -= w_size){
-+#ifdef DEBUG
- 			int err;
-+#endif
- 
- 			signal_block(sigmask);   /* signal block */
- 			get_printer_sem(sem_id); /* printer lock */
- 
- 			w_size = p_dvacs->ptdev_write(dev_path, ptr, r_size); /* data write -> printer */
-+#ifdef DEBUG
- 			err = errno;
-+#endif
- #ifdef DATA_LOG
- 			if(log_hand >=0 && w_size > 0)
- 				write(log_hand, ptr, w_size);
-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
-@@ -445,7 +445,9 @@
- 	int dev_path = PRNT_PATH;
- 	short	cnclerr = -1;
- 	char *cmd_wrbuf = NULL;
-+#ifdef DEBUG
- 	short i=0;
-+#endif
- 
- 	/* write command buffer */
- 	cmd_wrbuf = (char *)malloc(MAX_STATBUF); /* 4096 */
-@@ -506,7 +508,9 @@
- 
- 		/* wait "CNCL_CHECK_START2:response" */
- 		cnclerr = -1;
-+#ifdef DEBUG
- 		i = 0;
-+#endif
- 		while( cnclerr != CNCL_OK ){
- #ifdef DEBUG
- 			fprintf(log_path, "CNCL_CHECK_START2:response @  i : %d\n",i);
-diff -aur cnijfilter-source-3.20-1/lgmon/src/lm_sub.c cnijfilter-source-3.20-1.new/lgmon/src/lm_sub.c
---- cnijfilter-source-3.20-1/lgmon/src/lm_sub.c	2009-07-28 12:46:33.000000000 +0430
-+++ cnijfilter-source-3.20-1.new/lgmon/src/lm_sub.c	2013-07-26 00:12:36.289987934 +0430
-@@ -788,7 +788,8 @@
- 		//fflush(log_path);
- #endif
- 		if( ret3 == CNCL_OK ){
--			memset( buf, 0, sizeof(buf) );
-+//			memset( buf, 0, sizeof(buf) );
-+			memset( buf, 0, MAX_STATBUF );
- 			memcpy( &buf[0], &buf2[0], MAX_STATBUF );
- 		}
- 		else
-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
-@@ -1198,6 +1198,7 @@
- 			close(fds[0]);
- 		}
- 	}
-+	(void) status;
- 	return child_pid;
- }
-