commit d8e5af23a63c4670327b5220d384e79739fb9634 Author: Juergen Daubert <jue@jue.li> Date: Wed Jun 10 18:22:01 2015 +0200 inetutils: update to 1.9.4 diff --git a/inetutils/.md5sum b/inetutils/.md5sum index ebeaa80..39b6814 100644 --- a/inetutils/.md5sum +++ b/inetutils/.md5sum @@ -1,4 +1,3 @@ -63afd1bd27e883d1b026d921a4ef2784 ifconfig-default_behaviour.patch 87fdb9f85d8fc140b2f873e8e4e18440 inetd dd0d71e008809420edada02dda7a3149 inetd.conf -491a75cb382ce3f68122e4556addfcae inetutils-1.9.3.tar.gz +04852c26c47cc8c6b825f2b74f191f52 inetutils-1.9.4.tar.gz diff --git a/inetutils/Pkgfile b/inetutils/Pkgfile index 7a608ad..c58aea2 100644 --- a/inetutils/Pkgfile +++ b/inetutils/Pkgfile @@ -4,17 +4,14 @@ # Depends on: readline name=inetutils -version=1.9.3 +version=1.9.4 release=1 source=(http://ftp.gnu.org/gnu/inetutils/inetutils-$version.tar.gz \ - inetd.conf inetd ifconfig-default_behaviour.patch) + inetd.conf inetd) build() { cd inetutils-$version - # http://article.gmane.org/gmane.comp.gnu.inetutils.bugs/3909 - patch -p1 -i $SRC/ifconfig-default_behaviour.patch - ./configure --prefix=/usr \ --libexecdir=/usr/sbin \ --mandir=/usr/man \ diff --git a/inetutils/ifconfig-default_behaviour.patch b/inetutils/ifconfig-default_behaviour.patch deleted file mode 100644 index 8b4251a..0000000 --- a/inetutils/ifconfig-default_behaviour.patch +++ /dev/null @@ -1,54 +0,0 @@ -commit ddfc1fda581f61f5154a9dd5827e49584409ee86 -Author: Mats Erik Andersson <gnu@gisladisker.se> -Date: Sun May 17 00:58:17 2015 +0200 - - ifconfig: Regression during interface selection. - - Correctly implement the default behaviour of printing - all interfaces in state `UP'. The regression appeared - in version 1.9.3 when 32-bit wide flags were implemented. - -diff --git a/ifconfig/printif.c b/ifconfig/printif.c -index cc4d7a1..615a630 100644 ---- a/ifconfig/printif.c -+++ b/ifconfig/printif.c -@@ -481,22 +481,29 @@ fh_ifdisplay_query (format_data_t form, int argc, char *argv[]) - int n; - - #ifdef SIOCGIFFLAGS -- int f; -- int rev; -- unsigned int uflags = (unsigned short) form->ifr->ifr_flags; -+ /* Request for all, or for a specified interface? */ -+ n = all_option || ifs_cmdline; -+ if (!n) -+ { -+ /* Otherwise, only interfaces in state `UP' are displayed. */ -+ int rev = 0; -+ int f = if_nameztoflag ("UP", &rev); -+ -+ n = f && ioctl (form->sfd, SIOCGIFFLAGS, form->ifr) == 0; -+ if (n) { -+ unsigned int uflags = (unsigned short) form->ifr->ifr_flags; - - # ifdef ifr_flagshigh -- uflags |= (unsigned short) form->ifr->ifr_flagshigh << 16; -+ uflags |= (unsigned short) form->ifr->ifr_flagshigh << 16; - # endif /* ifr_flagshigh */ - -- n = !(all_option || ifs_cmdline -- || ((f = if_nameztoflag ("UP", &rev)) -- && ioctl (form->sfd, SIOCGIFFLAGS, form->ifr) == 0 -- && (f & uflags))); -+ n = n && (f & uflags); -+ }; -+ } - #else -- n = 0; -+ n = 1; /* Display all of them. */ - #endif -- select_arg (form, argc, argv, n); -+ select_arg (form, argc, argv, !n); - } - - void