Hello community, here is the log from the commit of package net-tools for openSUSE:Factory checked in at 2016-05-26 23:52:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/net-tools (Old) and /work/SRC/openSUSE:Factory/.net-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "net-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/net-tools/net-tools.changes 2015-06-16 14:04:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.net-tools.new/net-tools.changes 2016-05-26 23:52:47.000000000 +0200 @@ -1,0 +2,10 @@ +Tue May 17 11:36:17 UTC 2016 - [email protected] + +- Add net-tools-1.60-hostname-s.patch: + This changes the hostname behavior to match other systems and its + own documentation. Namely, that -s just parses the result of the + active gethostname() and does not attempt any network/DNS traffic. + upstream: https://sourceforge.net/p/net-tools/bugs/14/ + commit#452f8e (boo#872264). + +------------------------------------------------------------------- New: ---- net-tools-1.60-hostname-s.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ net-tools.spec ++++++ --- /var/tmp/diff_new_pack.ZpdNRE/_old 2016-05-26 23:52:48.000000000 +0200 +++ /var/tmp/diff_new_pack.ZpdNRE/_new 2016-05-26 23:52:48.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package net-tools # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -83,6 +83,8 @@ Patch50: net-tools-1.60-plipconfig-usage.patch Patch51: net-tools-1.60-plipconfig-manpage.patch Patch52: net-tools-1.60-plipconfig-ecode.patch +# PATCH-FIX-UPSTREAM net-tools-1.60-hostname-s.patch boo#872264 ticket#14 commit#452f8e +Patch53: net-tools-1.60-hostname-s.patch %description This package contains essential programs for network administration and @@ -161,6 +163,7 @@ %patch50 -p1 %patch51 -p1 %patch52 -p1 +%patch53 -p1 cp %{S:4} . cp %{S:5} ./man/en_US @@ -193,6 +196,9 @@ done mv $RPM_BUILD_ROOT/%{_mandir}/de_DE $RPM_BUILD_ROOT/%{_mandir}/de mv $RPM_BUILD_ROOT/%{_mandir}/fr_FR $RPM_BUILD_ROOT/%{_mandir}/fr +%if 0%{?suse_version} < 1120 +rm -rf $RPM_BUILD_ROOT/%{_mandir}/pt_BR +%endif %find_lang %{name} --all-name --with-man # generate the filelist for net-tools-deprecated ++++++ net-tools-1.60-hostname-s.patch ++++++ Index: net-tools-1.60/hostname.c =================================================================== --- net-tools-1.60.orig/hostname.c +++ net-tools-1.60/hostname.c @@ -300,11 +300,6 @@ static void showhname(char *hname, int c case 'f': printf("%s\n", res->ai_canonname); break; - case 's': - if (p != NULL) - *p = '\0'; - printf("%s\n", res->ai_canonname); - break; default: break; } @@ -494,7 +489,12 @@ int main(int argc, char **argv) fprintf(stderr, _("gethostname()=`%s'\n"), myname); if (!type) printf("%s\n", myname); - else + else if (type == 's') { + char *p = strchr(myname, '.'); + if (p) + *p = '\0'; + printf("%s\n", myname); + } else showhname(myname, type); break; case 3:
