summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Severance2019-01-14 11:51:04 -0500
committerChris Severance2019-01-14 11:51:04 -0500
commit77a03465c10ab3d7b8cf1bdd380bcf076476851f (patch)
tree15fa3a606b2fee0538d0369e108a65d7ad047783
parent21a3a1e8e6703e4c1f1409854f2abe7c5f316313 (diff)
downloadaur-77a03465c10ab3d7b8cf1bdd380bcf076476851f.tar.gz
autu: Update to 1.9.4.r42.ga4a331b7-1 Remove changelog from patch
-rw-r--r--.SRCINFO6
-rw-r--r--0001-telnetd-Fix-buffer-overflows.patch16
-rw-r--r--PKGBUILD7
3 files changed, 7 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 49d872510e53..2d5d1b2fe1fa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Tue Jul 11 18:42:59 UTC 2017
+# Mon Jan 14 16:51:04 UTC 2019
pkgbase = inetutils-git
pkgdesc = A collection of common network programs
- pkgver = 1.9.4.r38.g91960071
+ pkgver = 1.9.4.r42.ga4a331b7
pkgrel = 1
url = http://www.gnu.org/software/inetutils/
install = inetutils.install
@@ -44,7 +44,7 @@ pkgbase = inetutils-git
source = telnet.xinetd::https://projects.archlinux.org/svntogit/packages.git/plain/trunk/telnet.xinetd?h=packages/inetutils
sha256sums = SKIP
sha256sums = SKIP
- sha256sums = 1eacb0bdb4496f12e7a0593278aa4ae1eadf271a263bf27285acb1c03015c4de
+ sha256sums = 263489599727020041cdeffe5ec0eae3b17b24e4b6b9f04d8ebda1079b5ff2fb
sha256sums = f1b9b4e57f484070366444a649f1be151d01d5bc965b9b192c242e4b7cc4beeb
sha256sums = 428367b148033c7fa865e92bdd73b06cb58e6909488649adebf8d2253a022f1f
sha256sums = 6112bcdb595937a8c7940dc158a97fd48b8cce6526a9fb017f347f614b9d6548
diff --git a/0001-telnetd-Fix-buffer-overflows.patch b/0001-telnetd-Fix-buffer-overflows.patch
index 5742a2c67c72..ae4460c5f3d3 100644
--- a/0001-telnetd-Fix-buffer-overflows.patch
+++ b/0001-telnetd-Fix-buffer-overflows.patch
@@ -7,26 +7,10 @@ Increate the data buffers so that the terminating NUL fits. Use strlen
instead of sizeof to cope with the buffers size increase and to make
the code future-proof.
---
- ChangeLog | 7 +++++++
telnetd/telnetd.c | 6 +++---
telnetd/termstat.c | 34 +++++++++++++++++-----------------
3 files changed, 27 insertions(+), 20 deletions(-)
-diff --git a/ChangeLog b/ChangeLog
-index ea93a846..99157ea1 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,10 @@
-+2017-07-11 Guillem Jover <guillem@hadrons.org>
-+
-+ * telnetd/telnetd.c (telnetd_run): Increate the data buffer so that
-+ the terminating NUL fits. Use strlen instead of sizeof to cope with
-+ the buffer size increase and make the code future-proof.
-+ * telnetd/termstat.c (localstat, flowstat, clientstat): Likewise.
-+
- 2017-07-10 Omer Anson <oaanson@gmail.com> (tiny change)
-
- * src/hostname.c (parse_file): Free name and allocate one extra
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index 5e13e23d..917a3355 100644
--- a/telnetd/telnetd.c
diff --git a/PKGBUILD b/PKGBUILD
index 6cefe8a7a16e..4d4141349b69 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
set -u
_pkgname='inetutils'
pkgname="${_pkgname}-git"
-pkgver=1.9.4.r38.g91960071
+pkgver=1.9.4.r42.ga4a331b7
pkgrel=1
_srcdir="${_pkgname}"
pkgdesc='A collection of common network programs'
@@ -42,7 +42,7 @@ done
unset _src _archlink
sha256sums=('SKIP'
'SKIP'
- '1eacb0bdb4496f12e7a0593278aa4ae1eadf271a263bf27285acb1c03015c4de'
+ '263489599727020041cdeffe5ec0eae3b17b24e4b6b9f04d8ebda1079b5ff2fb'
'f1b9b4e57f484070366444a649f1be151d01d5bc965b9b192c242e4b7cc4beeb'
'428367b148033c7fa865e92bdd73b06cb58e6909488649adebf8d2253a022f1f'
'6112bcdb595937a8c7940dc158a97fd48b8cce6526a9fb017f347f614b9d6548'
@@ -77,7 +77,7 @@ prepare() {
sed -e 's:if (pty_read () <= 0):if (pty_read () < 0):g' -i 'telnetd/telnetd.c'
# http://lists.gnu.org/archive/html/bug-inetutils/2017-07/msg00005.html
- patch -Nbup1 < '../0001-telnetd-Fix-buffer-overflows.patch'
+ patch -Nbup1 -i "${srcdir}/0001-telnetd-Fix-buffer-overflows.patch"
set +u
}
@@ -139,6 +139,7 @@ package() {
*.xinetd) install -Dpm644 "${srcdir}/${_src}" "${pkgdir}/etc/xinetd.d/${_src%.xinetd}";;
*.pam) install -Dpm644 "${srcdir}/${_src}" "${pkgdir}/etc/pam.d/${_src%.pam}";;
*.service|*.socket) install -Dpm644 "${srcdir}/${_src}" -t "${pkgdir}/usr/lib/systemd/system/";;
+ *) echo "Don't know where to write ${_src}"; false;;
esac
done
set +u