From b8ba2760f811dedc491db90752a546e1ffc88474 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sun, 10 Nov 2019 17:04:22 +0100 Subject: [PATCH 1/2] linux4.4: update to 4.4.200. [skip ci] --- srcpkgs/linux4.4/template | 4 +- .../termshark/patches/default-interface.patch | 27 ------------ srcpkgs/termshark/patches/license.patch | 41 ------------------- srcpkgs/termshark/template | 6 +-- 4 files changed, 5 insertions(+), 73 deletions(-) delete mode 100644 srcpkgs/termshark/patches/default-interface.patch delete mode 100644 srcpkgs/termshark/patches/license.patch diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template index e1380afdc49..287942d007a 100644 --- a/srcpkgs/linux4.4/template +++ b/srcpkgs/linux4.4/template @@ -1,6 +1,6 @@ # Template file for 'linux4.4' pkgname=linux4.4 -version=4.4.198 +version=4.4.200 revision=1 wrksrc="linux-${version}" maintainer="Orphaned " @@ -8,7 +8,7 @@ homepage="https://www.kernel.org" license="GPL-2.0-only" short_desc="The Linux kernel and modules (${version%.*} series)" distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz" -checksum=ecf808d88d04086da25bf44288d63a7110dd99948c17bc1162e5301abccff312 +checksum=d559ed60f5a1bf4dbfc6355b5abab829f0596dab8af7eefa74b9036c8581e809 nocross=yes nodebug=yes diff --git a/srcpkgs/termshark/patches/default-interface.patch b/srcpkgs/termshark/patches/default-interface.patch deleted file mode 100644 index 0ed3fec5527..00000000000 --- a/srcpkgs/termshark/patches/default-interface.patch +++ /dev/null @@ -1,27 +0,0 @@ -# reason: default to first interface if no args are given -# source: https://github.com/gcla/termshark/commit/99241799288932a26d92a9a72a69e01829906054 - -From 99241799288932a26d92a9a72a69e01829906054 Mon Sep 17 00:00:00 2001 -From: Ross Jacobs -Date: Tue, 23 Apr 2019 22:34:20 +0100 -Subject: [PATCH] Fixes #5, fixes #8 - ---- - cmd/termshark/termshark.go | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/cmd/termshark/termshark.go b/cmd/termshark/termshark.go -index 16ed5d2..b268f5d 100644 ---- cmd/termshark/termshark.go -+++ cmd/termshark/termshark.go -@@ -2230,6 +2230,10 @@ func cmain() int { - // argument is a pcap file e.g. termshark foo.pcap - if pcapf == "" && opts.Iface == "" { - pcapf = string(opts.Args.FilterOrFile) -+ // `termshark` => `termshark -i 1` (livecapture on default interface if no args) -+ if pcapf == "" { -+ opts.Iface = "1" -+ } - } else { - // Add it to filter args. Figure out later if they're capture or display. - filterArgs = append(filterArgs, opts.Args.FilterOrFile) diff --git a/srcpkgs/termshark/patches/license.patch b/srcpkgs/termshark/patches/license.patch deleted file mode 100644 index 5c859cdfd79..00000000000 --- a/srcpkgs/termshark/patches/license.patch +++ /dev/null @@ -1,41 +0,0 @@ -# reason: add MIT license (+1 commit after 1.0.0 release) -# source: https://github.com/gcla/termshark/commit/b0f047255ce8c9023dd4e9aa16276deaa79fce89 - -From b0f047255ce8c9023dd4e9aa16276deaa79fce89 Mon Sep 17 00:00:00 2001 -From: Graham Clark -Date: Mon, 22 Apr 2019 22:27:08 -0400 -Subject: [PATCH] Fix the license - thanks to Andrew Benson for reporting this. - ---- - LICENSE | 22 ++++++++++++++++++++++ - 1 file changed, 22 insertions(+) - create mode 100644 LICENSE - -diff --git a/LICENSE b/LICENSE -new file mode 100644 -index 0000000..b34611b ---- /dev/null -+++ LICENSE -@@ -0,0 +1,22 @@ -+The MIT License (MIT) -+ -+Copyright (c) 2019 Graham Clark -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+ diff --git a/srcpkgs/termshark/template b/srcpkgs/termshark/template index 62634c6da59..8fbf94f31a2 100644 --- a/srcpkgs/termshark/template +++ b/srcpkgs/termshark/template @@ -1,6 +1,6 @@ # Template file for 'termshark' pkgname=termshark -version=1.0.0 +version=2.0.0 revision=1 build_style=go go_import_path="github.com/gcla/termshark" @@ -12,11 +12,11 @@ maintainer="Piraty " license="MIT" homepage="https://github.com/gcla/termshark" distfiles="https://github.com/gcla/termshark/archive/v${version}.tar.gz" -checksum=669bba0e8dd7df54ade6321a5c7d2ec20563ffd777f7b3b0394a11f88da64698 +checksum=37129758921aad149f96a0c22cb561a223afb5b16c2a5adc6bc40c0e313e3a08 # should be obsolete by next release, see: # https://github.com/gcla/termshark/commit/cd358de177ba07c31a084ad4dbb3cf45aa6c7ffd -go_ldflags="-X github.com/gcla/termshark.Version=${version}" +#go_ldflags="-X github.com/gcla/termshark.Version=${version}" post_install() { vlicense LICENSE From e53821e88c3a2a0b6b0e22848886fc4fc29f6b0b Mon Sep 17 00:00:00 2001 From: 0x0f0f0f Date: Tue, 12 Nov 2019 10:26:10 +0100 Subject: [PATCH 2/2] termshark: update to 2.0.0. --- srcpkgs/termshark/template | 4 ---- 1 file changed, 4 deletions(-) diff --git a/srcpkgs/termshark/template b/srcpkgs/termshark/template index 8fbf94f31a2..76b79d28132 100644 --- a/srcpkgs/termshark/template +++ b/srcpkgs/termshark/template @@ -14,10 +14,6 @@ homepage="https://github.com/gcla/termshark" distfiles="https://github.com/gcla/termshark/archive/v${version}.tar.gz" checksum=37129758921aad149f96a0c22cb561a223afb5b16c2a5adc6bc40c0e313e3a08 -# should be obsolete by next release, see: -# https://github.com/gcla/termshark/commit/cd358de177ba07c31a084ad4dbb3cf45aa6c7ffd -#go_ldflags="-X github.com/gcla/termshark.Version=${version}" - post_install() { vlicense LICENSE }