diff options
author | Chris Severance | 2019-03-10 20:18:55 -0400 |
---|---|---|
committer | Chris Severance | 2019-03-10 20:18:55 -0400 |
commit | 5c95a783ef9d3a4e7a1566fca92bdd8f464936cf (patch) | |
tree | 731d3a2ee8654edb6f26af8ea88f2615c4b24ac8 | |
parent | 1a7a8e66b362324d568ef8f63231f81bfa14eec1 (diff) | |
download | aur-5c95a783ef9d3a4e7a1566fca92bdd8f464936cf.tar.gz |
autu: Update to 2.2.1-2
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | 0001-adv_main-access_ok_kernel-5-0.patch | 26 | ||||
-rw-r--r-- | PKGBUILD | 26 |
3 files changed, 49 insertions, 9 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sun Nov 25 00:26:26 UTC 2018 +# Mon Mar 11 00:18:54 UTC 2019 pkgbase = advantech-vcom pkgdesc = tty driver for Advantech Adam EKI serial console terminal servers pkgver = 2.2.1 - pkgrel = 1 + pkgrel = 2 url = http://www.advantech.com/intelligent-connectivity/ install = advantech-vcom-install.sh arch = i686 @@ -20,8 +20,10 @@ pkgbase = advantech-vcom backup = etc/advttyd.conf source = http://advdownload.advantech.com/productfile/Downloadfile5/1-1NOKMCV/vcom_linux_2.2.1.tar.bz2 source = 0000-advman.systemd.patch + source = 0001-adv_main-access_ok_kernel-5-0.patch sha256sums = e5e313a1542e227a654fd1a497f8846ccb90df5490a888929826cb82becb5b0f sha256sums = 02f504a23fbef07f666aaa595faba0513d9ffec5e99ebca7b7fe2299a0179e32 + sha256sums = 9335cfe8addfdf80224d21529fe0a70a6b750fa0823cfe806f5c94ae50a06cad pkgname = advantech-vcom diff --git a/0001-adv_main-access_ok_kernel-5-0.patch b/0001-adv_main-access_ok_kernel-5-0.patch new file mode 100644 index 000000000000..2ac85d00b5f8 --- /dev/null +++ b/0001-adv_main-access_ok_kernel-5-0.patch @@ -0,0 +1,26 @@ +--- driver/adv_main.c.orig 2019-03-10 20:06:08.695818531 -0400 ++++ driver/adv_main.c 2019-03-10 20:11:15.161215515 -0400 +@@ -75,14 +75,21 @@ long adv_proc_ioctl(struct file *filp, u + if(_IOC_NR(cmd) > ADVVCOM_IOCMAX){ + printk("%s(%d) cmd = %x\n", __func__, __LINE__, cmd); + return -ENOTTY; + } + ++#include <linux/version.h> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0) ++#define compat_access_ok(u,v,w) access_ok(v,w) ++#else ++#define compat_access_ok(u,v,w) access_ok(u,v,w) ++#endif ++ + if (_IOC_DIR(cmd) & _IOC_READ){ +- err = !access_ok(VERIFY_WRITE, (void __user *)arg, _IOC_SIZE(cmd)); ++ err = !compat_access_ok(VERIFY_WRITE, (void __user *)arg, _IOC_SIZE(cmd)); + }else if (_IOC_DIR(cmd) & _IOC_WRITE){ +- err = !access_ok(VERIFY_READ, (void __user *)arg, _IOC_SIZE(cmd)); ++ err = !compat_access_ok(VERIFY_READ, (void __user *)arg, _IOC_SIZE(cmd)); + } + if (err) + return -EFAULT; + + data = filp->private_data; @@ -55,10 +55,11 @@ set -u # Earlier versions of Advantech TTY were called ICOM # http://advdownload.advantech.com/productfile/Downloadfile1/1-NZ17GY/ICOM_LINUX_PSEUDO_TTY_DRIVER_V1.4.1.ZIP pkgname='advantech-vcom' +#pkgver='2.0.0'; _dl='4/1-X92NP4' #pkgver='2.1.0'; _dl='4/1-15OSOW4' #pkgver='2.2.0'; _dl='4/1-1LPJPGD' -pkgver='2.2.1'; _dl='5/1-1NOKMCV' -pkgrel='1' +pkgver='2.2.1'; _dl='5/1-1NOKMCV' # not compatible with Linux 3.16 +pkgrel='2' pkgdesc='tty driver for Advantech Adam EKI serial console terminal servers' _pkgdescshort="Advantech ${pkgname} TTY driver" arch=('i686' 'x86_64') @@ -73,9 +74,13 @@ source=("http://advdownload.advantech.com/productfile/Downloadfile${_dl}/${_srcd #source=("${_srcdir,,}::http://downloadt.advantech.com/download/downloadsr.aspx?File_Id=${_dl}") # redirect works sooner but can be changed arbitrairly _srcdir="${_srcdir%\.tar*}" #source=("http://advdownload.advantech.com/productfile/Downloadfile4/${_dl}/${_srcdir}.rar") -source+=('0000-advman.systemd.patch') +source+=( + '0000-advman.systemd.patch' + '0001-adv_main-access_ok_kernel-5-0.patch' +) sha256sums=('e5e313a1542e227a654fd1a497f8846ccb90df5490a888929826cb82becb5b0f' - '02f504a23fbef07f666aaa595faba0513d9ffec5e99ebca7b7fe2299a0179e32') + '02f504a23fbef07f666aaa595faba0513d9ffec5e99ebca7b7fe2299a0179e32' + '9335cfe8addfdf80224d21529fe0a70a6b750fa0823cfe806f5c94ae50a06cad') if [ "${_opt_DKMS}" -ne 0 ]; then depends+=('linux' 'dkms' 'linux-headers') @@ -87,6 +92,10 @@ prepare() { set -u cd "${_srcdir}" + #cp -p driver/adv_main.c{,.orig}; false + #diff -pNau5 driver/adv_main.c{.orig,} > '../0001-adv_main-access_ok_kernel-5-0.patch' + patch -Nbup0 -i "${srcdir}/0001-adv_main-access_ok_kernel-5-0.patch" + # Cosmetic correction of CRLF for Linux sed -e 's:\r$::g' -i 'readme.txt' @@ -175,7 +184,7 @@ fi -i 'initd/advttyd.c' # Cosmetic correction of spaces - sed -e 's:\s\+$::g' -i 'readme.txt' script/* inotify/* initd/adv* driver/adv* daemon/* + sed -e 's:\s\+$::g' -i 'readme.txt' script/* initd/adv* driver/adv* daemon/* inotify/* || : # Add device table to config sed -n -e '/Device-Type Table/,/install/ p' 'readme.txt' | \ @@ -187,7 +196,7 @@ fi sed -e 's:^[0-9]:# Sample &:g' \ -e '/Minor/ s:^#:&00:g' \ 'config/advttyd.conf' > 'config/advttyd.conf.Arch' - sort -g 'config/advttyd.conf.Arch' > 'config/advttyd.conf' + cat <(tail +4 'config/advttyd.conf.Arch') <(head -3 'config/advttyd.conf.Arch') > 'config/advttyd.conf' rm 'config/advttyd.conf.Arch' # Make a less noisy start/stop to not clog up the systemd logs @@ -196,11 +205,14 @@ fi # Change original advman to systemd #cp -p script/advman{,.orig}; false #diff -pNau10 script/advman{.orig,} > '../0000-advman.systemd.patch' - patch -Nbup0 -i "${srcdir}/0000-advman.systemd.patch" + patch -Nbup0 -i "${srcdir}/0000-advman.systemd.patch" || : # Tame the port count sed -e 's:^\(#define VCOM_PORTS\)\s.*$:'"\1 ${_opt_MAXINSTPORTS}:g" -i 'driver/advconf.h' + # Get rid of dmesg spam that looks like crashes but aren't. + sed -e 's:dump_stack():// &:g' -i 'driver/adv_uart.c' + # The compiled files should not have been included 'ma'ke -s -j1 clean # keep git-aurcheck quiet set +u |