autu: Update to 1.9.4.r42.ga4a331b7-2 readline update hook

4 files changed, 116 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2d5d1b2fe1fa..d8258905ce41 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Jan 14 16:51:04 UTC 2019
+# Mon Jan 14 18:08:45 UTC 2019
 pkgbase = inetutils-git
 	pkgdesc = A collection of common network programs
 	pkgver = 1.9.4.r42.ga4a331b7
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.gnu.org/software/inetutils/
 	install = inetutils.install
 	arch = i686
@@ -14,6 +14,7 @@ pkgbase = inetutils-git
 	makedepends = autoconf
 	depends = pam
 	depends = libcap
+	depends = readline
 	provides = inetutils=1.9.4
 	conflicts = inetutils
 	options = !emptydirs
@@ -42,9 +43,27 @@ pkgbase = inetutils-git
 	source = telnet@.service::https://projects.archlinux.org/svntogit/packages.git/plain/trunk/telnet@.service?h=packages/inetutils
 	source = telnet.socket::https://projects.archlinux.org/svntogit/packages.git/plain/trunk/telnet.socket?h=packages/inetutils
 	source = telnet.xinetd::https://projects.archlinux.org/svntogit/packages.git/plain/trunk/telnet.xinetd?h=packages/inetutils
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = a902f8c38f6db36574b928e41d2d2814
+	md5sums = fe181e22d3544456f52e64f3bdf5f291
+	md5sums = cda2aa3cd2353120b142fd33b3b4f4df
+	md5sums = 7cea13f4ff7fd170fc4d03ef2698200d
+	md5sums = f4d16e649c13db9d47ad3654d1595c83
+	md5sums = bf522b381451b3fba8386f3566b37848
+	md5sums = 8083b2fac54a76afb93be31d2f55dc68
+	md5sums = fc022f7959011aa2bf27d573bdcdc7dd
+	md5sums = 71b8206f220d28b91aabaf9cb16038f1
+	md5sums = 50c76143eadd3c004f5857d712fa05c4
+	md5sums = 2b7ea36e13178c7a3b3c9b38ac7eb588
+	md5sums = bd581fa64b91ded853317334b1489346
+	md5sums = ae4539ffbabae314744aea8467125f85
+	md5sums = d7e5d8f70b7fc7321ab0e61178829b06
+	md5sums = bafd84474b3a0942307571e742dd096f
+	md5sums = ab71e7458e8ed2b9d31c48eba5ab4c3a
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 263489599727020041cdeffe5ec0eae3b17b24e4b6b9f04d8ebda1079b5ff2fb
+	sha256sums = 09210d3e7799fe93c712a0540f74ba281c61499a47af53e308ee6c3c3367b4dc
 	sha256sums = f1b9b4e57f484070366444a649f1be151d01d5bc965b9b192c242e4b7cc4beeb
 	sha256sums = 428367b148033c7fa865e92bdd73b06cb58e6909488649adebf8d2253a022f1f
 	sha256sums = 6112bcdb595937a8c7940dc158a97fd48b8cce6526a9fb017f347f614b9d6548
diff --git a/0001-telnetd-Fix-buffer-overflows.patch b/0001-telnetd-Fix-buffer-overflows.patch
index ae4460c5f3d3..b3f8654b3b44 100644
--- a/0001-telnetd-Fix-buffer-overflows.patch
+++ b/0001-telnetd-Fix-buffer-overflows.patch
@@ -7,10 +7,27 @@ 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(-)
 
+# changelog patch elimianted. It interferes with all future versions.
+#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 4d4141349b69..92378098efec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,20 @@
 # Maintainer:  Chris Severance aur.severach aATt spamgourmet dott com
-# From core
-# $Id: PKGBUILD 241146 2015-06-21 01:47:41Z eric $
 # Contributor: Eric Bélanger <eric@archlinux.org>
 
+# TODO: package is not compatible with makepkg -Rfi
+
 set -u
 _pkgname='inetutils'
 pkgname="${_pkgname}-git"
 pkgver=1.9.4.r42.ga4a331b7
-pkgrel=1
+pkgrel=2
 _srcdir="${_pkgname}"
 pkgdesc='A collection of common network programs'
 arch=('i686' 'x86_64')
 url='http://www.gnu.org/software/inetutils/'
 license=('GPL3')
 #groups=('base')
-depends=('pam' 'libcap')
+depends=('pam' 'libcap' 'readline')
 makedepends=('help2man' 'git' 'autoconf')
 provides=("${_pkgname}=${pkgver%%.r*}")
 conflicts=("${_pkgname}")
@@ -40,9 +40,27 @@ for _src in "${_archsource[@]}"; do
   source+=("${_archlink//@@@/${_src}}")
 done
 unset _src _archlink
