summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Severance2018-11-24 18:46:15 -0500
committerChris Severance2018-11-24 18:46:15 -0500
commit0f89658187e968a3d4be7a825b2cd6737ca6960a (patch)
tree4075fa0b281dde1a311ff66324f6f3a75a3c196a
parent40b33cbd631dc5ccac130009e1a7d7b2cab0f8f9 (diff)
downloadaur-0f89658187e968a3d4be7a825b2cd6737ca6960a.tar.gz
autu: Update to 7.34-1
-rw-r--r--.SRCINFO17
-rw-r--r--0000-Invalid-MKDEV-macro.patch26
-rw-r--r--0001-kernel-4.18-proc_fops-to-proc_show.patch42
-rw-r--r--PKGBUILD118
4 files changed, 29 insertions, 174 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c235c4a9fda..67624dec612 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sat Sep 15 00:01:07 UTC 2018
+# Sat Nov 24 23:46:14 UTC 2018
pkgbase = nslink
pkgdesc = tty driver and firmware update for Comtrol DeviceMaster, RTS, LT, PRO, 500, UP, RPSH-SI, RPSH, and Serial port Hub console terminal device server
- pkgver = 7.28
- pkgrel = 5
+ pkgver = 7.34
+ pkgrel = 1
url = http://www.comtrol.com/
install = nslink-install.sh
arch = i686
@@ -22,19 +22,14 @@ pkgbase = nslink
depends = linux-headers
optdepends = gksu: NS-Link Manager GUI
options = !zipman
+ options = !strip
backup = etc/nslink.conf
- source = http://downloads.comtrol.com/dev_mstr/rts/drivers/linux/devicemaster-linux-7.28.tar.gz
+ source = http://downloads.comtrol.com/beta/dev_mstr/rts/drivers/linux/devicemaster-linux-7.34.tar.gz
source = http://downloads.comtrol.com/dev_mstr/rts/utility/linux_firmware_uploader/DM-Firmware-Updater-1.06.tar.gz
source = dmupdate.py.usage.patch
- source = 0000-Invalid-MKDEV-macro.patch
- source = 0001-kernel-4.18-proc_fops-to-proc_show.patch
- source = http://downloads.comtrol.com/legacy/dev_mstr/rts/drivers/linux/7.26/devicemaster-linux-7.26.tar.gz
- sha256sums = 900d0681a86d0732cf3e71e56a013456d5a77a68f7faa2afb955e275f73353fb
+ sha256sums = 4434d75078db4c4d8406fc3013bd76dbac2d11133062de9ee1cfff4db533773b
sha256sums = d21c5eeefdbf08a202a230454f0bf702221686ba3e663eb41852719bb20b75fb
sha256sums = 5a4e2713a8d1fe0eebd94fc843839ce5daa647f9fa7d88f62507e660ae111073
- sha256sums = 6968b10cd66d783f86f587a03584e78af4a2766d223b8d5c24c3ea4fe79f7230
- sha256sums = b20f97b6627b2b804f73dc09178d01a92407a5a9e16fd89c84baedb38f9d007c
- sha256sums = 5c00939eb945c98336211cd61408b5a8623b01a7059356e663ccc638b0d159fb
pkgname = nslink
diff --git a/0000-Invalid-MKDEV-macro.patch b/0000-Invalid-MKDEV-macro.patch
deleted file mode 100644
index 19f32351c76..00000000000
--- a/0000-Invalid-MKDEV-macro.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- nslinkd.c.orig 2018-01-05 11:01:23.000000000 -0500
-+++ nslinkd.c 2018-06-18 18:06:27.399852118 -0400
-@@ -40,10 +40,11 @@
- #include <netinet/tcp.h>
- #include <arpa/inet.h>
- #include <netpacket/packet.h>
- #include <net/if.h>
- #include <netdb.h>
-+#include <linux/kdev_t.h>
-
- #include "nslink.h"
- #include "nslinkd.h"
- #include "version.h"
-
-@@ -216,11 +217,10 @@ static void put_pid_file()
-
- /*
- * Create a device if it doesn't exist and have the correct device
- * number or major/minor number.
- */
--#define MKDEV(a,b) ((int)((((a) & 0xff) << 8) | ((b) & 0xff)))
-
-
- static void create_device(const char *prefix, int major, int num, gid_t def_group)
- {
- char name[80];
diff --git a/0001-kernel-4.18-proc_fops-to-proc_show.patch b/0001-kernel-4.18-proc_fops-to-proc_show.patch
deleted file mode 100644
index 365e0d0bb9b..00000000000
--- a/0001-kernel-4.18-proc_fops-to-proc_show.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- nslink.c.orig 2018-01-30 13:52:48.000000000 -0500
-+++ nslink.c 2018-09-12 22:01:56.166540521 -0400
-@@ -5349,10 +5349,11 @@ static int nrp_proc_show(struct seq_file
- }
- }
- return 0;
- }
-
-+#if LINUX_VERSION_CODE < VERSION_CODE(4,18,0)
- static int nrp_proc_open(struct inode *inode, struct file *file)
- {
- return single_open(file, nrp_proc_show, NULL);
- }
-
-@@ -5361,10 +5362,11 @@ static const struct file_operations nrp_
- .open = nrp_proc_open,
- .read = seq_read,
- .llseek = seq_lseek,
- .release = single_release,
- };
-+#endif
-
- static struct tty_operations nslink_ops = {
- .open = nrp_open,
- .close = nrp_close,
- .write = nrp_write,
-@@ -5382,11 +5384,15 @@ static struct tty_operations nslink_ops
- .break_ctl = nrp_break,
- .send_xchar = nrp_send_xchar,
- .wait_until_sent = nrp_wait_until_sent,
- .tiocmget = nrp_tiocmget,
- .tiocmset = nrp_tiocmset,
-+#if LINUX_VERSION_CODE < VERSION_CODE(4,18,0)
- .proc_fops = &nrp_proc_fops,
-+#else
-+ .proc_show = nrp_proc_show,
-+#endif
- };
- static const struct tty_port_operations nslink_port_ops = {
- .carrier_raised = nrp_port_carrier_raised,
- .dtr_rts = nrp_port_dtr_rts,
- .activate = nrp_port_activate,
diff --git a/PKGBUILD b/PKGBUILD
index 83a9c51ffbb..66759d44615 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,9 +8,11 @@ _opt_defaultmode='660' # default: 620
# Todo: python tools should be updated to python3
# Todo: nslinktool Config Driver needs an up down button to reorder entries
# Todo: TUI firmware updater.
+# Todo: Firmware updater can't update unit set to DHCP.
# Todo: Comtrol icons for nslinktool and the firmware updater
# Todo: nslinktool set the mouse pointer to a spinning circle far too long after startup
# Todo: rm /dev/ttySI* on rmmod nslink
+# Todo: When characters are held by RTS low, opening ttySI* raises RTS too soon and some characters are lost
# Todo: nslinktool, HUB IP Admin, [Get] with SocketServer, error getting IP info, did not get ip6info reply
@@ -21,8 +23,8 @@ _opt_defaultmode='660' # default: 620
set -u
pkgname='nslink'
-pkgver='7.28'
-pkgrel='5'
+pkgver='7.34'
+pkgrel='1'
pkgdesc='tty driver and firmware update for Comtrol DeviceMaster, RTS, LT, PRO, 500, UP, RPSH-SI, RPSH, and Serial port Hub console terminal device server'
# UP is not explicitly supported by NS-Link, only by the firmware updater.
_pkgdescshort="Comtrol DeviceMaster ${pkgname} TTY driver"
@@ -34,24 +36,22 @@ optdepends=(
'gksu: NS-Link Manager GUI'
)
backup=('etc/nslink.conf')
-options=('!zipman')
+options=('!zipman' '!strip')
install="${pkgname}-install.sh"
_verwatch=('http://downloads.comtrol.com/html/DM_PRO_RTS_SERIALHUB_drivers.htm' '.*/devicemaster-linux-\([0-9\.]\+\)\.tar\.gz' 'l')
_srcdir="devicemaster-linux-${pkgver}"
_srcdir2='DM-Firmware-Updater-1.06' # http://downloads.comtrol.com/html/DM_PRO_RTS_SERIALHUB_pvdx2.htm
-#source=("ftp://ftp.comtrol.com/dev_mstr/rts/drivers/linux/devicemaster-linux-${pkgver}.tar.gz")
-source=("http://downloads.comtrol.com/dev_mstr/rts/drivers/linux/devicemaster-linux-${pkgver}.tar.gz")
-#source+=('ftp://ftp.comtrol.com/dev_mstr/rts/utility/linux_firmware_uploader/DM-Firmware-Updater-1.06.tar.gz')
-source+=('http://downloads.comtrol.com/dev_mstr/rts/utility/linux_firmware_uploader/DM-Firmware-Updater-1.06.tar.gz')
-source+=('dmupdate.py.usage.patch')
-source+=('0000-Invalid-MKDEV-macro.patch')
-source+=('0001-kernel-4.18-proc_fops-to-proc_show.patch') # https://patchwork.kernel.org/patch/10349751/
-sha256sums=('900d0681a86d0732cf3e71e56a013456d5a77a68f7faa2afb955e275f73353fb'
+source=(
+ #"ftp://ftp.comtrol.com/dev_mstr/rts/drivers/linux/devicemaster-linux-${pkgver}.tar.gz"
+ #"http://downloads.comtrol.com/dev_mstr/rts/drivers/linux/devicemaster-linux-${pkgver}.tar.gz"
+ "http://downloads.comtrol.com/beta/dev_mstr/rts/drivers/linux/devicemaster-linux-${pkgver}.tar.gz"
+ #'ftp://ftp.comtrol.com/dev_mstr/rts/utility/linux_firmware_uploader/DM-Firmware-Updater-1.06.tar.gz'
+ 'http://downloads.comtrol.com/dev_mstr/rts/utility/linux_firmware_uploader/DM-Firmware-Updater-1.06.tar.gz'
+ 'dmupdate.py.usage.patch'
+)
+sha256sums=('4434d75078db4c4d8406fc3013bd76dbac2d11133062de9ee1cfff4db533773b'
'd21c5eeefdbf08a202a230454f0bf702221686ba3e663eb41852719bb20b75fb'
- '5a4e2713a8d1fe0eebd94fc843839ce5daa647f9fa7d88f62507e660ae111073'
- '6968b10cd66d783f86f587a03584e78af4a2766d223b8d5c24c3ea4fe79f7230'
- 'b20f97b6627b2b804f73dc09178d01a92407a5a9e16fd89c84baedb38f9d007c'
- '5c00939eb945c98336211cd61408b5a8623b01a7059356e663ccc638b0d159fb')
+ '5a4e2713a8d1fe0eebd94fc843839ce5daa647f9fa7d88f62507e660ae111073')
if [ "${_opt_DKMS}" -ne 0 ]; then
depends+=('linux' 'dkms' 'linux-headers')
@@ -59,41 +59,19 @@ else
makedepends+=('linux-headers')
fi
-_opt_LEGACY_VER=''
-# Install both versions so dkms gets the right version for each kernel
-if [ "${_opt_DKMS}" -ne 0 ]; then
- # 7.26 supports Kernels 2.6.33 through 4.14.x
- # 7.28 supports Kernels 4.15 through 4.17.x.
- _opt_LEGACY_VER='7.26'
- if [ "$(vercmp "${pkgver}" "${_opt_LEGACY_VER}")" -gt 0 ]; then
- _srcalt="${_srcdir//${pkgver}/${_opt_LEGACY_VER}}"
- source+=("http://downloads.comtrol.com/legacy/dev_mstr/rts/drivers/linux/${_opt_LEGACY_VER}/${_srcalt}.tar.gz")
- else
- _opt_LEGACY_VER=''
- fi
-fi
-
-_fn_patch_km() {
- set +u; msg2 "patch_km $1"; set -u
+prepare() {
+ set -u
+ cd "${_srcdir}"
# Fix permissions
find -type 'f' -perm '/111' -exec chmod 644 '{}' '+'
chmod 755 *.sh *.py 'nslinktool'
- #diff -pNau5 nslinkd.c{.orig,} > '0000-Invalid-MKDEV-macro.patch'
- patch -Nbup0 -i "${srcdir}/0000-Invalid-MKDEV-macro.patch"
-
- #diff -pNau5 nslink.c{.orig,} > '0001-kernel-4.18-proc_fops-to-proc_show.patch'
- patch -Nbup0 -i "${srcdir}/0001-kernel-4.18-proc_fops-to-proc_show.patch"
-
- # Fix namespace collision in 4.18
- sed -e 's:\btcp_data_ready\b:nslink_&:g' -i 'nslink.c'
-
# Version check
local _ver
_ver="$(sed -n -e 's:^#define\sSI_VERSION\s"\([^"]\+\).*$:\1:p' 'version.h')"
- if [ "$1" != "${_ver}" ]; then
- echo "Version mismatch $1 != ${_ver}"
+ if [ "${pkgver}" != "${_ver}" ]; then
+ echo "Version mismatch ${pkgver} != ${_ver}"
set +u
false
fi
@@ -152,17 +130,6 @@ _fn_patch_km() {
-e '#s:\(mode_t mode\) = [0-9]\+\(.*;\)'":\1 = ${_opt_defaultmode}\2:g" \
-e "/mknod/ s:mode:0${_opt_defaultmode}:g" \
-i 'nslinkd.c'
-}
-
-prepare() {
- set -u
- cd "${_srcdir}"
- _fn_patch_km "${pkgver}"
- if [ ! -z "${_opt_LEGACY_VER}" ]; then
- pushd "${srcdir}/${_srcalt}" > /dev/null
- _fn_patch_km "${_opt_LEGACY_VER}"
- popd > /dev/null
- fi
# Fix up the firmware downloaders
cd "${srcdir}/${_srcdir2}"
@@ -262,53 +229,15 @@ CLEAN[0]="make -j1 clean"
DEST_MODULE_LOCATION[0]="/kernel/drivers/misc"
EOF
) "${_dkms}/dkms.conf"
-_fn_dkmsinst() {
- install -Dpm644 'nslink.h' 'nslink_int.h' 'version.h' 'nslink.c' 'Makefile' -t "$1"
- #make -C "$1" clean
+ install -Dpm644 'nslink.h' 'nslink_int.h' 'version.h' 'nslink.c' 'Makefile' -t "${_dkms}"
+ #make -C "${_dkms}" clean
sed -e '# No DKMS instructions say to do this but it works and keeps the MAKE line real simple' \
-e 's:$(shell uname -r):$(KERNELRELEASE):g' \
-e 's:`uname -r`:$(KERNELRELEASE):g' \
-e 's:$(KVER):$(KERNELRELEASE):g' \
-e '# Get rid of make lines so make all makes the module' \
-e 's:^\s\+make\s:#&:g' \
- -i "$1/Makefile"
-}
- if [ -z "${_opt_LEGACY_VER}" ]; then
- _fn_dkmsinst "${_dkms}"
- else
- # It is not necessary to install files to ${_dkms} for pacman -Qo
- # The cp does not happen in /usr/src but in /var/lib/dkms where dkms cleans everything up
- _fn_dkmsinst "${_dkms}/${pkgver}"
-
- # Install a custom make helper that selects source based on kernel version
- sed -e "/^MAKE/ s:make :${_dkms#${pkgdir}}/makedkms.sh"' KERNELRELEASE=$kernelver :g' -i "${_dkms}/dkms.conf"
- install -Dm744 <(cat << EOF
-#!/usr/bin/bash
-
-# Automatically generated by ${pkgname}-${pkgver} PKGBUILD from Arch Linux AUR
-# https://aur.archlinux.org/
-
-set -e
-set -u
-
-kv="\$*" # \$@ is not what we want here.
-kv="\${kv##*KERNELRELEASE=}"
-kv="\${kv%% *}"
-
-if [ "\$(vercmp "\${kv}" '4.15')" -lt 0 ]; then
- cp -p '${_opt_LEGACY_VER}'/* .
-else
- cp -p '${pkgver}'/* .
-fi
-make "\$@"
-EOF
- ) "${_dkms}/makedkms.sh"
-
- # Install legacy code
- pushd "${srcdir}/${_srcdir//${pkgver}/${_opt_LEGACY_VER}}" > /dev/null
- _fn_dkmsinst "${_dkms}/${_opt_LEGACY_VER}"
- popd > /dev/null
- fi
+ -i "${_dkms}/Makefile"
fi
# Install firmware updaters
@@ -330,7 +259,6 @@ Categories=Application;Utilities;
MimeType=application/x-executable
EOF
) "${pkgdir}/usr/share/applications/DM-Firmware-Updater.py.desktop"
-
set +u
}