[arch-commits] Commit in inetutils/trunk (PKGBUILD inetutils.install)

2016-08-05 Thread Christian Hesse
Date: Friday, August 5, 2016 @ 15:53:45
  Author: eworm
Revision: 273126

upgpkg: inetutils 1.9.4-4

un-break capabilities on upgrade

Modified:
  inetutils/trunk/PKGBUILD
  inetutils/trunk/inetutils.install

---+
 PKGBUILD  |2 +-
 inetutils.install |4 
 2 files changed, 5 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-05 12:54:08 UTC (rev 273125)
+++ PKGBUILD2016-08-05 15:53:45 UTC (rev 273126)
@@ -3,7 +3,7 @@
 
 pkgname=inetutils
 pkgver=1.9.4
-pkgrel=3
+pkgrel=4
 pkgdesc="A collection of common network programs"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/inetutils/";

Modified: inetutils.install
===
--- inetutils.install   2016-08-05 12:54:08 UTC (rev 273125)
+++ inetutils.install   2016-08-05 15:53:45 UTC (rev 273126)
@@ -3,3 +3,7 @@
   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
 }
+
+post_upgrade() {
+  post_install
+}


[arch-commits] Commit in inetutils/trunk (PKGBUILD inetutils.install)

2016-08-04 Thread Christian Hesse
Date: Thursday, August 4, 2016 @ 12:09:13
  Author: eworm
Revision: 273023

upgpkg: inetutils 1.9.4-3

pacman hooks rebuild - remove install-info from install script

Modified:
  inetutils/trunk/PKGBUILD
  inetutils/trunk/inetutils.install

---+
 PKGBUILD  |2 +-
 inetutils.install |   19 ---
 2 files changed, 1 insertion(+), 20 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-04 11:30:37 UTC (rev 273022)
+++ PKGBUILD2016-08-04 12:09:13 UTC (rev 273023)
@@ -3,7 +3,7 @@
 
 pkgname=inetutils
 pkgver=1.9.4
-pkgrel=2
+pkgrel=3
 pkgdesc="A collection of common network programs"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/inetutils/";

Modified: inetutils.install
===
--- inetutils.install   2016-08-04 11:30:37 UTC (rev 273022)
+++ inetutils.install   2016-08-04 12:09:13 UTC (rev 273023)
@@ -1,24 +1,5 @@
-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
-
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
 }
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}


[arch-commits] Commit in inetutils/trunk (PKGBUILD inetutils.install)

2014-09-24 Thread Eric BĂ©langer
Date: Thursday, September 25, 2014 @ 03:50:11
  Author: eric
Revision: 222996

upgpkg: inetutils 1.9.2-2

Replace setuid by cap_net_bind_service (close FS#39686)

Modified:
  inetutils/trunk/PKGBUILD
  inetutils/trunk/inetutils.install

---+
 PKGBUILD  |6 --
 inetutils.install |4 
 2 files changed, 8 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-25 01:42:35 UTC (rev 222995)
+++ PKGBUILD2014-09-25 01:50:11 UTC (rev 222996)
@@ -3,13 +3,13 @@
 
 pkgname=inetutils
 pkgver=1.9.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A collection of common network programs"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/inetutils/";
 license=('GPL3')
 groups=('base')
-depends=('pam')
+depends=('pam' 'libcap')
 makedepends=('help2man')
 backup=('etc/xinetd.d/telnet' 'etc/xinetd.d/talk'
 'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh'
@@ -67,6 +67,8 @@
   cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
+  chmod -s "${pkgdir}"/usr/bin/{rcp,rlogin,rsh}
+
   install -D -m644 "${srcdir}/telnet.xinetd" "${pkgdir}/etc/xinetd.d/telnet"
   install -D -m644 "${srcdir}/talk.xinetd" "${pkgdir}/etc/xinetd.d/talk"
   install -D -m644 "${srcdir}/rlogin.xinetd" "${pkgdir}/etc/xinetd.d/rlogin"

Modified: inetutils.install
===
--- inetutils.install   2014-09-25 01:42:35 UTC (rev 222995)
+++ inetutils.install   2014-09-25 01:50:11 UTC (rev 222996)
@@ -2,6 +2,10 @@
 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
+
   [ -x usr/bin/install-info ] || return 0
   for file in ${filelist[@]}; do
 install-info $infodir/$file $infodir/dir 2> /dev/null



[arch-commits] Commit in inetutils/trunk (PKGBUILD inetutils.install)

2010-04-18 Thread Allan McRae
Date: Sunday, April 18, 2010 @ 09:06:59
  Author: allan
Revision: 77841

upgpkg: inetutils 1.7-3
add install-info presence test to install script

Modified:
  inetutils/trunk/PKGBUILD
  inetutils/trunk/inetutils.install

---+
 PKGBUILD  |6 +-
 inetutils.install |2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-18 11:21:43 UTC (rev 77840)
+++ PKGBUILD2010-04-18 13:06:59 UTC (rev 77841)
@@ -4,7 +4,7 @@
 
 pkgname=inetutils
 pkgver=1.7
-pkgrel=2
+pkgrel=3
 pkgdesc="A collection of common network programs"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/inetutils/";
@@ -47,6 +47,10 @@
 --disable-uucpd --disable-hostname \
 --disable-ifconfig --disable-traceroute || return 1
   make || return 1
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install || return 1
 
   install -D -m755 "${srcdir}/ftpd.rc" "${pkgdir}/etc/rc.d/ftpd" || return 1

Modified: inetutils.install
===
--- inetutils.install   2010-04-18 11:21:43 UTC (rev 77840)
+++ inetutils.install   2010-04-18 13:06:59 UTC (rev 77841)
@@ -2,6 +2,7 @@
 filelist=(inetutils.info.gz)
 
 post_install() {
+  [ -x usr/bin/install-info ] || return 0
   for file in ${fileli...@]}; do
 install-info $infodir/$file $infodir/dir 2> /dev/null
   done
@@ -12,6 +13,7 @@
 }
 
 pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
   for file in ${fileli...@]}; do
 install-info --delete $infodir/$file $infodir/dir 2> /dev/null
   done