diff options
-rw-r--r-- | .SRCINFO | 22 | ||||
-rw-r--r-- | 0000-add-x64-cpu.patch | 16 | ||||
-rw-r--r-- | 0001-util-stdlib.patch | 15 | ||||
-rw-r--r-- | PKGBUILD | 45 | ||||
-rw-r--r-- | tcpslice-1.2a3-time.patch | 71 | ||||
-rw-r--r-- | tcpslice-CVS.20010207-bpf.patch | 12 |
6 files changed, 11 insertions, 170 deletions
@@ -1,31 +1,19 @@ # Generated by mksrcinfo v8 -# Sat Dec 17 03:31:15 UTC 2022 +# Sat Dec 17 03:40:08 UTC 2022 pkgbase = tcpslice pkgdesc = A tool for extracting portions of packet-trace files generated using tcpdump's -w flag. - pkgver = 1.2a3 + pkgver = 1.6 pkgrel = 1 url = https://www.tcpdump.org/ arch = i686 arch = x86_64 license = BSD depends = libpcap - source = https://github.com/the-tcpdump-group/tcpslice/archive/refs/tags/tcpslice-1.2a3.tar.gz - source = tcpslice-CVS.20010207-bpf.patch - source = tcpslice-1.2a3-time.patch - source = 0000-add-x64-cpu.patch - source = 0001-util-stdlib.patch + source = https://github.com/the-tcpdump-group/tcpslice/archive/refs/tags/tcpslice-1.6.tar.gz source = LICENSE - md5sums = e329cbeb7e589f132d92c3447c477190 - md5sums = d09da8cba8d72acc1bfcbca3244f7f0d - md5sums = 21ab0242869433d0e2b1b4f183dafcef - md5sums = f553efd84cf415064b082471afc55d23 - md5sums = 7787c37a16a81d6a58e89a92206ca27a + md5sums = 2a18e9da13b1dee08b92d10a88a97c38 md5sums = a8c9bb95fd32da1c9fdf4b5825ba7628 - sha256sums = 4096e8debc898cfaa16b5306f1c42f8d18b19e30e60da8d4deb781c8f684c840 - sha256sums = 51f10963a0e84bdaddce76cdcf52a833a348eaea1073c614c6a6c478967e058e - sha256sums = 8a4b60b0833e297958a166c28911259ad314ca5b0a2e0e3d8cb7d96a69914923 - sha256sums = 3d25564e12a77200fc30cf358fe685fa2a7e71b9c5259bf0acabbf3492257085 - sha256sums = 79690d882d5d016349ece906a2c3905ed64914839310f94ea8c798e6eb23d926 + sha256sums = b9143ed454d173e3bd5161406379bbb259f35f57adb37a1f8aa6aebd4cb9233f sha256sums = 6f4b64754b831217eee983f787d3b278ae7e73e4563c52bfe69cf7b07566f588 pkgname = tcpslice diff --git a/0000-add-x64-cpu.patch b/0000-add-x64-cpu.patch deleted file mode 100644 index fa6963e147cd..000000000000 --- a/0000-add-x64-cpu.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -pNaru5 a/config.sub b/config.sub ---- a/config.sub 1996-11-29 17:38:56.000000000 -0500 -+++ b/config.sub 2022-12-16 22:21:16.032485434 -0500 -@@ -175,11 +175,11 @@ case $basic_machine in - | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \ - | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \ - | hppa-* | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \ - | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \ - | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \ -- | mips64el-* | mips64orion-* | mips64orionel-* | f301-*) -+ | mips64el-* | mips64orion-* | mips64orionel-* | f301-* | x86_64-*) - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att diff --git a/0001-util-stdlib.patch b/0001-util-stdlib.patch deleted file mode 100644 index 9a0e907c5795..000000000000 --- a/0001-util-stdlib.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -pNaru5 a/util.c b/util.c ---- a/util.c 1996-12-21 22:56:44.000000000 -0500 -+++ b/util.c 2022-12-16 22:25:23.305136967 -0500 -@@ -25,10 +25,11 @@ static const char rcsid[] = - #endif - - #include <sys/types.h> - - #include <stdio.h> -+#include <stdlib.h> - #if __STDC__ - #include <stdarg.h> - #else - #include <varargs.h> - #endif @@ -3,7 +3,7 @@ set -u pkgname='tcpslice' -pkgver='1.2a3' +pkgver='1.6' pkgrel='1' pkgdesc="A tool for extracting portions of packet-trace files generated using tcpdump's -w flag." arch=('i686' 'x86_64') @@ -15,50 +15,19 @@ _srcdir="${pkgname}-${pkgver}" source=( #"ftp://ftp.ee.lbl.gov/${pkgname}-${pkgver}.tar.gz" "${_giturl}/archive/refs/tags/${_srcdir}.tar.gz" - 'tcpslice-CVS.20010207-bpf.patch' - 'tcpslice-1.2a3-time.patch' - '0000-add-x64-cpu.patch' - '0001-util-stdlib.patch' 'LICENSE' ) _srcdir="${pkgname}-${_srcdir}" -md5sums=('e329cbeb7e589f132d92c3447c477190' - 'd09da8cba8d72acc1bfcbca3244f7f0d' - '21ab0242869433d0e2b1b4f183dafcef' - 'f553efd84cf415064b082471afc55d23' - '7787c37a16a81d6a58e89a92206ca27a' +md5sums=('2a18e9da13b1dee08b92d10a88a97c38' 'a8c9bb95fd32da1c9fdf4b5825ba7628') -sha256sums=('4096e8debc898cfaa16b5306f1c42f8d18b19e30e60da8d4deb781c8f684c840' - '51f10963a0e84bdaddce76cdcf52a833a348eaea1073c614c6a6c478967e058e' - '8a4b60b0833e297958a166c28911259ad314ca5b0a2e0e3d8cb7d96a69914923' - '3d25564e12a77200fc30cf358fe685fa2a7e71b9c5259bf0acabbf3492257085' - '79690d882d5d016349ece906a2c3905ed64914839310f94ea8c798e6eb23d926' +sha256sums=('b9143ed454d173e3bd5161406379bbb259f35f57adb37a1f8aa6aebd4cb9233f' '6f4b64754b831217eee983f787d3b278ae7e73e4563c52bfe69cf7b07566f588') -prepare() { - set -u - chmod -R 'u+w' "${_srcdir}" - cd "${_srcdir}" - - patch -Nup1 -i '../tcpslice-CVS.20010207-bpf.patch' - patch -Nup1 -i '../tcpslice-1.2a3-time.patch' - - # cd ..; cp -pr "${_srcdir}" 'a'; ln -s "${_srcdir}" 'b'; false - # diff -pNaru5 'a' 'b' > '0000-add-x64-cpu.patch' - patch -Nup1 -i '../0000-add-x64-cpu.patch' - - # cd ..; cp -pr "${_srcdir}" 'a'; ln -s "${_srcdir}" 'b'; false - # diff -pNaru5 'a' 'b' > '0001-util-stdlib.patch' - patch -Nup1 -i '../0001-util-stdlib.patch' - - set +u -} - build() { set -u cd "${_srcdir}" if [ ! -s 'Makefile' ]; then - ./configure --sbindir='/usr/bin' + ./configure --sbindir='/usr/bin' --prefix='/usr' fi make -s -j1 # too small to need this set +u @@ -67,10 +36,8 @@ build() { package() { set -u cd "${_srcdir}" - install -Dpm755 'tcpslice' "${pkgdir}/usr/bin/tcpslice" - install -Dpm544 'tcpslice.1' "${pkgdir}/usr/share/man/man1/tcpslice.1" - - install -Dpm644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + make -s -j1 install DESTDIR="${pkgdir}" + install -Dpm644 -t "${pkgdir}/usr/share/licenses/${pkgname}" '../LICENSE' set +u } set +u diff --git a/tcpslice-1.2a3-time.patch b/tcpslice-1.2a3-time.patch deleted file mode 100644 index c59448d23627..000000000000 --- a/tcpslice-1.2a3-time.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- tcpslice-1.2a3.orig/search.c 2000-09-10 10:52:40.000000000 +0200 -+++ tcpslice-1.2a3/search.c 2006-07-28 14:56:55.000000000 +0200 -@@ -53,7 +53,7 @@ - /* Size of a packet header in bytes; easier than typing the sizeof() all - * the time ... - */ --#define PACKET_HDR_LEN (sizeof( struct pcap_pkthdr )) -+#define PACKET_HDR_LEN (sizeof( struct pcap_sf_pkthdr )) - - extern int snaplen; - -@@ -111,16 +111,24 @@ - static void - extract_header( pcap_t *p, u_char *buf, struct pcap_pkthdr *hdr ) - { -- memcpy((char *) hdr, (char *) buf, sizeof(struct pcap_pkthdr)); -+ struct pcap_sf_pkthdr hdri; -+ -+ memcpy((char *) &hdri, (char *) buf, sizeof(struct pcap_sf_pkthdr)); - - if ( pcap_is_swapped( p ) ) - { -- hdr->ts.tv_sec = SWAPLONG(hdr->ts.tv_sec); -- hdr->ts.tv_usec = SWAPLONG(hdr->ts.tv_usec); -- hdr->len = SWAPLONG(hdr->len); -- hdr->caplen = SWAPLONG(hdr->caplen); -+ hdr->ts.tv_sec = SWAPLONG(hdri.ts.tv_sec); -+ hdr->ts.tv_usec = SWAPLONG(hdri.ts.tv_usec); -+ hdr->len = SWAPLONG(hdri.len); -+ hdr->caplen = SWAPLONG(hdri.caplen); -+ } -+ else -+ { -+ hdr->ts.tv_sec = hdri.ts.tv_sec; -+ hdr->ts.tv_usec = hdri.ts.tv_usec; -+ hdr->len = hdri.len; -+ hdr->caplen = hdri.caplen; - } -- - /* - * From bpf/libpcap/savefile.c: - * ---- tcpslice-1.2a3.orig/tcpslice.h 1995-11-02 00:40:53.000000000 +0100 -+++ tcpslice-1.2a3/tcpslice.h 2006-07-28 14:56:55.000000000 +0200 -@@ -20,6 +20,26 @@ - */ - - -+#include <time.h> -+/* #include <net/bpf.h> */ -+ -+/* -+ * This is a timeval as stored in disk in a dumpfile. -+ * It has to use the same types everywhere, independent of the actual -+ * `struct timeval' -+ */ -+ -+struct pcap_timeval { -+ bpf_int32 tv_sec; /* seconds */ -+ bpf_int32 tv_usec; /* microseconds */ -+}; -+ -+struct pcap_sf_pkthdr { -+ struct pcap_timeval ts; /* time stamp */ -+ bpf_u_int32 caplen; /* length of portion present */ -+ bpf_u_int32 len; /* length this packet (off wire) */ -+}; -+ - time_t gwtm2secs( struct tm *tm ); - - int sf_find_end( struct pcap *p, struct timeval *first_timestamp, diff --git a/tcpslice-CVS.20010207-bpf.patch b/tcpslice-CVS.20010207-bpf.patch deleted file mode 100644 index 8aaad3b20a52..000000000000 --- a/tcpslice-CVS.20010207-bpf.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur tcpdump-3.8.1/tcpslice/tcpslice.c tcpdump-3.8.1.new/tcpslice/tcpslice.c ---- tcpslice/tcpslice.c 2004-01-15 17:35:53.000000000 +0100 -+++ tcpslice/tcpslice.c 2004-01-15 16:12:57.000000000 +0100 -@@ -35,7 +35,7 @@ - #include <sys/file.h> - #include <sys/stat.h> - --#include <net/bpf.h> -+/* #include <net/bpf.h> */ - - #include <ctype.h> - #ifdef HAVE_FCNTL_H |