+md5sums=('SKIP'
+         'SKIP'
+         'a902f8c38f6db36574b928e41d2d2814'
+         'fe181e22d3544456f52e64f3bdf5f291'
+         'cda2aa3cd2353120b142fd33b3b4f4df'
+         '7cea13f4ff7fd170fc4d03ef2698200d'
+         'f4d16e649c13db9d47ad3654d1595c83'
+         'bf522b381451b3fba8386f3566b37848'
+         '8083b2fac54a76afb93be31d2f55dc68'
+         'fc022f7959011aa2bf27d573bdcdc7dd'
+         '71b8206f220d28b91aabaf9cb16038f1'
+         '50c76143eadd3c004f5857d712fa05c4'
+         '2b7ea36e13178c7a3b3c9b38ac7eb588'
+         'bd581fa64b91ded853317334b1489346'
+         'ae4539ffbabae314744aea8467125f85'
+         'd7e5d8f70b7fc7321ab0e61178829b06'
+         'bafd84474b3a0942307571e742dd096f'
+         'ab71e7458e8ed2b9d31c48eba5ab4c3a')
 sha256sums=('SKIP'
             'SKIP'
-            '263489599727020041cdeffe5ec0eae3b17b24e4b6b9f04d8ebda1079b5ff2fb'
+            '09210d3e7799fe93c712a0540f74ba281c61499a47af53e308ee6c3c3367b4dc'
             'f1b9b4e57f484070366444a649f1be151d01d5bc965b9b192c242e4b7cc4beeb'
             '428367b148033c7fa865e92bdd73b06cb58e6909488649adebf8d2253a022f1f'
             '6112bcdb595937a8c7940dc158a97fd48b8cce6526a9fb017f347f614b9d6548'
@@ -70,14 +88,17 @@ pkgver() {
 prepare() {
   set -u
   cd "${_srcdir}"
-  ln -s '../gnulib'
-  # telnetd disconnects without banner on 90% of connections
-  # http://lists.gnu.org/archive/html/bug-inetutils/2015-07/msg00006.html
-  # http://lists.gnu.org/archive/html/bug-inetutils/2015-08/index.html
-  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 -i "${srcdir}/0001-telnetd-Fix-buffer-overflows.patch"
+  # makepkg -i reruns prepare() which it should not
+  if [ ! -L 'gnulib' ]; then
+    ln -s '../gnulib'
+    # telnetd disconnects without banner on 90% of connections
+    # http://lists.gnu.org/archive/html/bug-inetutils/2015-07/msg00006.html
+    # http://lists.gnu.org/archive/html/bug-inetutils/2015-08/index.html
+    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'
+  fi
   set +u
 }
 
@@ -126,6 +147,9 @@ check() {
   set +u
 }
 
+_scriptdir="/usr/share/${pkgname}"
+_script="${_scriptdir}/${pkgname}.sh"
+
 package() {
   set -u
   cd "${_srcdir}"
@@ -142,6 +166,46 @@ package() {
     *) echo "Don't know where to write ${_src}"; false;;
     esac
   done
+
+  # Install readline update detector
+  install -Dpm644 <(cat << EOF
+#!/bin/sh
+
+set +e
+set -u
+
+ftp << FEOF
+quit
+FEOF
+if [ "\$?" -ne 0 ]; then
+  echo '*******************************************************************************'
+  echo '*******************************************************************************'
+  echo 'readline has been updated. ${pkgname} must be recompiled soon***************'
+  echo '*******************************************************************************'
+  echo '*******************************************************************************'
+fi
+EOF
+  ) "${pkgdir}${_script}"
+  bash -n "${pkgdir}${_script}"
+
+  install -Dm644 <(cat << EOF
+# Automatically generated by ${pkgname}-${pkgver} PKGBUILD from Arch Linux AUR
+# https://aur.archlinux.org/
+
+# Check ${pkgname} on each upgrade of readline
+
+[Trigger]
+Operation = Upgrade
+Type = Package
+Target = readline
+
+[Action]
+Description = Check ${pkgname} for readline update
+Depends = coreutils
+When = PostTransaction
+Exec = /usr/bin/bash "${_script}"
+EOF
+  ) "${pkgdir}/usr/share/libalpm/hooks/${pkgname}-foomatic-db.hook"
   set +u
 }
 set +u
diff --git a/inetutils.install b/inetutils.install
index 2e758e59ef83..17dd12b9acf0 100644
--- a/inetutils.install
+++ b/inetutils.install
@@ -1,32 +1,9 @@
-infodir='usr/share/info'
-filelist=('inetutils.info.gz')
-
 post_install() {
   setcap cap_net_bind_service=+ep 'usr/bin/rcp'    2>/dev/null || chmod +s 'usr/bin/rcp'
   setcap cap_net_bind_service=+ep 'usr/bin/rlogin' 2>/dev/null || chmod +s 'usr/bin/rlogin'
   setcap cap_net_bind_service=+ep 'usr/bin/rsh'    2>/dev/null || chmod +s 'usr/bin/rsh'
-
-  if [ -x 'usr/bin/install-info' ]; then
-    local file
-    for file in "${filelist[@]}"; do
-      install-info "${infodir}/${file}" "${infodir}/dir" 2>/dev/null
-    done
-  fi
-  systemctl daemon-reload
 }
 
 post_upgrade() {
   post_install $1
 }
-
-pre_remove() {
-  if [ -x 'usr/bin/install-info' ]; then
-    for file in "${filelist[@]}"; do
-      install-info --delete "${infodir}/${file}" "${infodir}/dir" 2>/dev/null
-    done
-  fi
-}
-
-post_remove() {
-  systemctl daemon-reload
-}