diff options
author | Chris Severance | 2019-02-18 03:36:15 -0500 |
---|---|---|
committer | Chris Severance | 2019-02-18 03:36:15 -0500 |
commit | 69a0bef9157c9270c076b2372f1549d57a3bc8ef (patch) | |
tree | 9399f9dd99c54cbd015ed4a14a28df5a93f88f93 | |
parent | ebed45064a1bd9b65a773e2ac0ea144b50a950e2 (diff) | |
download | aur-69a0bef9157c9270c076b2372f1549d57a3bc8ef.tar.gz |
autu: Update to 1.9.4.r42.ga4a331b7-3 fix pambase 20190105.1-1
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 30 | ||||
-rw-r--r-- | inetutils.install | 1 | ||||
-rw-r--r-- | telnetd.pam | 5 |
4 files changed, 39 insertions, 5 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Mon Jan 14 18:08:45 UTC 2019 +# Mon Feb 18 08:36:15 UTC 2019 pkgbase = inetutils-git pkgdesc = A collection of common network programs pkgver = 1.9.4.r42.ga4a331b7 - pkgrel = 2 + pkgrel = 3 url = http://www.gnu.org/software/inetutils/ install = inetutils.install arch = i686 @@ -25,9 +25,11 @@ pkgbase = inetutils-git backup = etc/xinetd.d/rsh backup = etc/pam.d/rlogin backup = etc/pam.d/rsh + backup = etc/pam.d/telnetd source = git://git.savannah.gnu.org/inetutils.git source = git://git.sv.gnu.org/gnulib source = 0001-telnetd-Fix-buffer-overflows.patch + source = telnetd.pam source = ftpd.service::https://projects.archlinux.org/svntogit/packages.git/plain/trunk/ftpd.service?h=packages/inetutils source = rlogin.pam::https://projects.archlinux.org/svntogit/packages.git/plain/trunk/rlogin.pam?h=packages/inetutils source = rlogin@.service::https://projects.archlinux.org/svntogit/packages.git/plain/trunk/rlogin@.service?h=packages/inetutils @@ -46,6 +48,7 @@ pkgbase = inetutils-git md5sums = SKIP md5sums = SKIP md5sums = a902f8c38f6db36574b928e41d2d2814 + md5sums = 6e6c8719e5989d976a14610f340bd33a md5sums = fe181e22d3544456f52e64f3bdf5f291 md5sums = cda2aa3cd2353120b142fd33b3b4f4df md5sums = 7cea13f4ff7fd170fc4d03ef2698200d @@ -64,6 +67,7 @@ pkgbase = inetutils-git sha256sums = SKIP sha256sums = SKIP sha256sums = 09210d3e7799fe93c712a0540f74ba281c61499a47af53e308ee6c3c3367b4dc + sha256sums = de66118684a2ecec18017dd96e50a489f30465510250c007ced16f81fb542ba5 sha256sums = f1b9b4e57f484070366444a649f1be151d01d5bc965b9b192c242e4b7cc4beeb sha256sums = 428367b148033c7fa865e92bdd73b06cb58e6909488649adebf8d2253a022f1f sha256sums = 6112bcdb595937a8c7940dc158a97fd48b8cce6526a9fb017f347f614b9d6548 @@ -7,7 +7,7 @@ set -u _pkgname='inetutils' pkgname="${_pkgname}-git" pkgver=1.9.4.r42.ga4a331b7 -pkgrel=2 +pkgrel=3 _srcdir="${_pkgname}" pkgdesc='A collection of common network programs' arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ makedepends=('help2man' 'git' 'autoconf') provides=("${_pkgname}=${pkgver%%.r*}") conflicts=("${_pkgname}") backup=('etc/xinetd.d'/{telnet,talk,rlogin,rsh} - 'etc/pam.d'/{rlogin,rsh}) + 'etc/pam.d'/{rlogin,rsh,telnetd}) options=('!emptydirs' '!strip') install="${_pkgname}.install" _verwatch=('http://ftp.gnu.org/gnu/inetutils/' 'inetutils-\([0-9\.]\+\)\.tar\.gz' 'l') @@ -27,6 +27,7 @@ source=( "git://git.savannah.gnu.org/${_pkgname}.git" #commit=3d64a8c7280e7d218c4b607aa25352be1d6c4ded" 'git://git.sv.gnu.org/gnulib' '0001-telnetd-Fix-buffer-overflows.patch' + 'telnetd.pam' # for now this overwrites /etc/pam.d/other until a better way or pam patch is found ) # This link must be the same as the one in bootstrap _archlink="@@@::https://projects.archlinux.org/svntogit/packages.git/plain/trunk/@@@?h=packages/${_pkgname}" _archsource=( @@ -43,6 +44,7 @@ unset _src _archlink md5sums=('SKIP' 'SKIP' 'a902f8c38f6db36574b928e41d2d2814' + '6e6c8719e5989d976a14610f340bd33a' 'fe181e22d3544456f52e64f3bdf5f291' 'cda2aa3cd2353120b142fd33b3b4f4df' '7cea13f4ff7fd170fc4d03ef2698200d' @@ -61,6 +63,7 @@ md5sums=('SKIP' sha256sums=('SKIP' 'SKIP' '09210d3e7799fe93c712a0540f74ba281c61499a47af53e308ee6c3c3367b4dc' + 'de66118684a2ecec18017dd96e50a489f30465510250c007ced16f81fb542ba5' 'f1b9b4e57f484070366444a649f1be151d01d5bc965b9b192c242e4b7cc4beeb' '428367b148033c7fa865e92bdd73b06cb58e6909488649adebf8d2253a022f1f' '6112bcdb595937a8c7940dc158a97fd48b8cce6526a9fb017f347f614b9d6548' @@ -205,7 +208,28 @@ Depends = coreutils When = PostTransaction Exec = /usr/bin/bash "${_script}" EOF - ) "${pkgdir}/usr/share/libalpm/hooks/${pkgname}-foomatic-db.hook" + ) "${pkgdir}/usr/share/libalpm/hooks/${pkgname}-readline.hook" + + # Crude but effective method for fixing pam unaware application + install -Dm644 <(cat << EOF +# Automatically generated by ${pkgname}-${pkgver} PKGBUILD from Arch Linux AUR +# https://aur.archlinux.org/ + +# Update /etc/pam.d/other for ${pkgname} on each upgrade of pambase + +[Trigger] +Operation = Upgrade +Type = Package +Target = pambase + +[Action] +Description = Update /etc/pam.d/other for ${pkgname} +Depends = coreutils +When = PostTransaction +Exec = /usr/bin/cp -p /etc/pam.d/telnetd /etc/pam.d/other +EOF + ) "${pkgdir}/usr/share/libalpm/hooks/${pkgname}-pambase-other.hook" + install -Dpm644 "${srcdir}/telnetd.pam" "${pkgdir}/etc/pam.d/telnetd" set +u } set +u diff --git a/inetutils.install b/inetutils.install index 17dd12b9acf0..97b9f7d73bef 100644 --- a/inetutils.install +++ b/inetutils.install @@ -2,6 +2,7 @@ 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' + cp -p /etc/pam.d/telnetd /etc/pam.d/other } post_upgrade() { diff --git a/telnetd.pam b/telnetd.pam new file mode 100644 index 000000000000..08498b423541 --- /dev/null +++ b/telnetd.pam @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth required pam_unix.so +account required pam_unix.so +password required pam_unix.so +session required pam_unix.so |