diff options
Diffstat (limited to 'main/devicemaster-linux-grsec')
| -rw-r--r-- | main/devicemaster-linux-grsec/APKBUILD | 18 | ||||
| -rw-r--r-- | main/devicemaster-linux-grsec/nslink.patch | 42 |
2 files changed, 30 insertions, 30 deletions
diff --git a/main/devicemaster-linux-grsec/APKBUILD b/main/devicemaster-linux-grsec/APKBUILD index ce4857d5db..aa61158cc1 100644 --- a/main/devicemaster-linux-grsec/APKBUILD +++ b/main/devicemaster-linux-grsec/APKBUILD @@ -13,18 +13,18 @@ _realname=devicemaster-linux pkgname=${_realname}-${_flavor} pkgver=$_kver # when changing _realver we *must* bump _mypkgrel -_realver=7.06 +_realver=7.11 pkgrel=$(( $_kpkgrel + $_mypkgrel )) pkgdesc="NS-Link Device Drivers $_realver for linux-$_flavor" url="http://www.comtrol.com/resources/product-resources-white-papers/ns-link-device-drivers" -arch="" +arch="all" license="GPL" depends="linux-${_flavor}=${_kpkgver}" makedepends="linux-${_flavor}-dev=${_kpkgver} linux-headers" install= install_if="$_kpkg=$_kpkgver $_realname" subpackages="" -source="ftp://ftp.comtrol.com/dev_mstr/rts/drivers/linux/devicemaster-linux-$_realver.tar.gz +source="http://dev.alpinelinux.org/archive/devicemaster-linux/devicemaster-linux-$_realver.tar.gz nslink.patch " @@ -63,9 +63,9 @@ package() { cp *.ko "$pkgdir/lib/modules/${_abi_release}/misc/" || return 1 } -md5sums="deded30023c8135c9beb06696e8c578f devicemaster-linux-7.06.tar.gz -4a7ab12e64cfb0dc2f5270a95534ca18 nslink.patch" -sha256sums="6b11295952d1d74a6102a295a6ed5651ec040a0d8c30838cd23a1f3f7c95a4e7 devicemaster-linux-7.06.tar.gz -6d635a133f795a90ff776b1f5026d4cae734570a46042b3e23c3f6bd07d2c11c nslink.patch" -sha512sums="496144ee40464c96442ce655424db886cb5b4df1701e30cc8d059fc918e8916cb6c3b0b57cead2d0e9d50e4618ee13efa5f3630765545ea45e29f8080101800b devicemaster-linux-7.06.tar.gz -acb1e19bb56f47ba95bebf386c66a5639e11ed5c3d7e8591060fcc739d5383cec0cab08a1accaeef930adae495f3a63526ed1491977567caa257e4a9bd219045 nslink.patch" +md5sums="0e79cf4afe5503087454d052f33847a9 devicemaster-linux-7.11.tar.gz +93304a282dab87658481fdce61d97f5c nslink.patch" +sha256sums="9901966cf6a696f07a7d3f79c8fc5d6dbc5340fd36ea785cf27577b1fcadfc04 devicemaster-linux-7.11.tar.gz +bb875877b13fb5a477598b17c94f0b8f3e08812c37d90db63fcb7de78554ddff nslink.patch" +sha512sums="dade8220f25c32e38520fd9267f18f2af0bcc14e84b422f77d6cdf7a23d4f14512182176039686ec898d6e4c390751318bc0c7aa7f74e4aa9a94d411b3c774d8 devicemaster-linux-7.11.tar.gz +f3549770d7253595d51466973d112a1b63c3aad9b73cb3033718031327bfd4ac6f182540bc6a9c44a0919431b3ffa38c382923874a9f8c856a194ab768464fe7 nslink.patch" diff --git a/main/devicemaster-linux-grsec/nslink.patch b/main/devicemaster-linux-grsec/nslink.patch index 0304bf6c8b..79d7fc444f 100644 --- a/main/devicemaster-linux-grsec/nslink.patch +++ b/main/devicemaster-linux-grsec/nslink.patch @@ -1,5 +1,5 @@ diff --git a/nslink.c b/nslink.c -index 16a4212..e64907d 100755 +index 6de4618..d67d8b0 100755 --- a/nslink.c +++ b/nslink.c @@ -113,6 +113,7 @@ @@ -43,7 +43,25 @@ index 16a4212..e64907d 100755 } static void nrp_set_termios(struct tty_struct *tty, struct ktermios *old_termios) -@@ -4786,7 +4787,7 @@ static int free_si_box(int boxid) +@@ -4094,7 +4095,7 @@ static void tcp_check_rx(struct si_state *si) + #endif + msg.msg_control = NULL; + +- rc = si->SOCK_PROT(tcp_sk)->recvmsg(NULL, si->tcp_sk, &msg, pktlen, 1, 0, NULL); ++ rc = si->SOCK_PROT(tcp_sk)->recvmsg(si->tcp_sk, &msg, pktlen, 1, 0, NULL); + + if (rc < 0) { + printk(KERN_INFO "nslink: CheckRxTcp recvmsg err %d\n", rc); +@@ -4155,7 +4156,7 @@ static void tcp_send_packet(struct si_state *si, int len) + oldfs = get_fs(); + set_fs(KERNEL_DS); + +- rc = si->tcp_sock->ops->sendmsg(NULL, si->tcp_sock, &msg, len); ++ rc = si->tcp_sock->ops->sendmsg(si->tcp_sock, &msg, len); + + set_fs(oldfs); + +@@ -4785,7 +4786,7 @@ static int free_si_box(int boxid) info = nrp_table[i + si->base_port]; if (!info) continue; @@ -52,7 +70,7 @@ index 16a4212..e64907d 100755 DebugOpenErr("Attempt to free_si_box() with port open\n"); return -EBUSY; } -@@ -5008,7 +5009,7 @@ static int port_proc_show(struct seq_file *m, void *v) +@@ -5007,7 +5008,7 @@ static int port_proc_show(struct seq_file *m, void *v) for (i=0; i<NumElements(nrp_table); ++i) { struct nr_port *info = nrp_table[i]; if (info) { @@ -61,21 +79,3 @@ index 16a4212..e64907d 100755 // Ctrl ... seq_printf(m, (info->control_settings & SC_DATABITS_7) ? "7" : "8"); -@@ -5192,7 +5193,7 @@ static int status_proc_show(struct seq_file *m, void *v) - struct si_state *si; - - seq_printf(m, "Comtrol NS-Link -- version %s (%s)\n",SI_VERSION,SI_DATE); -- seq_printf(m, "Built %s %s\n\n",__DATE__,__TIME__); -+ seq_printf(m, "Build %s\n\n",utsname()->version); - seq_printf(m, "Hub State Address Ports\n"); - seq_printf(m, "--- ------------ ------------------ -----\n"); - -@@ -5381,7 +5382,7 @@ int nrp_init(void) - static struct proc_dir_entry *procdir; - - printk(KERN_INFO "nslink: NS-Link driver, version %s %s\n",SI_VERSION, SI_DATE); -- printk(KERN_INFO "nslink: Built %s %s\n", __DATE__, __TIME__); -+ printk(KERN_INFO "nslink: Build %s\n", utsname()->version); - - // Initialize the array of pointers to our own internal state structures. - memset(nrp_table, 0, sizeof(nrp_table)); |