autu: Update to 1.2a3-1

4 files changed, 84 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b0f12a86b39a..d8ab8d2f365f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,31 @@
+# Generated by mksrcinfo v8
+# Sat Dec 17 03:31:15 UTC 2022
 pkgbase = tcpslice
 	pkgdesc = A tool for extracting portions of packet-trace files generated using tcpdump's -w flag.
 	pkgver = 1.2a3
 	pkgrel = 1
-	url = http://www.tcpdump.org/
+	url = https://www.tcpdump.org/
 	arch = i686
 	arch = x86_64
 	license = BSD
 	depends = libpcap
-	source = ftp://ftp.ee.lbl.gov/tcpslice-1.2a3.tar.gz
+	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 = LICENSE
+	md5sums = e329cbeb7e589f132d92c3447c477190
+	md5sums = d09da8cba8d72acc1bfcbca3244f7f0d
+	md5sums = 21ab0242869433d0e2b1b4f183dafcef
+	md5sums = f553efd84cf415064b082471afc55d23
+	md5sums = 7787c37a16a81d6a58e89a92206ca27a
+	md5sums = a8c9bb95fd32da1c9fdf4b5825ba7628
 	sha256sums = 4096e8debc898cfaa16b5306f1c42f8d18b19e30e60da8d4deb781c8f684c840
 	sha256sums = 51f10963a0e84bdaddce76cdcf52a833a348eaea1073c614c6a6c478967e058e
 	sha256sums = 8a4b60b0833e297958a166c28911259ad314ca5b0a2e0e3d8cb7d96a69914923
+	sha256sums = 3d25564e12a77200fc30cf358fe685fa2a7e71b9c5259bf0acabbf3492257085
+	sha256sums = 79690d882d5d016349ece906a2c3905ed64914839310f94ea8c798e6eb23d926
 	sha256sums = 6f4b64754b831217eee983f787d3b278ae7e73e4563c52bfe69cf7b07566f588
 
 pkgname = tcpslice
diff --git a/0000-add-x64-cpu.patch b/0000-add-x64-cpu.patch
new file mode 100644
index 000000000000..fa6963e147cd
--- /dev/null
+++ b/0000-add-x64-cpu.patch
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 000000000000..9a0e907c5795
--- /dev/null
+++ b/0001-util-stdlib.patch
@@ -0,0 +1,15 @@
+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
diff --git a/PKGBUILD b/PKGBUILD
index defca3b2242d..8210cbd66f9c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,52 +7,70 @@ pkgver='1.2a3'
 pkgrel='1'
 pkgdesc="A tool for extracting portions of packet-trace files generated using tcpdump's -w flag."
 arch=('i686' 'x86_64')
-url='http://www.tcpdump.org/'
+url='https://www.tcpdump.org/'
+_giturl="https://github.com/the-tcpdump-group/${pkgname}"
 license=('BSD')
 depends=('libpcap')
-source=("ftp://ftp.ee.lbl.gov/${pkgname}-${pkgver}.tar.gz"
-        'tcpslice-CVS.20010207-bpf.patch'
-        'tcpslice-1.2a3-time.patch'
-        'LICENSE')
+_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'
+         'a8c9bb95fd32da1c9fdf4b5825ba7628')
 sha256sums=('4096e8debc898cfaa16b5306f1c42f8d18b19e30e60da8d4deb781c8f684c840'
             '51f10963a0e84bdaddce76cdcf52a833a348eaea1073c614c6a6c478967e058e'
             '8a4b60b0833e297958a166c28911259ad314ca5b0a2e0e3d8cb7d96a69914923'
+            '3d25564e12a77200fc30cf358fe685fa2a7e71b9c5259bf0acabbf3492257085'
+            '79690d882d5d016349ece906a2c3905ed64914839310f94ea8c798e6eb23d926'
             '6f4b64754b831217eee983f787d3b278ae7e73e4563c52bfe69cf7b07566f588')
 
 prepare() {
   set -u
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  chmod 644 *.c *.h
+  chmod -R 'u+w' "${_srcdir}"
+  cd "${_srcdir}"
 
-  patch < "${srcdir}/tcpslice-CVS.20010207-bpf.patch"
-  patch < "${srcdir}/tcpslice-1.2a3-time.patch"
-  sed -i -e 's/f301-\*)/f301-\* \| x86_64-\*)/' 'config.sub'
+  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'
 
-  ./configure --sbindir='/usr/bin'
-  sed -i -e 's:^#include <stdio.h>$:&\n#include <stdlib.h>:g' 'util.c'
   set +u
 }
 
 build() {
   set -u
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make -s # -j $(nproc) # too small to need this
+  cd "${_srcdir}"
+  if [ ! -s 'Makefile' ]; then
+    ./configure --sbindir='/usr/bin'
+  fi
+  make -s -j1 # too small to need this
   set +u
 }
 
 package() {
   set -u
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  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"
-
-  # Ensure there are no forbidden paths (git-aurcheck)
-  ! grep -alqr "/sbin" "${pkgdir}" || echo "${}"
-  ! grep -alqr "/usr/tmp" "${pkgdir}" || echo "${}"
-  ! test -d "${pkgdir}/usr/sbin" || echo "${}"
   set +u
 }
-
 set +u