diff options
author | Behnam Momeni | 2020-09-17 19:52:08 +0430 |
---|---|---|
committer | Behnam Momeni | 2020-09-17 19:52:08 +0430 |
commit | ece92af501ee3918881222d00e0052677e696ba1 (patch) | |
tree | b9119bd53a45cc1182d2dcfb877d53b57ef822ed | |
parent | ba88f745a6f347425534a3bb73a7899d1b408a5d (diff) | |
download | aur-ece92af501ee3918881222d00e0052677e696ba1.tar.gz |
Patch cnijnpr/src/cnijnpr.c for deprecated sysctl.h
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | PKGBUILD | 6 | ||||
-rw-r--r-- | mychanges.patch | 42 |
4 files changed, 34 insertions, 21 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Fri Oct 18 18:12:54 UTC 2019 +# Thu Sep 17 15:19:58 UTC 2020 pkgbase = cnijfilter-common pkgdesc = Canon IJ Printer Driver (Common Package) pkgver = 4.10 - pkgrel = 2 + pkgrel = 3 url = http://www.canon-europe.com/support/pixma_software/ install = cnijfilter-common.install arch = i686 @@ -21,7 +21,7 @@ pkgbase = cnijfilter-common sha512sums = 58198e92e360c71c95423bfa8278f449eb645245af1b96770323cb6f4b2b7186e5ab326d58377c20627c750d3d8c253addf637f9d18e085b1c89a81d6239ab51 sha512sums = ce3de5764d47809166c86cc52feeae354f459bdc1db757ee62e8c7793b4886f95d9a04caee5adefc73b3ae1752ce370668d23d9530ebf8be2b7b25066e064210 sha512sums = fb73e2e0653f2654a9c5211b5dc3e06ce24cd2f5bf64a27009f5446e69c7f02d78bb201f15da0f68ad01b1cb4e699c808eccb9df690ffea07b6d5a59ab5629f3 - sha512sums = c23d7e8406a7b43b0680a43cc1467075afc299b85ce5c3f7c0eb8e85f573226ec0dfb1497b70e0b08746cbc639360b746cd5962cfbf3935adb66aedf2a7fbcd2 + sha512sums = 1c70fbe7da493cd44e13149baeda1d90edbbe0d9e52ca9178e70b8dc0e494f544523eefad653e2f2a4c0283f601feb549767f2eb2941cd44dc97ebc8b2b0db9a depends_i686 = libcups depends_i686 = popt depends_i686 = libusb diff --git a/.gitignore b/.gitignore index b96695de219c..34460684d8d6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ pkg/ src/ cnijfilter-source-*.tar.gz *.pkg.tar.xz +*.pkg.tar.zst *~ @@ -4,11 +4,11 @@ # Contributor: Jeroen Op 't Eynde <jeroen [at the] xprsyrslf [dot] be> # Contributor: Maxqia <contrib [at the] maxqia [dot] com -pkgname=('cnijfilter-common') +pkgname=cnijfilter-common _pkgname=cnijfilter pkgver=4.10 -pkgrel=2 +pkgrel=3 _pkgreview=1 pkgdesc="Canon IJ Printer Driver (Common Package)" @@ -37,7 +37,7 @@ source=("cnijfilter-source-4.10-1.tar.gz::http://pdisp01.c-wss.com/gdl/WWUFORedi sha512sums=('58198e92e360c71c95423bfa8278f449eb645245af1b96770323cb6f4b2b7186e5ab326d58377c20627c750d3d8c253addf637f9d18e085b1c89a81d6239ab51' 'ce3de5764d47809166c86cc52feeae354f459bdc1db757ee62e8c7793b4886f95d9a04caee5adefc73b3ae1752ce370668d23d9530ebf8be2b7b25066e064210' 'fb73e2e0653f2654a9c5211b5dc3e06ce24cd2f5bf64a27009f5446e69c7f02d78bb201f15da0f68ad01b1cb4e699c808eccb9df690ffea07b6d5a59ab5629f3' - 'c23d7e8406a7b43b0680a43cc1467075afc299b85ce5c3f7c0eb8e85f573226ec0dfb1497b70e0b08746cbc639360b746cd5962cfbf3935adb66aedf2a7fbcd2') + '1c70fbe7da493cd44e13149baeda1d90edbbe0d9e52ca9178e70b8dc0e494f544523eefad653e2f2a4c0283f601feb549767f2eb2941cd44dc97ebc8b2b0db9a') prepare() { cd "${srcdir}/${_pkgname}-source-${pkgver}-${_pkgreview}/" diff --git a/mychanges.patch b/mychanges.patch index e49fea1a82f3..436b739492cc 100644 --- a/mychanges.patch +++ b/mychanges.patch @@ -1,6 +1,6 @@ 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 2019-10-18 19:59:20.867823821 +0330 ++++ cnijfilter-source-4.10-1/backendnet/backend/cnijnetlm.c 2020-09-17 19:44:53.592370556 +0430 @@ -252,6 +252,7 @@ // waitpid( g_pid, NULL, 0) ; /* child process wait */ @@ -21,7 +21,7 @@ diff -ruN cnijfilter-source-4.10-1.orig/backendnet/backend/cnijnetlm.c cnijfilte fseek(tempfp, read_position, SEEK_SET); 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 2019-10-18 19:59:20.867823821 +0330 ++++ cnijfilter-source-4.10-1/backendnet/lmonitor/cnijnetchk.c 2020-09-17 19:44:53.592370556 +0430 @@ -337,7 +337,7 @@ bufsize = (src[0] << 8) + src[1]; buf = (char*)&(src[2]); @@ -33,7 +33,7 @@ diff -ruN cnijfilter-source-4.10-1.orig/backendnet/lmonitor/cnijnetchk.c cnijfil keylen = strlen(key); 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 2019-10-18 19:59:20.867823821 +0330 ++++ cnijfilter-source-4.10-1/bscc2sts/src/langmon.c 2020-09-17 19:44:53.592370556 +0430 @@ -258,7 +258,7 @@ static int print_normal() @@ -54,7 +54,7 @@ diff -ruN cnijfilter-source-4.10-1.orig/bscc2sts/src/langmon.c cnijfilter-source ptr += w_size; 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 2019-10-18 19:59:20.867823821 +0330 ++++ cnijfilter-source-4.10-1/bscc2sts/src/lm_print.c 2020-09-17 19:44:53.592370556 +0430 @@ -244,13 +244,17 @@ ptr = buf; /* data print(output) loop */ @@ -75,7 +75,7 @@ diff -ruN cnijfilter-source-4.10-1.orig/bscc2sts/src/lm_print.c cnijfilter-sourc write(log_hand, ptr, w_size); 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 2019-10-18 19:59:20.867823821 +0330 ++++ cnijfilter-source-4.10-1/bscc2sts/src/lm_status.c 2020-09-17 19:44:53.592370556 +0430 @@ -516,7 +516,9 @@ int dev_path = PRNT_PATH; short cnclerr = -1; @@ -98,7 +98,7 @@ diff -ruN cnijfilter-source-4.10-1.orig/bscc2sts/src/lm_status.c cnijfilter-sour fprintf(log_path, "CNCL_CHECK_START2:response @ i : %d\n",i); 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 2019-10-18 21:38:49.880605949 +0330 ++++ cnijfilter-source-4.10-1/cngpij/cngpij/bjcups.c 2020-09-17 19:44:53.595703924 +0430 @@ -660,22 +660,6 @@ @@ -204,7 +204,7 @@ diff -ruN cnijfilter-source-4.10-1.orig/cngpij/cngpij/bjcups.c cnijfilter-source 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 2019-10-18 19:59:20.867823821 +0330 ++++ cnijfilter-source-4.10-1/cngpij/cngpij/getipc.c 2020-09-17 19:44:53.595703924 +0430 @@ -60,59 +60,57 @@ while( (client_fd = accept(server_fd, (struct sockaddr *)&sun, &len)) >= 0 ) @@ -288,7 +288,7 @@ diff -ruN cnijfilter-source-4.10-1.orig/cngpij/cngpij/getipc.c cnijfilter-source unlink(sname); 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 2019-10-18 19:59:20.867823821 +0330 ++++ cnijfilter-source-4.10-1/cngpijmnt/src/getipc.c 2020-09-17 19:44:53.595703924 +0430 @@ -62,59 +62,57 @@ while( (client_fd = accept(server_fd, (struct sockaddr *)&sun, &len)) >= 0 ) @@ -372,7 +372,7 @@ diff -ruN cnijfilter-source-4.10-1.orig/cngpijmnt/src/getipc.c cnijfilter-source unlink(sname); 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 2019-10-18 21:38:46.250574242 +0330 ++++ cnijfilter-source-4.10-1/cngpijmnt/src/main.c 2020-09-17 19:44:53.595703924 +0430 @@ -283,22 +283,6 @@ @@ -477,16 +477,19 @@ diff -ruN cnijfilter-source-4.10-1.orig/cngpijmnt/src/main.c cnijfilter-source-4 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 2019-10-18 19:59:20.867823821 +0330 -@@ -35,6 +35,7 @@ - #include <sys/sysctl.h> ++++ cnijfilter-source-4.10-1/cnijnpr/src/cnijnpr.c 2020-09-17 19:48:19.677933956 +0430 +@@ -32,9 +32,9 @@ + #include <signal.h> + #include <sys/ioctl.h> + #include <net/if.h> +-#include <sys/sysctl.h> #include <config.h> #include <fcntl.h> +#include <unistd.h> #include <dlfcn.h> #include "cncl.h" -@@ -96,7 +97,7 @@ +@@ -96,7 +96,7 @@ /* argv[8]: /dev/usb/lp0 */ /* */ /**********************************************/ @@ -495,7 +498,16 @@ diff -ruN cnijfilter-source-4.10-1.orig/cnijnpr/src/cnijnpr.c cnijfilter-source- { int fd; int rtn = 0 ; -@@ -583,7 +584,7 @@ +@@ -301,7 +301,7 @@ + datawrite01: + //printf("child :X--- buf[0] ---X = %s\n", &buf[0]); + //printf("child :X--- buf[1] ---X = %s\n", &buf[1]); +- wrtn = write(fd, buf, STATUS_BUF + 1); /* for bug fix Ver.3.20 buf[0] */ ++ wrtn = write(fd, buf, STATUS_BUF); /* for bug fix Ver.3.20 buf[0] */ + //wrtn = write(fd, buf, 4096); /* for bug fix Ver.3.20 buf[0] */ + + if( fdusb > 0 ) { +@@ -583,7 +583,7 @@ /************************************************/ /* get_printer_devid */ /************************************************/ @@ -506,7 +518,7 @@ diff -ruN cnijfilter-source-4.10-1.orig/cnijnpr/src/cnijnpr.c cnijfilter-source- char *ivec = NULL; 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 2019-10-18 19:59:20.867823821 +0330 ++++ cnijfilter-source-4.10-1/pstocanonij/filter/pstocanonij.c 2020-09-17 19:44:53.595703924 +0430 @@ -387,7 +387,7 @@ { if( !IS_BLANK(*p_code) ) |